@turnkey/react-wallet-kit 2.3.1 → 2.4.0

package/dist/providers/client/Provider.mjs

@@ -4,14 +4,14 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { sha256 } from '@noble/hashes/sha2';
 import { bytesToHex } from '@noble/hashes/utils';
 import { storePKCEVerifier, storeOAuthCaptchaToken, storeOAuthAddProviderMetadata, clearAllOAuthData, getOAuthAddProviderMetadata, hasPKCEVerifier, OAUTH_INTENT_ADD_PROVIDER } from '../../utils/oauth/storage.mjs';
-import '../../utils/oauth/config.mjs';
-import { parseOAuthResponse, openOAuthPopup, buildOAuthUrl, redirectToOAuthProvider, cleanupOAuthUrlPreserveSearch, cleanupOAuthUrl } from '../../utils/oauth/url.mjs';
+import { OAUTH_PROVIDER_CONFIGS } from '../../utils/oauth/config.mjs';
+import { isExpectedOAuthRedirectUrl, parseOAuthResponse, openOAuthPopup, buildOAuthUrl, redirectToOAuthProvider, cleanupOAuthUrlPreserveSearch, cleanupOAuthUrl } from '../../utils/oauth/url.mjs';
 import { completeOAuthPopup, completeOAuthFlow, completePKCEFlow } from '../../utils/oauth/completion.mjs';
 import { generateChallengePair, exchangeFacebookCodeForToken } from '../../utils/oauth/pkce.mjs';
 import { capitalizeProviderName, getProviderIcon } from '../../utils/oauth/helpers.mjs';
 import { useWalletProviderState, useDebouncedCallback, isValidSession, withTurnkeyErrorHandling, SESSION_WARNING_THRESHOLD_MS, mergeWalletsWithoutDuplicates } from '../../utils/utils.mjs';
 import { clearKeys, clearAll, setCappedTimeoutInMap, clearKey, setTimeoutInMap } from '../../utils/timers.mjs';
-import { resetPasskeyScope, DEFAULT_SESSION_EXPIRATION_IN_SECONDS, OtpType, applyPasskeyScope, buildSecondaryOauthProviders, TurnkeyClient, Chain, WalletInterfaceType, getAuthProxyConfig, getClientParams, WalletSource, buildSecondaryOidcClaims } from '@turnkey/core';
+import { resetPasskeyScope, DEFAULT_SESSION_EXPIRATION_IN_SECONDS, OtpType, applyPasskeyScope, TurnkeyClient, Chain, WalletInterfaceType, getAuthProxyConfig, getClientParams, WalletSource, buildSecondaryOauthProviders, buildSecondaryOidcClaims } from '@turnkey/core';
 import { useState, useRef, useCallback, useEffect } from 'react';
 import { TurnkeyError, TurnkeyErrorCodes, TurnkeyNetworkError, AuthAction, OAuthProviders, FiatOnRampCryptoCurrency, FiatOnRampBlockchainNetwork } from '@turnkey/sdk-types';
 import { useModal } from '../modal/Hook.mjs';
