diff --git a/examples/core-connection/yarn.lock b/examples/core-connection/yarn.lock
index 191b3b72..a75205e0 100644
--- a/examples/core-connection/yarn.lock
+++ b/examples/core-connection/yarn.lock
@@ -6822,7 +6822,7 @@ __metadata:
 
 "shared-components@file:../../packages/shared-components::locator=core-connection%40workspace%3A.":
   version: 0.1.0
-  resolution: "shared-components@file:../../packages/shared-components#../../packages/shared-components::hash=f63c81&locator=core-connection%40workspace%3A."
+  resolution: "shared-components@file:../../packages/shared-components#../../packages/shared-components::hash=4270f6&locator=core-connection%40workspace%3A."
   dependencies:
     "@emotion/react": "npm:^11.13.0"
     "@radix-ui/react-dialog": "npm:^1.1.1"
@@ -6843,7 +6843,7 @@ __metadata:
   peerDependencies:
     react: ^18.3.1
     react-dom: ^18.3.1
-  checksum: 10/79cc95a9b4697156f8b4e3f4b026f89284855d97af9c8bf9d8bc601997c80a6bb6afd5cf1bd42d844ec38a8339a40bcffcf62e396d327abd22096b710f00ec79
+  checksum: 10/8ba8d4af0295c9192d4df2d2f96fdfb6eba69d3400588450d9c6c3e658877d4b613de32365e83ddc4cad0213427727b8b075299b353e079e8e42cd34105044d1
   languageName: node
   linkType: hard
 
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index 0c160653..e46396fe 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -15,4 +15,4 @@
   "scripts": {
     "release:stable": "npx nx run ui-kit:nx-release-publish --otp=1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/ui-kit/src/lib/constants.ts b/packages/ui-kit/src/lib/constants.ts
index 1ccb2784..06618346 100644
--- a/packages/ui-kit/src/lib/constants.ts
+++ b/packages/ui-kit/src/lib/constants.ts
@@ -1,4 +1,3 @@
-import { FC, ReactNode } from 'react';
 import {
   ArbitrumMonotone,
   BnbMonotone,
@@ -23,9 +22,7 @@ export const CONSTANTS = {
   ENV: ENV,
 };
 
-export const CHAIN_LOGO: {
-  [x: number | string]: FC<ReactNode>;
-} = {
+export const CHAIN_LOGO: Record<string, React.FC | React.ComponentType> = {
   1: EthereumMonotone,
   11155111: EthereumMonotone,
   137: PolygonMonotone,
diff --git a/packages/ui-kit/src/lib/wallet/components/PushWalletIFrame.tsx b/packages/ui-kit/src/lib/wallet/components/PushWalletIFrame.tsx
index 8c223888..2ca32cc2 100644
--- a/packages/ui-kit/src/lib/wallet/components/PushWalletIFrame.tsx
+++ b/packages/ui-kit/src/lib/wallet/components/PushWalletIFrame.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import { FC } from 'react';
 import { usePushWalletContext } from './PushWalletProvider';
 import config from '../../config';
 import styled from 'styled-components';
@@ -20,10 +20,7 @@ const PushWalletIFrame: FC = () => {
   return (
     <>
       {isWalletVisible ? (
-        <FrameContainer
-          isWalletMinimised={isWalletMinimised}
-          account={account}
-        >
+        <FrameContainer isWalletMinimised={isWalletMinimised} account={account}>
           {isIframeLoading && (
             <FrameLoadingContainer>
               <CloseButtonContainer
@@ -34,9 +31,7 @@ const PushWalletIFrame: FC = () => {
                 <CrossIcon />
               </CloseButtonContainer>
               <LoadingTextContainer>
-                <LoadingText>
-                  Loading...
-                </LoadingText>
+                <LoadingText>Loading...</LoadingText>
                 <Spinner />
               </LoadingTextContainer>
             </FrameLoadingContainer>
@@ -46,13 +41,9 @@ const PushWalletIFrame: FC = () => {
             isWalletMinimised={isWalletMinimised}
             isIframeLoading={isIframeLoading}
           >
-            <AccountContainer
-              account={account}
-            >
+            <AccountContainer account={account}>
               {account ? (
-                <DashButtonContainer
-                  onClick={() => setMinimiseWallet(true)}
-                >
+                <DashButtonContainer onClick={() => setMinimiseWallet(true)}>
                   <DashIcon />
                 </DashButtonContainer>
               ) : (
@@ -81,15 +72,16 @@ const PushWalletIFrame: FC = () => {
           </FrameSubContainer>
         </FrameContainer>
       ) : null}
-
     </>
-
   );
 };
 
 export { PushWalletIFrame };
 
-const FrameContainer = styled.div`
+const FrameContainer = styled.div<{
+  account: string | null;
+  isWalletMinimised: boolean;
+}>`
   position: fixed;
   display: flex;
   flex-direction: column;
@@ -97,17 +89,20 @@ const FrameContainer = styled.div`
   border-radius: 10px;
   z-index: 99;
 
-  width:${({ account, isWalletMinimised }) => isWalletMinimised ? '0px' : account ? '450px' : '100%'};
-  height:${({ account, isWalletMinimised }) => isWalletMinimised ? '0px' : account ? '710px' : '100%'};
-  right:${({ account }) => account ? '24px' : '0'};
-  top:${({ account }) => account ? '24px' : '0'};
-
-  @media (max-width:425px){
-    width:${({ account, isWalletMinimised }) => isWalletMinimised ? '0px' : account ? '96%' : '100%'};
-    right:${({ account }) => account ? '2%' : '0'};
-    top:${({ account }) => account ? '8%' : '0'};
+  width: ${({ account, isWalletMinimised }) =>
+    isWalletMinimised ? '0px' : account ? '450px' : '100%'};
+  height: ${({ account, isWalletMinimised }) =>
+    isWalletMinimised ? '0px' : account ? '710px' : '100%'};
+  right: ${({ account }) => (account ? '24px' : '0')};
+  top: ${({ account }) => (account ? '24px' : '0')};
+
+  @media (max-width: 425px) {
+    width: ${({ account, isWalletMinimised }) =>
+      isWalletMinimised ? '0px' : account ? '96%' : '100%'};
+    right: ${({ account }) => (account ? '2%' : '0')};
+    top: ${({ account }) => (account ? '8%' : '0')};
   }
-`
+`;
 
 const CloseButtonContainer = styled.div`
   display: flex;
@@ -115,28 +110,27 @@ const CloseButtonContainer = styled.div`
   justify-content: flex-end;
   cursor: pointer;
   padding: 0 16px;
-`
+`;
 
 const DashButtonContainer = styled.div`
   display: flex;
   align-items: center;
   justify-content: center;
   cursor: pointer;
-  border-radius:1000px;
-  height:14px;
-  width:14px;
-  background-color:#ffbb16;
-
-`
+  border-radius: 1000px;
+  height: 14px;
+  width: 14px;
+  background-color: #ffbb16;
+`;
 
 const LoadingTextContainer = styled.div`
-  display:flex;
-  align-items:center;
-  justify-content:center;
-  gap:16px;
-  width:-webkit-fill-available;
-  height:-webkit-fill-available;
-`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 16px;
+  width: -webkit-fill-available;
+  height: -webkit-fill-available;
+`;
 
 const LoadingText = styled.p`
   font-size: 18px;
@@ -146,33 +140,35 @@ const LoadingText = styled.p`
   font-family: FK Grotesk Neu;
   margin: 0px;
   width: auto;
-`
+`;
 
 const FrameLoadingContainer = styled.div`
-  height:-webkit-fill-available;
-  width:-webkit-fill-available;
-  flex-direction:column;
-  display:flex;
-  padding:8px;
-  background-color:#17181b;
-`
+  height: -webkit-fill-available;
+  width: -webkit-fill-available;
+  flex-direction: column;
+  display: flex;
+  padding: 8px;
+  background-color: #17181b;
+`;
 
-const FrameSubContainer = styled.div`
+const FrameSubContainer = styled.div<{
+  isWalletMinimised: boolean;
+  isIframeLoading: boolean;
+}>`
   display: ${({ isWalletMinimised, isIframeLoading }) =>
     isWalletMinimised || isIframeLoading ? 'none' : 'flex'};
   width: -webkit-fill-available;
   height: -webkit-fill-available;
   flex-direction: column;
-`
+`;
 
-const AccountContainer = styled.div`
- width: -webkit-fill-available;
+const AccountContainer = styled.div<{ account: string | null }>`
+  width: -webkit-fill-available;
   display: flex;
   align-items: center;
   justify-content: flex-end;
   padding: var(--spacing-xxs) var(--spacing-xxs);
-  border-top-right-radius:${({ account }) => account ? '10px' : '0px'};
-  border-top-left-radius:${({ account }) => account ? '10px' : '0px'};
-  background-color:${({ account }) => account ? '#e3e3e3' : '#17181B'};
-
-`
\ No newline at end of file
+  border-top-right-radius: ${({ account }) => (account ? '10px' : '0px')};
+  border-top-left-radius: ${({ account }) => (account ? '10px' : '0px')};
+  background-color: ${({ account }) => (account ? '#e3e3e3' : '#17181B')};
+`;
diff --git a/yarn.lock b/yarn.lock
index f1b8a2b3..f81db523 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1498,6 +1498,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emotion/is-prop-valid@npm:1.2.2":
+  version: 1.2.2
+  resolution: "@emotion/is-prop-valid@npm:1.2.2"
+  dependencies:
+    "@emotion/memoize": "npm:^0.8.1"
+  checksum: 10/0fa3960abfbe845d40cc230ab8c9408e1f33d3c03b321980359911c7212133cdcb0344d249e9dab23342b304567eece7a10ec44b986f7230e0640ba00049dceb
+  languageName: node
+  linkType: hard
+
 "@emotion/is-prop-valid@npm:^1.1.0":
   version: 1.3.1
   resolution: "@emotion/is-prop-valid@npm:1.3.1"
@@ -1507,6 +1516,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emotion/memoize@npm:^0.8.1":
+  version: 0.8.1
+  resolution: "@emotion/memoize@npm:0.8.1"
+  checksum: 10/a19cc01a29fcc97514948eaab4dc34d8272e934466ed87c07f157887406bc318000c69ae6f813a9001c6a225364df04249842a50e692ef7a9873335fbcc141b0
+  languageName: node
+  linkType: hard
+
 "@emotion/memoize@npm:^0.9.0":
   version: 0.9.0
   resolution: "@emotion/memoize@npm:0.9.0"
@@ -1562,6 +1578,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emotion/unitless@npm:0.8.1":
+  version: 0.8.1
+  resolution: "@emotion/unitless@npm:0.8.1"
+  checksum: 10/918f73c46ac0b7161e3c341cc07d651ce87e31ab1695e74b12adb7da6bb98dfbff8c69cf68a4e40d9eb3d820ca055dc1267aeb3007927ce88f98b885bf729b63
+  languageName: node
+  linkType: hard
+
 "@emotion/unitless@npm:^0.10.0":
   version: 0.10.0
   resolution: "@emotion/unitless@npm:0.10.0"
@@ -2685,7 +2708,7 @@ __metadata:
   dependencies:
     "@types/react": "npm:^18.3.13"
     react: "npm:^18.3.1"
-    shared-components: ../shared-components
+    styled-components: "npm:^6.1.14"
     tslib: "npm:^2.3.0"
   languageName: unknown
   linkType: soft
@@ -4087,6 +4110,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/stylis@npm:4.2.5":
+  version: 4.2.5
+  resolution: "@types/stylis@npm:4.2.5"
+  checksum: 10/f8dde326432a7047b6684b96442f0e2ade2cfe8c29bf56217fb8cbbe4763997051fa9dc0f8dba4aeed2fddb794b4bc91feba913b780666b3adc28198ac7c63d4
+  languageName: node
+  linkType: hard
+
 "@types/uuid@npm:^10.0.0":
   version: 10.0.0
   resolution: "@types/uuid@npm:10.0.0"
@@ -6007,7 +6037,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-to-react-native@npm:^3.0.0":
+"css-to-react-native@npm:3.2.0, css-to-react-native@npm:^3.0.0":
   version: 3.2.0
   resolution: "css-to-react-native@npm:3.2.0"
   dependencies:
@@ -6027,7 +6057,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csstype@npm:^3.0.2":
+"csstype@npm:3.1.3, csstype@npm:^3.0.2":
   version: 3.1.3
   resolution: "csstype@npm:3.1.3"
   checksum: 10/f593cce41ff5ade23f44e77521e3a1bcc2c64107041e1bf6c3c32adc5187d0d60983292fda326154d20b01079e24931aa5b08e4467cc488b60bb1e7f6d478ade
@@ -10315,6 +10345,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss@npm:8.4.38":
+  version: 8.4.38
+  resolution: "postcss@npm:8.4.38"
+  dependencies:
+    nanoid: "npm:^3.3.7"
+    picocolors: "npm:^1.0.0"
+    source-map-js: "npm:^1.2.0"
+  checksum: 10/6e44a7ed835ffa9a2b096e8d3e5dfc6bcf331a25c48aeb862dd54e3aaecadf814fa22be224fd308f87d08adf2299164f88c5fd5ab1c4ef6cbd693ceb295377f4
+  languageName: node
+  linkType: hard
+
 "postcss@npm:^8.4.47, postcss@npm:^8.4.49":
   version: 8.4.49
   resolution: "postcss@npm:8.4.49"
@@ -11238,40 +11279,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shallowequal@npm:^1.1.0":
+"shallowequal@npm:1.1.0, shallowequal@npm:^1.1.0":
   version: 1.1.0
   resolution: "shallowequal@npm:1.1.0"
   checksum: 10/f4c1de0837f106d2dbbfd5d0720a5d059d1c66b42b580965c8f06bb1db684be8783538b684092648c981294bf817869f743a066538771dbecb293df78f765e00
   languageName: node
   linkType: hard
 
-"shared-components@file:../shared-components::locator=%40pushprotocol%2Fpushchain-ui-kit%40workspace%3Apackages%2Fui-kit":
-  version: 0.1.0
-  resolution: "shared-components@file:../shared-components#../shared-components::hash=f8c2c4&locator=%40pushprotocol%2Fpushchain-ui-kit%40workspace%3Apackages%2Fui-kit"
-  dependencies:
-    "@emotion/react": "npm:^11.13.0"
-    "@radix-ui/react-dialog": "npm:^1.1.1"
-    "@radix-ui/react-dropdown-menu": "npm:^2.1.1"
-    "@radix-ui/react-switch": "npm:^1.1.0"
-    "@radix-ui/react-tooltip": "npm:^1.1.1"
-    "@reach/combobox": "npm:^0.18.0"
-    "@reach/tabs": "npm:^0.18.0"
-    "@table-library/react-table-library": "npm:^4.1.7"
-    "@types/styled-components": "npm:^5.1.34"
-    rc-pagination: "npm:^4.2.0"
-    react-router-dom: "npm:^6.26.2"
-    react-slider: "npm:^2.0.6"
-    sonner: "npm:^1.5.0"
-    styled-components: "npm:^5.3.8"
-    usehooks-ts: "npm:3.1.0"
-    vite-plugin-dts: "npm:^4.3.0"
-  peerDependencies:
-    react: ^18.3.1
-    react-dom: ^18.3.1
-  checksum: 10/122a8b94389289cfd4afcb36f2321fcc8d163ba630b02e2350c01443af93151f6dca0672d082842a08df2a2a2e5e9e1d41b287e5a60065c269f54d38e2b5d3dc
-  languageName: node
-  linkType: hard
-
 "shared-components@workspace:packages/shared-components":
   version: 0.0.0-use.local
   resolution: "shared-components@workspace:packages/shared-components"
@@ -11744,6 +11758,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"styled-components@npm:^6.1.14":
+  version: 6.1.14
+  resolution: "styled-components@npm:6.1.14"
+  dependencies:
+    "@emotion/is-prop-valid": "npm:1.2.2"
+    "@emotion/unitless": "npm:0.8.1"
+    "@types/stylis": "npm:4.2.5"
+    css-to-react-native: "npm:3.2.0"
+    csstype: "npm:3.1.3"
+    postcss: "npm:8.4.38"
+    shallowequal: "npm:1.1.0"
+    stylis: "npm:4.3.2"
+    tslib: "npm:2.6.2"
+  peerDependencies:
+    react: ">= 16.8.0"
+    react-dom: ">= 16.8.0"
+  checksum: 10/de26960b8e2b8d9430e8a02a22a7fa1ae764d914064525008257fb5d469cbddb4ef9b8b5b5e4baaabd236bd77c84fdad9a8d5f0d2fd05ff39ff55d80a71ff9de
+  languageName: node
+  linkType: hard
+
 "stylis@npm:4.2.0":
   version: 4.2.0
   resolution: "stylis@npm:4.2.0"
@@ -11751,6 +11785,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stylis@npm:4.3.2":
+  version: 4.3.2
+  resolution: "stylis@npm:4.3.2"
+  checksum: 10/4d3e3cb5cbfc7abdf14e424c8631a15fd15cbf0357ffc641c319587e00c2d1036b1a71cb88b42411bc3ce10d7730ad3fb9789b034d11365e8a19d23f56486c77
+  languageName: node
+  linkType: hard
+
 "sucrase@npm:^3.35.0":
   version: 3.35.0
   resolution: "sucrase@npm:3.35.0"
@@ -12159,6 +12200,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:2.6.2":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca
+  languageName: node
+  linkType: hard
+
 "tslib@npm:^2.0.0, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3, tslib@npm:^2.8.0":
   version: 2.8.1
   resolution: "tslib@npm:2.8.1"