@turnkey/react-wallet-kit 1.2.0 → 1.3.1

package/dist/providers/client/Provider.mjs

@@ -614,7 +614,8 @@ var ClientProvider = function ClientProvider(_ref) {
                 chains: _objectSpread2({}, (_masterConfig$walletC2 = masterConfig.walletConfig) === null || _masterConfig$walletC2 === void 0 ? void 0 : _masterConfig$walletC2.chains)
               }, ((_masterConfig$walletC3 = masterConfig.walletConfig) === null || _masterConfig$walletC3 === void 0 ? void 0 : _masterConfig$walletC3.walletConnect) && {
                 walletConnect: masterConfig.walletConfig.walletConnect
-              })
+              }),
+              defaultStamperType: masterConfig.defaultStamperType
             });
             _context6.n = 2;
             return turnkeyClient.init();
@@ -787,11 +788,11 @@ var ClientProvider = function ClientProvider(_ref) {
    * @throws {TurnkeyError} If an error occurs while scheduling the session expiration.
    */
   function _initializeWalletProviderListeners() {
-    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee106(walletProviders, onUpdateState) {
+    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee107(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 (_context106) {
-        while (1) switch (_context106.n) {
+      return _regenerator().w(function (_context107) {
+        while (1) switch (_context107.n) {
           case 0:
             attachSolanaListeners = function _attachSolanaListener(provider, onUpdateState) {
               var _provider$features;
@@ -799,19 +800,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 _ref127 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee104(_evt) {
-                    return _regenerator().w(function (_context104) {
-                      while (1) switch (_context104.n) {
+                  var _ref128 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee105(_evt) {
+                    return _regenerator().w(function (_context105) {
+                      while (1) switch (_context105.n) {
                         case 0:
-                          _context104.n = 1;
+                          _context105.n = 1;
                           return onUpdateState();
                         case 1:
-                          return _context104.a(2);
+                          return _context105.a(2);
                       }
-                    }, _callee104);
+                    }, _callee105);
                   }));
-                  return function (_x91) {
-                    return _ref127.apply(this, arguments);
+                  return function (_x92) {
+                    return _ref128.apply(this, arguments);
                   };
                 }());
                 cleanups.push(offChange);
@@ -825,31 +826,31 @@ var ClientProvider = function ClientProvider(_ref) {
             attachEthereumListeners = function _attachEthereumListen(provider, onUpdateState) {
               if (typeof provider.on !== "function") return;
               var handleChainChanged = /*#__PURE__*/function () {
-                var _ref125 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee102(_chainId) {
-                  return _regenerator().w(function (_context102) {
-                    while (1) switch (_context102.n) {
+                var _ref126 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee103(_chainId) {
+                  return _regenerator().w(function (_context103) {
+                    while (1) switch (_context103.n) {
                       case 0:
-                        return _context102.a(2, onUpdateState());
+                        return _context103.a(2, onUpdateState());
                     }
-                  }, _callee102);
+                  }, _callee103);
                 }));
-                return function handleChainChanged(_x89) {
-                  return _ref125.apply(this, arguments);
+                return function handleChainChanged(_x90) {
+                  return _ref126.apply(this, arguments);
                 };
               }();
               var handleAccountsChanged = /*#__PURE__*/function () {
-                var _ref126 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee103(accounts) {
-                  return _regenerator().w(function (_context103) {
-                    while (1) switch (_context103.n) {
+                var _ref127 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee104(accounts) {
+                  return _regenerator().w(function (_context104) {
+                    while (1) switch (_context104.n) {
                       case 0:
                         if (accounts.length === 0) onUpdateState();
                       case 1:
-                        return _context103.a(2);
+                        return _context104.a(2);
                     }
-                  }, _callee103);
+                  }, _callee104);
                 }));
-                return function handleAccountsChanged(_x90) {
-                  return _ref126.apply(this, arguments);
+                return function handleAccountsChanged(_x91) {
+                  return _ref127.apply(this, arguments);
                 };
               }();
               var handleDisconnect = function handleDisconnect() {
@@ -865,10 +866,10 @@ var ClientProvider = function ClientProvider(_ref) {
               };
             };
             if (!(walletProviders.length === 0)) {
-              _context106.n = 1;
+              _context107.n = 1;
               break;
             }
-            return _context106.a(2, function () {});
+            return _context107.a(2, function () {});
           case 1:
             cleanups = []; // we only want to initialize these listeners for connected walletProviders
             nativeOnly = function nativeOnly(provider) {
@@ -906,9 +907,9 @@ 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 _ref128 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee105(evt) {
-                      return _regenerator().w(function (_context105) {
-                        while (1) switch (_context105.n) {
+                    var _ref129 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee106(evt) {
+                      return _regenerator().w(function (_context106) {
+                        while (1) switch (_context106.n) {
                           case 0:
                             // if the event is a proposalExpired, we want to re-fetch the providers
                             // to refresh the uri, there is no need to refresh the wallets state
@@ -917,28 +918,28 @@ var ClientProvider = function ClientProvider(_ref) {
                             }
                             // any other event (disconnect, chain switch, accounts changed)
                             // we refresh the wallets state
-                            _context105.n = 1;
+                            _context106.n = 1;
                             return onUpdateState();
                           case 1:
-                            return _context105.a(2);
+                            return _context106.a(2);
                         }
-                      }, _callee105);
+                      }, _callee106);
                     }));
-                    return function (_x92) {
-                      return _ref128.apply(this, arguments);
+                    return function (_x93) {
+                      return _ref129.apply(this, arguments);
                     };
                   }());
                   cleanups.push(unsubscribe);
                 }
               }
             }
-            return _context106.a(2, function () {
+            return _context107.a(2, function () {
               cleanups.forEach(function (remove) {
                 return remove();
               });
             });
         }
-      }, _callee106);
+      }, _callee107);
     }));
     return _initializeWalletProviderListeners.apply(this, arguments);
   }
@@ -954,13 +955,13 @@ var ClientProvider = function ClientProvider(_ref) {
    * @throws {TurnkeyError} If an error occurs while clearing the timers.
    */
   function _scheduleSessionExpiration() {
-    _scheduleSessionExpiration = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee109(params) {
+    _scheduleSessionExpiration = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee110(params) {
       var sessionKey, expiry, warnKey, now, expiryMs, timeUntilExpiry, _beforeExpiry, expireSession, warnAt, _callbacks$onError0, _callbacks$onError1, _t34;
-      return _regenerator().w(function (_context109) {
-        while (1) switch (_context109.p = _context109.n) {
+      return _regenerator().w(function (_context110) {
+        while (1) switch (_context110.p = _context110.n) {
           case 0:
             sessionKey = params.sessionKey, expiry = params.expiry;
-            _context109.p = 1;
+            _context110.p = 1;
             warnKey = "".concat(sessionKey, "-warning"); // Replace any prior timers for this session
             clearKey(expiryTimeoutsRef.current, sessionKey);
             clearKey(expiryTimeoutsRef.current, warnKey);
@@ -968,86 +969,86 @@ var ClientProvider = function ClientProvider(_ref) {
             expiryMs = expiry * 1000;
             timeUntilExpiry = expiryMs - now;
             _beforeExpiry = /*#__PURE__*/function () {
-              var _ref129 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee107() {
-                var _callbacks$beforeSess, _masterConfig$auth48;
+              var _ref130 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee108() {
+                var _callbacks$beforeSess, _masterConfig$auth49;
                 var activeSession, session;
-                return _regenerator().w(function (_context107) {
-                  while (1) switch (_context107.n) {
+                return _regenerator().w(function (_context108) {
+                  while (1) switch (_context108.n) {
                     case 0:
-                      _context107.n = 1;
+                      _context108.n = 1;
                       return getSession();
                     case 1:
-                      activeSession = _context107.v;
+                      activeSession = _context108.v;
                       if (!(!activeSession && expiryTimeoutsRef.current[warnKey])) {
-                        _context107.n = 2;
+                        _context108.n = 2;
                         break;
                       }
                       // Keep nudging until session materializes (short 10s timer is fine)
                       setTimeoutInMap(expiryTimeoutsRef.current, warnKey, _beforeExpiry, 10000);
-                      return _context107.a(2);
+                      return _context108.a(2);
                     case 2:
-                      _context107.n = 3;
+                      _context108.n = 3;
                       return getSession({
                         sessionKey: sessionKey
                       });
                     case 3:
-                      session = _context107.v;
+                      session = _context108.v;
                       if (session) {
-                        _context107.n = 4;
+                        _context108.n = 4;
                         break;
                       }
-                      return _context107.a(2);
+                      return _context108.a(2);
                     case 4:
                       callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$beforeSess = callbacks.beforeSessionExpiry) === null || _callbacks$beforeSess === void 0 ? void 0 : _callbacks$beforeSess.call(callbacks, {
                         sessionKey: sessionKey
                       });
-                      if (!(masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth48 = masterConfig.auth) !== null && _masterConfig$auth48 !== void 0 && _masterConfig$auth48.autoRefreshSession)) {
-                        _context107.n = 5;
+                      if (!(masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth49 = masterConfig.auth) !== null && _masterConfig$auth49 !== void 0 && _masterConfig$auth49.autoRefreshSession)) {
+                        _context108.n = 5;
                         break;
                       }
-                      _context107.n = 5;
+                      _context108.n = 5;
                       return refreshSession({
                         expirationSeconds: session.expirationSeconds,
                         sessionKey: sessionKey
                       });
                     case 5:
-                      return _context107.a(2);
+                      return _context108.a(2);
                   }
-                }, _callee107);
+                }, _callee108);
               }));
               return function beforeExpiry() {
-                return _ref129.apply(this, arguments);
+                return _ref130.apply(this, arguments);
               };
             }();
             expireSession = /*#__PURE__*/function () {
-              var _ref130 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee108() {
+              var _ref131 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee109() {
                 var _callbacks$onSessionE;
                 var expiredSession, _t32, _t33;
-                return _regenerator().w(function (_context108) {
-                  while (1) switch (_context108.n) {
+                return _regenerator().w(function (_context109) {
+                  while (1) switch (_context109.n) {
                     case 0:
-                      _context108.n = 1;
+                      _context109.n = 1;
                       return getSession({
                         sessionKey: sessionKey
                       });
                     case 1:
-                      expiredSession = _context108.v;
+                      expiredSession = _context109.v;
                       if (expiredSession) {
-                        _context108.n = 2;
+                        _context109.n = 2;
                         break;
                       }
-                      return _context108.a(2);
+                      return _context109.a(2);
                     case 2:
                       callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onSessionE = callbacks.onSessionExpired) === null || _callbacks$onSessionE === void 0 ? void 0 : _callbacks$onSessionE.call(callbacks, {
                         sessionKey: sessionKey
                       });
-                      _context108.n = 3;
+                      _context109.n = 3;
                       return getActiveSessionKey();
                     case 3:
-                      _t32 = _context108.v;
+                      _t32 = _context109.v;
                       _t33 = sessionKey;
                       if (!(_t32 === _t33)) {
-                        _context108.n = 4;
+                        _context109.n = 4;
                         break;
                       }
                       setSession(undefined);
@@ -1058,7 +1059,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         delete next[sessionKey];
                         return next;
                       });
-                      _context108.n = 5;
+                      _context109.n = 5;
                       return clearSession({
                         sessionKey: sessionKey
                       });
@@ -1066,25 +1067,25 @@ var ClientProvider = function ClientProvider(_ref) {
                       // Remove timers for this session
                       clearKey(expiryTimeoutsRef.current, sessionKey);
                       clearKey(expiryTimeoutsRef.current, warnKey);
-                      _context108.n = 6;
+                      _context109.n = 6;
                       return logout();
                     case 6:
-                      return _context108.a(2);
+                      return _context109.a(2);
                   }
-                }, _callee108);
+                }, _callee109);
               }));
               return function expireSession() {
-                return _ref130.apply(this, arguments);
+                return _ref131.apply(this, arguments);
               };
             }(); // Already expired → expire immediately
             if (!(timeUntilExpiry <= 0)) {
-              _context109.n = 3;
+              _context110.n = 3;
               break;
             }
-            _context109.n = 2;
+            _context110.n = 2;
             return expireSession();
           case 2:
-            return _context109.a(2);
+            return _context110.a(2);
           case 3:
             // Warning timer (if threshold is in the future)
             warnAt = expiryMs - SESSION_WARNING_THRESHOLD_MS;
@@ -1095,20 +1096,20 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             // Actual expiry timer (safe for long delays)
             setCappedTimeoutInMap(expiryTimeoutsRef.current, sessionKey, expireSession, timeUntilExpiry);
-            _context109.n = 5;
+            _context110.n = 5;
             break;
           case 4:
-            _context109.p = 4;
-            _t34 = _context109.v;
+            _context110.p = 4;
+            _t34 = _context110.v;
             if (_t34 instanceof TurnkeyError || _t34 instanceof TurnkeyNetworkError) {
               callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError0 = callbacks.onError) === null || _callbacks$onError0 === void 0 ? void 0 : _callbacks$onError0.call(callbacks, _t34);
             } else {
               callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError1 = callbacks.onError) === null || _callbacks$onError1 === void 0 ? void 0 : _callbacks$onError1.call(callbacks, new TurnkeyError("Failed to schedule session expiration for ".concat(sessionKey), TurnkeyErrorCodes.SCHEDULE_SESSION_EXPIRY_ERROR, _t34));
             }
           case 5:
-            return _context109.a(2);
+            return _context110.a(2);
         }
-      }, _callee109, null, [[1, 4]]);
+      }, _callee110, null, [[1, 4]]);
     }));
     return _scheduleSessionExpiration.apply(this, arguments);
   }
@@ -1239,6 +1240,12 @@ var ClientProvider = function ClientProvider(_ref) {
       callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError9 = callbacks.onError) === null || _callbacks$onError9 === void 0 ? void 0 : _callbacks$onError9.call(callbacks, new TurnkeyError("Failed to initialize sessions", TurnkeyErrorCodes.HANDLE_POST_LOGOUT_ERROR, error));
     }
   };
+  var createHttpClient = useCallback(function (params) {
+    if (!client) {
+      throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+    }
+    return client.createHttpClient(params);
+  }, [client]);
   var createPasskey = useCallback(/*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(params) {
       return _regenerator().w(function (_context0) {
@@ -1554,10 +1561,10 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref15.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var loginWithWallet = useCallback(/*#__PURE__*/function () {
+  var buildWalletLoginRequest = useCallback(/*#__PURE__*/function () {
     var _ref16 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(params) {
       var _masterConfig$auth$se3, _masterConfig$auth1;
-      var expirationSeconds, res;
+      var expirationSeconds;
       return _regenerator().w(function (_context17) {
         while (1) switch (_context17.n) {
           case 0:
@@ -1570,26 +1577,14 @@ var ClientProvider = function ClientProvider(_ref) {
             expirationSeconds = (_masterConfig$auth$se3 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth1 = masterConfig.auth) === null || _masterConfig$auth1 === void 0 ? void 0 : _masterConfig$auth1.sessionExpirationSeconds) !== null && _masterConfig$auth$se3 !== void 0 ? _masterConfig$auth$se3 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
             _context17.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.loginWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
+              return client.buildWalletLoginRequest(_objectSpread2(_objectSpread2({}, params), {}, {
                 expirationSeconds: expirationSeconds
               }));
             }, function () {
               return logout();
             }, callbacks, "Failed to login with wallet");
           case 2:
-            res = _context17.v;
-            if (!res) {
-              _context17.n = 3;
-              break;
-            }
-            _context17.n = 3;
-            return handlePostAuth({
-              method: AuthMethod.Wallet,
-              action: AuthAction.LOGIN,
-              identifier: res.address
-            });
-          case 3:
-            return _context17.a(2, res);
+            return _context17.a(2, _context17.v);
         }
       }, _callee17);
     }));
@@ -1597,10 +1592,10 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref16.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var signUpWithWallet = useCallback(/*#__PURE__*/function () {
+  var loginWithWallet = useCallback(/*#__PURE__*/function () {
     var _ref17 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18(params) {
-      var _params$createSubOrgP2, _masterConfig$auth10, _masterConfig$auth10$, _masterConfig$auth$se4, _masterConfig$auth11;
-      var createSubOrgParams, expirationSeconds, res;
+      var _masterConfig$auth$se4, _masterConfig$auth10;
+      var expirationSeconds, res;
       return _regenerator().w(function (_context18) {
         while (1) switch (_context18.n) {
           case 0:
@@ -1610,39 +1605,28 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            if (masterConfig) {
-              _context18.n = 2;
-              break;
-            }
-            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$createSubOrgP2 = params.createSubOrgParams) !== null && _params$createSubOrgP2 !== void 0 ? _params$createSubOrgP2 : (_masterConfig$auth10 = masterConfig.auth) === null || _masterConfig$auth10 === void 0 ? void 0 : (_masterConfig$auth10$ = _masterConfig$auth10.createSuborgParams) === null || _masterConfig$auth10$ === void 0 ? void 0 : _masterConfig$auth10$.walletAuth;
-            params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
-              createSubOrgParams: createSubOrgParams
-            }) : _objectSpread2({}, params);
-            expirationSeconds = (_masterConfig$auth$se4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth11 = masterConfig.auth) === null || _masterConfig$auth11 === void 0 ? void 0 : _masterConfig$auth11.sessionExpirationSeconds) !== null && _masterConfig$auth$se4 !== void 0 ? _masterConfig$auth$se4 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
-            _context18.n = 3;
+            expirationSeconds = (_masterConfig$auth$se4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth10 = masterConfig.auth) === null || _masterConfig$auth10 === void 0 ? void 0 : _masterConfig$auth10.sessionExpirationSeconds) !== null && _masterConfig$auth$se4 !== void 0 ? _masterConfig$auth$se4 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
+            _context18.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.signUpWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
+              return client.loginWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
                 expirationSeconds: expirationSeconds
               }));
             }, function () {
               return logout();
-            }, callbacks, "Failed to sign up with wallet");
-          case 3:
+            }, callbacks, "Failed to login with wallet");
+          case 2:
             res = _context18.v;
             if (!res) {
-              _context18.n = 4;
+              _context18.n = 3;
               break;
             }
-            _context18.n = 4;
+            _context18.n = 3;
             return handlePostAuth({
               method: AuthMethod.Wallet,
-              action: AuthAction.SIGNUP,
+              action: AuthAction.LOGIN,
               identifier: res.address
             });
-          case 4:
+          case 3:
             return _context18.a(2, res);
         }
       }, _callee18);
@@ -1650,10 +1634,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x13) {
       return _ref17.apply(this, arguments);
     };
