fix: not connected accounts on evm instance return empty array instea…

…d of null
rango-exchange · Dec 21, 2024 · f5eadf8 · f5eadf8
1 parent fed9b28
commit f5eadf8
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/wallets/core/src/namespaces/evm/actions.ts b/wallets/core/src/namespaces/evm/actions.ts
@@ -70,19 +70,23 @@ export function changeAccountSubscriber(
       const [, setState] = context.state();
 
       eventCallback = async (accounts) => {
-        const chainId = await evmInstance.request({ method: 'eth_chainId' });
-
-        const formatAccounts = accounts.map((account) =>
-          AccountId.format({
-            address: account,
-            chainId: {
-              namespace: CAIP_NAMESPACE,
-              reference: chainId,
-            },
-          })
-        );
-
-        setState('accounts', formatAccounts);
+        // Phantom's intance on switching account to a not-connected account, will return empty array.
+        if (!accounts || accounts.length === 0) {
+          setState('accounts', null);
+        } else {
+          const chainId = await evmInstance.request({ method: 'eth_chainId' });
+          const formatAccounts = accounts.map((account) =>
+            AccountId.format({
+              address: account,
+              chainId: {
+                namespace: CAIP_NAMESPACE,
+                reference: chainId,
+              },
+            })
+          );
+
+          setState('accounts', formatAccounts);
+        }
       };
       evmInstance.on('accountsChanged', eventCallback);
     },