Resolved the comments

push-protocol · Feb 10, 2025 · 295aad8 · 295aad8
1 parent 9d972cf
commit 295aad8
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 310 deletions.
diff --git a/examples/core-connection/src/App.tsx b/examples/core-connection/src/App.tsx
@@ -5,7 +5,7 @@ import { getBlocksCSSVariables, themeConfig } from 'shared-components';
 import { useDarkMode } from './common/hooks';
 import { RouterContainer } from './common/components';
 import { GlobalProvider } from './context/GlobalContext';
-import { CONSTANTS, PushWalletProvider } from '../../../packages/ui-kit';
+import { CONSTANTS, PushWalletProvider } from '@pushprotocol/pushchain-ui-kit';
 
 const GlobalStyle = createGlobalStyle`
   :root{

diff --git a/examples/core-connection/src/common/constants.ts b/examples/core-connection/src/common/constants.ts
@@ -1,5 +1,4 @@
 export const APP_ROUTES = {
   LANDING_PAGE: '/',
   SIMULATE: '/simulate',
-  WALLETPAGE: '/wallet-page',
 };
diff --git a/examples/core-connection/src/context/GlobalContext.tsx b/examples/core-connection/src/context/GlobalContext.tsx
@@ -8,7 +8,7 @@ import {
   useEffect,
   useState,
 } from 'react';
-import { usePushWalletContext } from '../../../../packages/ui-kit';
+import { usePushWalletContext } from '@pushprotocol/pushchain-ui-kit';
 
 // Define a type for the context value
 type GlobalContextType = {

diff --git a/examples/core-connection/src/helpers/walletHelper.ts b/examples/core-connection/src/helpers/walletHelper.ts
@@ -1,4 +1,4 @@
-import { UniversalAddress } from '../../../../packages/ui-kit/src';
+import { UniversalAddress } from '@pushprotocol/pushchain-ui-kit';
 
 export function centerMaskString(str: string) {
   if (str && str.length > 15) {

diff --git a/examples/core-connection/src/modules/WalletTestPage/WalletPage.tsx b/examples/core-connection/src/modules/WalletTestPage/WalletPage.tsx
diff --git a/examples/core-connection/src/modules/landingPage/components/LandingPageLeftComponent.tsx b/examples/core-connection/src/modules/landingPage/components/LandingPageLeftComponent.tsx
@@ -6,7 +6,7 @@ import { SimulateTxText } from './SimulateTxText';
 import {
   PushWalletButton,
   usePushWalletContext,
-} from '../../../../../../packages/ui-kit/src';
+} from '@pushprotocol/pushchain-ui-kit';
 
 const LandingPageLeftComponent = () => {
   const { pushNetwork, mockTx } = useGlobalContext();

diff --git a/examples/core-connection/src/modules/simulatePage/components/MockSendTransaction.tsx b/examples/core-connection/src/modules/simulatePage/components/MockSendTransaction.tsx
@@ -5,7 +5,7 @@ import { TransactionSnippet } from '../../../common/components';
 import { useGlobalContext } from '../../../context/GlobalContext';
 import { Transaction } from '@pushprotocol/push-chain/src/lib/generated/tx';
 import { centerMaskString, convertToCaip } from '../../../helpers';
-import { usePushWalletContext } from '../../../../../../packages/ui-kit/src';
+import { usePushWalletContext } from '@pushprotocol/pushchain-ui-kit';
 
 const MockSendTransaction = () => {
   const { pushNetwork, mockTx } = useGlobalContext();

diff --git a/examples/core-connection/src/modules/simulatePage/components/SimulateHeader.tsx b/examples/core-connection/src/modules/simulatePage/components/SimulateHeader.tsx
@@ -2,7 +2,7 @@ import { Box } from 'shared-components';
 import {
   PushWalletButton,
   usePushWalletContext,
-} from '../../../../../../packages/ui-kit';
+} from '@pushprotocol/pushchain-ui-kit';
 
 const SimulateHeader = () => {
   const { universalAddress } = usePushWalletContext();

diff --git a/packages/ui-kit/src/lib/wallet/components/ConnectPushWalletButton.tsx b/packages/ui-kit/src/lib/wallet/components/ConnectPushWalletButton.tsx
@@ -1,6 +1,5 @@
 import React, { FC } from 'react';
 import { usePushWalletContext } from './PushWalletProvider';
-import { walletConnectionButtonStatusMapper } from '../wallet.constants';
 import styled from 'styled-components';
 import { Spinner } from '../../common';
 
@@ -41,7 +40,6 @@ const ConnectPushWalletButton: FC<ConnectPushWalletButtonProps> = ({
         disabled={isConnectButtonDisbaled || isLoading}
         customStyle={styling}
       >
-        {/* {walletConnectionButtonStatusMapper[connectionStatus]} */}
         {connectionStatus === 'notConnected' ? title : connectionStatus}
         {isLoading && (
           <SpinnerContainer>

diff --git a/packages/ui-kit/src/lib/wallet/components/PushWalletButton.tsx b/packages/ui-kit/src/lib/wallet/components/PushWalletButton.tsx
@@ -16,20 +16,13 @@ const PushWalletButton: React.FC<PushWalletButtonProps> = ({
   title = 'Login',
   styling,
 }) => {
-  // If a custom component is provided, render it
-  if (component) {
+  // If universal address is present render the button
+  if (universalAddress) {
+    return <TogglePushWalletButton universalAddress={universalAddress} />;
+  } else if (component) {
+    // If no UA and custom component, then render the component
     return <>{component}</>;
-  }
-
-  return (
-    <>
-      {universalAddress ? (
-        <TogglePushWalletButton universalAddress={universalAddress} />
-      ) : (
-        <ConnectPushWalletButton title={title} styling={styling} />
-      )}
-    </>
-  );
+  } else return <ConnectPushWalletButton title={title} styling={styling} />; // If no UA and no custom component, then render the connect button
 };
 
 export { PushWalletButton };
diff --git a/packages/ui-kit/src/lib/wallet/components/PushWalletIFrame.tsx b/packages/ui-kit/src/lib/wallet/components/PushWalletIFrame.tsx