Don't remove wallet account if storageAddress is undefined

src/GlobalStateProvider/helpers.ts

@@ -14,8 +14,7 @@ const initTalisman = async (dAppName: string, selected?: string) => {
   if (!wallet) return;
   await wallet.enable(dAppName);
   const accounts = await wallet.getAccounts();
-  const selectedWallet = accounts.find((a) => a.address === selected) || accounts[0];
-  return selectedWallet;
+  return accounts.find((a) => a.address === selected) || accounts[0];
 };
 
 const initWalletConnect = async (chainId: string) => {

src/GlobalStateProvider/index.tsx

@@ -48,15 +48,16 @@ const GlobalStateProvider = ({ children }: { children: JSX.Element }) => {
     set,
     clear,
   } = useLocalStorage<string | undefined>({
-    key: `${storageKeys.ACCOUNT}-${tenantName}`,
-    expire: EXPIRATION_PERIOD,
+    key: `${storageKeys.ACCOUNT}`,
+    expire: undefined,
   });
 
   const clearLocalStorageWallets = () => {
     storageService.remove(LocalStorageKeys.SELECTED_WALLET_NAME);
   };
 
   const removeWalletAccount = useCallback(async () => {
+    console.log('Removing wallet account', walletAccount);
     await handleWalletConnectDisconnect(walletAccount);
     clear();
     clearLocalStorageWallets();
@@ -71,21 +72,22 @@ const GlobalStateProvider = ({ children }: { children: JSX.Element }) => {
     [set],
   );
 
-  const accountAddress = walletAccount?.address;
   useEffect(() => {
     const run = async () => {
       if (!storageAddress) {
-        removeWalletAccount();
         return;
       }
       // skip if tenant already initialized
-      if (tenantRef.current === tenantName || accountAddress) return;
+      if (tenantRef.current === tenantName) return;
       tenantRef.current = tenantName;
-      const selectedWallet = await initSelectedWallet(dAppName, tenantName, storageAddress);
-      if (selectedWallet) setWallet(selectedWallet);
+      // Delay this to allow the wallet extension to be injected, otherwise the call to wallet.enable() might fail
+      setTimeout(async () => {
+        const selectedWallet = await initSelectedWallet(dAppName, tenantName, storageAddress);
+        if (selectedWallet) setWallet(selectedWallet);
+      }, 400);
     };
     run();
-  }, [storageAddress, removeWalletAccount, dAppName, tenantName, accountAddress]);
+  }, [storageAddress, dAppName, tenantName]);
 
   const providerValue = useMemo<GlobalState>(
     () => ({