fix: impersonated

bgd-labs · Jan 11, 2024 · fd8b414 · fd8b414
1 parent 9233aee
commit fd8b414
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/web3/connectors/ImpersonatedConnector.ts b/src/web3/connectors/ImpersonatedConnector.ts
@@ -119,7 +119,10 @@ export function impersonated(parameters: ImpersonatedParameters) {
       connected = false;
     },
     async getProvider({ chainId }: { chainId?: number } = {}) {
-      accountAddress = parameters.getAccountAddress() || zeroAddress;
+      accountAddress =
+        (!!parameters.getAccountAddress()
+          ? parameters.getAccountAddress()
+          : zeroAddress) || zeroAddress;
       const chain =
         config.chains.find((x) => x.id === chainId) ?? config.chains[0];
       const url = chain.rpcUrls.default.http[0]!;

diff --git a/src/web3/store/walletSlice.ts b/src/web3/store/walletSlice.ts
@@ -223,12 +223,15 @@ export function createWalletSlice({
     },
     disconnectActiveWallet: async () => {
       const config = get().wagmiConfig;
-      if (config && !!config.connectors.length) {
-        await disconnect(config);
-        set({ activeWallet: undefined });
-        deleteLocalStorageWallet();
-        clearWalletLinkLocalStorage();
-        clearWalletConnectV2LocalStorage();
+      if (config) {
+        const account = getAccount(config);
+        if (account.isConnected) {
+          await disconnect(config);
+          set({ activeWallet: undefined });
+          deleteLocalStorageWallet();
+          clearWalletLinkLocalStorage();
+          clearWalletConnectV2LocalStorage();
+        }
       }
     },
     resetWalletConnectionError: () => {
@@ -319,6 +322,8 @@ export function createWalletSlice({
     getImpersonatedAddress: () => {
       const impersonated = get().impersonated;
 
+      console.log('getImpersonatedAddress', impersonated);
+
       if (impersonated) {
         if (impersonated.isViewOnly) {
           return impersonated.address;