chore(dcellar-web-ui): add some log points

node-real · Oct 12, 2023 · ad1ab0e · ad1ab0e
1 parent 6942e9e
commit ad1ab0e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/apps/dcellar-web-ui/src/components/ConnectWallet/index.tsx b/apps/dcellar-web-ui/src/components/ConnectWallet/index.tsx
@@ -18,12 +18,13 @@ export const ConnectWallet = memo<Partial<ConnectWalletProps>>(function ConnectB
   const dispatch = useDispatch();
   const router = useRouter();
   const { loginAccount } = useAppSelector((root) => root.persist);
-  const { isConnected } = useAccount();
+  const { isConnecting, isConnected, connector } = useAccount();
   const { icon, text, ...restProps } = props;
   const onOpen = () => {
+    console.log('invoke connect wallet', isConnected, connector);
     // The window.trustwallet.request method is undefined when the app is loaded. So add a delay to avoid.
     setTimeout(() => {
-      if (loginAccount && isConnected) {
+      if (loginAccount && isConnected && !isConnecting) {
         const originPathname = decodeURIComponent(router.query.originAsPath as string);
         return router.push(
           !!originPathname && originPathname !== 'undefined'

diff --git a/apps/dcellar-web-ui/src/components/WrongNetworkModal/index.tsx b/apps/dcellar-web-ui/src/components/WrongNetworkModal/index.tsx
@@ -7,6 +7,7 @@ import { DCButton } from '../common/DCButton';
 import { useWalletSwitchNetWork } from '@/context/WalletConnectContext';
 import { useLogin } from '@/hooks/useLogin';
 import { IconFont } from '@/components/IconFont';
+import { CHAIN_NAMES } from '@/utils/constant';
 
 export const WrongNetworkModal = ({ isOpen, onClose }: any) => {
   const { logout } = useLogin();
@@ -24,10 +25,10 @@ export const WrongNetworkModal = ({ isOpen, onClose }: any) => {
           <IconFont w={120} type={'error-network'} />
         </Flex>
         <Text fontSize={'24px'} fontWeight={600} lineHeight="150%" marginY={'16px'}>
-          Wrong Network
+          Switch Network
         </Text>
         <Text color="#76808F" fontSize={'18px'} fontWeight="400" lineHeight={'22px'}>
-          You are on the wrong network. Switch your wallet to BNB Greenfield first.
+          To complete the action, you need to switch to {CHAIN_NAMES[GREENFIELD_CHAIN_ID]}.
         </Text>
       </ModalBody>
       <ModalFooter flexDirection={'column'} mt={24} gap={16}>
@@ -39,7 +40,7 @@ export const WrongNetworkModal = ({ isOpen, onClose }: any) => {
             switchNetwork?.(GREENFIELD_CHAIN_ID);
           }}
         >
-          Switch to BNB Greenfield
+          Switch to {CHAIN_NAMES[GREENFIELD_CHAIN_ID]}
         </DCButton>
         <DCButton
           size={'lg'}

diff --git a/apps/dcellar-web-ui/src/context/LoginContext/provider.tsx b/apps/dcellar-web-ui/src/context/LoginContext/provider.tsx
@@ -48,7 +48,7 @@ export function LoginContextProvider(props: PropsWithChildren<LoginContextProvid
   });
 
   const { pathname } = useRouter();
-  const { address: walletAddress, connector } = useAccount();
+  const { address: walletAddress, isConnected } = useAccount();
 
   useEffect(() => {
     if (pathname === '/' || inline) return;
@@ -63,15 +63,15 @@ export function LoginContextProvider(props: PropsWithChildren<LoginContextProvid
     // to avoid errors when using the connector, we treat this situation as logout.
     const timer = setTimeout(() => {
       console.log('invoke not connector')
-      if (!connector) {
+      if (!isConnected) {
         logout();
       }
     }, 1000);
 
     return () => {
       clearTimeout(timer);
     };
-  }, [connector, inline, loginAccount, logout, pathname, walletAddress]);
+  }, [inline, isConnected, loginAccount, logout, pathname, walletAddress]);
 
   useAsyncEffect(async () => {
     // ssr pages loginAccount initial value ''

diff --git a/apps/dcellar-web-ui/src/utils/constant.ts b/apps/dcellar-web-ui/src/utils/constant.ts
@@ -11,9 +11,9 @@ export const reverseVisibilityType = convertVisibility();
 export const CHAIN_NAMES: { [key: number | string]: string } = {
   56: 'BNB Smart Chain Mainnet',
   97: 'BNB Smart Chain Testnet',
-  9000: 'Greenfield Devnet',
-  5600: 'Greenfield Testnet',
-  1017: 'Greenfield Mainnet',
+  9000: 'BNB Greenfield Devnet',
+  5600: 'BNB Greenfield Testnet',
+  1017: 'BNB Greenfield Mainnet',
 };
 
 export const GNFD_TESTNET = 5600;