@abstraxn/signer-react 3.3.9 → 4.0.0

package/dist/src/walletConnectMobile.js

@@ -569,19 +569,57 @@ export function clearWalletConnectPendingState(provider) {
         // ignore
     }
 }
+/** EIP-1193 4001 / WC 5000 (and common message shapes). */
+export function isUserRejectionError(error) {
+    const walk = (err, depth = 0) => {
+        if (err == null || depth > 8)
+            return false;
+        if (typeof err === "string") {
+            return /user rejected|rejected by user|user denied|denied transaction|request rejected|cancelled by user/i.test(err);
+        }
+        if (typeof err !== "object")
+            return false;
+        const e = err;
+        if (e.code === 4001 || e.code === 5000 || e.code === "4001" || e.code === "ACTION_REJECTED") {
+            return true;
+        }
+        if (typeof e.name === "string" && /UserRejected/i.test(e.name))
+            return true;
+        const msg = `${e.message ?? ""} ${e.shortMessage ?? ""}`;
+        if (/user rejected|rejected by user|user denied|denied transaction|request rejected|user cancelled|user canceled/i.test(msg)) {
+            return true;
+        }
+        return walk(e.cause, depth + 1);
+    };
+    return walk(error);
+}
+export function toUserRejectionError(error) {
+    if (error instanceof Error && isUserRejectionError(error)) {
+        const err = new Error("User rejected the request");
+        err.code = 4001;
+        err.cause = error;
+        return err;
+    }
+    const err = new Error("User rejected the request");
+    err.code = 4001;
+    if (error !== undefined)
+        err.cause = error;
+    return err;
+}
 /**
- * When WalletConnect never returns eth_sendTransaction after MetaMask approve,
- * scan recent blocks for a matching outgoing tx (from/to + optional calldata prefix).
+ * Success-only recovery: find an on-chain hash when WC never returns one.
+ * Does not infer reject (that is handled by relay resume + reject fallback).
  */
 export async function pollForOutgoingTx(params) {
-    const { publicClient, from, to, dataPrefix, value, startBlock, signal, timeoutMs = 90_000, initialDelayMs = 10_000, } = params;
+    const { publicClient, from, to, dataPrefix, value, startBlock, signal, timeoutMs = 60_000, initialDelayMs = 1_000, } = params;
+    await waitUntilDocumentVisible();
+    if (signal.cancelled)
+        throw new Error("cancelled");
     if (initialDelayMs > 0) {
         await new Promise((r) => setTimeout(r, initialDelayMs));
     }
-    if (signal.cancelled) {
+    if (signal.cancelled)
         throw new Error("cancelled");
-    }
-    await waitUntilDocumentVisible();
     const fromLc = from.toLowerCase();
     const toLc = to.toLowerCase();
     const prefixLc = dataPrefix ? dataPrefix.toLowerCase() : undefined;
@@ -589,11 +627,7 @@ export async function pollForOutgoingTx(params) {
     while (!signal.cancelled && Date.now() - started < timeoutMs) {
         try {
             const latest = await publicClient.getBlockNumber();
-            const fromBlock = startBlock > 0n
-                ? startBlock
-                : latest > 12n
-                    ? latest - 12n
-                    : 0n;
+            const fromBlock = startBlock > 0n ? startBlock : latest > 12n ? latest - 12n : 0n;
             for (let b = fromBlock; b <= latest; b++) {
                 if (signal.cancelled)
                     break;
@@ -609,7 +643,8 @@ export async function pollForOutgoingTx(params) {
                         continue;
                     if (String(tx.to || "").toLowerCase() !== toLc)
                         continue;
-                    if (value !== undefined && BigInt(tx.value ?? 0) !== value) {
+                    if (value !== undefined &&
+                        BigInt(tx.value ?? 0) !== value) {
                         continue;
                     }
                     if (prefixLc) {
@@ -625,11 +660,83 @@ export async function pollForOutgoingTx(params) {
             }
         }
         catch {
-            // RPC blip — keep polling
+            // RPC blip
         }
         await new Promise((r) => setTimeout(r, 2_000));
     }
-    throw new Error("No WalletConnect response and no matching on-chain transaction found. If MetaMask showed confirmed, refresh and check the explorer.");
+    // Stay pending until cancelled — reject UX is owned by the approval race.
+    if (signal.cancelled)
+        throw new Error("cancelled");
+    await new Promise(() => { });
+    throw new Error("cancelled");
+}
+/** Time-bounded force-resume (must not hang on transportOpen). */
+export async function forceResumeWalletConnectOnReturn(provider, timeoutMs = 1_500) {
+    if (!provider)
+        return;
+    try {
+        provider[NEEDS_RESUME_FLAG] = true;
+        await Promise.race([
+            resumeWalletConnectRelayer(provider, { force: true }),
+            new Promise((resolve) => setTimeout(resolve, timeoutMs)),
+        ]);
+    }
+    catch {
+        // best-effort
+    }
+}
+async function readPendingNonce(provider) {
+    try {
+        const accounts = provider?.accounts ||
+            provider?.session?.namespaces?.eip155?.accounts?.map((a) => a.includes(":") ? a.split(":").pop() : a) ||
+            [];
+        const address = accounts[0];
+        if (!address || typeof provider.request !== "function")
+            return null;
+        // Use unbound original if patched — readPendingNonce is called from
+        // inside the patch with the live provider; eth_getTransactionCount is
+        // not an approval method so the patch forwards it.
+        const hex = await provider.request({
+            method: "eth_getTransactionCount",
+            params: [address, "pending"],
+        });
+        return typeof hex === "string" ? parseInt(hex, 16) : Number(hex);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Prefer WC delivering real approve/reject after return (docs: respondSessionRequest).
+ * If still pending with no nonce bump → EIP-1193-style user rejection.
+ * If nonce moved → do not fake reject (let success hash arrive via WC or poll).
+ */
+async function raceApprovalWithResumeAndRejectFallback(resultPromise, provider, startNonce) {
+    const normalizedResult = resultPromise.then((v) => v, (err) => {
+        if (isUserRejectionError(err))
+            throw toUserRejectionError(err);
+        throw err;
+    });
+    const rejectFallback = (async () => {
+        await waitUntilDocumentVisible();
+        await forceResumeWalletConnectOnReturn(provider, 1_500);
+        await new Promise((r) => setTimeout(r, 400));
+        await forceResumeWalletConnectOnReturn(provider, 1_500);
+        // Window for MetaMask's real JSON-RPC reject/hash after resume.
+        await new Promise((r) => setTimeout(r, 5_000));
+        if (!hasPendingWalletConnectApproval(provider)) {
+            return await new Promise(() => { });
+        }
+        const currentNonce = await readPendingNonce(provider);
+        if (startNonce != null &&
+            currentNonce != null &&
+            currentNonce > startNonce) {
+            // Tx submitted — confirmation path owns this.
+            return await new Promise(() => { });
+        }
+        throw toUserRejectionError();
+    })();
+    return await Promise.race([normalizedResult, rejectFallback]);
 }
 function getRequestMethod(args) {
     const payload = args[0];
@@ -661,7 +768,10 @@ export function patchWalletConnectProviderForMobile(provider) {
         }
         if (!isApproval && wasBackgrounded) {
             try {
-                await resumeWalletConnectRelayer(provider, { force: true });
+                await Promise.race([
+                    resumeWalletConnectRelayer(provider, { force: true }),
+                    new Promise((resolve) => setTimeout(resolve, 1_500)),
+                ]);
             }
             finally {
                 provider[NEEDS_RESUME_FLAG] = false;
@@ -669,10 +779,10 @@ export function patchWalletConnectProviderForMobile(provider) {
             return originalRequest(...args);
         }
         let cancelDeeplinks;
+        let startNonce = null;
         if (isApproval) {
             provider[PENDING_FLAG] = (provider[PENDING_FLAG] || 0) + 1;
-            // Already connected: never re-open "All Wallets". Only restore modal
-            // during connect (no session yet).
+            startNonce = await readPendingNonce(provider);
             if (hasActiveWalletConnectSession(provider)) {
                 hideWalletConnectModal(provider);
             }
@@ -680,29 +790,24 @@ export function patchWalletConnectProviderForMobile(provider) {
                 restoreWalletConnectModal();
             }
             syncWalletConnectDappRedirect(provider);
-            // Mark before deeplink so a fast backgrounding still triggers force-resume.
             provider[NEEDS_RESUME_FLAG] = true;
         }
         try {
-            // Never force-restart right before sending a new tx — that is what
-            // blocked the MetaMask popup on Create Proposal after 3.3.7.
             await Promise.race([
                 resumeWalletConnectRelayer(provider, { force: false }),
                 new Promise((resolve) => setTimeout(resolve, 1000)),
             ]);
             const resultPromise = originalRequest(...args);
             if (isApproval) {
-                // Do NOT auto-deeplink when a session already exists.
-                // WC ethereum-provider already opens the peer wallet; our extra
-                // metamask:// calls queue iOS "Open in MetaMask?" dialogs that stay
-                // on screen after the tx is confirmed (JS cannot dismiss them).
-                // Connect flow (no session) may still use a single scheduled open.
                 if (!hasActiveWalletConnectSession(provider)) {
                     cancelDeeplinks = scheduleOpenConnectedWalletApp(provider);
                 }
                 else {
                     hideWalletConnectModal(provider);
                 }
+                if (isMobileDevice()) {
+                    return await raceApprovalWithResumeAndRejectFallback(resultPromise, provider, startNonce);
+                }
             }
             return await resultPromise;
         }
@@ -711,7 +816,6 @@ export function patchWalletConnectProviderForMobile(provider) {
             if (isApproval) {
                 provider[PENDING_FLAG] = Math.max(0, (provider[PENDING_FLAG] || 1) - 1);
                 provider.__abstraxnWcDeeplinkOpened = false;
-                // Close picker that may have been left open after approve/reject.
                 hideWalletConnectModal(provider);
                 if (!hasPendingWalletConnectApproval(provider)) {
                     provider[NEEDS_RESUME_FLAG] = false;
@@ -721,8 +825,8 @@ export function patchWalletConnectProviderForMobile(provider) {
     };
 }
 /**
- * When the dapp tab is shown again (user left MetaMask), restart the relay so
- * the pending WalletConnect response can be received.
+ * When the dapp tab is shown again, restart the relay so pending
+ * approve/reject responses can be delivered (WalletConnect mobile linking).
  */
 export function subscribeWalletConnectForegroundResume(provider) {
     if (typeof window === "undefined" || !provider)
@@ -732,35 +836,32 @@ export function subscribeWalletConnectForegroundResume(provider) {
         timers.splice(0).forEach((t) => clearTimeout(t));
         const pending = hasPendingWalletConnectApproval(provider);
         const needsResume = pending || !!provider[NEEDS_RESUME_FLAG];
-        // Do not restart after connect-only backgrounding — that broke the next
-        // session_request so MetaMask never opened for Create Proposal.
         if (!needsResume) {
             clearWalletReturnIfSameDocument();
             return;
         }
-        // iOS often reports "visible" before networking is ready; retry force-resume.
-        const delays = [50, 300, 1000, 2000, 4000];
-        delays.forEach((ms) => {
-            timers.push(setTimeout(() => {
-                if (!hasPendingWalletConnectApproval(provider) &&
-                    !provider[NEEDS_RESUME_FLAG]) {
-                    return;
-                }
-                clearWalletReturnIfSameDocument();
-                void resumeWalletConnectRelayer(provider, { force: true }).then(() => {
-                    if (!hasPendingWalletConnectApproval(provider)) {
-                        provider[NEEDS_RESUME_FLAG] = false;
-                        hideWalletConnectModal(provider);
-                    }
-                });
-                // Do not restoreWalletConnectModal here — that reopens "All Wallets".
-                if (!hasActiveWalletConnectSession(provider)) {
-                    restoreWalletConnectModal();
-                }
-                else {
+        const run = () => {
+            if (!hasPendingWalletConnectApproval(provider) &&
+                !provider[NEEDS_RESUME_FLAG]) {
+                return;
+            }
+            clearWalletReturnIfSameDocument();
+            void forceResumeWalletConnectOnReturn(provider, 1_500).then(() => {
+                if (!hasPendingWalletConnectApproval(provider)) {
+                    provider[NEEDS_RESUME_FLAG] = false;
                     hideWalletConnectModal(provider);
                 }
-            }, ms));
+            });
+            if (!hasActiveWalletConnectSession(provider)) {
+                restoreWalletConnectModal();
+            }
+            else {
+                hideWalletConnectModal(provider);
+            }
+        };
+        run();
+        [800, 2_000].forEach((ms) => {
+            timers.push(setTimeout(run, ms));
         });
     };
     const onVisibility = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abstraxn/signer-react",
-  "version": "3.3.9",
+  "version": "4.0.0",
   "description": "React SDK for Abstraxn Wallet - React components, hooks, and providers for seamless Web3 wallet integration",
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",
@@ -25,7 +25,8 @@
     "Wallet Provider"
   ],
   "scripts": {
-    "build": "rimraf dist && tsc && cp -r src/components/OnboardingUI/*.css dist/src/components/OnboardingUI/ 2>/dev/null || true && cp src/*.css dist/src/ 2>/dev/null || true && mkdir -p dist/src/components/WalletModal/components && cp src/components/WalletModal/components/*.css dist/src/components/WalletModal/components/ 2>/dev/null || true"
+    "build": "rimraf dist && tsc && node scripts/build-css-modules.mjs && cp -r src/components/OnboardingUI/*.css dist/src/components/OnboardingUI/ 2>/dev/null || true && cp src/*.css dist/src/ 2>/dev/null || true && mkdir -p dist/src/components/WalletModal/components && cp src/components/WalletModal/components/*.css dist/src/components/WalletModal/components/ 2>/dev/null || true",
+    "test": "vitest run"
   },
   "author": "Team Abstraxn <developer@abstraxn.com> (https://www.abstraxn.com/)",
   "license": "MIT",
@@ -40,7 +41,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@abstraxn/signer-core": "2.1.4",
+    "@abstraxn/signer-core": "^2.2.0",
     "@abstraxn/solana-relayer": "^1.1.0",
     "@solana/wallet-adapter-base": "^0.9.27",
     "@solana/wallet-adapter-react": "^0.15.39",
@@ -57,11 +58,15 @@
   },
   "devDependencies": {
     "@tanstack/react-query": "^5.90.16",
+    "@testing-library/jest-dom": "^7.0.1",
+    "@testing-library/react": "^16.3.2",
     "@types/node": "^25.0.3",
     "@types/react": ">=18.2.0",
     "@types/react-dom": ">=18.2.0",
+    "jsdom": "^29.1.1",
     "rimraf": "^6.1.2",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.11"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.90.16",