-  }(), [client, callbacks, masterConfig]);
-  var loginOrSignupWithWallet = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks]);
+  var signUpWithWallet = useCallback(/*#__PURE__*/function () {
     var _ref18 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(params) {
-      var _params$createSubOrgP3, _masterConfig$auth12, _masterConfig$auth12$, _masterConfig$auth$se5, _masterConfig$auth13;
+      var _params$createSubOrgP2, _masterConfig$auth11, _masterConfig$auth11$, _masterConfig$auth$se5, _masterConfig$auth12;
       var createSubOrgParams, expirationSeconds, res;
       return _regenerator().w(function (_context19) {
         while (1) switch (_context19.n) {
@@ -1671,19 +1655,19 @@ 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$createSubOrgP3 = params.createSubOrgParams) !== null && _params$createSubOrgP3 !== void 0 ? _params$createSubOrgP3 : (_masterConfig$auth12 = masterConfig.auth) === null || _masterConfig$auth12 === void 0 ? void 0 : (_masterConfig$auth12$ = _masterConfig$auth12.createSuborgParams) === null || _masterConfig$auth12$ === void 0 ? void 0 : _masterConfig$auth12$.walletAuth;
+            createSubOrgParams = (_params$createSubOrgP2 = params.createSubOrgParams) !== null && _params$createSubOrgP2 !== void 0 ? _params$createSubOrgP2 : (_masterConfig$auth11 = masterConfig.auth) === null || _masterConfig$auth11 === void 0 ? void 0 : (_masterConfig$auth11$ = _masterConfig$auth11.createSuborgParams) === null || _masterConfig$auth11$ === void 0 ? void 0 : _masterConfig$auth11$.walletAuth;
             params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
-            expirationSeconds = (_masterConfig$auth$se5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth13 = masterConfig.auth) === null || _masterConfig$auth13 === void 0 ? void 0 : _masterConfig$auth13.sessionExpirationSeconds) !== null && _masterConfig$auth$se5 !== void 0 ? _masterConfig$auth$se5 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
+            expirationSeconds = (_masterConfig$auth$se5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth12 = masterConfig.auth) === null || _masterConfig$auth12 === void 0 ? void 0 : _masterConfig$auth12.sessionExpirationSeconds) !== null && _masterConfig$auth$se5 !== void 0 ? _masterConfig$auth$se5 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
             _context19.n = 3;
             return withTurnkeyErrorHandling(function () {
-              return client.loginOrSignupWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
+              return client.signUpWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
                 expirationSeconds: expirationSeconds
               }));
             }, function () {
               return logout();
-            }, callbacks, "Failed to login or sign up with wallet");
+            }, callbacks, "Failed to sign up with wallet");
           case 3:
             res = _context19.v;
             if (!res) {
@@ -1693,7 +1677,7 @@ var ClientProvider = function ClientProvider(_ref) {
             _context19.n = 4;
             return handlePostAuth({
               method: AuthMethod.Wallet,
-              action: res.action,
+              action: AuthAction.SIGNUP,
               identifier: res.address
             });
           case 4:
@@ -1705,8 +1689,10 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref18.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig]);
-  var initOtp = useCallback(/*#__PURE__*/function () {
+  var loginOrSignupWithWallet = useCallback(/*#__PURE__*/function () {
     var _ref19 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee20(params) {
+      var _params$createSubOrgP3, _masterConfig$auth13, _masterConfig$auth13$, _masterConfig$auth$se6, _masterConfig$auth14;
+      var createSubOrgParams, expirationSeconds, res;
       return _regenerator().w(function (_context20) {
         while (1) switch (_context20.n) {
           case 0:
@@ -1716,19 +1702,48 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context20.a(2, withTurnkeyErrorHandling(function () {
-              return client.initOtp(params);
+            if (masterConfig) {
+              _context20.n = 2;
+              break;
+            }
+            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$createSubOrgP3 = params.createSubOrgParams) !== null && _params$createSubOrgP3 !== void 0 ? _params$createSubOrgP3 : (_masterConfig$auth13 = masterConfig.auth) === null || _masterConfig$auth13 === void 0 ? void 0 : (_masterConfig$auth13$ = _masterConfig$auth13.createSuborgParams) === null || _masterConfig$auth13$ === void 0 ? void 0 : _masterConfig$auth13$.walletAuth;
+            params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
+              createSubOrgParams: createSubOrgParams
+            }) : _objectSpread2({}, params);
+            expirationSeconds = (_masterConfig$auth$se6 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth14 = masterConfig.auth) === null || _masterConfig$auth14 === void 0 ? void 0 : _masterConfig$auth14.sessionExpirationSeconds) !== null && _masterConfig$auth$se6 !== void 0 ? _masterConfig$auth$se6 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
+            _context20.n = 3;
+            return withTurnkeyErrorHandling(function () {
+              return client.loginOrSignupWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
+                expirationSeconds: expirationSeconds
+              }));
             }, function () {
               return logout();
-            }, callbacks, "Failed to initialize OTP"));
+            }, callbacks, "Failed to login or sign up with wallet");
+          case 3:
+            res = _context20.v;
+            if (!res) {
+              _context20.n = 4;
+              break;
+            }
+            _context20.n = 4;
+            return handlePostAuth({
+              method: AuthMethod.Wallet,
+              action: res.action,
+              identifier: res.address
+            });
+          case 4:
+            return _context20.a(2, res);
         }
       }, _callee20);
     }));
     return function (_x15) {
       return _ref19.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var verifyOtp = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, masterConfig]);