@@ -68,7 +68,7 @@ import { Turnstile } from '../../components/auth/Turnstile.mjs';
  * @returns A React context provider exposing authentication, wallet, and user management methods and state.
  */
 var ClientProvider = function ClientProvider(_ref) {
-  var _config$autoFetchWall, _masterConfig$auth31, _masterConfig$auth33, _masterConfig$auth35;
+  var _config$autoFetchWall, _masterConfig$auth33, _masterConfig$auth35, _masterConfig$auth37;
   var config = _ref.config,
     children = _ref.children,
     callbacks = _ref.callbacks;
@@ -120,6 +120,9 @@ var ClientProvider = function ClientProvider(_ref) {
   var expiryTimeoutsRef = useRef({});
   var proxyAuthConfigRef = useRef(null);
   var clientParamsRef = useRef(null);
+  // Stores the developer's custom MFA handler set via setMfaHandler.
+  // When unset, the default httpClient MFA behavior is used (no onMfaRequired callback).
+  var mfaHandlerRef = useRef(undefined);
   var _useState13 = useState(undefined),
     _useState14 = _slicedToArray(_useState13, 2),
     allSessions = _useState14[0],
@@ -942,11 +945,11 @@ var ClientProvider = function ClientProvider(_ref) {
    * @throws {TurnkeyError} If an error occurs while clearing the timers.
    */
   function _initializeWalletProviderListeners() {
-    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee142(walletProviders, onUpdateState) {
+    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee149(walletProviders, onUpdateState) {
       var _masterConfig$walletC0, _masterConfig$walletC1, _masterConfig$walletC10, _masterConfig$walletC11;
       var cleanups, nativeOnly, ethProviders, solProviders, wcProviders, wcProvider, attachEthereumListeners, attachSolanaListeners, _wcProvider$provider, _wcProvider$provider$, standardEvents, unsubscribe;
-      return _regenerator().w(function (_context142) {
-        while (1) switch (_context142.n) {
+      return _regenerator().w(function (_context149) {
+        while (1) switch (_context149.n) {
           case 0:
             attachSolanaListeners = function _attachSolanaListener(provider, onUpdateState) {
               var _provider$features;
@@ -954,19 +957,19 @@ var ClientProvider = function ClientProvider(_ref) {
               var walletEvents = provider === null || provider === void 0 ? void 0 : (_provider$features = provider.features) === null || _provider$features === void 0 ? void 0 : _provider$features["standard:events"];
               if (walletEvents !== null && walletEvents !== void 0 && walletEvents.on) {
                 var offChange = walletEvents.on("change", /*#__PURE__*/function () {
-                  var _ref166 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee140(_evt) {
-                    return _regenerator().w(function (_context140) {
-                      while (1) switch (_context140.n) {
+                  var _ref175 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee147(_evt) {
+                    return _regenerator().w(function (_context147) {
+                      while (1) switch (_context147.n) {
                         case 0:
-                          _context140.n = 1;
+                          _context147.n = 1;
                           return onUpdateState();
                         case 1:
-                          return _context140.a(2);
+                          return _context147.a(2);
                       }
-                    }, _callee140);
+                    }, _callee147);
                   }));
-                  return function (_x118) {
-                    return _ref166.apply(this, arguments);
+                  return function (_x120) {
+                    return _ref175.apply(this, arguments);
                   };
                 }());
                 cleanups.push(offChange);
@@ -980,31 +983,31 @@ var ClientProvider = function ClientProvider(_ref) {
             attachEthereumListeners = function _attachEthereumListen(provider, onUpdateState) {
               if (typeof provider.on !== "function") return;
               var handleChainChanged = /*#__PURE__*/function () {
-                var _ref164 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee138(_chainId) {
-                  return _regenerator().w(function (_context138) {
-                    while (1) switch (_context138.n) {
+                var _ref173 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee145(_chainId) {
+                  return _regenerator().w(function (_context145) {
+                    while (1) switch (_context145.n) {
                       case 0:
-                        return _context138.a(2, onUpdateState());
+                        return _context145.a(2, onUpdateState());
                     }
-                  }, _callee138);
+                  }, _callee145);
                 }));
-                return function handleChainChanged(_x116) {
-                  return _ref164.apply(this, arguments);
+                return function handleChainChanged(_x118) {
+                  return _ref173.apply(this, arguments);
                 };
               }();
               var handleAccountsChanged = /*#__PURE__*/function () {
-                var _ref165 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee139(accounts) {
-                  return _regenerator().w(function (_context139) {
-                    while (1) switch (_context139.n) {
+                var _ref174 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee146(accounts) {
+                  return _regenerator().w(function (_context146) {
+                    while (1) switch (_context146.n) {
                       case 0:
                         if (accounts.length === 0) onUpdateState();
                       case 1:
-                        return _context139.a(2);
+                        return _context146.a(2);
                     }
-                  }, _callee139);
+                  }, _callee146);
                 }));
-                return function handleAccountsChanged(_x117) {
-                  return _ref165.apply(this, arguments);
+                return function handleAccountsChanged(_x119) {
+                  return _ref174.apply(this, arguments);
                 };
               }();
               var handleDisconnect = function handleDisconnect() {
@@ -1020,10 +1023,10 @@ var ClientProvider = function ClientProvider(_ref) {
               };
             };
             if (!(walletProviders.length === 0)) {
-              _context142.n = 1;
+              _context149.n = 1;
               break;
             }
-            return _context142.a(2, function () {});
+            return _context149.a(2, function () {});
           case 1:
             cleanups = []; // we only want to initialize these listeners for connected walletProviders
             nativeOnly = function nativeOnly(provider) {
@@ -1061,82 +1064,82 @@ var ClientProvider = function ClientProvider(_ref) {
               if (standardEvents !== null && standardEvents !== void 0 && standardEvents.on) {
                 if (standardEvents !== null && standardEvents !== void 0 && standardEvents.on) {
                   unsubscribe = standardEvents.on("change", /*#__PURE__*/function () {
-                    var _ref167 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee141(evt) {
+                    var _ref176 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee148(evt) {
                       var _callbacks$onError10, providers, currentSession, _wcProviders, wcWallets;
-                      return _regenerator().w(function (_context141) {
-                        while (1) switch (_context141.n) {
+                      return _regenerator().w(function (_context148) {
+                        while (1) switch (_context148.n) {
                           case 0:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "pairingExpired")) {
-                              _context141.n = 1;
+                              _context148.n = 1;
                               break;
                             }
                             debouncedFetchWalletProviders();
-                            return _context141.a(2);
+                            return _context148.a(2);
                           case 1:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "failed")) {
-                              _context141.n = 2;
+                              _context148.n = 2;
                               break;
                             }
                             debouncedFetchWalletProviders();
                             callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError10 = callbacks.onError) === null || _callbacks$onError10 === void 0 ? void 0 : _callbacks$onError10.call(callbacks, new TurnkeyError("WalletConnect initialization failed: ".concat(evt.error || "Unknown error"), TurnkeyErrorCodes.WALLET_CONNECT_INITIALIZATION_ERROR, evt.error));
-                            return _context141.a(2);
+                            return _context148.a(2);
                           case 2:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "initialized")) {
-                              _context141.n = 7;
+                              _context148.n = 7;
                               break;
                             }
-                            _context141.n = 3;
+                            _context148.n = 3;
                             return debouncedFetchWalletProviders();
                           case 3:
-                            providers = _context141.v;
-                            _context141.n = 4;
+                            providers = _context148.v;
+                            _context148.n = 4;
                             return getSession();
                           case 4:
-                            currentSession = _context141.v;
+                            currentSession = _context148.v;
                             if (!currentSession) {
-                              _context141.n = 6;
+                              _context148.n = 6;
                               break;
                             }
                             _wcProviders = providers === null || providers === void 0 ? void 0 : providers.filter(function (p) {
                               return p.interfaceType === WalletInterfaceType.WalletConnect;
                             });
-                            _context141.n = 5;
+                            _context148.n = 5;
                             return fetchWallets({
                               walletProviders: _wcProviders,
                               connectedOnly: true
                             });
                           case 5:
-                            wcWallets = _context141.v;
+                            wcWallets = _context148.v;
                             if (wcWallets.length > 0) {
                               setWallets(function (prev) {
                                 return mergeWalletsWithoutDuplicates(prev, wcWallets);
                               });
                             }
                           case 6:
-                            return _context141.a(2);
+                            return _context148.a(2);
                           case 7:
-                            _context141.n = 8;
+                            _context148.n = 8;
                             return onUpdateState();
                           case 8:
-                            return _context141.a(2);
+                            return _context148.a(2);
                         }
-                      }, _callee141);
+                      }, _callee148);
                     }));
-                    return function (_x119) {
-                      return _ref167.apply(this, arguments);
+                    return function (_x121) {
+                      return _ref176.apply(this, arguments);
                     };
                   }());
                   cleanups.push(unsubscribe);
                 }
               }
             }
-            return _context142.a(2, function () {
+            return _context149.a(2, function () {
               cleanups.forEach(function (remove) {
                 return remove();
               });
             });
         }
-      }, _callee142);
+      }, _callee149);
     }));
     return _initializeWalletProviderListeners.apply(this, arguments);
   }
@@ -1324,6 +1327,12 @@ var ClientProvider = function ClientProvider(_ref) {
     }
     return client.overridePasskeyStamper(params);
   }, [client]);
+  var overrideAttestedStamper = useCallback(function (params) {
+    if (!client) {
+      throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+    }
+    return client.overrideAttestedStamper(params);
+  }, [client]);
   var getActiveSessionKey = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
     return _regenerator().w(function (_context15) {
       while (1) switch (_context15.n) {
@@ -2419,6 +2428,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [client, callbacks]);
   var verifyOtp = useCallback(/*#__PURE__*/function () {
     var _ref61 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee48(params) {
+      var res;
       return _regenerator().w(function (_context48) {
         while (1) switch (_context48.n) {
           case 0:
@@ -2428,9 +2438,19 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context48.a(2, withTurnkeyErrorHandling(function () {
+            _context48.n = 2;
+            return withTurnkeyErrorHandling(function () {
               return client.verifyOtp(params);
-            }, undefined, callbacks, "Failed to verify OTP"));
+            }, undefined, callbacks, "Failed to verify OTP");
+          case 2:
+            res = _context48.v;
+            _context48.n = 3;
+            return client.overrideAttestedStamper({
+              verificationToken: res.verificationToken,
+              publicKey: res.publicKey
+            });
+          case 3:
+            return _context48.a(2, res);
         }
       }, _callee48);
     }));
@@ -2440,7 +2460,8 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [client, callbacks]);
   var loginWithOtp = useCallback(/*#__PURE__*/function () {
     var _ref62 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee49(params) {
-      var res;
+      var _ref63, _params$expirationSec7, _masterConfig$auth26;
+      var expirationSeconds, res;
       return _regenerator().w(function (_context49) {
         while (1) switch (_context49.n) {
           case 0:
@@ -2450,9 +2471,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
+            expirationSeconds = (_ref63 = (_params$expirationSec7 = params === null || params === void 0 ? void 0 : params.expirationSeconds) !== null && _params$expirationSec7 !== void 0 ? _params$expirationSec7 : masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth26 = masterConfig.auth) === null || _masterConfig$auth26 === void 0 ? void 0 : _masterConfig$auth26.sessionExpirationSeconds) !== null && _ref63 !== void 0 ? _ref63 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
             _context49.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.loginWithOtp(params);
+              return client.loginWithOtp(_objectSpread2(_objectSpread2({}, params), {}, {
+                expirationSeconds: expirationSeconds
+              }));
             }, undefined, callbacks, "Failed to login with OTP");
           case 2:
             res = _context49.v;
@@ -2475,10 +2499,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x37) {
       return _ref62.apply(this, arguments);
     };
-  }(), [client, callbacks, handlePostAuth]);
+  }(), [client, callbacks, masterConfig, handlePostAuth]);
   var signUpWithOtp = useCallback(/*#__PURE__*/function () {
-    var _ref63 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee50(params) {
-      var _masterConfig$auth26;
+    var _ref64 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee50(params) {
+      var _masterConfig$auth27;
       var createSubOrgParams, res;
       return _regenerator().w(function (_context50) {
         while (1) switch (_context50.n) {
@@ -2497,7 +2521,7 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             // If createSubOrgParams is not provided, use the default from masterConfig
             createSubOrgParams = params.createSubOrgParams;
-            if (!createSubOrgParams && masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth26 = masterConfig.auth) !== null && _masterConfig$auth26 !== void 0 && _masterConfig$auth26.createSuborgParams) {
+            if (!createSubOrgParams && masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth27 = masterConfig.auth) !== null && _masterConfig$auth27 !== void 0 && _masterConfig$auth27.createSuborgParams) {
               if (params.otpType === OtpType.Email) {
                 createSubOrgParams = masterConfig.auth.createSuborgParams.emailOtpAuth;
               } else if (params.otpType === OtpType.Sms) {
@@ -2530,12 +2554,12 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee50);
     }));
     return function (_x38) {
-      return _ref63.apply(this, arguments);
+      return _ref64.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, handlePostAuth]);
   var completeOtp = useCallback(/*#__PURE__*/function () {
-    var _ref64 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee51(params) {
-      var _masterConfig$auth27;
+    var _ref65 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee51(params) {
+      var _masterConfig$auth28;
       var createSubOrgParams, res;
       return _regenerator().w(function (_context51) {
         while (1) switch (_context51.n) {
@@ -2554,7 +2578,7 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             // If createSubOrgParams is not provided, use the default from masterConfig
             createSubOrgParams = params.createSubOrgParams;
-            if (!createSubOrgParams && masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth27 = masterConfig.auth) !== null && _masterConfig$auth27 !== void 0 && _masterConfig$auth27.createSuborgParams) {
+            if (!createSubOrgParams && masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth28 = masterConfig.auth) !== null && _masterConfig$auth28 !== void 0 && _masterConfig$auth28.createSuborgParams) {
               if (params.otpType === OtpType.Email) {
                 createSubOrgParams = masterConfig.auth.createSuborgParams.emailOtpAuth;
               } else if (params.otpType === OtpType.Sms) {
@@ -2587,12 +2611,13 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee51);
     }));
     return function (_x39) {
-      return _ref64.apply(this, arguments);
+      return _ref65.apply(this, arguments);
     };
   }(), [client, callbacks, handlePostAuth, masterConfig]);
   var loginWithOauth = useCallback(/*#__PURE__*/function () {
-    var _ref65 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee52(params) {
-      var res;
+    var _ref66 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee52(params) {
+      var _ref67, _params$expirationSec8, _masterConfig$auth29;
+      var expirationSeconds, res;
       return _regenerator().w(function (_context52) {
         while (1) switch (_context52.n) {
           case 0:
@@ -2602,9 +2627,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
+            expirationSeconds = (_ref67 = (_params$expirationSec8 = params === null || params === void 0 ? void 0 : params.expirationSeconds) !== null && _params$expirationSec8 !== void 0 ? _params$expirationSec8 : masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth29 = masterConfig.auth) === null || _masterConfig$auth29 === void 0 ? void 0 : _masterConfig$auth29.sessionExpirationSeconds) !== null && _ref67 !== void 0 ? _ref67 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
             _context52.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.loginWithOauth(params);
+              return client.loginWithOauth(_objectSpread2(_objectSpread2({}, params), {}, {
+                expirationSeconds: expirationSeconds
+              }));
             }, undefined, callbacks, "Failed to login with OAuth");
           case 2:
             res = _context52.v;
@@ -2625,12 +2653,12 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee52);
     }));
     return function (_x40) {
-      return _ref65.apply(this, arguments);
+      return _ref66.apply(this, arguments);
     };
-  }(), [client, callbacks, handlePostAuth]);
+  }(), [client, callbacks, masterConfig, handlePostAuth]);
   var signUpWithOauth = useCallback(/*#__PURE__*/function () {
-    var _ref66 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee53(params) {
-      var _params$createSubOrgP4, _masterConfig$auth28, _masterConfig$auth28$;
+    var _ref68 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee53(params) {
+      var _params$createSubOrgP4, _masterConfig$auth30, _masterConfig$auth30$;
       var createSubOrgParams, res;
       return _regenerator().w(function (_context53) {
         while (1) switch (_context53.n) {
@@ -2648,7 +2676,7 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             // If createSubOrgParams is not provided, use the default from masterConfig
-            createSubOrgParams = (_params$createSubOrgP4 = params.createSubOrgParams) !== null && _params$createSubOrgP4 !== void 0 ? _params$createSubOrgP4 : (_masterConfig$auth28 = masterConfig.auth) === null || _masterConfig$auth28 === void 0 ? void 0 : (_masterConfig$auth28$ = _masterConfig$auth28.createSuborgParams) === null || _masterConfig$auth28$ === void 0 ? void 0 : _masterConfig$auth28$.oauth;
+            createSubOrgParams = (_params$createSubOrgP4 = params.createSubOrgParams) !== null && _params$createSubOrgP4 !== void 0 ? _params$createSubOrgP4 : (_masterConfig$auth30 = masterConfig.auth) === null || _masterConfig$auth30 === void 0 ? void 0 : (_masterConfig$auth30$ = _masterConfig$auth30.createSuborgParams) === null || _masterConfig$auth30$ === void 0 ? void 0 : _masterConfig$auth30$.oauth;
             params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
@@ -2675,12 +2703,12 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee53);
     }));
     return function (_x41) {
-      return _ref66.apply(this, arguments);
+      return _ref68.apply(this, arguments);
     };
   }(), [client, callbacks, handlePostAuth, masterConfig]);
   var _completeOauth = useCallback(/*#__PURE__*/function () {
-    var _ref67 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee54(params) {
-      var _params$createSubOrgP5, _masterConfig$auth29, _masterConfig$auth29$;
+    var _ref69 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee54(params) {
+      var _params$createSubOrgP5, _masterConfig$auth31, _masterConfig$auth31$;
       var createSubOrgParams, res;
       return _regenerator().w(function (_context54) {
         while (1) switch (_context54.n) {
@@ -2698,7 +2726,7 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             // If createSubOrgParams is not provided, use the default from masterConfig
-            createSubOrgParams = (_params$createSubOrgP5 = params.createSubOrgParams) !== null && _params$createSubOrgP5 !== void 0 ? _params$createSubOrgP5 : (_masterConfig$auth29 = masterConfig.auth) === null || _masterConfig$auth29 === void 0 ? void 0 : (_masterConfig$auth29$ = _masterConfig$auth29.createSuborgParams) === null || _masterConfig$auth29$ === void 0 ? void 0 : _masterConfig$auth29$.oauth;
+            createSubOrgParams = (_params$createSubOrgP5 = params.createSubOrgParams) !== null && _params$createSubOrgP5 !== void 0 ? _params$createSubOrgP5 : (_masterConfig$auth31 = masterConfig.auth) === null || _masterConfig$auth31 === void 0 ? void 0 : (_masterConfig$auth31$ = _masterConfig$auth31.createSuborgParams) === null || _masterConfig$auth31$ === void 0 ? void 0 : _masterConfig$auth31$.oauth;
             params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
@@ -2725,11 +2753,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee54);
     }));
     return function (_x42) {
-      return _ref67.apply(this, arguments);
+      return _ref69.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, handlePostAuth]);
   var fetchWalletAccounts = useCallback(/*#__PURE__*/function () {
-    var _ref68 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee55(params) {
+    var _ref70 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee55(params) {
       return _regenerator().w(function (_context55) {
         while (1) switch (_context55.n) {
           case 0:
@@ -2748,11 +2776,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee55);
     }));
     return function (_x43) {
-      return _ref68.apply(this, arguments);
+      return _ref70.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var fetchPrivateKeys = useCallback(/*#__PURE__*/function () {
-    var _ref69 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee56(params) {
+    var _ref71 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee56(params) {
       return _regenerator().w(function (_context56) {
         while (1) switch (_context56.n) {
           case 0:
@@ -2771,11 +2799,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee56);
     }));
     return function (_x44) {
-      return _ref69.apply(this, arguments);
+      return _ref71.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var signMessage = useCallback(/*#__PURE__*/function () {
-    var _ref70 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee57(params) {
+    var _ref72 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee57(params) {
       return _regenerator().w(function (_context57) {
         while (1) switch (_context57.n) {
           case 0:
@@ -2794,11 +2822,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee57);
     }));
     return function (_x45) {
-      return _ref70.apply(this, arguments);
+      return _ref72.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var handleSignMessage = useCallback(/*#__PURE__*/function () {
-    var _ref71 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee58(params) {
+    var _ref73 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee58(params) {
       var _params$successPageDu, successPageDuration;
       return _regenerator().w(function (_context58) {
         while (1) switch (_context58.n) {
@@ -2843,11 +2871,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee58);
     }));
     return function (_x46) {
-      return _ref71.apply(this, arguments);
+      return _ref73.apply(this, arguments);
     };
   }(), [client, callbacks, pushPage]);
   var signTransaction = useCallback(/*#__PURE__*/function () {
-    var _ref72 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee59(params) {
+    var _ref74 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee59(params) {
       return _regenerator().w(function (_context59) {
         while (1) switch (_context59.n) {
           case 0:
@@ -2866,11 +2894,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee59);
     }));
     return function (_x47) {
-      return _ref72.apply(this, arguments);
+      return _ref74.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var ethSendTransaction = useCallback(/*#__PURE__*/function () {
-    var _ref73 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee60(params) {
+    var _ref75 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee60(params) {
       return _regenerator().w(function (_context60) {
         while (1) switch (_context60.n) {
           case 0:
@@ -2889,11 +2917,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee60);
     }));
     return function (_x48) {
-      return _ref73.apply(this, arguments);
+      return _ref75.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var ethSendErc20Transfer = useCallback(/*#__PURE__*/function () {
-    var _ref74 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee61(params) {
+    var _ref76 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee61(params) {
       return _regenerator().w(function (_context61) {
         while (1) switch (_context61.n) {
           case 0:
@@ -2912,11 +2940,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee61);
     }));
     return function (_x49) {
-      return _ref74.apply(this, arguments);
+      return _ref76.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var solSendTransaction = useCallback(/*#__PURE__*/function () {
-    var _ref75 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee62(params) {
+    var _ref77 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee62(params) {
       return _regenerator().w(function (_context62) {
         while (1) switch (_context62.n) {
           case 0:
@@ -2935,11 +2963,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee62);
     }));
     return function (_x50) {
-      return _ref75.apply(this, arguments);
+      return _ref77.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var signAndSendTransaction = useCallback(/*#__PURE__*/function () {
-    var _ref76 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee63(params) {
+    var _ref78 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee63(params) {
       return _regenerator().w(function (_context63) {
         while (1) switch (_context63.n) {
           case 0:
@@ -2958,11 +2986,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee63);
     }));
     return function (_x51) {
-      return _ref76.apply(this, arguments);
+      return _ref78.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var pollTransactionStatus = useCallback(/*#__PURE__*/function () {
-    var _ref77 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee64(params) {
+    var _ref79 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee64(params) {
       return _regenerator().w(function (_context64) {
         while (1) switch (_context64.n) {
           case 0:
@@ -2981,11 +3009,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee64);
     }));
     return function (_x52) {
-      return _ref77.apply(this, arguments);
+      return _ref79.apply(this, arguments);
     };
   }(), [client, callbacks]);
   var fetchOrCreateP256ApiKeyUser = useCallback(/*#__PURE__*/function () {
-    var _ref78 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee65(params) {
+    var _ref80 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee65(params) {
       return _regenerator().w(function (_context65) {
         while (1) switch (_context65.n) {
           case 0:
@@ -3004,11 +3032,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee65);
     }));
     return function (_x53) {
-      return _ref78.apply(this, arguments);
+      return _ref80.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var fetchOrCreatePolicies = useCallback(/*#__PURE__*/function () {
-    var _ref79 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee66(params) {
+    var _ref81 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee66(params) {
       return _regenerator().w(function (_context66) {
         while (1) switch (_context66.n) {
           case 0:
@@ -3027,11 +3055,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee66);
     }));
     return function (_x54) {
-      return _ref79.apply(this, arguments);
+      return _ref81.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var updateUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref80 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee67(params) {
+    var _ref82 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee67(params) {
       var res;
       return _regenerator().w(function (_context67) {
         while (1) switch (_context67.n) {
@@ -3068,11 +3096,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee67);
     }));
     return function (_x55) {
-      return _ref80.apply(this, arguments);
+      return _ref82.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
   var removeUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref81 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee68(params) {
+    var _ref83 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee68(params) {
       var res;
       return _regenerator().w(function (_context68) {
         while (1) switch (_context68.n) {
@@ -3109,11 +3137,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee68);
     }));
     return function (_x56) {
-      return _ref81.apply(this, arguments);
+      return _ref83.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
   var updateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref82 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee69(params) {
+    var _ref84 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee69(params) {
       var res;
       return _regenerator().w(function (_context69) {
         while (1) switch (_context69.n) {
@@ -3150,11 +3178,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee69);
     }));
     return function (_x57) {
-      return _ref82.apply(this, arguments);
+      return _ref84.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
   var removeUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref83 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee70(params) {
+    var _ref85 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee70(params) {
       var res;
       return _regenerator().w(function (_context70) {
         while (1) switch (_context70.n) {
@@ -3191,11 +3219,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee70);
     }));
     return function (_x58) {
-      return _ref83.apply(this, arguments);
+      return _ref85.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
   var updateUserName = useCallback(/*#__PURE__*/function () {
-    var _ref84 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee71(params) {
+    var _ref86 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee71(params) {
       var res;
       return _regenerator().w(function (_context71) {
         while (1) switch (_context71.n) {
@@ -3232,11 +3260,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee71);
     }));
     return function (_x59) {
-      return _ref84.apply(this, arguments);
+      return _ref86.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
   var addOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref85 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee72(params) {
+    var _ref87 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee72(params) {
       var res;
       return _regenerator().w(function (_context72) {
         while (1) switch (_context72.n) {
@@ -3273,11 +3301,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee72);
     }));
     return function (_x60) {
-      return _ref85.apply(this, arguments);
+      return _ref87.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
   var removeOauthProviders = useCallback(/*#__PURE__*/function () {
-    var _ref86 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee73(params) {
+    var _ref88 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee73(params) {
       var res;
       return _regenerator().w(function (_context73) {
         while (1) switch (_context73.n) {
@@ -3314,12 +3342,12 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee73);
     }));
     return function (_x61) {
-      return _ref86.apply(this, arguments);
+      return _ref88.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
   var addPasskey = useCallback(/*#__PURE__*/function () {
-    var _ref87 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee74(params) {
-      var res, _masterConfig$auth30, updatedUser;
+    var _ref89 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee74(params) {
+      var res, _masterConfig$auth32, updatedUser;
       return _regenerator().w(function (_context74) {
         while (1) switch (_context74.n) {
           case 0:
@@ -3352,18 +3380,18 @@ var ClientProvider = function ClientProvider(_ref) {
           case 3:
             updatedUser = _context74.v;
             _context74.n = 4;
-            return applyPasskeyScope(client, client.config.passkeyConfig, updatedUser, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth30 = masterConfig.auth) === null || _masterConfig$auth30 === void 0 ? void 0 : _masterConfig$auth30.scopePasskeyToUser);
+            return applyPasskeyScope(client, client.config.passkeyConfig, updatedUser, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth32 = masterConfig.auth) === null || _masterConfig$auth32 === void 0 ? void 0 : _masterConfig$auth32.scopePasskeyToUser);
           case 4:
             return _context74.a(2, res);
         }
       }, _callee74);
     }));
     return function (_x62) {
-      return _ref87.apply(this, arguments);
+      return _ref89.apply(this, arguments);
     };
-  }(), [client, callbacks, logout, maybeRefreshUser, masterConfig === null || masterConfig === void 0 ? void 0 : masterConfig.passkeyConfig, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth31 = masterConfig.auth) === null || _masterConfig$auth31 === void 0 ? void 0 : _masterConfig$auth31.scopePasskeyToUser]);
+  }(), [client, callbacks, logout, maybeRefreshUser, masterConfig === null || masterConfig === void 0 ? void 0 : masterConfig.passkeyConfig, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth33 = masterConfig.auth) === null || _masterConfig$auth33 === void 0 ? void 0 : _masterConfig$auth33.scopePasskeyToUser]);
   var removePasskeys = useCallback(/*#__PURE__*/function () {
-    var _ref88 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee75(params) {
+    var _ref90 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee75(params) {
       var res;
       return _regenerator().w(function (_context75) {
         while (1) switch (_context75.n) {
@@ -3400,11 +3428,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee75);
     }));
     return function (_x63) {
-      return _ref88.apply(this, arguments);
+      return _ref90.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
   var createWallet = useCallback(/*#__PURE__*/function () {
-    var _ref89 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee76(params) {
+    var _ref91 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee76(params) {
       var res, s;
       return _regenerator().w(function (_context76) {
         while (1) switch (_context76.n) {
@@ -3443,11 +3471,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee76);
     }));
     return function (_x64) {
-      return _ref89.apply(this, arguments);
+      return _ref91.apply(this, arguments);
     };
   }(), [client, session, callbacks, logout, maybeRefreshWallets, getSession]);
   var createWalletAccounts = useCallback(/*#__PURE__*/function () {
-    var _ref90 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee77(params) {
+    var _ref92 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee77(params) {
       var res, s;
       return _regenerator().w(function (_context77) {
         while (1) switch (_context77.n) {
@@ -3486,11 +3514,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee77);
     }));
     return function (_x65) {
-      return _ref90.apply(this, arguments);
+      return _ref92.apply(this, arguments);
     };
   }(), [client, session, callbacks, logout, getSession, maybeRefreshWallets]);
   var exportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref91 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee78(params) {
+    var _ref93 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee78(params) {
       var res, s;
       return _regenerator().w(function (_context78) {
         while (1) switch (_context78.n) {
@@ -3529,11 +3557,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee78);
     }));
     return function (_x66) {
-      return _ref91.apply(this, arguments);
+      return _ref93.apply(this, arguments);
     };
   }(), [client, session, callbacks, logout, getSession, maybeRefreshWallets]);
   var exportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref92 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee79(params) {
+    var _ref94 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee79(params) {
       var res;
       return _regenerator().w(function (_context79) {
         while (1) switch (_context79.n) {
@@ -3557,11 +3585,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee79);
     }));
     return function (_x67) {
-      return _ref92.apply(this, arguments);
+      return _ref94.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var exportWalletAccount = useCallback(/*#__PURE__*/function () {
-    var _ref93 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee80(params) {
+    var _ref95 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee80(params) {
       var res, s;
       return _regenerator().w(function (_context80) {
         while (1) switch (_context80.n) {
@@ -3600,11 +3628,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee80);
     }));
     return function (_x68) {
-      return _ref93.apply(this, arguments);
+      return _ref95.apply(this, arguments);
     };
   }(), [client, callbacks, logout, getSession, maybeRefreshWallets]);
   var importWallet = useCallback(/*#__PURE__*/function () {
-    var _ref94 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee81(params) {
+    var _ref96 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee81(params) {
       var res, s;
       return _regenerator().w(function (_context81) {
         while (1) switch (_context81.n) {
@@ -3645,11 +3673,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee81);
     }));
     return function (_x69) {
-      return _ref94.apply(this, arguments);
+      return _ref96.apply(this, arguments);
     };
   }(), [client, callbacks, logout, getSession, maybeRefreshWallets]);
   var importPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref95 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee82(params) {
+    var _ref97 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee82(params) {
       var res;
       return _regenerator().w(function (_context82) {
         while (1) switch (_context82.n) {
@@ -3673,11 +3701,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee82);
     }));
     return function (_x70) {
-      return _ref95.apply(this, arguments);
+      return _ref97.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var deleteSubOrganization = useCallback(/*#__PURE__*/function () {
-    var _ref96 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee83(params) {
+    var _ref98 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee83(params) {
       return _regenerator().w(function (_context83) {
         while (1) switch (_context83.n) {
           case 0:
@@ -3696,12 +3724,12 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee83);
     }));
     return function (_x71) {
-      return _ref96.apply(this, arguments);
+      return _ref98.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var storeSession = useCallback(/*#__PURE__*/function () {
-    var _ref97 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee84(params) {
-      var _masterConfig$auth32;
+    var _ref99 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee84(params) {
+      var _masterConfig$auth34;
       var sessionKey, session, allSessions, nextUser;
       return _regenerator().w(function (_context84) {
         while (1) switch (_context84.n) {
@@ -3757,16 +3785,16 @@ var ClientProvider = function ClientProvider(_ref) {
               break;
             }
             _context84.n = 9;
-            return applyPasskeyScope(client, client.config.passkeyConfig, nextUser, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth32 = masterConfig.auth) === null || _masterConfig$auth32 === void 0 ? void 0 : _masterConfig$auth32.scopePasskeyToUser);
+            return applyPasskeyScope(client, client.config.passkeyConfig, nextUser, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth34 = masterConfig.auth) === null || _masterConfig$auth34 === void 0 ? void 0 : _masterConfig$auth34.scopePasskeyToUser);
           case 9:
             return _context84.a(2);
         }
       }, _callee84);
     }));
     return function (_x72) {
-      return _ref97.apply(this, arguments);
+      return _ref99.apply(this, arguments);
     };
-  }(), [client, callbacks, logout, getActiveSessionKey, getSession, scheduleSessionExpiration, getAllSessions, masterConfig === null || masterConfig === void 0 ? void 0 : masterConfig.passkeyConfig, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth33 = masterConfig.auth) === null || _masterConfig$auth33 === void 0 ? void 0 : _masterConfig$auth33.scopePasskeyToUser, maybeRefreshWallets, maybeRefreshUser]);
+  }(), [client, callbacks, logout, getActiveSessionKey, getSession, scheduleSessionExpiration, getAllSessions, masterConfig === null || masterConfig === void 0 ? void 0 : masterConfig.passkeyConfig, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth35 = masterConfig.auth) === null || _masterConfig$auth35 === void 0 ? void 0 : _masterConfig$auth35.scopePasskeyToUser, maybeRefreshWallets, maybeRefreshUser]);
   var clearAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee85() {
     return _regenerator().w(function (_context85) {
       while (1) switch (_context85.n) {
@@ -3797,8 +3825,8 @@ var ClientProvider = function ClientProvider(_ref) {
     }, _callee85);
   })), [client, callbacks, logout, clearSessionTimeouts, masterConfig === null || masterConfig === void 0 ? void 0 : masterConfig.passkeyConfig]);
   var setActiveSession = useCallback(/*#__PURE__*/function () {
-    var _ref99 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee87(params) {
-      var session, s;
+    var _ref101 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee87(params) {
+      var s;
       return _regenerator().w(function (_context87) {
         while (1) switch (_context87.n) {
           case 0:
@@ -3809,36 +3837,28 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             _context87.n = 2;
-            return withTurnkeyErrorHandling(function () {
-              return client.getSession({
-                sessionKey: params.sessionKey
-              });
-            }, function () {
-              return logout();
-            }, callbacks, "Failed to get session");
+            return getSession({
+              sessionKey: params.sessionKey
+            });
           case 2:
-            session = _context87.v;
-            _context87.n = 3;
-            return getSession();
-          case 3:
             s = _context87.v;
             if (s) {
-              _context87.n = 4;
+              _context87.n = 3;
               break;
             }
             throw new TurnkeyError("Session not found.", TurnkeyErrorCodes.NOT_FOUND);
-          case 4:
-            _context87.n = 5;
+          case 3:
+            _context87.n = 4;
             return withTurnkeyErrorHandling(function () {
               return client.setActiveSession(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to set active session");
-          case 5:
+          case 4:
             setSession(session);
-            _context87.n = 6;
+            _context87.n = 5;
             return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee86() {
-              var _masterConfig$auth34;
+              var _masterConfig$auth36;
               var nextUser;
               return _regenerator().w(function (_context86) {
                 while (1) switch (_context86.n) {
@@ -3855,7 +3875,7 @@ var ClientProvider = function ClientProvider(_ref) {
                       break;
                     }
                     _context86.n = 3;
-                    return applyPasskeyScope(client, client.config.passkeyConfig, nextUser, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth34 = masterConfig.auth) === null || _masterConfig$auth34 === void 0 ? void 0 : _masterConfig$auth34.scopePasskeyToUser);
+                    return applyPasskeyScope(client, client.config.passkeyConfig, nextUser, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth36 = masterConfig.auth) === null || _masterConfig$auth36 === void 0 ? void 0 : _masterConfig$auth36.scopePasskeyToUser);
                   case 3:
                     return _context86.a(2);
                 }
@@ -3863,15 +3883,15 @@ var ClientProvider = function ClientProvider(_ref) {
             })), function () {
               return logout();
             }, callbacks, "Failed to refresh data after setting active session");
-          case 6:
+          case 5:
             return _context87.a(2);
         }
       }, _callee87);
     }));
     return function (_x73) {
-      return _ref99.apply(this, arguments);
+      return _ref101.apply(this, arguments);
     };
-  }(), [client, callbacks, logout, getSession, masterConfig === null || masterConfig === void 0 ? void 0 : masterConfig.passkeyConfig, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth35 = masterConfig.auth) === null || _masterConfig$auth35 === void 0 ? void 0 : _masterConfig$auth35.scopePasskeyToUser, maybeRefreshWallets, maybeRefreshUser]);
+  }(), [client, callbacks, logout, getSession, masterConfig === null || masterConfig === void 0 ? void 0 : masterConfig.passkeyConfig, masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth37 = masterConfig.auth) === null || _masterConfig$auth37 === void 0 ? void 0 : _masterConfig$auth37.scopePasskeyToUser, maybeRefreshWallets, maybeRefreshUser]);
   var clearUnusedKeyPairs = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee88() {
     return _regenerator().w(function (_context88) {
       while (1) switch (_context88.n) {
@@ -3889,7 +3909,7 @@ var ClientProvider = function ClientProvider(_ref) {
     }, _callee88);
   })), [client, callbacks]);
   var createApiKeyPair = useCallback(/*#__PURE__*/function () {
-    var _ref102 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee89(params) {
+    var _ref104 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee89(params) {
       return _regenerator().w(function (_context89) {
         while (1) switch (_context89.n) {
           case 0:
@@ -3906,11 +3926,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee89);
     }));
     return function (_x74) {
-      return _ref102.apply(this, arguments);
+      return _ref104.apply(this, arguments);
     };
   }(), [client, callbacks]);
   var deleteApiKeyPair = useCallback(/*#__PURE__*/function () {
-    var _ref103 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee90(params) {
+    var _ref105 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee90(params) {
       return _regenerator().w(function (_context90) {
         while (1) switch (_context90.n) {
           case 0:
@@ -3927,11 +3947,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee90);
     }));
     return function (_x75) {
-      return _ref103.apply(this, arguments);
+      return _ref105.apply(this, arguments);
     };
   }(), [client, callbacks]);
   var signWithApiKey = useCallback(/*#__PURE__*/function () {
-    var _ref104 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee91(params) {
+    var _ref106 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee91(params) {
       return _regenerator().w(function (_context91) {
         while (1) switch (_context91.n) {
           case 0:
@@ -3948,7 +3968,7 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee91);
     }));
     return function (_x76) {
-      return _ref104.apply(this, arguments);
+      return _ref106.apply(this, arguments);
     };
   }(), [client, callbacks]);
   var getProxyAuthConfig = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee92() {
@@ -3968,7 +3988,7 @@ var ClientProvider = function ClientProvider(_ref) {
     }, _callee92);
   })), [client, callbacks]);
   var fetchBootProofForAppProof = useCallback(/*#__PURE__*/function () {
-    var _ref106 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee93(params) {
+    var _ref108 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee93(params) {
       return _regenerator().w(function (_context93) {
         while (1) switch (_context93.n) {
           case 0:
@@ -3987,11 +4007,11 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee93);
     }));
     return function (_x77) {
-      return _ref106.apply(this, arguments);
+      return _ref108.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var verifyAppProofs = useCallback(/*#__PURE__*/function () {
-    var _ref107 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee94(params) {
+    var _ref109 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee94(params) {
       return _regenerator().w(function (_context94) {
         while (1) switch (_context94.n) {
           case 0:
@@ -4010,54 +4030,78 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee94);
     }));
     return function (_x78) {
-      return _ref107.apply(this, arguments);
+      return _ref109.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
+  var setMfaHandler = useCallback(function (handler) {
+    mfaHandlerRef.current = handler;
+    // Apply immediately if the client is ready.
+    // When a custom handler is set, route the httpClient's MFA callback to it.
+    // When cleared, restore the default httpClient behavior (no onMfaRequired callback).
+    if (client) {
+      client.httpClient.config.onMfaRequired = handler ? (/*#__PURE__*/function () {
+        var _ref110 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee95(ctx) {
+          return _regenerator().w(function (_context95) {
+            while (1) switch (_context95.n) {
+              case 0:
+                _context95.n = 1;
+                return handler(ctx);
+              case 1:
+                return _context95.a(2);
+            }
+          }, _callee95);
+        }));
+        return function (_x79) {
+          return _ref110.apply(this, arguments);
+        };
+      }()) : undefined;
+    }
+  }, [client]);
   var handleDiscordOauth = useCallback(/*#__PURE__*/function () {
-    var _ref108 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee96(params) {
-      var _masterConfig$auth36, _masterConfig$auth36$, _masterConfig$auth36$2, _masterConfig$auth$oa4, _masterConfig$auth37, _masterConfig$auth37$, _masterConfig$auth37$2, _masterConfig$auth$oa5, _masterConfig$auth38, _masterConfig$auth38$, _masterConfig$auth39, _masterConfig$auth39$, _masterConfig$auth40;
-      var _ref109, _ref109$primaryClient, primaryClientId, _ref109$secondaryClie, secondaryClientIds, _ref109$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, authUrl, authWindow;
-      return _regenerator().w(function (_context96) {
-        while (1) switch (_context96.n) {
+    var _ref111 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee98(params) {
+      var _masterConfig$auth38, _masterConfig$auth38$, _masterConfig$auth38$2, _masterConfig$auth$oa4, _masterConfig$auth39, _masterConfig$auth39$, _masterConfig$auth39$2, _masterConfig$auth$oa5, _masterConfig$auth40, _masterConfig$auth40$, _masterConfig$auth41, _masterConfig$auth41$, _masterConfig$auth42;
+      var _ref112, _ref112$primaryClient, primaryClientId, _ref112$secondaryClie, secondaryClientIds, _ref112$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, authUrl, authWindow;
+      return _regenerator().w(function (_context98) {
+        while (1) switch (_context98.n) {
           case 0:
-            _ref109 = params || {}, _ref109$primaryClient = _ref109.primaryClientId, primaryClientId = _ref109$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth36 = masterConfig.auth) === null || _masterConfig$auth36 === void 0 ? void 0 : (_masterConfig$auth36$ = _masterConfig$auth36.oauthConfig) === null || _masterConfig$auth36$ === void 0 ? void 0 : (_masterConfig$auth36$2 = _masterConfig$auth36$.discord) === null || _masterConfig$auth36$2 === void 0 ? void 0 : _masterConfig$auth36$2.primaryClientId : _ref109$primaryClient, _ref109$secondaryClie = _ref109.secondaryClientIds, secondaryClientIds = _ref109$secondaryClie === void 0 ? (_masterConfig$auth$oa4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth37 = masterConfig.auth) === null || _masterConfig$auth37 === void 0 ? void 0 : (_masterConfig$auth37$ = _masterConfig$auth37.oauthConfig) === null || _masterConfig$auth37$ === void 0 ? void 0 : (_masterConfig$auth37$2 = _masterConfig$auth37$.discord) === null || _masterConfig$auth37$2 === void 0 ? void 0 : _masterConfig$auth37$2.secondaryClientIds) !== null && _masterConfig$auth$oa4 !== void 0 ? _masterConfig$auth$oa4 : [] : _ref109$secondaryClie, _ref109$openInPage = _ref109.openInPage, openInPage = _ref109$openInPage === void 0 ? (_masterConfig$auth$oa5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth38 = masterConfig.auth) === null || _masterConfig$auth38 === void 0 ? void 0 : (_masterConfig$auth38$ = _masterConfig$auth38.oauthConfig) === null || _masterConfig$auth38$ === void 0 ? void 0 : _masterConfig$auth38$.openOauthInPage) !== null && _masterConfig$auth$oa5 !== void 0 ? _masterConfig$auth$oa5 : false : _ref109$openInPage, additionalParameters = _ref109.additionalState, captchaToken = _ref109.captchaToken;
+            _ref112 = params || {}, _ref112$primaryClient = _ref112.primaryClientId, primaryClientId = _ref112$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth38 = masterConfig.auth) === null || _masterConfig$auth38 === void 0 ? void 0 : (_masterConfig$auth38$ = _masterConfig$auth38.oauthConfig) === null || _masterConfig$auth38$ === void 0 ? void 0 : (_masterConfig$auth38$2 = _masterConfig$auth38$.discord) === null || _masterConfig$auth38$2 === void 0 ? void 0 : _masterConfig$auth38$2.primaryClientId : _ref112$primaryClient, _ref112$secondaryClie = _ref112.secondaryClientIds, secondaryClientIds = _ref112$secondaryClie === void 0 ? (_masterConfig$auth$oa4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth39 = masterConfig.auth) === null || _masterConfig$auth39 === void 0 ? void 0 : (_masterConfig$auth39$ = _masterConfig$auth39.oauthConfig) === null || _masterConfig$auth39$ === void 0 ? void 0 : (_masterConfig$auth39$2 = _masterConfig$auth39$.discord) === null || _masterConfig$auth39$2 === void 0 ? void 0 : _masterConfig$auth39$2.secondaryClientIds) !== null && _masterConfig$auth$oa4 !== void 0 ? _masterConfig$auth$oa4 : [] : _ref112$secondaryClie, _ref112$openInPage = _ref112.openInPage, openInPage = _ref112$openInPage === void 0 ? (_masterConfig$auth$oa5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth40 = masterConfig.auth) === null || _masterConfig$auth40 === void 0 ? void 0 : (_masterConfig$auth40$ = _masterConfig$auth40.oauthConfig) === null || _masterConfig$auth40$ === void 0 ? void 0 : _masterConfig$auth40$.openOauthInPage) !== null && _masterConfig$auth$oa5 !== void 0 ? _masterConfig$auth$oa5 : false : _ref112$openInPage, additionalParameters = _ref112.additionalState, captchaToken = _ref112.captchaToken;
             clientId = primaryClientId;
             provider = OAuthProviders.DISCORD;
             if (masterConfig) {
-              _context96.n = 1;
+              _context98.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context96.n = 2;
+              _context98.n = 2;
               break;
             }
             throw new TurnkeyError("Discord Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
-            if ((_masterConfig$auth39 = masterConfig.auth) !== null && _masterConfig$auth39 !== void 0 && (_masterConfig$auth39$ = _masterConfig$auth39.oauthConfig) !== null && _masterConfig$auth39$ !== void 0 && _masterConfig$auth39$.oauthRedirectUri) {
-              _context96.n = 3;
+            if ((_masterConfig$auth41 = masterConfig.auth) !== null && _masterConfig$auth41 !== void 0 && (_masterConfig$auth41$ = _masterConfig$auth41.oauthConfig) !== null && _masterConfig$auth41$ !== void 0 && _masterConfig$auth41$.oauthRedirectUri) {
+              _context98.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup";
-            redirectUri = (_masterConfig$auth40 = masterConfig.auth) === null || _masterConfig$auth40 === void 0 ? void 0 : _masterConfig$auth40.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context96.n = 4;
+            redirectUri = (_masterConfig$auth42 = masterConfig.auth) === null || _masterConfig$auth42 === void 0 ? void 0 : _masterConfig$auth42.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
+            _context98.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context96.v;
+            publicKey = _context98.v;
             if (publicKey) {
-              _context96.n = 5;
+              _context98.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 5:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair and store verifier
-            _context96.n = 6;
+            _context98.n = 6;
             return generateChallengePair();
           case 6:
-            _yield$generateChalle = _context96.v;
+            _yield$generateChalle = _context98.v;
             verifier = _yield$generateChalle.verifier;
             codeChallenge = _yield$generateChalle.codeChallenge;
             storePKCEVerifier(provider, verifier);
@@ -4077,143 +4121,167 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: _objectSpread2({}, additionalParameters)
             });
             if (!openInPage) {
-              _context96.n = 7;
+              _context98.n = 7;
               break;
             }
-            return _context96.a(2, redirectToOAuthProvider(authUrl));
+            return _context98.a(2, redirectToOAuthProvider(authUrl));
           case 7:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context96.n = 8;
+              _context98.n = 8;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 8:
             authWindow.location.href = authUrl;
-            return _context96.a(2, new Promise(function (resolve, reject) {
-              var interval = setInterval(function () {
-                try {
-                  if (authWindow.closed) {
-                    clearInterval(interval);
-                    reject(new Error("Authentication window was closed."));
-                    return;
-                  }
-                  var url = authWindow.location.href || "";
-                  if (url.startsWith(window.location.origin)) {
-                    var result = parseOAuthResponse(url, provider);
-                    if (result) {
-                      authWindow.close();
+            return _context98.a(2, new Promise(function (resolve, reject) {
+              var interval = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee97() {
+                var url, result;
+                return _regenerator().w(function (_context97) {
+                  while (1) switch (_context97.p = _context97.n) {
+                    case 0:
+                      _context97.p = 0;
+                      if (!authWindow.closed) {
+                        _context97.n = 1;
+                        break;
+                      }
                       clearInterval(interval);
-                      completeOAuthPopup({
-                        provider: provider,
-                        publicKey: publicKey,
-                        result: result,
-                        callbacks: callbacks,
-                        completeOauth: function completeOauth(completionParams) {
-                          var _masterConfig$auth41, _masterConfig$auth41$, _completionParams$pro3, _existingCreateSubOrg3;
-                          var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth41 = masterConfig.auth) === null || _masterConfig$auth41 === void 0 ? void 0 : (_masterConfig$auth41$ = _masterConfig$auth41.createSuborgParams) === null || _masterConfig$auth41$ === void 0 ? void 0 : _masterConfig$auth41$.oauth;
-                          var secondaryProviders = buildSecondaryOauthProviders(completionParams.oidcToken, (_completionParams$pro3 = completionParams.providerName) !== null && _completionParams$pro3 !== void 0 ? _completionParams$pro3 : provider, secondaryClientIds);
-                          return _completeOauth(_objectSpread2(_objectSpread2({}, completionParams), secondaryProviders.length > 0 && {
-                            createSubOrgParams: _objectSpread2(_objectSpread2({}, existingCreateSubOrgParams), {}, {
-                              oauthProviders: [].concat(_toConsumableArray((_existingCreateSubOrg3 = existingCreateSubOrgParams === null || existingCreateSubOrgParams === void 0 ? void 0 : existingCreateSubOrgParams.oauthProviders) !== null && _existingCreateSubOrg3 !== void 0 ? _existingCreateSubOrg3 : []), _toConsumableArray(secondaryProviders))
-                            })
-                          }));
-                        },
-                        captchaToken: captchaToken,
-                        onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
-                        exchangeCodeForToken: function () {
-                          var _exchangeCodeForToken = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee95(codeVerifier) {
-                            var _resp$oidcToken;
-                            var resp;
-                            return _regenerator().w(function (_context95) {
-                              while (1) switch (_context95.n) {
-                                case 0:
-                                  _context95.n = 1;
-                                  return client === null || client === void 0 ? void 0 : client.httpClient.proxyOAuth2Authenticate({
-                                    provider: "OAUTH2_PROVIDER_DISCORD",
-                                    authCode: result.authCode,
-                                    redirectUri: redirectUri,
-                                    codeVerifier: codeVerifier,
-                                    clientId: clientId,
-                                    nonce: nonce
-                                  });
-                                case 1:
-                                  resp = _context95.v;
-                                  return _context95.a(2, (_resp$oidcToken = resp === null || resp === void 0 ? void 0 : resp.oidcToken) !== null && _resp$oidcToken !== void 0 ? _resp$oidcToken : "");
+                      reject(new Error("Authentication window was closed."));
+                      return _context97.a(2);
+                    case 1:
+                      url = authWindow.location.href || "";
+                      if (isExpectedOAuthRedirectUrl(url, redirectUri, OAUTH_PROVIDER_CONFIGS[provider].expectedResponseMode)) {
+                        result = parseOAuthResponse(url, provider);
+                        if (result) {
+                          authWindow.close();
+                          clearInterval(interval);
+                          completeOAuthPopup({
+                            provider: provider,
+                            publicKey: publicKey,
+                            result: result,
+                            callbacks: callbacks,
+                            completeOauth: function completeOauth(completionParams) {
+                              var _masterConfig$auth43, _masterConfig$auth43$, _completionParams$pro3, _existingCreateSubOrg3;
+                              var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth43 = masterConfig.auth) === null || _masterConfig$auth43 === void 0 ? void 0 : (_masterConfig$auth43$ = _masterConfig$auth43.createSuborgParams) === null || _masterConfig$auth43$ === void 0 ? void 0 : _masterConfig$auth43$.oauth;
+                              var secondaryProviders = buildSecondaryOauthProviders(completionParams.oidcToken, (_completionParams$pro3 = completionParams.providerName) !== null && _completionParams$pro3 !== void 0 ? _completionParams$pro3 : provider, secondaryClientIds);
+                              return _completeOauth(_objectSpread2(_objectSpread2({}, completionParams), secondaryProviders.length > 0 && {
+                                createSubOrgParams: _objectSpread2(_objectSpread2({}, existingCreateSubOrgParams), {}, {
+                                  oauthProviders: [].concat(_toConsumableArray((_existingCreateSubOrg3 = existingCreateSubOrgParams === null || existingCreateSubOrgParams === void 0 ? void 0 : existingCreateSubOrgParams.oauthProviders) !== null && _existingCreateSubOrg3 !== void 0 ? _existingCreateSubOrg3 : []), _toConsumableArray(secondaryProviders))
+                                })
+                              }));
+                            },
+                            captchaToken: captchaToken,
+                            onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
+                            exchangeCodeForToken: function () {
+                              var _exchangeCodeForToken = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee96(codeVerifier) {
+                                var _resp$oidcToken;
+                                var resp, oidcToken;
+                                return _regenerator().w(function (_context96) {
+                                  while (1) switch (_context96.n) {
+                                    case 0:
+                                      _context96.n = 1;
+                                      return client === null || client === void 0 ? void 0 : client.httpClient.proxyOAuth2Authenticate({
+                                        provider: "OAUTH2_PROVIDER_DISCORD",
+                                        authCode: result.authCode,
+                                        redirectUri: redirectUri,
+                                        codeVerifier: codeVerifier,
+                                        clientId: clientId,
+                                        nonce: nonce
+                                      });
+                                    case 1:
+                                      resp = _context96.v;
+                                      oidcToken = (_resp$oidcToken = resp === null || resp === void 0 ? void 0 : resp.oidcToken) !== null && _resp$oidcToken !== void 0 ? _resp$oidcToken : ""; // Set the attested stamper with the oidcToken
+                                      if (!oidcToken) {
+                                        _context96.n = 2;
+                                        break;
+                                      }
+                                      _context96.n = 2;
+                                      return client === null || client === void 0 ? void 0 : client.overrideAttestedStamper({
+                                        oidcToken: oidcToken,
+                                        publicKey: publicKey
+                                      });
+                                    case 2:
+                                      return _context96.a(2, oidcToken);
+                                  }
+                                }, _callee96);
+                              }));
+                              function exchangeCodeForToken(_x81) {
+                                return _exchangeCodeForToken.apply(this, arguments);
                               }
-                            }, _callee95);
-                          }));
-                          function exchangeCodeForToken(_x80) {
-                            return _exchangeCodeForToken.apply(this, arguments);
-                          }
-                          return exchangeCodeForToken;
-                        }()
-                      }).then(function () {
-                        return resolve();
-                      })["catch"](reject);
-                    }
+                              return exchangeCodeForToken;
+                            }()
+                          }).then(function () {
+                            return resolve();
+                          })["catch"](reject);
+                        }
+                      }
+                      _context97.n = 3;
+                      break;
+                    case 2:
+                      _context97.p = 2;
+                      _context97.v;
+                    case 3:
+                      return _context97.a(2);
                   }
-                } catch (_unused) {
-                  // ignore cross-origin
-                }
-              }, 500);
+                }, _callee97, null, [[0, 2]]);
+              })), 500);
               if (authWindow.closed) {
                 clearInterval(interval);
               }
             }));
         }
-      }, _callee96);
+      }, _callee98);
     }));
-    return function (_x79) {
-      return _ref108.apply(this, arguments);
+    return function (_x80) {
+      return _ref111.apply(this, arguments);
     };
   }(), [client, callbacks, _completeOauth, createApiKeyPair, masterConfig]);
   var handleXOauth = useCallback(/*#__PURE__*/function () {
-    var _ref110 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee98(params) {
-      var _masterConfig$auth42, _masterConfig$auth42$, _masterConfig$auth42$2, _masterConfig$auth$oa6, _masterConfig$auth43, _masterConfig$auth43$, _masterConfig$auth43$2, _masterConfig$auth$oa7, _masterConfig$auth44, _masterConfig$auth44$, _masterConfig$auth45, _masterConfig$auth45$, _masterConfig$auth46;
-      var _ref111, _ref111$primaryClient, primaryClientId, _ref111$secondaryClie, secondaryClientIds, _ref111$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle2, verifier, codeChallenge, authUrl, authWindow;
-      return _regenerator().w(function (_context98) {
-        while (1) switch (_context98.n) {
+    var _ref114 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee101(params) {
+      var _masterConfig$auth44, _masterConfig$auth44$, _masterConfig$auth44$2, _masterConfig$auth$oa6, _masterConfig$auth45, _masterConfig$auth45$, _masterConfig$auth45$2, _masterConfig$auth$oa7, _masterConfig$auth46, _masterConfig$auth46$, _masterConfig$auth47, _masterConfig$auth47$, _masterConfig$auth48;
+      var _ref115, _ref115$primaryClient, primaryClientId, _ref115$secondaryClie, secondaryClientIds, _ref115$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle2, verifier, codeChallenge, authUrl, authWindow;
+      return _regenerator().w(function (_context101) {
+        while (1) switch (_context101.n) {
           case 0:
-            _ref111 = params || {}, _ref111$primaryClient = _ref111.primaryClientId, primaryClientId = _ref111$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth42 = masterConfig.auth) === null || _masterConfig$auth42 === void 0 ? void 0 : (_masterConfig$auth42$ = _masterConfig$auth42.oauthConfig) === null || _masterConfig$auth42$ === void 0 ? void 0 : (_masterConfig$auth42$2 = _masterConfig$auth42$.x) === null || _masterConfig$auth42$2 === void 0 ? void 0 : _masterConfig$auth42$2.primaryClientId : _ref111$primaryClient, _ref111$secondaryClie = _ref111.secondaryClientIds, secondaryClientIds = _ref111$secondaryClie === void 0 ? (_masterConfig$auth$oa6 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth43 = masterConfig.auth) === null || _masterConfig$auth43 === void 0 ? void 0 : (_masterConfig$auth43$ = _masterConfig$auth43.oauthConfig) === null || _masterConfig$auth43$ === void 0 ? void 0 : (_masterConfig$auth43$2 = _masterConfig$auth43$.x) === null || _masterConfig$auth43$2 === void 0 ? void 0 : _masterConfig$auth43$2.secondaryClientIds) !== null && _masterConfig$auth$oa6 !== void 0 ? _masterConfig$auth$oa6 : [] : _ref111$secondaryClie, _ref111$openInPage = _ref111.openInPage, openInPage = _ref111$openInPage === void 0 ? (_masterConfig$auth$oa7 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth44 = masterConfig.auth) === null || _masterConfig$auth44 === void 0 ? void 0 : (_masterConfig$auth44$ = _masterConfig$auth44.oauthConfig) === null || _masterConfig$auth44$ === void 0 ? void 0 : _masterConfig$auth44$.openOauthInPage) !== null && _masterConfig$auth$oa7 !== void 0 ? _masterConfig$auth$oa7 : false : _ref111$openInPage, additionalParameters = _ref111.additionalState, captchaToken = _ref111.captchaToken;
+            _ref115 = params || {}, _ref115$primaryClient = _ref115.primaryClientId, primaryClientId = _ref115$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth44 = masterConfig.auth) === null || _masterConfig$auth44 === void 0 ? void 0 : (_masterConfig$auth44$ = _masterConfig$auth44.oauthConfig) === null || _masterConfig$auth44$ === void 0 ? void 0 : (_masterConfig$auth44$2 = _masterConfig$auth44$.x) === null || _masterConfig$auth44$2 === void 0 ? void 0 : _masterConfig$auth44$2.primaryClientId : _ref115$primaryClient, _ref115$secondaryClie = _ref115.secondaryClientIds, secondaryClientIds = _ref115$secondaryClie === void 0 ? (_masterConfig$auth$oa6 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth45 = masterConfig.auth) === null || _masterConfig$auth45 === void 0 ? void 0 : (_masterConfig$auth45$ = _masterConfig$auth45.oauthConfig) === null || _masterConfig$auth45$ === void 0 ? void 0 : (_masterConfig$auth45$2 = _masterConfig$auth45$.x) === null || _masterConfig$auth45$2 === void 0 ? void 0 : _masterConfig$auth45$2.secondaryClientIds) !== null && _masterConfig$auth$oa6 !== void 0 ? _masterConfig$auth$oa6 : [] : _ref115$secondaryClie, _ref115$openInPage = _ref115.openInPage, openInPage = _ref115$openInPage === void 0 ? (_masterConfig$auth$oa7 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth46 = masterConfig.auth) === null || _masterConfig$auth46 === void 0 ? void 0 : (_masterConfig$auth46$ = _masterConfig$auth46.oauthConfig) === null || _masterConfig$auth46$ === void 0 ? void 0 : _masterConfig$auth46$.openOauthInPage) !== null && _masterConfig$auth$oa7 !== void 0 ? _masterConfig$auth$oa7 : false : _ref115$openInPage, additionalParameters = _ref115.additionalState, captchaToken = _ref115.captchaToken;
             clientId = primaryClientId;
             provider = OAuthProviders.X;
             if (masterConfig) {
-              _context98.n = 1;
+              _context101.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context98.n = 2;
+              _context101.n = 2;
               break;
             }
             throw new TurnkeyError("Twitter Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
-            if ((_masterConfig$auth45 = masterConfig.auth) !== null && _masterConfig$auth45 !== void 0 && (_masterConfig$auth45$ = _masterConfig$auth45.oauthConfig) !== null && _masterConfig$auth45$ !== void 0 && _masterConfig$auth45$.oauthRedirectUri) {
-              _context98.n = 3;
+            if ((_masterConfig$auth47 = masterConfig.auth) !== null && _masterConfig$auth47 !== void 0 && (_masterConfig$auth47$ = _masterConfig$auth47.oauthConfig) !== null && _masterConfig$auth47$ !== void 0 && _masterConfig$auth47$.oauthRedirectUri) {
+              _context101.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup";
-            redirectUri = (_masterConfig$auth46 = masterConfig.auth) === null || _masterConfig$auth46 === void 0 ? void 0 : _masterConfig$auth46.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context98.n = 4;
+            redirectUri = (_masterConfig$auth48 = masterConfig.auth) === null || _masterConfig$auth48 === void 0 ? void 0 : _masterConfig$auth48.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
+            _context101.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context98.v;
+            publicKey = _context101.v;
             if (publicKey) {
-              _context98.n = 5;
+              _context101.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 5:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair and store verifier
-            _context98.n = 6;
+            _context101.n = 6;
             return generateChallengePair();
           case 6:
-            _yield$generateChalle2 = _context98.v;
+            _yield$generateChalle2 = _context101.v;
             verifier = _yield$generateChalle2.verifier;
             codeChallenge = _yield$generateChalle2.codeChallenge;
             storePKCEVerifier(provider, verifier);
@@ -4233,134 +4301,158 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: _objectSpread2({}, additionalParameters)
             });
             if (!openInPage) {
-              _context98.n = 7;
+              _context101.n = 7;
               break;
             }
-            return _context98.a(2, redirectToOAuthProvider(authUrl));
+            return _context101.a(2, redirectToOAuthProvider(authUrl));
           case 7:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context98.n = 8;
+              _context101.n = 8;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 8:
             authWindow.location.href = authUrl;
-            return _context98.a(2, new Promise(function (resolve, reject) {
-              var interval = setInterval(function () {
-                try {
-                  if (authWindow.closed) {
-                    clearInterval(interval);
-                    reject(new Error("Authentication window was closed."));
-                    return;
-                  }
-                  var url = authWindow.location.href || "";
-                  if (url.startsWith(window.location.origin)) {
-                    var result = parseOAuthResponse(url, provider);
-                    if (result) {
-                      authWindow.close();
+            return _context101.a(2, new Promise(function (resolve, reject) {
+              var interval = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee100() {
+                var url, result;
+                return _regenerator().w(function (_context100) {
+                  while (1) switch (_context100.p = _context100.n) {
+                    case 0:
+                      _context100.p = 0;
+                      if (!authWindow.closed) {
+                        _context100.n = 1;
+                        break;
+                      }
                       clearInterval(interval);
-                      completeOAuthPopup({
-                        provider: provider,
-                        publicKey: publicKey,
-                        result: result,
-                        callbacks: callbacks,
-                        completeOauth: function completeOauth(completionParams) {
-                          var _masterConfig$auth47, _masterConfig$auth47$, _completionParams$pro4, _existingCreateSubOrg4;
-                          var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth47 = masterConfig.auth) === null || _masterConfig$auth47 === void 0 ? void 0 : (_masterConfig$auth47$ = _masterConfig$auth47.createSuborgParams) === null || _masterConfig$auth47$ === void 0 ? void 0 : _masterConfig$auth47$.oauth;
-                          var secondaryProviders = buildSecondaryOauthProviders(completionParams.oidcToken, (_completionParams$pro4 = completionParams.providerName) !== null && _completionParams$pro4 !== void 0 ? _completionParams$pro4 : provider, secondaryClientIds);
-                          return _completeOauth(_objectSpread2(_objectSpread2({}, completionParams), secondaryProviders.length > 0 && {
-                            createSubOrgParams: _objectSpread2(_objectSpread2({}, existingCreateSubOrgParams), {}, {
-                              oauthProviders: [].concat(_toConsumableArray((_existingCreateSubOrg4 = existingCreateSubOrgParams === null || existingCreateSubOrgParams === void 0 ? void 0 : existingCreateSubOrgParams.oauthProviders) !== null && _existingCreateSubOrg4 !== void 0 ? _existingCreateSubOrg4 : []), _toConsumableArray(secondaryProviders))
-                            })
-                          }));
-                        },
-                        captchaToken: captchaToken,
-                        onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
-                        exchangeCodeForToken: function () {
-                          var _exchangeCodeForToken2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee97(codeVerifier) {
-                            var _resp$oidcToken2;
-                            var resp;
-                            return _regenerator().w(function (_context97) {
-                              while (1) switch (_context97.n) {
-                                case 0:
-                                  _context97.n = 1;
-                                  return client === null || client === void 0 ? void 0 : client.httpClient.proxyOAuth2Authenticate({
-                                    provider: "OAUTH2_PROVIDER_X",
-                                    authCode: result.authCode,
-                                    redirectUri: redirectUri,
-                                    codeVerifier: codeVerifier,
-                                    clientId: clientId,
-                                    nonce: nonce
-                                  });
-                                case 1:
-                                  resp = _context97.v;
-                                  return _context97.a(2, (_resp$oidcToken2 = resp === null || resp === void 0 ? void 0 : resp.oidcToken) !== null && _resp$oidcToken2 !== void 0 ? _resp$oidcToken2 : "");
+                      reject(new Error("Authentication window was closed."));
+                      return _context100.a(2);
+                    case 1:
+                      url = authWindow.location.href || "";
+                      if (isExpectedOAuthRedirectUrl(url, redirectUri, OAUTH_PROVIDER_CONFIGS[provider].expectedResponseMode)) {
+                        result = parseOAuthResponse(url, provider);
+                        if (result) {
+                          authWindow.close();
+                          clearInterval(interval);
+                          completeOAuthPopup({
+                            provider: provider,
+                            publicKey: publicKey,
+                            result: result,
+                            callbacks: callbacks,
+                            completeOauth: function completeOauth(completionParams) {
+                              var _masterConfig$auth49, _masterConfig$auth49$, _completionParams$pro4, _existingCreateSubOrg4;
+                              var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth49 = masterConfig.auth) === null || _masterConfig$auth49 === void 0 ? void 0 : (_masterConfig$auth49$ = _masterConfig$auth49.createSuborgParams) === null || _masterConfig$auth49$ === void 0 ? void 0 : _masterConfig$auth49$.oauth;
+                              var secondaryProviders = buildSecondaryOauthProviders(completionParams.oidcToken, (_completionParams$pro4 = completionParams.providerName) !== null && _completionParams$pro4 !== void 0 ? _completionParams$pro4 : provider, secondaryClientIds);
+                              return _completeOauth(_objectSpread2(_objectSpread2({}, completionParams), secondaryProviders.length > 0 && {
+                                createSubOrgParams: _objectSpread2(_objectSpread2({}, existingCreateSubOrgParams), {}, {
+                                  oauthProviders: [].concat(_toConsumableArray((_existingCreateSubOrg4 = existingCreateSubOrgParams === null || existingCreateSubOrgParams === void 0 ? void 0 : existingCreateSubOrgParams.oauthProviders) !== null && _existingCreateSubOrg4 !== void 0 ? _existingCreateSubOrg4 : []), _toConsumableArray(secondaryProviders))
+                                })
+                              }));
+                            },
+                            captchaToken: captchaToken,
+                            onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
+                            exchangeCodeForToken: function () {
+                              var _exchangeCodeForToken2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee99(codeVerifier) {
+                                var _resp$oidcToken2;
+                                var resp, oidcToken;
+                                return _regenerator().w(function (_context99) {
+                                  while (1) switch (_context99.n) {
+                                    case 0:
+                                      _context99.n = 1;
+                                      return client === null || client === void 0 ? void 0 : client.httpClient.proxyOAuth2Authenticate({
+                                        provider: "OAUTH2_PROVIDER_X",
+                                        authCode: result.authCode,
+                                        redirectUri: redirectUri,
+                                        codeVerifier: codeVerifier,
+                                        clientId: clientId,
+                                        nonce: nonce
+                                      });
+                                    case 1:
+                                      resp = _context99.v;
+                                      oidcToken = (_resp$oidcToken2 = resp === null || resp === void 0 ? void 0 : resp.oidcToken) !== null && _resp$oidcToken2 !== void 0 ? _resp$oidcToken2 : ""; // Set the attested stamper with the oidcToken
+                                      if (!oidcToken) {
+                                        _context99.n = 2;
+                                        break;
+                                      }
+                                      _context99.n = 2;
+                                      return client === null || client === void 0 ? void 0 : client.overrideAttestedStamper({
+                                        oidcToken: oidcToken,
+                                        publicKey: publicKey
+                                      });
+                                    case 2:
+                                      return _context99.a(2, oidcToken);
+                                  }
+                                }, _callee99);
+                              }));
+                              function exchangeCodeForToken(_x83) {
+                                return _exchangeCodeForToken2.apply(this, arguments);
                               }
-                            }, _callee97);
-                          }));
-                          function exchangeCodeForToken(_x82) {
-                            return _exchangeCodeForToken2.apply(this, arguments);
-                          }
-                          return exchangeCodeForToken;
-                        }()
-                      }).then(function () {
-                        return resolve();
-                      })["catch"](reject);
-                    }
+                              return exchangeCodeForToken;
+                            }()
+                          }).then(function () {
+                            return resolve();
+                          })["catch"](reject);
+                        }
+                      }
+                      _context100.n = 3;
+                      break;
+                    case 2:
+                      _context100.p = 2;
+                      _context100.v;
+                    case 3:
+                      return _context100.a(2);
                   }
-                } catch (_unused2) {
-                  // ignore cross-origin
-                }
-              }, 500);
+                }, _callee100, null, [[0, 2]]);
+              })), 500);
               if (authWindow.closed) {
                 clearInterval(interval);
               }
             }));
         }
-      }, _callee98);
+      }, _callee101);
     }));
-    return function (_x81) {
-      return _ref110.apply(this, arguments);
+    return function (_x82) {
+      return _ref114.apply(this, arguments);
     };
   }(), [client, callbacks, _completeOauth, createApiKeyPair, masterConfig]);
   var handleGoogleOauth = useCallback(/*#__PURE__*/function () {
-    var _ref112 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee99(params) {
-      var _masterConfig$auth48, _masterConfig$auth48$, _masterConfig$auth48$2, _masterConfig$auth$oa8, _masterConfig$auth49, _masterConfig$auth49$, _masterConfig$auth49$2, _masterConfig$auth$oa9, _masterConfig$auth50, _masterConfig$auth50$, _masterConfig$auth51, _masterConfig$auth51$, _masterConfig$auth52;
-      var _ref113, _ref113$primaryClient, primaryClientId, _ref113$secondaryClie, secondaryClientIds, _ref113$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, authUrl, authWindow;
-      return _regenerator().w(function (_context99) {
-        while (1) switch (_context99.n) {
+    var _ref117 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee103(params) {
+      var _masterConfig$auth50, _masterConfig$auth50$, _masterConfig$auth50$2, _masterConfig$auth$oa8, _masterConfig$auth51, _masterConfig$auth51$, _masterConfig$auth51$2, _masterConfig$auth$oa9, _masterConfig$auth52, _masterConfig$auth52$, _masterConfig$auth53, _masterConfig$auth53$, _masterConfig$auth54;
+      var _ref118, _ref118$primaryClient, primaryClientId, _ref118$secondaryClie, secondaryClientIds, _ref118$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, authUrl, authWindow;
+      return _regenerator().w(function (_context103) {
+        while (1) switch (_context103.n) {
           case 0:
-            _ref113 = params || {}, _ref113$primaryClient = _ref113.primaryClientId, primaryClientId = _ref113$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth48 = masterConfig.auth) === null || _masterConfig$auth48 === void 0 ? void 0 : (_masterConfig$auth48$ = _masterConfig$auth48.oauthConfig) === null || _masterConfig$auth48$ === void 0 ? void 0 : (_masterConfig$auth48$2 = _masterConfig$auth48$.google) === null || _masterConfig$auth48$2 === void 0 ? void 0 : _masterConfig$auth48$2.primaryClientId : _ref113$primaryClient, _ref113$secondaryClie = _ref113.secondaryClientIds, secondaryClientIds = _ref113$secondaryClie === void 0 ? (_masterConfig$auth$oa8 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth49 = masterConfig.auth) === null || _masterConfig$auth49 === void 0 ? void 0 : (_masterConfig$auth49$ = _masterConfig$auth49.oauthConfig) === null || _masterConfig$auth49$ === void 0 ? void 0 : (_masterConfig$auth49$2 = _masterConfig$auth49$.google) === null || _masterConfig$auth49$2 === void 0 ? void 0 : _masterConfig$auth49$2.secondaryClientIds) !== null && _masterConfig$auth$oa8 !== void 0 ? _masterConfig$auth$oa8 : [] : _ref113$secondaryClie, _ref113$openInPage = _ref113.openInPage, openInPage = _ref113$openInPage === void 0 ? (_masterConfig$auth$oa9 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth50 = masterConfig.auth) === null || _masterConfig$auth50 === void 0 ? void 0 : (_masterConfig$auth50$ = _masterConfig$auth50.oauthConfig) === null || _masterConfig$auth50$ === void 0 ? void 0 : _masterConfig$auth50$.openOauthInPage) !== null && _masterConfig$auth$oa9 !== void 0 ? _masterConfig$auth$oa9 : false : _ref113$openInPage, additionalParameters = _ref113.additionalState, captchaToken = _ref113.captchaToken;
+            _ref118 = params || {}, _ref118$primaryClient = _ref118.primaryClientId, primaryClientId = _ref118$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth50 = masterConfig.auth) === null || _masterConfig$auth50 === void 0 ? void 0 : (_masterConfig$auth50$ = _masterConfig$auth50.oauthConfig) === null || _masterConfig$auth50$ === void 0 ? void 0 : (_masterConfig$auth50$2 = _masterConfig$auth50$.google) === null || _masterConfig$auth50$2 === void 0 ? void 0 : _masterConfig$auth50$2.primaryClientId : _ref118$primaryClient, _ref118$secondaryClie = _ref118.secondaryClientIds, secondaryClientIds = _ref118$secondaryClie === void 0 ? (_masterConfig$auth$oa8 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth51 = masterConfig.auth) === null || _masterConfig$auth51 === void 0 ? void 0 : (_masterConfig$auth51$ = _masterConfig$auth51.oauthConfig) === null || _masterConfig$auth51$ === void 0 ? void 0 : (_masterConfig$auth51$2 = _masterConfig$auth51$.google) === null || _masterConfig$auth51$2 === void 0 ? void 0 : _masterConfig$auth51$2.secondaryClientIds) !== null && _masterConfig$auth$oa8 !== void 0 ? _masterConfig$auth$oa8 : [] : _ref118$secondaryClie, _ref118$openInPage = _ref118.openInPage, openInPage = _ref118$openInPage === void 0 ? (_masterConfig$auth$oa9 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth52 = masterConfig.auth) === null || _masterConfig$auth52 === void 0 ? void 0 : (_masterConfig$auth52$ = _masterConfig$auth52.oauthConfig) === null || _masterConfig$auth52$ === void 0 ? void 0 : _masterConfig$auth52$.openOauthInPage) !== null && _masterConfig$auth$oa9 !== void 0 ? _masterConfig$auth$oa9 : false : _ref118$openInPage, additionalParameters = _ref118.additionalState, captchaToken = _ref118.captchaToken;
             clientId = primaryClientId;
             provider = OAuthProviders.GOOGLE;
             if (masterConfig) {
-              _context99.n = 1;
+              _context103.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context99.n = 2;
+              _context103.n = 2;
               break;
             }
             throw new TurnkeyError("Google Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
-            if ((_masterConfig$auth51 = masterConfig.auth) !== null && _masterConfig$auth51 !== void 0 && (_masterConfig$auth51$ = _masterConfig$auth51.oauthConfig) !== null && _masterConfig$auth51$ !== void 0 && _masterConfig$auth51$.oauthRedirectUri) {
-              _context99.n = 3;
+            if ((_masterConfig$auth53 = masterConfig.auth) !== null && _masterConfig$auth53 !== void 0 && (_masterConfig$auth53$ = _masterConfig$auth53.oauthConfig) !== null && _masterConfig$auth53$ !== void 0 && _masterConfig$auth53$.oauthRedirectUri) {
+              _context103.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup"; // Google requires no trailing slash
-            redirectUri = (_masterConfig$auth52 = masterConfig.auth) === null || _masterConfig$auth52 === void 0 ? void 0 : _masterConfig$auth52.oauthConfig.oauthRedirectUri.replace(/\/$/, ""); // Create key pair and generate nonce
-            _context99.n = 4;
+            redirectUri = (_masterConfig$auth54 = masterConfig.auth) === null || _masterConfig$auth54 === void 0 ? void 0 : _masterConfig$auth54.oauthConfig.oauthRedirectUri.replace(/\/$/, ""); // Create key pair and generate nonce
+            _context103.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context99.v;
+            publicKey = _context103.v;
             if (publicKey) {
-              _context99.n = 5;
+              _context103.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -4380,42 +4472,66 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: _objectSpread2({}, additionalParameters)
             });
             if (!openInPage) {
-              _context99.n = 6;
+              _context103.n = 6;
               break;
             }
-            return _context99.a(2, redirectToOAuthProvider(authUrl));
+            return _context103.a(2, redirectToOAuthProvider(authUrl));
           case 6:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context99.n = 7;
+              _context103.n = 7;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 7:
             authWindow.location.href = authUrl;
-            return _context99.a(2, new Promise(function (resolve, reject) {
-              var interval = setInterval(function () {
-                try {
-                  if (authWindow.closed) {
-                    clearInterval(interval);
-                    reject(new Error("Authentication window was closed."));
-                    return;
-                  }
-                  var url = authWindow.location.href || "";
-                  if (url.startsWith(window.location.origin)) {
-                    var result = parseOAuthResponse(url, provider);
-                    if (result) {
+            return _context103.a(2, new Promise(function (resolve, reject) {
+              var interval = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee102() {
+                var url, result;
+                return _regenerator().w(function (_context102) {
+                  while (1) switch (_context102.p = _context102.n) {
+                    case 0:
+                      _context102.p = 0;
+                      if (!authWindow.closed) {
+                        _context102.n = 1;
+                        break;
+                      }
+                      clearInterval(interval);
+                      reject(new Error("Authentication window was closed."));
+                      return _context102.a(2);
+                    case 1:
+                      url = authWindow.location.href || "";
+                      if (!isExpectedOAuthRedirectUrl(url, redirectUri, OAUTH_PROVIDER_CONFIGS[provider].expectedResponseMode)) {
+                        _context102.n = 3;
+                        break;
+                      }
+                      result = parseOAuthResponse(url, provider);
+                      if (!result) {
+                        _context102.n = 3;
+                        break;
+                      }
                       authWindow.close();
                       clearInterval(interval);
+                      // Set the attested stamper with the oidcToken
+                      if (!result.idToken) {
+                        _context102.n = 2;
+                        break;
+                      }
+                      _context102.n = 2;
+                      return client === null || client === void 0 ? void 0 : client.overrideAttestedStamper({
+                        oidcToken: result.idToken,
+                        publicKey: publicKey
+                      });
+                    case 2:
                       completeOAuthPopup({
                         provider: provider,
                         publicKey: publicKey,
                         result: result,
                         callbacks: callbacks,
                         completeOauth: function completeOauth(completionParams) {
-                          var _masterConfig$auth53, _masterConfig$auth53$, _completionParams$pro5, _existingCreateSubOrg5;
-                          var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth53 = masterConfig.auth) === null || _masterConfig$auth53 === void 0 ? void 0 : (_masterConfig$auth53$ = _masterConfig$auth53.createSuborgParams) === null || _masterConfig$auth53$ === void 0 ? void 0 : _masterConfig$auth53$.oauth;
+                          var _masterConfig$auth55, _masterConfig$auth55$, _completionParams$pro5, _existingCreateSubOrg5;
+                          var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth55 = masterConfig.auth) === null || _masterConfig$auth55 === void 0 ? void 0 : (_masterConfig$auth55$ = _masterConfig$auth55.createSuborgParams) === null || _masterConfig$auth55$ === void 0 ? void 0 : _masterConfig$auth55$.oauth;
                           var secondaryProviders = buildSecondaryOauthProviders(completionParams.oidcToken, (_completionParams$pro5 = completionParams.providerName) !== null && _completionParams$pro5 !== void 0 ? _completionParams$pro5 : provider, secondaryClientIds);
                           return _completeOauth(_objectSpread2(_objectSpread2({}, completionParams), secondaryProviders.length > 0 && {
                             createSubOrgParams: _objectSpread2(_objectSpread2({}, existingCreateSubOrgParams), {}, {
@@ -4428,59 +4544,64 @@ var ClientProvider = function ClientProvider(_ref) {
                       }).then(function () {
                         return resolve();
                       })["catch"](reject);
-                    }
+                    case 3:
+                      _context102.n = 5;
+                      break;
+                    case 4:
+                      _context102.p = 4;
+                      _context102.v;
+                    case 5:
+                      return _context102.a(2);
                   }
-                } catch (_unused3) {
-                  // Ignore cross-origin errors
-                }
-              }, 500);
+                }, _callee102, null, [[0, 4]]);
+              })), 500);
               if (authWindow.closed) {
                 clearInterval(interval);
               }
             }));
         }
-      }, _callee99);
+      }, _callee103);
     }));
-    return function (_x83) {
-      return _ref112.apply(this, arguments);
+    return function (_x84) {
+      return _ref117.apply(this, arguments);
     };
   }(), [callbacks, _completeOauth, createApiKeyPair, masterConfig]);
   var handleAppleOauth = useCallback(/*#__PURE__*/function () {
-    var _ref114 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee100(params) {
-      var _masterConfig$auth54, _masterConfig$auth54$, _masterConfig$auth54$2, _masterConfig$auth$oa0, _masterConfig$auth55, _masterConfig$auth55$, _masterConfig$auth55$2, _masterConfig$auth$oa1, _masterConfig$auth56, _masterConfig$auth56$, _masterConfig$auth57, _masterConfig$auth57$, _masterConfig$auth58;
-      var _ref115, _ref115$primaryClient, primaryClientId, _ref115$secondaryClie, secondaryClientIds, _ref115$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, authUrl, authWindow;
-      return _regenerator().w(function (_context100) {
-        while (1) switch (_context100.n) {
+    var _ref120 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee105(params) {
+      var _masterConfig$auth56, _masterConfig$auth56$, _masterConfig$auth56$2, _masterConfig$auth$oa0, _masterConfig$auth57, _masterConfig$auth57$, _masterConfig$auth57$2, _masterConfig$auth$oa1, _masterConfig$auth58, _masterConfig$auth58$, _masterConfig$auth59, _masterConfig$auth59$, _masterConfig$auth60;
+      var _ref121, _ref121$primaryClient, primaryClientId, _ref121$secondaryClie, secondaryClientIds, _ref121$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, authUrl, authWindow;
+      return _regenerator().w(function (_context105) {
+        while (1) switch (_context105.n) {
           case 0:
-            _ref115 = params || {}, _ref115$primaryClient = _ref115.primaryClientId, primaryClientId = _ref115$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth54 = masterConfig.auth) === null || _masterConfig$auth54 === void 0 ? void 0 : (_masterConfig$auth54$ = _masterConfig$auth54.oauthConfig) === null || _masterConfig$auth54$ === void 0 ? void 0 : (_masterConfig$auth54$2 = _masterConfig$auth54$.apple) === null || _masterConfig$auth54$2 === void 0 ? void 0 : _masterConfig$auth54$2.primaryClientId : _ref115$primaryClient, _ref115$secondaryClie = _ref115.secondaryClientIds, secondaryClientIds = _ref115$secondaryClie === void 0 ? (_masterConfig$auth$oa0 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth55 = masterConfig.auth) === null || _masterConfig$auth55 === void 0 ? void 0 : (_masterConfig$auth55$ = _masterConfig$auth55.oauthConfig) === null || _masterConfig$auth55$ === void 0 ? void 0 : (_masterConfig$auth55$2 = _masterConfig$auth55$.apple) === null || _masterConfig$auth55$2 === void 0 ? void 0 : _masterConfig$auth55$2.secondaryClientIds) !== null && _masterConfig$auth$oa0 !== void 0 ? _masterConfig$auth$oa0 : [] : _ref115$secondaryClie, _ref115$openInPage = _ref115.openInPage, openInPage = _ref115$openInPage === void 0 ? (_masterConfig$auth$oa1 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth56 = masterConfig.auth) === null || _masterConfig$auth56 === void 0 ? void 0 : (_masterConfig$auth56$ = _masterConfig$auth56.oauthConfig) === null || _masterConfig$auth56$ === void 0 ? void 0 : _masterConfig$auth56$.openOauthInPage) !== null && _masterConfig$auth$oa1 !== void 0 ? _masterConfig$auth$oa1 : false : _ref115$openInPage, additionalParameters = _ref115.additionalState, captchaToken = _ref115.captchaToken;
+            _ref121 = params || {}, _ref121$primaryClient = _ref121.primaryClientId, primaryClientId = _ref121$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth56 = masterConfig.auth) === null || _masterConfig$auth56 === void 0 ? void 0 : (_masterConfig$auth56$ = _masterConfig$auth56.oauthConfig) === null || _masterConfig$auth56$ === void 0 ? void 0 : (_masterConfig$auth56$2 = _masterConfig$auth56$.apple) === null || _masterConfig$auth56$2 === void 0 ? void 0 : _masterConfig$auth56$2.primaryClientId : _ref121$primaryClient, _ref121$secondaryClie = _ref121.secondaryClientIds, secondaryClientIds = _ref121$secondaryClie === void 0 ? (_masterConfig$auth$oa0 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth57 = masterConfig.auth) === null || _masterConfig$auth57 === void 0 ? void 0 : (_masterConfig$auth57$ = _masterConfig$auth57.oauthConfig) === null || _masterConfig$auth57$ === void 0 ? void 0 : (_masterConfig$auth57$2 = _masterConfig$auth57$.apple) === null || _masterConfig$auth57$2 === void 0 ? void 0 : _masterConfig$auth57$2.secondaryClientIds) !== null && _masterConfig$auth$oa0 !== void 0 ? _masterConfig$auth$oa0 : [] : _ref121$secondaryClie, _ref121$openInPage = _ref121.openInPage, openInPage = _ref121$openInPage === void 0 ? (_masterConfig$auth$oa1 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth58 = masterConfig.auth) === null || _masterConfig$auth58 === void 0 ? void 0 : (_masterConfig$auth58$ = _masterConfig$auth58.oauthConfig) === null || _masterConfig$auth58$ === void 0 ? void 0 : _masterConfig$auth58$.openOauthInPage) !== null && _masterConfig$auth$oa1 !== void 0 ? _masterConfig$auth$oa1 : false : _ref121$openInPage, additionalParameters = _ref121.additionalState, captchaToken = _ref121.captchaToken;
             clientId = primaryClientId;
             provider = OAuthProviders.APPLE;
             if (masterConfig) {
-              _context100.n = 1;
+              _context105.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context100.n = 2;
+              _context105.n = 2;
               break;
             }
             throw new TurnkeyError("Apple Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
-            if ((_masterConfig$auth57 = masterConfig.auth) !== null && _masterConfig$auth57 !== void 0 && (_masterConfig$auth57$ = _masterConfig$auth57.oauthConfig) !== null && _masterConfig$auth57$ !== void 0 && _masterConfig$auth57$.oauthRedirectUri) {
-              _context100.n = 3;
+            if ((_masterConfig$auth59 = masterConfig.auth) !== null && _masterConfig$auth59 !== void 0 && (_masterConfig$auth59$ = _masterConfig$auth59.oauthConfig) !== null && _masterConfig$auth59$ !== void 0 && _masterConfig$auth59$.oauthRedirectUri) {
+              _context105.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup"; // TODO (Amir): Apple needs the '/' at the end. Maybe we should add it if not there?
-            redirectUri = (_masterConfig$auth58 = masterConfig.auth) === null || _masterConfig$auth58 === void 0 ? void 0 : _masterConfig$auth58.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context100.n = 4;
+            redirectUri = (_masterConfig$auth60 = masterConfig.auth) === null || _masterConfig$auth60 === void 0 ? void 0 : _masterConfig$auth60.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
+            _context105.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context100.v;
+            publicKey = _context105.v;
             if (publicKey) {
-              _context100.n = 5;
+              _context105.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -4500,42 +4621,66 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: _objectSpread2({}, additionalParameters)
             });
             if (!openInPage) {
-              _context100.n = 6;
+              _context105.n = 6;
               break;
             }
-            return _context100.a(2, redirectToOAuthProvider(authUrl));
+            return _context105.a(2, redirectToOAuthProvider(authUrl));
           case 6:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context100.n = 7;
+              _context105.n = 7;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 7:
             authWindow.location.href = authUrl;
-            return _context100.a(2, new Promise(function (resolve, reject) {
-              var interval = setInterval(function () {
-                try {
-                  if (authWindow.closed) {
-                    clearInterval(interval);
-                    reject(new Error("Authentication window was closed."));
-                    return;
-                  }
-                  var url = authWindow.location.href || "";
-                  if (url.startsWith(window.location.origin)) {
-                    var result = parseOAuthResponse(url, provider);
-                    if (result) {
-                      authWindow.close();
+            return _context105.a(2, new Promise(function (resolve, reject) {
+              var interval = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee104() {
+                var url, result;
+                return _regenerator().w(function (_context104) {
+                  while (1) switch (_context104.p = _context104.n) {
+                    case 0:
+                      _context104.p = 0;
+                      if (!authWindow.closed) {
+                        _context104.n = 1;
+                        break;
+                      }
+                      clearInterval(interval);
+                      reject(new Error("Authentication window was closed."));
+                      return _context104.a(2);
+                    case 1:
+                      url = authWindow.location.href || "";
+                      if (!isExpectedOAuthRedirectUrl(url, redirectUri, OAUTH_PROVIDER_CONFIGS[provider].expectedResponseMode)) {
+                        _context104.n = 3;
+                        break;
+                      }
+                      result = parseOAuthResponse(url, provider);
+                      if (!result) {
+                        _context104.n = 3;
+                        break;
+                      }
+                      authWindow.close();
                       clearInterval(interval);
+                      // Set the attested stamper with the oidcToken
+                      if (!result.idToken) {
+                        _context104.n = 2;
+                        break;
+                      }
+                      _context104.n = 2;
+                      return client === null || client === void 0 ? void 0 : client.overrideAttestedStamper({
+                        oidcToken: result.idToken,
+                        publicKey: publicKey
+                      });
+                    case 2:
                       completeOAuthPopup({
                         provider: provider,
                         publicKey: publicKey,
                         result: result,
                         callbacks: callbacks,
                         completeOauth: function completeOauth(completionParams) {
-                          var _masterConfig$auth59, _masterConfig$auth59$, _completionParams$pro6, _existingCreateSubOrg6;
-                          var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth59 = masterConfig.auth) === null || _masterConfig$auth59 === void 0 ? void 0 : (_masterConfig$auth59$ = _masterConfig$auth59.createSuborgParams) === null || _masterConfig$auth59$ === void 0 ? void 0 : _masterConfig$auth59$.oauth;
+                          var _masterConfig$auth61, _masterConfig$auth61$, _completionParams$pro6, _existingCreateSubOrg6;
+                          var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth61 = masterConfig.auth) === null || _masterConfig$auth61 === void 0 ? void 0 : (_masterConfig$auth61$ = _masterConfig$auth61.createSuborgParams) === null || _masterConfig$auth61$ === void 0 ? void 0 : _masterConfig$auth61$.oauth;
                           var secondaryProviders = buildSecondaryOauthProviders(completionParams.oidcToken, (_completionParams$pro6 = completionParams.providerName) !== null && _completionParams$pro6 !== void 0 ? _completionParams$pro6 : provider, secondaryClientIds);
                           return _completeOauth(_objectSpread2(_objectSpread2({}, completionParams), secondaryProviders.length > 0 && {
                             createSubOrgParams: _objectSpread2(_objectSpread2({}, existingCreateSubOrgParams), {}, {
@@ -4548,68 +4693,73 @@ var ClientProvider = function ClientProvider(_ref) {
                       }).then(function () {
                         return resolve();
                       })["catch"](reject);
-                    }
+                    case 3:
+                      _context104.n = 5;
+                      break;
+                    case 4:
+                      _context104.p = 4;
+                      _context104.v;
+                    case 5:
+                      return _context104.a(2);
                   }
-                } catch (_unused4) {
-                  // Ignore cross-origin errors
-                }
-              }, 500);
+                }, _callee104, null, [[0, 4]]);
+              })), 500);
               if (authWindow.closed) {
                 clearInterval(interval);
               }
             }));
         }
-      }, _callee100);
+      }, _callee105);
     }));
-    return function (_x84) {
-      return _ref114.apply(this, arguments);
+    return function (_x85) {
+      return _ref120.apply(this, arguments);
     };
   }(), [callbacks, _completeOauth, createApiKeyPair, masterConfig]);
   var handleFacebookOauth = useCallback(/*#__PURE__*/function () {
-    var _ref116 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee102(params) {
-      var _masterConfig$auth60, _masterConfig$auth60$, _masterConfig$auth60$2, _masterConfig$auth$oa10, _masterConfig$auth61, _masterConfig$auth61$, _masterConfig$auth61$2, _masterConfig$auth$oa11, _masterConfig$auth62, _masterConfig$auth62$, _masterConfig$auth63, _masterConfig$auth63$, _masterConfig$auth64;
-      var _ref117, _ref117$primaryClient, primaryClientId, _ref117$secondaryClie, secondaryClientIds, _ref117$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle3, verifier, codeChallenge, authUrl, authWindow;
-      return _regenerator().w(function (_context102) {
-        while (1) switch (_context102.n) {
+    var _ref123 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee108(params) {
+      var _masterConfig$auth62, _masterConfig$auth62$, _masterConfig$auth62$2, _masterConfig$auth$oa10, _masterConfig$auth63, _masterConfig$auth63$, _masterConfig$auth63$2, _masterConfig$auth$oa11, _masterConfig$auth64, _masterConfig$auth64$, _masterConfig$auth65, _masterConfig$auth65$, _masterConfig$auth66;
+      var _ref124, _ref124$primaryClient, primaryClientId, _ref124$secondaryClie, secondaryClientIds, _ref124$openInPage, openInPage, additionalParameters, captchaToken, clientId, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle3, verifier, codeChallenge, authUrl, authWindow;
+      return _regenerator().w(function (_context108) {
+        while (1) switch (_context108.n) {
           case 0:
-            _ref117 = params || {}, _ref117$primaryClient = _ref117.primaryClientId, primaryClientId = _ref117$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth60 = masterConfig.auth) === null || _masterConfig$auth60 === void 0 ? void 0 : (_masterConfig$auth60$ = _masterConfig$auth60.oauthConfig) === null || _masterConfig$auth60$ === void 0 ? void 0 : (_masterConfig$auth60$2 = _masterConfig$auth60$.facebook) === null || _masterConfig$auth60$2 === void 0 ? void 0 : _masterConfig$auth60$2.primaryClientId : _ref117$primaryClient, _ref117$secondaryClie = _ref117.secondaryClientIds, secondaryClientIds = _ref117$secondaryClie === void 0 ? (_masterConfig$auth$oa10 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth61 = masterConfig.auth) === null || _masterConfig$auth61 === void 0 ? void 0 : (_masterConfig$auth61$ = _masterConfig$auth61.oauthConfig) === null || _masterConfig$auth61$ === void 0 ? void 0 : (_masterConfig$auth61$2 = _masterConfig$auth61$.facebook) === null || _masterConfig$auth61$2 === void 0 ? void 0 : _masterConfig$auth61$2.secondaryClientIds) !== null && _masterConfig$auth$oa10 !== void 0 ? _masterConfig$auth$oa10 : [] : _ref117$secondaryClie, _ref117$openInPage = _ref117.openInPage, openInPage = _ref117$openInPage === void 0 ? (_masterConfig$auth$oa11 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth62 = masterConfig.auth) === null || _masterConfig$auth62 === void 0 ? void 0 : (_masterConfig$auth62$ = _masterConfig$auth62.oauthConfig) === null || _masterConfig$auth62$ === void 0 ? void 0 : _masterConfig$auth62$.openOauthInPage) !== null && _masterConfig$auth$oa11 !== void 0 ? _masterConfig$auth$oa11 : false : _ref117$openInPage, additionalParameters = _ref117.additionalState, captchaToken = _ref117.captchaToken;
+            _ref124 = params || {}, _ref124$primaryClient = _ref124.primaryClientId, primaryClientId = _ref124$primaryClient === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth62 = masterConfig.auth) === null || _masterConfig$auth62 === void 0 ? void 0 : (_masterConfig$auth62$ = _masterConfig$auth62.oauthConfig) === null || _masterConfig$auth62$ === void 0 ? void 0 : (_masterConfig$auth62$2 = _masterConfig$auth62$.facebook) === null || _masterConfig$auth62$2 === void 0 ? void 0 : _masterConfig$auth62$2.primaryClientId : _ref124$primaryClient, _ref124$secondaryClie = _ref124.secondaryClientIds, secondaryClientIds = _ref124$secondaryClie === void 0 ? (_masterConfig$auth$oa10 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth63 = masterConfig.auth) === null || _masterConfig$auth63 === void 0 ? void 0 : (_masterConfig$auth63$ = _masterConfig$auth63.oauthConfig) === null || _masterConfig$auth63$ === void 0 ? void 0 : (_masterConfig$auth63$2 = _masterConfig$auth63$.facebook) === null || _masterConfig$auth63$2 === void 0 ? void 0 : _masterConfig$auth63$2.secondaryClientIds) !== null && _masterConfig$auth$oa10 !== void 0 ? _masterConfig$auth$oa10 : [] : _ref124$secondaryClie, _ref124$openInPage = _ref124.openInPage, openInPage = _ref124$openInPage === void 0 ? (_masterConfig$auth$oa11 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth64 = masterConfig.auth) === null || _masterConfig$auth64 === void 0 ? void 0 : (_masterConfig$auth64$ = _masterConfig$auth64.oauthConfig) === null || _masterConfig$auth64$ === void 0 ? void 0 : _masterConfig$auth64$.openOauthInPage) !== null && _masterConfig$auth$oa11 !== void 0 ? _masterConfig$auth$oa11 : false : _ref124$openInPage, additionalParameters = _ref124.additionalState, captchaToken = _ref124.captchaToken;
             clientId = primaryClientId;
             provider = OAuthProviders.FACEBOOK;
             if (masterConfig) {
-              _context102.n = 1;
+              _context108.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context102.n = 2;
+              _context108.n = 2;
               break;
             }
             throw new TurnkeyError("Facebook Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
-            if ((_masterConfig$auth63 = masterConfig.auth) !== null && _masterConfig$auth63 !== void 0 && (_masterConfig$auth63$ = _masterConfig$auth63.oauthConfig) !== null && _masterConfig$auth63$ !== void 0 && _masterConfig$auth63$.oauthRedirectUri) {
-              _context102.n = 3;
+            if ((_masterConfig$auth65 = masterConfig.auth) !== null && _masterConfig$auth65 !== void 0 && (_masterConfig$auth65$ = _masterConfig$auth65.oauthConfig) !== null && _masterConfig$auth65$ !== void 0 && _masterConfig$auth65$.oauthRedirectUri) {
+              _context108.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup";
-            redirectUri = (_masterConfig$auth64 = masterConfig.auth) === null || _masterConfig$auth64 === void 0 ? void 0 : _masterConfig$auth64.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context102.n = 4;
+            redirectUri = (_masterConfig$auth66 = masterConfig.auth) === null || _masterConfig$auth66 === void 0 ? void 0 : _masterConfig$auth66.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
+            _context108.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context102.v;
+            publicKey = _context108.v;
             if (publicKey) {
-              _context102.n = 5;
+              _context108.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 5:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair and store verifier
-            _context102.n = 6;
+            _context108.n = 6;
             return generateChallengePair();
           case 6:
-            _yield$generateChalle3 = _context102.v;
+            _yield$generateChalle3 = _context108.v;
             verifier = _yield$generateChalle3.verifier;
             codeChallenge = _yield$generateChalle3.codeChallenge;
             storePKCEVerifier(provider, verifier);
@@ -4629,96 +4779,120 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: _objectSpread2({}, additionalParameters)
             });
             if (!openInPage) {
-              _context102.n = 7;
+              _context108.n = 7;
               break;
             }
-            return _context102.a(2, redirectToOAuthProvider(authUrl));
+            return _context108.a(2, redirectToOAuthProvider(authUrl));
           case 7:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context102.n = 8;
+              _context108.n = 8;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 8:
             authWindow.location.href = authUrl;
-            return _context102.a(2, new Promise(function (resolve, reject) {
-              var interval = setInterval(function () {
-                try {
-                  if (authWindow.closed) {
-                    clearInterval(interval);
-                    reject(new Error("Authentication window was closed."));
-                    return;
-                  }
-                  var url = authWindow.location.href || "";
-                  if (url.startsWith(window.location.origin)) {
-                    var result = parseOAuthResponse(url, provider);
-                    if (result) {
-                      authWindow.close();
+            return _context108.a(2, new Promise(function (resolve, reject) {
+              var interval = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee107() {
+                var url, result;
+                return _regenerator().w(function (_context107) {
+                  while (1) switch (_context107.p = _context107.n) {
+                    case 0:
+                      _context107.p = 0;
+                      if (!authWindow.closed) {
+                        _context107.n = 1;
+                        break;
+                      }
                       clearInterval(interval);
-                      completeOAuthPopup({
-                        provider: provider,
-                        publicKey: publicKey,
-                        result: result,
-                        callbacks: callbacks,
-                        completeOauth: function completeOauth(completionParams) {
-                          var _masterConfig$auth65, _masterConfig$auth65$, _completionParams$pro7, _existingCreateSubOrg7;
-                          var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth65 = masterConfig.auth) === null || _masterConfig$auth65 === void 0 ? void 0 : (_masterConfig$auth65$ = _masterConfig$auth65.createSuborgParams) === null || _masterConfig$auth65$ === void 0 ? void 0 : _masterConfig$auth65$.oauth;
-                          var secondaryProviders = buildSecondaryOauthProviders(completionParams.oidcToken, (_completionParams$pro7 = completionParams.providerName) !== null && _completionParams$pro7 !== void 0 ? _completionParams$pro7 : provider, secondaryClientIds);
-                          return _completeOauth(_objectSpread2(_objectSpread2({}, completionParams), secondaryProviders.length > 0 && {
-                            createSubOrgParams: _objectSpread2(_objectSpread2({}, existingCreateSubOrgParams), {}, {
-                              oauthProviders: [].concat(_toConsumableArray((_existingCreateSubOrg7 = existingCreateSubOrgParams === null || existingCreateSubOrgParams === void 0 ? void 0 : existingCreateSubOrgParams.oauthProviders) !== null && _existingCreateSubOrg7 !== void 0 ? _existingCreateSubOrg7 : []), _toConsumableArray(secondaryProviders))
-                            })
-                          }));
-                        },
-                        captchaToken: captchaToken,
-                        onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
-                        exchangeCodeForToken: function () {
-                          var _exchangeCodeForToken3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee101(codeVerifier) {
-                            var tokenData;
-                            return _regenerator().w(function (_context101) {
-                              while (1) switch (_context101.n) {
-                                case 0:
-                                  _context101.n = 1;
-                                  return exchangeFacebookCodeForToken(clientId, redirectUri, result.authCode, codeVerifier);
-                                case 1:
-                                  tokenData = _context101.v;
-                                  return _context101.a(2, tokenData.id_token);
+                      reject(new Error("Authentication window was closed."));
+                      return _context107.a(2);
+                    case 1:
+                      url = authWindow.location.href || "";
+                      if (isExpectedOAuthRedirectUrl(url, redirectUri, OAUTH_PROVIDER_CONFIGS[provider].expectedResponseMode)) {
+                        result = parseOAuthResponse(url, provider);
+                        if (result) {
+                          authWindow.close();
+                          clearInterval(interval);
+                          completeOAuthPopup({
+                            provider: provider,
+                            publicKey: publicKey,
+                            result: result,
+                            callbacks: callbacks,
+                            completeOauth: function completeOauth(completionParams) {
+                              var _masterConfig$auth67, _masterConfig$auth67$, _completionParams$pro7, _existingCreateSubOrg7;
+                              var existingCreateSubOrgParams = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth67 = masterConfig.auth) === null || _masterConfig$auth67 === void 0 ? void 0 : (_masterConfig$auth67$ = _masterConfig$auth67.createSuborgParams) === null || _masterConfig$auth67$ === void 0 ? void 0 : _masterConfig$auth67$.oauth;
+                              var secondaryProviders = buildSecondaryOauthProviders(completionParams.oidcToken, (_completionParams$pro7 = completionParams.providerName) !== null && _completionParams$pro7 !== void 0 ? _completionParams$pro7 : provider, secondaryClientIds);
+                              return _completeOauth(_objectSpread2(_objectSpread2({}, completionParams), secondaryProviders.length > 0 && {
+                                createSubOrgParams: _objectSpread2(_objectSpread2({}, existingCreateSubOrgParams), {}, {
+                                  oauthProviders: [].concat(_toConsumableArray((_existingCreateSubOrg7 = existingCreateSubOrgParams === null || existingCreateSubOrgParams === void 0 ? void 0 : existingCreateSubOrgParams.oauthProviders) !== null && _existingCreateSubOrg7 !== void 0 ? _existingCreateSubOrg7 : []), _toConsumableArray(secondaryProviders))
+                                })
+                              }));
+                            },
+                            captchaToken: captchaToken,
+                            onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
+                            exchangeCodeForToken: function () {
+                              var _exchangeCodeForToken3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee106(codeVerifier) {
+                                var tokenData, oidcToken;
+                                return _regenerator().w(function (_context106) {
+                                  while (1) switch (_context106.n) {
+                                    case 0:
+                                      _context106.n = 1;
+                                      return exchangeFacebookCodeForToken(clientId, redirectUri, result.authCode, codeVerifier);
+                                    case 1:
+                                      tokenData = _context106.v;
+                                      oidcToken = tokenData.id_token; // Set the attested stamper with the oidcToken
+                                      if (!oidcToken) {
+                                        _context106.n = 2;
+                                        break;
+                                      }
+                                      _context106.n = 2;
+                                      return client === null || client === void 0 ? void 0 : client.overrideAttestedStamper({
+                                        oidcToken: oidcToken,
+                                        publicKey: publicKey
+                                      });
+                                    case 2:
+                                      return _context106.a(2, oidcToken);
+                                  }
+                                }, _callee106);
+                              }));
+                              function exchangeCodeForToken(_x87) {
+                                return _exchangeCodeForToken3.apply(this, arguments);
                               }
-                            }, _callee101);
-                          }));
-                          function exchangeCodeForToken(_x86) {
-                            return _exchangeCodeForToken3.apply(this, arguments);
-                          }
-                          return exchangeCodeForToken;
-                        }()
-                      }).then(function () {
-                        return resolve();
-                      })["catch"](reject);
-                    }
+                              return exchangeCodeForToken;
+                            }()
+                          }).then(function () {
+                            return resolve();
+                          })["catch"](reject);
+                        }
+                      }
+                      _context107.n = 3;
+                      break;
+                    case 2:
+                      _context107.p = 2;
+                      _context107.v;
+                    case 3:
+                      return _context107.a(2);
                   }
-                } catch (_unused5) {
-                  // Ignore cross-origin errors
-                }
-              }, 500);
+                }, _callee107, null, [[0, 2]]);
+              })), 500);
               if (authWindow.closed) {
                 clearInterval(interval);
               }
             }));
         }
-      }, _callee102);
+      }, _callee108);
     }));
-    return function (_x85) {
-      return _ref116.apply(this, arguments);
+    return function (_x86) {
+      return _ref123.apply(this, arguments);
     };
   }(), [callbacks, _completeOauth, createApiKeyPair, masterConfig]);
   var handleLogin = useCallback(/*#__PURE__*/function () {
-    var _ref118 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee103(params) {
+    var _ref126 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee109(params) {
       var _masterConfig$ui, _params$logoDark, _masterConfig$ui2, _params$logoLight, _masterConfig$ui3, _params$title;
       var logo;
-      return _regenerator().w(function (_context103) {
-        while (1) switch (_context103.n) {
+      return _regenerator().w(function (_context109) {
+        while (1) switch (_context109.n) {
           case 0:
             logo = masterConfig !== null && masterConfig !== void 0 && (_masterConfig$ui = masterConfig.ui) !== null && _masterConfig$ui !== void 0 && _masterConfig$ui.darkMode ? (_params$logoDark = params === null || params === void 0 ? void 0 : params.logoDark) !== null && _params$logoDark !== void 0 ? _params$logoDark : masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$ui2 = masterConfig.ui) === null || _masterConfig$ui2 === void 0 ? void 0 : _masterConfig$ui2.logoDark : (_params$logoLight = params === null || params === void 0 ? void 0 : params.logoLight) !== null && _params$logoLight !== void 0 ? _params$logoLight : masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$ui3 = masterConfig.ui) === null || _masterConfig$ui3 === void 0 ? void 0 : _masterConfig$ui3.logoLight;
             pushPage({
@@ -4733,22 +4907,22 @@ var ClientProvider = function ClientProvider(_ref) {
               contextProvider: WalletConnectProvider
             });
           case 1:
-            return _context103.a(2);
+            return _context109.a(2);
         }
-      }, _callee103);
+      }, _callee109);
     }));
-    return function (_x87) {
-      return _ref118.apply(this, arguments);
+    return function (_x88) {
+      return _ref126.apply(this, arguments);
     };
   }(), [pushPage, masterConfig]);
   var handleExportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref119 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee104(params) {
+    var _ref127 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee110(params) {
       var walletId, targetPublicKey, stampWith, organizationId;
-      return _regenerator().w(function (_context104) {
-        while (1) switch (_context104.n) {
+      return _regenerator().w(function (_context110) {
+        while (1) switch (_context110.n) {
           case 0:
             walletId = params.walletId, targetPublicKey = params.targetPublicKey, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context104.a(2, new Promise(function (resolve, reject) {
+            return _context110.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export wallet",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4774,20 +4948,20 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee104);
+      }, _callee110);
     }));
-    return function (_x88) {
-      return _ref119.apply(this, arguments);
+    return function (_x89) {
+      return _ref127.apply(this, arguments);
     };
   }(), [pushPage]);
   var handleExportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref120 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee105(params) {
+    var _ref128 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee111(params) {
       var privateKeyId, targetPublicKey, keyFormat, stampWith, organizationId;
-      return _regenerator().w(function (_context105) {
-        while (1) switch (_context105.n) {
+      return _regenerator().w(function (_context111) {
+        while (1) switch (_context111.n) {
           case 0:
             privateKeyId = params.privateKeyId, targetPublicKey = params.targetPublicKey, keyFormat = params.keyFormat, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context105.a(2, new Promise(function (resolve, reject) {
+            return _context111.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export private key",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4815,20 +4989,20 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee105);
+      }, _callee111);
     }));
-    return function (_x89) {
-      return _ref120.apply(this, arguments);
+    return function (_x90) {
+      return _ref128.apply(this, arguments);
     };
   }(), [pushPage]);
   var handleExportWalletAccount = useCallback(/*#__PURE__*/function () {
-    var _ref121 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee106(params) {
+    var _ref129 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee112(params) {
       var address, targetPublicKey, keyFormat, stampWith, organizationId;
-      return _regenerator().w(function (_context106) {
-        while (1) switch (_context106.n) {
+      return _regenerator().w(function (_context112) {
+        while (1) switch (_context112.n) {
           case 0:
             address = params.address, targetPublicKey = params.targetPublicKey, keyFormat = params.keyFormat, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context106.a(2, new Promise(function (resolve, reject) {
+            return _context112.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export wallet account",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4856,21 +5030,21 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee106);
+      }, _callee112);
     }));
-    return function (_x90) {
-      return _ref121.apply(this, arguments);
+    return function (_x91) {
+      return _ref129.apply(this, arguments);
     };
   }(), [pushPage]);
   var handleImportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref122 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee107(params) {
-      var _ref123, defaultWalletAccounts, _ref123$successPageDu, successPageDuration, stampWith, walletName, clearClipboardOnPaste, organizationId, userId, _t10;
-      return _regenerator().w(function (_context107) {
-        while (1) switch (_context107.p = _context107.n) {
+    var _ref130 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee113(params) {
+      var _ref131, defaultWalletAccounts, _ref131$successPageDu, successPageDuration, stampWith, walletName, clearClipboardOnPaste, organizationId, userId, _t15;
+      return _regenerator().w(function (_context113) {
+        while (1) switch (_context113.p = _context113.n) {
           case 0:
-            _ref123 = params || {}, defaultWalletAccounts = _ref123.defaultWalletAccounts, _ref123$successPageDu = _ref123.successPageDuration, successPageDuration = _ref123$successPageDu === void 0 ? 2000 : _ref123$successPageDu, stampWith = _ref123.stampWith, walletName = _ref123.walletName, clearClipboardOnPaste = _ref123.clearClipboardOnPaste, organizationId = _ref123.organizationId, userId = _ref123.userId;
-            _context107.p = 1;
-            return _context107.a(2, withTurnkeyErrorHandling(function () {
+            _ref131 = params || {}, defaultWalletAccounts = _ref131.defaultWalletAccounts, _ref131$successPageDu = _ref131.successPageDuration, successPageDuration = _ref131$successPageDu === void 0 ? 2000 : _ref131$successPageDu, stampWith = _ref131.stampWith, walletName = _ref131.walletName, clearClipboardOnPaste = _ref131.clearClipboardOnPaste, organizationId = _ref131.organizationId, userId = _ref131.userId;
+            _context113.p = 1;
+            return _context113.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import wallet",
@@ -4903,33 +5077,33 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 2:
-            _context107.p = 2;
-            _t10 = _context107.v;
-            if (!(_t10 instanceof TurnkeyError)) {
-              _context107.n = 3;
+            _context113.p = 2;
+            _t15 = _context113.v;
+            if (!(_t15 instanceof TurnkeyError)) {
+              _context113.n = 3;
               break;
             }
-            throw _t10;
+            throw _t15;
           case 3:
-            throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t10);
+            throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t15);
           case 4:
-            return _context107.a(2);
+            return _context113.a(2);
         }
-      }, _callee107, null, [[1, 2]]);
+      }, _callee113, null, [[1, 2]]);
     }));
-    return function (_x91) {
-      return _ref122.apply(this, arguments);
+    return function (_x92) {
+      return _ref130.apply(this, arguments);
     };
   }(), [pushPage, logout]);
   var handleImportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref124 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee108(params) {
-      var _ref125, curve, addressFormats, _ref125$successPageDu, successPageDuration, stampWith, keyName, keyFormat, clearClipboardOnPaste, organizationId, _t11;
-      return _regenerator().w(function (_context108) {
-        while (1) switch (_context108.p = _context108.n) {
+    var _ref132 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee114(params) {
+      var _ref133, curve, addressFormats, _ref133$successPageDu, successPageDuration, stampWith, keyName, keyFormat, clearClipboardOnPaste, organizationId, _t16;
+      return _regenerator().w(function (_context114) {
+        while (1) switch (_context114.p = _context114.n) {
           case 0:
-            _ref125 = params || {}, curve = _ref125.curve, addressFormats = _ref125.addressFormats, _ref125$successPageDu = _ref125.successPageDuration, successPageDuration = _ref125$successPageDu === void 0 ? 2000 : _ref125$successPageDu, stampWith = _ref125.stampWith, keyName = _ref125.keyName, keyFormat = _ref125.keyFormat, clearClipboardOnPaste = _ref125.clearClipboardOnPaste, organizationId = _ref125.organizationId;
-            _context108.p = 1;
-            return _context108.a(2, withTurnkeyErrorHandling(function () {
+            _ref133 = params || {}, curve = _ref133.curve, addressFormats = _ref133.addressFormats, _ref133$successPageDu = _ref133.successPageDuration, successPageDuration = _ref133$successPageDu === void 0 ? 2000 : _ref133$successPageDu, stampWith = _ref133.stampWith, keyName = _ref133.keyName, keyFormat = _ref133.keyFormat, clearClipboardOnPaste = _ref133.clearClipboardOnPaste, organizationId = _ref133.organizationId;
+            _context114.p = 1;
+            return _context114.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import private key",
@@ -4961,51 +5135,51 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 2:
-            _context108.p = 2;
-            _t11 = _context108.v;
-            if (!(_t11 instanceof TurnkeyError)) {
-              _context108.n = 3;
+            _context114.p = 2;
+            _t16 = _context114.v;
+            if (!(_t16 instanceof TurnkeyError)) {
+              _context114.n = 3;
               break;
             }
-            throw _t11;
+            throw _t16;
           case 3:
-            throw new TurnkeyError("Failed to import private key.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t11);
+            throw new TurnkeyError("Failed to import private key.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t16);
           case 4:
-            return _context108.a(2);
+            return _context114.a(2);
         }
-      }, _callee108, null, [[1, 2]]);
+      }, _callee114, null, [[1, 2]]);
     }));
-    return function (_x92) {
-      return _ref124.apply(this, arguments);
+    return function (_x93) {
+      return _ref132.apply(this, arguments);
     };
   }(), [pushPage, logout]);
   var handleUpdateUserName = useCallback(/*#__PURE__*/function () {
-    var _ref126 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee109(params) {
-      var _ref127, _ref127$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _params$userId, res, _t12;
-      return _regenerator().w(function (_context109) {
-        while (1) switch (_context109.p = _context109.n) {
+    var _ref134 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee115(params) {
+      var _ref135, _ref135$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _params$userId, res, _t17;
+      return _regenerator().w(function (_context115) {
+        while (1) switch (_context115.p = _context115.n) {
           case 0:
-            _ref127 = params || {}, _ref127$successPageDu = _ref127.successPageDuration, successPageDuration = _ref127$successPageDu === void 0 ? 2000 : _ref127$successPageDu, subTitle = _ref127.subTitle, title = _ref127.title, stampWith = _ref127.stampWith;
+            _ref135 = params || {}, _ref135$successPageDu = _ref135.successPageDuration, successPageDuration = _ref135$successPageDu === void 0 ? 2000 : _ref135$successPageDu, subTitle = _ref135.subTitle, title = _ref135.title, stampWith = _ref135.stampWith;
             if (client) {
-              _context109.n = 1;
+              _context115.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context109.n = 2;
+            _context115.n = 2;
             return getSession();
           case 2:
-            s = _context109.v;
+            s = _context115.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context109.n = 3;
+              _context115.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (user === null || user === void 0 ? void 0 : user.userId);
             if (userId) {
-              _context109.n = 4;
+              _context115.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to update a user name.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5025,12 +5199,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context109.p = 5;
+            _context115.p = 5;
             if (!(!(params !== null && params !== void 0 && params.userName) && (params === null || params === void 0 ? void 0 : params.userName) !== "")) {
-              _context109.n = 6;
+              _context115.n = 6;
               break;
             }
-            return _context109.a(2, withTurnkeyErrorHandling(function () {
+            return _context115.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update User Name",
@@ -5058,7 +5232,7 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context109.n = 7;
+            _context115.n = 7;
             return updateUserName(_objectSpread2({
               userName: params.userName,
               userId: (_params$userId = params.userId) !== null && _params$userId !== void 0 ? _params$userId : user.userId,
@@ -5067,64 +5241,64 @@ var ClientProvider = function ClientProvider(_ref) {
               organizationId: organizationId
             }));
           case 7:
-            res = _context109.v;
+            res = _context115.v;
             onSuccess();
-            return _context109.a(2, res);
+            return _context115.a(2, res);
           case 8:
-            _context109.n = 11;
+            _context115.n = 11;
             break;
           case 9:
-            _context109.p = 9;
-            _t12 = _context109.v;
-            if (!(_t12 instanceof TurnkeyError)) {
-              _context109.n = 10;
+            _context115.p = 9;
+            _t17 = _context115.v;
+            if (!(_t17 instanceof TurnkeyError)) {
+              _context115.n = 10;
               break;
             }
-            throw _t12;
+            throw _t17;
           case 10:
-            throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _t12);
+            throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _t17);
           case 11:
-            return _context109.a(2);
+            return _context115.a(2);
         }
-      }, _callee109, null, [[5, 9]]);
+      }, _callee115, null, [[5, 9]]);
     }));
-    return function (_x93) {
-      return _ref126.apply(this, arguments);
+    return function (_x94) {
+      return _ref134.apply(this, arguments);
     };
   }(), [client, getSession, user, pushPage, closeModal, updateUserName, logout]);
   var handleUpdateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref128 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee111(params) {
-      var _ref129, _ref129$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _yield$initOtp, otpId, otpEncryptionTargetBundle, _t14;
-      return _regenerator().w(function (_context111) {
-        while (1) switch (_context111.p = _context111.n) {
+    var _ref136 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee117(params) {
+      var _ref137, _ref137$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _yield$initOtp, otpId, otpEncryptionTargetBundle, _t19;
+      return _regenerator().w(function (_context117) {
+        while (1) switch (_context117.p = _context117.n) {
           case 0:
-            _ref129 = params || {}, _ref129$successPageDu = _ref129.successPageDuration, successPageDuration = _ref129$successPageDu === void 0 ? 2000 : _ref129$successPageDu, subTitle = _ref129.subTitle, title = _ref129.title, stampWith = _ref129.stampWith;
+            _ref137 = params || {}, _ref137$successPageDu = _ref137.successPageDuration, successPageDuration = _ref137$successPageDu === void 0 ? 2000 : _ref137$successPageDu, subTitle = _ref137.subTitle, title = _ref137.title, stampWith = _ref137.stampWith;
             if (client) {
-              _context111.n = 1;
+              _context117.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             if (masterConfig) {
-              _context111.n = 2;
+              _context117.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 2:
-            _context111.n = 3;
+            _context117.n = 3;
             return getSession();
           case 3:
-            s = _context111.v;
+            s = _context117.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context111.n = 4;
+              _context117.n = 4;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 4:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context111.n = 5;
+              _context117.n = 5;
               break;
             }
             throw new TurnkeyError("A user ID is required to update a phone number.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5144,12 +5318,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context111.p = 6;
+            _context117.p = 6;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context111.n = 7;
+              _context117.n = 7;
               break;
             }
-            return _context111.a(2, withTurnkeyErrorHandling(function () {
+            return _context117.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Phone Number",
@@ -5177,18 +5351,18 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 7:
-            _context111.n = 8;
+            _context117.n = 8;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 8:
-            _yield$initOtp = _context111.v;
+            _yield$initOtp = _context117.v;
             otpId = _yield$initOtp.otpId;
             otpEncryptionTargetBundle = _yield$initOtp.otpEncryptionTargetBundle;
-            return _context111.a(2, withTurnkeyErrorHandling(function () {
+            return _context117.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
-                var _masterConfig$auth66, _masterConfig$auth67;
+                var _masterConfig$auth68, _masterConfig$auth69;
                 pushPage({
                   key: "Update Phone Number",
                   content: jsx(OtpVerification, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5196,25 +5370,25 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.phoneNumber,
                     otpId: otpId,
                     otpEncryptionTargetBundle: otpEncryptionTargetBundle,
-                    otpLength: ((_masterConfig$auth66 = masterConfig.auth) === null || _masterConfig$auth66 === void 0 ? void 0 : _masterConfig$auth66.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
-                    alphanumeric: (_masterConfig$auth67 = masterConfig.auth) === null || _masterConfig$auth67 === void 0 ? void 0 : _masterConfig$auth67.otpAlphanumeric,
+                    otpLength: ((_masterConfig$auth68 = masterConfig.auth) === null || _masterConfig$auth68 === void 0 ? void 0 : _masterConfig$auth68.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
+                    alphanumeric: (_masterConfig$auth69 = masterConfig.auth) === null || _masterConfig$auth69 === void 0 ? void 0 : _masterConfig$auth69.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee110(otpCode) {
-                        var _yield$verifyOtp, verificationToken, res, _t13;
-                        return _regenerator().w(function (_context110) {
-                          while (1) switch (_context110.p = _context110.n) {
+                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee116(otpCode) {
+                        var _yield$verifyOtp, verificationToken, res, _t18;
+                        return _regenerator().w(function (_context116) {
+                          while (1) switch (_context116.p = _context116.n) {
                             case 0:
-                              _context110.p = 0;
-                              _context110.n = 1;
+                              _context116.p = 0;
+                              _context116.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
                                 otpEncryptionTargetBundle: otpEncryptionTargetBundle
                               });
                             case 1:
-                              _yield$verifyOtp = _context110.v;
+                              _yield$verifyOtp = _context116.v;
                               verificationToken = _yield$verifyOtp.verificationToken;
-                              _context110.n = 2;
+                              _context116.n = 2;
                               return updateUserPhoneNumber(_objectSpread2({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
@@ -5224,21 +5398,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               }));
                             case 2:
-                              res = _context110.v;
+                              res = _context116.v;
                               onSuccess();
                               resolve(res);
-                              _context110.n = 4;
+                              _context116.n = 4;
                               break;
                             case 3:
-                              _context110.p = 3;
-                              _t13 = _context110.v;
-                              reject(_t13);
+                              _context116.p = 3;
+                              _t18 = _context116.v;
+                              reject(_t18);
                             case 4:
-                              return _context110.a(2);
+                              return _context116.a(2);
                           }
-                        }, _callee110, null, [[0, 3]]);
+                        }, _callee116, null, [[0, 3]]);
                       }));
-                      function onContinue(_x95) {
+                      function onContinue(_x96) {
                         return _onContinue.apply(this, arguments);
                       }
                       return onContinue;
@@ -5257,54 +5431,54 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to update phone number"));
           case 9:
-            _context111.n = 12;
+            _context117.n = 12;
             break;
           case 10:
-            _context111.p = 10;
-            _t14 = _context111.v;
-            if (!(_t14 instanceof TurnkeyError)) {
-              _context111.n = 11;
+            _context117.p = 10;
+            _t19 = _context117.v;
+            if (!(_t19 instanceof TurnkeyError)) {
+              _context117.n = 11;
               break;
             }
-            throw _t14;
+            throw _t19;
           case 11:
-            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t14);
+            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t19);
           case 12:
-            return _context111.a(2);
+            return _context117.a(2);
         }
-      }, _callee111, null, [[6, 10]]);
+      }, _callee117, null, [[6, 10]]);
     }));
-    return function (_x94) {
-      return _ref128.apply(this, arguments);
+    return function (_x95) {
+      return _ref136.apply(this, arguments);
     };
   }(), [client, masterConfig, getSession, pushPage, closeModal, logout, initOtp, verifyOtp, updateUserPhoneNumber, user, callbacks]);
   var handleUpdateUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref130 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee113(params) {
-      var _ref131, _ref131$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _yield$initOtp2, otpId, otpEncryptionTargetBundle, _t16;
-      return _regenerator().w(function (_context113) {
-        while (1) switch (_context113.p = _context113.n) {
+    var _ref138 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee119(params) {
+      var _ref139, _ref139$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _yield$initOtp2, otpId, otpEncryptionTargetBundle, _t21;
+      return _regenerator().w(function (_context119) {
+        while (1) switch (_context119.p = _context119.n) {
           case 0:
-            _ref131 = params || {}, _ref131$successPageDu = _ref131.successPageDuration, successPageDuration = _ref131$successPageDu === void 0 ? 2000 : _ref131$successPageDu, subTitle = _ref131.subTitle, title = _ref131.title, stampWith = _ref131.stampWith;
+            _ref139 = params || {}, _ref139$successPageDu = _ref139.successPageDuration, successPageDuration = _ref139$successPageDu === void 0 ? 2000 : _ref139$successPageDu, subTitle = _ref139.subTitle, title = _ref139.title, stampWith = _ref139.stampWith;
             if (client) {
-              _context113.n = 1;
+              _context119.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context113.n = 2;
+            _context119.n = 2;
             return getSession();
           case 2:
-            s = _context113.v;
+            s = _context119.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context113.n = 3;
+              _context119.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context113.n = 4;
+              _context119.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to update an email.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5324,12 +5498,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context113.p = 5;
+            _context119.p = 5;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context113.n = 6;
+              _context119.n = 6;
               break;
             }
-            return _context113.a(2, withTurnkeyErrorHandling(function () {
+            return _context119.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Email",
@@ -5357,18 +5531,18 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context113.n = 7;
+            _context119.n = 7;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 7:
-            _yield$initOtp2 = _context113.v;
+            _yield$initOtp2 = _context119.v;
             otpId = _yield$initOtp2.otpId;
             otpEncryptionTargetBundle = _yield$initOtp2.otpEncryptionTargetBundle;
-            return _context113.a(2, withTurnkeyErrorHandling(function () {
+            return _context119.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
-                var _masterConfig$auth68, _masterConfig$auth69;
+                var _masterConfig$auth70, _masterConfig$auth71;
                 pushPage({
                   key: "Update Email",
                   content: jsx(OtpVerification, _objectSpread2(_objectSpread2({
@@ -5376,25 +5550,25 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.email,
                     otpId: otpId,
                     otpEncryptionTargetBundle: otpEncryptionTargetBundle,
-                    otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth68 = masterConfig.auth) === null || _masterConfig$auth68 === void 0 ? void 0 : _masterConfig$auth68.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
-                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth69 = masterConfig.auth) === null || _masterConfig$auth69 === void 0 ? void 0 : _masterConfig$auth69.otpAlphanumeric,
+                    otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth70 = masterConfig.auth) === null || _masterConfig$auth70 === void 0 ? void 0 : _masterConfig$auth70.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
+                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth71 = masterConfig.auth) === null || _masterConfig$auth71 === void 0 ? void 0 : _masterConfig$auth71.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee112(otpCode) {
-                        var _yield$verifyOtp2, verificationToken, res, _t15;
-                        return _regenerator().w(function (_context112) {
-                          while (1) switch (_context112.p = _context112.n) {
+                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee118(otpCode) {
+                        var _yield$verifyOtp2, verificationToken, res, _t20;
+                        return _regenerator().w(function (_context118) {
+                          while (1) switch (_context118.p = _context118.n) {
                             case 0:
-                              _context112.p = 0;
-                              _context112.n = 1;
+                              _context118.p = 0;
+                              _context118.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
                                 otpEncryptionTargetBundle: otpEncryptionTargetBundle
                               });
                             case 1:
-                              _yield$verifyOtp2 = _context112.v;
+                              _yield$verifyOtp2 = _context118.v;
                               verificationToken = _yield$verifyOtp2.verificationToken;
-                              _context112.n = 2;
+                              _context118.n = 2;
                               return updateUserEmail(_objectSpread2({
                                 email: params.email,
                                 verificationToken: verificationToken,
@@ -5404,21 +5578,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               }));
                             case 2:
-                              res = _context112.v;
+                              res = _context118.v;
                               onSuccess();
                               resolve(res);
-                              _context112.n = 4;
+                              _context118.n = 4;
                               break;
                             case 3:
-                              _context112.p = 3;
-                              _t15 = _context112.v;
-                              reject(_t15);
+                              _context118.p = 3;
+                              _t20 = _context118.v;
+                              reject(_t20);
                             case 4:
-                              return _context112.a(2);
+                              return _context118.a(2);
                           }
-                        }, _callee112, null, [[0, 3]]);
+                        }, _callee118, null, [[0, 3]]);
                       }));
-                      function onContinue(_x97) {
+                      function onContinue(_x98) {
                         return _onContinue2.apply(this, arguments);
                       }
                       return onContinue;
@@ -5435,54 +5609,54 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to update email"));
           case 8:
-            _context113.n = 11;
+            _context119.n = 11;
             break;
           case 9:
-            _context113.p = 9;
-            _t16 = _context113.v;
-            if (!(_t16 instanceof TurnkeyError)) {
-              _context113.n = 10;
+            _context119.p = 9;
+            _t21 = _context119.v;
+            if (!(_t21 instanceof TurnkeyError)) {
+              _context119.n = 10;
               break;
             }
-            throw _t16;
+            throw _t21;
           case 10:
-            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t16);
+            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t21);
           case 11:
-            return _context113.a(2);
+            return _context119.a(2);
         }
-      }, _callee113, null, [[5, 9]]);
+      }, _callee119, null, [[5, 9]]);
     }));
-    return function (_x96) {
-      return _ref130.apply(this, arguments);
+    return function (_x97) {
+      return _ref138.apply(this, arguments);
     };
   }(), [client, getSession, pushPage, closeModal, logout, initOtp, masterConfig, verifyOtp, updateUserEmail, user, callbacks]);
   var handleAddEmail = useCallback(/*#__PURE__*/function () {
-    var _ref132 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee115(params) {
-      var _ref133, _ref133$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _yield$initOtp3, otpId, otpEncryptionTargetBundle, _t18;
-      return _regenerator().w(function (_context115) {
-        while (1) switch (_context115.p = _context115.n) {
+    var _ref140 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee121(params) {
+      var _ref141, _ref141$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _yield$initOtp3, otpId, otpEncryptionTargetBundle, _t23;
+      return _regenerator().w(function (_context121) {
+        while (1) switch (_context121.p = _context121.n) {
           case 0:
-            _ref133 = params || {}, _ref133$successPageDu = _ref133.successPageDuration, successPageDuration = _ref133$successPageDu === void 0 ? 2000 : _ref133$successPageDu, subTitle = _ref133.subTitle, title = _ref133.title, stampWith = _ref133.stampWith;
+            _ref141 = params || {}, _ref141$successPageDu = _ref141.successPageDuration, successPageDuration = _ref141$successPageDu === void 0 ? 2000 : _ref141$successPageDu, subTitle = _ref141.subTitle, title = _ref141.title, stampWith = _ref141.stampWith;
             if (client) {
-              _context115.n = 1;
+              _context121.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context115.n = 2;
+            _context121.n = 2;
             return getSession();
           case 2:
-            s = _context115.v;
+            s = _context121.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context115.n = 3;
+              _context121.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context115.n = 4;
+              _context121.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to add an email.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5502,12 +5676,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context115.p = 5;
+            _context121.p = 5;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context115.n = 6;
+              _context121.n = 6;
               break;
             }
-            return _context115.a(2, withTurnkeyErrorHandling(function () {
+            return _context121.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Email",
@@ -5535,18 +5709,18 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context115.n = 7;
+            _context121.n = 7;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 7:
-            _yield$initOtp3 = _context115.v;
+            _yield$initOtp3 = _context121.v;
             otpId = _yield$initOtp3.otpId;
             otpEncryptionTargetBundle = _yield$initOtp3.otpEncryptionTargetBundle;
-            return _context115.a(2, withTurnkeyErrorHandling(function () {
+            return _context121.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
-                var _masterConfig$auth70, _masterConfig$auth71;
+                var _masterConfig$auth72, _masterConfig$auth73;
                 pushPage({
                   key: "Add Email",
                   content: jsx(OtpVerification, _objectSpread2(_objectSpread2({
@@ -5554,25 +5728,25 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.email,
                     otpId: otpId,
                     otpEncryptionTargetBundle: otpEncryptionTargetBundle,
-                    otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth70 = masterConfig.auth) === null || _masterConfig$auth70 === void 0 ? void 0 : _masterConfig$auth70.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
-                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth71 = masterConfig.auth) === null || _masterConfig$auth71 === void 0 ? void 0 : _masterConfig$auth71.otpAlphanumeric,
+                    otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth72 = masterConfig.auth) === null || _masterConfig$auth72 === void 0 ? void 0 : _masterConfig$auth72.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
+                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth73 = masterConfig.auth) === null || _masterConfig$auth73 === void 0 ? void 0 : _masterConfig$auth73.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee114(otpCode) {
-                        var _yield$verifyOtp3, verificationToken, res, _t17;
-                        return _regenerator().w(function (_context114) {
-                          while (1) switch (_context114.p = _context114.n) {
+                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee120(otpCode) {
+                        var _yield$verifyOtp3, verificationToken, res, _t22;
+                        return _regenerator().w(function (_context120) {
+                          while (1) switch (_context120.p = _context120.n) {
                             case 0:
-                              _context114.p = 0;
-                              _context114.n = 1;
+                              _context120.p = 0;
+                              _context120.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
                                 otpEncryptionTargetBundle: otpEncryptionTargetBundle
                               });
                             case 1:
-                              _yield$verifyOtp3 = _context114.v;
+                              _yield$verifyOtp3 = _context120.v;
                               verificationToken = _yield$verifyOtp3.verificationToken;
-                              _context114.n = 2;
+                              _context120.n = 2;
                               return updateUserEmail({
                                 email: params.email,
                                 verificationToken: verificationToken,
@@ -5581,21 +5755,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               });
                             case 2:
-                              res = _context114.v;
+                              res = _context120.v;
                               onSuccess();
                               resolve(res);
-                              _context114.n = 4;
+                              _context120.n = 4;
                               break;
                             case 3:
-                              _context114.p = 3;
-                              _t17 = _context114.v;
-                              reject(_t17);
+                              _context120.p = 3;
+                              _t22 = _context120.v;
+                              reject(_t22);
                             case 4:
-                              return _context114.a(2);
+                              return _context120.a(2);
                           }
-                        }, _callee114, null, [[0, 3]]);
+                        }, _callee120, null, [[0, 3]]);
                       }));
-                      function onContinue(_x99) {
+                      function onContinue(_x100) {
                         return _onContinue3.apply(this, arguments);
                       }
                       return onContinue;
@@ -5612,60 +5786,60 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add email"));
           case 8:
-            _context115.n = 11;
+            _context121.n = 11;
             break;
           case 9:
-            _context115.p = 9;
-            _t18 = _context115.v;
-            if (!(_t18 instanceof TurnkeyError)) {
-              _context115.n = 10;
+            _context121.p = 9;
+            _t23 = _context121.v;
+            if (!(_t23 instanceof TurnkeyError)) {
+              _context121.n = 10;
               break;
             }
-            throw _t18;
+            throw _t23;
           case 10:
-            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t18);
+            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t23);
           case 11:
-            return _context115.a(2);
+            return _context121.a(2);
         }
-      }, _callee115, null, [[5, 9]]);
+      }, _callee121, null, [[5, 9]]);
     }));
-    return function (_x98) {
-      return _ref132.apply(this, arguments);
+    return function (_x99) {
+      return _ref140.apply(this, arguments);
     };
   }(), [client, getSession, pushPage, closeModal, user, logout, initOtp, masterConfig, verifyOtp, updateUserEmail, callbacks]);
   var handleAddPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref134 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee117(params) {
-      var _ref135, _ref135$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _yield$initOtp4, otpId, otpEncryptionTargetBundle, _t20;
-      return _regenerator().w(function (_context117) {
-        while (1) switch (_context117.p = _context117.n) {
+    var _ref142 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee123(params) {
+      var _ref143, _ref143$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _yield$initOtp4, otpId, otpEncryptionTargetBundle, _t25;
+      return _regenerator().w(function (_context123) {
+        while (1) switch (_context123.p = _context123.n) {
           case 0:
-            _ref135 = params || {}, _ref135$successPageDu = _ref135.successPageDuration, successPageDuration = _ref135$successPageDu === void 0 ? 2000 : _ref135$successPageDu, subTitle = _ref135.subTitle, title = _ref135.title, stampWith = _ref135.stampWith;
+            _ref143 = params || {}, _ref143$successPageDu = _ref143.successPageDuration, successPageDuration = _ref143$successPageDu === void 0 ? 2000 : _ref143$successPageDu, subTitle = _ref143.subTitle, title = _ref143.title, stampWith = _ref143.stampWith;
             if (client) {
-              _context117.n = 1;
+              _context123.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             if (masterConfig) {
-              _context117.n = 2;
+              _context123.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 2:
-            _context117.n = 3;
+            _context123.n = 3;
             return getSession();
           case 3:
-            s = _context117.v;
+            s = _context123.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context117.n = 4;
+              _context123.n = 4;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 4:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context117.n = 5;
+              _context123.n = 5;
               break;
             }
             throw new TurnkeyError("A user ID is required to add a phone number.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5685,12 +5859,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context117.p = 6;
+            _context123.p = 6;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context117.n = 7;
+              _context123.n = 7;
               break;
             }
-            return _context117.a(2, withTurnkeyErrorHandling(function () {
+            return _context123.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Phone Number",
@@ -5718,18 +5892,18 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add phone number"));
           case 7:
-            _context117.n = 8;
+            _context123.n = 8;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 8:
-            _yield$initOtp4 = _context117.v;
+            _yield$initOtp4 = _context123.v;
             otpId = _yield$initOtp4.otpId;
             otpEncryptionTargetBundle = _yield$initOtp4.otpEncryptionTargetBundle;
-            return _context117.a(2, withTurnkeyErrorHandling(function () {
+            return _context123.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
-                var _masterConfig$auth72, _masterConfig$auth73;
+                var _masterConfig$auth74, _masterConfig$auth75;
                 pushPage({
                   key: "Add Phone Number",
                   content: jsx(OtpVerification, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5737,25 +5911,25 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.phoneNumber,
                     otpId: otpId,
                     otpEncryptionTargetBundle: otpEncryptionTargetBundle,
-                    otpLength: ((_masterConfig$auth72 = masterConfig.auth) === null || _masterConfig$auth72 === void 0 ? void 0 : _masterConfig$auth72.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
-                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth73 = masterConfig.auth) === null || _masterConfig$auth73 === void 0 ? void 0 : _masterConfig$auth73.otpAlphanumeric,
+                    otpLength: ((_masterConfig$auth74 = masterConfig.auth) === null || _masterConfig$auth74 === void 0 ? void 0 : _masterConfig$auth74.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
+                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth75 = masterConfig.auth) === null || _masterConfig$auth75 === void 0 ? void 0 : _masterConfig$auth75.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee116(otpCode) {
-                        var _yield$verifyOtp4, verificationToken, res, _t19;
-                        return _regenerator().w(function (_context116) {
-                          while (1) switch (_context116.p = _context116.n) {
+                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee122(otpCode) {
+                        var _yield$verifyOtp4, verificationToken, res, _t24;
+                        return _regenerator().w(function (_context122) {
+                          while (1) switch (_context122.p = _context122.n) {
                             case 0:
-                              _context116.p = 0;
-                              _context116.n = 1;
+                              _context122.p = 0;
+                              _context122.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
                                 otpEncryptionTargetBundle: otpEncryptionTargetBundle
                               });
                             case 1:
-                              _yield$verifyOtp4 = _context116.v;
+                              _yield$verifyOtp4 = _context122.v;
                               verificationToken = _yield$verifyOtp4.verificationToken;
-                              _context116.n = 2;
+                              _context122.n = 2;
                               return updateUserPhoneNumber({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
@@ -5764,21 +5938,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               });
                             case 2:
-                              res = _context116.v;
+                              res = _context122.v;
                               onSuccess();
                               resolve(res);
-                              _context116.n = 4;
+                              _context122.n = 4;
                               break;
                             case 3:
-                              _context116.p = 3;
-                              _t19 = _context116.v;
-                              reject(_t19);
+                              _context122.p = 3;
+                              _t24 = _context122.v;
+                              reject(_t24);
                             case 4:
-                              return _context116.a(2);
+                              return _context122.a(2);
                           }
-                        }, _callee116, null, [[0, 3]]);
+                        }, _callee122, null, [[0, 3]]);
                       }));
-                      function onContinue(_x101) {
+                      function onContinue(_x102) {
                         return _onContinue4.apply(this, arguments);
                       }
                       return onContinue;
@@ -5797,52 +5971,52 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add phone number"));
           case 9:
-            _context117.n = 12;
+            _context123.n = 12;
             break;
           case 10:
-            _context117.p = 10;
-            _t20 = _context117.v;
-            if (!(_t20 instanceof TurnkeyError)) {
-              _context117.n = 11;
+            _context123.p = 10;
+            _t25 = _context123.v;
+            if (!(_t25 instanceof TurnkeyError)) {
+              _context123.n = 11;
               break;
             }
-            throw _t20;
+            throw _t25;
           case 11:
-            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t20);
+            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t25);
           case 12:
-            return _context117.a(2);
+            return _context123.a(2);
         }
-      }, _callee117, null, [[6, 10]]);
+      }, _callee123, null, [[6, 10]]);
     }));
-    return function (_x100) {
-      return _ref134.apply(this, arguments);
+    return function (_x101) {
+      return _ref142.apply(this, arguments);
     };
   }(), [client, masterConfig, getSession, pushPage, closeModal, user, logout, callbacks, initOtp, verifyOtp, updateUserPhoneNumber]);
   var handleRemovePasskey = useCallback(/*#__PURE__*/function () {
-    var _ref136 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee118(params) {
+    var _ref144 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee124(params) {
       var authenticatorId, _params$successPageDu2, successPageDuration, subTitle, title, stampWith, userId, s, organizationId;
-      return _regenerator().w(function (_context118) {
-        while (1) switch (_context118.n) {
+      return _regenerator().w(function (_context124) {
+        while (1) switch (_context124.n) {
           case 0:
             authenticatorId = params.authenticatorId, _params$successPageDu2 = params.successPageDuration, successPageDuration = _params$successPageDu2 === void 0 ? 2000 : _params$successPageDu2, subTitle = params.subTitle, title = params.title, stampWith = params.stampWith, userId = params.userId;
             if (client) {
-              _context118.n = 1;
+              _context124.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context118.n = 2;
+            _context124.n = 2;
             return getSession();
           case 2:
-            s = _context118.v;
+            s = _context124.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context118.n = 3;
+              _context124.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
-            return _context118.a(2, withTurnkeyErrorHandling(function () {
+            return _context124.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Remove Passkey",
@@ -5873,44 +6047,44 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to remove passkey"));
         }
-      }, _callee118);
+      }, _callee124);
     }));
-    return function (_x102) {
-      return _ref136.apply(this, arguments);
+    return function (_x103) {
+      return _ref144.apply(this, arguments);
     };
   }(), [client, getSession, pushPage, logout, callbacks]);
   var handleAddPasskey = useCallback(/*#__PURE__*/function () {
-    var _ref137 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee119(params) {
-      var _ref138, name, displayName, _ref138$successPageDu, successPageDuration, stampWith, s, organizationId, userId, resPromise, _t21;
-      return _regenerator().w(function (_context119) {
-        while (1) switch (_context119.p = _context119.n) {
+    var _ref145 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee125(params) {
+      var _ref146, name, displayName, _ref146$successPageDu, successPageDuration, stampWith, s, organizationId, userId, resPromise, _t26;
+      return _regenerator().w(function (_context125) {
+        while (1) switch (_context125.p = _context125.n) {
           case 0:
-            _ref138 = params || {}, name = _ref138.name, displayName = _ref138.displayName, _ref138$successPageDu = _ref138.successPageDuration, successPageDuration = _ref138$successPageDu === void 0 ? 2000 : _ref138$successPageDu, stampWith = _ref138.stampWith;
+            _ref146 = params || {}, name = _ref146.name, displayName = _ref146.displayName, _ref146$successPageDu = _ref146.successPageDuration, successPageDuration = _ref146$successPageDu === void 0 ? 2000 : _ref146$successPageDu, stampWith = _ref146.stampWith;
             if (client) {
-              _context119.n = 1;
+              _context125.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context119.n = 2;
+            _context125.n = 2;
             return getSession();
           case 2:
-            s = _context119.v;
+            s = _context125.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context119.n = 3;
+              _context125.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context119.n = 4;
+              _context125.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID or a valid session is required to add a passkey.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 4:
-            _context119.p = 4;
+            _context125.p = 4;
             resPromise = addPasskey(_objectSpread2(_objectSpread2(_objectSpread2({}, name && {
               name: name
             }), displayName && {
@@ -5935,55 +6109,55 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             });
-            _context119.n = 5;
+            _context125.n = 5;
             return resPromise;
           case 5:
-            return _context119.a(2, _context119.v);
+            return _context125.a(2, _context125.v);
           case 6:
-            _context119.p = 6;
-            _t21 = _context119.v;
-            if (!(_t21 instanceof TurnkeyError)) {
-              _context119.n = 7;
+            _context125.p = 6;
+            _t26 = _context125.v;
+            if (!(_t26 instanceof TurnkeyError)) {
+              _context125.n = 7;
               break;
             }
-            throw _t21;
+            throw _t26;
           case 7:
-            throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _t21);
+            throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _t26);
           case 8:
-            return _context119.a(2);
+            return _context125.a(2);
         }
-      }, _callee119, null, [[4, 6]]);
+      }, _callee125, null, [[4, 6]]);
     }));
-    return function (_x103) {
-      return _ref137.apply(this, arguments);
+    return function (_x104) {
+      return _ref145.apply(this, arguments);
     };
   }(), [client, getSession, addPasskey, pushPage, closeModal]);
   var handleRemoveOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref139 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee120(params) {
-      var providerId, _params$successPageDu3, successPageDuration, subTitle, title, stampWith, s, organizationId, _t22;
-      return _regenerator().w(function (_context120) {
-        while (1) switch (_context120.p = _context120.n) {
+    var _ref147 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee126(params) {
+      var providerId, _params$successPageDu3, successPageDuration, subTitle, title, stampWith, s, organizationId, _t27;
+      return _regenerator().w(function (_context126) {
+        while (1) switch (_context126.p = _context126.n) {
           case 0:
             providerId = params.providerId, _params$successPageDu3 = params.successPageDuration, successPageDuration = _params$successPageDu3 === void 0 ? 2000 : _params$successPageDu3, subTitle = params.subTitle, title = params.title, stampWith = params.stampWith;
             if (client) {
-              _context120.n = 1;
+              _context126.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context120.n = 2;
+            _context126.n = 2;
             return getSession();
           case 2:
-            s = _context120.v;
+            s = _context126.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context120.n = 3;
+              _context126.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
-            _context120.p = 3;
-            return _context120.a(2, new Promise(function (resolve, reject) {
+            _context126.p = 3;
+            return _context126.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove OAuth Provider",
                 content: jsx(RemoveOAuthProvider, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -6011,94 +6185,94 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 4:
-            _context120.p = 4;
-            _t22 = _context120.v;
-            if (!(_t22 instanceof TurnkeyError)) {
-              _context120.n = 5;
+            _context126.p = 4;
+            _t27 = _context126.v;
+            if (!(_t27 instanceof TurnkeyError)) {
+              _context126.n = 5;
               break;
             }
-            throw _t22;
+            throw _t27;
           case 5:
-            throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _t22);
+            throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _t27);
           case 6:
-            return _context120.a(2);
+            return _context126.a(2);
         }
-      }, _callee120, null, [[3, 4]]);
+      }, _callee126, null, [[3, 4]]);
     }));
-    return function (_x104) {
-      return _ref139.apply(this, arguments);
+    return function (_x105) {
+      return _ref147.apply(this, arguments);
     };
   }(), [client, getSession, pushPage]);
   var handleAddOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref140 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee123(params) {
-      var _masterConfig$auth$oa12, _masterConfig$auth74, _masterConfig$auth74$, _masterConfig$auth75, _masterConfig$auth75$, _masterConfig$auth76, _masterConfig$auth76$, _masterConfig$auth77, _masterConfig$auth77$, _masterConfig$auth78, _masterConfig$auth78$, _masterConfig$auth79, _masterConfig$auth79$, _params$primaryClient, _providerConfig, _ref141, _params$secondaryClie, _providerConfig2;
-      var providerName, stampWith, _params$successPageDu4, successPageDuration, _params$openInPage, openInPage, providerConfig, primaryClientId, secondaryClientIds, s, organizationId, userId, _t25;
-      return _regenerator().w(function (_context123) {
-        while (1) switch (_context123.n) {
+    var _ref148 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee129(params) {
+      var _masterConfig$auth$oa12, _masterConfig$auth76, _masterConfig$auth76$, _masterConfig$auth77, _masterConfig$auth77$, _masterConfig$auth78, _masterConfig$auth78$, _masterConfig$auth79, _masterConfig$auth79$, _masterConfig$auth80, _masterConfig$auth80$, _masterConfig$auth81, _masterConfig$auth81$, _params$primaryClient, _providerConfig, _ref149, _params$secondaryClie, _providerConfig2;
+      var providerName, stampWith, _params$successPageDu4, successPageDuration, _params$openInPage, openInPage, providerConfig, primaryClientId, secondaryClientIds, s, organizationId, userId, _t30;
+      return _regenerator().w(function (_context129) {
+        while (1) switch (_context129.n) {
           case 0:
             if (client) {
-              _context123.n = 1;
+              _context129.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            providerName = params.providerName, stampWith = params.stampWith, _params$successPageDu4 = params.successPageDuration, successPageDuration = _params$successPageDu4 === void 0 ? 2000 : _params$successPageDu4, _params$openInPage = params.openInPage, openInPage = _params$openInPage === void 0 ? (_masterConfig$auth$oa12 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth74 = masterConfig.auth) === null || _masterConfig$auth74 === void 0 ? void 0 : (_masterConfig$auth74$ = _masterConfig$auth74.oauthConfig) === null || _masterConfig$auth74$ === void 0 ? void 0 : _masterConfig$auth74$.openOauthInPage) !== null && _masterConfig$auth$oa12 !== void 0 ? _masterConfig$auth$oa12 : false : _params$openInPage; // Resolve the provider's per-provider config, then apply per-call overrides.
-            _t25 = providerName;
-            _context123.n = _t25 === OAuthProviders.DISCORD ? 2 : _t25 === OAuthProviders.X ? 3 : _t25 === OAuthProviders.GOOGLE ? 4 : _t25 === OAuthProviders.APPLE ? 5 : _t25 === OAuthProviders.FACEBOOK ? 6 : 7;
+            providerName = params.providerName, stampWith = params.stampWith, _params$successPageDu4 = params.successPageDuration, successPageDuration = _params$successPageDu4 === void 0 ? 2000 : _params$successPageDu4, _params$openInPage = params.openInPage, openInPage = _params$openInPage === void 0 ? (_masterConfig$auth$oa12 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth76 = masterConfig.auth) === null || _masterConfig$auth76 === void 0 ? void 0 : (_masterConfig$auth76$ = _masterConfig$auth76.oauthConfig) === null || _masterConfig$auth76$ === void 0 ? void 0 : _masterConfig$auth76$.openOauthInPage) !== null && _masterConfig$auth$oa12 !== void 0 ? _masterConfig$auth$oa12 : false : _params$openInPage; // Resolve the provider's per-provider config, then apply per-call overrides.
+            _t30 = providerName;
+            _context129.n = _t30 === OAuthProviders.DISCORD ? 2 : _t30 === OAuthProviders.X ? 3 : _t30 === OAuthProviders.GOOGLE ? 4 : _t30 === OAuthProviders.APPLE ? 5 : _t30 === OAuthProviders.FACEBOOK ? 6 : 7;
             break;
           case 2:
-            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth75 = masterConfig.auth) === null || _masterConfig$auth75 === void 0 ? void 0 : (_masterConfig$auth75$ = _masterConfig$auth75.oauthConfig) === null || _masterConfig$auth75$ === void 0 ? void 0 : _masterConfig$auth75$.discord;
-            return _context123.a(3, 8);
+            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth77 = masterConfig.auth) === null || _masterConfig$auth77 === void 0 ? void 0 : (_masterConfig$auth77$ = _masterConfig$auth77.oauthConfig) === null || _masterConfig$auth77$ === void 0 ? void 0 : _masterConfig$auth77$.discord;
+            return _context129.a(3, 8);
           case 3:
-            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth76 = masterConfig.auth) === null || _masterConfig$auth76 === void 0 ? void 0 : (_masterConfig$auth76$ = _masterConfig$auth76.oauthConfig) === null || _masterConfig$auth76$ === void 0 ? void 0 : _masterConfig$auth76$.x;
-            return _context123.a(3, 8);
+            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth78 = masterConfig.auth) === null || _masterConfig$auth78 === void 0 ? void 0 : (_masterConfig$auth78$ = _masterConfig$auth78.oauthConfig) === null || _masterConfig$auth78$ === void 0 ? void 0 : _masterConfig$auth78$.x;
+            return _context129.a(3, 8);
           case 4:
-            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth77 = masterConfig.auth) === null || _masterConfig$auth77 === void 0 ? void 0 : (_masterConfig$auth77$ = _masterConfig$auth77.oauthConfig) === null || _masterConfig$auth77$ === void 0 ? void 0 : _masterConfig$auth77$.google;
-            return _context123.a(3, 8);
+            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth79 = masterConfig.auth) === null || _masterConfig$auth79 === void 0 ? void 0 : (_masterConfig$auth79$ = _masterConfig$auth79.oauthConfig) === null || _masterConfig$auth79$ === void 0 ? void 0 : _masterConfig$auth79$.google;
+            return _context129.a(3, 8);
           case 5:
-            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth78 = masterConfig.auth) === null || _masterConfig$auth78 === void 0 ? void 0 : (_masterConfig$auth78$ = _masterConfig$auth78.oauthConfig) === null || _masterConfig$auth78$ === void 0 ? void 0 : _masterConfig$auth78$.apple;
-            return _context123.a(3, 8);
+            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth80 = masterConfig.auth) === null || _masterConfig$auth80 === void 0 ? void 0 : (_masterConfig$auth80$ = _masterConfig$auth80.oauthConfig) === null || _masterConfig$auth80$ === void 0 ? void 0 : _masterConfig$auth80$.apple;
+            return _context129.a(3, 8);
           case 6:
-            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth79 = masterConfig.auth) === null || _masterConfig$auth79 === void 0 ? void 0 : (_masterConfig$auth79$ = _masterConfig$auth79.oauthConfig) === null || _masterConfig$auth79$ === void 0 ? void 0 : _masterConfig$auth79$.facebook;
-            return _context123.a(3, 8);
+            providerConfig = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth81 = masterConfig.auth) === null || _masterConfig$auth81 === void 0 ? void 0 : (_masterConfig$auth81$ = _masterConfig$auth81.oauthConfig) === null || _masterConfig$auth81$ === void 0 ? void 0 : _masterConfig$auth81$.facebook;
+            return _context129.a(3, 8);
           case 7:
             providerConfig = undefined;
           case 8:
             primaryClientId = (_params$primaryClient = params.primaryClientId) !== null && _params$primaryClient !== void 0 ? _params$primaryClient : (_providerConfig = providerConfig) === null || _providerConfig === void 0 ? void 0 : _providerConfig.primaryClientId;
-            secondaryClientIds = (_ref141 = (_params$secondaryClie = params.secondaryClientIds) !== null && _params$secondaryClie !== void 0 ? _params$secondaryClie : (_providerConfig2 = providerConfig) === null || _providerConfig2 === void 0 ? void 0 : _providerConfig2.secondaryClientIds) !== null && _ref141 !== void 0 ? _ref141 : [];
-            _context123.n = 9;
+            secondaryClientIds = (_ref149 = (_params$secondaryClie = params.secondaryClientIds) !== null && _params$secondaryClie !== void 0 ? _params$secondaryClie : (_providerConfig2 = providerConfig) === null || _providerConfig2 === void 0 ? void 0 : _providerConfig2.secondaryClientIds) !== null && _ref149 !== void 0 ? _ref149 : [];
+            _context129.n = 9;
             return getSession();
           case 9:
-            s = _context123.v;
+            s = _context129.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context123.n = 10;
+              _context129.n = 10;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 10:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context123.n = 11;
+              _context129.n = 11;
               break;
             }
             throw new TurnkeyError("A user ID is required to add an OAuth provider.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 11:
-            return _context123.a(2, new Promise(/*#__PURE__*/function () {
-              var _ref142 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee122(resolve, reject) {
-                var onOauthSuccess, additionalState, sharedOauthParams, _t23, _t24;
-                return _regenerator().w(function (_context122) {
-                  while (1) switch (_context122.p = _context122.n) {
+            return _context129.a(2, new Promise(/*#__PURE__*/function () {
+              var _ref150 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee128(resolve, reject) {
+                var onOauthSuccess, additionalState, sharedOauthParams, _t28, _t29;
+                return _regenerator().w(function (_context128) {
+                  while (1) switch (_context128.p = _context128.n) {
                     case 0:
-                      _context122.p = 0;
+                      _context128.p = 0;
                       onOauthSuccess = /*#__PURE__*/function () {
-                        var _ref143 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee121(params) {
+                        var _ref151 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee127(params) {
                           var oidcClaims;
-                          return _regenerator().w(function (_context121) {
-                            while (1) switch (_context121.n) {
+                          return _regenerator().w(function (_context127) {
+                            while (1) switch (_context127.n) {
                               case 0:
                                 oidcClaims = buildSecondaryOidcClaims(params.oidcToken, secondaryClientIds);
-                                _context121.n = 1;
+                                _context127.n = 1;
                                 return addOauthProvider(_objectSpread2(_objectSpread2({
                                   providerName: params.providerName,
                                   oidcToken: params.oidcToken
@@ -6124,12 +6298,12 @@ var ClientProvider = function ClientProvider(_ref) {
                                   showTitle: false
                                 });
                               case 2:
-                                return _context121.a(2);
+                                return _context127.a(2);
                             }
-                          }, _callee121);
+                          }, _callee127);
                         }));
-                        return function onOauthSuccess(_x108) {
-                          return _ref143.apply(this, arguments);
+                        return function onOauthSuccess(_x109) {
+                          return _ref151.apply(this, arguments);
                         };
                       }();
                       if (openInPage) {
@@ -6158,80 +6332,80 @@ var ClientProvider = function ClientProvider(_ref) {
                       }), !openInPage && {
                         onOauthSuccess: onOauthSuccess
                       });
-                      _t23 = providerName;
-                      _context122.n = _t23 === OAuthProviders.DISCORD ? 1 : _t23 === OAuthProviders.X ? 3 : _t23 === OAuthProviders.GOOGLE ? 5 : _t23 === OAuthProviders.APPLE ? 7 : _t23 === OAuthProviders.FACEBOOK ? 9 : 11;
+                      _t28 = providerName;
+                      _context128.n = _t28 === OAuthProviders.DISCORD ? 1 : _t28 === OAuthProviders.X ? 3 : _t28 === OAuthProviders.GOOGLE ? 5 : _t28 === OAuthProviders.APPLE ? 7 : _t28 === OAuthProviders.FACEBOOK ? 9 : 11;
                       break;
                     case 1:
-                      _context122.n = 2;
+                      _context128.n = 2;
                       return handleDiscordOauth(sharedOauthParams);
                     case 2:
-                      return _context122.a(2, _context122.v);
+                      return _context128.a(2, _context128.v);
                     case 3:
-                      _context122.n = 4;
+                      _context128.n = 4;
                       return handleXOauth(sharedOauthParams);
                     case 4:
-                      return _context122.a(2, _context122.v);
+                      return _context128.a(2, _context128.v);
                     case 5:
-                      _context122.n = 6;
+                      _context128.n = 6;
                       return handleGoogleOauth(sharedOauthParams);
                     case 6:
-                      return _context122.a(2, _context122.v);
+                      return _context128.a(2, _context128.v);
                     case 7:
-                      _context122.n = 8;
+                      _context128.n = 8;
                       return handleAppleOauth(sharedOauthParams);
                     case 8:
-                      return _context122.a(2, _context122.v);
+                      return _context128.a(2, _context128.v);
                     case 9:
-                      _context122.n = 10;
+                      _context128.n = 10;
                       return handleFacebookOauth(sharedOauthParams);
                     case 10:
-                      return _context122.a(2, _context122.v);
+                      return _context128.a(2, _context128.v);
                     case 11:
                       throw new TurnkeyError("Unsupported OAuth provider: ".concat(providerName), TurnkeyErrorCodes.NOT_FOUND);
                     case 12:
-                      _context122.n = 14;
+                      _context128.n = 14;
                       break;
                     case 13:
-                      _context122.p = 13;
-                      _t24 = _context122.v;
-                      reject(_t24);
+                      _context128.p = 13;
+                      _t29 = _context128.v;
+                      reject(_t29);
                     case 14:
-                      return _context122.a(2);
+                      return _context128.a(2);
                   }
-                }, _callee122, null, [[0, 13]]);
+                }, _callee128, null, [[0, 13]]);
               }));
-              return function (_x106, _x107) {
-                return _ref142.apply(this, arguments);
+              return function (_x107, _x108) {
+                return _ref150.apply(this, arguments);
               };
             }()));
         }
-      }, _callee123);
+      }, _callee129);
     }));
-    return function (_x105) {
-      return _ref140.apply(this, arguments);
+    return function (_x106) {
+      return _ref148.apply(this, arguments);
     };
   }(), [client, getSession, addOauthProvider, pushPage, closeModal, handleDiscordOauth, handleXOauth, handleGoogleOauth, handleAppleOauth, handleFacebookOauth]);
   var handleConnectExternalWallet = useCallback(/*#__PURE__*/function () {
-    var _ref144 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee124(params) {
+    var _ref152 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee130(params) {
       var _masterConfig$walletC4, _masterConfig$walletC5;
-      var _ref145, _ref145$successPageDu, successPageDuration;
-      return _regenerator().w(function (_context124) {
-        while (1) switch (_context124.n) {
+      var _ref153, _ref153$successPageDu, successPageDuration;
+      return _regenerator().w(function (_context130) {
+        while (1) switch (_context130.n) {
           case 0:
-            _ref145 = params || {}, _ref145$successPageDu = _ref145.successPageDuration, successPageDuration = _ref145$successPageDu === void 0 ? 2000 : _ref145$successPageDu;
+            _ref153 = params || {}, _ref153$successPageDu = _ref153.successPageDuration, successPageDuration = _ref153$successPageDu === void 0 ? 2000 : _ref153$successPageDu;
             if (client) {
-              _context124.n = 1;
+              _context130.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             if (masterConfig !== null && masterConfig !== void 0 && (_masterConfig$walletC4 = masterConfig.walletConfig) !== null && _masterConfig$walletC4 !== void 0 && (_masterConfig$walletC5 = _masterConfig$walletC4.features) !== null && _masterConfig$walletC5 !== void 0 && _masterConfig$walletC5.connecting) {
-              _context124.n = 2;
+              _context130.n = 2;
               break;
             }
             throw new TurnkeyError("Wallet connecting is not enabled.", TurnkeyErrorCodes.FEATURE_NOT_ENABLED);
           case 2:
-            return _context124.a(2, new Promise(function (resolve, reject) {
+            return _context130.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Connect wallet",
                 content: jsx(ConnectWalletModal, {
@@ -6250,32 +6424,32 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee124);
+      }, _callee130);
     }));
-    return function (_x109) {
-      return _ref144.apply(this, arguments);
+    return function (_x110) {
+      return _ref152.apply(this, arguments);
     };
   }(), [client, masterConfig, fetchWalletProviders, pushPage]);
   var handleRemoveUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref146 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee125(params) {
-      var _ref147, _ref147$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t26;
-      return _regenerator().w(function (_context125) {
-        while (1) switch (_context125.p = _context125.n) {
+    var _ref154 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee131(params) {
+      var _ref155, _ref155$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t31;
+      return _regenerator().w(function (_context131) {
+        while (1) switch (_context131.p = _context131.n) {
           case 0:
-            _ref147 = params || {}, _ref147$successPageDu = _ref147.successPageDuration, successPageDuration = _ref147$successPageDu === void 0 ? 2000 : _ref147$successPageDu, stampWith = _ref147.stampWith, userId = _ref147.userId;
-            _context125.n = 1;
+            _ref155 = params || {}, _ref155$successPageDu = _ref155.successPageDuration, successPageDuration = _ref155$successPageDu === void 0 ? 2000 : _ref155$successPageDu, stampWith = _ref155.stampWith, userId = _ref155.userId;
+            _context131.n = 1;
             return getSession();
           case 1:
-            s = _context125.v;
+            s = _context131.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context125.n = 2;
+              _context131.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context125.p = 2;
-            return _context125.a(2, new Promise(function (resolve, reject) {
+            _context131.p = 2;
+            return _context131.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Email",
                 content: jsx(RemoveEmail, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -6302,44 +6476,44 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context125.p = 3;
-            _t26 = _context125.v;
-            if (!(_t26 instanceof TurnkeyError)) {
-              _context125.n = 4;
+            _context131.p = 3;
+            _t31 = _context131.v;
+            if (!(_t31 instanceof TurnkeyError)) {
+              _context131.n = 4;
               break;
             }
-            throw _t26;
+            throw _t31;
           case 4:
-            throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _t26);
+            throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _t31);
           case 5:
-            return _context125.a(2);
+            return _context131.a(2);
         }
-      }, _callee125, null, [[2, 3]]);
+      }, _callee131, null, [[2, 3]]);
     }));
-    return function (_x110) {
-      return _ref146.apply(this, arguments);
+    return function (_x111) {
+      return _ref154.apply(this, arguments);
     };
   }(), [getSession, pushPage]);
   var handleRemoveUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref148 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee126(params) {
-      var _ref149, _ref149$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t27;
-      return _regenerator().w(function (_context126) {
-        while (1) switch (_context126.p = _context126.n) {
+    var _ref156 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee132(params) {
+      var _ref157, _ref157$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t32;
+      return _regenerator().w(function (_context132) {
+        while (1) switch (_context132.p = _context132.n) {
           case 0:
-            _ref149 = params || {}, _ref149$successPageDu = _ref149.successPageDuration, successPageDuration = _ref149$successPageDu === void 0 ? 2000 : _ref149$successPageDu, stampWith = _ref149.stampWith, userId = _ref149.userId;
-            _context126.n = 1;
+            _ref157 = params || {}, _ref157$successPageDu = _ref157.successPageDuration, successPageDuration = _ref157$successPageDu === void 0 ? 2000 : _ref157$successPageDu, stampWith = _ref157.stampWith, userId = _ref157.userId;
+            _context132.n = 1;
             return getSession();
           case 1:
-            s = _context126.v;
+            s = _context132.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context126.n = 2;
+              _context132.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context126.p = 2;
-            return _context126.a(2, new Promise(function (resolve, reject) {
+            _context132.p = 2;
+            return _context132.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Phone Number",
                 content: jsx(RemovePhoneNumber, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -6366,37 +6540,37 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context126.p = 3;
-            _t27 = _context126.v;
-            if (!(_t27 instanceof TurnkeyError)) {
-              _context126.n = 4;
+            _context132.p = 3;
+            _t32 = _context132.v;
+            if (!(_t32 instanceof TurnkeyError)) {
+              _context132.n = 4;
               break;
             }
-            throw _t27;
+            throw _t32;
           case 4:
-            throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _t27);
+            throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _t32);
           case 5:
-            return _context126.a(2);
+            return _context132.a(2);
         }
-      }, _callee126, null, [[2, 3]]);
+      }, _callee132, null, [[2, 3]]);
     }));
-    return function (_x111) {
-      return _ref148.apply(this, arguments);
+    return function (_x112) {
+      return _ref156.apply(this, arguments);
     };
   }(), [getSession, pushPage]);
   var handleSendTransaction = useCallback(/*#__PURE__*/function () {
-    var _ref150 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee129(params) {
+    var _ref158 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee135(params) {
       var session, organizationId, transaction, icon, stampWith, _params$successPageDu5, successPageDuration, caip2, isSolanaTransaction;
-      return _regenerator().w(function (_context129) {
-        while (1) switch (_context129.n) {
+      return _regenerator().w(function (_context135) {
+        while (1) switch (_context135.n) {
           case 0:
-            _context129.n = 1;
+            _context135.n = 1;
             return getSession();
           case 1:
-            session = _context129.v;
+            session = _context135.v;
             organizationId = params.organizationId || (session === null || session === void 0 ? void 0 : session.organizationId);
             if (organizationId) {
-              _context129.n = 2;
+              _context135.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -6404,34 +6578,34 @@ var ClientProvider = function ClientProvider(_ref) {
             transaction = params.transaction, icon = params.icon, stampWith = params.stampWith, _params$successPageDu5 = params.successPageDuration, successPageDuration = _params$successPageDu5 === void 0 ? 2000 : _params$successPageDu5;
             caip2 = transaction.caip2;
             isSolanaTransaction = caip2.startsWith("solana:");
-            return _context129.a(2, new Promise(function (resolve, reject) {
+            return _context135.a(2, new Promise(function (resolve, reject) {
               var action = /*#__PURE__*/function () {
-                var _ref151 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee128() {
-                  var _ref154, _txDetails$eth$txHash, _txDetails$eth, _txDetails$solana;
-                  var sendTransactionStatusId, pollResult, txDetails, txHash, _t28;
-                  return _regenerator().w(function (_context128) {
-                    while (1) switch (_context128.n) {
+                var _ref159 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee134() {
+                  var _ref162, _txDetails$eth$txHash, _txDetails$eth, _txDetails$solana;
+                  var sendTransactionStatusId, pollResult, txDetails, txHash, _t33;
+                  return _regenerator().w(function (_context134) {
+                    while (1) switch (_context134.n) {
                       case 0:
                         if (!isSolanaTransaction) {
-                          _context128.n = 2;
+                          _context134.n = 2;
                           break;
                         }
-                        _context128.n = 1;
+                        _context134.n = 1;
                         return solSendTransaction({
                           organizationId: organizationId,
                           transaction: transaction,
                           stampWith: stampWith
                         });
                       case 1:
-                        _t28 = _context128.v;
-                        _context128.n = 4;
+                        _t33 = _context134.v;
+                        _context134.n = 4;
                         break;
                       case 2:
-                        _context128.n = 3;
-                        return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee127() {
+                        _context134.n = 3;
+                        return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee133() {
                           var ethTx, cleanData, from, sponsor, nonce, gasLimit, maxFeePerGas, maxPriorityFeePerGas, commonFields, tx, cleanedData;
-                          return _regenerator().w(function (_context127) {
-                            while (1) switch (_context127.n) {
+                          return _regenerator().w(function (_context133) {
+                            while (1) switch (_context133.n) {
                               case 0:
                                 ethTx = transaction; // Drop empty/no-op calldata ("0x" or "") so it isn't sent.
                                 cleanData = function cleanData(data) {
@@ -6454,10 +6628,10 @@ var ClientProvider = function ClientProvider(_ref) {
                                 // TODO (breaking change): eventually, we wont generate the v1 activity at all, remove this check and update the intent.
                                 if ("calls" in ethTx) {
                                   tx = _objectSpread2(_objectSpread2({}, commonFields), {}, {
-                                    calls: ethTx.calls.map(function (_ref153) {
-                                      var to = _ref153.to,
-                                        value = _ref153.value,
-                                        data = _ref153.data;
+                                    calls: ethTx.calls.map(function (_ref161) {
+                                      var to = _ref161.to,
+                                        value = _ref161.value,
+                                        data = _ref161.data;
                                       var cleanedData = cleanData(data);
                                       return _objectSpread2(_objectSpread2({
                                         to: to
@@ -6478,41 +6652,41 @@ var ClientProvider = function ClientProvider(_ref) {
                                     data: cleanedData
                                   } : {});
                                 }
-                                return _context127.a(2, ethSendTransaction({
+                                return _context133.a(2, ethSendTransaction({
                                   organizationId: organizationId,
                                   transaction: tx,
                                   stampWith: stampWith
                                 }));
                             }
-                          }, _callee127);
+                          }, _callee133);
                         }))();
                       case 3:
-                        _t28 = _context128.v;
+                        _t33 = _context134.v;
                       case 4:
-                        sendTransactionStatusId = _t28;
+                        sendTransactionStatusId = _t33;
                         if (sendTransactionStatusId) {
-                          _context128.n = 5;
+                          _context134.n = 5;
                           break;
                         }
                         throw new TurnkeyError("Missing sendTransactionStatusId", TurnkeyErrorCodes.BAD_RESPONSE);
                       case 5:
-                        _context128.n = 6;
+                        _context134.n = 6;
                         return pollTransactionStatus({
                           organizationId: organizationId,
                           sendTransactionStatusId: sendTransactionStatusId
                         });
                       case 6:
-                        pollResult = _context128.v;
+                        pollResult = _context134.v;
                         txDetails = pollResult;
-                        txHash = (_ref154 = (_txDetails$eth$txHash = (_txDetails$eth = txDetails.eth) === null || _txDetails$eth === void 0 ? void 0 : _txDetails$eth.txHash) !== null && _txDetails$eth$txHash !== void 0 ? _txDetails$eth$txHash : (_txDetails$solana = txDetails.solana) === null || _txDetails$solana === void 0 ? void 0 : _txDetails$solana.signature) !== null && _ref154 !== void 0 ? _ref154 : txDetails.txHash;
-                        return _context128.a(2, txHash ? {
+                        txHash = (_ref162 = (_txDetails$eth$txHash = (_txDetails$eth = txDetails.eth) === null || _txDetails$eth === void 0 ? void 0 : _txDetails$eth.txHash) !== null && _txDetails$eth$txHash !== void 0 ? _txDetails$eth$txHash : (_txDetails$solana = txDetails.solana) === null || _txDetails$solana === void 0 ? void 0 : _txDetails$solana.signature) !== null && _ref162 !== void 0 ? _ref162 : txDetails.txHash;
+                        return _context134.a(2, txHash ? {
                           txHash: txHash
                         } : {});
                     }
-                  }, _callee128);
+                  }, _callee134);
                 }));
                 return function action() {
-                  return _ref151.apply(this, arguments);
+                  return _ref159.apply(this, arguments);
                 };
               }();
               pushPage({
@@ -6537,69 +6711,69 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee129);
+      }, _callee135);
     }));
-    return function (_x112) {
-      return _ref150.apply(this, arguments);
+    return function (_x113) {
+      return _ref158.apply(this, arguments);
     };
   }(), [ethSendTransaction, getSession, pollTransactionStatus, pushPage, solSendTransaction]);
   var handleSendErc20Transfer = useCallback(/*#__PURE__*/function () {
-    var _ref155 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee131(params) {
+    var _ref163 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee137(params) {
       var session, organizationId, transfer, icon, stampWith, _params$successPageDu6, successPageDuration, caip2;
-      return _regenerator().w(function (_context131) {
-        while (1) switch (_context131.n) {
+      return _regenerator().w(function (_context137) {
+        while (1) switch (_context137.n) {
           case 0:
-            _context131.n = 1;
+            _context137.n = 1;
             return getSession();
           case 1:
-            session = _context131.v;
+            session = _context137.v;
             organizationId = params.organizationId || (session === null || session === void 0 ? void 0 : session.organizationId);
             if (organizationId) {
-              _context131.n = 2;
+              _context137.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
             transfer = params.transfer, icon = params.icon, stampWith = params.stampWith, _params$successPageDu6 = params.successPageDuration, successPageDuration = _params$successPageDu6 === void 0 ? 2000 : _params$successPageDu6;
             caip2 = transfer.caip2;
-            return _context131.a(2, new Promise(function (resolve, reject) {
+            return _context137.a(2, new Promise(function (resolve, reject) {
               var action = /*#__PURE__*/function () {
-                var _ref156 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee130() {
+                var _ref164 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee136() {
                   var _pollResult$eth$txHas, _pollResult$eth;
                   var sendTransactionStatusId, pollResult, txHash;
-                  return _regenerator().w(function (_context130) {
-                    while (1) switch (_context130.n) {
+                  return _regenerator().w(function (_context136) {
+                    while (1) switch (_context136.n) {
                       case 0:
-                        _context130.n = 1;
+                        _context136.n = 1;
                         return ethSendErc20Transfer({
                           organizationId: organizationId,
                           transfer: transfer,
                           stampWith: stampWith
                         });
                       case 1:
-                        sendTransactionStatusId = _context130.v;
+                        sendTransactionStatusId = _context136.v;
                         if (sendTransactionStatusId) {
-                          _context130.n = 2;
+                          _context136.n = 2;
                           break;
                         }
                         throw new TurnkeyError("Missing sendTransactionStatusId", TurnkeyErrorCodes.BAD_RESPONSE);
                       case 2:
-                        _context130.n = 3;
+                        _context136.n = 3;
                         return pollTransactionStatus({
                           organizationId: organizationId,
                           sendTransactionStatusId: sendTransactionStatusId
                         });
                       case 3:
-                        pollResult = _context130.v;
+                        pollResult = _context136.v;
                         txHash = (_pollResult$eth$txHas = pollResult === null || pollResult === void 0 ? void 0 : (_pollResult$eth = pollResult.eth) === null || _pollResult$eth === void 0 ? void 0 : _pollResult$eth.txHash) !== null && _pollResult$eth$txHas !== void 0 ? _pollResult$eth$txHas : pollResult === null || pollResult === void 0 ? void 0 : pollResult.txHash;
-                        return _context130.a(2, txHash ? {
+                        return _context136.a(2, txHash ? {
                           txHash: txHash
                         } : {});
                     }
-                  }, _callee130);
+                  }, _callee136);
                 }));
                 return function action() {
-                  return _ref156.apply(this, arguments);
+                  return _ref164.apply(this, arguments);
                 };
               }();
               pushPage({
@@ -6624,55 +6798,55 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee131);
+      }, _callee137);
     }));
-    return function (_x113) {
-      return _ref155.apply(this, arguments);
+    return function (_x114) {
+      return _ref163.apply(this, arguments);
     };
   }(), [ethSendErc20Transfer, getSession, pollTransactionStatus, pushPage]);
   var handleOnRamp = useCallback(/*#__PURE__*/function () {
-    var _ref157 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee134(params) {
+    var _ref165 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee140(params) {
       var _walletAccount$addres;
-      var walletAccount, fiatCurrencyAmount, fiatCurrencyCode, paymentMethod, countrySubdivisionCode, urlForSignature, countryCode, _params$onrampProvide, onrampProvider, _params$sandboxMode, sandboxMode, _params$successPageDu7, successPageDuration, _params$openInNewTab, openInNewTab, s, organizationId, cryptoCurrencyCode, network, openNewTab, _t31;
-      return _regenerator().w(function (_context134) {
-        while (1) switch (_context134.n) {
+      var walletAccount, fiatCurrencyAmount, fiatCurrencyCode, paymentMethod, countrySubdivisionCode, urlForSignature, countryCode, _params$onrampProvide, onrampProvider, _params$sandboxMode, sandboxMode, _params$successPageDu7, successPageDuration, _params$openInNewTab, openInNewTab, s, organizationId, cryptoCurrencyCode, network, openNewTab, _t36;
+      return _regenerator().w(function (_context140) {
+        while (1) switch (_context140.n) {
           case 0:
             walletAccount = params.walletAccount, fiatCurrencyAmount = params.fiatCurrencyAmount, fiatCurrencyCode = params.fiatCurrencyCode, paymentMethod = params.paymentMethod, countrySubdivisionCode = params.countrySubdivisionCode, urlForSignature = params.urlForSignature, countryCode = params.countryCode, _params$onrampProvide = params.onrampProvider, onrampProvider = _params$onrampProvide === void 0 ? "FIAT_ON_RAMP_PROVIDER_MOONPAY" : _params$onrampProvide, _params$sandboxMode = params.sandboxMode, sandboxMode = _params$sandboxMode === void 0 ? true : _params$sandboxMode, _params$successPageDu7 = params.successPageDuration, successPageDuration = _params$successPageDu7 === void 0 ? 2000 : _params$successPageDu7, _params$openInNewTab = params.openInNewTab, openInNewTab = _params$openInNewTab === void 0 ? false : _params$openInNewTab;
-            _context134.n = 1;
+            _context140.n = 1;
             return getSession();
           case 1:
-            s = _context134.v;
+            s = _context140.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context134.n = 2;
+              _context140.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _t31 = true;
-            _context134.n = _t31 === (walletAccount.addressFormat === "ADDRESS_FORMAT_ETHEREUM") ? 3 : _t31 === ((_walletAccount$addres = walletAccount.addressFormat) === null || _walletAccount$addres === void 0 ? void 0 : _walletAccount$addres.includes("ADDRESS_FORMAT_BITCOIN")) ? 4 : _t31 === (walletAccount.addressFormat === "ADDRESS_FORMAT_SOLANA") ? 5 : 6;
+            _t36 = true;
+            _context140.n = _t36 === (walletAccount.addressFormat === "ADDRESS_FORMAT_ETHEREUM") ? 3 : _t36 === ((_walletAccount$addres = walletAccount.addressFormat) === null || _walletAccount$addres === void 0 ? void 0 : _walletAccount$addres.includes("ADDRESS_FORMAT_BITCOIN")) ? 4 : _t36 === (walletAccount.addressFormat === "ADDRESS_FORMAT_SOLANA") ? 5 : 6;
             break;
           case 3:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.ETHEREUM;
             network = FiatOnRampBlockchainNetwork.ETHEREUM;
-            return _context134.a(3, 7);
+            return _context140.a(3, 7);
           case 4:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.BITCOIN;
             network = FiatOnRampBlockchainNetwork.BITCOIN;
-            return _context134.a(3, 7);
+            return _context140.a(3, 7);
           case 5:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.SOLANA;
             network = FiatOnRampBlockchainNetwork.SOLANA;
-            return _context134.a(3, 7);
+            return _context140.a(3, 7);
           case 6:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.ETHEREUM;
             network = FiatOnRampBlockchainNetwork.ETHEREUM;
-            return _context134.a(3, 7);
+            return _context140.a(3, 7);
           case 7:
             openNewTab = openInNewTab || isMobile;
             cryptoCurrencyCode = params.cryptoCurrencyCode || cryptoCurrencyCode;
             network = params.network || network;
-            return _context134.a(2, new Promise(function (resolve, reject) {
+            return _context140.a(2, new Promise(function (resolve, reject) {
               var OnRampContainer = function OnRampContainer() {
                 var _useState15 = useState(false),
                   _useState16 = _slicedToArray(_useState15, 2),
@@ -6691,25 +6865,25 @@ var ClientProvider = function ClientProvider(_ref) {
                   };
                 }, []);
                 var action = /*#__PURE__*/function () {
-                  var _ref158 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee133() {
-                    var _client$httpClient, onRampWindow, result, popupWidth, popupHeight, left, top, onRampTransactionId, _t30;
-                    return _regenerator().w(function (_context133) {
-                      while (1) switch (_context133.p = _context133.n) {
+                  var _ref166 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee139() {
+                    var _client$httpClient, onRampWindow, result, popupWidth, popupHeight, left, top, onRampTransactionId, _t35;
+                    return _regenerator().w(function (_context139) {
+                      while (1) switch (_context139.p = _context139.n) {
                         case 0:
-                          _context133.p = 0;
+                          _context139.p = 0;
                           onRampWindow = null;
                           if (!openNewTab) {
-                            _context133.n = 1;
+                            _context139.n = 1;
                             break;
                           }
                           onRampWindow = window.open("", "_blank");
                           if (onRampWindow) {
-                            _context133.n = 1;
+                            _context139.n = 1;
                             break;
                           }
                           throw new Error("Failed to open On Ramp tab.");
                         case 1:
-                          _context133.n = 2;
+                          _context139.n = 2;
                           return client === null || client === void 0 ? void 0 : (_client$httpClient = client.httpClient) === null || _client$httpClient === void 0 ? void 0 : _client$httpClient.initFiatOnRamp(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
                             onrampProvider: onrampProvider,
                             walletAddress: walletAccount.address,
@@ -6733,19 +6907,19 @@ var ClientProvider = function ClientProvider(_ref) {
                             urlForSignature: urlForSignature
                           } : {}));
                         case 2:
-                          result = _context133.v;
+                          result = _context139.v;
                           if (result !== null && result !== void 0 && result.onRampUrl) {
-                            _context133.n = 3;
+                            _context139.n = 3;
                             break;
                           }
                           throw new Error("Missing onRampUrl");
                         case 3:
                           if (!(openNewTab && onRampWindow)) {
-                            _context133.n = 4;
+                            _context139.n = 4;
                             break;
                           }
                           onRampWindow.location.href = result.onRampUrl.toString();
-                          _context133.n = 5;
+                          _context139.n = 5;
                           break;
                         case 4:
                           popupWidth = 500;
@@ -6754,54 +6928,54 @@ var ClientProvider = function ClientProvider(_ref) {
                           top = window.screenY + (window.innerHeight - popupHeight) / 2;
                           onRampWindow = window.open(result.onRampUrl.toString(), "_blank", "width=".concat(popupWidth, ",height=").concat(popupHeight, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
                           if (onRampWindow) {
-                            _context133.n = 5;
+                            _context139.n = 5;
                             break;
                           }
                           throw new Error("Failed to open On Ramp window.");
                         case 5:
                           onRampTransactionId = result.onRampTransactionId;
                           if (onRampTransactionId) {
-                            _context133.n = 6;
+                            _context139.n = 6;
                             break;
                           }
                           throw new Error("No onRampTransactionId returned");
                         case 6:
-                          return _context133.a(2, new Promise(function (resolveAction, rejectAction) {
-                            pollingRef.current = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee132() {
-                              var _onRampWindow, _client$httpClient2, currentUrl, _onRampWindow2, _onRampWindow3, resp, status, _onRampWindow4, _t29;
-                              return _regenerator().w(function (_context132) {
-                                while (1) switch (_context132.p = _context132.n) {
+                          return _context139.a(2, new Promise(function (resolveAction, rejectAction) {
+                            pollingRef.current = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee138() {
+                              var _onRampWindow, _client$httpClient2, currentUrl, _onRampWindow2, _onRampWindow3, resp, status, _onRampWindow4, _t34;
+                              return _regenerator().w(function (_context138) {
+                                while (1) switch (_context138.p = _context138.n) {
                                   case 0:
-                                    _context132.p = 0;
+                                    _context138.p = 0;
                                     if (!(onrampProvider === "FIAT_ON_RAMP_PROVIDER_COINBASE" && (_onRampWindow = onRampWindow) !== null && _onRampWindow !== void 0 && _onRampWindow.closed)) {
-                                      _context132.n = 1;
+                                      _context138.n = 1;
                                       break;
                                     }
                                     cleanup();
                                     rejectAction(new Error("On-ramp popup closed by user"));
-                                    return _context132.a(2);
+                                    return _context138.a(2);
                                   case 1:
                                     currentUrl = "";
                                     try {
                                       currentUrl = ((_onRampWindow2 = onRampWindow) === null || _onRampWindow2 === void 0 ? void 0 : _onRampWindow2.location.href) || "";
                                     } catch (_unused6) {}
                                     if (!(currentUrl && currentUrl.startsWith(window.location.origin))) {
-                                      _context132.n = 2;
+                                      _context138.n = 2;
                                       break;
                                     }
                                     cleanup();
                                     (_onRampWindow3 = onRampWindow) === null || _onRampWindow3 === void 0 ? void 0 : _onRampWindow3.close();
                                     setCompleted(true);
                                     resolveAction();
-                                    return _context132.a(2);
+                                    return _context138.a(2);
                                   case 2:
-                                    _context132.n = 3;
+                                    _context138.n = 3;
                                     return client === null || client === void 0 ? void 0 : (_client$httpClient2 = client.httpClient) === null || _client$httpClient2 === void 0 ? void 0 : _client$httpClient2.getOnRampTransactionStatus({
                                       transactionId: onRampTransactionId,
                                       refresh: true
                                     });
                                   case 3:
-                                    resp = _context132.v;
+                                    resp = _context138.v;
                                     status = resp === null || resp === void 0 ? void 0 : resp.transactionStatus;
                                     if (["COMPLETED", "FAILED", "CANCELLED"].includes(status !== null && status !== void 0 ? status : "")) {
                                       cleanup();
@@ -6811,30 +6985,30 @@ var ClientProvider = function ClientProvider(_ref) {
                                       setCompleted(true);
                                       resolveAction();
                                     }
-                                    _context132.n = 5;
+                                    _context138.n = 5;
                                     break;
                                   case 4:
-                                    _context132.p = 4;
-                                    _t29 = _context132.v;
-                                    console.warn("Polling error (ignored):", _t29);
+                                    _context138.p = 4;
+                                    _t34 = _context138.v;
+                                    console.warn("Polling error (ignored):", _t34);
                                   case 5:
-                                    return _context132.a(2);
+                                    return _context138.a(2);
                                 }
-                              }, _callee132, null, [[0, 4]]);
+                              }, _callee138, null, [[0, 4]]);
                             })), 3000);
                           }));
                         case 7:
-                          _context133.p = 7;
-                          _t30 = _context133.v;
+                          _context139.p = 7;
+                          _t35 = _context139.v;
                           cleanup();
-                          throw _t30;
+                          throw _t35;
                         case 8:
-                          return _context133.a(2);
+                          return _context139.a(2);
                       }
-                    }, _callee133, null, [[0, 7]]);
+                    }, _callee139, null, [[0, 7]]);
                   }));
                   return function action() {
-                    return _ref158.apply(this, arguments);
+                    return _ref166.apply(this, arguments);
                   };
                 }();
                 return jsx(OnRampPage, {
@@ -6867,32 +7041,32 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee134);
+      }, _callee140);
     }));
-    return function (_x114) {
-      return _ref157.apply(this, arguments);
+    return function (_x115) {
+      return _ref165.apply(this, arguments);
     };
   }(), [getSession, client, pushPage]);
   var handleVerifyAppProofs = useCallback(/*#__PURE__*/function () {
-    var _ref160 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee135(params) {
-      var _ref161, appProofs, _ref161$successPageDu, successPageDuration, stampWith, s, organizationId, _t32;
-      return _regenerator().w(function (_context135) {
-        while (1) switch (_context135.p = _context135.n) {
+    var _ref168 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee141(params) {
+      var _ref169, appProofs, _ref169$successPageDu, successPageDuration, stampWith, s, organizationId, _t37;
+      return _regenerator().w(function (_context141) {
+        while (1) switch (_context141.p = _context141.n) {
           case 0:
-            _ref161 = params || {}, appProofs = _ref161.appProofs, _ref161$successPageDu = _ref161.successPageDuration, successPageDuration = _ref161$successPageDu === void 0 ? 3000 : _ref161$successPageDu, stampWith = _ref161.stampWith;
-            _context135.n = 1;
+            _ref169 = params || {}, appProofs = _ref169.appProofs, _ref169$successPageDu = _ref169.successPageDuration, successPageDuration = _ref169$successPageDu === void 0 ? 3000 : _ref169$successPageDu, stampWith = _ref169.stampWith;
+            _context141.n = 1;
             return getSession();
           case 1:
-            s = _context135.v;
+            s = _context141.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context135.n = 2;
+              _context141.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context135.p = 2;
-            return _context135.a(2, new Promise(function (resolve, reject) {
+            _context141.p = 2;
+            return _context141.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Verify app proofs",
                 showTurnkeyBranding: false,
@@ -6918,34 +7092,34 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context135.p = 3;
-            _t32 = _context135.v;
-            if (!(_t32 instanceof TurnkeyError)) {
-              _context135.n = 4;
+            _context141.p = 3;
+            _t37 = _context141.v;
+            if (!(_t37 instanceof TurnkeyError)) {
+              _context141.n = 4;
               break;
             }
-            throw _t32;
+            throw _t37;
           case 4:
-            throw new TurnkeyError("Failed to verify app proofs.", TurnkeyErrorCodes.VERIFY_APP_PROOFS_ERROR, _t32);
+            throw new TurnkeyError("Failed to verify app proofs.", TurnkeyErrorCodes.VERIFY_APP_PROOFS_ERROR, _t37);
           case 5:
-            return _context135.a(2);
+            return _context141.a(2);
         }
-      }, _callee135, null, [[2, 3]]);
+      }, _callee141, null, [[2, 3]]);
     }));
-    return function (_x115) {
-      return _ref160.apply(this, arguments);
+    return function (_x116) {
+      return _ref168.apply(this, arguments);
     };
   }(), [getSession, pushPage]);
   useEffect(function () {
     if (proxyAuthConfigRef.current) return;
     // Fetch proxy auth config and client params once. Use both to build the master config.
     var fetchProxyAuthConfig = /*#__PURE__*/function () {
-      var _ref162 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee136() {
+      var _ref170 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee142() {
         var proxyAuthConfig, clientParams, promises;
-        return _regenerator().w(function (_context136) {
-          while (1) switch (_context136.p = _context136.n) {
+        return _regenerator().w(function (_context142) {
+          while (1) switch (_context142.p = _context142.n) {
             case 0:
-              _context136.p = 0;
+              _context142.p = 0;
               promises = [];
               if (shouldFetchWalletKitConfig) {
                 promises.push(getAuthProxyConfig(config.authProxyConfigId, config.authProxyUrl).then(function (result) {
@@ -6957,7 +7131,7 @@ var ClientProvider = function ClientProvider(_ref) {
                   clientParams = result;
                 }));
               }
-              _context136.n = 1;
+              _context142.n = 1;
               return Promise.all(promises);
             case 1:
               if (proxyAuthConfig) {
@@ -6967,19 +7141,19 @@ var ClientProvider = function ClientProvider(_ref) {
                 clientParamsRef.current = clientParams;
               }
               setMasterConfig(buildConfig(proxyAuthConfig, clientParams));
-              _context136.n = 3;
+              _context142.n = 3;
               break;
             case 2:
-              _context136.p = 2;
-              _context136.v;
+              _context142.p = 2;
+              _context142.v;
               setClientState(ClientState.Error);
             case 3:
-              return _context136.a(2);
+              return _context142.a(2);
           }
-        }, _callee136, null, [[0, 2]]);
+        }, _callee142, null, [[0, 2]]);
       }));
       return function fetchProxyAuthConfig() {
-        return _ref162.apply(this, arguments);
+        return _ref170.apply(this, arguments);
       };
     }();
     fetchProxyAuthConfig();
@@ -7012,34 +7186,34 @@ var ClientProvider = function ClientProvider(_ref) {
   var debouncedFetchWalletProviders = useDebouncedCallback(fetchWalletProviders, 100);
   useEffect(function () {
     var handleUpdateState = /*#__PURE__*/function () {
-      var _ref163 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee137() {
+      var _ref171 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee143() {
         var currentSession;
-        return _regenerator().w(function (_context137) {
-          while (1) switch (_context137.n) {
+        return _regenerator().w(function (_context143) {
+          while (1) switch (_context143.n) {
             case 0:
-              _context137.n = 1;
+              _context143.n = 1;
               return getSession();
             case 1:
-              currentSession = _context137.v;
+              currentSession = _context143.v;
               if (!currentSession) {
-                _context137.n = 3;
+                _context143.n = 3;
                 break;
               }
-              _context137.n = 2;
+              _context143.n = 2;
               return debouncedRefreshWallets();
             case 2:
-              _context137.n = 4;
+              _context143.n = 4;
               break;
             case 3:
-              _context137.n = 4;
+              _context143.n = 4;
               return debouncedFetchWalletProviders();
             case 4:
-              return _context137.a(2);
+              return _context143.a(2);
           }
-        }, _callee137);
+        }, _callee143);
       }));
       return function handleUpdateState() {
-        return _ref163.apply(this, arguments);
+        return _ref171.apply(this, arguments);
       };
     }();
     var cleanup = function cleanup() {};
@@ -7062,8 +7236,8 @@ var ClientProvider = function ClientProvider(_ref) {
     }
   }, [session]);
   useEffect(function () {
-    // This will handle any redirect based oAuth. It then initializes the session. This is the last step before client is considered "ready"
     if (!client || !masterConfig) return;
+    // This will handle any redirect based oAuth. It then initializes the session. This is the last step before client is considered "ready"
     completeRedirectOauth()["finally"](function () {
       var _masterConfig$walletC6, _masterConfig$walletC7, _masterConfig$walletC8, _masterConfig$walletC9;
       clearSessionTimeouts();
@@ -7077,6 +7251,26 @@ var ClientProvider = function ClientProvider(_ref) {
         setClientState(ClientState.Ready);
       });
     });
+    // Only set the onMfaRequired handler if we have a mfaHandler set.
+    var mfaHandler = mfaHandlerRef.current;
+    if (mfaHandler) {
+      client.httpClient.config.onMfaRequired = /*#__PURE__*/function () {
+        var _ref172 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee144(ctx) {
+          return _regenerator().w(function (_context144) {
+            while (1) switch (_context144.n) {
+              case 0:
+                _context144.n = 1;
+                return mfaHandler(ctx);
+              case 1:
+                return _context144.a(2);
+            }
+          }, _callee144);
+        }));
+        return function (_x117) {
+          return _ref172.apply(this, arguments);
+        };
+      }();
+    }
     return function () {
       clearSessionTimeouts();
     };
@@ -7095,6 +7289,7 @@ var ClientProvider = function ClientProvider(_ref) {
       createHttpClient: createHttpClient,
       overrideApiKeyStamper: overrideApiKeyStamper,
       overridePasskeyStamper: overridePasskeyStamper,
+      overrideAttestedStamper: overrideAttestedStamper,
       createPasskey: createPasskey,
       logout: logout,
       loginWithPasskey: loginWithPasskey,
@@ -7190,6 +7385,7 @@ var ClientProvider = function ClientProvider(_ref) {
       handleOnRamp: handleOnRamp,
       handleSendTransaction: handleSendTransaction,
       handleSendErc20Transfer: handleSendErc20Transfer,
+      setMfaHandler: setMfaHandler,
       getTurnstileToken: getTurnstileToken,
       setTurnstileToken: setTurnstileToken
     },