feat(dcellar-web-ui): update walletkit

node-real · Nov 15, 2023 · a6ff456 · a6ff456
1 parent 6afb5e8
commit a6ff456
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/apps/dcellar-web-ui/package.json b/apps/dcellar-web-ui/package.json
@@ -26,7 +26,7 @@
     "@next/bundle-analyzer": "^13.1.6",
     "@totejs/icons": "^2.17.0",
     "@totejs/uikit": "~2.54.1",
-    "@totejs/walletkit": "0.2.1",
+    "@totejs/walletkit": "0.2.4",
     "axios": "^1.3.2",
     "axios-retry": "^3.4.0",
     "bignumber.js": "^9.1.1",

diff --git a/apps/dcellar-web-ui/src/components/ConnectWallet/index.tsx b/apps/dcellar-web-ui/src/components/ConnectWallet/index.tsx
@@ -21,7 +21,7 @@ interface ConnectWalletProps extends DCButtonProps {
 let eventTriggerTime = Date.now();
 
 export const ConnectWallet = memo<Partial<ConnectWalletProps>>(function ConnectButton(props) {
-  const { onOpen } = useModal();
+  const { onOpen, onClose } = useModal();
   const router = useRouter();
   const dispatch = useAppDispatch();
   const { connector, address, isConnected } = useAccount();
@@ -47,12 +47,14 @@ export const ConnectWallet = memo<Partial<ConnectWalletProps>>(function ConnectB
 
     if (!isAvailable) {
       const res = await onOffChainAuth(address);
+      onClose();
       if (res.code !== 0) {
         disconnect();
         return;
       }
       dispatch(setLogin(address));
     } else {
+      onClose();
       dispatch(setLogin(address));
     }
 

diff --git a/apps/dcellar-web-ui/src/context/WalletConnectContext/components/WalletConnectProvider.tsx b/apps/dcellar-web-ui/src/context/WalletConnectContext/components/WalletConnectProvider.tsx
@@ -25,6 +25,9 @@ const client = createClient(
 
 const options: WalletKitOptions = {
   initialChainId: GREENFIELD_CHAIN_ID,
+  closeModalAfterConnected: false,
+  closeModalOnEsc: false,
+  closeModalOnOverlayClick: false,
   disclaimer: (
     <Text>
       By connecting your wallet, you agree to our{' '}

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml