@dubsdotapp/expo 0.2.27 → 0.2.28

package/dist/index.d.mts

@@ -562,16 +562,6 @@ interface MwaAdapterConfig {
 /**
  * Mobile Wallet Adapter implementation.
  * Wraps @solana-mobile/mobile-wallet-adapter-protocol-web3js.
- *
- * Usage:
- * ```ts
- * import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
- *
- * const adapter = new MwaWalletAdapter({
- *   transact,
- *   appIdentity: { name: 'My App' },
- * });
- * ```
  */
 declare class MwaWalletAdapter implements WalletAdapter {
     private _publicKey;
@@ -588,6 +578,8 @@ declare class MwaWalletAdapter implements WalletAdapter {
     setAuthToken(token: string | null): void;
     /**
      * 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.
      */
     connect(): Promise<void>;
     /**
@@ -597,6 +589,7 @@ declare class MwaWalletAdapter implements WalletAdapter {
     signTransaction(transaction: Transaction): Promise<Transaction>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
     signAndSendTransaction(transaction: Transaction): Promise<string>;
+    private applyAuthResult;
 }
 
 /** Serializable session state — save this to restore without a deeplink round-trip. */

package/dist/index.d.ts

@@ -562,16 +562,6 @@ interface MwaAdapterConfig {
 /**
  * Mobile Wallet Adapter implementation.
  * Wraps @solana-mobile/mobile-wallet-adapter-protocol-web3js.
- *
- * Usage:
- * ```ts
- * import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
- *
- * const adapter = new MwaWalletAdapter({
- *   transact,
- *   appIdentity: { name: 'My App' },
- * });
- * ```
  */
 declare class MwaWalletAdapter implements WalletAdapter {
     private _publicKey;
@@ -588,6 +578,8 @@ declare class MwaWalletAdapter implements WalletAdapter {
     setAuthToken(token: string | null): void;
     /**
      * 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.
      */
     connect(): Promise<void>;
     /**
@@ -597,6 +589,7 @@ declare class MwaWalletAdapter implements WalletAdapter {
     signTransaction(transaction: Transaction): Promise<Transaction>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
     signAndSendTransaction(transaction: Transaction): Promise<string>;
+    private applyAuthResult;
 }
 
 /** Serializable session state — save this to restore without a deeplink round-trip. */

package/dist/index.js

@@ -596,32 +596,29 @@ var MwaWalletAdapter = class {
   }
   /**
    * 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);
     });
   }
   /**
@@ -638,8 +635,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]
       });
@@ -651,9 +647,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]
@@ -666,8 +660,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]
       });
@@ -678,6 +671,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
@@ -1379,7 +1379,7 @@ function ManagedWalletProvider({
           }
           return transactRef.current(...args);
         },
-        appIdentity: { name: appName },
+        appIdentity: { name: appName, uri: appUrl },
         cluster,
         onAuthTokenChange: (token) => {
           if (token) {