Merge pull request #227 from skip-mev/fix/sync-solana-wallets

fix: sync solana wallets
skip-mev · Mar 26, 2024 · 2f08dfa · 2f08dfa
2 parents 75f140d + be4b276
commit 2f08dfa
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/components/SwapWidget/useSwapWidget.ts b/src/components/SwapWidget/useSwapWidget.ts
@@ -646,10 +646,18 @@ export function useSwapWidget() {
           }
         }
         if (srcChain && srcChain.chainType === "svm") {
-          const solanaWallet = wallets.find((w) => w.adapter.name === srcTrack?.walletName);
+          let wallet: (typeof wallets)[number] | undefined;
+          if (srcTrack?.chainType === "svm") {
+            wallet = wallets.find((w) => w.adapter.name === srcTrack?.walletName);
+          } else if (dstTrack?.chainType === "svm") {
+            wallet = wallets.find((w) => w.adapter.name === dstTrack?.walletName);
+          } else {
+            wallet = wallets.find((w) => w.adapter.connected);
+          }
 
-          if (solanaWallet?.adapter.connected) {
-            trackWallet.track("source", srcChain.chainID, solanaWallet.adapter.name, srcChain.chainType);
+          if (wallet) {
+            wallet.adapter.connect();
+            trackWallet.track("source", srcChain.chainID, wallet.adapter.name, srcChain.chainType);
           } else {
             trackWallet.untrack("source");
           }
@@ -717,10 +725,18 @@ export function useSwapWidget() {
           }
         }
         if (dstChain && dstChain.chainType === "svm") {
-          const solanaWallet = wallets.find((w) => w.adapter.name === srcTrack?.walletName);
+          let wallet: (typeof wallets)[number] | undefined;
+          if (dstTrack?.chainType === "svm") {
+            wallet = wallets.find((w) => w.adapter.name === dstTrack?.walletName);
+          } else if (srcTrack?.chainType === "svm") {
+            wallet = wallets.find((w) => w.adapter.name === srcTrack?.walletName);
+          } else {
+            wallet = wallets.find((w) => w.adapter.connected);
+          }
 
-          if (solanaWallet?.adapter.connected) {
-            trackWallet.track("destination", dstChain.chainID, solanaWallet.adapter.name, dstChain.chainType);
+          if (wallet) {
+            wallet.adapter.connect();
+            trackWallet.track("destination", dstChain.chainID, wallet.adapter.name, dstChain.chainType);
           } else {
             trackWallet.untrack("destination");
           }
@@ -731,7 +747,7 @@ export function useSwapWidget() {
         fireImmediately: true,
       },
     );
-  }, [connector, evmChain, getWalletRepo, srcChain, switchNetworkAsync]);
+  }, [connector, disconnect, evmChain, getWalletRepo, srcChain, switchNetworkAsync, wallets]);
 
   /**
    * sync destination chain wallet connections on track wallet level

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -31,6 +31,7 @@ export default function App({ Component, pageProps }: AppProps) {
       <WalletProvider
         wallets={solanaWallets}
         localStorageKey="solana-wallet"
+        autoConnect
       >
         <ChainProvider
           assetLists={assets}