@dubsdotapp/expo 0.2.27 → 0.2.29

package/dist/index.mjs

@@ -455,6 +455,7 @@ var DubsClient = class {
 // src/storage.ts
 var STORAGE_KEYS = {
   MWA_AUTH_TOKEN: "dubs_mwa_auth_token",
+  MWA_WALLET_ADDRESS: "dubs_mwa_wallet_address",
   JWT_TOKEN: "dubs_jwt_token",
   PHANTOM_SESSION: "dubs_phantom_session",
   PHANTOM_CONNECT_IN_FLIGHT: "dubs_phantom_connect_in_flight"
@@ -528,34 +529,41 @@ var MwaWalletAdapter = class {
   setAuthToken(token) {
     this._authToken = token;
   }
+  /**
+   * Restore a previous session silently (no wallet interaction).
+   * Sets the public key and auth token so the adapter appears connected.
+   * The next signing operation will reauthorize with Phantom.
+   */
+  restoreSession(token, walletAddressBase58) {
+    this._authToken = token;
+    this._publicKey = new PublicKey(walletAddressBase58);
+    this._connected = true;
+  }
   /**
    * Connect to a mobile wallet. Call this before any signing.
+   * Tries reauthorize first (if we have a saved token), then falls back to
+   * a fresh authorize in a SEPARATE transact session.
    */
   async connect() {
-    await this.transact(async (wallet) => {
-      let authResult;
-      if (this._authToken) {
-        try {
-          authResult = await wallet.reauthorize({ auth_token: this._authToken });
-        } catch {
-          console.log("[Dubs:MWA] reauthorize failed, falling back to authorize");
-          this._authToken = null;
-          authResult = await wallet.authorize({
-            identity: this.config.appIdentity,
-            cluster: this.config.cluster || "mainnet-beta"
-          });
-        }
-      } else {
-        authResult = await wallet.authorize({
-          identity: this.config.appIdentity,
-          cluster: this.config.cluster || "mainnet-beta"
+    if (this._authToken) {
+      try {
+        await this.transact(async (wallet) => {
+          const authResult = await wallet.reauthorize({ auth_token: this._authToken });
+          this.applyAuthResult(authResult);
         });
+        return;
+      } catch {
+        console.log("[Dubs:MWA] reauthorize failed, clearing token and doing fresh authorize");
+        this._authToken = null;
+        this.config.onAuthTokenChange?.(null);
       }
-      this._mwaAddress = authResult.accounts[0].address;
-      this._publicKey = toPublicKey(this._mwaAddress);
-      this._authToken = authResult.auth_token;
-      this._connected = true;
-      this.config.onAuthTokenChange?.(this._authToken);
+    }
+    await this.transact(async (wallet) => {
+      const authResult = await wallet.authorize({
+        identity: this.config.appIdentity,
+        cluster: this.config.cluster || "mainnet-beta"
+      });
+      this.applyAuthResult(authResult);
     });
   }
   /**
@@ -572,8 +580,7 @@ var MwaWalletAdapter = class {
     if (!this._connected) throw new Error("Wallet not connected");
     const signed = await this.transact(async (wallet) => {
       const reauth = await wallet.reauthorize({ auth_token: this._authToken });
-      this._authToken = reauth.auth_token;
-      this.config.onAuthTokenChange?.(this._authToken);
+      this.applyAuthResult(reauth);
       const result = await wallet.signTransactions({
         transactions: [transaction]
       });
@@ -585,9 +592,7 @@ var MwaWalletAdapter = class {
     if (!this._connected || !this._publicKey) throw new Error("Wallet not connected");
     const sig = await this.transact(async (wallet) => {
       const reauth = await wallet.reauthorize({ auth_token: this._authToken });
-      this._authToken = reauth.auth_token;
-      this._mwaAddress = reauth.accounts[0].address;
-      this.config.onAuthTokenChange?.(this._authToken);
+      this.applyAuthResult(reauth);
       const result = await wallet.signMessages({
         addresses: [reauth.accounts[0].address],
         payloads: [message]
@@ -600,8 +605,7 @@ var MwaWalletAdapter = class {
     if (!this._connected) throw new Error("Wallet not connected");
     const signature = await this.transact(async (wallet) => {
       const reauth = await wallet.reauthorize({ auth_token: this._authToken });
-      this._authToken = reauth.auth_token;
-      this.config.onAuthTokenChange?.(this._authToken);
+      this.applyAuthResult(reauth);
       const result = await wallet.signAndSendTransactions({
         transactions: [transaction]
       });
@@ -612,6 +616,13 @@ var MwaWalletAdapter = class {
     }
     return String(signature);
   }
+  applyAuthResult(authResult) {
+    this._mwaAddress = authResult.accounts[0].address;
+    this._publicKey = toPublicKey(this._mwaAddress);
+    this._authToken = authResult.auth_token;
+    this._connected = true;
+    this.config.onAuthTokenChange?.(this._authToken);
+  }
 };
 
 // src/wallet/phantom-deeplink/phantom-deeplink-adapter.ts
@@ -1320,7 +1331,7 @@ function ManagedWalletProvider({
           }
           return transactRef.current(...args);
         },
-        appIdentity: { name: appName },
+        appIdentity: { name: appName, uri: appUrl },
         cluster,
         onAuthTokenChange: (token) => {
           if (token) {
@@ -1398,19 +1409,20 @@ function ManagedWalletProvider({
         }
         try {
           const savedToken = await storage.getItem(STORAGE_KEYS.MWA_AUTH_TOKEN);
-          if (savedToken && !cancelled) {
-            console.log(TAG3, "Found saved MWA auth token, reconnecting...");
-            adapter.setAuthToken(savedToken);
-            await adapter.connect();
-            if (!cancelled) {
-              console.log(TAG3, "MWA reconnected from saved token");
-              setConnected(true);
-            }
+          const savedAddress = await storage.getItem(STORAGE_KEYS.MWA_WALLET_ADDRESS);
+          if (savedToken && savedAddress && !cancelled) {
+            console.log(TAG3, "Found saved MWA session, restoring silently for wallet:", savedAddress);
+            adapter.restoreSession(savedToken, savedAddress);
+            setConnected(true);
           } else {
-            console.log(TAG3, "No saved MWA auth token");
+            console.log(TAG3, "No saved MWA session (token or address missing)");
           }
         } catch (err) {
-          console.log(TAG3, "MWA silent reconnect failed:", err instanceof Error ? err.message : err);
+          console.log(TAG3, "MWA session restore failed:", err instanceof Error ? err.message : err);
+          await storage.deleteItem(STORAGE_KEYS.MWA_AUTH_TOKEN).catch(() => {
+          });
+          await storage.deleteItem(STORAGE_KEYS.MWA_WALLET_ADDRESS).catch(() => {
+          });
         } finally {
           if (!cancelled) {
             console.log(TAG3, "MWA init complete, marking ready");
@@ -1429,7 +1441,12 @@ function ManagedWalletProvider({
     setError(null);
     try {
       await adapter.connect();
-      console.log(TAG3, "handleConnect() \u2014 success, wallet:", adapter.publicKey?.toBase58());
+      const walletAddress = adapter.publicKey?.toBase58();
+      console.log(TAG3, "handleConnect() \u2014 success, wallet:", walletAddress);
+      if (!usePhantom && walletAddress) {
+        storage.setItem(STORAGE_KEYS.MWA_WALLET_ADDRESS, walletAddress).catch(() => {
+        });
+      }
       setConnected(true);
     } catch (err) {
       const message = err instanceof Error ? err.message : "Connection failed";
@@ -1438,7 +1455,7 @@ function ManagedWalletProvider({
     } finally {
       setConnecting(false);
     }
-  }, [adapter]);
+  }, [adapter, storage, usePhantom]);
   const disconnect = useCallback(async () => {
     console.log(TAG3, "disconnect() \u2014 clearing all state");
     adapter.disconnect?.();
@@ -1450,6 +1467,8 @@ function ManagedWalletProvider({
     }
     await storage.deleteItem(STORAGE_KEYS.MWA_AUTH_TOKEN).catch(() => {
     });
+    await storage.deleteItem(STORAGE_KEYS.MWA_WALLET_ADDRESS).catch(() => {
+    });
     await storage.deleteItem(STORAGE_KEYS.PHANTOM_SESSION).catch(() => {
     });
     await storage.deleteItem(STORAGE_KEYS.JWT_TOKEN).catch(() => {