fix: resolve issue with connecting to solana namespace

rango-exchange · Jan 29, 2025 · 1bde858 · 1bde858
1 parent 74179d2
commit 1bde858
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/wallets/shared/src/helpers.ts b/wallets/shared/src/helpers.ts
@@ -146,10 +146,15 @@ export const evmChainsToRpcMap = (
 };
 
 export const getSolanaAccounts: Connect = async ({ instance }) => {
-  // Asking for account from wallet.
-  const solanaResponse = await instance.connect();
+  let account = '';
+  if (instance.isConnected && instance.publicKey) {
+    account = instance.publicKey.toString();
+  } else {
+    // Asking for account from wallet if not connected or no public key available.
+    const solanaResponse = await instance.connect();
+    account = solanaResponse.publicKey.toString();
+  }
 
-  const account = solanaResponse.publicKey.toString();
   return {
     accounts: [account],
     chainId: Networks.SOLANA,