@pooflabs/web 0.0.86 → 0.0.88

package/dist/{solana-mobile-wallet-provider-D7BbSpez.esm.js → solana-mobile-wallet-provider-C5mN8Dxh.esm.js}

@@ -1,10 +1,18 @@
-import { b as bufferExports } from './index-DKyWaxCB.esm.js';
-import { g as getPlatform, k as setAuthLoading, W as WebSessionManager, s as setCurrentUser, l as genAuthNonce, m as genSolanaMessage, n as createSessionWithSignature, d as base58, e as confirmAndCheckTransaction, c as convertRemainingAccounts, b as buildSetDocumentsTransaction, a as SOLANA_DEVNET_RPC_URL, S as SOLANA_MAINNET_RPC_URL, h as SURFNET_RPC_URL } from './index.native-BItnSD47.esm.js';
+import { b as bufferExports } from './index-DpiO7Cpe.esm.js';
+import { g as getPlatform, W as WebSessionManager, m as genAuthNonce, n as genSolanaMessage, s as setCurrentUser, o as createSessionWithSignature, l as setAuthLoading, e as confirmAndCheckTransaction, d as base58, c as convertRemainingAccounts, b as buildSetDocumentsTransaction, a as SOLANA_DEVNET_RPC_URL, S as SOLANA_MAINNET_RPC_URL, h as SURFNET_RPC_URL } from './index.native-GyqT8Dn5.esm.js';
 import { PublicKey, Connection, VersionedTransaction, VersionedMessage, Transaction } from '@solana/web3.js';
 import * as anchor from '@coral-xyz/anchor';
 import 'axios';
 import 'react';
 
+/**
+ * Storage key for persisting the MWA auth_token across cold starts.
+ * Holds JSON `{ token: string, address: string }`. Cleared by
+ * `logout()`. Hydrated by the constructor on native so cold-start
+ * doesn't force the user back into Phantom's approval flow when the
+ * underlying wallet authorization is still valid.
+ */
+const MWA_AUTH_TOKEN_STORAGE_KEY = 'tarobase_mwa_auth_token';
 const ED25519_SIGNATURE_LENGTH = 64;
 const STORED_AUTH_METHOD_KEY = 'tarobase_last_auth_method';
 const MWA_AUTH_METHOD = 'mobile-wallet-adapter';
