fix: do not connect wallet from remember me in restricted geo (#1124)

dydxprotocol · Oct 4, 2024 · 0cec083 · 0cec083
1 parent 77e2e58
commit 0cec083
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/hooks/useAccounts.tsx b/src/hooks/useAccounts.tsx
@@ -65,6 +65,10 @@ const useAccountsContext = () => {
 
   const { ready, authenticated } = usePrivy();
 
+  const blockedGeo = useMemo(() => {
+    return geo && isBlockedGeo(geo) && checkForGeo;
+  }, [geo, checkForGeo]);
+
   const [previousAddress, setPreviousAddress] = useState(sourceAccount.address);
   useEffect(() => {
     const { address, chain } = sourceAccount;
@@ -187,7 +191,7 @@ const useAccountsContext = () => {
               log('useAccounts/decryptSignature', error);
               dispatch(clearSavedEncryptedSignature());
             }
-          } else if (sourceAccount.encryptedSignature) {
+          } else if (sourceAccount.encryptedSignature && geo && !blockedGeo) {
             try {
               const signature = decryptSignature(sourceAccount.encryptedSignature);
 
@@ -205,7 +209,7 @@ const useAccountsContext = () => {
         if (!localDydxWallet) {
           dispatch(setOnboardingState(OnboardingState.WalletConnected));
 
-          if (sourceAccount?.encryptedSignature) {
+          if (sourceAccount?.encryptedSignature && geo && !blockedGeo) {
             try {
               const signature = decryptSignature(sourceAccount.encryptedSignature);
               await setWalletFromSignature(signature);
@@ -223,7 +227,7 @@ const useAccountsContext = () => {
         dispatch(setOnboardingState(OnboardingState.Disconnected));
       }
     })();
-  }, [signerWagmi, isConnectedGraz, sourceAccount, localDydxWallet]);
+  }, [signerWagmi, isConnectedGraz, sourceAccount, localDydxWallet, blockedGeo]);
 
   // abacus
   useEffect(() => {
@@ -288,10 +292,10 @@ const useAccountsContext = () => {
   }, [dispatch, dydxSubaccounts]);
 
   useEffect(() => {
-    if (geo && isBlockedGeo(geo) && checkForGeo) {
+    if (blockedGeo) {
       disconnect();
     }
-  }, [checkForGeo, geo]);
+  }, [blockedGeo]);
 
   // Disconnect wallet / accounts
   const disconnectLocalDydxWallet = () => {