@dubsdotapp/expo 0.2.13 → 0.2.15

package/dist/index.mjs

@@ -1155,6 +1155,31 @@ var styles = StyleSheet.create({
 // src/managed-wallet.tsx
 import { Fragment, jsx as jsx2 } from "react/jsx-runtime";
 var TAG3 = "[Dubs:ManagedWallet]";
+var phantomSingleton = null;
+function getOrCreatePhantomAdapter(config) {
+  if (!phantomSingleton) {
+    console.log(TAG3, "Creating PhantomDeeplinkAdapter (singleton)");
+    phantomSingleton = new PhantomDeeplinkAdapter({
+      redirectUri: config.redirectUri,
+      appUrl: config.appUrl,
+      cluster: config.cluster,
+      onSessionChange: (session) => {
+        if (session) {
+          console.log(TAG3, "Phantom session changed \u2014 saving to storage, wallet:", session.walletPublicKey);
+          config.storage.setItem(STORAGE_KEYS.PHANTOM_SESSION, JSON.stringify(session)).catch((err) => {
+            console.log(TAG3, "Failed to save Phantom session:", err);
+          });
+        } else {
+          console.log(TAG3, "Phantom session cleared \u2014 removing from storage");
+          config.storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch((err) => {
+            console.log(TAG3, "Failed to delete Phantom session:", err);
+          });
+        }
+      }
+    });
+  }
+  return phantomSingleton;
+}
 var DisconnectContext = createContext(null);
 function useDisconnect() {
   return useContext(DisconnectContext);
@@ -1181,24 +1206,11 @@ function ManagedWalletProvider({
   const transactRef = useRef(null);
   if (!adapterRef.current) {
     if (usePhantom) {
-      console.log(TAG3, "Creating PhantomDeeplinkAdapter");
-      adapterRef.current = new PhantomDeeplinkAdapter({
+      adapterRef.current = getOrCreatePhantomAdapter({
         redirectUri,
         appUrl,
         cluster,
-        onSessionChange: (session) => {
-          if (session) {
-            console.log(TAG3, "Phantom session changed \u2014 saving to storage, wallet:", session.walletPublicKey);
-            storage.setItem(STORAGE_KEYS.PHANTOM_SESSION, JSON.stringify(session)).catch((err) => {
-              console.log(TAG3, "Failed to save Phantom session:", err);
-            });
-          } else {
-            console.log(TAG3, "Phantom session cleared \u2014 removing from storage");
-            storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch((err) => {
-              console.log(TAG3, "Failed to delete Phantom session:", err);
-            });
-          }
-        }
+        storage
       });
     } else {
       console.log(TAG3, "Creating MwaWalletAdapter");
@@ -1230,22 +1242,21 @@ function ManagedWalletProvider({
     let cancelled = false;
     (async () => {
       if (usePhantom) {
-        console.log(TAG3, "Phantom path \u2014 checking for saved session...");
-        try {
-          const savedJson = await storage.getItem(STORAGE_KEYS.PHANTOM_SESSION);
-          if (savedJson && !cancelled) {
-            console.log(TAG3, "Found saved Phantom session, restoring...");
-            const saved = JSON.parse(savedJson);
-            adapter.restoreSession(saved);
-            if (!cancelled) {
-              console.log(TAG3, "Session restored, marking connected");
-              setConnected(true);
-            }
-          } else {
-            console.log(TAG3, "No saved Phantom session found");
+        const phantom = adapter;
+        if (phantom.connected) {
+          console.log(TAG3, "Phantom adapter already connected, skipping restore");
+          if (!cancelled) {
+            setConnected(true);
+            setIsReady(true);
           }
+          return;
+        }
+        console.log(TAG3, "Phantom path \u2014 clearing any saved session, will require fresh connect");
+        await storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch(() => {
+        });
+        try {
         } catch (err) {
-          console.log(TAG3, "Failed to restore Phantom session:", err instanceof Error ? err.message : err);
+          console.log(TAG3, "Unexpected error during Phantom init:", err instanceof Error ? err.message : err);
         } finally {
           if (!cancelled) {
             console.log(TAG3, "Phantom init complete, marking ready");
@@ -1308,6 +1319,12 @@ function ManagedWalletProvider({
   const disconnect = useCallback(async () => {
     console.log(TAG3, "disconnect() \u2014 clearing all state");
     adapter.disconnect?.();
+    if (usePhantom && phantomSingleton) {
+      console.log(TAG3, "Destroying Phantom singleton");
+      phantomSingleton.destroy();
+      phantomSingleton = null;
+      adapterRef.current = null;
+    }
     await storage.deleteItem(STORAGE_KEYS.MWA_AUTH_TOKEN).catch(() => {
     });
     await storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch(() => {
@@ -1316,15 +1333,7 @@ function ManagedWalletProvider({
     });
     setConnected(false);
     console.log(TAG3, "disconnect() \u2014 done");
-  }, [adapter, storage]);
-  useEffect(() => {
-    return () => {
-      if (usePhantom && adapter && "destroy" in adapter) {
-        console.log(TAG3, "Unmounting \u2014 destroying Phantom adapter");
-        adapter.destroy();
-      }
-    };
-  }, [adapter, usePhantom]);
+  }, [adapter, storage, usePhantom]);
   if (!isReady) {
     console.log(TAG3, "Not ready yet \u2014 rendering null");
     return null;