+  var initOtp = useCallback(/*#__PURE__*/function () {
     var _ref20 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee21(params) {
       return _regenerator().w(function (_context21) {
         while (1) switch (_context21.n) {
@@ -1740,10 +1755,10 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context21.a(2, withTurnkeyErrorHandling(function () {
-              return client.verifyOtp(params);
+              return client.initOtp(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to verify OTP"));
+            }, callbacks, "Failed to initialize OTP"));
         }
       }, _callee21);
     }));
@@ -1751,9 +1766,8 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref20.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var loginWithOtp = useCallback(/*#__PURE__*/function () {
+  var verifyOtp = useCallback(/*#__PURE__*/function () {
     var _ref21 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(params) {
-      var res;
       return _regenerator().w(function (_context22) {
         while (1) switch (_context22.n) {
           case 0:
@@ -1763,26 +1777,11 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context22.n = 2;
-            return withTurnkeyErrorHandling(function () {
-              return client.loginWithOtp(params);
+            return _context22.a(2, withTurnkeyErrorHandling(function () {
+              return client.verifyOtp(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to login with OTP");
-          case 2:
-            res = _context22.v;
-            if (!res) {
-              _context22.n = 3;
-              break;
-            }
-            _context22.n = 3;
-            return handlePostAuth({
-              method: AuthMethod.Otp,
-              action: AuthAction.LOGIN,
-              identifier: params.verificationToken
-            });
-          case 3:
-            return _context22.a(2, res);
+            }, callbacks, "Failed to verify OTP"));
         }
       }, _callee22);
     }));
@@ -1790,10 +1789,9 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref21.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var signUpWithOtp = useCallback(/*#__PURE__*/function () {
+  var loginWithOtp = useCallback(/*#__PURE__*/function () {
     var _ref22 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee23(params) {
-      var _masterConfig$auth14;
-      var createSubOrgParams, res;
+      var res;
       return _regenerator().w(function (_context23) {
         while (1) switch (_context23.n) {
           case 0:
@@ -1803,43 +1801,25 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            if (masterConfig) {
-              _context23.n = 2;
-              break;
-            }
-            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.createSubOrgParams;
-            if (!createSubOrgParams && masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth14 = masterConfig.auth) !== null && _masterConfig$auth14 !== void 0 && _masterConfig$auth14.createSuborgParams) {
-              if (params.otpType === OtpType.Email) {
-                createSubOrgParams = masterConfig.auth.createSuborgParams.emailOtpAuth;
-              } else if (params.otpType === OtpType.Sms) {
-                createSubOrgParams = masterConfig.auth.createSuborgParams.smsOtpAuth;
-              }
-            }
-            params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
-              createSubOrgParams: createSubOrgParams
-            }) : _objectSpread2({}, params);
-            _context23.n = 3;
+            _context23.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.signUpWithOtp(params);
+              return client.loginWithOtp(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to sign up with OTP");
-          case 3:
+            }, callbacks, "Failed to login with OTP");
+          case 2:
             res = _context23.v;
             if (!res) {
-              _context23.n = 4;
+              _context23.n = 3;
               break;
             }
-            _context23.n = 4;
+            _context23.n = 3;
             return handlePostAuth({
               method: AuthMethod.Otp,
-              action: AuthAction.SIGNUP,
+              action: AuthAction.LOGIN,
               identifier: params.verificationToken
             });
-          case 4:
+          case 3:
             return _context23.a(2, res);
         }
       }, _callee23);
@@ -1847,8 +1827,8 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x18) {
       return _ref22.apply(this, arguments);
     };
-  }(), [client, callbacks, masterConfig]);
-  var completeOtp = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks]);
+  var signUpWithOtp = useCallback(/*#__PURE__*/function () {
     var _ref23 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee24(params) {
       var _masterConfig$auth15;
       var createSubOrgParams, res;
@@ -1881,10 +1861,10 @@ var ClientProvider = function ClientProvider(_ref) {
             }) : _objectSpread2({}, params);
             _context24.n = 3;
             return withTurnkeyErrorHandling(function () {
-              return client.completeOtp(params);
+              return client.signUpWithOtp(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to complete OTP");
+            }, callbacks, "Failed to sign up with OTP");
           case 3:
             res = _context24.v;
             if (!res) {
@@ -1894,8 +1874,8 @@ var ClientProvider = function ClientProvider(_ref) {
             _context24.n = 4;
             return handlePostAuth({
               method: AuthMethod.Otp,
-              action: res.action,
-              identifier: res.verificationToken
+              action: AuthAction.SIGNUP,
+              identifier: params.verificationToken
             });
           case 4:
             return _context24.a(2, res);
@@ -1906,9 +1886,10 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref23.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig]);
-  var loginWithOauth = useCallback(/*#__PURE__*/function () {
+  var completeOtp = useCallback(/*#__PURE__*/function () {
     var _ref24 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee25(params) {
-      var res;
+      var _masterConfig$auth16;
+      var createSubOrgParams, res;
       return _regenerator().w(function (_context25) {
         while (1) switch (_context25.n) {
           case 0:
@@ -1918,25 +1899,43 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context25.n = 2;
+            if (masterConfig) {
+              _context25.n = 2;
+              break;
+            }
+            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.createSubOrgParams;
+            if (!createSubOrgParams && masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth16 = masterConfig.auth) !== null && _masterConfig$auth16 !== void 0 && _masterConfig$auth16.createSuborgParams) {
+              if (params.otpType === OtpType.Email) {
+                createSubOrgParams = masterConfig.auth.createSuborgParams.emailOtpAuth;
+              } else if (params.otpType === OtpType.Sms) {
+                createSubOrgParams = masterConfig.auth.createSuborgParams.smsOtpAuth;
+              }
+            }
+            params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
+              createSubOrgParams: createSubOrgParams
+            }) : _objectSpread2({}, params);
+            _context25.n = 3;
             return withTurnkeyErrorHandling(function () {
-              return client.loginWithOauth(params);
+              return client.completeOtp(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to login with OAuth");
-          case 2:
+            }, callbacks, "Failed to complete OTP");
+          case 3:
             res = _context25.v;
             if (!res) {
-              _context25.n = 3;
+              _context25.n = 4;
               break;
             }
-            _context25.n = 3;
+            _context25.n = 4;
             return handlePostAuth({
-              method: AuthMethod.Oauth,
-              action: AuthAction.LOGIN,
-              identifier: params.oidcToken
+              method: AuthMethod.Otp,
+              action: res.action,
+              identifier: res.verificationToken
             });
-          case 3:
+          case 4:
             return _context25.a(2, res);
         }
       }, _callee25);
@@ -1944,11 +1943,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x20) {
       return _ref24.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var signUpWithOauth = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, masterConfig]);
+  var loginWithOauth = useCallback(/*#__PURE__*/function () {
     var _ref25 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee26(params) {
-      var _params$createSubOrgP4, _masterConfig$auth16, _masterConfig$auth16$;
-      var createSubOrgParams, res;
+      var res;
       return _regenerator().w(function (_context26) {
         while (1) switch (_context26.n) {
           case 0:
@@ -1958,36 +1956,25 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            if (masterConfig) {
-              _context26.n = 2;
-              break;
-            }
-            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$auth16 = masterConfig.auth) === null || _masterConfig$auth16 === void 0 ? void 0 : (_masterConfig$auth16$ = _masterConfig$auth16.createSuborgParams) === null || _masterConfig$auth16$ === void 0 ? void 0 : _masterConfig$auth16$.oauth;
-            params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
-              createSubOrgParams: createSubOrgParams
-            }) : _objectSpread2({}, params);
-            _context26.n = 3;
+            _context26.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.signUpWithOauth(params);
+              return client.loginWithOauth(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to sign up with OAuth");
-          case 3:
+            }, callbacks, "Failed to login with OAuth");
+          case 2:
             res = _context26.v;
             if (!res) {
-              _context26.n = 4;
+              _context26.n = 3;
               break;
             }
-            _context26.n = 4;
+            _context26.n = 3;
             return handlePostAuth({
               method: AuthMethod.Oauth,
-              action: AuthAction.SIGNUP,
+              action: AuthAction.LOGIN,
               identifier: params.oidcToken
             });
-          case 4:
+          case 3:
             return _context26.a(2, res);
         }
       }, _callee26);
@@ -1995,10 +1982,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x21) {
       return _ref25.apply(this, arguments);
     };
-  }(), [client, callbacks, masterConfig]);
-  var completeOauth = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks]);
+  var signUpWithOauth = useCallback(/*#__PURE__*/function () {
     var _ref26 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee27(params) {
-      var _params$createSubOrgP5, _masterConfig$auth17, _masterConfig$auth17$;
+      var _params$createSubOrgP4, _masterConfig$auth17, _masterConfig$auth17$;
       var createSubOrgParams, res;
       return _regenerator().w(function (_context27) {
         while (1) switch (_context27.n) {
@@ -2016,16 +2003,16 @@ 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$auth17 = masterConfig.auth) === null || _masterConfig$auth17 === void 0 ? void 0 : (_masterConfig$auth17$ = _masterConfig$auth17.createSuborgParams) === null || _masterConfig$auth17$ === void 0 ? void 0 : _masterConfig$auth17$.oauth;
+            createSubOrgParams = (_params$createSubOrgP4 = params.createSubOrgParams) !== null && _params$createSubOrgP4 !== void 0 ? _params$createSubOrgP4 : (_masterConfig$auth17 = masterConfig.auth) === null || _masterConfig$auth17 === void 0 ? void 0 : (_masterConfig$auth17$ = _masterConfig$auth17.createSuborgParams) === null || _masterConfig$auth17$ === void 0 ? void 0 : _masterConfig$auth17$.oauth;
             params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
             _context27.n = 3;
             return withTurnkeyErrorHandling(function () {
-              return client.completeOauth(params);
+              return client.signUpWithOauth(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to complete OAuth");
+            }, callbacks, "Failed to sign up with OAuth");
           case 3:
             res = _context27.v;
             if (!res) {
@@ -2035,7 +2022,7 @@ var ClientProvider = function ClientProvider(_ref) {
             _context27.n = 4;
             return handlePostAuth({
               method: AuthMethod.Oauth,
-              action: res.action,
+              action: AuthAction.SIGNUP,
               identifier: params.oidcToken
             });
           case 4:
@@ -2047,8 +2034,10 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref26.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig]);
-  var fetchWallets = useCallback(/*#__PURE__*/function () {
+  var completeOauth = useCallback(/*#__PURE__*/function () {
     var _ref27 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee28(params) {
+      var _params$createSubOrgP5, _masterConfig$auth18, _masterConfig$auth18$;
+      var createSubOrgParams, res;
       return _regenerator().w(function (_context28) {
         while (1) switch (_context28.n) {
           case 0:
@@ -2058,19 +2047,45 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context28.a(2, withTurnkeyErrorHandling(function () {
-              return client.fetchWallets(params);
+            if (masterConfig) {
+              _context28.n = 2;
+              break;
+            }
+            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$auth18 = masterConfig.auth) === null || _masterConfig$auth18 === void 0 ? void 0 : (_masterConfig$auth18$ = _masterConfig$auth18.createSuborgParams) === null || _masterConfig$auth18$ === void 0 ? void 0 : _masterConfig$auth18$.oauth;
+            params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
+              createSubOrgParams: createSubOrgParams
+            }) : _objectSpread2({}, params);
+            _context28.n = 3;
+            return withTurnkeyErrorHandling(function () {
+              return client.completeOauth(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to fetch wallets"));
+            }, callbacks, "Failed to complete OAuth");
+          case 3:
+            res = _context28.v;
+            if (!res) {
+              _context28.n = 4;
+              break;
+            }
+            _context28.n = 4;
+            return handlePostAuth({
+              method: AuthMethod.Oauth,
+              action: res.action,
+              identifier: params.oidcToken
+            });
+          case 4:
+            return _context28.a(2, res);
         }
       }, _callee28);
     }));
     return function (_x23) {
       return _ref27.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var fetchWalletAccounts = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, masterConfig]);
+  var fetchWallets = useCallback(/*#__PURE__*/function () {
     var _ref28 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee29(params) {
       return _regenerator().w(function (_context29) {
         while (1) switch (_context29.n) {
@@ -2082,10 +2097,10 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context29.a(2, withTurnkeyErrorHandling(function () {
-              return client.fetchWalletAccounts(params);
+              return client.fetchWallets(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to fetch wallet accounts"));
+            }, callbacks, "Failed to fetch wallets"));
         }
       }, _callee29);
     }));
@@ -2093,7 +2108,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref28.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var fetchPrivateKeys = useCallback(/*#__PURE__*/function () {
+  var fetchWalletAccounts = useCallback(/*#__PURE__*/function () {
     var _ref29 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee30(params) {
       return _regenerator().w(function (_context30) {
         while (1) switch (_context30.n) {
@@ -2105,10 +2120,10 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context30.a(2, withTurnkeyErrorHandling(function () {
-              return client.fetchPrivateKeys(params);
+              return client.fetchWalletAccounts(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to fetch private keys"));
+            }, callbacks, "Failed to fetch wallet accounts"));
         }
       }, _callee30);
     }));
@@ -2116,7 +2131,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref29.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var signMessage = useCallback(/*#__PURE__*/function () {
+  var fetchPrivateKeys = useCallback(/*#__PURE__*/function () {
     var _ref30 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee31(params) {
       return _regenerator().w(function (_context31) {
         while (1) switch (_context31.n) {
@@ -2128,10 +2143,10 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context31.a(2, withTurnkeyErrorHandling(function () {
-              return client.signMessage(params);
+              return client.fetchPrivateKeys(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to sign message"));
+            }, callbacks, "Failed to fetch private keys"));
         }
       }, _callee31);
     }));
@@ -2139,20 +2154,43 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref30.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var handleSignMessage = useCallback(/*#__PURE__*/function () {
+  var signMessage = useCallback(/*#__PURE__*/function () {
     var _ref31 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee32(params) {
-      var _params$successPageDu, successPageDuration;
       return _regenerator().w(function (_context32) {
         while (1) switch (_context32.n) {
           case 0:
-            _params$successPageDu = params.successPageDuration, successPageDuration = _params$successPageDu === void 0 ? 2000 : _params$successPageDu;
             if (client) {
               _context32.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context32.a(2, new Promise(function (resolve, reject) {
+            return _context32.a(2, withTurnkeyErrorHandling(function () {
+              return client.signMessage(params);
+            }, function () {
+              return logout();
+            }, callbacks, "Failed to sign message"));
+        }
+      }, _callee32);
+    }));
+    return function (_x27) {
+      return _ref31.apply(this, arguments);
+    };
+  }(), [client, callbacks]);
+  var handleSignMessage = useCallback(/*#__PURE__*/function () {
+    var _ref32 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee33(params) {
+      var _params$successPageDu, successPageDuration;
+      return _regenerator().w(function (_context33) {
+        while (1) switch (_context33.n) {
+          case 0:
+            _params$successPageDu = params.successPageDuration, successPageDuration = _params$successPageDu === void 0 ? 2000 : _params$successPageDu;
+            if (client) {
+              _context33.n = 1;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 1:
+            return _context33.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Sign message",
                 content: jsx(SignMessageModal, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -2182,36 +2220,13 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee32);
-    }));
-    return function (_x27) {
-      return _ref31.apply(this, arguments);
-    };
-  }(), [client, callbacks]);
-  var signTransaction = useCallback(/*#__PURE__*/function () {
-    var _ref32 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee33(params) {
-      return _regenerator().w(function (_context33) {
-        while (1) switch (_context33.n) {
-          case 0:
-            if (client) {
-              _context33.n = 1;
-              break;
-            }
-            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
-          case 1:
-            return _context33.a(2, withTurnkeyErrorHandling(function () {
-              return client.signTransaction(params);
-            }, function () {
-              return logout();
-            }, callbacks, "Failed to sign transaction"));
-        }
       }, _callee33);
     }));
     return function (_x28) {
       return _ref32.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var signAndSendTransaction = useCallback(/*#__PURE__*/function () {
+  var signTransaction = useCallback(/*#__PURE__*/function () {
     var _ref33 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee34(params) {
       return _regenerator().w(function (_context34) {
         while (1) switch (_context34.n) {
@@ -2223,7 +2238,7 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context34.a(2, withTurnkeyErrorHandling(function () {
-              return client.signAndSendTransaction(params);
+              return client.signTransaction(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to sign transaction"));
@@ -2234,7 +2249,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref33.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var fetchUser = useCallback(/*#__PURE__*/function () {
+  var signAndSendTransaction = useCallback(/*#__PURE__*/function () {
     var _ref34 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee35(params) {
       return _regenerator().w(function (_context35) {
         while (1) switch (_context35.n) {
@@ -2246,10 +2261,10 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context35.a(2, withTurnkeyErrorHandling(function () {
-              return client.fetchUser(params);
+              return client.signAndSendTransaction(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to fetch user"));
+            }, callbacks, "Failed to sign transaction"));
         }
       }, _callee35);
     }));
@@ -2257,7 +2272,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref34.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var fetchOrCreateP256ApiKeyUser = useCallback(/*#__PURE__*/function () {
+  var fetchUser = useCallback(/*#__PURE__*/function () {
     var _ref35 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee36(params) {
       return _regenerator().w(function (_context36) {
         while (1) switch (_context36.n) {
@@ -2269,10 +2284,10 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context36.a(2, withTurnkeyErrorHandling(function () {
-              return client.fetchOrCreateP256ApiKeyUser(params);
+              return client.fetchUser(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to fetch or create delegated access user"));
+            }, callbacks, "Failed to fetch user"));
         }
       }, _callee36);
     }));
@@ -2280,7 +2295,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref35.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var fetchOrCreatePolicies = useCallback(/*#__PURE__*/function () {
+  var fetchOrCreateP256ApiKeyUser = useCallback(/*#__PURE__*/function () {
     var _ref36 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee37(params) {
       return _regenerator().w(function (_context37) {
         while (1) switch (_context37.n) {
@@ -2292,7 +2307,7 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context37.a(2, withTurnkeyErrorHandling(function () {
-              return client.fetchOrCreatePolicies(params);
+              return client.fetchOrCreateP256ApiKeyUser(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to fetch or create delegated access user"));
@@ -2303,9 +2318,8 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref36.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var updateUserEmail = useCallback(/*#__PURE__*/function () {
+  var fetchOrCreatePolicies = useCallback(/*#__PURE__*/function () {
     var _ref37 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee38(params) {
-      var res;
       return _regenerator().w(function (_context38) {
         while (1) switch (_context38.n) {
           case 0:
@@ -2315,28 +2329,11 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context38.n = 2;
-            return withTurnkeyErrorHandling(function () {
-              return client.updateUserEmail(params);
+            return _context38.a(2, withTurnkeyErrorHandling(function () {
+              return client.fetchOrCreatePolicies(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to update user email");
-          case 2:
-            res = _context38.v;
-            if (!res) {
-              _context38.n = 3;
-              break;
-            }
-            _context38.n = 3;
-            return refreshUser(_objectSpread2(_objectSpread2({
-              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
-            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
-              organizationId: params.organizationId
-            }), (params === null || params === void 0 ? void 0 : params.userId) && {
-              userId: params.userId
-            }));
-          case 3:
-            return _context38.a(2, res);
+            }, callbacks, "Failed to fetch or create delegated access user"));
         }
       }, _callee38);
     }));
@@ -2344,7 +2341,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref37.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var removeUserEmail = useCallback(/*#__PURE__*/function () {
+  var updateUserEmail = useCallback(/*#__PURE__*/function () {
     var _ref38 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee39(params) {
       var res;
       return _regenerator().w(function (_context39) {
@@ -2358,10 +2355,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context39.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.removeUserEmail(params);
+              return client.updateUserEmail(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to remove user email");
+            }, callbacks, "Failed to update user email");
           case 2:
             res = _context39.v;
             if (!res) {
@@ -2385,7 +2382,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref38.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var updateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
+  var removeUserEmail = useCallback(/*#__PURE__*/function () {
     var _ref39 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee40(params) {
       var res;
       return _regenerator().w(function (_context40) {
@@ -2399,10 +2396,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context40.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.updateUserPhoneNumber(params);
+              return client.removeUserEmail(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to update user phone number");
+            }, callbacks, "Failed to remove user email");
           case 2:
             res = _context40.v;
             if (!res) {
@@ -2426,7 +2423,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref39.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var removeUserPhoneNumber = useCallback(/*#__PURE__*/function () {
+  var updateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref40 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee41(params) {
       var res;
       return _regenerator().w(function (_context41) {
@@ -2440,10 +2437,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context41.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.removeUserPhoneNumber(params);
+              return client.updateUserPhoneNumber(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to remove user phone number");
+            }, callbacks, "Failed to update user phone number");
           case 2:
             res = _context41.v;
             if (!res) {
@@ -2467,7 +2464,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref40.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var updateUserName = useCallback(/*#__PURE__*/function () {
+  var removeUserPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref41 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee42(params) {
       var res;
       return _regenerator().w(function (_context42) {
@@ -2481,10 +2478,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context42.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.updateUserName(params);
+              return client.removeUserPhoneNumber(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to update user name");
+            }, callbacks, "Failed to remove user phone number");
           case 2:
             res = _context42.v;
             if (!res) {
@@ -2508,7 +2505,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref41.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var addOauthProvider = useCallback(/*#__PURE__*/function () {
+  var updateUserName = useCallback(/*#__PURE__*/function () {
     var _ref42 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee43(params) {
       var res;
       return _regenerator().w(function (_context43) {
@@ -2522,10 +2519,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context43.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.addOauthProvider(params);
+              return client.updateUserName(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to add OAuth provider");
+            }, callbacks, "Failed to update user name");
           case 2:
             res = _context43.v;
             if (!res) {
@@ -2549,7 +2546,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref42.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var removeOauthProviders = useCallback(/*#__PURE__*/function () {
+  var addOauthProvider = useCallback(/*#__PURE__*/function () {
     var _ref43 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee44(params) {
       var res;
       return _regenerator().w(function (_context44) {
@@ -2563,10 +2560,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context44.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.removeOauthProviders(params);
+              return client.addOauthProvider(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to remove OAuth providers");
+            }, callbacks, "Failed to add OAuth provider");
           case 2:
             res = _context44.v;
             if (!res) {
@@ -2590,7 +2587,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref43.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var addPasskey = useCallback(/*#__PURE__*/function () {
+  var removeOauthProviders = useCallback(/*#__PURE__*/function () {
     var _ref44 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee45(params) {
       var res;
       return _regenerator().w(function (_context45) {
@@ -2604,10 +2601,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context45.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.addPasskey(params);
+              return client.removeOauthProviders(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to add passkey");
+            }, callbacks, "Failed to remove OAuth providers");
           case 2:
             res = _context45.v;
             if (!res) {
@@ -2631,7 +2628,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref44.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var removePasskeys = useCallback(/*#__PURE__*/function () {
+  var addPasskey = useCallback(/*#__PURE__*/function () {
     var _ref45 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee46(params) {
       var res;
       return _regenerator().w(function (_context46) {
@@ -2645,10 +2642,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context46.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.removePasskeys(params);
+              return client.addPasskey(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to remove passkeys");
+            }, callbacks, "Failed to add passkey");
           case 2:
             res = _context46.v;
             if (!res) {
@@ -2672,9 +2669,9 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref45.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var createWallet = useCallback(/*#__PURE__*/function () {
+  var removePasskeys = useCallback(/*#__PURE__*/function () {
     var _ref46 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee47(params) {
-      var res, s;
+      var res;
       return _regenerator().w(function (_context47) {
         while (1) switch (_context47.n) {
           case 0:
@@ -2686,27 +2683,25 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context47.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.createWallet(params);
+              return client.removePasskeys(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to create wallet");
+            }, callbacks, "Failed to remove passkeys");
           case 2:
             res = _context47.v;
-            _context47.n = 3;
-            return getSession();
-          case 3:
-            s = _context47.v;
-            if (!(res && s)) {
-              _context47.n = 4;
+            if (!res) {
+              _context47.n = 3;
               break;
             }
-            _context47.n = 4;
-            return refreshWallets(_objectSpread2({
+            _context47.n = 3;
+            return refreshUser(_objectSpread2(_objectSpread2({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
               organizationId: params.organizationId
+            }), (params === null || params === void 0 ? void 0 : params.userId) && {
+              userId: params.userId
             }));
-          case 4:
+          case 3:
             return _context47.a(2, res);
         }
       }, _callee47);
@@ -2714,8 +2709,8 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x42) {
       return _ref46.apply(this, arguments);
     };
-  }(), [client, session, callbacks]);
-  var createWalletAccounts = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks]);
+  var createWallet = useCallback(/*#__PURE__*/function () {
     var _ref47 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee48(params) {
       var res, s;
       return _regenerator().w(function (_context48) {
@@ -2729,10 +2724,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context48.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.createWalletAccounts(params);
+              return client.createWallet(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to create wallet accounts");
+            }, callbacks, "Failed to create wallet");
           case 2:
             res = _context48.v;
             _context48.n = 3;
@@ -2758,7 +2753,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref47.apply(this, arguments);
     };
   }(), [client, session, callbacks]);
-  var exportWallet = useCallback(/*#__PURE__*/function () {
+  var createWalletAccounts = useCallback(/*#__PURE__*/function () {
     var _ref48 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee49(params) {
       var res, s;
       return _regenerator().w(function (_context49) {
@@ -2772,10 +2767,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context49.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.exportWallet(params);
+              return client.createWalletAccounts(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to export wallet");
+            }, callbacks, "Failed to create wallet accounts");
           case 2:
             res = _context49.v;
             _context49.n = 3;
@@ -2801,9 +2796,9 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref48.apply(this, arguments);
     };
   }(), [client, session, callbacks]);
-  var exportPrivateKey = useCallback(/*#__PURE__*/function () {
+  var exportWallet = useCallback(/*#__PURE__*/function () {
     var _ref49 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee50(params) {
-      var res;
+      var res, s;
       return _regenerator().w(function (_context50) {
         while (1) switch (_context50.n) {
           case 0:
@@ -2815,12 +2810,27 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context50.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.exportPrivateKey(params);
+              return client.exportWallet(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to export private key");
+            }, callbacks, "Failed to export wallet");
           case 2:
             res = _context50.v;
+            _context50.n = 3;
+            return getSession();
+          case 3:
+            s = _context50.v;
+            if (!(res && s)) {
+              _context50.n = 4;
+              break;
+            }
+            _context50.n = 4;
+            return refreshWallets(_objectSpread2({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
+              organizationId: params.organizationId
+            }));
+          case 4:
             return _context50.a(2, res);
         }
       }, _callee50);
@@ -2828,10 +2838,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x45) {
       return _ref49.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var exportWalletAccount = useCallback(/*#__PURE__*/function () {
+  }(), [client, session, callbacks]);
+  var exportPrivateKey = useCallback(/*#__PURE__*/function () {
     var _ref50 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee51(params) {
-      var res, s;
+      var res;
       return _regenerator().w(function (_context51) {
         while (1) switch (_context51.n) {
           case 0:
@@ -2843,27 +2853,12 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context51.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.exportWalletAccount(params);
+              return client.exportPrivateKey(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to export wallet accounts");
+            }, callbacks, "Failed to export private key");
           case 2:
             res = _context51.v;
-            _context51.n = 3;
-            return getSession();
-          case 3:
-            s = _context51.v;
-            if (!(res && s)) {
-              _context51.n = 4;
-              break;
-            }
-            _context51.n = 4;
-            return refreshWallets(_objectSpread2({
-              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
-            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
-              organizationId: params.organizationId
-            }));
-          case 4:
             return _context51.a(2, res);
         }
       }, _callee51);
@@ -2871,8 +2866,8 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x46) {
       return _ref50.apply(this, arguments);
     };
-  }(), [client, callbacks, masterConfig, session, user]);
-  var importWallet = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks]);
+  var exportWalletAccount = useCallback(/*#__PURE__*/function () {
     var _ref51 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee52(params) {
       var res, s;
       return _regenerator().w(function (_context52) {
@@ -2886,10 +2881,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context52.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.importWallet(params);
+              return client.exportWalletAccount(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to import wallet");
+            }, callbacks, "Failed to export wallet accounts");
           case 2:
             res = _context52.v;
             _context52.n = 3;
@@ -2901,12 +2896,10 @@ var ClientProvider = function ClientProvider(_ref) {
               break;
             }
             _context52.n = 4;
-            return refreshWallets(_objectSpread2(_objectSpread2({
+            return refreshWallets(_objectSpread2({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
               organizationId: params.organizationId
-            }), (params === null || params === void 0 ? void 0 : params.userId) && {
-              userId: params.userId
             }));
           case 4:
             return _context52.a(2, res);
@@ -2917,9 +2910,9 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref51.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, session, user]);
-  var importPrivateKey = useCallback(/*#__PURE__*/function () {
+  var importWallet = useCallback(/*#__PURE__*/function () {
     var _ref52 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee53(params) {
-      var res;
+      var res, s;
       return _regenerator().w(function (_context53) {
         while (1) switch (_context53.n) {
           case 0:
@@ -2931,12 +2924,29 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context53.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.importPrivateKey(params);
+              return client.importWallet(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to import private key");
+            }, callbacks, "Failed to import wallet");
           case 2:
             res = _context53.v;
+            _context53.n = 3;
+            return getSession();
+          case 3:
+            s = _context53.v;
+            if (!(res && s)) {
+              _context53.n = 4;
+              break;
+            }
+            _context53.n = 4;
+            return refreshWallets(_objectSpread2(_objectSpread2({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
+              organizationId: params.organizationId
+            }), (params === null || params === void 0 ? void 0 : params.userId) && {
+              userId: params.userId
+            }));
+          case 4:
             return _context53.a(2, res);
         }
       }, _callee53);
@@ -2945,8 +2955,9 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref52.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, session, user]);
-  var deleteSubOrganization = useCallback(/*#__PURE__*/function () {
+  var importPrivateKey = useCallback(/*#__PURE__*/function () {
     var _ref53 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee54(params) {
+      var res;
       return _regenerator().w(function (_context54) {
         while (1) switch (_context54.n) {
           case 0:
@@ -2956,11 +2967,15 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context54.a(2, withTurnkeyErrorHandling(function () {
-              return client.deleteSubOrganization(params);
+            _context54.n = 2;
+            return withTurnkeyErrorHandling(function () {
+              return client.importPrivateKey(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to delete sub-organization"));
+            }, callbacks, "Failed to import private key");
+          case 2:
+            res = _context54.v;
+            return _context54.a(2, res);
         }
       }, _callee54);
     }));
@@ -2968,9 +2983,8 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref53.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, session, user]);
-  var storeSession = useCallback(/*#__PURE__*/function () {
+  var deleteSubOrganization = useCallback(/*#__PURE__*/function () {
     var _ref54 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee55(params) {
-      var sessionKey, session, allSessions;
       return _regenerator().w(function (_context55) {
         while (1) switch (_context55.n) {
           case 0:
@@ -2980,91 +2994,115 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context55.n = 2;
+            return _context55.a(2, withTurnkeyErrorHandling(function () {
+              return client.deleteSubOrganization(params);
+            }, function () {
+              return logout();
+            }, callbacks, "Failed to delete sub-organization"));
+        }
+      }, _callee55);
+    }));
+    return function (_x50) {
+      return _ref54.apply(this, arguments);
+    };
+  }(), [client, callbacks, masterConfig, session, user]);
+  var storeSession = useCallback(/*#__PURE__*/function () {
+    var _ref55 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee56(params) {
+      var sessionKey, session, allSessions;
+      return _regenerator().w(function (_context56) {
+        while (1) switch (_context56.n) {
+          case 0:
+            if (client) {
+              _context56.n = 1;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 1:
+            _context56.n = 2;
             return withTurnkeyErrorHandling(function () {
               return client.storeSession(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to store session");
           case 2:
-            _context55.n = 3;
+            _context56.n = 3;
             return getActiveSessionKey();
           case 3:
-            sessionKey = _context55.v;
-            _context55.n = 4;
+            sessionKey = _context56.v;
+            _context56.n = 4;
             return getSession(_objectSpread2({}, sessionKey && {
               sessionKey: sessionKey
             }));
           case 4:
-            session = _context55.v;
+            session = _context56.v;
             if (!(session && sessionKey)) {
-              _context55.n = 5;
+              _context56.n = 5;
               break;
             }
-            _context55.n = 5;
+            _context56.n = 5;
             return scheduleSessionExpiration({
               sessionKey: sessionKey,
               expiry: session.expiry
             });
           case 5:
-            _context55.n = 6;
+            _context56.n = 6;
             return getAllSessions();
           case 6:
-            allSessions = _context55.v;
+            allSessions = _context56.v;
             setSession(session);
             setAllSessions(allSessions);
-            return _context55.a(2);
+            return _context56.a(2);
         }
-      }, _callee55);
+      }, _callee56);
     }));
-    return function (_x50) {
-      return _ref54.apply(this, arguments);
+    return function (_x51) {
+      return _ref55.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, session, user]);
   var clearSession = useCallback(/*#__PURE__*/function () {
-    var _ref55 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee57(params) {
+    var _ref56 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee58(params) {
       var _params$sessionKey;
       var sessionKey, newAllSessions, _t0;
-      return _regenerator().w(function (_context57) {
-        while (1) switch (_context57.n) {
+      return _regenerator().w(function (_context58) {
+        while (1) switch (_context58.n) {
           case 0:
             if (client) {
-              _context57.n = 1;
+              _context58.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context57.n = 2;
-            return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee56() {
-              return _regenerator().w(function (_context56) {
-                while (1) switch (_context56.n) {
+            _context58.n = 2;
+            return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee57() {
+              return _regenerator().w(function (_context57) {
+                while (1) switch (_context57.n) {
                   case 0:
-                    return _context56.a(2, client.clearSession(params));
+                    return _context57.a(2, client.clearSession(params));
                 }
-              }, _callee56);
+              }, _callee57);
             })), function () {
               return logout();
             }, callbacks, "Failed to clear session");
           case 2:
             if (!((_params$sessionKey = params === null || params === void 0 ? void 0 : params.sessionKey) !== null && _params$sessionKey !== void 0)) {
-              _context57.n = 3;
+              _context58.n = 3;
               break;
             }
             _t0 = _params$sessionKey;
-            _context57.n = 5;
+            _context58.n = 5;
             break;
           case 3:
-            _context57.n = 4;
+            _context58.n = 4;
             return getActiveSessionKey();
           case 4:
-            _t0 = _context57.v;
+            _t0 = _context58.v;
           case 5:
             sessionKey = _t0;
             if (sessionKey) {
-              _context57.n = 6;
+              _context58.n = 6;
               break;
             }
-            return _context57.a(2);
+            return _context58.a(2);
           case 6:
             if (!(params !== null && params !== void 0 && params.sessionKey)) {
               setSession(undefined);
@@ -3076,20 +3114,20 @@ var ClientProvider = function ClientProvider(_ref) {
               delete newAllSessions[sessionKey];
             }
             setAllSessions(newAllSessions);
-            return _context57.a(2);
+            return _context58.a(2);
         }
-      }, _callee57);
+      }, _callee58);
     }));
-    return function (_x51) {
-      return _ref55.apply(this, arguments);
+    return function (_x52) {
+      return _ref56.apply(this, arguments);
     };
   }(), [client, callbacks, session, user, masterConfig]);
-  var clearAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee58() {
-    return _regenerator().w(function (_context58) {
-      while (1) switch (_context58.n) {
+  var clearAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee59() {
+    return _regenerator().w(function (_context59) {
+      while (1) switch (_context59.n) {
         case 0:
           if (client) {
-            _context58.n = 1;
+            _context59.n = 1;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
@@ -3097,60 +3135,60 @@ var ClientProvider = function ClientProvider(_ref) {
           setSession(undefined);
           setAllSessions(undefined);
           clearSessionTimeouts();
-          _context58.n = 2;
+          _context59.n = 2;
           return withTurnkeyErrorHandling(function () {
             return client.clearAllSessions();
           }, function () {
             return logout();
           }, callbacks, "Failed to clear all sessions");
         case 2:
-          return _context58.a(2, _context58.v);
+          return _context59.a(2, _context59.v);
       }
-    }, _callee58);
+    }, _callee59);
   })), [client, callbacks, session, user, masterConfig]);
   var refreshSession = useCallback(/*#__PURE__*/function () {
-    var _ref58 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee59(params) {
+    var _ref59 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee60(params) {
       var _params$sessionKey2;
       var activeSessionKey, sessionKey, res, session, allSessions;
-      return _regenerator().w(function (_context59) {
-        while (1) switch (_context59.n) {
+      return _regenerator().w(function (_context60) {
+        while (1) switch (_context60.n) {
           case 0:
             if (client) {
-              _context59.n = 1;
+              _context60.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context59.n = 2;
+            _context60.n = 2;
             return client.getActiveSessionKey();
           case 2:
-            activeSessionKey = _context59.v;
+            activeSessionKey = _context60.v;
             if (activeSessionKey) {
-              _context59.n = 3;
+              _context60.n = 3;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 3:
             sessionKey = (_params$sessionKey2 = params === null || params === void 0 ? void 0 : params.sessionKey) !== null && _params$sessionKey2 !== void 0 ? _params$sessionKey2 : activeSessionKey;
-            _context59.n = 4;
+            _context60.n = 4;
             return withTurnkeyErrorHandling(function () {
               return client.refreshSession(_objectSpread2({}, params));
             }, function () {
               return logout();
             }, callbacks, "Failed to refresh session");
           case 4:
-            res = _context59.v;
-            _context59.n = 5;
+            res = _context60.v;
+            _context60.n = 5;
             return getSession({
               sessionKey: sessionKey
             });
           case 5:
-            session = _context59.v;
+            session = _context60.v;
             if (!(session && sessionKey)) {
-              _context59.n = 6;
+              _context60.n = 6;
               break;
             }
-            _context59.n = 6;
+            _context60.n = 6;
             return scheduleSessionExpiration(_objectSpread2({
               sessionKey: sessionKey,
               expiry: session.expiry
@@ -3158,74 +3196,74 @@ var ClientProvider = function ClientProvider(_ref) {
               expirationSeconds: params === null || params === void 0 ? void 0 : params.expirationSeconds
             }));
           case 6:
-            _context59.n = 7;
+            _context60.n = 7;
             return getAllSessions();
           case 7:
-            allSessions = _context59.v;
+            allSessions = _context60.v;
             setSession(session);
             setAllSessions(allSessions);
-            return _context59.a(2, res);
+            return _context60.a(2, res);
         }
-      }, _callee59);
+      }, _callee60);
     }));
-    return function (_x52) {
-      return _ref58.apply(this, arguments);
+    return function (_x53) {
+      return _ref59.apply(this, arguments);
     };
   }(), [client, callbacks, scheduleSessionExpiration, session, user, masterConfig]);
   var getSession = useCallback(/*#__PURE__*/function () {
-    var _ref59 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee60(params) {
-      return _regenerator().w(function (_context60) {
-        while (1) switch (_context60.n) {
+    var _ref60 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee61(params) {
+      return _regenerator().w(function (_context61) {
+        while (1) switch (_context61.n) {
           case 0:
             if (client) {
-              _context60.n = 1;
+              _context61.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context60.a(2, withTurnkeyErrorHandling(function () {
+            return _context61.a(2, withTurnkeyErrorHandling(function () {
               return client.getSession(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to get session"));
         }
-      }, _callee60);
+      }, _callee61);
     }));
-    return function (_x53) {
-      return _ref59.apply(this, arguments);
+    return function (_x54) {
+      return _ref60.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, session, user]);
-  var getAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee61() {
-    return _regenerator().w(function (_context61) {
-      while (1) switch (_context61.n) {
+  var getAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee62() {
+    return _regenerator().w(function (_context62) {
+      while (1) switch (_context62.n) {
         case 0:
           if (client) {
-            _context61.n = 1;
+            _context62.n = 1;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 1:
-          return _context61.a(2, withTurnkeyErrorHandling(function () {
+          return _context62.a(2, withTurnkeyErrorHandling(function () {
             return client.getAllSessions();
           }, function () {
             return logout();
           }, callbacks, "Failed to get all sessions"));
       }
-    }, _callee61);
+    }, _callee62);
   })), [client, callbacks, masterConfig, session, user]);
   var setActiveSession = useCallback(/*#__PURE__*/function () {
-    var _ref61 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee63(params) {
+    var _ref62 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee64(params) {
       var session, s;
-      return _regenerator().w(function (_context63) {
-        while (1) switch (_context63.n) {
+      return _regenerator().w(function (_context64) {
+        while (1) switch (_context64.n) {
           case 0:
             if (client) {
-              _context63.n = 1;
+              _context64.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context63.n = 2;
+            _context64.n = 2;
             return withTurnkeyErrorHandling(function () {
               return client.getSession({
                 sessionKey: params.sessionKey
@@ -3234,18 +3272,18 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to get session");
           case 2:
-            session = _context63.v;
-            _context63.n = 3;
+            session = _context64.v;
+            _context64.n = 3;
             return getSession();
           case 3:
-            s = _context63.v;
+            s = _context64.v;
             if (s) {
-              _context63.n = 4;
+              _context64.n = 4;
               break;
             }
             throw new TurnkeyError("Session not found.", TurnkeyErrorCodes.NOT_FOUND);
           case 4:
-            _context63.n = 5;
+            _context64.n = 5;
             return withTurnkeyErrorHandling(function () {
               return client.setActiveSession(params);
             }, function () {
@@ -3253,129 +3291,129 @@ var ClientProvider = function ClientProvider(_ref) {
             }, callbacks, "Failed to set active session");
           case 5:
             setSession(session);
-            _context63.n = 6;
-            return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee62() {
-              return _regenerator().w(function (_context62) {
-                while (1) switch (_context62.n) {
+            _context64.n = 6;
+            return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee63() {
+              return _regenerator().w(function (_context63) {
+                while (1) switch (_context63.n) {
                   case 0:
-                    _context62.n = 1;
+                    _context63.n = 1;
                     return refreshWallets();
                   case 1:
-                    _context62.n = 2;
+                    _context63.n = 2;
                     return refreshUser();
                   case 2:
-                    return _context62.a(2);
+                    return _context63.a(2);
                 }
-              }, _callee62);
+              }, _callee63);
             })), function () {
               return logout();
             }, callbacks, "Failed to refresh data after setting active session");
           case 6:
-            return _context63.a(2);
+            return _context64.a(2);
         }
-      }, _callee63);
+      }, _callee64);
     }));
-    return function (_x54) {
-      return _ref61.apply(this, arguments);
+    return function (_x55) {
+      return _ref62.apply(this, arguments);
     };
   }(), [client, callbacks, session, user, masterConfig]);
-  var getActiveSessionKey = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee64() {
-    return _regenerator().w(function (_context64) {
-      while (1) switch (_context64.n) {
+  var getActiveSessionKey = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee65() {
+    return _regenerator().w(function (_context65) {
+      while (1) switch (_context65.n) {
         case 0:
           if (client) {
-            _context64.n = 1;
+            _context65.n = 1;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 1:
-          return _context64.a(2, withTurnkeyErrorHandling(function () {
+          return _context65.a(2, withTurnkeyErrorHandling(function () {
             return client.getActiveSessionKey();
           }, function () {
             return logout();
           }, callbacks, "Failed to get active session key"));
       }
-    }, _callee64);
+    }, _callee65);
   })), [client, callbacks, masterConfig, session, user]);
-  var clearUnusedKeyPairs = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee65() {
-    return _regenerator().w(function (_context65) {
-      while (1) switch (_context65.n) {
+  var clearUnusedKeyPairs = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee66() {
+    return _regenerator().w(function (_context66) {
+      while (1) switch (_context66.n) {
         case 0:
           if (client) {
-            _context65.n = 1;
+            _context66.n = 1;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 1:
-          return _context65.a(2, withTurnkeyErrorHandling(function () {
+          return _context66.a(2, withTurnkeyErrorHandling(function () {
             return client.clearUnusedKeyPairs();
           }, function () {
             return logout();
           }, callbacks, "Failed to clear unused key pairs"));
       }
-    }, _callee65);
+    }, _callee66);
   })), [client, callbacks, masterConfig, session, user]);
   var createApiKeyPair = useCallback(/*#__PURE__*/function () {
-    var _ref65 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee66(params) {
-      return _regenerator().w(function (_context66) {
-        while (1) switch (_context66.n) {
+    var _ref66 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee67(params) {
+      return _regenerator().w(function (_context67) {
+        while (1) switch (_context67.n) {
           case 0:
             if (client) {
-              _context66.n = 1;
+              _context67.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context66.a(2, withTurnkeyErrorHandling(function () {
+            return _context67.a(2, withTurnkeyErrorHandling(function () {
               return client.createApiKeyPair(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to create API key pair"));
         }
-      }, _callee66);
+      }, _callee67);
     }));
-    return function (_x55) {
-      return _ref65.apply(this, arguments);
+    return function (_x56) {
+      return _ref66.apply(this, arguments);
     };
   }(), [client, callbacks, session, user, masterConfig]);
-  var getProxyAuthConfig = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee67() {
-    return _regenerator().w(function (_context67) {
-      while (1) switch (_context67.n) {
+  var getProxyAuthConfig = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee68() {
+    return _regenerator().w(function (_context68) {
+      while (1) switch (_context68.n) {
         case 0:
           if (client) {
-            _context67.n = 1;
+            _context68.n = 1;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 1:
-          return _context67.a(2, withTurnkeyErrorHandling(function () {
+          return _context68.a(2, withTurnkeyErrorHandling(function () {
             return client.getProxyAuthConfig();
           }, function () {
             return logout();
           }, callbacks, "Failed to get proxy auth config"));
       }
-    }, _callee67);
+    }, _callee68);
   })), [client, callbacks, masterConfig, session, user]);
   var refreshUser = useCallback(/*#__PURE__*/function () {
-    var _ref67 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee68(params) {
-      var _ref68, stampWith, organizationId, userId, user;
-      return _regenerator().w(function (_context68) {
-        while (1) switch (_context68.n) {
+    var _ref68 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee69(params) {
+      var _ref69, stampWith, organizationId, userId, user;
+      return _regenerator().w(function (_context69) {
+        while (1) switch (_context69.n) {
           case 0:
             if (masterConfig !== null && masterConfig !== void 0 && masterConfig.autoRefreshManagedState) {
-              _context68.n = 1;
+              _context69.n = 1;
               break;
             }
-            return _context68.a(2);
+            return _context69.a(2);
           case 1:
-            _ref68 = params || {}, stampWith = _ref68.stampWith, organizationId = _ref68.organizationId, userId = _ref68.userId;
+            _ref69 = params || {}, stampWith = _ref69.stampWith, organizationId = _ref69.organizationId, userId = _ref69.userId;
             if (client) {
-              _context68.n = 2;
+              _context69.n = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context68.n = 3;
+            _context69.n = 3;
             return withTurnkeyErrorHandling(function () {
               return fetchUser(_objectSpread2(_objectSpread2({
                 stampWith: stampWith
@@ -3388,70 +3426,70 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to refresh user");
           case 3:
-            user = _context68.v;
+            user = _context69.v;
             if (user) {
               setUser(user);
             }
           case 4:
-            return _context68.a(2);
+            return _context69.a(2);
         }
-      }, _callee68);
+      }, _callee69);
     }));
-    return function (_x56) {
-      return _ref67.apply(this, arguments);
+    return function (_x57) {
+      return _ref68.apply(this, arguments);
     };
   }(), [client, callbacks, fetchUser, masterConfig, session, user]);
   var fetchBootProofForAppProof = useCallback(/*#__PURE__*/function () {
-    var _ref69 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee69(params) {
-      return _regenerator().w(function (_context69) {
-        while (1) switch (_context69.n) {
+    var _ref70 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee70(params) {
+      return _regenerator().w(function (_context70) {
+        while (1) switch (_context70.n) {
           case 0:
             if (client) {
-              _context69.n = 1;
+              _context70.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context69.a(2, withTurnkeyErrorHandling(function () {
+            return _context70.a(2, withTurnkeyErrorHandling(function () {
               return client.fetchBootProofForAppProof(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to fetch or create delegated access user"));
         }
-      }, _callee69);
+      }, _callee70);
     }));
-    return function (_x57) {
-      return _ref69.apply(this, arguments);
+    return function (_x58) {
+      return _ref70.apply(this, arguments);
     };
   }(), [client, callbacks]);
   var refreshWallets = useCallback(/*#__PURE__*/function () {
-    var _ref70 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee70(params) {
-      var _ref71, stampWith, organizationId, userId, walletProviders, wallets;
-      return _regenerator().w(function (_context70) {
-        while (1) switch (_context70.n) {
+    var _ref71 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee71(params) {
+      var _ref72, stampWith, organizationId, userId, walletProviders, wallets;
+      return _regenerator().w(function (_context71) {
+        while (1) switch (_context71.n) {
           case 0:
             if (masterConfig !== null && masterConfig !== void 0 && masterConfig.autoRefreshManagedState) {
-              _context70.n = 1;
+              _context71.n = 1;
               break;
             }
-            return _context70.a(2, []);
+            return _context71.a(2, []);
           case 1:
-            _ref71 = params || {}, stampWith = _ref71.stampWith, organizationId = _ref71.organizationId, userId = _ref71.userId;
+            _ref72 = params || {}, stampWith = _ref72.stampWith, organizationId = _ref72.organizationId, userId = _ref72.userId;
             if (client) {
-              _context70.n = 2;
+              _context71.n = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context70.n = 3;
+            _context71.n = 3;
             return withTurnkeyErrorHandling(function () {
               return fetchWalletProviders();
             }, function () {
               return logout();
             }, callbacks, "Failed to refresh wallets");
           case 3:
-            walletProviders = _context70.v;
-            _context70.n = 4;
+            walletProviders = _context71.v;
+            _context71.n = 4;
             return withTurnkeyErrorHandling(function () {
               return fetchWallets(_objectSpread2(_objectSpread2({
                 stampWith: stampWith,
@@ -3465,62 +3503,62 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to refresh wallets");
           case 4:
-            wallets = _context70.v;
+            wallets = _context71.v;
             if (wallets) {
               setWallets(wallets);
             }
-            return _context70.a(2, wallets);
+            return _context71.a(2, wallets);
         }
-      }, _callee70);
+      }, _callee71);
     }));
-    return function (_x58) {
-      return _ref70.apply(this, arguments);
+    return function (_x59) {
+      return _ref71.apply(this, arguments);
     };
   }(), [client, callbacks, fetchWalletProviders, fetchWallets, masterConfig, session, user]);
   var handleDiscordOauth = useCallback(/*#__PURE__*/function () {
-    var _ref72 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee71(params) {
-      var _masterConfig$auth18, _masterConfig$auth18$, _masterConfig$auth$oa2, _masterConfig$auth19, _masterConfig$auth19$;
-      var _ref73, _ref73$clientId, clientId, _ref73$openInPage, openInPage, additionalParameters, _masterConfig$auth20, _masterConfig$auth20$, _masterConfig$auth21, flow, redirectURI, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, discordAuthUrl, extra, width, height, left, top, authWindow, _t1;
-      return _regenerator().w(function (_context71) {
-        while (1) switch (_context71.p = _context71.n) {
+    var _ref73 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee72(params) {
+      var _masterConfig$auth19, _masterConfig$auth19$, _masterConfig$auth$oa2, _masterConfig$auth20, _masterConfig$auth20$;
+      var _ref74, _ref74$clientId, clientId, _ref74$openInPage, openInPage, additionalParameters, _masterConfig$auth21, _masterConfig$auth21$, _masterConfig$auth22, flow, redirectURI, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, discordAuthUrl, extra, width, height, left, top, authWindow, _t1;
+      return _regenerator().w(function (_context72) {
+        while (1) switch (_context72.p = _context72.n) {
           case 0:
-            _ref73 = params || {}, _ref73$clientId = _ref73.clientId, clientId = _ref73$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth18 = masterConfig.auth) === null || _masterConfig$auth18 === void 0 ? void 0 : (_masterConfig$auth18$ = _masterConfig$auth18.oauthConfig) === null || _masterConfig$auth18$ === void 0 ? void 0 : _masterConfig$auth18$.discordClientId : _ref73$clientId, _ref73$openInPage = _ref73.openInPage, openInPage = _ref73$openInPage === void 0 ? (_masterConfig$auth$oa2 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth19 = masterConfig.auth) === null || _masterConfig$auth19 === void 0 ? void 0 : (_masterConfig$auth19$ = _masterConfig$auth19.oauthConfig) === null || _masterConfig$auth19$ === void 0 ? void 0 : _masterConfig$auth19$.openOauthInPage) !== null && _masterConfig$auth$oa2 !== void 0 ? _masterConfig$auth$oa2 : false : _ref73$openInPage, additionalParameters = _ref73.additionalState;
-            _context71.p = 1;
+            _ref74 = params || {}, _ref74$clientId = _ref74.clientId, clientId = _ref74$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth19 = masterConfig.auth) === null || _masterConfig$auth19 === void 0 ? void 0 : (_masterConfig$auth19$ = _masterConfig$auth19.oauthConfig) === null || _masterConfig$auth19$ === void 0 ? void 0 : _masterConfig$auth19$.discordClientId : _ref74$clientId, _ref74$openInPage = _ref74.openInPage, openInPage = _ref74$openInPage === void 0 ? (_masterConfig$auth$oa2 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth20 = masterConfig.auth) === null || _masterConfig$auth20 === void 0 ? void 0 : (_masterConfig$auth20$ = _masterConfig$auth20.oauthConfig) === null || _masterConfig$auth20$ === void 0 ? void 0 : _masterConfig$auth20$.openOauthInPage) !== null && _masterConfig$auth$oa2 !== void 0 ? _masterConfig$auth$oa2 : false : _ref74$openInPage, additionalParameters = _ref74.additionalState;
+            _context72.p = 1;
             if (masterConfig) {
-              _context71.n = 2;
+              _context72.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if (clientId) {
-              _context71.n = 3;
+              _context72.n = 3;
               break;
             }
             throw new TurnkeyError("Discord Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
-            if ((_masterConfig$auth20 = masterConfig.auth) !== null && _masterConfig$auth20 !== void 0 && (_masterConfig$auth20$ = _masterConfig$auth20.oauthConfig) !== null && _masterConfig$auth20$ !== void 0 && _masterConfig$auth20$.oauthRedirectUri) {
-              _context71.n = 4;
+            if ((_masterConfig$auth21 = masterConfig.auth) !== null && _masterConfig$auth21 !== void 0 && (_masterConfig$auth21$ = _masterConfig$auth21.oauthConfig) !== null && _masterConfig$auth21$ !== void 0 && _masterConfig$auth21$.oauthRedirectUri) {
+              _context72.n = 4;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             flow = openInPage ? "redirect" : "popup";
-            redirectURI = (_masterConfig$auth21 = masterConfig.auth) === null || _masterConfig$auth21 === void 0 ? void 0 : _masterConfig$auth21.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context71.n = 5;
+            redirectURI = (_masterConfig$auth22 = masterConfig.auth) === null || _masterConfig$auth22 === void 0 ? void 0 : _masterConfig$auth22.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
+            _context72.n = 5;
             return createApiKeyPair();
           case 5:
-            publicKey = _context71.v;
+            publicKey = _context72.v;
             if (publicKey) {
-              _context71.n = 6;
+              _context72.n = 6;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 6:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair
-            _context71.n = 7;
+            _context72.n = 7;
             return generateChallengePair();
           case 7:
-            _yield$generateChalle = _context71.v;
+            _yield$generateChalle = _context72.v;
             verifier = _yield$generateChalle.verifier;
             codeChallenge = _yield$generateChalle.codeChallenge;
             sessionStorage.setItem("discord_verifier", verifier);
@@ -3534,10 +3572,10 @@ var ClientProvider = function ClientProvider(_ref) {
             discordAuthUrl.searchParams.set("scope", "identify email");
             discordAuthUrl.searchParams.set("state", "provider=discord&flow=".concat(flow, "&publicKey=").concat(encodeURIComponent(publicKey), "&nonce=").concat(nonce));
             if (additionalParameters) {
-              extra = Object.entries(additionalParameters).map(function (_ref74) {
-                var _ref75 = _slicedToArray(_ref74, 2),
-                  k = _ref75[0],
-                  v = _ref75[1];
+              extra = Object.entries(additionalParameters).map(function (_ref75) {
+                var _ref76 = _slicedToArray(_ref75, 2),
+                  k = _ref76[0],
+                  v = _ref76[1];
                 return "".concat(encodeURIComponent(k), "=").concat(encodeURIComponent(v));
               }).join("&");
               if (extra) {
@@ -3545,11 +3583,11 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }
             if (!openInPage) {
-              _context71.n = 8;
+              _context72.n = 8;
               break;
             }
             window.location.href = discordAuthUrl.toString();
-            return _context71.a(2, new Promise(function (_, reject) {
+            return _context72.a(2, new Promise(function (_, reject) {
               var timeout = setTimeout(function () {
                 reject(new Error("Authentication timed out."));
               }, 300000);
@@ -3564,13 +3602,13 @@ var ClientProvider = function ClientProvider(_ref) {
             top = window.screenY + (window.innerHeight - height) / 2;
             authWindow = window.open("about:blank", "_blank", "width=".concat(width, ",height=").concat(height, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
             if (authWindow) {
-              _context71.n = 9;
+              _context72.n = 9;
               break;
             }
             throw new Error("Failed to open Discord login window.");
           case 9:
             authWindow.location.href = discordAuthUrl.toString();
-            return _context71.a(2, new Promise(function (resolve, reject) {
+            return _context72.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -3607,6 +3645,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         var oidcToken = resp.oidcToken;
                         if (params !== null && params !== void 0 && params.onOauthSuccess) {
                           params.onOauthSuccess(_objectSpread2({
+                            publicKey: publicKey,
                             oidcToken: oidcToken,
                             providerName: "discord"
                           }, sessionKey && {
@@ -3644,65 +3683,65 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 10:
-            _context71.n = 12;
+            _context72.n = 12;
             break;
           case 11:
-            _context71.p = 11;
-            _t1 = _context71.v;
+            _context72.p = 11;
+            _t1 = _context72.v;
             throw _t1;
           case 12:
-            return _context71.a(2);
+            return _context72.a(2);
         }
-      }, _callee71, null, [[1, 11]]);
+      }, _callee72, null, [[1, 11]]);
     }));
-    return function (_x59) {
-      return _ref72.apply(this, arguments);
+    return function (_x60) {
+      return _ref73.apply(this, arguments);
     };
   }(), [client, callbacks, completeOauth, createApiKeyPair, masterConfig, session, user]);
   var handleXOauth = useCallback(/*#__PURE__*/function () {
-    var _ref76 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee72(params) {
-      var _masterConfig$auth22, _masterConfig$auth22$, _masterConfig$auth$oa3, _masterConfig$auth23, _masterConfig$auth23$;
-      var _ref77, _ref77$clientId, clientId, _ref77$openInPage, openInPage, additionalParameters, _masterConfig$auth24, _masterConfig$auth24$, _masterConfig$auth25, flow, redirectURI, publicKey, nonce, _yield$generateChalle2, verifier, codeChallenge, twitterAuthUrl, extra, width, height, left, top, authWindow, _t10;
-      return _regenerator().w(function (_context72) {
-        while (1) switch (_context72.p = _context72.n) {
+    var _ref77 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee73(params) {
+      var _masterConfig$auth23, _masterConfig$auth23$, _masterConfig$auth$oa3, _masterConfig$auth24, _masterConfig$auth24$;
+      var _ref78, _ref78$clientId, clientId, _ref78$openInPage, openInPage, additionalParameters, _masterConfig$auth25, _masterConfig$auth25$, _masterConfig$auth26, flow, redirectURI, publicKey, nonce, _yield$generateChalle2, verifier, codeChallenge, twitterAuthUrl, extra, width, height, left, top, authWindow, _t10;
+      return _regenerator().w(function (_context73) {
+        while (1) switch (_context73.p = _context73.n) {
           case 0:
-            _ref77 = params || {}, _ref77$clientId = _ref77.clientId, clientId = _ref77$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth22 = masterConfig.auth) === null || _masterConfig$auth22 === void 0 ? void 0 : (_masterConfig$auth22$ = _masterConfig$auth22.oauthConfig) === null || _masterConfig$auth22$ === void 0 ? void 0 : _masterConfig$auth22$.xClientId : _ref77$clientId, _ref77$openInPage = _ref77.openInPage, openInPage = _ref77$openInPage === void 0 ? (_masterConfig$auth$oa3 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth23 = masterConfig.auth) === null || _masterConfig$auth23 === void 0 ? void 0 : (_masterConfig$auth23$ = _masterConfig$auth23.oauthConfig) === null || _masterConfig$auth23$ === void 0 ? void 0 : _masterConfig$auth23$.openOauthInPage) !== null && _masterConfig$auth$oa3 !== void 0 ? _masterConfig$auth$oa3 : false : _ref77$openInPage, additionalParameters = _ref77.additionalState;
-            _context72.p = 1;
+            _ref78 = params || {}, _ref78$clientId = _ref78.clientId, clientId = _ref78$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth23 = masterConfig.auth) === null || _masterConfig$auth23 === void 0 ? void 0 : (_masterConfig$auth23$ = _masterConfig$auth23.oauthConfig) === null || _masterConfig$auth23$ === void 0 ? void 0 : _masterConfig$auth23$.xClientId : _ref78$clientId, _ref78$openInPage = _ref78.openInPage, openInPage = _ref78$openInPage === void 0 ? (_masterConfig$auth$oa3 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth24 = masterConfig.auth) === null || _masterConfig$auth24 === void 0 ? void 0 : (_masterConfig$auth24$ = _masterConfig$auth24.oauthConfig) === null || _masterConfig$auth24$ === void 0 ? void 0 : _masterConfig$auth24$.openOauthInPage) !== null && _masterConfig$auth$oa3 !== void 0 ? _masterConfig$auth$oa3 : false : _ref78$openInPage, additionalParameters = _ref78.additionalState;
+            _context73.p = 1;
             if (masterConfig) {
-              _context72.n = 2;
+              _context73.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if (clientId) {
-              _context72.n = 3;
+              _context73.n = 3;
               break;
             }
             throw new TurnkeyError("Twitter Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
-            if ((_masterConfig$auth24 = masterConfig.auth) !== null && _masterConfig$auth24 !== void 0 && (_masterConfig$auth24$ = _masterConfig$auth24.oauthConfig) !== null && _masterConfig$auth24$ !== void 0 && _masterConfig$auth24$.oauthRedirectUri) {
-              _context72.n = 4;
+            if ((_masterConfig$auth25 = masterConfig.auth) !== null && _masterConfig$auth25 !== void 0 && (_masterConfig$auth25$ = _masterConfig$auth25.oauthConfig) !== null && _masterConfig$auth25$ !== void 0 && _masterConfig$auth25$.oauthRedirectUri) {
+              _context73.n = 4;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             flow = openInPage ? "redirect" : "popup";
-            redirectURI = (_masterConfig$auth25 = masterConfig.auth) === null || _masterConfig$auth25 === void 0 ? void 0 : _masterConfig$auth25.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context72.n = 5;
+            redirectURI = (_masterConfig$auth26 = masterConfig.auth) === null || _masterConfig$auth26 === void 0 ? void 0 : _masterConfig$auth26.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
+            _context73.n = 5;
             return createApiKeyPair();
           case 5:
-            publicKey = _context72.v;
+            publicKey = _context73.v;
             if (publicKey) {
-              _context72.n = 6;
+              _context73.n = 6;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 6:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair
-            _context72.n = 7;
+            _context73.n = 7;
             return generateChallengePair();
           case 7:
-            _yield$generateChalle2 = _context72.v;
+            _yield$generateChalle2 = _context73.v;
             verifier = _yield$generateChalle2.verifier;
             codeChallenge = _yield$generateChalle2.codeChallenge;
             sessionStorage.setItem("twitter_verifier", verifier);
@@ -3716,10 +3755,10 @@ var ClientProvider = function ClientProvider(_ref) {
             twitterAuthUrl.searchParams.set("scope", "tweet.read users.read");
             twitterAuthUrl.searchParams.set("state", "provider=twitter&flow=".concat(flow, "&publicKey=").concat(encodeURIComponent(publicKey), "&nonce=").concat(nonce));
             if (additionalParameters) {
-              extra = Object.entries(additionalParameters).map(function (_ref78) {
-                var _ref79 = _slicedToArray(_ref78, 2),
-                  k = _ref79[0],
-                  v = _ref79[1];
+              extra = Object.entries(additionalParameters).map(function (_ref79) {
+                var _ref80 = _slicedToArray(_ref79, 2),
+                  k = _ref80[0],
+                  v = _ref80[1];
                 return "".concat(encodeURIComponent(k), "=").concat(encodeURIComponent(v));
               }).join("&");
               if (extra) {
@@ -3727,11 +3766,11 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }
             if (!openInPage) {
-              _context72.n = 8;
+              _context73.n = 8;
               break;
             }
             window.location.href = twitterAuthUrl.toString();
-            return _context72.a(2, new Promise(function (_, reject) {
+            return _context73.a(2, new Promise(function (_, reject) {
               var timeout = setTimeout(function () {
                 reject(new Error("Authentication timed out."));
               }, 300000);
@@ -3746,13 +3785,13 @@ var ClientProvider = function ClientProvider(_ref) {
             top = window.screenY + (window.innerHeight - height) / 2;
             authWindow = window.open("about:blank", "_blank", "width=".concat(width, ",height=").concat(height, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
             if (authWindow) {
-              _context72.n = 9;
+              _context73.n = 9;
               break;
             }
             throw new Error("Failed to open Twitter login window.");
           case 9:
             authWindow.location.href = twitterAuthUrl.toString();
-            return _context72.a(2, new Promise(function (resolve, reject) {
+            return _context73.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -3789,6 +3828,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         var oidcToken = resp.oidcToken;
                         if (params !== null && params !== void 0 && params.onOauthSuccess) {
                           params.onOauthSuccess(_objectSpread2({
+                            publicKey: publicKey,
                             oidcToken: oidcToken,
                             providerName: "twitter"
                           }, sessionKey && {
@@ -3826,56 +3866,56 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 10:
-            _context72.n = 12;
+            _context73.n = 12;
             break;
           case 11:
-            _context72.p = 11;
-            _t10 = _context72.v;
+            _context73.p = 11;
+            _t10 = _context73.v;
             throw _t10;
           case 12:
-            return _context72.a(2);
+            return _context73.a(2);
         }
-      }, _callee72, null, [[1, 11]]);
+      }, _callee73, null, [[1, 11]]);
     }));
-    return function (_x60) {
-      return _ref76.apply(this, arguments);
+    return function (_x61) {
+      return _ref77.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, session, user]);
   var handleGoogleOauth = useCallback(/*#__PURE__*/function () {
-    var _ref80 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee73(params) {
-      var _masterConfig$auth26, _masterConfig$auth26$, _masterConfig$auth$oa4, _masterConfig$auth27, _masterConfig$auth27$;
-      var _ref81, _ref81$clientId, clientId, _ref81$openInPage, openInPage, additionalParameters, _masterConfig$auth28, _masterConfig$auth28$, _masterConfig$auth29, flow, redirectURI, publicKey, nonce, googleAuthUrl, state, additionalState, width, height, left, top, authWindow, _t11;
-      return _regenerator().w(function (_context73) {
-        while (1) switch (_context73.p = _context73.n) {
+    var _ref81 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee74(params) {
+      var _masterConfig$auth27, _masterConfig$auth27$, _masterConfig$auth$oa4, _masterConfig$auth28, _masterConfig$auth28$;
+      var _ref82, _ref82$clientId, clientId, _ref82$openInPage, openInPage, additionalParameters, _masterConfig$auth29, _masterConfig$auth29$, _masterConfig$auth30, flow, redirectURI, publicKey, nonce, googleAuthUrl, state, additionalState, width, height, left, top, authWindow, _t11;
+      return _regenerator().w(function (_context74) {
+        while (1) switch (_context74.p = _context74.n) {
           case 0:
-            _ref81 = params || {}, _ref81$clientId = _ref81.clientId, clientId = _ref81$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth26 = masterConfig.auth) === null || _masterConfig$auth26 === void 0 ? void 0 : (_masterConfig$auth26$ = _masterConfig$auth26.oauthConfig) === null || _masterConfig$auth26$ === void 0 ? void 0 : _masterConfig$auth26$.googleClientId : _ref81$clientId, _ref81$openInPage = _ref81.openInPage, openInPage = _ref81$openInPage === void 0 ? (_masterConfig$auth$oa4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth27 = masterConfig.auth) === null || _masterConfig$auth27 === void 0 ? void 0 : (_masterConfig$auth27$ = _masterConfig$auth27.oauthConfig) === null || _masterConfig$auth27$ === void 0 ? void 0 : _masterConfig$auth27$.openOauthInPage) !== null && _masterConfig$auth$oa4 !== void 0 ? _masterConfig$auth$oa4 : false : _ref81$openInPage, additionalParameters = _ref81.additionalState;
-            _context73.p = 1;
+            _ref82 = params || {}, _ref82$clientId = _ref82.clientId, clientId = _ref82$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth27 = masterConfig.auth) === null || _masterConfig$auth27 === void 0 ? void 0 : (_masterConfig$auth27$ = _masterConfig$auth27.oauthConfig) === null || _masterConfig$auth27$ === void 0 ? void 0 : _masterConfig$auth27$.googleClientId : _ref82$clientId, _ref82$openInPage = _ref82.openInPage, openInPage = _ref82$openInPage === void 0 ? (_masterConfig$auth$oa4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth28 = masterConfig.auth) === null || _masterConfig$auth28 === void 0 ? void 0 : (_masterConfig$auth28$ = _masterConfig$auth28.oauthConfig) === null || _masterConfig$auth28$ === void 0 ? void 0 : _masterConfig$auth28$.openOauthInPage) !== null && _masterConfig$auth$oa4 !== void 0 ? _masterConfig$auth$oa4 : false : _ref82$openInPage, additionalParameters = _ref82.additionalState;
+            _context74.p = 1;
             if (masterConfig) {
-              _context73.n = 2;
+              _context74.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if (clientId) {
-              _context73.n = 3;
+              _context74.n = 3;
               break;
             }
             throw new TurnkeyError("Google Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
-            if ((_masterConfig$auth28 = masterConfig.auth) !== null && _masterConfig$auth28 !== void 0 && (_masterConfig$auth28$ = _masterConfig$auth28.oauthConfig) !== null && _masterConfig$auth28$ !== void 0 && _masterConfig$auth28$.oauthRedirectUri) {
-              _context73.n = 4;
+            if ((_masterConfig$auth29 = masterConfig.auth) !== null && _masterConfig$auth29 !== void 0 && (_masterConfig$auth29$ = _masterConfig$auth29.oauthConfig) !== null && _masterConfig$auth29$ !== void 0 && _masterConfig$auth29$.oauthRedirectUri) {
+              _context74.n = 4;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             flow = openInPage ? "redirect" : "popup";
-            redirectURI = (_masterConfig$auth29 = masterConfig.auth) === null || _masterConfig$auth29 === void 0 ? void 0 : _masterConfig$auth29.oauthConfig.oauthRedirectUri.replace(/\/$/, ""); // Create key pair and generate nonce
-            _context73.n = 5;
+            redirectURI = (_masterConfig$auth30 = masterConfig.auth) === null || _masterConfig$auth30 === void 0 ? void 0 : _masterConfig$auth30.oauthConfig.oauthRedirectUri.replace(/\/$/, ""); // Create key pair and generate nonce
+            _context74.n = 5;
             return createApiKeyPair();
           case 5:
-            publicKey = _context73.v;
+            publicKey = _context74.v;
             if (publicKey) {
-              _context73.n = 6;
+              _context74.n = 6;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -3891,10 +3931,10 @@ var ClientProvider = function ClientProvider(_ref) {
             // Create state parameter
             state = "provider=google&flow=".concat(flow, "&publicKey=").concat(encodeURIComponent(publicKey));
             if (additionalParameters) {
-              additionalState = Object.entries(additionalParameters).map(function (_ref82) {
-                var _ref83 = _slicedToArray(_ref82, 2),
-                  key = _ref83[0],
-                  value = _ref83[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref83) {
+                var _ref84 = _slicedToArray(_ref83, 2),
+                  key = _ref84[0],
+                  value = _ref84[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -3903,12 +3943,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             googleAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context73.n = 7;
+              _context74.n = 7;
               break;
             }
             // Redirect current page to Google Auth
             window.location.href = googleAuthUrl.toString();
-            return _context73.a(2, new Promise(function (_, reject) {
+            return _context74.a(2, new Promise(function (_, reject) {
               // By here, the page should have already redirected. We wait here since the function is async.
               // We want any function that runs this to simply wait until the page redirects.
               // A 5 min timeout is set just in case, idk
@@ -3928,7 +3968,7 @@ var ClientProvider = function ClientProvider(_ref) {
             top = window.screenY + (window.innerHeight - height) / 2;
             authWindow = window.open("about:blank", "_blank", "width=".concat(width, ",height=").concat(height, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
             if (authWindow) {
-              _context73.n = 8;
+              _context74.n = 8;
               break;
             }
             throw new Error("Failed to open Google login window.");
@@ -3936,7 +3976,7 @@ var ClientProvider = function ClientProvider(_ref) {
             authWindow.location.href = googleAuthUrl.toString();
             // Return a promise that resolves when the OAuth flow completes
             // This following code will only run for the popup flow
-            return _context73.a(2, new Promise(function (resolve, reject) {
+            return _context74.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -3959,6 +3999,7 @@ var ClientProvider = function ClientProvider(_ref) {
                       clearInterval(interval);
                       if (params !== null && params !== void 0 && params.onOauthSuccess) {
                         params.onOauthSuccess(_objectSpread2({
+                          publicKey: publicKey,
                           oidcToken: idToken,
                           providerName: "google"
                         }, sessionKey && {
@@ -3995,57 +4036,57 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 9:
-            _context73.n = 11;
+            _context74.n = 11;
             break;
           case 10:
-            _context73.p = 10;
-            _t11 = _context73.v;
+            _context74.p = 10;
+            _t11 = _context74.v;
             throw _t11;
           case 11:
-            return _context73.a(2);
+            return _context74.a(2);
         }
-      }, _callee73, null, [[1, 10]]);
+      }, _callee74, null, [[1, 10]]);
     }));
-    return function (_x61) {
-      return _ref80.apply(this, arguments);
+    return function (_x62) {
+      return _ref81.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, session, user]);
   var handleAppleOauth = useCallback(/*#__PURE__*/function () {
-    var _ref84 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee74(params) {
-      var _masterConfig$auth30, _masterConfig$auth30$, _masterConfig$auth$oa5, _masterConfig$auth31, _masterConfig$auth31$;
-      var _ref85, _ref85$clientId, clientId, _ref85$openInPage, openInPage, additionalParameters, _masterConfig$auth32, _masterConfig$auth32$, _masterConfig$auth33, flow, redirectURI, publicKey, nonce, appleAuthUrl, state, additionalState, width, height, left, top, authWindow, _t12;
-      return _regenerator().w(function (_context74) {
-        while (1) switch (_context74.p = _context74.n) {
+    var _ref85 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee75(params) {
+      var _masterConfig$auth31, _masterConfig$auth31$, _masterConfig$auth$oa5, _masterConfig$auth32, _masterConfig$auth32$;
+      var _ref86, _ref86$clientId, clientId, _ref86$openInPage, openInPage, additionalParameters, _masterConfig$auth33, _masterConfig$auth33$, _masterConfig$auth34, flow, redirectURI, publicKey, nonce, appleAuthUrl, state, additionalState, width, height, left, top, authWindow, _t12;
+      return _regenerator().w(function (_context75) {
+        while (1) switch (_context75.p = _context75.n) {
           case 0:
-            _ref85 = params || {}, _ref85$clientId = _ref85.clientId, clientId = _ref85$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth30 = masterConfig.auth) === null || _masterConfig$auth30 === void 0 ? void 0 : (_masterConfig$auth30$ = _masterConfig$auth30.oauthConfig) === null || _masterConfig$auth30$ === void 0 ? void 0 : _masterConfig$auth30$.appleClientId : _ref85$clientId, _ref85$openInPage = _ref85.openInPage, openInPage = _ref85$openInPage === void 0 ? (_masterConfig$auth$oa5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth31 = masterConfig.auth) === null || _masterConfig$auth31 === void 0 ? void 0 : (_masterConfig$auth31$ = _masterConfig$auth31.oauthConfig) === null || _masterConfig$auth31$ === void 0 ? void 0 : _masterConfig$auth31$.openOauthInPage) !== null && _masterConfig$auth$oa5 !== void 0 ? _masterConfig$auth$oa5 : false : _ref85$openInPage, additionalParameters = _ref85.additionalState;
-            _context74.p = 1;
+            _ref86 = params || {}, _ref86$clientId = _ref86.clientId, clientId = _ref86$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth31 = masterConfig.auth) === null || _masterConfig$auth31 === void 0 ? void 0 : (_masterConfig$auth31$ = _masterConfig$auth31.oauthConfig) === null || _masterConfig$auth31$ === void 0 ? void 0 : _masterConfig$auth31$.appleClientId : _ref86$clientId, _ref86$openInPage = _ref86.openInPage, openInPage = _ref86$openInPage === void 0 ? (_masterConfig$auth$oa5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth32 = masterConfig.auth) === null || _masterConfig$auth32 === void 0 ? void 0 : (_masterConfig$auth32$ = _masterConfig$auth32.oauthConfig) === null || _masterConfig$auth32$ === void 0 ? void 0 : _masterConfig$auth32$.openOauthInPage) !== null && _masterConfig$auth$oa5 !== void 0 ? _masterConfig$auth$oa5 : false : _ref86$openInPage, additionalParameters = _ref86.additionalState;
+            _context75.p = 1;
             if (masterConfig) {
-              _context74.n = 2;
+              _context75.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if (clientId) {
-              _context74.n = 3;
+              _context75.n = 3;
               break;
             }
             throw new TurnkeyError("Apple Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
-            if ((_masterConfig$auth32 = masterConfig.auth) !== null && _masterConfig$auth32 !== void 0 && (_masterConfig$auth32$ = _masterConfig$auth32.oauthConfig) !== null && _masterConfig$auth32$ !== void 0 && _masterConfig$auth32$.oauthRedirectUri) {
-              _context74.n = 4;
+            if ((_masterConfig$auth33 = masterConfig.auth) !== null && _masterConfig$auth33 !== void 0 && (_masterConfig$auth33$ = _masterConfig$auth33.oauthConfig) !== null && _masterConfig$auth33$ !== void 0 && _masterConfig$auth33$.oauthRedirectUri) {
+              _context75.n = 4;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             flow = openInPage ? "redirect" : "popup";
-            redirectURI = (_masterConfig$auth33 = masterConfig.auth) === null || _masterConfig$auth33 === void 0 ? void 0 : _masterConfig$auth33.oauthConfig.oauthRedirectUri; // TODO (Amir): Apple needs the '/' at the end. Maybe we should add it if not there?
+            redirectURI = (_masterConfig$auth34 = masterConfig.auth) === null || _masterConfig$auth34 === void 0 ? void 0 : _masterConfig$auth34.oauthConfig.oauthRedirectUri; // TODO (Amir): Apple needs the '/' at the end. Maybe we should add it if not there?
             // Create key pair and generate nonce
-            _context74.n = 5;
+            _context75.n = 5;
             return createApiKeyPair();
           case 5:
-            publicKey = _context74.v;
+            publicKey = _context75.v;
             if (publicKey) {
-              _context74.n = 6;
+              _context75.n = 6;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -4060,10 +4101,10 @@ var ClientProvider = function ClientProvider(_ref) {
             // Create state parameter
             state = "provider=apple&flow=".concat(flow, "&publicKey=").concat(encodeURIComponent(publicKey));
             if (additionalParameters) {
-              additionalState = Object.entries(additionalParameters).map(function (_ref86) {
-                var _ref87 = _slicedToArray(_ref86, 2),
-                  key = _ref87[0],
-                  value = _ref87[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref87) {
+                var _ref88 = _slicedToArray(_ref87, 2),
+                  key = _ref88[0],
+                  value = _ref88[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -4072,12 +4113,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             appleAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context74.n = 7;
+              _context75.n = 7;
               break;
             }
             // Redirect current page to Apple Auth
             window.location.href = appleAuthUrl.toString();
-            return _context74.a(2, new Promise(function (_, reject) {
+            return _context75.a(2, new Promise(function (_, reject) {
               // Set a timeout just in case the redirect doesn't happen
               var timeout = setTimeout(function () {
                 reject(new Error("Authentication timed out."));
@@ -4095,14 +4136,14 @@ var ClientProvider = function ClientProvider(_ref) {
             top = window.screenY + (window.innerHeight - height) / 2;
             authWindow = window.open("about:blank", "_blank", "width=".concat(width, ",height=").concat(height, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
             if (authWindow) {
-              _context74.n = 8;
+              _context75.n = 8;
               break;
             }
             throw new Error("Failed to open Apple login window.");
           case 8:
             authWindow.location.href = appleAuthUrl.toString();
             // Return a promise that resolves when the OAuth flow completes
-            return _context74.a(2, new Promise(function (resolve, reject) {
+            return _context75.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -4125,6 +4166,7 @@ var ClientProvider = function ClientProvider(_ref) {
                       clearInterval(interval);
                       if (params !== null && params !== void 0 && params.onOauthSuccess) {
                         params.onOauthSuccess(_objectSpread2({
+                          publicKey: publicKey,
                           oidcToken: idToken,
                           providerName: "apple"
                         }, sessionKey && {
@@ -4161,65 +4203,65 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 9:
-            _context74.n = 11;
+            _context75.n = 11;
             break;
           case 10:
-            _context74.p = 10;
-            _t12 = _context74.v;
+            _context75.p = 10;
+            _t12 = _context75.v;
             throw _t12;
           case 11:
-            return _context74.a(2);
+            return _context75.a(2);
         }
-      }, _callee74, null, [[1, 10]]);
+      }, _callee75, null, [[1, 10]]);
     }));
-    return function (_x62) {
-      return _ref84.apply(this, arguments);
+    return function (_x63) {
+      return _ref85.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, session, user]);
   var handleFacebookOauth = useCallback(/*#__PURE__*/function () {
-    var _ref88 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee75(params) {
-      var _masterConfig$auth34, _masterConfig$auth34$, _masterConfig$auth$oa6, _masterConfig$auth35, _masterConfig$auth35$;
-      var _ref89, _ref89$clientId, clientId, _ref89$openInPage, openInPage, additionalParameters, _masterConfig$auth36, _masterConfig$auth36$, _masterConfig$auth37, flow, redirectURI, publicKey, nonce, _yield$generateChalle3, verifier, codeChallenge, facebookAuthUrl, state, additionalState, width, height, left, top, authWindow, _t13;
-      return _regenerator().w(function (_context75) {
-        while (1) switch (_context75.p = _context75.n) {
+    var _ref89 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee76(params) {
+      var _masterConfig$auth35, _masterConfig$auth35$, _masterConfig$auth$oa6, _masterConfig$auth36, _masterConfig$auth36$;
+      var _ref90, _ref90$clientId, clientId, _ref90$openInPage, openInPage, additionalParameters, _masterConfig$auth37, _masterConfig$auth37$, _masterConfig$auth38, flow, redirectURI, publicKey, nonce, _yield$generateChalle3, verifier, codeChallenge, facebookAuthUrl, state, additionalState, width, height, left, top, authWindow, _t13;
+      return _regenerator().w(function (_context76) {
+        while (1) switch (_context76.p = _context76.n) {
           case 0:
-            _ref89 = params || {}, _ref89$clientId = _ref89.clientId, clientId = _ref89$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth34 = masterConfig.auth) === null || _masterConfig$auth34 === void 0 ? void 0 : (_masterConfig$auth34$ = _masterConfig$auth34.oauthConfig) === null || _masterConfig$auth34$ === void 0 ? void 0 : _masterConfig$auth34$.facebookClientId : _ref89$clientId, _ref89$openInPage = _ref89.openInPage, openInPage = _ref89$openInPage === void 0 ? (_masterConfig$auth$oa6 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth35 = masterConfig.auth) === null || _masterConfig$auth35 === void 0 ? void 0 : (_masterConfig$auth35$ = _masterConfig$auth35.oauthConfig) === null || _masterConfig$auth35$ === void 0 ? void 0 : _masterConfig$auth35$.openOauthInPage) !== null && _masterConfig$auth$oa6 !== void 0 ? _masterConfig$auth$oa6 : false : _ref89$openInPage, additionalParameters = _ref89.additionalState;
-            _context75.p = 1;
+            _ref90 = params || {}, _ref90$clientId = _ref90.clientId, clientId = _ref90$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth35 = masterConfig.auth) === null || _masterConfig$auth35 === void 0 ? void 0 : (_masterConfig$auth35$ = _masterConfig$auth35.oauthConfig) === null || _masterConfig$auth35$ === void 0 ? void 0 : _masterConfig$auth35$.facebookClientId : _ref90$clientId, _ref90$openInPage = _ref90.openInPage, openInPage = _ref90$openInPage === void 0 ? (_masterConfig$auth$oa6 = 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$.openOauthInPage) !== null && _masterConfig$auth$oa6 !== void 0 ? _masterConfig$auth$oa6 : false : _ref90$openInPage, additionalParameters = _ref90.additionalState;
+            _context76.p = 1;
             if (masterConfig) {
-              _context75.n = 2;
+              _context76.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if (clientId) {
-              _context75.n = 3;
+              _context76.n = 3;
               break;
             }
             throw new TurnkeyError("Facebook Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
-            if ((_masterConfig$auth36 = masterConfig.auth) !== null && _masterConfig$auth36 !== void 0 && (_masterConfig$auth36$ = _masterConfig$auth36.oauthConfig) !== null && _masterConfig$auth36$ !== void 0 && _masterConfig$auth36$.oauthRedirectUri) {
-              _context75.n = 4;
+            if ((_masterConfig$auth37 = masterConfig.auth) !== null && _masterConfig$auth37 !== void 0 && (_masterConfig$auth37$ = _masterConfig$auth37.oauthConfig) !== null && _masterConfig$auth37$ !== void 0 && _masterConfig$auth37$.oauthRedirectUri) {
+              _context76.n = 4;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             flow = openInPage ? "redirect" : "popup";
-            redirectURI = (_masterConfig$auth37 = masterConfig.auth) === null || _masterConfig$auth37 === void 0 ? void 0 : _masterConfig$auth37.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context75.n = 5;
+            redirectURI = (_masterConfig$auth38 = masterConfig.auth) === null || _masterConfig$auth38 === void 0 ? void 0 : _masterConfig$auth38.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
+            _context76.n = 5;
             return createApiKeyPair();
           case 5:
-            publicKey = _context75.v;
+            publicKey = _context76.v;
             if (publicKey) {
-              _context75.n = 6;
+              _context76.n = 6;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 6:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair
-            _context75.n = 7;
+            _context76.n = 7;
             return generateChallengePair();
           case 7:
-            _yield$generateChalle3 = _context75.v;
+            _yield$generateChalle3 = _context76.v;
             verifier = _yield$generateChalle3.verifier;
             codeChallenge = _yield$generateChalle3.codeChallenge;
             // Store verifier for later token exchange
@@ -4236,10 +4278,10 @@ var ClientProvider = function ClientProvider(_ref) {
             // Create state parameter
             state = "provider=facebook&flow=".concat(flow, "&publicKey=").concat(encodeURIComponent(publicKey));
             if (additionalParameters) {
-              additionalState = Object.entries(additionalParameters).map(function (_ref90) {
-                var _ref91 = _slicedToArray(_ref90, 2),
-                  key = _ref91[0],
-                  value = _ref91[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref91) {
+                var _ref92 = _slicedToArray(_ref91, 2),
+                  key = _ref92[0],
+                  value = _ref92[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -4248,12 +4290,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             facebookAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context75.n = 8;
+              _context76.n = 8;
               break;
             }
             // Redirect current page to Facebook Auth
             window.location.href = facebookAuthUrl.toString();
-            return _context75.a(2, new Promise(function (_, reject) {
+            return _context76.a(2, new Promise(function (_, reject) {
               // Set a timeout just in case the redirect doesn't happen
               var timeout = setTimeout(function () {
                 reject(new Error("Authentication timed out."));
@@ -4271,14 +4313,14 @@ var ClientProvider = function ClientProvider(_ref) {
             top = window.screenY + (window.innerHeight - height) / 2;
             authWindow = window.open("about:blank", "_blank", "width=".concat(width, ",height=").concat(height, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
             if (authWindow) {
-              _context75.n = 9;
+              _context76.n = 9;
               break;
             }
             throw new Error("Failed to open Facebook login window.");
           case 9:
             authWindow.location.href = facebookAuthUrl.toString();
             // Return a promise that resolves when the OAuth flow completes
-            return _context75.a(2, new Promise(function (resolve, reject) {
+            return _context76.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -4309,6 +4351,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         sessionStorage.removeItem("facebook_verifier");
                         if (params !== null && params !== void 0 && params.onOauthSuccess) {
                           params.onOauthSuccess(_objectSpread2({
+                            publicKey: publicKey,
                             oidcToken: tokenData.id_token,
                             providerName: "facebook"
                           }, sessionKey && {
@@ -4346,27 +4389,27 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 10:
-            _context75.n = 12;
+            _context76.n = 12;
             break;
           case 11:
-            _context75.p = 11;
-            _t13 = _context75.v;
+            _context76.p = 11;
+            _t13 = _context76.v;
             throw _t13;
           case 12:
-            return _context75.a(2);
+            return _context76.a(2);
         }
-      }, _callee75, null, [[1, 11]]);
+      }, _callee76, null, [[1, 11]]);
     }));
-    return function (_x63) {
-      return _ref88.apply(this, arguments);
+    return function (_x64) {
+      return _ref89.apply(this, arguments);
     };
   }(), [client, callbacks, masterConfig, client, session, user]);
   var handleLogin = useCallback(/*#__PURE__*/function () {
-    var _ref92 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee76(params) {
+    var _ref93 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee77(params) {
       var _masterConfig$ui, _params$logoDark, _masterConfig$ui2, _params$logoLight, _masterConfig$ui3, _params$title;
       var logo;
-      return _regenerator().w(function (_context76) {
-        while (1) switch (_context76.n) {
+      return _regenerator().w(function (_context77) {
+        while (1) switch (_context77.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({
@@ -4380,22 +4423,22 @@ var ClientProvider = function ClientProvider(_ref) {
               showTitle: logo ? false : true
             });
           case 1:
-            return _context76.a(2);
+            return _context77.a(2);
         }
-      }, _callee76);
+      }, _callee77);
     }));
-    return function (_x64) {
-      return _ref92.apply(this, arguments);
+    return function (_x65) {
+      return _ref93.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleExportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref93 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee77(params) {
+    var _ref94 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee78(params) {
       var walletId, targetPublicKey, stampWith, organizationId;
-      return _regenerator().w(function (_context77) {
-        while (1) switch (_context77.n) {
+      return _regenerator().w(function (_context78) {
+        while (1) switch (_context78.n) {
           case 0:
             walletId = params.walletId, targetPublicKey = params.targetPublicKey, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context77.a(2, new Promise(function (resolve, reject) {
+            return _context78.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export wallet",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4421,20 +4464,20 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee77);
+      }, _callee78);
     }));
-    return function (_x65) {
-      return _ref93.apply(this, arguments);
+    return function (_x66) {
+      return _ref94.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleExportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref94 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee78(params) {
+    var _ref95 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee79(params) {
       var privateKeyId, targetPublicKey, keyFormat, stampWith, organizationId;
-      return _regenerator().w(function (_context78) {
-        while (1) switch (_context78.n) {
+      return _regenerator().w(function (_context79) {
+        while (1) switch (_context79.n) {
           case 0:
             privateKeyId = params.privateKeyId, targetPublicKey = params.targetPublicKey, keyFormat = params.keyFormat, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context78.a(2, new Promise(function (resolve, reject) {
+            return _context79.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export private key",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4462,20 +4505,20 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee78);
+      }, _callee79);
     }));
-    return function (_x66) {
-      return _ref94.apply(this, arguments);
+    return function (_x67) {
+      return _ref95.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleExportWalletAccount = useCallback(/*#__PURE__*/function () {
-    var _ref95 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee79(params) {
+    var _ref96 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee80(params) {
       var address, targetPublicKey, keyFormat, stampWith, organizationId;
-      return _regenerator().w(function (_context79) {
-        while (1) switch (_context79.n) {
+      return _regenerator().w(function (_context80) {
+        while (1) switch (_context80.n) {
           case 0:
             address = params.address, targetPublicKey = params.targetPublicKey, keyFormat = params.keyFormat, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context79.a(2, new Promise(function (resolve, reject) {
+            return _context80.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export wallet account",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4503,21 +4546,21 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee79);
+      }, _callee80);
     }));
-    return function (_x67) {
-      return _ref95.apply(this, arguments);
+    return function (_x68) {
+      return _ref96.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleImportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref96 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee80(params) {
-      var _ref97, defaultWalletAccounts, _ref97$successPageDur, successPageDuration, stampWith, walletName, organizationId, userId, _t14;
-      return _regenerator().w(function (_context80) {
-        while (1) switch (_context80.p = _context80.n) {
+    var _ref97 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee81(params) {
+      var _ref98, defaultWalletAccounts, _ref98$successPageDur, successPageDuration, stampWith, walletName, organizationId, userId, _t14;
+      return _regenerator().w(function (_context81) {
+        while (1) switch (_context81.p = _context81.n) {
           case 0:
-            _ref97 = params || {}, defaultWalletAccounts = _ref97.defaultWalletAccounts, _ref97$successPageDur = _ref97.successPageDuration, successPageDuration = _ref97$successPageDur === void 0 ? 2000 : _ref97$successPageDur, stampWith = _ref97.stampWith, walletName = _ref97.walletName, organizationId = _ref97.organizationId, userId = _ref97.userId;
-            _context80.p = 1;
-            return _context80.a(2, withTurnkeyErrorHandling(function () {
+            _ref98 = params || {}, defaultWalletAccounts = _ref98.defaultWalletAccounts, _ref98$successPageDur = _ref98.successPageDuration, successPageDuration = _ref98$successPageDur === void 0 ? 2000 : _ref98$successPageDur, stampWith = _ref98.stampWith, walletName = _ref98.walletName, organizationId = _ref98.organizationId, userId = _ref98.userId;
+            _context81.p = 1;
+            return _context81.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import wallet",
@@ -4548,33 +4591,33 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 2:
-            _context80.p = 2;
-            _t14 = _context80.v;
+            _context81.p = 2;
+            _t14 = _context81.v;
             if (!(_t14 instanceof TurnkeyError)) {
-              _context80.n = 3;
+              _context81.n = 3;
               break;
             }
             throw _t14;
           case 3:
             throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t14);
           case 4:
-            return _context80.a(2);
+            return _context81.a(2);
         }
-      }, _callee80, null, [[1, 2]]);
+      }, _callee81, null, [[1, 2]]);
     }));
-    return function (_x68) {
-      return _ref96.apply(this, arguments);
+    return function (_x69) {
+      return _ref97.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleImportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref98 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee81(params) {
-      var _ref99, curve, addressFormats, _ref99$successPageDur, successPageDuration, stampWith, keyName, organizationId, _t15;
-      return _regenerator().w(function (_context81) {
-        while (1) switch (_context81.p = _context81.n) {
+    var _ref99 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee82(params) {
+      var _ref100, curve, addressFormats, _ref100$successPageDu, successPageDuration, stampWith, keyName, organizationId, _t15;
+      return _regenerator().w(function (_context82) {
+        while (1) switch (_context82.p = _context82.n) {
           case 0:
-            _ref99 = params || {}, curve = _ref99.curve, addressFormats = _ref99.addressFormats, _ref99$successPageDur = _ref99.successPageDuration, successPageDuration = _ref99$successPageDur === void 0 ? 2000 : _ref99$successPageDur, stampWith = _ref99.stampWith, keyName = _ref99.keyName, organizationId = _ref99.organizationId;
-            _context81.p = 1;
-            return _context81.a(2, withTurnkeyErrorHandling(function () {
+            _ref100 = params || {}, curve = _ref100.curve, addressFormats = _ref100.addressFormats, _ref100$successPageDu = _ref100.successPageDuration, successPageDuration = _ref100$successPageDu === void 0 ? 2000 : _ref100$successPageDu, stampWith = _ref100.stampWith, keyName = _ref100.keyName, organizationId = _ref100.organizationId;
+            _context82.p = 1;
+            return _context82.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import private key",
@@ -4603,51 +4646,51 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 2:
-            _context81.p = 2;
-            _t15 = _context81.v;
+            _context82.p = 2;
+            _t15 = _context82.v;
             if (!(_t15 instanceof TurnkeyError)) {
-              _context81.n = 3;
+              _context82.n = 3;
               break;
             }
             throw _t15;
           case 3:
             throw new TurnkeyError("Failed to import private key.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t15);
           case 4:
-            return _context81.a(2);
+            return _context82.a(2);
         }
-      }, _callee81, null, [[1, 2]]);
+      }, _callee82, null, [[1, 2]]);
     }));
-    return function (_x69) {
-      return _ref98.apply(this, arguments);
+    return function (_x70) {
+      return _ref99.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleUpdateUserName = useCallback(/*#__PURE__*/function () {
-    var _ref100 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee82(params) {
-      var _ref101, _ref101$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, res, _t16;
-      return _regenerator().w(function (_context82) {
-        while (1) switch (_context82.p = _context82.n) {
+    var _ref101 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee83(params) {
+      var _ref102, _ref102$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, res, _t16;
+      return _regenerator().w(function (_context83) {
+        while (1) switch (_context83.p = _context83.n) {
           case 0:
-            _ref101 = params || {}, _ref101$successPageDu = _ref101.successPageDuration, successPageDuration = _ref101$successPageDu === void 0 ? 2000 : _ref101$successPageDu, subTitle = _ref101.subTitle, title = _ref101.title, stampWith = _ref101.stampWith;
+            _ref102 = params || {}, _ref102$successPageDu = _ref102.successPageDuration, successPageDuration = _ref102$successPageDu === void 0 ? 2000 : _ref102$successPageDu, subTitle = _ref102.subTitle, title = _ref102.title, stampWith = _ref102.stampWith;
             if (client) {
-              _context82.n = 1;
+              _context83.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context82.n = 2;
+            _context83.n = 2;
             return getSession();
           case 2:
-            s = _context82.v;
+            s = _context83.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context82.n = 3;
+              _context83.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) {
-              _context82.n = 4;
+              _context83.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to update a user name.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -4667,12 +4710,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context82.p = 5;
+            _context83.p = 5;
             if (!(!(params !== null && params !== void 0 && params.userName) && (params === null || params === void 0 ? void 0 : params.userName) !== "")) {
-              _context82.n = 6;
+              _context83.n = 6;
               break;
             }
-            return _context82.a(2, withTurnkeyErrorHandling(function () {
+            return _context83.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update User Name",
@@ -4700,7 +4743,7 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context82.n = 7;
+            _context83.n = 7;
             return updateUserName(_objectSpread2({
               userName: params.userName,
               userId: user.userId,
@@ -4709,71 +4752,71 @@ var ClientProvider = function ClientProvider(_ref) {
               organizationId: organizationId
             }));
           case 7:
-            res = _context82.v;
+            res = _context83.v;
             onSuccess();
-            return _context82.a(2, res);
+            return _context83.a(2, res);
           case 8:
-            _context82.n = 11;
+            _context83.n = 11;
             break;
           case 9:
-            _context82.p = 9;
-            _t16 = _context82.v;
+            _context83.p = 9;
+            _t16 = _context83.v;
             if (!(_t16 instanceof TurnkeyError)) {
-              _context82.n = 10;
+              _context83.n = 10;
               break;
             }
             throw _t16;
           case 10:
             throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _t16);
           case 11:
-            return _context82.a(2);
+            return _context83.a(2);
         }
-      }, _callee82, null, [[5, 9]]);
+      }, _callee83, null, [[5, 9]]);
     }));
-    return function (_x70) {
-      return _ref100.apply(this, arguments);
+    return function (_x71) {
+      return _ref101.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleUpdateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref102 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee84(params) {
-      var _masterConfig$auth38, _masterConfig$auth38$;
-      var _ref103, _ref103$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t18;
-      return _regenerator().w(function (_context84) {
-        while (1) switch (_context84.p = _context84.n) {
+    var _ref103 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee85(params) {
+      var _masterConfig$auth39, _masterConfig$auth39$;
+      var _ref104, _ref104$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t18;
+      return _regenerator().w(function (_context85) {
+        while (1) switch (_context85.p = _context85.n) {
           case 0:
-            _ref103 = params || {}, _ref103$successPageDu = _ref103.successPageDuration, successPageDuration = _ref103$successPageDu === void 0 ? 2000 : _ref103$successPageDu, subTitle = _ref103.subTitle, title = _ref103.title, stampWith = _ref103.stampWith;
+            _ref104 = params || {}, _ref104$successPageDu = _ref104.successPageDuration, successPageDuration = _ref104$successPageDu === void 0 ? 2000 : _ref104$successPageDu, subTitle = _ref104.subTitle, title = _ref104.title, stampWith = _ref104.stampWith;
             if (client) {
-              _context84.n = 1;
+              _context85.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             if (masterConfig) {
-              _context84.n = 2;
+              _context85.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 2:
-            if ((_masterConfig$auth38 = masterConfig.auth) !== null && _masterConfig$auth38 !== void 0 && (_masterConfig$auth38$ = _masterConfig$auth38.methods) !== null && _masterConfig$auth38$ !== void 0 && _masterConfig$auth38$.smsOtpAuthEnabled) {
-              _context84.n = 3;
+            if ((_masterConfig$auth39 = masterConfig.auth) !== null && _masterConfig$auth39 !== void 0 && (_masterConfig$auth39$ = _masterConfig$auth39.methods) !== null && _masterConfig$auth39$ !== void 0 && _masterConfig$auth39$.smsOtpAuthEnabled) {
+              _context85.n = 3;
               break;
             }
             throw new TurnkeyError("SMS OTP authentication is not enabled in the configuration.", TurnkeyErrorCodes.AUTH_METHOD_NOT_ENABLED);
           case 3:
-            _context84.n = 4;
+            _context85.n = 4;
             return getSession();
           case 4:
-            s = _context84.v;
+            s = _context85.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context84.n = 5;
+              _context85.n = 5;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 5:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context84.n = 6;
+              _context85.n = 6;
               break;
             }
             throw new TurnkeyError("A user ID is required to update a phone number.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -4793,12 +4836,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context84.p = 7;
+            _context85.p = 7;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context84.n = 8;
+              _context85.n = 8;
               break;
             }
-            return _context84.a(2, withTurnkeyErrorHandling(function () {
+            return _context85.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Phone Number",
@@ -4826,32 +4869,32 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 8:
-            _context84.n = 9;
+            _context85.n = 9;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 9:
-            otpId = _context84.v;
-            return _context84.a(2, withTurnkeyErrorHandling(function () {
+            otpId = _context85.v;
+            return _context85.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
-                var _masterConfig$auth39, _masterConfig$auth40;
+                var _masterConfig$auth40, _masterConfig$auth41;
                 pushPage({
                   key: "Update Phone Number",
                   content: jsx(OtpVerification, _objectSpread2(_objectSpread2(_objectSpread2({
                     otpType: OtpType.Sms,
                     contact: params.phoneNumber,
                     otpId: otpId,
-                    otpLength: ((_masterConfig$auth39 = masterConfig.auth) === null || _masterConfig$auth39 === void 0 ? void 0 : _masterConfig$auth39.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
-                    alphanumeric: (_masterConfig$auth40 = masterConfig.auth) === null || _masterConfig$auth40 === void 0 ? void 0 : _masterConfig$auth40.otpAlphanumeric,
+                    otpLength: ((_masterConfig$auth40 = masterConfig.auth) === null || _masterConfig$auth40 === void 0 ? void 0 : _masterConfig$auth40.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
+                    alphanumeric: (_masterConfig$auth41 = masterConfig.auth) === null || _masterConfig$auth41 === void 0 ? void 0 : _masterConfig$auth41.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee83(otpCode) {
+                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee84(otpCode) {
                         var _yield$verifyOtp, verificationToken, res, _t17;
-                        return _regenerator().w(function (_context83) {
-                          while (1) switch (_context83.p = _context83.n) {
+                        return _regenerator().w(function (_context84) {
+                          while (1) switch (_context84.p = _context84.n) {
                             case 0:
-                              _context83.p = 0;
-                              _context83.n = 1;
+                              _context84.p = 0;
+                              _context84.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -4859,9 +4902,9 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Sms
                               });
                             case 1:
-                              _yield$verifyOtp = _context83.v;
+                              _yield$verifyOtp = _context84.v;
                               verificationToken = _yield$verifyOtp.verificationToken;
-                              _context83.n = 2;
+                              _context84.n = 2;
                               return updateUserPhoneNumber(_objectSpread2({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
@@ -4871,21 +4914,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               }));
                             case 2:
-                              res = _context83.v;
+                              res = _context84.v;
                               onSuccess();
                               resolve(res);
-                              _context83.n = 4;
+                              _context84.n = 4;
                               break;
                             case 3:
-                              _context83.p = 3;
-                              _t17 = _context83.v;
+                              _context84.p = 3;
+                              _t17 = _context84.v;
                               reject(_t17);
                             case 4:
-                              return _context83.a(2);
+                              return _context84.a(2);
                           }
-                        }, _callee83, null, [[0, 3]]);
+                        }, _callee84, null, [[0, 3]]);
                       }));
-                      function onContinue(_x72) {
+                      function onContinue(_x73) {
                         return _onContinue.apply(this, arguments);
                       }
                       return onContinue;
@@ -4904,54 +4947,54 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to update phone number"));
           case 10:
-            _context84.n = 13;
+            _context85.n = 13;
             break;
           case 11:
-            _context84.p = 11;
-            _t18 = _context84.v;
+            _context85.p = 11;
+            _t18 = _context85.v;
             if (!(_t18 instanceof TurnkeyError)) {
-              _context84.n = 12;
+              _context85.n = 12;
               break;
             }
             throw _t18;
           case 12:
             throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t18);
           case 13:
-            return _context84.a(2);
+            return _context85.a(2);
         }
-      }, _callee84, null, [[7, 11]]);
+      }, _callee85, null, [[7, 11]]);
     }));
-    return function (_x71) {
-      return _ref102.apply(this, arguments);
+    return function (_x72) {
+      return _ref103.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleUpdateUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref104 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee86(params) {
-      var _ref105, _ref105$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t20;
-      return _regenerator().w(function (_context86) {
-        while (1) switch (_context86.p = _context86.n) {
+    var _ref105 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee87(params) {
+      var _ref106, _ref106$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t20;
+      return _regenerator().w(function (_context87) {
+        while (1) switch (_context87.p = _context87.n) {
           case 0:
-            _ref105 = params || {}, _ref105$successPageDu = _ref105.successPageDuration, successPageDuration = _ref105$successPageDu === void 0 ? 2000 : _ref105$successPageDu, subTitle = _ref105.subTitle, title = _ref105.title, stampWith = _ref105.stampWith;
+            _ref106 = params || {}, _ref106$successPageDu = _ref106.successPageDuration, successPageDuration = _ref106$successPageDu === void 0 ? 2000 : _ref106$successPageDu, subTitle = _ref106.subTitle, title = _ref106.title, stampWith = _ref106.stampWith;
             if (client) {
-              _context86.n = 1;
+              _context87.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context86.n = 2;
+            _context87.n = 2;
             return getSession();
           case 2:
-            s = _context86.v;
+            s = _context87.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context86.n = 3;
+              _context87.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) {
-              _context86.n = 4;
+              _context87.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to update an email.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -4971,12 +5014,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context86.p = 5;
+            _context87.p = 5;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context86.n = 6;
+              _context87.n = 6;
               break;
             }
-            return _context86.a(2, withTurnkeyErrorHandling(function () {
+            return _context87.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Email",
@@ -5004,32 +5047,32 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context86.n = 7;
+            _context87.n = 7;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 7:
-            otpId = _context86.v;
-            return _context86.a(2, withTurnkeyErrorHandling(function () {
+            otpId = _context87.v;
+            return _context87.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
-                var _masterConfig$auth41, _masterConfig$auth42;
+                var _masterConfig$auth42, _masterConfig$auth43;
                 pushPage({
                   key: "Update Email",
                   content: jsx(OtpVerification, _objectSpread2(_objectSpread2({
                     otpType: OtpType.Email,
                     contact: params.email,
                     otpId: otpId,
-                    otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth41 = masterConfig.auth) === null || _masterConfig$auth41 === void 0 ? void 0 : _masterConfig$auth41.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
-                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth42 = masterConfig.auth) === null || _masterConfig$auth42 === void 0 ? void 0 : _masterConfig$auth42.otpAlphanumeric,
+                    otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth42 = masterConfig.auth) === null || _masterConfig$auth42 === void 0 ? void 0 : _masterConfig$auth42.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
+                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth43 = masterConfig.auth) === null || _masterConfig$auth43 === void 0 ? void 0 : _masterConfig$auth43.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee85(otpCode) {
+                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee86(otpCode) {
                         var _yield$verifyOtp2, verificationToken, res, _t19;
-                        return _regenerator().w(function (_context85) {
-                          while (1) switch (_context85.p = _context85.n) {
+                        return _regenerator().w(function (_context86) {
+                          while (1) switch (_context86.p = _context86.n) {
                             case 0:
-                              _context85.p = 0;
-                              _context85.n = 1;
+                              _context86.p = 0;
+                              _context86.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -5037,9 +5080,9 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Email
                               });
                             case 1:
-                              _yield$verifyOtp2 = _context85.v;
+                              _yield$verifyOtp2 = _context86.v;
                               verificationToken = _yield$verifyOtp2.verificationToken;
-                              _context85.n = 2;
+                              _context86.n = 2;
                               return updateUserEmail(_objectSpread2({
                                 email: params.email,
                                 verificationToken: verificationToken,
@@ -5049,21 +5092,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               }));
                             case 2:
-                              res = _context85.v;
+                              res = _context86.v;
                               onSuccess();
                               resolve(res);
-                              _context85.n = 4;
+                              _context86.n = 4;
                               break;
                             case 3:
-                              _context85.p = 3;
-                              _t19 = _context85.v;
+                              _context86.p = 3;
+                              _t19 = _context86.v;
                               reject(_t19);
                             case 4:
-                              return _context85.a(2);
+                              return _context86.a(2);
                           }
-                        }, _callee85, null, [[0, 3]]);
+                        }, _callee86, null, [[0, 3]]);
                       }));
-                      function onContinue(_x74) {
+                      function onContinue(_x75) {
                         return _onContinue2.apply(this, arguments);
                       }
                       return onContinue;
@@ -5080,54 +5123,54 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to update email"));
           case 8:
-            _context86.n = 11;
+            _context87.n = 11;
             break;
           case 9:
-            _context86.p = 9;
-            _t20 = _context86.v;
+            _context87.p = 9;
+            _t20 = _context87.v;
             if (!(_t20 instanceof TurnkeyError)) {
-              _context86.n = 10;
+              _context87.n = 10;
               break;
             }
             throw _t20;
           case 10:
             throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t20);
           case 11:
-            return _context86.a(2);
+            return _context87.a(2);
         }
-      }, _callee86, null, [[5, 9]]);
+      }, _callee87, null, [[5, 9]]);
     }));
-    return function (_x73) {
-      return _ref104.apply(this, arguments);
+    return function (_x74) {
+      return _ref105.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleAddEmail = useCallback(/*#__PURE__*/function () {
-    var _ref106 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee88(params) {
-      var _ref107, _ref107$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t22;
-      return _regenerator().w(function (_context88) {
-        while (1) switch (_context88.p = _context88.n) {
+    var _ref107 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee89(params) {
+      var _ref108, _ref108$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t22;
+      return _regenerator().w(function (_context89) {
+        while (1) switch (_context89.p = _context89.n) {
           case 0:
-            _ref107 = params || {}, _ref107$successPageDu = _ref107.successPageDuration, successPageDuration = _ref107$successPageDu === void 0 ? 2000 : _ref107$successPageDu, subTitle = _ref107.subTitle, title = _ref107.title, stampWith = _ref107.stampWith;
+            _ref108 = params || {}, _ref108$successPageDu = _ref108.successPageDuration, successPageDuration = _ref108$successPageDu === void 0 ? 2000 : _ref108$successPageDu, subTitle = _ref108.subTitle, title = _ref108.title, stampWith = _ref108.stampWith;
             if (client) {
-              _context88.n = 1;
+              _context89.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context88.n = 2;
+            _context89.n = 2;
             return getSession();
           case 2:
-            s = _context88.v;
+            s = _context89.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context88.n = 3;
+              _context89.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) {
-              _context88.n = 4;
+              _context89.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to add an email.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5147,12 +5190,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context88.p = 5;
+            _context89.p = 5;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context88.n = 6;
+              _context89.n = 6;
               break;
             }
-            return _context88.a(2, withTurnkeyErrorHandling(function () {
+            return _context89.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Email",
@@ -5180,32 +5223,32 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context88.n = 7;
+            _context89.n = 7;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 7:
-            otpId = _context88.v;
-            return _context88.a(2, withTurnkeyErrorHandling(function () {
+            otpId = _context89.v;
+            return _context89.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
-                var _masterConfig$auth43, _masterConfig$auth44;
+                var _masterConfig$auth44, _masterConfig$auth45;
                 pushPage({
                   key: "Add Email",
                   content: jsx(OtpVerification, _objectSpread2(_objectSpread2({
                     otpType: OtpType.Email,
                     contact: params.email,
                     otpId: otpId,
-                    otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth43 = masterConfig.auth) === null || _masterConfig$auth43 === void 0 ? void 0 : _masterConfig$auth43.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
-                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth44 = masterConfig.auth) === null || _masterConfig$auth44 === void 0 ? void 0 : _masterConfig$auth44.otpAlphanumeric,
+                    otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth44 = masterConfig.auth) === null || _masterConfig$auth44 === void 0 ? void 0 : _masterConfig$auth44.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
+                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth45 = masterConfig.auth) === null || _masterConfig$auth45 === void 0 ? void 0 : _masterConfig$auth45.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee87(otpCode) {
+                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee88(otpCode) {
                         var _yield$verifyOtp3, verificationToken, res, _t21;
-                        return _regenerator().w(function (_context87) {
-                          while (1) switch (_context87.p = _context87.n) {
+                        return _regenerator().w(function (_context88) {
+                          while (1) switch (_context88.p = _context88.n) {
                             case 0:
-                              _context87.p = 0;
-                              _context87.n = 1;
+                              _context88.p = 0;
+                              _context88.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -5213,9 +5256,9 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Email
                               });
                             case 1:
-                              _yield$verifyOtp3 = _context87.v;
+                              _yield$verifyOtp3 = _context88.v;
                               verificationToken = _yield$verifyOtp3.verificationToken;
-                              _context87.n = 2;
+                              _context88.n = 2;
                               return updateUserEmail({
                                 email: params.email,
                                 verificationToken: verificationToken,
@@ -5224,21 +5267,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               });
                             case 2:
-                              res = _context87.v;
+                              res = _context88.v;
                               onSuccess();
                               resolve(res);
-                              _context87.n = 4;
+                              _context88.n = 4;
                               break;
                             case 3:
-                              _context87.p = 3;
-                              _t21 = _context87.v;
+                              _context88.p = 3;
+                              _t21 = _context88.v;
                               reject(_t21);
                             case 4:
-                              return _context87.a(2);
+                              return _context88.a(2);
                           }
-                        }, _callee87, null, [[0, 3]]);
+                        }, _callee88, null, [[0, 3]]);
                       }));
-                      function onContinue(_x76) {
+                      function onContinue(_x77) {
                         return _onContinue3.apply(this, arguments);
                       }
                       return onContinue;
@@ -5255,67 +5298,67 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add email"));
           case 8:
-            _context88.n = 11;
+            _context89.n = 11;
             break;
           case 9:
-            _context88.p = 9;
-            _t22 = _context88.v;
+            _context89.p = 9;
+            _t22 = _context89.v;
             if (!(_t22 instanceof TurnkeyError)) {
-              _context88.n = 10;
+              _context89.n = 10;
               break;
             }
             throw _t22;
           case 10:
             throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t22);
           case 11:
-            return _context88.a(2);
+            return _context89.a(2);
         }
-      }, _callee88, null, [[5, 9]]);
+      }, _callee89, null, [[5, 9]]);
     }));
-    return function (_x75) {
-      return _ref106.apply(this, arguments);
+    return function (_x76) {
+      return _ref107.apply(this, arguments);
     };
   }(), [pushPage, client, session, user]);
   var handleAddPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref108 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee90(params) {
-      var _masterConfig$auth45, _masterConfig$auth45$;
-      var _ref109, _ref109$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t24;
-      return _regenerator().w(function (_context90) {
-        while (1) switch (_context90.p = _context90.n) {
+    var _ref109 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee91(params) {
+      var _masterConfig$auth46, _masterConfig$auth46$;
+      var _ref110, _ref110$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t24;
+      return _regenerator().w(function (_context91) {
+        while (1) switch (_context91.p = _context91.n) {
           case 0:
-            _ref109 = params || {}, _ref109$successPageDu = _ref109.successPageDuration, successPageDuration = _ref109$successPageDu === void 0 ? 2000 : _ref109$successPageDu, subTitle = _ref109.subTitle, title = _ref109.title, stampWith = _ref109.stampWith;
+            _ref110 = params || {}, _ref110$successPageDu = _ref110.successPageDuration, successPageDuration = _ref110$successPageDu === void 0 ? 2000 : _ref110$successPageDu, subTitle = _ref110.subTitle, title = _ref110.title, stampWith = _ref110.stampWith;
             if (client) {
-              _context90.n = 1;
+              _context91.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             if (masterConfig) {
-              _context90.n = 2;
+              _context91.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 2:
-            if ((_masterConfig$auth45 = masterConfig.auth) !== null && _masterConfig$auth45 !== void 0 && (_masterConfig$auth45$ = _masterConfig$auth45.methods) !== null && _masterConfig$auth45$ !== void 0 && _masterConfig$auth45$.smsOtpAuthEnabled) {
-              _context90.n = 3;
+            if ((_masterConfig$auth46 = masterConfig.auth) !== null && _masterConfig$auth46 !== void 0 && (_masterConfig$auth46$ = _masterConfig$auth46.methods) !== null && _masterConfig$auth46$ !== void 0 && _masterConfig$auth46$.smsOtpAuthEnabled) {
+              _context91.n = 3;
               break;
             }
             throw new TurnkeyError("SMS OTP authentication is not enabled in the configuration.", TurnkeyErrorCodes.AUTH_METHOD_NOT_ENABLED);
           case 3:
-            _context90.n = 4;
+            _context91.n = 4;
             return getSession();
           case 4:
-            s = _context90.v;
+            s = _context91.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context90.n = 5;
+              _context91.n = 5;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 5:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context90.n = 6;
+              _context91.n = 6;
               break;
             }
             throw new TurnkeyError("A user ID is required to add a phone number.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5335,12 +5378,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context90.p = 7;
+            _context91.p = 7;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context90.n = 8;
+              _context91.n = 8;
               break;
             }
-            return _context90.a(2, withTurnkeyErrorHandling(function () {
+            return _context91.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Phone Number",
@@ -5368,32 +5411,32 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add phone number"));
           case 8:
-            _context90.n = 9;
+            _context91.n = 9;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 9:
-            otpId = _context90.v;
-            return _context90.a(2, withTurnkeyErrorHandling(function () {
+            otpId = _context91.v;
+            return _context91.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
-                var _masterConfig$auth46, _masterConfig$auth47;
+                var _masterConfig$auth47, _masterConfig$auth48;
                 pushPage({
                   key: "Add Phone Number",
                   content: jsx(OtpVerification, _objectSpread2(_objectSpread2(_objectSpread2({
                     otpType: OtpType.Sms,
                     contact: params.phoneNumber,
                     otpId: otpId,
-                    otpLength: ((_masterConfig$auth46 = masterConfig.auth) === null || _masterConfig$auth46 === void 0 ? void 0 : _masterConfig$auth46.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
-                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth47 = masterConfig.auth) === null || _masterConfig$auth47 === void 0 ? void 0 : _masterConfig$auth47.otpAlphanumeric,
+                    otpLength: ((_masterConfig$auth47 = masterConfig.auth) === null || _masterConfig$auth47 === void 0 ? void 0 : _masterConfig$auth47.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
+                    alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth48 = masterConfig.auth) === null || _masterConfig$auth48 === void 0 ? void 0 : _masterConfig$auth48.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee89(otpCode) {
+                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee90(otpCode) {
                         var _yield$verifyOtp4, verificationToken, res, _t23;
-                        return _regenerator().w(function (_context89) {
-                          while (1) switch (_context89.p = _context89.n) {
+                        return _regenerator().w(function (_context90) {
+                          while (1) switch (_context90.p = _context90.n) {
                             case 0:
-                              _context89.p = 0;
-                              _context89.n = 1;
+                              _context90.p = 0;
+                              _context90.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -5401,9 +5444,9 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Sms
                               });
                             case 1:
-                              _yield$verifyOtp4 = _context89.v;
+                              _yield$verifyOtp4 = _context90.v;
                               verificationToken = _yield$verifyOtp4.verificationToken;
-                              _context89.n = 2;
+                              _context90.n = 2;
                               return updateUserPhoneNumber({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
@@ -5412,21 +5455,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               });
                             case 2:
-                              res = _context89.v;
+                              res = _context90.v;
                               onSuccess();
                               resolve(res);
-                              _context89.n = 4;
+                              _context90.n = 4;
                               break;
                             case 3:
-                              _context89.p = 3;
-                              _t23 = _context89.v;
+                              _context90.p = 3;
+                              _t23 = _context90.v;
                               reject(_t23);
                             case 4:
-                              return _context89.a(2);
+                              return _context90.a(2);
                           }
-                        }, _callee89, null, [[0, 3]]);
+                        }, _callee90, null, [[0, 3]]);
                       }));
-                      function onContinue(_x78) {
+                      function onContinue(_x79) {
                         return _onContinue4.apply(this, arguments);
                       }
                       return onContinue;
@@ -5445,52 +5488,52 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add phone number"));
           case 10:
-            _context90.n = 13;
+            _context91.n = 13;
             break;
           case 11:
-            _context90.p = 11;
-            _t24 = _context90.v;
+            _context91.p = 11;
+            _t24 = _context91.v;
             if (!(_t24 instanceof TurnkeyError)) {
-              _context90.n = 12;
+              _context91.n = 12;
               break;
             }
             throw _t24;
           case 12:
             throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t24);
           case 13:
-            return _context90.a(2);
+            return _context91.a(2);
         }
-      }, _callee90, null, [[7, 11]]);
+      }, _callee91, null, [[7, 11]]);
     }));
-    return function (_x77) {
-      return _ref108.apply(this, arguments);
+    return function (_x78) {
+      return _ref109.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleRemovePasskey = useCallback(/*#__PURE__*/function () {
-    var _ref110 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee91(params) {
+    var _ref111 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee92(params) {
       var authenticatorId, _params$successPageDu2, successPageDuration, subTitle, title, stampWith, userId, s, organizationId;
-      return _regenerator().w(function (_context91) {
-        while (1) switch (_context91.n) {
+      return _regenerator().w(function (_context92) {
+        while (1) switch (_context92.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) {
-              _context91.n = 1;
+              _context92.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context91.n = 2;
+            _context92.n = 2;
             return getSession();
           case 2:
-            s = _context91.v;
+            s = _context92.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context91.n = 3;
+              _context92.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
-            return _context91.a(2, withTurnkeyErrorHandling(function () {
+            return _context92.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Remove Passkey",
@@ -5521,44 +5564,44 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to remove passkey"));
         }
-      }, _callee91);
+      }, _callee92);
     }));
-    return function (_x79) {
-      return _ref110.apply(this, arguments);
+    return function (_x80) {
+      return _ref111.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleAddPasskey = useCallback(/*#__PURE__*/function () {
-    var _ref111 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee92(params) {
-      var _ref112, name, displayName, _ref112$successPageDu, successPageDuration, stampWith, s, organizationId, userId, resPromise, _t25;
-      return _regenerator().w(function (_context92) {
-        while (1) switch (_context92.p = _context92.n) {
+    var _ref112 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee93(params) {
+      var _ref113, name, displayName, _ref113$successPageDu, successPageDuration, stampWith, s, organizationId, userId, resPromise, _t25;
+      return _regenerator().w(function (_context93) {
+        while (1) switch (_context93.p = _context93.n) {
           case 0:
-            _ref112 = params || {}, name = _ref112.name, displayName = _ref112.displayName, _ref112$successPageDu = _ref112.successPageDuration, successPageDuration = _ref112$successPageDu === void 0 ? 2000 : _ref112$successPageDu, stampWith = _ref112.stampWith;
+            _ref113 = params || {}, name = _ref113.name, displayName = _ref113.displayName, _ref113$successPageDu = _ref113.successPageDuration, successPageDuration = _ref113$successPageDu === void 0 ? 2000 : _ref113$successPageDu, stampWith = _ref113.stampWith;
             if (client) {
-              _context92.n = 1;
+              _context93.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context92.n = 2;
+            _context93.n = 2;
             return getSession();
           case 2:
-            s = _context92.v;
+            s = _context93.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context92.n = 3;
+              _context93.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) {
-              _context92.n = 4;
+              _context93.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID or a valid session is required to add a passkey.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 4:
-            _context92.p = 4;
+            _context93.p = 4;
             resPromise = addPasskey(_objectSpread2(_objectSpread2(_objectSpread2({}, name && {
               name: name
             }), displayName && {
@@ -5583,55 +5626,55 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             });
-            _context92.n = 5;
+            _context93.n = 5;
             return resPromise;
           case 5:
-            return _context92.a(2, _context92.v);
+            return _context93.a(2, _context93.v);
           case 6:
-            _context92.p = 6;
-            _t25 = _context92.v;
+            _context93.p = 6;
+            _t25 = _context93.v;
             if (!(_t25 instanceof TurnkeyError)) {
-              _context92.n = 7;
+              _context93.n = 7;
               break;
             }
             throw _t25;
           case 7:
             throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _t25);
           case 8:
-            return _context92.a(2);
+            return _context93.a(2);
         }
-      }, _callee92, null, [[4, 6]]);
+      }, _callee93, null, [[4, 6]]);
     }));
-    return function (_x80) {
-      return _ref111.apply(this, arguments);
+    return function (_x81) {
+      return _ref112.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleRemoveOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref113 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee93(params) {
+    var _ref114 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee94(params) {
       var providerId, _params$successPageDu3, successPageDuration, subTitle, title, stampWith, s, organizationId, _t26;
-      return _regenerator().w(function (_context93) {
-        while (1) switch (_context93.p = _context93.n) {
+      return _regenerator().w(function (_context94) {
+        while (1) switch (_context94.p = _context94.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) {
-              _context93.n = 1;
+              _context94.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context93.n = 2;
+            _context94.n = 2;
             return getSession();
           case 2:
-            s = _context93.v;
+            s = _context94.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context93.n = 3;
+              _context94.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
-            _context93.p = 3;
-            return _context93.a(2, new Promise(function (resolve, reject) {
+            _context94.p = 3;
+            return _context94.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove OAuth Provider",
                 content: jsx(RemoveOAuthProvider, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5659,68 +5702,68 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 4:
-            _context93.p = 4;
-            _t26 = _context93.v;
+            _context94.p = 4;
+            _t26 = _context94.v;
             if (!(_t26 instanceof TurnkeyError)) {
-              _context93.n = 5;
+              _context94.n = 5;
               break;
             }
             throw _t26;
           case 5:
             throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _t26);
           case 6:
-            return _context93.a(2);
+            return _context94.a(2);
         }
-      }, _callee93, null, [[3, 4]]);
+      }, _callee94, null, [[3, 4]]);
     }));
-    return function (_x81) {
-      return _ref113.apply(this, arguments);
+    return function (_x82) {
+      return _ref114.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleAddOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref114 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee96(params) {
+    var _ref115 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee97(params) {
       var providerName, stampWith, _params$successPageDu4, successPageDuration, s, organizationId, userId;
-      return _regenerator().w(function (_context96) {
-        while (1) switch (_context96.n) {
+      return _regenerator().w(function (_context97) {
+        while (1) switch (_context97.n) {
           case 0:
             if (client) {
-              _context96.n = 1;
+              _context97.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;
-            _context96.n = 2;
+            _context97.n = 2;
             return getSession();
           case 2:
-            s = _context96.v;
+            s = _context97.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context96.n = 3;
+              _context97.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) {
-              _context96.n = 4;
+              _context97.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to add an OAuth provider.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 4:
-            return _context96.a(2, new Promise(/*#__PURE__*/function () {
-              var _ref115 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee95(resolve, reject) {
+            return _context97.a(2, new Promise(/*#__PURE__*/function () {
+              var _ref116 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee96(resolve, reject) {
                 var onOauthSuccess, _t27, _t28;
-                return _regenerator().w(function (_context95) {
-                  while (1) switch (_context95.p = _context95.n) {
+                return _regenerator().w(function (_context96) {
+                  while (1) switch (_context96.p = _context96.n) {
                     case 0:
-                      _context95.p = 0;
+                      _context96.p = 0;
                       onOauthSuccess = /*#__PURE__*/function () {
-                        var _ref116 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee94(params) {
-                          return _regenerator().w(function (_context94) {
-                            while (1) switch (_context94.n) {
+                        var _ref117 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee95(params) {
+                          return _regenerator().w(function (_context95) {
+                            while (1) switch (_context95.n) {
                               case 0:
-                                _context94.n = 1;
+                                _context95.n = 1;
                                 return addOauthProvider({
                                   providerName: params.providerName,
                                   oidcToken: params.oidcToken,
@@ -5743,107 +5786,107 @@ var ClientProvider = function ClientProvider(_ref) {
                                   showTitle: false
                                 });
                               case 2:
-                                return _context94.a(2);
+                                return _context95.a(2);
                             }
-                          }, _callee94);
+                          }, _callee95);
                         }));
-                        return function onOauthSuccess(_x85) {
-                          return _ref116.apply(this, arguments);
+                        return function onOauthSuccess(_x86) {
+                          return _ref117.apply(this, arguments);
                         };
                       }();
                       _t27 = providerName;
-                      _context95.n = _t27 === OAuthProviders.DISCORD ? 1 : _t27 === OAuthProviders.X ? 3 : _t27 === OAuthProviders.GOOGLE ? 5 : _t27 === OAuthProviders.APPLE ? 7 : _t27 === OAuthProviders.FACEBOOK ? 9 : 11;
+                      _context96.n = _t27 === OAuthProviders.DISCORD ? 1 : _t27 === OAuthProviders.X ? 3 : _t27 === OAuthProviders.GOOGLE ? 5 : _t27 === OAuthProviders.APPLE ? 7 : _t27 === OAuthProviders.FACEBOOK ? 9 : 11;
                       break;
                     case 1:
-                      _context95.n = 2;
+                      _context96.n = 2;
                       return handleDiscordOauth({
                         openInPage: false,
                         onOauthSuccess: onOauthSuccess
                       });
                     case 2:
-                      return _context95.a(2, _context95.v);
+                      return _context96.a(2, _context96.v);
                     case 3:
-                      _context95.n = 4;
+                      _context96.n = 4;
                       return handleXOauth({
                         openInPage: false,
                         onOauthSuccess: onOauthSuccess
                       });
                     case 4:
-                      return _context95.a(2, _context95.v);
+                      return _context96.a(2, _context96.v);
                     case 5:
-                      _context95.n = 6;
+                      _context96.n = 6;
                       return handleGoogleOauth({
                         openInPage: false,
                         onOauthSuccess: onOauthSuccess
                       });
                     case 6:
-                      return _context95.a(2, _context95.v);
+                      return _context96.a(2, _context96.v);
                     case 7:
-                      _context95.n = 8;
+                      _context96.n = 8;
                       return handleAppleOauth({
                         openInPage: false,
                         onOauthSuccess: onOauthSuccess
                       });
                     case 8:
-                      return _context95.a(2, _context95.v);
+                      return _context96.a(2, _context96.v);
                     case 9:
-                      _context95.n = 10;
+                      _context96.n = 10;
                       return handleFacebookOauth({
                         openInPage: false,
                         onOauthSuccess: onOauthSuccess
                       });
                     case 10:
-                      return _context95.a(2, _context95.v);
+                      return _context96.a(2, _context96.v);
                     case 11:
                       throw new TurnkeyError("Unsupported OAuth provider: ".concat(providerName), TurnkeyErrorCodes.NOT_FOUND);
                     case 12:
-                      _context95.n = 14;
+                      _context96.n = 14;
                       break;
                     case 13:
-                      _context95.p = 13;
-                      _t28 = _context95.v;
+                      _context96.p = 13;
+                      _t28 = _context96.v;
                       reject(_t28);
                     case 14:
-                      return _context95.a(2);
+                      return _context96.a(2);
                   }
-                }, _callee95, null, [[0, 13]]);
+                }, _callee96, null, [[0, 13]]);
               }));
-              return function (_x83, _x84) {
-                return _ref115.apply(this, arguments);
+              return function (_x84, _x85) {
+                return _ref116.apply(this, arguments);
               };
             }()));
         }
-      }, _callee96);
+      }, _callee97);
     }));
-    return function (_x82) {
-      return _ref114.apply(this, arguments);
+    return function (_x83) {
+      return _ref115.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleConnectExternalWallet = useCallback(/*#__PURE__*/function () {
-    var _ref117 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee97(params) {
+    var _ref118 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee98(params) {
       var _masterConfig$walletC4, _masterConfig$walletC5;
-      var _ref118, _ref118$successPageDu, successPageDuration, providers;
-      return _regenerator().w(function (_context97) {
-        while (1) switch (_context97.n) {
+      var _ref119, _ref119$successPageDu, successPageDuration, providers;
+      return _regenerator().w(function (_context98) {
+        while (1) switch (_context98.n) {
           case 0:
-            _ref118 = params || {}, _ref118$successPageDu = _ref118.successPageDuration, successPageDuration = _ref118$successPageDu === void 0 ? 2000 : _ref118$successPageDu;
+            _ref119 = params || {}, _ref119$successPageDu = _ref119.successPageDuration, successPageDuration = _ref119$successPageDu === void 0 ? 2000 : _ref119$successPageDu;
             if (client) {
-              _context97.n = 1;
+              _context98.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) {
-              _context97.n = 2;
+              _context98.n = 2;
               break;
             }
             throw new TurnkeyError("Wallet connecting is not enabled.", TurnkeyErrorCodes.FEATURE_NOT_ENABLED);
           case 2:
-            _context97.n = 3;
+            _context98.n = 3;
             return fetchWalletProviders();
           case 3:
-            providers = _context97.v;
-            return _context97.a(2, new Promise(function (resolve, reject) {
+            providers = _context98.v;
+            return _context98.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Connect wallet",
                 content: jsx(ConnectWalletModal, {
@@ -5865,32 +5908,32 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee97);
+      }, _callee98);
     }));
-    return function (_x86) {
-      return _ref117.apply(this, arguments);
+    return function (_x87) {
+      return _ref118.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleRemoveUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref119 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee98(params) {
-      var _ref120, _ref120$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t29;
-      return _regenerator().w(function (_context98) {
-        while (1) switch (_context98.p = _context98.n) {
+    var _ref120 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee99(params) {
+      var _ref121, _ref121$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t29;
+      return _regenerator().w(function (_context99) {
+        while (1) switch (_context99.p = _context99.n) {
           case 0:
-            _ref120 = params || {}, _ref120$successPageDu = _ref120.successPageDuration, successPageDuration = _ref120$successPageDu === void 0 ? 2000 : _ref120$successPageDu, stampWith = _ref120.stampWith, userId = _ref120.userId;
-            _context98.n = 1;
+            _ref121 = params || {}, _ref121$successPageDu = _ref121.successPageDuration, successPageDuration = _ref121$successPageDu === void 0 ? 2000 : _ref121$successPageDu, stampWith = _ref121.stampWith, userId = _ref121.userId;
+            _context99.n = 1;
             return getSession();
           case 1:
-            s = _context98.v;
+            s = _context99.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context98.n = 2;
+              _context99.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context98.p = 2;
-            return _context98.a(2, new Promise(function (resolve, reject) {
+            _context99.p = 2;
+            return _context99.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Email",
                 content: jsx(RemoveEmail, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5917,44 +5960,44 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context98.p = 3;
-            _t29 = _context98.v;
+            _context99.p = 3;
+            _t29 = _context99.v;
             if (!(_t29 instanceof TurnkeyError)) {
-              _context98.n = 4;
+              _context99.n = 4;
               break;
             }
             throw _t29;
           case 4:
             throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _t29);
           case 5:
-            return _context98.a(2);
+            return _context99.a(2);
         }
-      }, _callee98, null, [[2, 3]]);
+      }, _callee99, null, [[2, 3]]);
     }));
-    return function (_x87) {
-      return _ref119.apply(this, arguments);
+    return function (_x88) {
+      return _ref120.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   var handleRemoveUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref121 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee99(params) {
-      var _ref122, _ref122$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t30;
-      return _regenerator().w(function (_context99) {
-        while (1) switch (_context99.p = _context99.n) {
+    var _ref122 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee100(params) {
+      var _ref123, _ref123$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t30;
+      return _regenerator().w(function (_context100) {
+        while (1) switch (_context100.p = _context100.n) {
           case 0:
-            _ref122 = params || {}, _ref122$successPageDu = _ref122.successPageDuration, successPageDuration = _ref122$successPageDu === void 0 ? 2000 : _ref122$successPageDu, stampWith = _ref122.stampWith, userId = _ref122.userId;
-            _context99.n = 1;
+            _ref123 = params || {}, _ref123$successPageDu = _ref123.successPageDuration, successPageDuration = _ref123$successPageDu === void 0 ? 2000 : _ref123$successPageDu, stampWith = _ref123.stampWith, userId = _ref123.userId;
+            _context100.n = 1;
             return getSession();
           case 1:
-            s = _context99.v;
+            s = _context100.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context99.n = 2;
+              _context100.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context99.p = 2;
-            return _context99.a(2, new Promise(function (resolve, reject) {
+            _context100.p = 2;
+            return _context100.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Phone Number",
                 content: jsx(RemovePhoneNumber, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5981,58 +6024,58 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context99.p = 3;
-            _t30 = _context99.v;
+            _context100.p = 3;
+            _t30 = _context100.v;
             if (!(_t30 instanceof TurnkeyError)) {
-              _context99.n = 4;
+              _context100.n = 4;
               break;
             }
             throw _t30;
           case 4:
             throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _t30);
           case 5:
-            return _context99.a(2);
+            return _context100.a(2);
         }
-      }, _callee99, null, [[2, 3]]);
+      }, _callee100, null, [[2, 3]]);
     }));
-    return function (_x88) {
-      return _ref121.apply(this, arguments);
+    return function (_x89) {
+      return _ref122.apply(this, arguments);
     };
   }(), [pushPage, masterConfig, client, session, user]);
   useEffect(function () {
     if (proxyAuthConfigRef.current) return;
     // Only fetch the proxy auth config once. Use that to build the master config.
     var fetchProxyAuthConfig = /*#__PURE__*/function () {
-      var _ref123 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee100() {
+      var _ref124 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee101() {
         var proxyAuthConfig;
-        return _regenerator().w(function (_context100) {
-          while (1) switch (_context100.p = _context100.n) {
+        return _regenerator().w(function (_context101) {
+          while (1) switch (_context101.p = _context101.n) {
             case 0:
-              _context100.p = 0;
+              _context101.p = 0;
               if (!config.authProxyConfigId) {
-                _context100.n = 2;
+                _context101.n = 2;
                 break;
               }
-              _context100.n = 1;
+              _context101.n = 1;
               return getAuthProxyConfig(config.authProxyConfigId, config.authProxyUrl);
             case 1:
-              proxyAuthConfig = _context100.v;
+              proxyAuthConfig = _context101.v;
               proxyAuthConfigRef.current = proxyAuthConfig;
             case 2:
               setMasterConfig(buildConfig(proxyAuthConfig));
-              _context100.n = 4;
+              _context101.n = 4;
               break;
             case 3:
-              _context100.p = 3;
-              _context100.v;
+              _context101.p = 3;
+              _context101.v;
               setClientState(ClientState.Error);
             case 4:
-              return _context100.a(2);
+              return _context101.a(2);
           }
-        }, _callee100, null, [[0, 3]]);
+        }, _callee101, null, [[0, 3]]);
       }));
       return function fetchProxyAuthConfig() {
-        return _ref123.apply(this, arguments);
+        return _ref124.apply(this, arguments);
       };
     }();
     fetchProxyAuthConfig();
@@ -6064,29 +6107,29 @@ var ClientProvider = function ClientProvider(_ref) {
   useEffect(function () {
     if (!client) return;
     var handleUpdateState = /*#__PURE__*/function () {
-      var _ref124 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee101() {
-        return _regenerator().w(function (_context101) {
-          while (1) switch (_context101.n) {
+      var _ref125 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee102() {
+        return _regenerator().w(function (_context102) {
+          while (1) switch (_context102.n) {
             case 0:
               if (!session) {
-                _context101.n = 2;
+                _context102.n = 2;
                 break;
               }
-              _context101.n = 1;
+              _context102.n = 1;
               return debouncedRefreshWallets();
             case 1:
-              _context101.n = 3;
+              _context102.n = 3;
               break;
             case 2:
-              _context101.n = 3;
+              _context102.n = 3;
               return debouncedFetchWalletProviders();
             case 3:
-              return _context101.a(2);
+              return _context102.a(2);
           }
-        }, _callee101);
+        }, _callee102);
       }));
       return function handleUpdateState() {
-        return _ref124.apply(this, arguments);
+        return _ref125.apply(this, arguments);
       };
     }();
     var cleanup = function cleanup() {};
@@ -6139,6 +6182,7 @@ var ClientProvider = function ClientProvider(_ref) {
       walletProviders: walletProviders,
       config: masterConfig,
       httpClient: client === null || client === void 0 ? void 0 : client.httpClient,
+      createHttpClient: createHttpClient,
       createPasskey: createPasskey,
       logout: logout,
       loginWithPasskey: loginWithPasskey,
@@ -6147,6 +6191,7 @@ var ClientProvider = function ClientProvider(_ref) {
       connectWalletAccount: connectWalletAccount,
       disconnectWalletAccount: disconnectWalletAccount,
       switchWalletAccountChain: switchWalletAccountChain,
+      buildWalletLoginRequest: buildWalletLoginRequest,
       loginWithWallet: loginWithWallet,
       signUpWithWallet: signUpWithWallet,
       loginOrSignupWithWallet: loginOrSignupWithWallet,