@dynamic-labs/sdk-react-core 4.88.2 → 4.88.4

package/CHANGELOG.md

@@ -1,4 +1,29 @@
 
+### [4.88.4](https://github.com/dynamic-labs/dynamic-auth/compare/v4.88.3...v4.88.4) (2026-06-10)
+
+
+### Features
+
+* **wagmi-connector:** instrument ConnectorAlreadyConnectedError to quantify SyncDynamicWagmi race DYNT-549 ([#11513](https://github.com/dynamic-labs/dynamic-auth/issues/11513)) ([00a3278](https://github.com/dynamic-labs/dynamic-auth/commit/00a3278197fc8d8442e64af7373fc4f20e4e5a69)), closes [#11131](https://github.com/dynamic-labs/dynamic-auth/issues/11131) [#11496](https://github.com/dynamic-labs/dynamic-auth/issues/11496)
+
+
+### Bug Fixes
+
+* **ci:** show unreleased changes in bump-version release review summary ([#11484](https://github.com/dynamic-labs/dynamic-auth/issues/11484)) ([3e1c3d1](https://github.com/dynamic-labs/dynamic-auth/commit/3e1c3d12d66e0d94cb430d66ccfbffe3abdbd6ba))
+* **release:** surface perf and revert commits in generated changelog ([#11507](https://github.com/dynamic-labs/dynamic-auth/issues/11507)) ([8efa0d9](https://github.com/dynamic-labs/dynamic-auth/commit/8efa0d95ab320480fcaf970a24bba35892b0fc99))
+* remediate critical shell-quote vulnerability (CVE-2026-9277) + bump @dynamic-labs-sdk/client to 1.8.1 ([#11527](https://github.com/dynamic-labs/dynamic-auth/issues/11527)) ([c056df6](https://github.com/dynamic-labs/dynamic-auth/commit/c056df653f99992c9b333078ba13651e61826ab5))
+* remediate high-severity vite vulnerability (CVE-2024-52011) ([#11509](https://github.com/dynamic-labs/dynamic-auth/issues/11509)) ([7c43b4e](https://github.com/dynamic-labs/dynamic-auth/commit/7c43b4e736c68da7de8789f1d44964778306abbf))
+* support plain EOA transactions for 7702 smart wallets via viem extension ([#11525](https://github.com/dynamic-labs/dynamic-auth/issues/11525)) ([ce8542f](https://github.com/dynamic-labs/dynamic-auth/commit/ce8542fa40b4227759bcf2ca243b4bc313018b50))
+* **wagmi-connector:** propagate external wagmi disconnect to Dynamic via handleLogOut ([#11496](https://github.com/dynamic-labs/dynamic-auth/issues/11496)) ([1b19565](https://github.com/dynamic-labs/dynamic-auth/commit/1b195657b9210da233480dda143fb92b39998962))
+
+### [4.88.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.88.2...v4.88.3) (2026-06-09)
+
+
+### Bug Fixes
+
+* **ethereum:** bump @walletconnect/ethereum-provider to 2.23.2 ([#11497](https://github.com/dynamic-labs/dynamic-auth/issues/11497)) ([fb42c38](https://github.com/dynamic-labs/dynamic-auth/commit/fb42c3877f55d2dfaa3a3a46f8178a6b4a0e55d0))
+* persist OTP verification state in sessionStorage to survive webview remounts ([#11499](https://github.com/dynamic-labs/dynamic-auth/issues/11499)) ([aa330df](https://github.com/dynamic-labs/dynamic-auth/commit/aa330dfc41e8fc81b823cce08b7c9b93588fc52c))
+
 ### [4.88.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.88.1...v4.88.2) (2026-06-06)
 
 

package/package.cjs

@@ -3,10 +3,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.88.2";
+var version = "4.88.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.1015",
-	"@dynamic-labs-sdk/client": "1.7.0",
+	"@dynamic-labs-sdk/client": "1.8.1",
 	"@dynamic-labs-wallet/browser-wallet-client": "1.0.16",
 	"@dynamic-labs-wallet/forward-mpc-client": "0.10.1",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,8 +1,8 @@
 'use client'
-var version = "4.88.2";
+var version = "4.88.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.1015",
-	"@dynamic-labs-sdk/client": "1.7.0",
+	"@dynamic-labs-sdk/client": "1.8.1",
 	"@dynamic-labs-wallet/browser-wallet-client": "1.0.16",
 	"@dynamic-labs-wallet/forward-mpc-client": "0.10.1",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.88.2",
+  "version": "4.88.4",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.1015",
-    "@dynamic-labs-sdk/client": "1.7.0",
+    "@dynamic-labs-sdk/client": "1.8.1",
     "@dynamic-labs-wallet/browser-wallet-client": "1.0.16",
     "@dynamic-labs-wallet/forward-mpc-client": "0.10.1",
     "@hcaptcha/react-hcaptcha": "1.4.4",
@@ -17,17 +17,17 @@
     "yup": "0.32.11",
     "react-international-phone": "4.5.0",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.88.2",
-    "@dynamic-labs/iconic": "4.88.2",
-    "@dynamic-labs/locale": "4.88.2",
-    "@dynamic-labs/logger": "4.88.2",
-    "@dynamic-labs/multi-wallet": "4.88.2",
-    "@dynamic-labs/rpc-providers": "4.88.2",
-    "@dynamic-labs/store": "4.88.2",
-    "@dynamic-labs/types": "4.88.2",
-    "@dynamic-labs/utils": "4.88.2",
-    "@dynamic-labs/wallet-book": "4.88.2",
-    "@dynamic-labs/wallet-connector-core": "4.88.2",
+    "@dynamic-labs/assert-package-version": "4.88.4",
+    "@dynamic-labs/iconic": "4.88.4",
+    "@dynamic-labs/locale": "4.88.4",
+    "@dynamic-labs/logger": "4.88.4",
+    "@dynamic-labs/multi-wallet": "4.88.4",
+    "@dynamic-labs/rpc-providers": "4.88.4",
+    "@dynamic-labs/store": "4.88.4",
+    "@dynamic-labs/types": "4.88.4",
+    "@dynamic-labs/utils": "4.88.4",
+    "@dynamic-labs/wallet-book": "4.88.4",
+    "@dynamic-labs/wallet-connector-core": "4.88.4",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/ConnectWithOtpContext/ConnectWithOtpProvider.cjs

@@ -89,8 +89,10 @@ require('../../utils/hooks/useWalletBackup/types.cjs');
 require('../../utils/hooks/useWalletBackup/cloudProviders.cjs');
 require('../IpConfigurationContext/IpConfigurationContext.cjs');
 var ConnectWithOtpContext = require('./ConnectWithOtpContext.cjs');
+var useRestoreOtpVerificationState = require('./hooks/useRestoreOtpVerificationState/useRestoreOtpVerificationState.cjs');
 var createEmailHandler = require('./utils/createEmailHandler.cjs');
 var createSmsHandler = require('./utils/createSmsHandler.cjs');
+var otpVerificationStorage = require('./utils/otpVerificationStorage/otpVerificationStorage.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
@@ -126,6 +128,11 @@ const ConnectWithOtpProvider = ({ children }) => {
         projectSettings,
     });
     const lastVerificationHandlerRef = React.useRef(null);
+    useRestoreOtpVerificationState.useRestoreOtpVerificationState({
+        embeddedWalletSessionKeys,
+        environmentId,
+        handlerRef: lastVerificationHandlerRef,
+    });
     const providers = (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || [];
     const mapProvider = {
         [sdkApiCore.ProviderEnum.Dynamic]: {
@@ -187,6 +194,7 @@ const ConnectWithOtpProvider = ({ children }) => {
             //EMAIL
             dynamicEvents.dynamicEvents.emit('emailVerificationResult', verified, destination);
         }
+        otpVerificationStorage.clearOtpVerificationState();
         // Avoid calling authSuccess if we're only verifying
         if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
             setCallback('authSuccess');

package/src/lib/context/ConnectWithOtpContext/ConnectWithOtpProvider.js

@@ -85,8 +85,10 @@ import '../../utils/hooks/useWalletBackup/types.js';
 import '../../utils/hooks/useWalletBackup/cloudProviders.js';
 import '../IpConfigurationContext/IpConfigurationContext.js';
 import { ConnectWithOtpContext } from './ConnectWithOtpContext.js';
+import { useRestoreOtpVerificationState } from './hooks/useRestoreOtpVerificationState/useRestoreOtpVerificationState.js';
 import { createEmailHandler } from './utils/createEmailHandler.js';
 import { createSmsHandler } from './utils/createSmsHandler.js';
+import { clearOtpVerificationState } from './utils/otpVerificationStorage/otpVerificationStorage.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
@@ -122,6 +124,11 @@ const ConnectWithOtpProvider = ({ children }) => {
         projectSettings,
     });
     const lastVerificationHandlerRef = useRef(null);
+    useRestoreOtpVerificationState({
+        embeddedWalletSessionKeys,
+        environmentId,
+        handlerRef: lastVerificationHandlerRef,
+    });
     const providers = (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || [];
     const mapProvider = {
         [ProviderEnum.Dynamic]: {
@@ -183,6 +190,7 @@ const ConnectWithOtpProvider = ({ children }) => {
             //EMAIL
             dynamicEvents.emit('emailVerificationResult', verified, destination);
         }
+        clearOtpVerificationState();
         // Avoid calling authSuccess if we're only verifying
         if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
             setCallback('authSuccess');

package/src/lib/context/ConnectWithOtpContext/hooks/useRestoreOtpVerificationState/index.d.ts

@@ -0,0 +1 @@
+export { useRestoreOtpVerificationState } from './useRestoreOtpVerificationState';

package/src/lib/context/ConnectWithOtpContext/hooks/useRestoreOtpVerificationState/useRestoreOtpVerificationState.cjs

@@ -0,0 +1,48 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var buildEmailOtpHandler = require('../../utils/buildEmailOtpHandler/buildEmailOtpHandler.cjs');
+var buildSmsOtpHandler = require('../../utils/buildSmsOtpHandler/buildSmsOtpHandler.cjs');
+var otpVerificationStorage = require('../../utils/otpVerificationStorage/otpVerificationStorage.cjs');
+
+/**
+ * Restores a persisted OTP verification handler from localStorage on mount.
+ * This handles the case where the webview was killed by Android on low-memory
+ * devices and needs to resume an in-progress OTP flow.
+ */
+const useRestoreOtpVerificationState = ({ embeddedWalletSessionKeys, environmentId, handlerRef, }) => {
+    React.useEffect(() => {
+        if (handlerRef.current) {
+            return;
+        }
+        const persisted = otpVerificationStorage.restoreOtpVerificationState();
+        if (!persisted) {
+            return;
+        }
+        if (persisted.type === 'email') {
+            handlerRef.current = buildEmailOtpHandler.buildEmailOtpHandler({
+                captchaToken: persisted.captchaToken,
+                email: persisted.destination,
+                embeddedWalletSessionKeys,
+                environmentId,
+                initialVerificationUUID: persisted.verificationUUID,
+            });
+        }
+        else {
+            handlerRef.current = buildSmsOtpHandler.buildSmsOtpHandler({
+                captchaToken: persisted.captchaToken,
+                embeddedWalletSessionKeys,
+                environmentId,
+                phone: persisted.destination,
+                verificationUUID: persisted.verificationUUID,
+            });
+        }
+        // Only needs to run once on mount
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+};
+
+exports.useRestoreOtpVerificationState = useRestoreOtpVerificationState;

package/src/lib/context/ConnectWithOtpContext/hooks/useRestoreOtpVerificationState/useRestoreOtpVerificationState.d.ts

@@ -0,0 +1,16 @@
+import { MutableRefObject } from 'react';
+import { PhoneData } from '@dynamic-labs/types';
+import { useEmbeddedWalletSessionKeys } from '../../../../utils/hooks';
+import { ProviderVerificationHandler } from '../../types';
+type UseRestoreOtpVerificationStateParams = {
+    embeddedWalletSessionKeys: ReturnType<typeof useEmbeddedWalletSessionKeys>;
+    environmentId: string;
+    handlerRef: MutableRefObject<ProviderVerificationHandler<string | PhoneData> | null>;
+};
+/**
+ * Restores a persisted OTP verification handler from localStorage on mount.
+ * This handles the case where the webview was killed by Android on low-memory
+ * devices and needs to resume an in-progress OTP flow.
+ */
+export declare const useRestoreOtpVerificationState: ({ embeddedWalletSessionKeys, environmentId, handlerRef, }: UseRestoreOtpVerificationStateParams) => void;
+export {};

package/src/lib/context/ConnectWithOtpContext/hooks/useRestoreOtpVerificationState/useRestoreOtpVerificationState.js

@@ -0,0 +1,44 @@
+'use client'
+import { useEffect } from 'react';
+import { buildEmailOtpHandler } from '../../utils/buildEmailOtpHandler/buildEmailOtpHandler.js';
+import { buildSmsOtpHandler } from '../../utils/buildSmsOtpHandler/buildSmsOtpHandler.js';
+import { restoreOtpVerificationState } from '../../utils/otpVerificationStorage/otpVerificationStorage.js';
+
+/**
+ * Restores a persisted OTP verification handler from localStorage on mount.
+ * This handles the case where the webview was killed by Android on low-memory
+ * devices and needs to resume an in-progress OTP flow.
+ */
+const useRestoreOtpVerificationState = ({ embeddedWalletSessionKeys, environmentId, handlerRef, }) => {
+    useEffect(() => {
+        if (handlerRef.current) {
+            return;
+        }
+        const persisted = restoreOtpVerificationState();
+        if (!persisted) {
+            return;
+        }
+        if (persisted.type === 'email') {
+            handlerRef.current = buildEmailOtpHandler({
+                captchaToken: persisted.captchaToken,
+                email: persisted.destination,
+                embeddedWalletSessionKeys,
+                environmentId,
+                initialVerificationUUID: persisted.verificationUUID,
+            });
+        }
+        else {
+            handlerRef.current = buildSmsOtpHandler({
+                captchaToken: persisted.captchaToken,
+                embeddedWalletSessionKeys,
+                environmentId,
+                phone: persisted.destination,
+                verificationUUID: persisted.verificationUUID,
+            });
+        }
+        // Only needs to run once on mount
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+};
+
+export { useRestoreOtpVerificationState };

package/src/lib/context/ConnectWithOtpContext/utils/buildEmailOtpHandler/buildEmailOtpHandler.cjs

@@ -0,0 +1,88 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('@dynamic-labs/sdk-api-core');
+require('react');
+require('eventemitter3');
+require('@dynamic-labs/utils');
+require('@dynamic-labs-sdk/client');
+require('../../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../ViewContext/ViewContext.cjs');
+require('../../../../shared/logger.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../../../utils/constants/colors.cjs');
+require('../../../../utils/constants/values.cjs');
+require('../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../../../store/state/nonce/nonce.cjs');
+var email = require('../../../../data/api/email/email.cjs');
+require('@dynamic-labs/locale');
+require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+require('../../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
+require('../../../../events/dynamicEvents.cjs');
+var storeTokenAndUser = require('../../../../client/extension/storeTokenAndUser/storeTokenAndUser.cjs');
+var generateSessionKeys = require('../../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
+var otpVerificationStorage = require('../otpVerificationStorage/otpVerificationStorage.cjs');
+
+/**
+ * Builds a ProviderVerificationHandler for email OTP from the given parameters.
+ * Used both after creating a new email verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+const buildEmailOtpHandler = ({ captchaToken, email: email$1, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, initialVerificationUUID, }) => {
+    // Mutable so retry can update the UUID for subsequent verify calls
+    let verificationUUID = initialVerificationUUID;
+    return {
+        retry: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            const retryEmailVerificationResponse = yield email.retryEmailVerification({
+                email: email$1,
+                environmentId,
+                verificationUUID,
+            });
+            // eslint-disable-next-line prefer-destructuring
+            verificationUUID = retryEmailVerificationResponse.verificationUUID;
+            otpVerificationStorage.persistOtpVerificationState({
+                captchaToken,
+                destination: email$1,
+                type: 'email',
+                verificationUUID,
+            });
+        }),
+        type: 'email',
+        verify: (oneTimePassword, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            let sessionPublicKey = undefined;
+            if (shouldRegisterSessionKeysOnSignin()) {
+                const keypair = yield generateSessionKey();
+                sessionPublicKey = keypair.publicKey;
+            }
+            yield generateSessionKeys.generateSessionKeys();
+            const response = yield email.signInWithEmailVerification({
+                captchaToken,
+                environmentId,
+                sessionPublicKey,
+                verificationToken: oneTimePassword,
+                verificationUUID,
+            });
+            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
+                storeTokenAndUser.storeTokenAndUser(response);
+            }
+            return {
+                destination: email$1,
+                response: response,
+                verified: true,
+            };
+        }),
+    };
+};
+
+exports.buildEmailOtpHandler = buildEmailOtpHandler;

package/src/lib/context/ConnectWithOtpContext/utils/buildEmailOtpHandler/buildEmailOtpHandler.d.ts

@@ -0,0 +1,16 @@
+import { useEmbeddedWalletSessionKeys } from '../../../../utils/hooks';
+import { ProviderVerificationHandler } from '../../types';
+type BuildEmailOtpHandlerParams = {
+    captchaToken: string | undefined;
+    email: string;
+    embeddedWalletSessionKeys: ReturnType<typeof useEmbeddedWalletSessionKeys>;
+    environmentId: string;
+    initialVerificationUUID: string;
+};
+/**
+ * Builds a ProviderVerificationHandler for email OTP from the given parameters.
+ * Used both after creating a new email verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+export declare const buildEmailOtpHandler: ({ captchaToken, email, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, initialVerificationUUID, }: BuildEmailOtpHandlerParams) => ProviderVerificationHandler<string>;
+export {};

package/src/lib/context/ConnectWithOtpContext/utils/buildEmailOtpHandler/buildEmailOtpHandler.js

@@ -0,0 +1,84 @@
+'use client'
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import '@dynamic-labs-sdk/client/core';
+import '@dynamic-labs/sdk-api-core';
+import 'react';
+import 'eventemitter3';
+import '@dynamic-labs/utils';
+import '@dynamic-labs-sdk/client';
+import '../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../ViewContext/ViewContext.js';
+import '../../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
+import '../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../../store/state/nonce/nonce.js';
+import { retryEmailVerification, signInWithEmailVerification } from '../../../../data/api/email/email.js';
+import '@dynamic-labs/locale';
+import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import '../../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
+import '../../../../events/dynamicEvents.js';
+import { storeTokenAndUser } from '../../../../client/extension/storeTokenAndUser/storeTokenAndUser.js';
+import { generateSessionKeys } from '../../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
+import { persistOtpVerificationState } from '../otpVerificationStorage/otpVerificationStorage.js';
+
+/**
+ * Builds a ProviderVerificationHandler for email OTP from the given parameters.
+ * Used both after creating a new email verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+const buildEmailOtpHandler = ({ captchaToken, email, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, initialVerificationUUID, }) => {
+    // Mutable so retry can update the UUID for subsequent verify calls
+    let verificationUUID = initialVerificationUUID;
+    return {
+        retry: () => __awaiter(void 0, void 0, void 0, function* () {
+            const retryEmailVerificationResponse = yield retryEmailVerification({
+                email,
+                environmentId,
+                verificationUUID,
+            });
+            // eslint-disable-next-line prefer-destructuring
+            verificationUUID = retryEmailVerificationResponse.verificationUUID;
+            persistOtpVerificationState({
+                captchaToken,
+                destination: email,
+                type: 'email',
+                verificationUUID,
+            });
+        }),
+        type: 'email',
+        verify: (oneTimePassword, options) => __awaiter(void 0, void 0, void 0, function* () {
+            let sessionPublicKey = undefined;
+            if (shouldRegisterSessionKeysOnSignin()) {
+                const keypair = yield generateSessionKey();
+                sessionPublicKey = keypair.publicKey;
+            }
+            yield generateSessionKeys();
+            const response = yield signInWithEmailVerification({
+                captchaToken,
+                environmentId,
+                sessionPublicKey,
+                verificationToken: oneTimePassword,
+                verificationUUID,
+            });
+            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
+                storeTokenAndUser(response);
+            }
+            return {
+                destination: email,
+                response: response,
+                verified: true,
+            };
+        }),
+    };
+};
+
+export { buildEmailOtpHandler };

package/src/lib/context/ConnectWithOtpContext/utils/buildEmailOtpHandler/index.d.ts

@@ -0,0 +1 @@
+export { buildEmailOtpHandler } from './buildEmailOtpHandler';

package/src/lib/context/ConnectWithOtpContext/utils/buildSmsOtpHandler/buildSmsOtpHandler.cjs

@@ -0,0 +1,67 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('@dynamic-labs/sdk-api-core');
+require('react');
+require('eventemitter3');
+require('@dynamic-labs/utils');
+require('@dynamic-labs-sdk/client');
+require('../../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../ViewContext/ViewContext.cjs');
+require('../../../../shared/logger.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../../../utils/constants/colors.cjs');
+require('../../../../utils/constants/values.cjs');
+require('../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../../../store/state/nonce/nonce.cjs');
+var sms = require('../../../../data/api/sms/sms.cjs');
+require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+require('../../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
+require('../../../../events/dynamicEvents.cjs');
+var storeTokenAndUser = require('../../../../client/extension/storeTokenAndUser/storeTokenAndUser.cjs');
+var generateSessionKeys = require('../../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
+
+/**
+ * Builds a ProviderVerificationHandler for SMS OTP from the given parameters.
+ * Used both after creating a new SMS verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+const buildSmsOtpHandler = ({ captchaToken, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, phone, verificationUUID, }) => ({
+    type: 'sms',
+    verify: (oneTimePassword, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        let sessionPublicKey = undefined;
+        if (shouldRegisterSessionKeysOnSignin()) {
+            const keypair = yield generateSessionKey();
+            sessionPublicKey = keypair.publicKey;
+        }
+        yield generateSessionKeys.generateSessionKeys();
+        const response = yield sms.signInWithSmsVerification({
+            captchaToken,
+            environmentId,
+            sessionPublicKey,
+            verificationToken: oneTimePassword,
+            verificationUUID,
+        });
+        if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
+            storeTokenAndUser.storeTokenAndUser(response);
+        }
+        return {
+            destination: phone,
+            response: response,
+            verified: true,
+        };
+    }),
+});
+
+exports.buildSmsOtpHandler = buildSmsOtpHandler;

package/src/lib/context/ConnectWithOtpContext/utils/buildSmsOtpHandler/buildSmsOtpHandler.d.ts

@@ -0,0 +1,17 @@
+import { PhoneData } from '@dynamic-labs/types';
+import { useEmbeddedWalletSessionKeys } from '../../../../utils/hooks';
+import { ProviderVerificationHandler } from '../../types';
+type BuildSmsOtpHandlerParams = {
+    captchaToken: string | undefined;
+    embeddedWalletSessionKeys: ReturnType<typeof useEmbeddedWalletSessionKeys>;
+    environmentId: string;
+    phone: PhoneData;
+    verificationUUID: string;
+};
+/**
+ * Builds a ProviderVerificationHandler for SMS OTP from the given parameters.
+ * Used both after creating a new SMS verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+export declare const buildSmsOtpHandler: ({ captchaToken, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, phone, verificationUUID, }: BuildSmsOtpHandlerParams) => ProviderVerificationHandler<PhoneData>;
+export {};

package/src/lib/context/ConnectWithOtpContext/utils/buildSmsOtpHandler/buildSmsOtpHandler.js

@@ -0,0 +1,63 @@
+'use client'
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import '@dynamic-labs-sdk/client/core';
+import '@dynamic-labs/sdk-api-core';
+import 'react';
+import 'eventemitter3';
+import '@dynamic-labs/utils';
+import '@dynamic-labs-sdk/client';
+import '../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../ViewContext/ViewContext.js';
+import '../../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
+import '../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../../store/state/nonce/nonce.js';
+import { signInWithSmsVerification } from '../../../../data/api/sms/sms.js';
+import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import '../../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
+import '../../../../events/dynamicEvents.js';
+import { storeTokenAndUser } from '../../../../client/extension/storeTokenAndUser/storeTokenAndUser.js';
+import { generateSessionKeys } from '../../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
+
+/**
+ * Builds a ProviderVerificationHandler for SMS OTP from the given parameters.
+ * Used both after creating a new SMS verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+const buildSmsOtpHandler = ({ captchaToken, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, phone, verificationUUID, }) => ({
+    type: 'sms',
+    verify: (oneTimePassword, options) => __awaiter(void 0, void 0, void 0, function* () {
+        let sessionPublicKey = undefined;
+        if (shouldRegisterSessionKeysOnSignin()) {
+            const keypair = yield generateSessionKey();
+            sessionPublicKey = keypair.publicKey;
+        }
+        yield generateSessionKeys();
+        const response = yield signInWithSmsVerification({
+            captchaToken,
+            environmentId,
+            sessionPublicKey,
+            verificationToken: oneTimePassword,
+            verificationUUID,
+        });
+        if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
+            storeTokenAndUser(response);
+        }
+        return {
+            destination: phone,
+            response: response,
+            verified: true,
+        };
+    }),
+});
+
+export { buildSmsOtpHandler };

package/src/lib/context/ConnectWithOtpContext/utils/buildSmsOtpHandler/index.d.ts

@@ -0,0 +1 @@
+export { buildSmsOtpHandler } from './buildSmsOtpHandler';

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.cjs

@@ -4,15 +4,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs-sdk/client/core');
+var email = require('../../../data/api/email/email.cjs');
 require('@dynamic-labs/sdk-api-core');
-require('react');
-require('eventemitter3');
 require('@dynamic-labs/utils');
-require('@dynamic-labs-sdk/client');
-require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
+require('react');
 require('react/jsx-runtime');
 require('../../ViewContext/ViewContext.cjs');
 require('../../../shared/logger.cjs');
@@ -20,63 +17,42 @@ require('@dynamic-labs/wallet-book');
 require('../../../utils/constants/colors.cjs');
 require('../../../utils/constants/values.cjs');
 require('../../../shared/consts/index.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('eventemitter3');
+require('@dynamic-labs-sdk/client');
+require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
-var email = require('../../../data/api/email/email.cjs');
-require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../events/dynamicEvents.cjs');
-var storeTokenAndUser = require('../../../client/extension/storeTokenAndUser/storeTokenAndUser.cjs');
-var generateSessionKeys = require('../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
+require('@dynamic-labs/locale');
+var buildEmailOtpHandler = require('./buildEmailOtpHandler/buildEmailOtpHandler.cjs');
+var otpVerificationStorage = require('./otpVerificationStorage/otpVerificationStorage.cjs');
 
-const createEmailHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (email$1, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const createEmailHandler = (environmentId, embeddedWalletSessionKeys) => (email$1, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const createEmailVerificationResponse = yield email.createEmailVerification({
         captchaToken,
         email: email$1,
         environmentId,
     });
-    let { verificationUUID } = createEmailVerificationResponse;
-    return {
-        retry: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            const retryEmailVerificationResponse = yield email.retryEmailVerification({
-                email: email$1,
-                environmentId,
-                verificationUUID,
-            });
-            // eslint-disable-next-line prefer-destructuring
-            verificationUUID = retryEmailVerificationResponse.verificationUUID;
-        }),
+    const { verificationUUID } = createEmailVerificationResponse;
+    otpVerificationStorage.persistOtpVerificationState({
+        captchaToken,
+        destination: email$1,
         type: 'email',
-        verify: (oneTimePassword, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            let sessionPublicKey = undefined;
-            if (shouldRegisterSessionKeysOnSignin()) {
-                const keypair = yield generateSessionKey();
-                sessionPublicKey = keypair.publicKey;
-            }
-            yield generateSessionKeys.generateSessionKeys();
-            const response = yield email.signInWithEmailVerification({
-                captchaToken,
-                environmentId,
-                sessionPublicKey,
-                verificationToken: oneTimePassword,
-                verificationUUID,
-            });
-            // Skip setting the user auth token and only return the VerifyResponse
-            // if needed because setUser can trigger view re-renders.
-            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
-                storeTokenAndUser.storeTokenAndUser(response);
-            }
-            return {
-                destination: email$1,
-                response: response,
-                verified: true,
-            };
-        }),
-    };
+        verificationUUID,
+    });
+    return buildEmailOtpHandler.buildEmailOtpHandler({
+        captchaToken,
+        email: email$1,
+        embeddedWalletSessionKeys,
+        environmentId,
+        initialVerificationUUID: verificationUUID,
+    });
 });
 
 exports.createEmailHandler = createEmailHandler;

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.d.ts

@@ -1,3 +1,3 @@
 import { useEmbeddedWalletSessionKeys } from '../../../utils/hooks';
 import { ProviderHandler } from '../types';
-export declare const createEmailHandler: (environmentId: string, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }: ReturnType<typeof useEmbeddedWalletSessionKeys>) => ProviderHandler<string>;
+export declare const createEmailHandler: (environmentId: string, embeddedWalletSessionKeys: ReturnType<typeof useEmbeddedWalletSessionKeys>) => ProviderHandler<string>;

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.js

@@ -1,14 +1,11 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import '@dynamic-labs-sdk/client/core';
+import { createEmailVerification } from '../../../data/api/email/email.js';
 import '@dynamic-labs/sdk-api-core';
-import 'react';
-import 'eventemitter3';
 import '@dynamic-labs/utils';
-import '@dynamic-labs-sdk/client';
-import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
+import 'react';
 import 'react/jsx-runtime';
 import '../../ViewContext/ViewContext.js';
 import '../../../shared/logger.js';
@@ -16,63 +13,42 @@ import '@dynamic-labs/wallet-book';
 import '../../../utils/constants/colors.js';
 import '../../../utils/constants/values.js';
 import '../../../shared/consts/index.js';
+import '@dynamic-labs-sdk/client/core';
+import 'eventemitter3';
+import '@dynamic-labs-sdk/client';
+import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
-import { createEmailVerification, retryEmailVerification, signInWithEmailVerification } from '../../../data/api/email/email.js';
-import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../events/dynamicEvents.js';
-import { storeTokenAndUser } from '../../../client/extension/storeTokenAndUser/storeTokenAndUser.js';
-import { generateSessionKeys } from '../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
+import '@dynamic-labs/locale';
+import { buildEmailOtpHandler } from './buildEmailOtpHandler/buildEmailOtpHandler.js';
+import { persistOtpVerificationState } from './otpVerificationStorage/otpVerificationStorage.js';
 
-const createEmailHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (email, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+const createEmailHandler = (environmentId, embeddedWalletSessionKeys) => (email, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
     const createEmailVerificationResponse = yield createEmailVerification({
         captchaToken,
         email,
         environmentId,
     });
-    let { verificationUUID } = createEmailVerificationResponse;
-    return {
-        retry: () => __awaiter(void 0, void 0, void 0, function* () {
-            const retryEmailVerificationResponse = yield retryEmailVerification({
-                email,
-                environmentId,
-                verificationUUID,
-            });
-            // eslint-disable-next-line prefer-destructuring
-            verificationUUID = retryEmailVerificationResponse.verificationUUID;
-        }),
+    const { verificationUUID } = createEmailVerificationResponse;
+    persistOtpVerificationState({
+        captchaToken,
+        destination: email,
         type: 'email',
-        verify: (oneTimePassword, options) => __awaiter(void 0, void 0, void 0, function* () {
-            let sessionPublicKey = undefined;
-            if (shouldRegisterSessionKeysOnSignin()) {
-                const keypair = yield generateSessionKey();
-                sessionPublicKey = keypair.publicKey;
-            }
-            yield generateSessionKeys();
-            const response = yield signInWithEmailVerification({
-                captchaToken,
-                environmentId,
-                sessionPublicKey,
-                verificationToken: oneTimePassword,
-                verificationUUID,
-            });
-            // Skip setting the user auth token and only return the VerifyResponse
-            // if needed because setUser can trigger view re-renders.
-            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
-                storeTokenAndUser(response);
-            }
-            return {
-                destination: email,
-                response: response,
-                verified: true,
-            };
-        }),
-    };
+        verificationUUID,
+    });
+    return buildEmailOtpHandler({
+        captchaToken,
+        email,
+        embeddedWalletSessionKeys,
+        environmentId,
+        initialVerificationUUID: verificationUUID,
+    });
 });
 
 export { createEmailHandler };

package/src/lib/context/ConnectWithOtpContext/utils/createSmsHandler.cjs

@@ -4,12 +4,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs-sdk/client/core');
+require('@dynamic-labs-sdk/client');
+require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
+require('@dynamic-labs-sdk/client/core');
 require('react');
 require('eventemitter3');
-require('@dynamic-labs/utils');
-require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -23,16 +23,16 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
-var sms = require('../../../data/api/sms/sms.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../events/dynamicEvents.cjs');
-var storeTokenAndUser = require('../../../client/extension/storeTokenAndUser/storeTokenAndUser.cjs');
-var generateSessionKeys = require('../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
+var sms = require('../../../data/api/sms/sms.cjs');
+var buildSmsOtpHandler = require('./buildSmsOtpHandler/buildSmsOtpHandler.cjs');
+var otpVerificationStorage = require('./otpVerificationStorage/otpVerificationStorage.cjs');
 
-const createSmsHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (phone, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const createSmsHandler = (environmentId, embeddedWalletSessionKeys) => (phone, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const { verificationUUID } = yield sms.createSmsVerification({
         captchaToken,
         environmentId,
@@ -40,34 +40,19 @@ const createSmsHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, ge
         phoneCountryCode: phone.dialCode,
         phoneNumber: phone.phone,
     });
-    return {
+    otpVerificationStorage.persistOtpVerificationState({
+        captchaToken,
+        destination: phone,
         type: 'sms',
-        verify: (oneTimePassword, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            let sessionPublicKey = undefined;
-            if (shouldRegisterSessionKeysOnSignin()) {
-                const keypair = yield generateSessionKey();
-                sessionPublicKey = keypair.publicKey;
-            }
-            yield generateSessionKeys.generateSessionKeys();
-            const response = yield sms.signInWithSmsVerification({
-                captchaToken,
-                environmentId,
-                sessionPublicKey,
-                verificationToken: oneTimePassword,
-                verificationUUID,
-            });
-            // Skip setting the user auth token and only return the VerifyResponse
-            // if needed because setUser can trigger view re-renders.
-            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
-                storeTokenAndUser.storeTokenAndUser(response);
-            }
-            return {
-                destination: phone,
-                response: response,
-                verified: true,
-            };
-        }),
-    };
+        verificationUUID,
+    });
+    return buildSmsOtpHandler.buildSmsOtpHandler({
+        captchaToken,
+        embeddedWalletSessionKeys,
+        environmentId,
+        phone,
+        verificationUUID,
+    });
 });
 
 exports.createSmsHandler = createSmsHandler;

package/src/lib/context/ConnectWithOtpContext/utils/createSmsHandler.d.ts

@@ -1,4 +1,4 @@
 import { PhoneData } from '@dynamic-labs/types';
 import { useEmbeddedWalletSessionKeys } from '../../../utils/hooks';
 import { ProviderHandler } from '../types';
-export declare const createSmsHandler: (environmentId: string, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }: ReturnType<typeof useEmbeddedWalletSessionKeys>) => ProviderHandler<PhoneData>;
+export declare const createSmsHandler: (environmentId: string, embeddedWalletSessionKeys: ReturnType<typeof useEmbeddedWalletSessionKeys>) => ProviderHandler<PhoneData>;

package/src/lib/context/ConnectWithOtpContext/utils/createSmsHandler.js

@@ -1,11 +1,11 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import '@dynamic-labs-sdk/client/core';
+import '@dynamic-labs-sdk/client';
+import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
+import '@dynamic-labs-sdk/client/core';
 import 'react';
 import 'eventemitter3';
-import '@dynamic-labs/utils';
-import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -19,16 +19,16 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
-import { createSmsVerification, signInWithSmsVerification } from '../../../data/api/sms/sms.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../events/dynamicEvents.js';
-import { storeTokenAndUser } from '../../../client/extension/storeTokenAndUser/storeTokenAndUser.js';
-import { generateSessionKeys } from '../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
+import { createSmsVerification } from '../../../data/api/sms/sms.js';
+import { buildSmsOtpHandler } from './buildSmsOtpHandler/buildSmsOtpHandler.js';
+import { persistOtpVerificationState } from './otpVerificationStorage/otpVerificationStorage.js';
 
-const createSmsHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (phone, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+const createSmsHandler = (environmentId, embeddedWalletSessionKeys) => (phone, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
     const { verificationUUID } = yield createSmsVerification({
         captchaToken,
         environmentId,
@@ -36,34 +36,19 @@ const createSmsHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, ge
         phoneCountryCode: phone.dialCode,
         phoneNumber: phone.phone,
     });
-    return {
+    persistOtpVerificationState({
+        captchaToken,
+        destination: phone,
         type: 'sms',
-        verify: (oneTimePassword, options) => __awaiter(void 0, void 0, void 0, function* () {
-            let sessionPublicKey = undefined;
-            if (shouldRegisterSessionKeysOnSignin()) {
-                const keypair = yield generateSessionKey();
-                sessionPublicKey = keypair.publicKey;
-            }
-            yield generateSessionKeys();
-            const response = yield signInWithSmsVerification({
-                captchaToken,
-                environmentId,
-                sessionPublicKey,
-                verificationToken: oneTimePassword,
-                verificationUUID,
-            });
-            // Skip setting the user auth token and only return the VerifyResponse
-            // if needed because setUser can trigger view re-renders.
-            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
-                storeTokenAndUser(response);
-            }
-            return {
-                destination: phone,
-                response: response,
-                verified: true,
-            };
-        }),
-    };
+        verificationUUID,
+    });
+    return buildSmsOtpHandler({
+        captchaToken,
+        embeddedWalletSessionKeys,
+        environmentId,
+        phone,
+        verificationUUID,
+    });
 });
 
 export { createSmsHandler };

package/src/lib/context/ConnectWithOtpContext/utils/otpVerificationStorage/index.d.ts

@@ -0,0 +1,2 @@
+export { clearOtpVerificationState, persistOtpVerificationState, restoreOtpVerificationState, } from './otpVerificationStorage';
+export type { PersistedOtpState } from './otpVerificationStorage';

package/src/lib/context/ConnectWithOtpContext/utils/otpVerificationStorage/otpVerificationStorage.cjs

@@ -0,0 +1,60 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('@dynamic-labs/utils');
+
+const STORAGE_KEY = 'dynamic_otp_verification_state';
+// 5 minutes in milliseconds — matches the backend OTP expiry window.
+const OTP_STATE_TTL_MS = 5 * 60 * 1000;
+/**
+ * Persists OTP verification state to localStorage so it can survive
+ * webview remounts (e.g. Android WebView process kills on low-memory devices).
+ */
+const persistOtpVerificationState = (state) => {
+    try {
+        const payload = Object.assign(Object.assign({}, state), { createdAt: Date.now() });
+        utils.StorageService.setItem(STORAGE_KEY, payload);
+    }
+    catch (_a) {
+        // Storage may not be available in all environments
+    }
+};
+/**
+ * Restores previously persisted OTP verification state, if any.
+ * Returns null when nothing is stored or storage is unavailable.
+ */
+const restoreOtpVerificationState = () => {
+    var _a;
+    try {
+        const parsed = (_a = utils.StorageService.getItem(STORAGE_KEY)) !== null && _a !== void 0 ? _a : null;
+        if (!parsed) {
+            return null;
+        }
+        if (parsed.createdAt && Date.now() - parsed.createdAt > OTP_STATE_TTL_MS) {
+            utils.StorageService.removeItem(STORAGE_KEY);
+            return null;
+        }
+        return parsed;
+    }
+    catch (_b) {
+        return null;
+    }
+};
+/**
+ * Clears any persisted OTP verification state from localStorage.
+ * Called after successful verification or when starting a new OTP flow.
+ */
+const clearOtpVerificationState = () => {
+    try {
+        utils.StorageService.removeItem(STORAGE_KEY);
+    }
+    catch (_a) {
+        // ignore
+    }
+};
+
+exports.clearOtpVerificationState = clearOtpVerificationState;
+exports.persistOtpVerificationState = persistOtpVerificationState;
+exports.restoreOtpVerificationState = restoreOtpVerificationState;

package/src/lib/context/ConnectWithOtpContext/utils/otpVerificationStorage/otpVerificationStorage.d.ts

@@ -0,0 +1,30 @@
+import { PhoneData } from '@dynamic-labs/types';
+type PersistedEmailOtpState = {
+    type: 'email';
+    verificationUUID: string;
+    destination: string;
+    captchaToken?: string;
+};
+type PersistedSmsOtpState = {
+    type: 'sms';
+    verificationUUID: string;
+    destination: PhoneData;
+    captchaToken?: string;
+};
+export type PersistedOtpState = PersistedEmailOtpState | PersistedSmsOtpState;
+/**
+ * Persists OTP verification state to localStorage so it can survive
+ * webview remounts (e.g. Android WebView process kills on low-memory devices).
+ */
+export declare const persistOtpVerificationState: (state: PersistedOtpState) => void;
+/**
+ * Restores previously persisted OTP verification state, if any.
+ * Returns null when nothing is stored or storage is unavailable.
+ */
+export declare const restoreOtpVerificationState: () => PersistedOtpState | null;
+/**
+ * Clears any persisted OTP verification state from localStorage.
+ * Called after successful verification or when starting a new OTP flow.
+ */
+export declare const clearOtpVerificationState: () => void;
+export {};

package/src/lib/context/ConnectWithOtpContext/utils/otpVerificationStorage/otpVerificationStorage.js

@@ -0,0 +1,54 @@
+'use client'
+import { StorageService } from '@dynamic-labs/utils';
+
+const STORAGE_KEY = 'dynamic_otp_verification_state';
+// 5 minutes in milliseconds — matches the backend OTP expiry window.
+const OTP_STATE_TTL_MS = 5 * 60 * 1000;
+/**
+ * Persists OTP verification state to localStorage so it can survive
+ * webview remounts (e.g. Android WebView process kills on low-memory devices).
+ */
+const persistOtpVerificationState = (state) => {
+    try {
+        const payload = Object.assign(Object.assign({}, state), { createdAt: Date.now() });
+        StorageService.setItem(STORAGE_KEY, payload);
+    }
+    catch (_a) {
+        // Storage may not be available in all environments
+    }
+};
+/**
+ * Restores previously persisted OTP verification state, if any.
+ * Returns null when nothing is stored or storage is unavailable.
+ */
+const restoreOtpVerificationState = () => {
+    var _a;
+    try {
+        const parsed = (_a = StorageService.getItem(STORAGE_KEY)) !== null && _a !== void 0 ? _a : null;
+        if (!parsed) {
+            return null;
+        }
+        if (parsed.createdAt && Date.now() - parsed.createdAt > OTP_STATE_TTL_MS) {
+            StorageService.removeItem(STORAGE_KEY);
+            return null;
+        }
+        return parsed;
+    }
+    catch (_b) {
+        return null;
+    }
+};
+/**
+ * Clears any persisted OTP verification state from localStorage.
+ * Called after successful verification or when starting a new OTP flow.
+ */
+const clearOtpVerificationState = () => {
+    try {
+        StorageService.removeItem(STORAGE_KEY);
+    }
+    catch (_a) {
+        // ignore
+    }
+};
+
+export { clearOtpVerificationState, persistOtpVerificationState, restoreOtpVerificationState };

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/useCreateWalletConnectorOptions.cjs

@@ -40,6 +40,12 @@ const useCreateWalletConnectorOptions = (_a) => {
     const redirectUrl = settingsUtils.useRedirectUrl();
     const walletConnectorsKey = React.useMemo(() => { var _a; return (_a = serializeWalletConnectors.serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
     const isWalletBookLoaded = React.useMemo(() => walletBook.isWalletBookPopulated(walletBook$1), [walletBook$1]);
+    // networkConfigurations can get a fresh object identity on every render even when
+    // its content is unchanged (e.g. built inline upstream, churned by a host-app
+    // re-render storm). Depending on a stable content signature instead of the object
+    // reference keeps a render storm from rebuilding the (potentially 100s-strong)
+    // connector list every frame — mirrors walletConnectorsKey above.
+    const networkConfigurationsKey = React.useMemo(() => JSON.stringify(networkConfigurations !== null && networkConfigurations !== void 0 ? networkConfigurations : {}), [networkConfigurations]);
     const walletConnectorOptions = React.useMemo(() => {
         if (!projectSettings || !isWalletBookLoaded || !networkConfigurations)
             return [];
@@ -48,14 +54,16 @@ const useCreateWalletConnectorOptions = (_a) => {
                 redirectUrl, settings: projectSettings, skipMemo: true, walletBook: walletBook$1, walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [] }, props),
             walletConnectorExtensions,
         });
-        // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+        // walletUiUtils is intentionally excluded (its unstable identity would cause an
+        // infinite loop); networkConfigurations is depended on via its content signature
+        // (networkConfigurationsKey) so an identity-only churn doesn't rebuild the list.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         projectSettings,
         redirectUrl,
         walletConnectorsKey,
         isWalletBookLoaded,
-        networkConfigurations,
+        networkConfigurationsKey,
     ]);
     React.useEffect(() => {
         if (!projectSettings || walletConnectorOptions.length === 0)

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/useCreateWalletConnectorOptions.js

@@ -36,6 +36,12 @@ const useCreateWalletConnectorOptions = (_a) => {
     const redirectUrl = useRedirectUrl();
     const walletConnectorsKey = useMemo(() => { var _a; return (_a = serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
     const isWalletBookLoaded = useMemo(() => isWalletBookPopulated(walletBook), [walletBook]);
+    // networkConfigurations can get a fresh object identity on every render even when
+    // its content is unchanged (e.g. built inline upstream, churned by a host-app
+    // re-render storm). Depending on a stable content signature instead of the object
+    // reference keeps a render storm from rebuilding the (potentially 100s-strong)
+    // connector list every frame — mirrors walletConnectorsKey above.
+    const networkConfigurationsKey = useMemo(() => JSON.stringify(networkConfigurations !== null && networkConfigurations !== void 0 ? networkConfigurations : {}), [networkConfigurations]);
     const walletConnectorOptions = useMemo(() => {
         if (!projectSettings || !isWalletBookLoaded || !networkConfigurations)
             return [];
@@ -44,14 +50,16 @@ const useCreateWalletConnectorOptions = (_a) => {
                 redirectUrl, settings: projectSettings, skipMemo: true, walletBook, walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [] }, props),
             walletConnectorExtensions,
         });
-        // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+        // walletUiUtils is intentionally excluded (its unstable identity would cause an
+        // infinite loop); networkConfigurations is depended on via its content signature
+        // (networkConfigurationsKey) so an identity-only churn doesn't rebuild the list.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         projectSettings,
         redirectUrl,
         walletConnectorsKey,
         isWalletBookLoaded,
-        networkConfigurations,
+        networkConfigurationsKey,
     ]);
     useEffect(() => {
         if (!projectSettings || walletConnectorOptions.length === 0)