Revert #960 (#1012)

* Revert "add changeset" This reverts commit aea46eb. * Revert "Allow Disconnect of MWA (#960)" This reverts commit d8632b4.
anza-xyz · Aug 24, 2024 · 3761cd8 · 3761cd8
1 parent aea46eb
commit 3761cd8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/.changeset/large-seas-play.md b/.changeset/large-seas-play.md
diff --git a/packages/core/react/src/WalletProvider.tsx b/packages/core/react/src/WalletProvider.tsx
@@ -76,14 +76,13 @@ export function WalletProvider({
         }
         return [mobileWalletAdapter, ...adaptersWithStandardAdapters];
     }, [adaptersWithStandardAdapters, mobileWalletAdapter]);
-    const [walletName, setWalletName] = useLocalStorage<WalletName | null>(localStorageKey, null);
+    const [walletName, setWalletName] = useLocalStorage<WalletName | null>(
+        localStorageKey,
+        getIsMobile(adaptersWithStandardAdapters) ? SolanaMobileWalletAdapterWalletName : null
+    );
     const adapter = useMemo(
-        () =>
-            adaptersWithMobileWalletAdapter.find((a) => a.name === walletName) ??
-            (adaptersWithMobileWalletAdapter.length === 1 && adaptersWithMobileWalletAdapter[0] === mobileWalletAdapter
-                ? mobileWalletAdapter
-                : null),
-        [adaptersWithMobileWalletAdapter, walletName, mobileWalletAdapter]
+        () => adaptersWithMobileWalletAdapter.find((a) => a.name === walletName) ?? null,
+        [adaptersWithMobileWalletAdapter, walletName]
     );
     const changeWallet = useCallback(
         (nextWalletName: WalletName<string> | null) => {
@@ -106,6 +105,8 @@ export function WalletProvider({
         if (!adapter) return;
         function handleDisconnect() {
             if (isUnloadingRef.current) return;
+            // Leave the adapter selected in the event of a disconnection.
+            if (walletName === SolanaMobileWalletAdapterWalletName && getIsMobile(adaptersWithStandardAdapters)) return;
             setWalletName(null);
         }
         adapter.on('disconnect', handleDisconnect);
@@ -149,7 +150,7 @@ export function WalletProvider({
         };
     }, [adaptersWithStandardAdapters, walletName]);
     const handleConnectError = useCallback(() => {
-        if (adapter) {
+        if (adapter && adapter.name !== SolanaMobileWalletAdapterWalletName) {
             // If any error happens while connecting, unset the adapter.
             changeWallet(null);
         }