@@ -120,13 +128,13 @@ async function withMwaAssociationRetry(fn) {
  * next tap is a new activation (a real retry). A timer-based retry would
  * just hit the same Chrome block. Cap at 3 attempts before giving up.
  */
-async function awaitSignInGestureAndSign(theme, signFn) {
+async function awaitSignInGestureAndSign(theme, signFn, noResultError = 'MWA returned no signature') {
     if (typeof document === 'undefined' || typeof window === 'undefined') {
         // SSR / non-browser: skip the gesture, just call (the activation
         // model doesn't apply outside the browser).
         const results = await signFn();
         if (!results || results.length === 0)
-            throw new Error('MWA returned no signature');
+            throw new Error(noResultError);
         return results[0];
     }
     return new Promise((resolve, reject) => {
@@ -318,7 +326,7 @@ async function awaitSignInGestureAndSign(theme, signFn) {
             // launchAssociation(). Do not `await` before calling.
             signFn().then((results) => {
                 if (!results || results.length === 0) {
-                    finishReject(new Error('MWA returned no signature'));
+                    finishReject(new Error(noResultError));
                     return;
                 }
                 finishResolve(results[0]);
@@ -346,6 +354,31 @@ async function awaitSignInGestureAndSign(theme, signFn) {
         });
     });
 }
+/**
+ * Sign through the gesture modal ONLY when transient user activation has
+ * already decayed. Fast transactions still hold the activation from the
+ * user's tap, so the `solana-wallet:` navigation succeeds directly with no
+ * modal (preserves prior UX — no extra tap). Slow transactions — e.g. a swap
+ * whose server-side build exceeds Chrome's ~5s activation window — have lost
+ * it, so we fall back to awaitSignInGestureAndSign to mint a fresh activation
+ * via a "Sign in" tap. Returns the first result (same shape as the bare
+ * wallet-standard feature call and as awaitSignInGestureAndSign).
+ */
+async function signWithFreshActivation(theme, signFn, noResultError = 'MWA returned no signature') {
+    var _a;
+    const activationLive = typeof navigator !== 'undefined' &&
+        ((_a = navigator.userActivation) === null || _a === void 0 ? void 0 : _a.isActive) === true;
+    if (activationLive) {
+        // Live gesture: invoke synchronously (no await before signFn) so the
+        // activation propagates to the protocol's location.assign navigation.
+        const results = await signFn();
+        if (!results || results.length === 0)
+            throw new Error(noResultError);
+        return results[0];
+    }
+    // Activation gone: surface the modal so the user's tap mints a fresh one.
+    return awaitSignInGestureAndSign(theme, signFn, noResultError);
+}
 /**
  * Normalize a chain string to a wallet-standard Solana chain identifier.
  *
@@ -506,19 +539,66 @@ class SolanaMobileWalletProvider {
     constructor(networkUrl = null, config = {}) {
         /** LocalSolanaMobileWalletAdapterWallet, lazy-constructed in ensureWallet(). */
         this.wallet = null;
+        /**
+         * Cached MWA auth_token returned by `wallet.authorize()`. Reused by
+         * subsequent native transact() calls (signMessage / signTransaction)
+         * so the user doesn't get the wallet-pick popup on every operation.
+         * Persisted to platform storage and hydrated by the constructor on
+         * native; cleared by logout() and on `ERROR_REAUTHORIZE`.
+         */
+        this.nativeAuthToken = null;
+        /** Cached public key string for the connected MWA wallet (native). */
+        this.nativeAddress = null;
         this.networkUrl = networkUrl;
         this.config = config;
-        if (typeof window === 'undefined') {
+        // Allow construction in true React Native environments: getPlatform().hasDOM
+        // is false there even though `typeof window === 'object'` (RN exposes a
+        // partial window global). Web/PWA paths still keep their original guard:
+        // they need real window+document for wallet-standard-mobile's deep-link
+        // mechanism, so missing-window in those builds remains a fail-fast.
+        const hasDOM = getPlatform().hasDOM;
+        if (!hasDOM && typeof window === 'undefined') {
+            throw new Error('SolanaMobileWalletProvider can only be instantiated in a browser or React Native environment');
+        }
+        if (hasDOM && typeof window === 'undefined') {
             throw new Error('SolanaMobileWalletProvider can only be instantiated in a browser environment');
         }
         if (SolanaMobileWalletProvider.instance) {
             return SolanaMobileWalletProvider.instance;
         }
+        // `appIdentity.uri` is what Phantom Android (and other MWA wallets)
+        // display in their approval modal. On web/PWA this is the page
+        // origin; on native there's no `window.location`, so fall back to
+        // a stable identifier the user can recognize. Apps can override
+        // entirely via `config.appIdentity.uri`.
+        const fallbackUri = hasDOM
+            ? getPlatform().getLocationOrigin()
+            : 'tarobase://app';
         this.appIdentity = config.appIdentity || {
             name: 'TaroBase App',
-            uri: getPlatform().getLocationOrigin(),
+            uri: fallbackUri,
         };
         this.cluster = config.cluster || 'mainnet-beta';
+        // Hydrate cached MWA auth_token from storage on native so we can
+        // skip the wallet-pick popup after a cold-start when the underlying
+        // wallet authorization is still valid. Sync storage call per the
+        // PlatformAdapter contract; safe to swallow read errors (a fresh
+        // login() just re-authorizes).
+        if (!hasDOM) {
+            try {
+                const raw = getPlatform().storage.getItem(MWA_AUTH_TOKEN_STORAGE_KEY);
+                if (raw) {
+                    const parsed = JSON.parse(raw);
+                    if (typeof parsed.token === 'string' && typeof parsed.address === 'string') {
+                        this.nativeAuthToken = parsed.token;
+                        this.nativeAddress = parsed.address;
+                    }
+                }
+            }
+            catch (_a) {
+                // Corrupt or unreadable cache — ignore. login() will re-auth.
+            }
+        }
         SolanaMobileWalletProvider.instance = this;
     }
     static getInstance(networkUrl, config) {
@@ -531,7 +611,7 @@ class SolanaMobileWalletProvider {
     async ensureWallet() {
         if (this.wallet)
             return this.wallet;
-        const mod = await import('./index.browser-DQqKPfDA.esm.js');
+        const mod = await import('./index.browser-CGZvkfTO.esm.js');
         const chain = mapChainToWalletStandard(this.cluster);
         this.wallet = new mod.LocalSolanaMobileWalletAdapterWallet({
             appIdentity: this.appIdentity,
@@ -581,6 +661,134 @@ class SolanaMobileWalletProvider {
     getChain() {
         return mapChainToWalletStandard(this.cluster);
     }
+    /**
+     * Dynamically import and unwrap `transact` from the MWA web3js
+     * package. The package is externalized in rollup.config.js so this
+     * resolves to `lib/cjs/index.native.js` (TurboModule-backed) on
+     * Metro and `lib/esm/index.browser.js` (WebSocket) on webpack/vite
+     * per their respective platform conditions. Handles Metro's CJS-to-
+     * ESM interop variance (`mod.transact` vs `mod.default?.transact`).
+     */
+    async loadTransact() {
+        var _a;
+        const mod = await import('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
+        const t = mod.transact || ((_a = mod.default) === null || _a === void 0 ? void 0 : _a.transact);
+        if (typeof t !== 'function') {
+            throw new Error('MWA transact API not available on this platform');
+        }
+        return t;
+    }
+    /**
+     * Cache and persist a fresh MWA auth_token + address. Called from
+     * `_loginNative` after a successful authorize. Storage failures are
+     * non-fatal (next cold-start re-auths).
+     */
+    persistNativeAuth(token, address) {
+        this.nativeAuthToken = token;
+        this.nativeAddress = address;
+        try {
+            getPlatform().storage.setItem(MWA_AUTH_TOKEN_STORAGE_KEY, JSON.stringify({ token, address }));
+        }
+        catch (_a) {
+            // non-fatal — token still in-memory for this process
+        }
+    }
+    /** Clear cached + persisted native auth state. */
+    clearNativeAuth() {
+        this.nativeAuthToken = null;
+        this.nativeAddress = null;
+        try {
+            getPlatform().storage.removeItem(MWA_AUTH_TOKEN_STORAGE_KEY);
+        }
+        catch (_a) {
+            // ignore
+        }
+    }
+    /**
+     * Classify an MWA-native error as a user cancellation. User-cancel
+     * shouldn't surface as a red console.error; callers can swallow or
+     * show a softer message. MWA spec codes plus the same substring
+     * checks the web path uses to catch wallet-specific phrasing.
+     */
+    isNativeUserCancel(err) {
+        var _a;
+        if (!err)
+            return false;
+        const code = err.code;
+        if (code === 'ERROR_NOT_SIGNED')
+            return true;
+        const msg = String((_a = err.message) !== null && _a !== void 0 ? _a : '').toLowerCase();
+        return /user (rejected|denied|cancelled|canceled|declined)/.test(msg);
+    }
+    /**
+     * Native MWA login via @solana-mobile/mobile-wallet-adapter-protocol-web3js.
+     * Used in true React Native (Expo) environments where wallet-standard-mobile's
+     * web universal-link path doesn't apply. Does authorize + signMessage in a
+     * single transact() roundtrip — intent-based MWA doesn't need the two-popup
+     * dance the web path uses (no Chrome activation-loss concern). Persists the
+     * resulting auth_token so cold-start can reauthorize without a fresh popup.
+     */
+    async _loginNative() {
+        const transact = await this.loadTransact();
+        const existingSession = await WebSessionManager.getSession();
+        const nonce = await genAuthNonce();
+        const result = await transact(async (wallet) => {
+            const auth = await wallet.authorize({
+                chain: this.getChain(),
+                identity: this.appIdentity,
+            });
+            if (!auth.accounts || auth.accounts.length === 0) {
+                throw new Error('MWA returned no accounts');
+            }
+            const account = auth.accounts[0];
+            // account.address is base64-encoded per MWA spec; convert to
+            // the base58 form Tarobase + the rest of the SDK use.
+            const base58Addr = new PublicKey(bufferExports.Buffer.from(account.address, 'base64')).toBase58();
+            // Reuse session if already valid for this address — skip the
+            // signMessages roundtrip entirely.
+            if (existingSession && existingSession.address === base58Addr) {
+                return {
+                    base58Addr,
+                    authToken: auth.auth_token,
+                    signatureBase64: null,
+                };
+            }
+            const messageText = await genSolanaMessage(base58Addr, nonce);
+            const messageBytes = getPlatform().textEncode(messageText);
+            const signatures = await wallet.signMessages({
+                addresses: [account.address],
+                payloads: [messageBytes],
+            });
+            if (!signatures || signatures.length === 0) {
+                throw new Error('MWA returned no signature');
+            }
+            // Per spec, signMessages returns Uint8Array[] of signatures
+            // (one per payload), not message+signature concatenations.
+            const signatureBase64 = bufferExports.Buffer.from(signatures[0]).toString('base64');
+            return {
+                base58Addr,
+                authToken: auth.auth_token,
+                signatureBase64,
+                messageText,
+            };
+        });
+        this.persistNativeAuth(result.authToken, result.base58Addr);
+        // Existing valid session — short-circuit before re-creating server-side.
+        if (existingSession && existingSession.address === result.base58Addr) {
+            const user = { provider: this, address: result.base58Addr };
+            setCurrentUser(user);
+            return user;
+        }
+        // Create Tarobase session on the server.
+        if (!result.signatureBase64 || !result.messageText) {
+            throw new Error('MWA login completed without signature');
+        }
+        const createSessionResult = await createSessionWithSignature(result.base58Addr, result.messageText, result.signatureBase64);
+        await WebSessionManager.storeSession(result.base58Addr, createSessionResult.accessToken, createSessionResult.idToken, createSessionResult.refreshToken);
+        const user = { provider: this, address: result.base58Addr };
+        setCurrentUser(user);
+        return user;
+    }
     async login() {
         var _a, _b, _c, _d, _e;
         setAuthLoading(true);
@@ -591,6 +799,13 @@ class SolanaMobileWalletProvider {
         const prevAuthMethod = readAuthMethod();
         writeAuthMethod(MWA_AUTH_METHOD);
         try {
+            // True React Native: skip the wallet-standard-mobile path (which
+            // requires window.isSecureContext and a real DOM) and use the raw
+            // MWA protocol via Android intents.
+            if (!getPlatform().hasDOM) {
+                const user = await this._loginNative();
+                return user;
+            }
             const wallet = await this.ensureWallet();
             // Quick-check: wallet may already have authorization (e.g. from a
             // previous in-page login) and a matching Tarobase session — skip
@@ -692,6 +907,29 @@ class SolanaMobileWalletProvider {
         return null;
     }
     async logout() {
+        if (!getPlatform().hasDOM) {
+            // Native path: deauthorize the cached MWA auth_token if we have
+            // one (failures non-fatal — the wallet app may have been
+            // uninstalled or the token already revoked), then clear local
+            // and persisted state.
+            const token = this.nativeAuthToken;
+            if (token) {
+                try {
+                    const transact = await this.loadTransact();
+                    await transact(async (wallet) => {
+                        await wallet.deauthorize({ auth_token: token });
+                    });
+                }
+                catch (error) {
+                    console.warn('[SolanaMobileWallet] Native deauthorize error:', error);
+                }
+            }
+            this.clearNativeAuth();
+            WebSessionManager.clearSession();
+            writeAuthMethod(null);
+            setCurrentUser(null);
+            return;
+        }
         try {
             const wallet = await this.ensureWallet();
             const disconnectFeat = getDisconnectFeature(wallet);
@@ -711,7 +949,42 @@ class SolanaMobileWalletProvider {
         setCurrentUser(null);
     }
     async signMessage(message) {
-        var _a, _b;
+        var _a, _b, _c;
+        // Native: reauthorize with cached auth_token, then signMessages inside
+        // the same transact() session. No wallet-pick popup if the auth_token
+        // is still valid for the user's wallet.
+        if (!getPlatform().hasDOM) {
+            if (!this.nativeAuthToken || !this.nativeAddress) {
+                throw new Error('Wallet not connected. Call login() first.');
+            }
+            const transact = await this.loadTransact();
+            const messageBytes = getPlatform().textEncode(message);
+            const addressBase64 = new PublicKey(this.nativeAddress).toBuffer().toString('base64');
+            const authToken = this.nativeAuthToken;
+            try {
+                const signature = await transact(async (wallet) => {
+                    await wallet.reauthorize({ auth_token: authToken, identity: this.appIdentity });
+                    const sigs = await wallet.signMessages({
+                        addresses: [addressBase64],
+                        payloads: [messageBytes],
+                    });
+                    if (!sigs || sigs.length === 0)
+                        throw new Error('MWA returned no signature');
+                    return sigs[0];
+                });
+                return bufferExports.Buffer.from(signature).toString('base64');
+            }
+            catch (error) {
+                if (this.isNativeUserCancel(error)) {
+                    throw new Error('User declined to sign');
+                }
+                if ((error === null || error === void 0 ? void 0 : error.code) === 'ERROR_AUTHORIZATION_FAILED' || (error === null || error === void 0 ? void 0 : error.code) === 'ERROR_REAUTHORIZE') {
+                    await this.logout();
+                    throw new Error('Wallet connection lost. Please reconnect.');
+                }
+                throw new Error(`Failed to sign message: ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error}`);
+            }
+        }
         const account = await this.ensureAuthorized();
         const wallet = await this.ensureWallet();
         try {
@@ -725,7 +998,7 @@ class SolanaMobileWalletProvider {
             return bufferExports.Buffer.from(sigBytes).toString('base64');
         }
         catch (error) {
-            if (((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('not connected')) || ((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.includes('not authorized')) ||
+            if (((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.includes('not connected')) || ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes('not authorized')) ||
                 (error === null || error === void 0 ? void 0 : error.code) === 'ERROR_AUTHORIZATION_FAILED') {
                 await this.logout();
                 throw new Error('Wallet connection lost. Please reconnect.');
@@ -734,7 +1007,58 @@ class SolanaMobileWalletProvider {
         }
     }
     async signTransaction(transaction) {
-        var _a, _b;
+        var _a, _b, _c;
+        // Native: fill blockhash/feePayer if missing, then signTransactions
+        // inside a transact() session keyed by the cached auth_token.
+        if (!getPlatform().hasDOM) {
+            if (!this.nativeAuthToken || !this.nativeAddress) {
+                throw new Error('Wallet not connected. Call login() first.');
+            }
+            const connectedPubkey = new PublicKey(this.nativeAddress);
+            const isLegacyTransaction = 'recentBlockhash' in transaction && !('message' in transaction && 'staticAccountKeys' in transaction.message);
+            if (isLegacyTransaction) {
+                const legacyTx = transaction;
+                if (!legacyTx.recentBlockhash) {
+                    const conn = new Connection(this.getRpcUrl(), 'confirmed');
+                    const { blockhash, lastValidBlockHeight } = await conn.getLatestBlockhash('confirmed');
+                    legacyTx.recentBlockhash = blockhash;
+                    legacyTx.lastValidBlockHeight = lastValidBlockHeight;
+                }
+                if (!legacyTx.feePayer) {
+                    legacyTx.feePayer = connectedPubkey;
+                }
+            }
+            else {
+                const versionedTx = transaction;
+                if (!versionedTx.message.recentBlockhash) {
+                    const conn = new Connection(this.getRpcUrl(), 'confirmed');
+                    const { blockhash } = await conn.getLatestBlockhash('confirmed');
+                    versionedTx.message.recentBlockhash = blockhash;
+                }
+            }
+            const transact = await this.loadTransact();
+            const authToken = this.nativeAuthToken;
+            try {
+                const signed = await transact(async (wallet) => {
+                    await wallet.reauthorize({ auth_token: authToken, identity: this.appIdentity });
+                    const results = await wallet.signTransactions({ transactions: [transaction] });
+                    if (!results || results.length === 0)
+                        throw new Error('MWA returned no signed transaction');
+                    return results[0];
+                });
+                return signed;
+            }
+            catch (error) {
+                if (this.isNativeUserCancel(error)) {
+                    throw new Error('User declined to sign');
+                }
+                if ((error === null || error === void 0 ? void 0 : error.code) === 'ERROR_AUTHORIZATION_FAILED' || (error === null || error === void 0 ? void 0 : error.code) === 'ERROR_REAUTHORIZE') {
+                    await this.logout();
+                    throw new Error('Wallet connection lost. Please reconnect.');
+                }
+                throw new Error(`Failed to sign transaction: ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error}`);
+            }
+        }
         const account = await this.ensureAuthorized();
         const connectedPubkey = new PublicKey(account.publicKey);
         const wallet = await this.ensureWallet();
@@ -765,15 +1089,14 @@ class SolanaMobileWalletProvider {
         try {
             const signTxFeat = getSignTransactionFeature(wallet);
             const wireBytes = txToWireBytes(transaction);
-            const results = await signTxFeat.signTransaction({ account, transaction: wireBytes, chain });
-            if (!results || results.length === 0) {
-                throw new Error('MWA returned no signed transaction');
-            }
-            const { signedTransaction: signedBytes } = results[0];
+            // signTransaction navigates to `solana-wallet:`; only show the
+            // gesture modal if the tap activation has decayed (see runTransaction).
+            const signResult = await signWithFreshActivation(this.config.theme, () => signTxFeat.signTransaction({ account, transaction: wireBytes, chain }), 'MWA returned no signed transaction');
+            const { signedTransaction: signedBytes } = signResult;
             return txFromWireBytes(new Uint8Array(signedBytes));
         }
         catch (error) {
-            if (((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('not connected')) || ((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.includes('not authorized')) ||
+            if (((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.includes('not connected')) || ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes('not authorized')) ||
                 (error === null || error === void 0 ? void 0 : error.code) === 'ERROR_AUTHORIZATION_FAILED') {
                 await this.logout();
                 throw new Error('Wallet connection lost. Please reconnect.');
@@ -782,7 +1105,70 @@ class SolanaMobileWalletProvider {
         }
     }
     async signAndSubmitTransaction(transaction, feePayer) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
+        // Native: signAndSendTransactions inside a transact() session.
+        // The wallet submits to its own RPC; we then await confirmation on
+        // ours. Surfnet (custom RPC) needs manual submission because the
+        // wallet won't route there — we fall back to sign-only + manual send.
+        if (!getPlatform().hasDOM) {
+            if (!this.nativeAuthToken || !this.nativeAddress) {
+                throw new Error('Wallet not connected. Call login() first.');
+            }
+            const connectedPubkey = new PublicKey(this.nativeAddress);
+            const rpcUrl = this.getRpcUrl();
+            const connection = new Connection(rpcUrl, 'confirmed');
+            const isSurfnet = rpcUrl === SURFNET_RPC_URL;
+            const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
+            const isLegacyTransaction = 'recentBlockhash' in transaction && !('message' in transaction && 'staticAccountKeys' in transaction.message);
+            if (isLegacyTransaction) {
+                const legacyTx = transaction;
+                legacyTx.recentBlockhash = blockhash;
+                legacyTx.lastValidBlockHeight = lastValidBlockHeight;
+                if (!legacyTx.feePayer)
+                    legacyTx.feePayer = feePayer !== null && feePayer !== void 0 ? feePayer : connectedPubkey;
+            }
+            else {
+                const versionedTx = transaction;
+                versionedTx.message.recentBlockhash = blockhash;
+            }
+            const transact = await this.loadTransact();
+            const authToken = this.nativeAuthToken;
+            try {
+                if (isSurfnet) {
+                    // Surfnet: sign only, submit manually to Surfnet RPC
+                    // (the wallet would route signAndSend to its own RPC).
+                    const signed = await transact(async (wallet) => {
+                        await wallet.reauthorize({ auth_token: authToken, identity: this.appIdentity });
+                        const results = await wallet.signTransactions({ transactions: [transaction] });
+                        if (!results || results.length === 0)
+                            throw new Error('MWA returned no signed transaction');
+                        return results[0];
+                    });
+                    const sig = await connection.sendRawTransaction(signed.serialize(), { preflightCommitment: 'confirmed' });
+                    await confirmAndCheckTransaction(connection, sig);
+                    return sig;
+                }
+                const sig = await transact(async (wallet) => {
+                    await wallet.reauthorize({ auth_token: authToken, identity: this.appIdentity });
+                    const results = await wallet.signAndSendTransactions({ transactions: [transaction] });
+                    if (!results || results.length === 0)
+                        throw new Error('MWA returned no signature');
+                    return results[0];
+                });
+                await confirmAndCheckTransaction(connection, sig);
+                return sig;
+            }
+            catch (error) {
+                if (this.isNativeUserCancel(error)) {
+                    throw new Error('User declined to sign');
+                }
+                if ((error === null || error === void 0 ? void 0 : error.code) === 'ERROR_AUTHORIZATION_FAILED' || (error === null || error === void 0 ? void 0 : error.code) === 'ERROR_REAUTHORIZE') {
+                    await this.logout();
+                    throw new Error('Wallet connection lost. Please reconnect.');
+                }
+                throw new Error(`Failed to sign+submit transaction: ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error}`);
+            }
+        }
         const account = await this.ensureAuthorized();
         const connectedPubkey = new PublicKey(account.publicKey);
         const wallet = await this.ensureWallet();
@@ -812,11 +1198,9 @@ class SolanaMobileWalletProvider {
                 // because the wallet would submit to its own RPC.
                 const signTxFeat = getSignTransactionFeature(wallet);
                 const wireBytes = txToWireBytes(transaction);
-                const results = await signTxFeat.signTransaction({ account, transaction: wireBytes, chain });
-                if (!results || results.length === 0) {
-                    throw new Error('MWA returned no signed transaction');
-                }
-                const { signedTransaction: signedBytes } = results[0];
+                // Gesture modal only if activation decayed (see runTransaction).
+                const signResult = await signWithFreshActivation(this.config.theme, () => signTxFeat.signTransaction({ account, transaction: wireBytes, chain }), 'MWA returned no signed transaction');
+                const { signedTransaction: signedBytes } = signResult;
                 const signedTx = txFromWireBytes(new Uint8Array(signedBytes));
                 const signature = await connection.sendRawTransaction(signedTx.serialize(), {
                     preflightCommitment: 'confirmed',
@@ -832,33 +1216,31 @@ class SolanaMobileWalletProvider {
                 return signature;
             }
             // Non-Surfnet: wallet signs and submits to its own RPC.
+            // Gesture modal only if activation decayed (see runTransaction).
             const signSendFeat = getSignAndSendTransactionFeature(wallet);
             const wireBytes = txToWireBytes(transaction);
-            const results = await signSendFeat.signAndSendTransaction({
+            const sendResult = await signWithFreshActivation(this.config.theme, () => signSendFeat.signAndSendTransaction({
                 account,
                 transaction: wireBytes,
                 chain,
                 options: { commitment: 'confirmed' },
-            });
-            if (!results || results.length === 0) {
-                throw new Error('MWA returned no signature');
-            }
-            const { signature: sigBytes } = results[0];
+            }));
+            const { signature: sigBytes } = sendResult;
             const signature = base58.encode(sigBytes);
             await confirmAndCheckTransaction(connection, signature);
             return signature;
         }
         catch (error) {
-            if (((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('not connected')) || ((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.includes('not authorized')) ||
+            if (((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.includes('not connected')) || ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes('not authorized')) ||
                 (error === null || error === void 0 ? void 0 : error.code) === 'ERROR_AUTHORIZATION_FAILED') {
                 await this.logout();
                 throw new Error('Wallet connection lost. Please reconnect.');
             }
             const isUserRejection = (error === null || error === void 0 ? void 0 : error.code) === 4001 ||
-                ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes('user rejected')) ||
-                ((_d = error === null || error === void 0 ? void 0 : error.message) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes('user denied')) ||
-                ((_e = error === null || error === void 0 ? void 0 : error.message) === null || _e === void 0 ? void 0 : _e.toLowerCase().includes('user cancelled')) ||
-                ((_f = error === null || error === void 0 ? void 0 : error.message) === null || _f === void 0 ? void 0 : _f.toLowerCase().includes('user canceled'));
+                ((_d = error === null || error === void 0 ? void 0 : error.message) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes('user rejected')) ||
+                ((_e = error === null || error === void 0 ? void 0 : error.message) === null || _e === void 0 ? void 0 : _e.toLowerCase().includes('user denied')) ||
+                ((_f = error === null || error === void 0 ? void 0 : error.message) === null || _f === void 0 ? void 0 : _f.toLowerCase().includes('user cancelled')) ||
+                ((_g = error === null || error === void 0 ? void 0 : error.message) === null || _g === void 0 ? void 0 : _g.toLowerCase().includes('user canceled'));
             if (!isUserRejection) {
                 console.error('[SolanaMobileWallet] Transaction failed:', error);
             }
@@ -923,11 +1305,13 @@ class SolanaMobileWalletProvider {
             if ((options === null || options === void 0 ? void 0 : options.shouldSubmitTx) === false) {
                 const signTxFeat = getSignTransactionFeature(wallet);
                 const wireBytes = txToWireBytes(tx);
-                const results = await signTxFeat.signTransaction({ account, transaction: wireBytes, chain });
-                if (!results || results.length === 0) {
+                // signTransaction also navigates to `solana-wallet:`; only
+                // surface the gesture modal if the tap activation has decayed.
+                const signOnlyResult = await signWithFreshActivation(this.config.theme, () => signTxFeat.signTransaction({ account, transaction: wireBytes, chain }), 'MWA returned no signed transaction');
+                if (!signOnlyResult) {
                     throw new Error('MWA returned no signed transaction');
                 }
-                const { signedTransaction: signedBytes } = results[0];
+                const { signedTransaction: signedBytes } = signOnlyResult;
                 const signedTx = txFromWireBytes(new Uint8Array(signedBytes));
                 return {
                     signedTransaction: signedTx,
@@ -940,11 +1324,13 @@ class SolanaMobileWalletProvider {
                 // Surfnet: sign locally via wallet-standard, submit manually.
                 const signTxFeat = getSignTransactionFeature(wallet);
                 const wireBytes = txToWireBytes(tx);
-                const results = await signTxFeat.signTransaction({ account, transaction: wireBytes, chain });
-                if (!results || results.length === 0) {
+                // signTransaction also navigates to `solana-wallet:`; only
+                // surface the gesture modal if the tap activation has decayed.
+                const surfnetResult = await signWithFreshActivation(this.config.theme, () => signTxFeat.signTransaction({ account, transaction: wireBytes, chain }), 'MWA returned no signed transaction');
+                if (!surfnetResult) {
                     throw new Error('MWA returned no signed transaction');
                 }
-                const { signedTransaction: signedBytes } = results[0];
+                const { signedTransaction: signedBytes } = surfnetResult;
                 const signedTx = txFromWireBytes(new Uint8Array(signedBytes));
                 const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
                 const signature = await connection.sendRawTransaction(signedTx.serialize(), {
@@ -970,18 +1356,24 @@ class SolanaMobileWalletProvider {
                 };
             }
             // Non-Surfnet: wallet signs and submits to its own RPC.
+            // signAndSendTransaction dispatches a `solana-wallet:` navigation
+            // that Chrome blocks without transient user activation. Fast txs
+            // still hold the tap activation and navigate directly; slow ones
+            // (e.g. a swap whose server build exceeds Chrome's ~5s window)
+            // have lost it, so signWithFreshActivation shows the "Sign in"
+            // modal to mint a fresh activation — no modal when not needed.
             const signSendFeat = getSignAndSendTransactionFeature(wallet);
             const wireBytes = txToWireBytes(tx);
-            const results = await signSendFeat.signAndSendTransaction({
+            const sendResult = await signWithFreshActivation(this.config.theme, () => signSendFeat.signAndSendTransaction({
                 account,
                 transaction: wireBytes,
                 chain,
                 options: { commitment: 'confirmed' },
-            });
-            if (!results || results.length === 0) {
+            }));
+            if (!sendResult) {
                 throw new Error('MWA returned no signature');
             }
-            const { signature: sigBytes } = results[0];
+            const { signature: sigBytes } = sendResult;
             const signature = base58.encode(sigBytes);
             const txInfo = await confirmAndCheckTransaction(connection, signature);
             return {
@@ -1063,4 +1455,4 @@ class SolanaMobileWalletProvider {
 SolanaMobileWalletProvider.instance = null;
 
 export { SolanaMobileWalletProvider };
-//# sourceMappingURL=solana-mobile-wallet-provider-D7BbSpez.esm.js.map
+//# sourceMappingURL=solana-mobile-wallet-provider-C5mN8Dxh.esm.js.map