From 2096c46395ed485eb1e97570a91c79566f7ae530 Mon Sep 17 00:00:00 2001 From: RyukTheCoder Date: Mon, 27 Jan 2025 11:42:39 +0000 Subject: [PATCH] fix: resolve issue with connecting to solana namespace --- wallets/shared/src/helpers.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/wallets/shared/src/helpers.ts b/wallets/shared/src/helpers.ts index 90bc296743..377e047738 100644 --- 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,