@dubsdotapp/expo 0.2.13 → 0.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dubsdotapp/expo",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "React Native SDK for the Dubs betting platform",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/managed-wallet.tsx

@@ -11,6 +11,41 @@ import { STORAGE_KEYS } from './storage';
 
 const TAG = '[Dubs:ManagedWallet]';
 
+// ── Module-level Phantom adapter singleton ──
+// Persists across React remounts (e.g. when the app backgrounds to open Phantom).
+// This prevents the Linking listener from being torn down mid-flow.
+let phantomSingleton: PhantomDeeplinkAdapter | null = null;
+
+function getOrCreatePhantomAdapter(config: {
+  redirectUri: string;
+  appUrl?: string;
+  cluster: string;
+  storage: TokenStorage;
+}): PhantomDeeplinkAdapter {
+  if (!phantomSingleton) {
+    console.log(TAG, 'Creating PhantomDeeplinkAdapter (singleton)');
+    phantomSingleton = new PhantomDeeplinkAdapter({
+      redirectUri: config.redirectUri,
+      appUrl: config.appUrl,
+      cluster: config.cluster,
+      onSessionChange: (session) => {
+        if (session) {
+          console.log(TAG, 'Phantom session changed — saving to storage, wallet:', session.walletPublicKey);
+          config.storage.setItem(STORAGE_KEYS.PHANTOM_SESSION, JSON.stringify(session)).catch((err) => {
+            console.log(TAG, 'Failed to save Phantom session:', err);
+          });
+        } else {
+          console.log(TAG, 'Phantom session cleared — removing from storage');
+          config.storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch((err) => {
+            console.log(TAG, 'Failed to delete Phantom session:', err);
+          });
+        }
+      },
+    });
+  }
+  return phantomSingleton;
+}
+
 // ── Disconnect Context (internal) ──
 
 type DisconnectFn = () => Promise<void>;
@@ -60,7 +95,7 @@ export function ManagedWalletProvider({
 
   // Determine which adapter to use:
   // - iOS always uses Phantom deeplinks
-  // - Android uses MWA (default) unless redirectUri is provided and MWA is unavailable
+  // - Android uses MWA (default)
   const usePhantom = Platform.OS === 'ios' && !!redirectUri;
 
   console.log(TAG, `Platform: ${Platform.OS}, redirectUri: ${redirectUri ? 'provided' : 'not set'}, usePhantom: ${usePhantom}`);
@@ -68,27 +103,14 @@ export function ManagedWalletProvider({
   const adapterRef = useRef<WalletAdapter | null>(null);
   const transactRef = useRef<any>(null);
 
-  // Lazily create adapter
+  // Lazily create adapter — Phantom uses a module-level singleton to survive remounts
   if (!adapterRef.current) {
     if (usePhantom) {
-      console.log(TAG, 'Creating PhantomDeeplinkAdapter');
-      adapterRef.current = new PhantomDeeplinkAdapter({
+      adapterRef.current = getOrCreatePhantomAdapter({
         redirectUri: redirectUri!,
         appUrl,
         cluster,
-        onSessionChange: (session) => {
-          if (session) {
-            console.log(TAG, 'Phantom session changed — saving to storage, wallet:', session.walletPublicKey);
-            storage.setItem(STORAGE_KEYS.PHANTOM_SESSION, JSON.stringify(session)).catch((err) => {
-              console.log(TAG, 'Failed to save Phantom session:', err);
-            });
-          } else {
-            console.log(TAG, 'Phantom session cleared — removing from storage');
-            storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch((err) => {
-              console.log(TAG, 'Failed to delete Phantom session:', err);
-            });
-          }
-        },
+        storage,
       });
     } else {
       console.log(TAG, 'Creating MwaWalletAdapter');
@@ -122,24 +144,27 @@ export function ManagedWalletProvider({
 
     (async () => {
       if (usePhantom) {
-        console.log(TAG, 'Phantom path — checking for saved session...');
-        // Attempt to restore a saved Phantom session
-        try {
-          const savedJson = await storage.getItem(STORAGE_KEYS.PHANTOM_SESSION);
-          if (savedJson && !cancelled) {
-            console.log(TAG, 'Found saved Phantom session, restoring...');
-            const saved: PhantomSession = JSON.parse(savedJson);
-            (adapter as PhantomDeeplinkAdapter).restoreSession(saved);
-            if (!cancelled) {
-              console.log(TAG, 'Session restored, marking connected');
-              setConnected(true);
-            }
-          } else {
-            console.log(TAG, 'No saved Phantom session found');
+        const phantom = adapter as PhantomDeeplinkAdapter;
+
+        // If the singleton is already connected (e.g. after returning from Phantom), skip restore
+        if (phantom.connected) {
+          console.log(TAG, 'Phantom adapter already connected, skipping restore');
+          if (!cancelled) {
+            setConnected(true);
+            setIsReady(true);
           }
+          return;
+        }
+
+        // Clear any stale session — Phantom sessions don't survive across app/Phantom restarts.
+        // Always require a fresh connect to establish a valid encryption channel.
+        console.log(TAG, 'Phantom path — clearing any saved session, will require fresh connect');
+        await storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch(() => {});
+
+        try {
+          // Nothing to restore — fall through to show connect screen
         } catch (err) {
-          console.log(TAG, 'Failed to restore Phantom session:', err instanceof Error ? err.message : err);
-          // Session expired or corrupt — user will tap Connect manually
+          console.log(TAG, 'Unexpected error during Phantom init:', err instanceof Error ? err.message : err);
         } finally {
           if (!cancelled) {
             console.log(TAG, 'Phantom init complete, marking ready');
@@ -148,7 +173,6 @@ export function ManagedWalletProvider({
         }
       } else {
         console.log(TAG, 'MWA path — dynamic-importing transact...');
-        // MWA path — dynamic-import transact
         try {
           const mwa = await import('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
           if (cancelled) return;
@@ -158,7 +182,6 @@ export function ManagedWalletProvider({
           console.log(TAG, 'MWA not installed — transact will throw on use');
         }
 
-        // Attempt silent reconnect from saved auth token
         try {
           const savedToken = await storage.getItem(STORAGE_KEYS.MWA_AUTH_TOKEN);
           if (savedToken && !cancelled) {
@@ -208,22 +231,19 @@ export function ManagedWalletProvider({
   const disconnect = useCallback(async () => {
     console.log(TAG, 'disconnect() — clearing all state');
     adapter.disconnect?.();
+    // Destroy and reset the singleton so a fresh adapter is created on next connect
+    if (usePhantom && phantomSingleton) {
+      console.log(TAG, '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(() => {});
     await storage.deleteItem(STORAGE_KEYS.JWT_TOKEN).catch(() => {});
     setConnected(false);
     console.log(TAG, 'disconnect() — done');
-  }, [adapter, storage]);
-
-  // Cleanup deeplink handler on unmount
-  useEffect(() => {
-    return () => {
-      if (usePhantom && adapter && 'destroy' in adapter) {
-        console.log(TAG, 'Unmounting — destroying Phantom adapter');
-        (adapter as PhantomDeeplinkAdapter).destroy();
-      }
-    };
-  }, [adapter, usePhantom]);
+  }, [adapter, storage, usePhantom]);
 
   // Show nothing until we've attempted silent reconnect
   if (!isReady) {
@@ -234,7 +254,6 @@ export function ManagedWalletProvider({
   // Not connected — show connect screen
   if (!connected) {
     if (renderConnectScreen === false) {
-      // Headless mode — render nothing
       return null;
     }
     const connectProps: ConnectWalletScreenProps = {