@turnkey/react-wallet-kit 1.0.0-beta.6 → 1.0.0

package/dist/providers/client/Provider.mjs

@@ -100,6 +100,7 @@ var ClientProvider = function ClientProvider(_ref) {
     allSessions = _useState14[0],
     setAllSessions = _useState14[1];
   var _useModal = useModal(),
+    isMobile = _useModal.isMobile,
     pushPage = _useModal.pushPage,
     closeModal = _useModal.closeModal;
   var completeRedirectOauth = /*#__PURE__*/function () {
@@ -238,6 +239,7 @@ var ClientProvider = function ClientProvider(_ref) {
                               authCode: code,
                               redirectUri: _redirectURI,
                               codeVerifier: verifier,
+                              clientId: _clientId,
                               nonce: nonce
                             });
                           case 3:
@@ -323,6 +325,7 @@ var ClientProvider = function ClientProvider(_ref) {
                               authCode: code,
                               redirectUri: _redirectURI2,
                               codeVerifier: _verifier,
+                              clientId: _clientId2,
                               nonce: _nonce
                             });
                           case 3:
@@ -483,7 +486,7 @@ var ClientProvider = function ClientProvider(_ref) {
     };
   }();
   var buildConfig = function buildConfig(proxyAuthConfig) {
-    var _config$auth$methods$, _config$auth, _config$auth$methods, _config$auth$methods$2, _config$auth2, _config$auth2$methods, _config$auth$methods$3, _config$auth3, _config$auth3$methods, _config$auth$methods$4, _config$auth4, _config$auth4$methods, _config$auth$methods$5, _config$auth5, _config$auth5$methods, _config$auth$methods$6, _config$auth6, _config$auth6$methods, _config$auth$methods$7, _config$auth7, _config$auth7$methods, _config$auth$methods$8, _config$auth8, _config$auth8$methods, _config$auth$methods$9, _config$auth9, _config$auth9$methods, _config$auth$oauthOrd, _config$auth0, _config$auth$methodOr, _config$auth1, _config$auth10, _config$auth11, _config$auth11$oauthC, _config$auth$autoRefr, _config$auth12, _config$walletConfig, _ref3, _resolvedMethods$wall, _config$walletConfig2, _config$walletConfig3, _config$walletConfig$, _config$walletConfig4, _config$walletConfig5, _config$walletConfig6, _config$walletConfig7, _config$walletConfig8, _config$walletConfig$2, _config$walletConfig9, _config$walletConfig0, _config$walletConfig1, _config$walletConfig10, _config$walletConfig11, _config$walletConfig$3, _config$walletConfig12, _config$walletConfig13, _config$walletConfig14, _config$importIframeU, _config$exportIframeU;
+    var _config$auth$methods$, _config$auth, _config$auth$methods, _config$auth$methods$2, _config$auth2, _config$auth2$methods, _config$auth$methods$3, _config$auth3, _config$auth3$methods, _config$auth$methods$4, _config$auth4, _config$auth4$methods, _config$auth$methods$5, _config$auth5, _config$auth5$methods, _config$auth$methods$6, _config$auth6, _config$auth6$methods, _config$auth$methods$7, _config$auth7, _config$auth7$methods, _config$auth$methods$8, _config$auth8, _config$auth8$methods, _config$auth$methods$9, _config$auth9, _config$auth9$methods, _config$auth$oauthCon, _config$auth0, _config$auth0$oauthCo, _proxyAuthConfig$oaut, _config$auth$oauthCon2, _config$auth1, _config$auth1$oauthCo, _proxyAuthConfig$oaut2, _config$auth$oauthCon3, _config$auth10, _config$auth10$oauthC, _proxyAuthConfig$oaut3, _config$auth$oauthCon4, _config$auth11, _config$auth11$oauthC, _proxyAuthConfig$oaut4, _config$auth$oauthCon5, _config$auth12, _config$auth12$oauthC, _proxyAuthConfig$oaut5, _config$auth$oauthCon6, _config$auth13, _config$auth13$oauthC, _config$auth$oauthOrd, _config$auth14, _config$auth$methodOr, _config$auth15, _config$auth16, _config$auth17, _config$auth17$oauthC, _config$auth$autoRefr, _config$auth18, _config$autoRefreshMa, _config$walletConfig, _ref3, _resolvedMethods$wall, _config$walletConfig2, _config$walletConfig3, _config$walletConfig$, _config$walletConfig4, _config$walletConfig5, _config$walletConfig6, _config$walletConfig7, _config$walletConfig8, _config$walletConfig$2, _config$walletConfig9, _config$walletConfig0, _config$walletConfig1, _config$walletConfig10, _config$walletConfig11, _config$walletConfig$3, _config$walletConfig12, _config$walletConfig13, _config$walletConfig14, _config$importIframeU, _config$exportIframeU;
     // Juggle the local overrides with the values set in the dashboard (proxyAuthConfig).
     var resolvedMethods = {
       emailOtpAuthEnabled: (_config$auth$methods$ = (_config$auth = config.auth) === null || _config$auth === void 0 ? void 0 : (_config$auth$methods = _config$auth.methods) === null || _config$auth$methods === void 0 ? void 0 : _config$auth$methods.emailOtpAuthEnabled) !== null && _config$auth$methods$ !== void 0 ? _config$auth$methods$ : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : proxyAuthConfig.enabledProviders.includes("email"),
@@ -496,24 +499,36 @@ var ClientProvider = function ClientProvider(_ref) {
       appleOauthEnabled: (_config$auth$methods$8 = (_config$auth8 = config.auth) === null || _config$auth8 === void 0 ? void 0 : (_config$auth8$methods = _config$auth8.methods) === null || _config$auth8$methods === void 0 ? void 0 : _config$auth8$methods.appleOauthEnabled) !== null && _config$auth$methods$8 !== void 0 ? _config$auth$methods$8 : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : proxyAuthConfig.enabledProviders.includes("apple"),
       facebookOauthEnabled: (_config$auth$methods$9 = (_config$auth9 = config.auth) === null || _config$auth9 === void 0 ? void 0 : (_config$auth9$methods = _config$auth9.methods) === null || _config$auth9$methods === void 0 ? void 0 : _config$auth9$methods.facebookOauthEnabled) !== null && _config$auth$methods$9 !== void 0 ? _config$auth$methods$9 : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : proxyAuthConfig.enabledProviders.includes("facebook")
     };
+    var resolvedClientIds = {
+      googleClientId: (_config$auth$oauthCon = (_config$auth0 = config.auth) === null || _config$auth0 === void 0 ? void 0 : (_config$auth0$oauthCo = _config$auth0.oauthConfig) === null || _config$auth0$oauthCo === void 0 ? void 0 : _config$auth0$oauthCo.googleClientId) !== null && _config$auth$oauthCon !== void 0 ? _config$auth$oauthCon : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : (_proxyAuthConfig$oaut = proxyAuthConfig.oauthClientIds) === null || _proxyAuthConfig$oaut === void 0 ? void 0 : _proxyAuthConfig$oaut.google,
+      appleClientId: (_config$auth$oauthCon2 = (_config$auth1 = config.auth) === null || _config$auth1 === void 0 ? void 0 : (_config$auth1$oauthCo = _config$auth1.oauthConfig) === null || _config$auth1$oauthCo === void 0 ? void 0 : _config$auth1$oauthCo.appleClientId) !== null && _config$auth$oauthCon2 !== void 0 ? _config$auth$oauthCon2 : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : (_proxyAuthConfig$oaut2 = proxyAuthConfig.oauthClientIds) === null || _proxyAuthConfig$oaut2 === void 0 ? void 0 : _proxyAuthConfig$oaut2.apple,
+      facebookClientId: (_config$auth$oauthCon3 = (_config$auth10 = config.auth) === null || _config$auth10 === void 0 ? void 0 : (_config$auth10$oauthC = _config$auth10.oauthConfig) === null || _config$auth10$oauthC === void 0 ? void 0 : _config$auth10$oauthC.facebookClientId) !== null && _config$auth$oauthCon3 !== void 0 ? _config$auth$oauthCon3 : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : (_proxyAuthConfig$oaut3 = proxyAuthConfig.oauthClientIds) === null || _proxyAuthConfig$oaut3 === void 0 ? void 0 : _proxyAuthConfig$oaut3.facebook,
+      xClientId: (_config$auth$oauthCon4 = (_config$auth11 = config.auth) === null || _config$auth11 === void 0 ? void 0 : (_config$auth11$oauthC = _config$auth11.oauthConfig) === null || _config$auth11$oauthC === void 0 ? void 0 : _config$auth11$oauthC.xClientId) !== null && _config$auth$oauthCon4 !== void 0 ? _config$auth$oauthCon4 : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : (_proxyAuthConfig$oaut4 = proxyAuthConfig.oauthClientIds) === null || _proxyAuthConfig$oaut4 === void 0 ? void 0 : _proxyAuthConfig$oaut4.x,
+      discordClientId: (_config$auth$oauthCon5 = (_config$auth12 = config.auth) === null || _config$auth12 === void 0 ? void 0 : (_config$auth12$oauthC = _config$auth12.oauthConfig) === null || _config$auth12$oauthC === void 0 ? void 0 : _config$auth12$oauthC.discordClientId) !== null && _config$auth$oauthCon5 !== void 0 ? _config$auth$oauthCon5 : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : (_proxyAuthConfig$oaut5 = proxyAuthConfig.oauthClientIds) === null || _proxyAuthConfig$oaut5 === void 0 ? void 0 : _proxyAuthConfig$oaut5.discord
+    };
+    var redirectUrl = (_config$auth$oauthCon6 = (_config$auth13 = config.auth) === null || _config$auth13 === void 0 ? void 0 : (_config$auth13$oauthC = _config$auth13.oauthConfig) === null || _config$auth13$oauthC === void 0 ? void 0 : _config$auth13$oauthC.oauthRedirectUri) !== null && _config$auth$oauthCon6 !== void 0 ? _config$auth$oauthCon6 : proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : proxyAuthConfig.oauthRedirectUrl;
     // Set a default ordering for the oAuth methods
-    var oauthOrder = (_config$auth$oauthOrd = (_config$auth0 = config.auth) === null || _config$auth0 === void 0 ? void 0 : _config$auth0.oauthOrder) !== null && _config$auth$oauthOrd !== void 0 ? _config$auth$oauthOrd : ["google", "apple", "x", "discord", "facebook"].filter(function (provider) {
+    var oauthOrder = (_config$auth$oauthOrd = (_config$auth14 = config.auth) === null || _config$auth14 === void 0 ? void 0 : _config$auth14.oauthOrder) !== null && _config$auth$oauthOrd !== void 0 ? _config$auth$oauthOrd : ["google", "apple", "x", "discord", "facebook"].filter(function (provider) {
       return resolvedMethods["".concat(provider, "OauthEnabled")];
     });
     // Set a default ordering for the overall auth methods
-    var methodOrder = (_config$auth$methodOr = (_config$auth1 = config.auth) === null || _config$auth1 === void 0 ? void 0 : _config$auth1.methodOrder) !== null && _config$auth$methodOr !== void 0 ? _config$auth$methodOr : [oauthOrder.length > 0 ? "socials" : null, resolvedMethods.emailOtpAuthEnabled ? "email" : null, resolvedMethods.smsOtpAuthEnabled ? "sms" : null, resolvedMethods.passkeyAuthEnabled ? "passkey" : null, resolvedMethods.walletAuthEnabled ? "wallet" : null].filter(Boolean);
+    var methodOrder = (_config$auth$methodOr = (_config$auth15 = config.auth) === null || _config$auth15 === void 0 ? void 0 : _config$auth15.methodOrder) !== null && _config$auth$methodOr !== void 0 ? _config$auth$methodOr : [oauthOrder.length > 0 ? "socials" : null, resolvedMethods.emailOtpAuthEnabled ? "email" : null, resolvedMethods.smsOtpAuthEnabled ? "sms" : null, resolvedMethods.passkeyAuthEnabled ? "passkey" : null, resolvedMethods.walletAuthEnabled ? "wallet" : null].filter(Boolean);
     return _objectSpread2(_objectSpread2({}, config), {}, {
       // Overrides:
       auth: _objectSpread2(_objectSpread2({}, config.auth), {}, {
         methods: resolvedMethods,
-        oauthConfig: _objectSpread2(_objectSpread2({}, (_config$auth10 = config.auth) === null || _config$auth10 === void 0 ? void 0 : _config$auth10.oauthConfig), {}, {
-          openOauthInPage: (_config$auth11 = config.auth) === null || _config$auth11 === void 0 ? void 0 : (_config$auth11$oauthC = _config$auth11.oauthConfig) === null || _config$auth11$oauthC === void 0 ? void 0 : _config$auth11$oauthC.openOauthInPage
+        oauthConfig: _objectSpread2(_objectSpread2(_objectSpread2({}, (_config$auth16 = config.auth) === null || _config$auth16 === void 0 ? void 0 : _config$auth16.oauthConfig), resolvedClientIds), {}, {
+          oauthRedirectUri: redirectUrl,
+          // on mobile we default to true since many mobile browsers
+          // (e.g. Safari) block popups
+          openOauthInPage: isMobile ? true : (_config$auth17 = config.auth) === null || _config$auth17 === void 0 ? void 0 : (_config$auth17$oauthC = _config$auth17.oauthConfig) === null || _config$auth17$oauthC === void 0 ? void 0 : _config$auth17$oauthC.openOauthInPage
         }),
         sessionExpirationSeconds: proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : proxyAuthConfig.sessionExpirationSeconds,
         methodOrder: methodOrder,
         oauthOrder: oauthOrder,
-        autoRefreshSession: (_config$auth$autoRefr = (_config$auth12 = config.auth) === null || _config$auth12 === void 0 ? void 0 : _config$auth12.autoRefreshSession) !== null && _config$auth$autoRefr !== void 0 ? _config$auth$autoRefr : true
+        autoRefreshSession: (_config$auth$autoRefr = (_config$auth18 = config.auth) === null || _config$auth18 === void 0 ? void 0 : _config$auth18.autoRefreshSession) !== null && _config$auth$autoRefr !== void 0 ? _config$auth$autoRefr : true
       }),
+      autoRefreshManagedState: (_config$autoRefreshMa = config.autoRefreshManagedState) !== null && _config$autoRefreshMa !== void 0 ? _config$autoRefreshMa : true,
       walletConfig: _objectSpread2(_objectSpread2({}, config.walletConfig), {}, {
         features: _objectSpread2(_objectSpread2({}, (_config$walletConfig = config.walletConfig) === null || _config$walletConfig === void 0 ? void 0 : _config$walletConfig.features), {}, {
           auth: // If walletAuthEnabled is not set, default to true. Wallet auth can be enabled/disabled in the dashboard or by explicitly changing the walletAuthEnabled / walletConfig auth feature.
@@ -746,11 +761,11 @@ var ClientProvider = function ClientProvider(_ref) {
    * @throws {TurnkeyError} If an error occurs while scheduling the session expiration.
    */
   function _initializeWalletProviderListeners() {
-    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee97(walletProviders, onWalletsChanged) {
+    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee99(walletProviders, onWalletsChanged) {
       var _masterConfig$walletC6, _masterConfig$walletC7, _masterConfig$walletC8, _masterConfig$walletC9;
       var cleanups, nativeOnly, ethProviders, solProviders, wcProviders, attachEthereumListeners, attachSolanaListeners;
-      return _regeneratorRuntime().wrap(function _callee97$(_context97) {
-        while (1) switch (_context97.prev = _context97.next) {
+      return _regeneratorRuntime().wrap(function _callee99$(_context99) {
+        while (1) switch (_context99.prev = _context99.next) {
           case 0:
             attachSolanaListeners = function _attachSolanaListener(provider, onWalletsChanged) {
               var _provider$features;
@@ -789,10 +804,10 @@ var ClientProvider = function ClientProvider(_ref) {
               };
             };
             if (!(walletProviders.length === 0)) {
-              _context97.next = 4;
+              _context99.next = 4;
               break;
             }
-            return _context97.abrupt("return", function () {});
+            return _context99.abrupt("return", function () {});
           case 4:
             cleanups = []; // we only want to initialize these listeners for connected walletProviders
             nativeOnly = function nativeOnly(provider) {
@@ -825,16 +840,16 @@ var ClientProvider = function ClientProvider(_ref) {
                 cleanups.push(unsubscribe);
               }
             });
-            return _context97.abrupt("return", function () {
+            return _context99.abrupt("return", function () {
               cleanups.forEach(function (remove) {
                 return remove();
               });
             });
           case 13:
           case "end":
-            return _context97.stop();
+            return _context99.stop();
         }
-      }, _callee97);
+      }, _callee99);
     }));
     return _initializeWalletProviderListeners.apply(this, arguments);
   }
@@ -850,13 +865,13 @@ var ClientProvider = function ClientProvider(_ref) {
    * @throws {TurnkeyError} If an error occurs while clearing the timers.
    */
   function _scheduleSessionExpiration() {
-    _scheduleSessionExpiration = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee100(params) {
+    _scheduleSessionExpiration = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee102(params) {
       var sessionKey, expiry, warnKey, now, expiryMs, timeUntilExpiry, _beforeExpiry, expireSession, warnAt, _callbacks$onError0, _callbacks$onError1;
-      return _regeneratorRuntime().wrap(function _callee100$(_context100) {
-        while (1) switch (_context100.prev = _context100.next) {
+      return _regeneratorRuntime().wrap(function _callee102$(_context102) {
+        while (1) switch (_context102.prev = _context102.next) {
           case 0:
             sessionKey = params.sessionKey, expiry = params.expiry;
-            _context100.prev = 1;
+            _context102.prev = 1;
             warnKey = "".concat(sessionKey, "-warning"); // Replace any prior timers for this session
             clearKey(expiryTimeoutsRef.current, sessionKey);
             clearKey(expiryTimeoutsRef.current, warnKey);
@@ -864,87 +879,87 @@ var ClientProvider = function ClientProvider(_ref) {
             expiryMs = expiry * 1000;
             timeUntilExpiry = expiryMs - now;
             _beforeExpiry = /*#__PURE__*/function () {
-              var _ref120 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee98() {
+              var _ref122 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee100() {
                 var _callbacks$beforeSess, _masterConfig$auth40;
                 var activeSession, session;
-                return _regeneratorRuntime().wrap(function _callee98$(_context98) {
-                  while (1) switch (_context98.prev = _context98.next) {
+                return _regeneratorRuntime().wrap(function _callee100$(_context100) {
+                  while (1) switch (_context100.prev = _context100.next) {
                     case 0:
-                      _context98.next = 2;
+                      _context100.next = 2;
                       return getSession();
                     case 2:
-                      activeSession = _context98.sent;
+                      activeSession = _context100.sent;
                       if (!(!activeSession && expiryTimeoutsRef.current[warnKey])) {
-                        _context98.next = 6;
+                        _context100.next = 6;
                         break;
                       }
                       // Keep nudging until session materializes (short 10s timer is fine)
                       setTimeoutInMap(expiryTimeoutsRef.current, warnKey, _beforeExpiry, 10000);
-                      return _context98.abrupt("return");
+                      return _context100.abrupt("return");
                     case 6:
-                      _context98.next = 8;
+                      _context100.next = 8;
                       return getSession({
                         sessionKey: sessionKey
                       });
                     case 8:
-                      session = _context98.sent;
+                      session = _context100.sent;
                       if (session) {
-                        _context98.next = 11;
+                        _context100.next = 11;
                         break;
                       }
-                      return _context98.abrupt("return");
+                      return _context100.abrupt("return");
                     case 11:
                       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$auth40 = masterConfig.auth) !== null && _masterConfig$auth40 !== void 0 && _masterConfig$auth40.autoRefreshSession)) {
-                        _context98.next = 15;
+                        _context100.next = 15;
                         break;
                       }
-                      _context98.next = 15;
+                      _context100.next = 15;
                       return refreshSession({
                         expirationSeconds: session.expirationSeconds,
                         sessionKey: sessionKey
                       });
                     case 15:
                     case "end":
-                      return _context98.stop();
+                      return _context100.stop();
                   }
-                }, _callee98);
+                }, _callee100);
               }));
               return function beforeExpiry() {
-                return _ref120.apply(this, arguments);
+                return _ref122.apply(this, arguments);
               };
             }();
             expireSession = /*#__PURE__*/function () {
-              var _ref121 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee99() {
+              var _ref123 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee101() {
                 var _callbacks$onSessionE;
                 var expiredSession;
-                return _regeneratorRuntime().wrap(function _callee99$(_context99) {
-                  while (1) switch (_context99.prev = _context99.next) {
+                return _regeneratorRuntime().wrap(function _callee101$(_context101) {
+                  while (1) switch (_context101.prev = _context101.next) {
                     case 0:
-                      _context99.next = 2;
+                      _context101.next = 2;
                       return getSession({
                         sessionKey: sessionKey
                       });
                     case 2:
-                      expiredSession = _context99.sent;
+                      expiredSession = _context101.sent;
                       if (expiredSession) {
-                        _context99.next = 5;
+                        _context101.next = 5;
                         break;
                       }
-                      return _context99.abrupt("return");
+                      return _context101.abrupt("return");
                     case 5:
                       callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onSessionE = callbacks.onSessionExpired) === null || _callbacks$onSessionE === void 0 ? void 0 : _callbacks$onSessionE.call(callbacks, {
                         sessionKey: sessionKey
                       });
-                      _context99.next = 8;
+                      _context101.next = 8;
                       return getActiveSessionKey();
                     case 8:
-                      _context99.t0 = _context99.sent;
-                      _context99.t1 = sessionKey;
-                      if (!(_context99.t0 === _context99.t1)) {
-                        _context99.next = 12;
+                      _context101.t0 = _context101.sent;
+                      _context101.t1 = sessionKey;
+                      if (!(_context101.t0 === _context101.t1)) {
+                        _context101.next = 12;
                         break;
                       }
                       setSession(undefined);
@@ -955,7 +970,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         delete next[sessionKey];
                         return next;
                       });
-                      _context99.next = 15;
+                      _context101.next = 15;
                       return clearSession({
                         sessionKey: sessionKey
                       });
@@ -963,26 +978,26 @@ var ClientProvider = function ClientProvider(_ref) {
                       // Remove timers for this session
                       clearKey(expiryTimeoutsRef.current, sessionKey);
                       clearKey(expiryTimeoutsRef.current, warnKey);
-                      _context99.next = 19;
+                      _context101.next = 19;
                       return logout();
                     case 19:
                     case "end":
-                      return _context99.stop();
+                      return _context101.stop();
                   }
-                }, _callee99);
+                }, _callee101);
               }));
               return function expireSession() {
-                return _ref121.apply(this, arguments);
+                return _ref123.apply(this, arguments);
               };
             }(); // Already expired → expire immediately
             if (!(timeUntilExpiry <= 0)) {
-              _context100.next = 14;
+              _context102.next = 14;
               break;
             }
-            _context100.next = 13;
+            _context102.next = 13;
             return expireSession();
           case 13:
-            return _context100.abrupt("return");
+            return _context102.abrupt("return");
           case 14:
             // Warning timer (if threshold is in the future)
             warnAt = expiryMs - SESSION_WARNING_THRESHOLD_MS;
@@ -993,21 +1008,21 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             // Actual expiry timer (safe for long delays)
             setCappedTimeoutInMap(expiryTimeoutsRef.current, sessionKey, expireSession, timeUntilExpiry);
-            _context100.next = 22;
+            _context102.next = 22;
             break;
           case 19:
-            _context100.prev = 19;
-            _context100.t0 = _context100["catch"](1);
-            if (_context100.t0 instanceof TurnkeyError || _context100.t0 instanceof TurnkeyNetworkError) {
-              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError0 = callbacks.onError) === null || _callbacks$onError0 === void 0 ? void 0 : _callbacks$onError0.call(callbacks, _context100.t0);
+            _context102.prev = 19;
+            _context102.t0 = _context102["catch"](1);
+            if (_context102.t0 instanceof TurnkeyError || _context102.t0 instanceof TurnkeyNetworkError) {
+              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError0 = callbacks.onError) === null || _callbacks$onError0 === void 0 ? void 0 : _callbacks$onError0.call(callbacks, _context102.t0);
             } 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, _context100.t0));
+              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, _context102.t0));
             }
           case 22:
           case "end":
-            return _context100.stop();
+            return _context102.stop();
         }
-      }, _callee100, null, [[1, 19]]);
+      }, _callee102, null, [[1, 19]]);
     }));
     return _scheduleSessionExpiration.apply(this, arguments);
   }
@@ -1322,7 +1337,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref10.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var getWalletProviders = useCallback(/*#__PURE__*/function () {
+  var fetchWalletProviders = useCallback(/*#__PURE__*/function () {
     var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(chain) {
       var newProviders;
       return _regeneratorRuntime().wrap(function _callee13$(_context13) {
@@ -1335,7 +1350,7 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             _context13.next = 4;
-            return client.getWalletProviders(chain);
+            return client.fetchWalletProviders(chain);
           case 4:
             newProviders = _context13.sent;
             // we update state with the latest providers
@@ -2154,9 +2169,8 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref34.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var updateUserEmail = useCallback(/*#__PURE__*/function () {
+  var fetchOrCreateP256ApiKeyUser = useCallback(/*#__PURE__*/function () {
     var _ref35 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
-      var res;
       return _regeneratorRuntime().wrap(function _callee36$(_context36) {
         while (1) switch (_context36.prev = _context36.next) {
           case 0:
@@ -2166,23 +2180,10 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context36.next = 4;
-            return withTurnkeyErrorHandling(function () {
-              return client.updateUserEmail(params);
-            }, callbacks, "Failed to update user email");
-          case 4:
-            res = _context36.sent;
-            if (!res) {
-              _context36.next = 8;
-              break;
-            }
-            _context36.next = 8;
-            return refreshUser({
-              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
-            });
-          case 8:
-            return _context36.abrupt("return", res);
-          case 9:
+            return _context36.abrupt("return", withTurnkeyErrorHandling(function () {
+              return client.fetchOrCreateP256ApiKeyUser(params);
+            }, callbacks, "Failed to fetch or create delegated access user"));
+          case 3:
           case "end":
             return _context36.stop();
         }
@@ -2192,9 +2193,8 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref35.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var removeUserEmail = useCallback(/*#__PURE__*/function () {
+  var fetchOrCreatePolicies = useCallback(/*#__PURE__*/function () {
     var _ref36 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
-      var res;
       return _regeneratorRuntime().wrap(function _callee37$(_context37) {
         while (1) switch (_context37.prev = _context37.next) {
           case 0:
@@ -2204,23 +2204,10 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context37.next = 4;
-            return withTurnkeyErrorHandling(function () {
-              return client.removeUserEmail(params);
-            }, callbacks, "Failed to remove user email");
-          case 4:
-            res = _context37.sent;
-            if (!res) {
-              _context37.next = 8;
-              break;
-            }
-            _context37.next = 8;
-            return refreshUser({
-              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
-            });
-          case 8:
-            return _context37.abrupt("return", res);
-          case 9:
+            return _context37.abrupt("return", withTurnkeyErrorHandling(function () {
+              return client.fetchOrCreatePolicies(params);
+            }, callbacks, "Failed to fetch or create delegated access user"));
+          case 3:
           case "end":
             return _context37.stop();
         }
@@ -2230,7 +2217,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref36.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var updateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
+  var updateUserEmail = useCallback(/*#__PURE__*/function () {
     var _ref37 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee38$(_context38) {
@@ -2244,8 +2231,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context38.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.updateUserPhoneNumber(params);
-            }, callbacks, "Failed to update user phone number");
+              return client.updateUserEmail(params);
+            }, callbacks, "Failed to update user email");
           case 4:
             res = _context38.sent;
             if (!res) {
@@ -2268,7 +2255,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref37.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var removeUserPhoneNumber = useCallback(/*#__PURE__*/function () {
+  var removeUserEmail = useCallback(/*#__PURE__*/function () {
     var _ref38 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee39$(_context39) {
@@ -2282,8 +2269,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context39.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.removeUserPhoneNumber(params);
-            }, callbacks, "Failed to remove user phone number");
+              return client.removeUserEmail(params);
+            }, callbacks, "Failed to remove user email");
           case 4:
             res = _context39.sent;
             if (!res) {
@@ -2306,7 +2293,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref38.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var updateUserName = useCallback(/*#__PURE__*/function () {
+  var updateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref39 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee40$(_context40) {
@@ -2320,8 +2307,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context40.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.updateUserName(params);
-            }, callbacks, "Failed to update user name");
+              return client.updateUserPhoneNumber(params);
+            }, callbacks, "Failed to update user phone number");
           case 4:
             res = _context40.sent;
             if (!res) {
@@ -2344,7 +2331,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref39.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var addOauthProvider = useCallback(/*#__PURE__*/function () {
+  var removeUserPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref40 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee41$(_context41) {
@@ -2358,8 +2345,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context41.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.addOauthProvider(params);
-            }, callbacks, "Failed to add OAuth provider");
+              return client.removeUserPhoneNumber(params);
+            }, callbacks, "Failed to remove user phone number");
           case 4:
             res = _context41.sent;
             if (!res) {
@@ -2382,7 +2369,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref40.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var removeOauthProviders = useCallback(/*#__PURE__*/function () {
+  var updateUserName = useCallback(/*#__PURE__*/function () {
     var _ref41 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee42$(_context42) {
@@ -2396,8 +2383,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context42.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.removeOauthProviders(params);
-            }, callbacks, "Failed to remove OAuth providers");
+              return client.updateUserName(params);
+            }, callbacks, "Failed to update user name");
           case 4:
             res = _context42.sent;
             if (!res) {
@@ -2420,7 +2407,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref41.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var addPasskey = useCallback(/*#__PURE__*/function () {
+  var addOauthProvider = useCallback(/*#__PURE__*/function () {
     var _ref42 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee43$(_context43) {
@@ -2434,8 +2421,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context43.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.addPasskey(params);
-            }, callbacks, "Failed to add passkey");
+              return client.addOauthProvider(params);
+            }, callbacks, "Failed to add OAuth provider");
           case 4:
             res = _context43.sent;
             if (!res) {
@@ -2458,7 +2445,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref42.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var removePasskeys = useCallback(/*#__PURE__*/function () {
+  var removeOauthProviders = useCallback(/*#__PURE__*/function () {
     var _ref43 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee44(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee44$(_context44) {
@@ -2472,8 +2459,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context44.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.removePasskeys(params);
-            }, callbacks, "Failed to remove passkeys");
+              return client.removeOauthProviders(params);
+            }, callbacks, "Failed to remove OAuth providers");
           case 4:
             res = _context44.sent;
             if (!res) {
@@ -2496,7 +2483,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref43.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var createWallet = useCallback(/*#__PURE__*/function () {
+  var addPasskey = useCallback(/*#__PURE__*/function () {
     var _ref44 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee45(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee45$(_context45) {
@@ -2510,8 +2497,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context45.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.createWallet(params);
-            }, callbacks, "Failed to create wallet");
+              return client.addPasskey(params);
+            }, callbacks, "Failed to add passkey");
           case 4:
             res = _context45.sent;
             if (!res) {
@@ -2519,7 +2506,7 @@ var ClientProvider = function ClientProvider(_ref) {
               break;
             }
             _context45.next = 8;
-            return refreshWallets({
+            return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
@@ -2534,7 +2521,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref44.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var createWalletAccounts = useCallback(/*#__PURE__*/function () {
+  var removePasskeys = useCallback(/*#__PURE__*/function () {
     var _ref45 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee46(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee46$(_context46) {
@@ -2548,8 +2535,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context46.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.createWalletAccounts(params);
-            }, callbacks, "Failed to create wallet accounts");
+              return client.removePasskeys(params);
+            }, callbacks, "Failed to remove passkeys");
           case 4:
             res = _context46.sent;
             if (!res) {
@@ -2557,7 +2544,7 @@ var ClientProvider = function ClientProvider(_ref) {
               break;
             }
             _context46.next = 8;
-            return refreshWallets({
+            return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
@@ -2572,7 +2559,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref45.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var exportWallet = useCallback(/*#__PURE__*/function () {
+  var createWallet = useCallback(/*#__PURE__*/function () {
     var _ref46 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee47(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee47$(_context47) {
@@ -2586,8 +2573,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context47.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.exportWallet(params);
-            }, callbacks, "Failed to export wallet");
+              return client.createWallet(params);
+            }, callbacks, "Failed to create wallet");
           case 4:
             res = _context47.sent;
             if (!res) {
@@ -2610,7 +2597,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref46.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var exportPrivateKey = useCallback(/*#__PURE__*/function () {
+  var createWalletAccounts = useCallback(/*#__PURE__*/function () {
     var _ref47 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee48(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee48$(_context48) {
@@ -2624,12 +2611,21 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context48.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.exportPrivateKey(params);
-            }, callbacks, "Failed to export private key");
+              return client.createWalletAccounts(params);
+            }, callbacks, "Failed to create wallet accounts");
           case 4:
             res = _context48.sent;
+            if (!res) {
+              _context48.next = 8;
+              break;
+            }
+            _context48.next = 8;
+            return refreshWallets({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            });
+          case 8:
             return _context48.abrupt("return", res);
-          case 6:
+          case 9:
           case "end":
             return _context48.stop();
         }
@@ -2639,7 +2635,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref47.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var exportWalletAccount = useCallback(/*#__PURE__*/function () {
+  var exportWallet = useCallback(/*#__PURE__*/function () {
     var _ref48 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee49(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee49$(_context49) {
@@ -2653,8 +2649,8 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context49.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.exportWalletAccount(params);
-            }, callbacks, "Failed to export wallet accounts");
+              return client.exportWallet(params);
+            }, callbacks, "Failed to export wallet");
           case 4:
             res = _context49.sent;
             if (!res) {
@@ -2677,7 +2673,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref48.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var importWallet = useCallback(/*#__PURE__*/function () {
+  var exportPrivateKey = useCallback(/*#__PURE__*/function () {
     var _ref49 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee50(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee50$(_context50) {
@@ -2691,21 +2687,12 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context50.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.importWallet(params);
-            }, callbacks, "Failed to import wallet");
+              return client.exportPrivateKey(params);
+            }, callbacks, "Failed to export private key");
           case 4:
             res = _context50.sent;
-            if (!res) {
-              _context50.next = 8;
-              break;
-            }
-            _context50.next = 8;
-            return refreshWallets({
-              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
-            });
-          case 8:
             return _context50.abrupt("return", res);
-          case 9:
+          case 6:
           case "end":
             return _context50.stop();
         }
@@ -2715,7 +2702,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref49.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var importPrivateKey = useCallback(/*#__PURE__*/function () {
+  var exportWalletAccount = useCallback(/*#__PURE__*/function () {
     var _ref50 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee51(params) {
       var res;
       return _regeneratorRuntime().wrap(function _callee51$(_context51) {
@@ -2729,12 +2716,21 @@ var ClientProvider = function ClientProvider(_ref) {
           case 2:
             _context51.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.importPrivateKey(params);
-            }, callbacks, "Failed to import private key");
+              return client.exportWalletAccount(params);
+            }, callbacks, "Failed to export wallet accounts");
           case 4:
             res = _context51.sent;
+            if (!res) {
+              _context51.next = 8;
+              break;
+            }
+            _context51.next = 8;
+            return refreshWallets({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            });
+          case 8:
             return _context51.abrupt("return", res);
-          case 6:
+          case 9:
           case "end":
             return _context51.stop();
         }
@@ -2743,9 +2739,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x46) {
       return _ref50.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var deleteSubOrganization = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, masterConfig, session, user]);
+  var importWallet = useCallback(/*#__PURE__*/function () {
     var _ref51 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee52(params) {
+      var res;
       return _regeneratorRuntime().wrap(function _callee52$(_context52) {
         while (1) switch (_context52.prev = _context52.next) {
           case 0:
@@ -2755,10 +2752,23 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context52.abrupt("return", withTurnkeyErrorHandling(function () {
-              return client.deleteSubOrganization(params);
-            }, callbacks, "Failed to delete sub-organization"));
-          case 3:
+            _context52.next = 4;
+            return withTurnkeyErrorHandling(function () {
+              return client.importWallet(params);
+            }, callbacks, "Failed to import wallet");
+          case 4:
+            res = _context52.sent;
+            if (!res) {
+              _context52.next = 8;
+              break;
+            }
+            _context52.next = 8;
+            return refreshWallets({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            });
+          case 8:
+            return _context52.abrupt("return", res);
+          case 9:
           case "end":
             return _context52.stop();
         }
@@ -2767,10 +2777,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x47) {
       return _ref51.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var storeSession = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, masterConfig, session, user]);
+  var importPrivateKey = useCallback(/*#__PURE__*/function () {
     var _ref52 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee53(params) {
-      var sessionKey, session, allSessions;
+      var res;
       return _regeneratorRuntime().wrap(function _callee53$(_context53) {
         while (1) switch (_context53.prev = _context53.next) {
           case 0:
@@ -2781,150 +2791,203 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             _context53.next = 4;
+            return withTurnkeyErrorHandling(function () {
+              return client.importPrivateKey(params);
+            }, callbacks, "Failed to import private key");
+          case 4:
+            res = _context53.sent;
+            return _context53.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context53.stop();
+        }
+      }, _callee53);
+    }));
+    return function (_x48) {
+      return _ref52.apply(this, arguments);
+    };
+  }(), [client, callbacks, masterConfig, session, user]);
+  var deleteSubOrganization = useCallback(/*#__PURE__*/function () {
+    var _ref53 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee54(params) {
+      return _regeneratorRuntime().wrap(function _callee54$(_context54) {
+        while (1) switch (_context54.prev = _context54.next) {
+          case 0:
+            if (client) {
+              _context54.next = 2;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 2:
+            return _context54.abrupt("return", withTurnkeyErrorHandling(function () {
+              return client.deleteSubOrganization(params);
+            }, callbacks, "Failed to delete sub-organization"));
+          case 3:
+          case "end":
+            return _context54.stop();
+        }
+      }, _callee54);
+    }));
+    return function (_x49) {
+      return _ref53.apply(this, arguments);
+    };
+  }(), [client, callbacks, masterConfig, session, user]);
+  var storeSession = useCallback(/*#__PURE__*/function () {
+    var _ref54 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee55(params) {
+      var sessionKey, session, allSessions;
+      return _regeneratorRuntime().wrap(function _callee55$(_context55) {
+        while (1) switch (_context55.prev = _context55.next) {
+          case 0:
+            if (client) {
+              _context55.next = 2;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 2:
+            _context55.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.storeSession(params);
             }, callbacks, "Failed to store session");
           case 4:
-            _context53.next = 6;
+            _context55.next = 6;
             return getActiveSessionKey();
           case 6:
-            sessionKey = _context53.sent;
-            _context53.next = 9;
+            sessionKey = _context55.sent;
+            _context55.next = 9;
             return getSession(_objectSpread2({}, sessionKey && {
               sessionKey: sessionKey
             }));
           case 9:
-            session = _context53.sent;
+            session = _context55.sent;
             if (!(session && sessionKey)) {
-              _context53.next = 13;
+              _context55.next = 13;
               break;
             }
-            _context53.next = 13;
+            _context55.next = 13;
             return scheduleSessionExpiration({
               sessionKey: sessionKey,
               expiry: session.expiry
             });
           case 13:
-            _context53.next = 15;
+            _context55.next = 15;
             return getAllSessions();
           case 15:
-            allSessions = _context53.sent;
+            allSessions = _context55.sent;
             setSession(session);
             setAllSessions(allSessions);
-            return _context53.abrupt("return");
+            return _context55.abrupt("return");
           case 19:
           case "end":
-            return _context53.stop();
+            return _context55.stop();
         }
-      }, _callee53);
+      }, _callee55);
     }));
-    return function (_x48) {
-      return _ref52.apply(this, arguments);
+    return function (_x50) {
+      return _ref54.apply(this, arguments);
     };
-  }(), [client, callbacks]);
+  }(), [client, callbacks, masterConfig, session, user]);
   var clearSession = useCallback(/*#__PURE__*/function () {
-    var _ref53 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee54(params) {
+    var _ref55 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee56(params) {
       var session, allSessions;
-      return _regeneratorRuntime().wrap(function _callee54$(_context54) {
-        while (1) switch (_context54.prev = _context54.next) {
+      return _regeneratorRuntime().wrap(function _callee56$(_context56) {
+        while (1) switch (_context56.prev = _context56.next) {
           case 0:
             if (client) {
-              _context54.next = 2;
+              _context56.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context54.next = 4;
+            _context56.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.clearSession(params);
             }, callbacks, "Failed to clear session");
           case 4:
-            _context54.next = 6;
+            _context56.next = 6;
             return getSession();
           case 6:
-            session = _context54.sent;
-            _context54.next = 9;
+            session = _context56.sent;
+            _context56.next = 9;
             return getAllSessions();
           case 9:
-            allSessions = _context54.sent;
+            allSessions = _context56.sent;
             setSession(session);
             setAllSessions(allSessions);
-            return _context54.abrupt("return");
+            return _context56.abrupt("return");
           case 13:
           case "end":
-            return _context54.stop();
+            return _context56.stop();
         }
-      }, _callee54);
+      }, _callee56);
     }));
-    return function (_x49) {
-      return _ref53.apply(this, arguments);
+    return function (_x51) {
+      return _ref55.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var clearAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee55() {
-    return _regeneratorRuntime().wrap(function _callee55$(_context55) {
-      while (1) switch (_context55.prev = _context55.next) {
+  }(), [client, callbacks, session, user, masterConfig]);
+  var clearAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee57() {
+    return _regeneratorRuntime().wrap(function _callee57$(_context57) {
+      while (1) switch (_context57.prev = _context57.next) {
         case 0:
           if (client) {
-            _context55.next = 2;
+            _context57.next = 2;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 2:
           setSession(undefined);
           setAllSessions(undefined);
-          _context55.next = 6;
+          _context57.next = 6;
           return withTurnkeyErrorHandling(function () {
             return client.clearAllSessions();
           }, callbacks, "Failed to clear all sessions");
         case 6:
-          return _context55.abrupt("return", _context55.sent);
+          return _context57.abrupt("return", _context57.sent);
         case 7:
         case "end":
-          return _context55.stop();
+          return _context57.stop();
       }
-    }, _callee55);
-  })), [client, callbacks]);
+    }, _callee57);
+  })), [client, callbacks, session, user, masterConfig]);
   var refreshSession = useCallback(/*#__PURE__*/function () {
-    var _ref55 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee56(params) {
+    var _ref57 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee58(params) {
       var _params$sessionKey;
       var activeSessionKey, sessionKey, res, session, allSessions;
-      return _regeneratorRuntime().wrap(function _callee56$(_context56) {
-        while (1) switch (_context56.prev = _context56.next) {
+      return _regeneratorRuntime().wrap(function _callee58$(_context58) {
+        while (1) switch (_context58.prev = _context58.next) {
           case 0:
             if (client) {
-              _context56.next = 2;
+              _context58.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context56.next = 4;
+            _context58.next = 4;
             return client.getActiveSessionKey();
           case 4:
-            activeSessionKey = _context56.sent;
+            activeSessionKey = _context58.sent;
             if (activeSessionKey) {
-              _context56.next = 7;
+              _context58.next = 7;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 7:
             sessionKey = (_params$sessionKey = params === null || params === void 0 ? void 0 : params.sessionKey) !== null && _params$sessionKey !== void 0 ? _params$sessionKey : activeSessionKey;
-            _context56.next = 10;
+            _context58.next = 10;
             return withTurnkeyErrorHandling(function () {
               return client.refreshSession(_objectSpread2({}, params));
             }, callbacks, "Failed to refresh session");
           case 10:
-            res = _context56.sent;
-            _context56.next = 13;
+            res = _context58.sent;
+            _context58.next = 13;
             return getSession({
               sessionKey: sessionKey
             });
           case 13:
-            session = _context56.sent;
+            session = _context58.sent;
             if (!(session && sessionKey)) {
-              _context56.next = 17;
+              _context58.next = 17;
               break;
             }
-            _context56.next = 17;
+            _context58.next = 17;
             return scheduleSessionExpiration(_objectSpread2({
               sessionKey: sessionKey,
               expiry: session.expiry
@@ -2932,326 +2995,338 @@ var ClientProvider = function ClientProvider(_ref) {
               expirationSeconds: params === null || params === void 0 ? void 0 : params.expirationSeconds
             }));
           case 17:
-            _context56.next = 19;
+            _context58.next = 19;
             return getAllSessions();
           case 19:
-            allSessions = _context56.sent;
+            allSessions = _context58.sent;
             setSession(session);
             setAllSessions(allSessions);
-            return _context56.abrupt("return", res);
+            return _context58.abrupt("return", res);
           case 23:
           case "end":
-            return _context56.stop();
+            return _context58.stop();
         }
-      }, _callee56);
+      }, _callee58);
     }));
-    return function (_x50) {
-      return _ref55.apply(this, arguments);
+    return function (_x52) {
+      return _ref57.apply(this, arguments);
     };
-  }(), [client, callbacks]);
+  }(), [client, callbacks, scheduleSessionExpiration, session, user, masterConfig]);
   var getSession = useCallback(/*#__PURE__*/function () {
-    var _ref56 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee57(params) {
-      return _regeneratorRuntime().wrap(function _callee57$(_context57) {
-        while (1) switch (_context57.prev = _context57.next) {
+    var _ref58 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee59(params) {
+      return _regeneratorRuntime().wrap(function _callee59$(_context59) {
+        while (1) switch (_context59.prev = _context59.next) {
           case 0:
             if (client) {
-              _context57.next = 2;
+              _context59.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context57.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context59.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.getSession(params);
             }, callbacks, "Failed to get session"));
           case 3:
           case "end":
-            return _context57.stop();
+            return _context59.stop();
         }
-      }, _callee57);
+      }, _callee59);
     }));
-    return function (_x51) {
-      return _ref56.apply(this, arguments);
+    return function (_x53) {
+      return _ref58.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var getAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee58() {
-    return _regeneratorRuntime().wrap(function _callee58$(_context58) {
-      while (1) switch (_context58.prev = _context58.next) {
+  }(), [client, callbacks, masterConfig, session, user]);
+  var getAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee60() {
+    return _regeneratorRuntime().wrap(function _callee60$(_context60) {
+      while (1) switch (_context60.prev = _context60.next) {
         case 0:
           if (client) {
-            _context58.next = 2;
+            _context60.next = 2;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 2:
-          return _context58.abrupt("return", withTurnkeyErrorHandling(function () {
+          return _context60.abrupt("return", withTurnkeyErrorHandling(function () {
             return client.getAllSessions();
           }, callbacks, "Failed to get all sessions"));
         case 3:
         case "end":
-          return _context58.stop();
+          return _context60.stop();
       }
-    }, _callee58);
-  })), [client, callbacks]);
+    }, _callee60);
+  })), [client, callbacks, masterConfig, session, user]);
   var setActiveSession = useCallback(/*#__PURE__*/function () {
-    var _ref58 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee60(params) {
+    var _ref60 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee62(params) {
       var session;
-      return _regeneratorRuntime().wrap(function _callee60$(_context60) {
-        while (1) switch (_context60.prev = _context60.next) {
+      return _regeneratorRuntime().wrap(function _callee62$(_context62) {
+        while (1) switch (_context62.prev = _context62.next) {
           case 0:
             if (client) {
-              _context60.next = 2;
+              _context62.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context60.next = 4;
+            _context62.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.getSession({
                 sessionKey: params.sessionKey
               });
             }, callbacks, "Failed to get session");
           case 4:
-            session = _context60.sent;
+            session = _context62.sent;
             if (session) {
-              _context60.next = 7;
+              _context62.next = 7;
               break;
             }
             throw new TurnkeyError("Session not found.", TurnkeyErrorCodes.NOT_FOUND);
           case 7:
-            _context60.next = 9;
+            _context62.next = 9;
             return withTurnkeyErrorHandling(function () {
               return client.setActiveSession(params);
             }, callbacks, "Failed to set active session");
           case 9:
             setSession(session);
-            _context60.next = 12;
-            return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee59() {
-              return _regeneratorRuntime().wrap(function _callee59$(_context59) {
-                while (1) switch (_context59.prev = _context59.next) {
+            _context62.next = 12;
+            return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee61() {
+              return _regeneratorRuntime().wrap(function _callee61$(_context61) {
+                while (1) switch (_context61.prev = _context61.next) {
                   case 0:
-                    _context59.next = 2;
+                    _context61.next = 2;
                     return refreshWallets();
                   case 2:
-                    _context59.next = 4;
+                    _context61.next = 4;
                     return refreshUser();
                   case 4:
                   case "end":
-                    return _context59.stop();
+                    return _context61.stop();
                 }
-              }, _callee59);
+              }, _callee61);
             })), callbacks, "Failed to refresh data after setting active session");
           case 12:
-            return _context60.abrupt("return");
+            return _context62.abrupt("return");
           case 13:
           case "end":
-            return _context60.stop();
+            return _context62.stop();
         }
-      }, _callee60);
+      }, _callee62);
     }));
-    return function (_x52) {
-      return _ref58.apply(this, arguments);
+    return function (_x54) {
+      return _ref60.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var getActiveSessionKey = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee61() {
-    return _regeneratorRuntime().wrap(function _callee61$(_context61) {
-      while (1) switch (_context61.prev = _context61.next) {
+  }(), [client, callbacks, session, user, masterConfig]);
+  var getActiveSessionKey = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee63() {
+    return _regeneratorRuntime().wrap(function _callee63$(_context63) {
+      while (1) switch (_context63.prev = _context63.next) {
         case 0:
           if (client) {
-            _context61.next = 2;
+            _context63.next = 2;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 2:
-          return _context61.abrupt("return", withTurnkeyErrorHandling(function () {
+          return _context63.abrupt("return", withTurnkeyErrorHandling(function () {
             return client.getActiveSessionKey();
           }, callbacks, "Failed to get active session key"));
         case 3:
         case "end":
-          return _context61.stop();
+          return _context63.stop();
       }
-    }, _callee61);
-  })), [client, callbacks]);
-  var clearUnusedKeyPairs = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee62() {
-    return _regeneratorRuntime().wrap(function _callee62$(_context62) {
-      while (1) switch (_context62.prev = _context62.next) {
+    }, _callee63);
+  })), [client, callbacks, masterConfig, session, user]);
+  var clearUnusedKeyPairs = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee64() {
+    return _regeneratorRuntime().wrap(function _callee64$(_context64) {
+      while (1) switch (_context64.prev = _context64.next) {
         case 0:
           if (client) {
-            _context62.next = 2;
+            _context64.next = 2;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 2:
-          return _context62.abrupt("return", withTurnkeyErrorHandling(function () {
+          return _context64.abrupt("return", withTurnkeyErrorHandling(function () {
             return client.clearUnusedKeyPairs();
           }, callbacks, "Failed to clear unused key pairs"));
         case 3:
         case "end":
-          return _context62.stop();
+          return _context64.stop();
       }
-    }, _callee62);
-  })), [client, callbacks]);
+    }, _callee64);
+  })), [client, callbacks, masterConfig, session, user]);
   var createApiKeyPair = useCallback(/*#__PURE__*/function () {
-    var _ref62 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee63(params) {
-      return _regeneratorRuntime().wrap(function _callee63$(_context63) {
-        while (1) switch (_context63.prev = _context63.next) {
+    var _ref64 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee65(params) {
+      return _regeneratorRuntime().wrap(function _callee65$(_context65) {
+        while (1) switch (_context65.prev = _context65.next) {
           case 0:
             if (client) {
-              _context63.next = 2;
+              _context65.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context63.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context65.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.createApiKeyPair(params);
             }, callbacks, "Failed to create API key pair"));
           case 3:
           case "end":
-            return _context63.stop();
+            return _context65.stop();
         }
-      }, _callee63);
+      }, _callee65);
     }));
-    return function (_x53) {
-      return _ref62.apply(this, arguments);
+    return function (_x55) {
+      return _ref64.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var getProxyAuthConfig = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee64() {
-    return _regeneratorRuntime().wrap(function _callee64$(_context64) {
-      while (1) switch (_context64.prev = _context64.next) {
+  }(), [client, callbacks, session, user, masterConfig]);
+  var getProxyAuthConfig = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee66() {
+    return _regeneratorRuntime().wrap(function _callee66$(_context66) {
+      while (1) switch (_context66.prev = _context66.next) {
         case 0:
           if (client) {
-            _context64.next = 2;
+            _context66.next = 2;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 2:
-          return _context64.abrupt("return", withTurnkeyErrorHandling(function () {
+          return _context66.abrupt("return", withTurnkeyErrorHandling(function () {
             return client.getProxyAuthConfig();
           }, callbacks, "Failed to get proxy auth config"));
         case 3:
         case "end":
-          return _context64.stop();
+          return _context66.stop();
       }
-    }, _callee64);
-  })), [client, callbacks]);
+    }, _callee66);
+  })), [client, callbacks, masterConfig, session, user]);
   var refreshUser = useCallback(/*#__PURE__*/function () {
-    var _ref64 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee65(params) {
-      var _ref65, stampWith, user;
-      return _regeneratorRuntime().wrap(function _callee65$(_context65) {
-        while (1) switch (_context65.prev = _context65.next) {
+    var _ref66 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee67(params) {
+      var _ref67, stampWith, user;
+      return _regeneratorRuntime().wrap(function _callee67$(_context67) {
+        while (1) switch (_context67.prev = _context67.next) {
           case 0:
-            _ref65 = params || {}, stampWith = _ref65.stampWith;
+            if (masterConfig !== null && masterConfig !== void 0 && masterConfig.autoRefreshManagedState) {
+              _context67.next = 2;
+              break;
+            }
+            return _context67.abrupt("return");
+          case 2:
+            _ref67 = params || {}, stampWith = _ref67.stampWith;
             if (client) {
-              _context65.next = 3;
+              _context67.next = 5;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
-          case 3:
-            _context65.next = 5;
+          case 5:
+            _context67.next = 7;
             return withTurnkeyErrorHandling(function () {
               return fetchUser({
                 stampWith: stampWith
               });
             }, callbacks, "Failed to refresh user");
-          case 5:
-            user = _context65.sent;
+          case 7:
+            user = _context67.sent;
             if (user) {
               setUser(user);
             }
-          case 7:
+          case 9:
           case "end":
-            return _context65.stop();
+            return _context67.stop();
         }
-      }, _callee65);
+      }, _callee67);
     }));
-    return function (_x54) {
-      return _ref64.apply(this, arguments);
+    return function (_x56) {
+      return _ref66.apply(this, arguments);
     };
-  }(), [client, callbacks]);
+  }(), [client, callbacks, fetchUser, masterConfig, session, user]);
   var refreshWallets = useCallback(/*#__PURE__*/function () {
-    var _ref66 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee66(params) {
-      var _ref67, stampWith, walletProviders, wallets;
-      return _regeneratorRuntime().wrap(function _callee66$(_context66) {
-        while (1) switch (_context66.prev = _context66.next) {
+    var _ref68 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee68(params) {
+      var _ref69, stampWith, walletProviders, wallets;
+      return _regeneratorRuntime().wrap(function _callee68$(_context68) {
+        while (1) switch (_context68.prev = _context68.next) {
           case 0:
-            _ref67 = params || {}, stampWith = _ref67.stampWith;
+            if (masterConfig !== null && masterConfig !== void 0 && masterConfig.autoRefreshManagedState) {
+              _context68.next = 2;
+              break;
+            }
+            return _context68.abrupt("return");
+          case 2:
+            _ref69 = params || {}, stampWith = _ref69.stampWith;
             if (client) {
-              _context66.next = 3;
+              _context68.next = 5;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
-          case 3:
-            _context66.next = 5;
+          case 5:
+            _context68.next = 7;
             return withTurnkeyErrorHandling(function () {
-              return getWalletProviders();
+              return fetchWalletProviders();
             }, callbacks, "Failed to refresh wallets");
-          case 5:
-            walletProviders = _context66.sent;
-            _context66.next = 8;
+          case 7:
+            walletProviders = _context68.sent;
+            _context68.next = 10;
             return withTurnkeyErrorHandling(function () {
               return fetchWallets({
                 stampWith: stampWith,
                 walletProviders: walletProviders
               });
             }, callbacks, "Failed to refresh wallets");
-          case 8:
-            wallets = _context66.sent;
+          case 10:
+            wallets = _context68.sent;
             if (wallets) {
               setWallets(wallets);
             }
-          case 10:
+          case 12:
           case "end":
-            return _context66.stop();
+            return _context68.stop();
         }
-      }, _callee66);
+      }, _callee68);
     }));
-    return function (_x55) {
-      return _ref66.apply(this, arguments);
+    return function (_x57) {
+      return _ref68.apply(this, arguments);
     };
-  }(), [client, callbacks, getWalletProviders, fetchWallets]);
+  }(), [client, callbacks, fetchWalletProviders, fetchWallets, masterConfig, session, user]);
   var handleDiscordOauth = useCallback(/*#__PURE__*/function () {
-    var _ref68 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee67(params) {
+    var _ref70 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee69(params) {
       var _masterConfig$auth18, _masterConfig$auth18$, _masterConfig$auth$oa2, _masterConfig$auth19, _masterConfig$auth19$;
-      var _ref69, _ref69$clientId, clientId, _ref69$openInPage, openInPage, additionalParameters, _masterConfig$auth20, _masterConfig$auth20$, _masterConfig$auth21, flow, redirectURI, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, discordAuthUrl, extra, width, height, left, top, authWindow;
-      return _regeneratorRuntime().wrap(function _callee67$(_context67) {
-        while (1) switch (_context67.prev = _context67.next) {
+      var _ref71, _ref71$clientId, clientId, _ref71$openInPage, openInPage, additionalParameters, _masterConfig$auth20, _masterConfig$auth20$, _masterConfig$auth21, flow, redirectURI, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, discordAuthUrl, extra, width, height, left, top, authWindow;
+      return _regeneratorRuntime().wrap(function _callee69$(_context69) {
+        while (1) switch (_context69.prev = _context69.next) {
           case 0:
-            _ref69 = params || {}, _ref69$clientId = _ref69.clientId, clientId = _ref69$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 : _ref69$clientId, _ref69$openInPage = _ref69.openInPage, openInPage = _ref69$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 : _ref69$openInPage, additionalParameters = _ref69.additionalState;
-            _context67.prev = 1;
+            _ref71 = params || {}, _ref71$clientId = _ref71.clientId, clientId = _ref71$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 : _ref71$clientId, _ref71$openInPage = _ref71.openInPage, openInPage = _ref71$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 : _ref71$openInPage, additionalParameters = _ref71.additionalState;
+            _context69.prev = 1;
             if (masterConfig) {
-              _context67.next = 4;
+              _context69.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             if (clientId) {
-              _context67.next = 6;
+              _context69.next = 6;
               break;
             }
             throw new TurnkeyError("Discord Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 6:
             if ((_masterConfig$auth20 = masterConfig.auth) !== null && _masterConfig$auth20 !== void 0 && (_masterConfig$auth20$ = _masterConfig$auth20.oauthConfig) !== null && _masterConfig$auth20$ !== void 0 && _masterConfig$auth20$.oauthRedirectUri) {
-              _context67.next = 8;
+              _context69.next = 8;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 8:
             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
-            _context67.next = 12;
+            _context69.next = 12;
             return createApiKeyPair();
           case 12:
-            publicKey = _context67.sent;
+            publicKey = _context69.sent;
             if (publicKey) {
-              _context67.next = 15;
+              _context69.next = 15;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 15:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair
-            _context67.next = 18;
+            _context69.next = 18;
             return generateChallengePair();
           case 18:
-            _yield$generateChalle = _context67.sent;
+            _yield$generateChalle = _context69.sent;
             verifier = _yield$generateChalle.verifier;
             codeChallenge = _yield$generateChalle.codeChallenge;
             sessionStorage.setItem("discord_verifier", verifier);
@@ -3265,10 +3340,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 (_ref70) {
-                var _ref71 = _slicedToArray(_ref70, 2),
-                  k = _ref71[0],
-                  v = _ref71[1];
+              extra = Object.entries(additionalParameters).map(function (_ref72) {
+                var _ref73 = _slicedToArray(_ref72, 2),
+                  k = _ref73[0],
+                  v = _ref73[1];
                 return "".concat(encodeURIComponent(k), "=").concat(encodeURIComponent(v));
               }).join("&");
               if (extra) {
@@ -3276,11 +3351,11 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }
             if (!openInPage) {
-              _context67.next = 36;
+              _context69.next = 36;
               break;
             }
             window.location.href = discordAuthUrl.toString();
-            return _context67.abrupt("return", new Promise(function (_, reject) {
+            return _context69.abrupt("return", new Promise(function (_, reject) {
               var timeout = setTimeout(function () {
                 reject(new Error("Authentication timed out."));
               }, 300000);
@@ -3295,13 +3370,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) {
-              _context67.next = 43;
+              _context69.next = 43;
               break;
             }
             throw new Error("Failed to open Discord login window.");
           case 43:
             authWindow.location.href = discordAuthUrl.toString();
-            return _context67.abrupt("return", new Promise(function (resolve, reject) {
+            return _context69.abrupt("return", new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -3331,6 +3406,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         authCode: authCode,
                         redirectUri: redirectURI,
                         codeVerifier: _verifier2,
+                        clientId: clientId,
                         nonce: nonce
                       }).then(function (resp) {
                         sessionStorage.removeItem("discord_verifier");
@@ -3374,66 +3450,66 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 45:
-            _context67.next = 50;
+            _context69.next = 50;
             break;
           case 47:
-            _context67.prev = 47;
-            _context67.t0 = _context67["catch"](1);
-            throw _context67.t0;
+            _context69.prev = 47;
+            _context69.t0 = _context69["catch"](1);
+            throw _context69.t0;
           case 50:
           case "end":
-            return _context67.stop();
+            return _context69.stop();
         }
-      }, _callee67, null, [[1, 47]]);
+      }, _callee69, null, [[1, 47]]);
     }));
-    return function (_x56) {
-      return _ref68.apply(this, arguments);
+    return function (_x58) {
+      return _ref70.apply(this, arguments);
     };
-  }(), [client, callbacks]);
+  }(), [client, callbacks, completeOauth, createApiKeyPair, masterConfig, session, user]);
   var handleXOauth = useCallback(/*#__PURE__*/function () {
-    var _ref72 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee68(params) {
+    var _ref74 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee70(params) {
       var _masterConfig$auth22, _masterConfig$auth22$, _masterConfig$auth$oa3, _masterConfig$auth23, _masterConfig$auth23$;
-      var _ref73, _ref73$clientId, clientId, _ref73$openInPage, openInPage, additionalParameters, _masterConfig$auth24, _masterConfig$auth24$, _masterConfig$auth25, flow, redirectURI, publicKey, nonce, _yield$generateChalle2, verifier, codeChallenge, twitterAuthUrl, extra, width, height, left, top, authWindow;
-      return _regeneratorRuntime().wrap(function _callee68$(_context68) {
-        while (1) switch (_context68.prev = _context68.next) {
+      var _ref75, _ref75$clientId, clientId, _ref75$openInPage, openInPage, additionalParameters, _masterConfig$auth24, _masterConfig$auth24$, _masterConfig$auth25, flow, redirectURI, publicKey, nonce, _yield$generateChalle2, verifier, codeChallenge, twitterAuthUrl, extra, width, height, left, top, authWindow;
+      return _regeneratorRuntime().wrap(function _callee70$(_context70) {
+        while (1) switch (_context70.prev = _context70.next) {
           case 0:
-            _ref73 = params || {}, _ref73$clientId = _ref73.clientId, clientId = _ref73$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 : _ref73$clientId, _ref73$openInPage = _ref73.openInPage, openInPage = _ref73$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 : _ref73$openInPage, additionalParameters = _ref73.additionalState;
-            _context68.prev = 1;
+            _ref75 = params || {}, _ref75$clientId = _ref75.clientId, clientId = _ref75$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 : _ref75$clientId, _ref75$openInPage = _ref75.openInPage, openInPage = _ref75$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 : _ref75$openInPage, additionalParameters = _ref75.additionalState;
+            _context70.prev = 1;
             if (masterConfig) {
-              _context68.next = 4;
+              _context70.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             if (clientId) {
-              _context68.next = 6;
+              _context70.next = 6;
               break;
             }
             throw new TurnkeyError("Twitter Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 6:
             if ((_masterConfig$auth24 = masterConfig.auth) !== null && _masterConfig$auth24 !== void 0 && (_masterConfig$auth24$ = _masterConfig$auth24.oauthConfig) !== null && _masterConfig$auth24$ !== void 0 && _masterConfig$auth24$.oauthRedirectUri) {
-              _context68.next = 8;
+              _context70.next = 8;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 8:
             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
-            _context68.next = 12;
+            _context70.next = 12;
             return createApiKeyPair();
           case 12:
-            publicKey = _context68.sent;
+            publicKey = _context70.sent;
             if (publicKey) {
-              _context68.next = 15;
+              _context70.next = 15;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 15:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair
-            _context68.next = 18;
+            _context70.next = 18;
             return generateChallengePair();
           case 18:
-            _yield$generateChalle2 = _context68.sent;
+            _yield$generateChalle2 = _context70.sent;
             verifier = _yield$generateChalle2.verifier;
             codeChallenge = _yield$generateChalle2.codeChallenge;
             sessionStorage.setItem("twitter_verifier", verifier);
@@ -3447,10 +3523,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 (_ref74) {
-                var _ref75 = _slicedToArray(_ref74, 2),
-                  k = _ref75[0],
-                  v = _ref75[1];
+              extra = Object.entries(additionalParameters).map(function (_ref76) {
+                var _ref77 = _slicedToArray(_ref76, 2),
+                  k = _ref77[0],
+                  v = _ref77[1];
                 return "".concat(encodeURIComponent(k), "=").concat(encodeURIComponent(v));
               }).join("&");
               if (extra) {
@@ -3458,11 +3534,11 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }
             if (!openInPage) {
-              _context68.next = 36;
+              _context70.next = 36;
               break;
             }
             window.location.href = twitterAuthUrl.toString();
-            return _context68.abrupt("return", new Promise(function (_, reject) {
+            return _context70.abrupt("return", new Promise(function (_, reject) {
               var timeout = setTimeout(function () {
                 reject(new Error("Authentication timed out."));
               }, 300000);
@@ -3477,13 +3553,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) {
-              _context68.next = 43;
+              _context70.next = 43;
               break;
             }
             throw new Error("Failed to open Twitter login window.");
           case 43:
             authWindow.location.href = twitterAuthUrl.toString();
-            return _context68.abrupt("return", new Promise(function (resolve, reject) {
+            return _context70.abrupt("return", new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -3513,6 +3589,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         authCode: authCode,
                         redirectUri: redirectURI,
                         codeVerifier: _verifier3,
+                        clientId: clientId,
                         nonce: nonce
                       }).then(function (resp) {
                         sessionStorage.removeItem("twitter_verifier");
@@ -3556,57 +3633,57 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 45:
-            _context68.next = 50;
+            _context70.next = 50;
             break;
           case 47:
-            _context68.prev = 47;
-            _context68.t0 = _context68["catch"](1);
-            throw _context68.t0;
+            _context70.prev = 47;
+            _context70.t0 = _context70["catch"](1);
+            throw _context70.t0;
           case 50:
           case "end":
-            return _context68.stop();
+            return _context70.stop();
         }
-      }, _callee68, null, [[1, 47]]);
+      }, _callee70, null, [[1, 47]]);
     }));
-    return function (_x57) {
-      return _ref72.apply(this, arguments);
+    return function (_x59) {
+      return _ref74.apply(this, arguments);
     };
-  }(), [client, callbacks]);
+  }(), [client, callbacks, masterConfig, session, user]);
   var handleGoogleOauth = useCallback(/*#__PURE__*/function () {
-    var _ref76 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee69(params) {
+    var _ref78 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee71(params) {
       var _masterConfig$auth26, _masterConfig$auth26$, _masterConfig$auth$oa4, _masterConfig$auth27, _masterConfig$auth27$;
-      var _ref77, _ref77$clientId, clientId, _ref77$openInPage, openInPage, additionalParameters, _masterConfig$auth28, _masterConfig$auth28$, _masterConfig$auth29, flow, redirectURI, publicKey, nonce, googleAuthUrl, state, additionalState, width, height, left, top, authWindow;
-      return _regeneratorRuntime().wrap(function _callee69$(_context69) {
-        while (1) switch (_context69.prev = _context69.next) {
+      var _ref79, _ref79$clientId, clientId, _ref79$openInPage, openInPage, additionalParameters, _masterConfig$auth28, _masterConfig$auth28$, _masterConfig$auth29, flow, redirectURI, publicKey, nonce, googleAuthUrl, state, additionalState, width, height, left, top, authWindow;
+      return _regeneratorRuntime().wrap(function _callee71$(_context71) {
+        while (1) switch (_context71.prev = _context71.next) {
           case 0:
-            _ref77 = params || {}, _ref77$clientId = _ref77.clientId, clientId = _ref77$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 : _ref77$clientId, _ref77$openInPage = _ref77.openInPage, openInPage = _ref77$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 : _ref77$openInPage, additionalParameters = _ref77.additionalState;
-            _context69.prev = 1;
+            _ref79 = params || {}, _ref79$clientId = _ref79.clientId, clientId = _ref79$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 : _ref79$clientId, _ref79$openInPage = _ref79.openInPage, openInPage = _ref79$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 : _ref79$openInPage, additionalParameters = _ref79.additionalState;
+            _context71.prev = 1;
             if (masterConfig) {
-              _context69.next = 4;
+              _context71.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             if (clientId) {
-              _context69.next = 6;
+              _context71.next = 6;
               break;
             }
             throw new TurnkeyError("Google Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 6:
             if ((_masterConfig$auth28 = masterConfig.auth) !== null && _masterConfig$auth28 !== void 0 && (_masterConfig$auth28$ = _masterConfig$auth28.oauthConfig) !== null && _masterConfig$auth28$ !== void 0 && _masterConfig$auth28$.oauthRedirectUri) {
-              _context69.next = 8;
+              _context71.next = 8;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 8:
             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
-            _context69.next = 12;
+            _context71.next = 12;
             return createApiKeyPair();
           case 12:
-            publicKey = _context69.sent;
+            publicKey = _context71.sent;
             if (publicKey) {
-              _context69.next = 15;
+              _context71.next = 15;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -3622,10 +3699,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 (_ref78) {
-                var _ref79 = _slicedToArray(_ref78, 2),
-                  key = _ref79[0],
-                  value = _ref79[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref80) {
+                var _ref81 = _slicedToArray(_ref80, 2),
+                  key = _ref81[0],
+                  value = _ref81[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -3634,12 +3711,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             googleAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context69.next = 31;
+              _context71.next = 31;
               break;
             }
             // Redirect current page to Google Auth
             window.location.href = googleAuthUrl.toString();
-            return _context69.abrupt("return", new Promise(function (_, reject) {
+            return _context71.abrupt("return", 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
@@ -3659,7 +3736,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) {
-              _context69.next = 38;
+              _context71.next = 38;
               break;
             }
             throw new Error("Failed to open Google login window.");
@@ -3667,7 +3744,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 _context69.abrupt("return", new Promise(function (resolve, reject) {
+            return _context71.abrupt("return", new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -3726,45 +3803,45 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 40:
-            _context69.next = 45;
+            _context71.next = 45;
             break;
           case 42:
-            _context69.prev = 42;
-            _context69.t0 = _context69["catch"](1);
-            throw _context69.t0;
+            _context71.prev = 42;
+            _context71.t0 = _context71["catch"](1);
+            throw _context71.t0;
           case 45:
           case "end":
-            return _context69.stop();
+            return _context71.stop();
         }
-      }, _callee69, null, [[1, 42]]);
+      }, _callee71, null, [[1, 42]]);
     }));
-    return function (_x58) {
-      return _ref76.apply(this, arguments);
+    return function (_x60) {
+      return _ref78.apply(this, arguments);
     };
-  }(), [client, callbacks]);
+  }(), [client, callbacks, masterConfig, session, user]);
   var handleAppleOauth = useCallback(/*#__PURE__*/function () {
-    var _ref80 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee70(params) {
+    var _ref82 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee72(params) {
       var _masterConfig$auth30, _masterConfig$auth30$, _masterConfig$auth$oa5, _masterConfig$auth31, _masterConfig$auth31$;
-      var _ref81, _ref81$clientId, clientId, _ref81$openInPage, openInPage, additionalParameters, _masterConfig$auth32, _masterConfig$auth32$, _masterConfig$auth33, flow, redirectURI, publicKey, nonce, appleAuthUrl, state, additionalState, width, height, left, top, authWindow;
-      return _regeneratorRuntime().wrap(function _callee70$(_context70) {
-        while (1) switch (_context70.prev = _context70.next) {
+      var _ref83, _ref83$clientId, clientId, _ref83$openInPage, openInPage, additionalParameters, _masterConfig$auth32, _masterConfig$auth32$, _masterConfig$auth33, flow, redirectURI, publicKey, nonce, appleAuthUrl, state, additionalState, width, height, left, top, authWindow;
+      return _regeneratorRuntime().wrap(function _callee72$(_context72) {
+        while (1) switch (_context72.prev = _context72.next) {
           case 0:
-            _ref81 = params || {}, _ref81$clientId = _ref81.clientId, clientId = _ref81$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 : _ref81$clientId, _ref81$openInPage = _ref81.openInPage, openInPage = _ref81$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 : _ref81$openInPage, additionalParameters = _ref81.additionalState;
-            _context70.prev = 1;
+            _ref83 = params || {}, _ref83$clientId = _ref83.clientId, clientId = _ref83$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 : _ref83$clientId, _ref83$openInPage = _ref83.openInPage, openInPage = _ref83$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 : _ref83$openInPage, additionalParameters = _ref83.additionalState;
+            _context72.prev = 1;
             if (masterConfig) {
-              _context70.next = 4;
+              _context72.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             if (clientId) {
-              _context70.next = 6;
+              _context72.next = 6;
               break;
             }
             throw new TurnkeyError("Apple Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 6:
             if ((_masterConfig$auth32 = masterConfig.auth) !== null && _masterConfig$auth32 !== void 0 && (_masterConfig$auth32$ = _masterConfig$auth32.oauthConfig) !== null && _masterConfig$auth32$ !== void 0 && _masterConfig$auth32$.oauthRedirectUri) {
-              _context70.next = 8;
+              _context72.next = 8;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -3772,12 +3849,12 @@ var ClientProvider = function ClientProvider(_ref) {
             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?
             // Create key pair and generate nonce
-            _context70.next = 12;
+            _context72.next = 12;
             return createApiKeyPair();
           case 12:
-            publicKey = _context70.sent;
+            publicKey = _context72.sent;
             if (publicKey) {
-              _context70.next = 15;
+              _context72.next = 15;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -3792,10 +3869,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 (_ref82) {
-                var _ref83 = _slicedToArray(_ref82, 2),
-                  key = _ref83[0],
-                  value = _ref83[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref84) {
+                var _ref85 = _slicedToArray(_ref84, 2),
+                  key = _ref85[0],
+                  value = _ref85[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -3804,12 +3881,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             appleAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context70.next = 30;
+              _context72.next = 30;
               break;
             }
             // Redirect current page to Apple Auth
             window.location.href = appleAuthUrl.toString();
-            return _context70.abrupt("return", new Promise(function (_, reject) {
+            return _context72.abrupt("return", 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."));
@@ -3827,14 +3904,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) {
-              _context70.next = 37;
+              _context72.next = 37;
               break;
             }
             throw new Error("Failed to open Apple login window.");
           case 37:
             authWindow.location.href = appleAuthUrl.toString();
             // Return a promise that resolves when the OAuth flow completes
-            return _context70.abrupt("return", new Promise(function (resolve, reject) {
+            return _context72.abrupt("return", new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -3893,66 +3970,66 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 39:
-            _context70.next = 44;
+            _context72.next = 44;
             break;
           case 41:
-            _context70.prev = 41;
-            _context70.t0 = _context70["catch"](1);
-            throw _context70.t0;
+            _context72.prev = 41;
+            _context72.t0 = _context72["catch"](1);
+            throw _context72.t0;
           case 44:
           case "end":
-            return _context70.stop();
+            return _context72.stop();
         }
-      }, _callee70, null, [[1, 41]]);
+      }, _callee72, null, [[1, 41]]);
     }));
-    return function (_x59) {
-      return _ref80.apply(this, arguments);
+    return function (_x61) {
+      return _ref82.apply(this, arguments);
     };
-  }(), [client, callbacks]);
+  }(), [client, callbacks, masterConfig, session, user]);
   var handleFacebookOauth = useCallback(/*#__PURE__*/function () {
-    var _ref84 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee71(params) {
+    var _ref86 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee73(params) {
       var _masterConfig$auth34, _masterConfig$auth34$, _masterConfig$auth$oa6, _masterConfig$auth35, _masterConfig$auth35$;
-      var _ref85, _ref85$clientId, clientId, _ref85$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;
-      return _regeneratorRuntime().wrap(function _callee71$(_context71) {
-        while (1) switch (_context71.prev = _context71.next) {
+      var _ref87, _ref87$clientId, clientId, _ref87$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;
+      return _regeneratorRuntime().wrap(function _callee73$(_context73) {
+        while (1) switch (_context73.prev = _context73.next) {
           case 0:
-            _ref85 = params || {}, _ref85$clientId = _ref85.clientId, clientId = _ref85$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 : _ref85$clientId, _ref85$openInPage = _ref85.openInPage, openInPage = _ref85$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 : _ref85$openInPage, additionalParameters = _ref85.additionalState;
-            _context71.prev = 1;
+            _ref87 = params || {}, _ref87$clientId = _ref87.clientId, clientId = _ref87$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 : _ref87$clientId, _ref87$openInPage = _ref87.openInPage, openInPage = _ref87$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 : _ref87$openInPage, additionalParameters = _ref87.additionalState;
+            _context73.prev = 1;
             if (masterConfig) {
-              _context71.next = 4;
+              _context73.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             if (clientId) {
-              _context71.next = 6;
+              _context73.next = 6;
               break;
             }
             throw new TurnkeyError("Facebook Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 6:
             if ((_masterConfig$auth36 = masterConfig.auth) !== null && _masterConfig$auth36 !== void 0 && (_masterConfig$auth36$ = _masterConfig$auth36.oauthConfig) !== null && _masterConfig$auth36$ !== void 0 && _masterConfig$auth36$.oauthRedirectUri) {
-              _context71.next = 8;
+              _context73.next = 8;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 8:
             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
-            _context71.next = 12;
+            _context73.next = 12;
             return createApiKeyPair();
           case 12:
-            publicKey = _context71.sent;
+            publicKey = _context73.sent;
             if (publicKey) {
-              _context71.next = 15;
+              _context73.next = 15;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 15:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair
-            _context71.next = 18;
+            _context73.next = 18;
             return generateChallengePair();
           case 18:
-            _yield$generateChalle3 = _context71.sent;
+            _yield$generateChalle3 = _context73.sent;
             verifier = _yield$generateChalle3.verifier;
             codeChallenge = _yield$generateChalle3.codeChallenge;
             // Store verifier for later token exchange
@@ -3969,10 +4046,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 (_ref86) {
-                var _ref87 = _slicedToArray(_ref86, 2),
-                  key = _ref87[0],
-                  value = _ref87[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref88) {
+                var _ref89 = _slicedToArray(_ref88, 2),
+                  key = _ref89[0],
+                  value = _ref89[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -3981,12 +4058,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             facebookAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context71.next = 38;
+              _context73.next = 38;
               break;
             }
             // Redirect current page to Facebook Auth
             window.location.href = facebookAuthUrl.toString();
-            return _context71.abrupt("return", new Promise(function (_, reject) {
+            return _context73.abrupt("return", 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."));
@@ -4004,14 +4081,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) {
-              _context71.next = 45;
+              _context73.next = 45;
               break;
             }
             throw new Error("Failed to open Facebook login window.");
           case 45:
             authWindow.location.href = facebookAuthUrl.toString();
             // Return a promise that resolves when the OAuth flow completes
-            return _context71.abrupt("return", new Promise(function (resolve, reject) {
+            return _context73.abrupt("return", new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -4079,26 +4156,26 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 47:
-            _context71.next = 52;
+            _context73.next = 52;
             break;
           case 49:
-            _context71.prev = 49;
-            _context71.t0 = _context71["catch"](1);
-            throw _context71.t0;
+            _context73.prev = 49;
+            _context73.t0 = _context73["catch"](1);
+            throw _context73.t0;
           case 52:
           case "end":
-            return _context71.stop();
+            return _context73.stop();
         }
-      }, _callee71, null, [[1, 49]]);
+      }, _callee73, null, [[1, 49]]);
     }));
-    return function (_x60) {
-      return _ref84.apply(this, arguments);
+    return function (_x62) {
+      return _ref86.apply(this, arguments);
     };
-  }(), [client, callbacks]);
+  }(), [client, callbacks, masterConfig, client, session, user]);
   var handleLogin = useCallback(/*#__PURE__*/function () {
-    var _ref88 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee72(params) {
-      return _regeneratorRuntime().wrap(function _callee72$(_context72) {
-        while (1) switch (_context72.prev = _context72.next) {
+    var _ref90 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee74(params) {
+      return _regeneratorRuntime().wrap(function _callee74$(_context74) {
+        while (1) switch (_context74.prev = _context74.next) {
           case 0:
             pushPage({
               key: "Log in or sign up",
@@ -4108,19 +4185,19 @@ var ClientProvider = function ClientProvider(_ref) {
             });
           case 1:
           case "end":
-            return _context72.stop();
+            return _context74.stop();
         }
-      }, _callee72);
+      }, _callee74);
     }));
-    return function (_x61) {
-      return _ref88.apply(this, arguments);
+    return function (_x63) {
+      return _ref90.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleExportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref89 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee73(params) {
+    var _ref91 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee75(params) {
       var walletId, targetPublicKey, stampWith;
-      return _regeneratorRuntime().wrap(function _callee73$(_context73) {
-        while (1) switch (_context73.prev = _context73.next) {
+      return _regeneratorRuntime().wrap(function _callee75$(_context75) {
+        while (1) switch (_context75.prev = _context75.next) {
           case 0:
             walletId = params.walletId, targetPublicKey = params.targetPublicKey, stampWith = params.stampWith;
             pushPage({
@@ -4136,19 +4213,19 @@ var ClientProvider = function ClientProvider(_ref) {
             });
           case 2:
           case "end":
-            return _context73.stop();
+            return _context75.stop();
         }
-      }, _callee73);
+      }, _callee75);
     }));
-    return function (_x62) {
-      return _ref89.apply(this, arguments);
+    return function (_x64) {
+      return _ref91.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleExportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref90 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee74(params) {
+    var _ref92 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee76(params) {
       var privateKeyId, targetPublicKey, keyFormat, stampWith;
-      return _regeneratorRuntime().wrap(function _callee74$(_context74) {
-        while (1) switch (_context74.prev = _context74.next) {
+      return _regeneratorRuntime().wrap(function _callee76$(_context76) {
+        while (1) switch (_context76.prev = _context76.next) {
           case 0:
             privateKeyId = params.privateKeyId, targetPublicKey = params.targetPublicKey, keyFormat = params.keyFormat, stampWith = params.stampWith;
             pushPage({
@@ -4166,19 +4243,19 @@ var ClientProvider = function ClientProvider(_ref) {
             });
           case 2:
           case "end":
-            return _context74.stop();
+            return _context76.stop();
         }
-      }, _callee74);
+      }, _callee76);
     }));
-    return function (_x63) {
-      return _ref90.apply(this, arguments);
+    return function (_x65) {
+      return _ref92.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleExportWalletAccount = useCallback(/*#__PURE__*/function () {
-    var _ref91 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee75(params) {
+    var _ref93 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee77(params) {
       var address, targetPublicKey, keyFormat, stampWith;
-      return _regeneratorRuntime().wrap(function _callee75$(_context75) {
-        while (1) switch (_context75.prev = _context75.next) {
+      return _regeneratorRuntime().wrap(function _callee77$(_context77) {
+        while (1) switch (_context77.prev = _context77.next) {
           case 0:
             address = params.address, targetPublicKey = params.targetPublicKey, keyFormat = params.keyFormat, stampWith = params.stampWith;
             pushPage({
@@ -4196,23 +4273,23 @@ var ClientProvider = function ClientProvider(_ref) {
             });
           case 2:
           case "end":
-            return _context75.stop();
+            return _context77.stop();
         }
-      }, _callee75);
+      }, _callee77);
     }));
-    return function (_x64) {
-      return _ref91.apply(this, arguments);
+    return function (_x66) {
+      return _ref93.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleImportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref92 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee76(params) {
-      var _ref93, defaultWalletAccounts, _ref93$successPageDur, successPageDuration, stampWith;
-      return _regeneratorRuntime().wrap(function _callee76$(_context76) {
-        while (1) switch (_context76.prev = _context76.next) {
+    var _ref94 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee78(params) {
+      var _ref95, defaultWalletAccounts, _ref95$successPageDur, successPageDuration, stampWith;
+      return _regeneratorRuntime().wrap(function _callee78$(_context78) {
+        while (1) switch (_context78.prev = _context78.next) {
           case 0:
-            _ref93 = params || {}, defaultWalletAccounts = _ref93.defaultWalletAccounts, _ref93$successPageDur = _ref93.successPageDuration, successPageDuration = _ref93$successPageDur === void 0 ? 2000 : _ref93$successPageDur, stampWith = _ref93.stampWith;
-            _context76.prev = 1;
-            return _context76.abrupt("return", withTurnkeyErrorHandling(function () {
+            _ref95 = params || {}, defaultWalletAccounts = _ref95.defaultWalletAccounts, _ref95$successPageDur = _ref95.successPageDuration, successPageDuration = _ref95$successPageDur === void 0 ? 2000 : _ref95$successPageDur, stampWith = _ref95.stampWith;
+            _context78.prev = 1;
+            return _context78.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import wallet",
@@ -4235,34 +4312,34 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 5:
-            _context76.prev = 5;
-            _context76.t0 = _context76["catch"](1);
-            if (!(_context76.t0 instanceof TurnkeyError)) {
-              _context76.next = 9;
+            _context78.prev = 5;
+            _context78.t0 = _context78["catch"](1);
+            if (!(_context78.t0 instanceof TurnkeyError)) {
+              _context78.next = 9;
               break;
             }
-            throw _context76.t0;
+            throw _context78.t0;
           case 9:
-            throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _context76.t0);
+            throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _context78.t0);
           case 10:
           case "end":
-            return _context76.stop();
+            return _context78.stop();
         }
-      }, _callee76, null, [[1, 5]]);
+      }, _callee78, null, [[1, 5]]);
     }));
-    return function (_x65) {
-      return _ref92.apply(this, arguments);
+    return function (_x67) {
+      return _ref94.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleImportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref94 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee77(params) {
-      var _ref95, curve, addressFormats, _ref95$successPageDur, successPageDuration, stampWith;
-      return _regeneratorRuntime().wrap(function _callee77$(_context77) {
-        while (1) switch (_context77.prev = _context77.next) {
+    var _ref96 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee79(params) {
+      var _ref97, curve, addressFormats, _ref97$successPageDur, successPageDuration, stampWith;
+      return _regeneratorRuntime().wrap(function _callee79$(_context79) {
+        while (1) switch (_context79.prev = _context79.next) {
           case 0:
-            _ref95 = params || {}, curve = _ref95.curve, addressFormats = _ref95.addressFormats, _ref95$successPageDur = _ref95.successPageDuration, successPageDuration = _ref95$successPageDur === void 0 ? 2000 : _ref95$successPageDur, stampWith = _ref95.stampWith;
-            _context77.prev = 1;
-            return _context77.abrupt("return", withTurnkeyErrorHandling(function () {
+            _ref97 = params || {}, curve = _ref97.curve, addressFormats = _ref97.addressFormats, _ref97$successPageDur = _ref97.successPageDuration, successPageDuration = _ref97$successPageDur === void 0 ? 2000 : _ref97$successPageDur, stampWith = _ref97.stampWith;
+            _context79.prev = 1;
+            return _context79.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import private key",
@@ -4285,40 +4362,40 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 5:
-            _context77.prev = 5;
-            _context77.t0 = _context77["catch"](1);
-            if (!(_context77.t0 instanceof TurnkeyError)) {
-              _context77.next = 9;
+            _context79.prev = 5;
+            _context79.t0 = _context79["catch"](1);
+            if (!(_context79.t0 instanceof TurnkeyError)) {
+              _context79.next = 9;
               break;
             }
-            throw _context77.t0;
+            throw _context79.t0;
           case 9:
-            throw new TurnkeyError("Failed to import private key.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _context77.t0);
+            throw new TurnkeyError("Failed to import private key.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _context79.t0);
           case 10:
           case "end":
-            return _context77.stop();
+            return _context79.stop();
         }
-      }, _callee77, null, [[1, 5]]);
+      }, _callee79, null, [[1, 5]]);
     }));
-    return function (_x66) {
-      return _ref94.apply(this, arguments);
+    return function (_x68) {
+      return _ref96.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleUpdateUserName = useCallback(/*#__PURE__*/function () {
-    var _ref96 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee78(params) {
-      var _ref97, _ref97$successPageDur, successPageDuration, subTitle, title, stampWith, onSuccess, res;
-      return _regeneratorRuntime().wrap(function _callee78$(_context78) {
-        while (1) switch (_context78.prev = _context78.next) {
+    var _ref98 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee80(params) {
+      var _ref99, _ref99$successPageDur, successPageDuration, subTitle, title, stampWith, onSuccess, res;
+      return _regeneratorRuntime().wrap(function _callee80$(_context80) {
+        while (1) switch (_context80.prev = _context80.next) {
           case 0:
-            _ref97 = params || {}, _ref97$successPageDur = _ref97.successPageDuration, successPageDuration = _ref97$successPageDur === void 0 ? 2000 : _ref97$successPageDur, subTitle = _ref97.subTitle, title = _ref97.title, stampWith = _ref97.stampWith;
+            _ref99 = params || {}, _ref99$successPageDur = _ref99.successPageDuration, successPageDuration = _ref99$successPageDur === void 0 ? 2000 : _ref99$successPageDur, subTitle = _ref99.subTitle, title = _ref99.title, stampWith = _ref99.stampWith;
             if (client) {
-              _context78.next = 3;
+              _context80.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context78.next = 5;
+              _context80.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
@@ -4338,12 +4415,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context78.prev = 6;
+            _context80.prev = 6;
             if (!(!(params !== null && params !== void 0 && params.userName) && (params === null || params === void 0 ? void 0 : params.userName) !== "")) {
-              _context78.next = 11;
+              _context80.next = 11;
               break;
             }
-            return _context78.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context80.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update User Name",
@@ -4366,67 +4443,67 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 11:
-            _context78.next = 13;
+            _context80.next = 13;
             return updateUserName({
               userName: params.userName,
               userId: user.userId,
               stampWith: stampWith
             });
           case 13:
-            res = _context78.sent;
+            res = _context80.sent;
             onSuccess();
-            return _context78.abrupt("return", res);
+            return _context80.abrupt("return", res);
           case 16:
-            _context78.next = 23;
+            _context80.next = 23;
             break;
           case 18:
-            _context78.prev = 18;
-            _context78.t0 = _context78["catch"](6);
-            if (!(_context78.t0 instanceof TurnkeyError)) {
-              _context78.next = 22;
+            _context80.prev = 18;
+            _context80.t0 = _context80["catch"](6);
+            if (!(_context80.t0 instanceof TurnkeyError)) {
+              _context80.next = 22;
               break;
             }
-            throw _context78.t0;
+            throw _context80.t0;
           case 22:
-            throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _context78.t0);
+            throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _context80.t0);
           case 23:
           case "end":
-            return _context78.stop();
+            return _context80.stop();
         }
-      }, _callee78, null, [[6, 18]]);
+      }, _callee80, null, [[6, 18]]);
     }));
-    return function (_x67) {
-      return _ref96.apply(this, arguments);
+    return function (_x69) {
+      return _ref98.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleUpdateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref98 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee80(params) {
+    var _ref100 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee82(params) {
       var _masterConfig$auth38, _masterConfig$auth38$;
-      var _ref99, _ref99$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
-      return _regeneratorRuntime().wrap(function _callee80$(_context80) {
-        while (1) switch (_context80.prev = _context80.next) {
+      var _ref101, _ref101$successPageDu, successPageDuration, subTitle, title, onSuccess, otpId;
+      return _regeneratorRuntime().wrap(function _callee82$(_context82) {
+        while (1) switch (_context82.prev = _context82.next) {
           case 0:
-            _ref99 = params || {}, _ref99$successPageDur = _ref99.successPageDuration, successPageDuration = _ref99$successPageDur === void 0 ? 2000 : _ref99$successPageDur, subTitle = _ref99.subTitle, title = _ref99.title;
+            _ref101 = params || {}, _ref101$successPageDu = _ref101.successPageDuration, successPageDuration = _ref101$successPageDu === void 0 ? 2000 : _ref101$successPageDu, subTitle = _ref101.subTitle, title = _ref101.title;
             if (client) {
-              _context80.next = 3;
+              _context82.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context80.next = 5;
+              _context82.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
             if (masterConfig) {
-              _context80.next = 7;
+              _context82.next = 7;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 7:
             if ((_masterConfig$auth38 = masterConfig.auth) !== null && _masterConfig$auth38 !== void 0 && (_masterConfig$auth38$ = _masterConfig$auth38.methods) !== null && _masterConfig$auth38$ !== void 0 && _masterConfig$auth38$.smsOtpAuthEnabled) {
-              _context80.next = 9;
+              _context82.next = 9;
               break;
             }
             throw new TurnkeyError("SMS OTP authentication is not enabled in the configuration.", TurnkeyErrorCodes.AUTH_METHOD_NOT_ENABLED);
@@ -4446,12 +4523,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context80.prev = 10;
+            _context82.prev = 10;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context80.next = 15;
+              _context82.next = 15;
               break;
             }
-            return _context80.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context82.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Phone Number",
@@ -4473,14 +4550,14 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 15:
-            _context80.next = 17;
+            _context82.next = 17;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 17:
-            otpId = _context80.sent;
-            return _context80.abrupt("return", withTurnkeyErrorHandling(function () {
+            otpId = _context82.sent;
+            return _context82.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Phone Number",
@@ -4489,13 +4566,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.phoneNumber,
                     otpId: otpId,
                     onContinue: function () {
-                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee79(otpCode) {
+                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee81(otpCode) {
                         var _yield$verifyOtp, verificationToken, res;
-                        return _regeneratorRuntime().wrap(function _callee79$(_context79) {
-                          while (1) switch (_context79.prev = _context79.next) {
+                        return _regeneratorRuntime().wrap(function _callee81$(_context81) {
+                          while (1) switch (_context81.prev = _context81.next) {
                             case 0:
-                              _context79.prev = 0;
-                              _context79.next = 3;
+                              _context81.prev = 0;
+                              _context81.next = 3;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -4503,31 +4580,31 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Sms
                               });
                             case 3:
-                              _yield$verifyOtp = _context79.sent;
+                              _yield$verifyOtp = _context81.sent;
                               verificationToken = _yield$verifyOtp.verificationToken;
-                              _context79.next = 7;
+                              _context81.next = 7;
                               return updateUserPhoneNumber({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
                                 userId: user.userId
                               });
                             case 7:
-                              res = _context79.sent;
+                              res = _context81.sent;
                               onSuccess();
                               resolve(res);
-                              _context79.next = 15;
+                              _context81.next = 15;
                               break;
                             case 12:
-                              _context79.prev = 12;
-                              _context79.t0 = _context79["catch"](0);
-                              reject(_context79.t0);
+                              _context81.prev = 12;
+                              _context81.t0 = _context81["catch"](0);
+                              reject(_context81.t0);
                             case 15:
                             case "end":
-                              return _context79.stop();
+                              return _context81.stop();
                           }
-                        }, _callee79, null, [[0, 12]]);
+                        }, _callee81, null, [[0, 12]]);
                       }));
-                      function onContinue(_x69) {
+                      function onContinue(_x71) {
                         return _onContinue.apply(this, arguments);
                       }
                       return onContinue;
@@ -4544,43 +4621,43 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to update phone number"));
           case 19:
-            _context80.next = 26;
+            _context82.next = 26;
             break;
           case 21:
-            _context80.prev = 21;
-            _context80.t0 = _context80["catch"](10);
-            if (!(_context80.t0 instanceof TurnkeyError)) {
-              _context80.next = 25;
+            _context82.prev = 21;
+            _context82.t0 = _context82["catch"](10);
+            if (!(_context82.t0 instanceof TurnkeyError)) {
+              _context82.next = 25;
               break;
             }
-            throw _context80.t0;
+            throw _context82.t0;
           case 25:
-            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context80.t0);
+            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context82.t0);
           case 26:
           case "end":
-            return _context80.stop();
+            return _context82.stop();
         }
-      }, _callee80, null, [[10, 21]]);
+      }, _callee82, null, [[10, 21]]);
     }));
-    return function (_x68) {
-      return _ref98.apply(this, arguments);
+    return function (_x70) {
+      return _ref100.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleUpdateUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref100 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee82(params) {
-      var _ref101, _ref101$successPageDu, successPageDuration, subTitle, title, onSuccess, otpId;
-      return _regeneratorRuntime().wrap(function _callee82$(_context82) {
-        while (1) switch (_context82.prev = _context82.next) {
+    var _ref102 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee84(params) {
+      var _ref103, _ref103$successPageDu, successPageDuration, subTitle, title, onSuccess, otpId;
+      return _regeneratorRuntime().wrap(function _callee84$(_context84) {
+        while (1) switch (_context84.prev = _context84.next) {
           case 0:
-            _ref101 = params || {}, _ref101$successPageDu = _ref101.successPageDuration, successPageDuration = _ref101$successPageDu === void 0 ? 2000 : _ref101$successPageDu, subTitle = _ref101.subTitle, title = _ref101.title;
+            _ref103 = params || {}, _ref103$successPageDu = _ref103.successPageDuration, successPageDuration = _ref103$successPageDu === void 0 ? 2000 : _ref103$successPageDu, subTitle = _ref103.subTitle, title = _ref103.title;
             if (client) {
-              _context82.next = 3;
+              _context84.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context82.next = 5;
+              _context84.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
@@ -4600,12 +4677,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context82.prev = 6;
+            _context84.prev = 6;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context82.next = 11;
+              _context84.next = 11;
               break;
             }
-            return _context82.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context84.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Email",
@@ -4627,14 +4704,14 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 11:
-            _context82.next = 13;
+            _context84.next = 13;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 13:
-            otpId = _context82.sent;
-            return _context82.abrupt("return", withTurnkeyErrorHandling(function () {
+            otpId = _context84.sent;
+            return _context84.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Email",
@@ -4643,13 +4720,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.email,
                     otpId: otpId,
                     onContinue: function () {
-                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee81(otpCode) {
+                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee83(otpCode) {
                         var _yield$verifyOtp2, verificationToken, res;
-                        return _regeneratorRuntime().wrap(function _callee81$(_context81) {
-                          while (1) switch (_context81.prev = _context81.next) {
+                        return _regeneratorRuntime().wrap(function _callee83$(_context83) {
+                          while (1) switch (_context83.prev = _context83.next) {
                             case 0:
-                              _context81.prev = 0;
-                              _context81.next = 3;
+                              _context83.prev = 0;
+                              _context83.next = 3;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -4657,31 +4734,31 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Email
                               });
                             case 3:
-                              _yield$verifyOtp2 = _context81.sent;
+                              _yield$verifyOtp2 = _context83.sent;
                               verificationToken = _yield$verifyOtp2.verificationToken;
-                              _context81.next = 7;
+                              _context83.next = 7;
                               return updateUserEmail({
                                 email: params.email,
                                 verificationToken: verificationToken,
                                 userId: user.userId
                               });
                             case 7:
-                              res = _context81.sent;
+                              res = _context83.sent;
                               onSuccess();
                               resolve(res);
-                              _context81.next = 15;
+                              _context83.next = 15;
                               break;
                             case 12:
-                              _context81.prev = 12;
-                              _context81.t0 = _context81["catch"](0);
-                              reject(_context81.t0);
+                              _context83.prev = 12;
+                              _context83.t0 = _context83["catch"](0);
+                              reject(_context83.t0);
                             case 15:
                             case "end":
-                              return _context81.stop();
+                              return _context83.stop();
                           }
-                        }, _callee81, null, [[0, 12]]);
+                        }, _callee83, null, [[0, 12]]);
                       }));
-                      function onContinue(_x71) {
+                      function onContinue(_x73) {
                         return _onContinue2.apply(this, arguments);
                       }
                       return onContinue;
@@ -4696,43 +4773,43 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to update email"));
           case 15:
-            _context82.next = 22;
+            _context84.next = 22;
             break;
           case 17:
-            _context82.prev = 17;
-            _context82.t0 = _context82["catch"](6);
-            if (!(_context82.t0 instanceof TurnkeyError)) {
-              _context82.next = 21;
+            _context84.prev = 17;
+            _context84.t0 = _context84["catch"](6);
+            if (!(_context84.t0 instanceof TurnkeyError)) {
+              _context84.next = 21;
               break;
             }
-            throw _context82.t0;
+            throw _context84.t0;
           case 21:
-            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context82.t0);
+            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context84.t0);
           case 22:
           case "end":
-            return _context82.stop();
+            return _context84.stop();
         }
-      }, _callee82, null, [[6, 17]]);
+      }, _callee84, null, [[6, 17]]);
     }));
-    return function (_x70) {
-      return _ref100.apply(this, arguments);
+    return function (_x72) {
+      return _ref102.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleAddEmail = useCallback(/*#__PURE__*/function () {
-    var _ref102 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee84(params) {
-      var _ref103, _ref103$successPageDu, successPageDuration, subTitle, title, onSuccess, otpId;
-      return _regeneratorRuntime().wrap(function _callee84$(_context84) {
-        while (1) switch (_context84.prev = _context84.next) {
+    var _ref104 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee86(params) {
+      var _ref105, _ref105$successPageDu, successPageDuration, subTitle, title, onSuccess, otpId;
+      return _regeneratorRuntime().wrap(function _callee86$(_context86) {
+        while (1) switch (_context86.prev = _context86.next) {
           case 0:
-            _ref103 = params || {}, _ref103$successPageDu = _ref103.successPageDuration, successPageDuration = _ref103$successPageDu === void 0 ? 2000 : _ref103$successPageDu, subTitle = _ref103.subTitle, title = _ref103.title;
+            _ref105 = params || {}, _ref105$successPageDu = _ref105.successPageDuration, successPageDuration = _ref105$successPageDu === void 0 ? 2000 : _ref105$successPageDu, subTitle = _ref105.subTitle, title = _ref105.title;
             if (client) {
-              _context84.next = 3;
+              _context86.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context84.next = 5;
+              _context86.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
@@ -4752,12 +4829,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context84.prev = 6;
+            _context86.prev = 6;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context84.next = 11;
+              _context86.next = 11;
               break;
             }
-            return _context84.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context86.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Email",
@@ -4779,14 +4856,14 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 11:
-            _context84.next = 13;
+            _context86.next = 13;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 13:
-            otpId = _context84.sent;
-            return _context84.abrupt("return", withTurnkeyErrorHandling(function () {
+            otpId = _context86.sent;
+            return _context86.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Email",
@@ -4795,13 +4872,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.email,
                     otpId: otpId,
                     onContinue: function () {
-                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee83(otpCode) {
+                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee85(otpCode) {
                         var _yield$verifyOtp3, verificationToken, res;
-                        return _regeneratorRuntime().wrap(function _callee83$(_context83) {
-                          while (1) switch (_context83.prev = _context83.next) {
+                        return _regeneratorRuntime().wrap(function _callee85$(_context85) {
+                          while (1) switch (_context85.prev = _context85.next) {
                             case 0:
-                              _context83.prev = 0;
-                              _context83.next = 3;
+                              _context85.prev = 0;
+                              _context85.next = 3;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -4809,31 +4886,31 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Email
                               });
                             case 3:
-                              _yield$verifyOtp3 = _context83.sent;
+                              _yield$verifyOtp3 = _context85.sent;
                               verificationToken = _yield$verifyOtp3.verificationToken;
-                              _context83.next = 7;
+                              _context85.next = 7;
                               return updateUserEmail({
                                 email: params.email,
                                 verificationToken: verificationToken,
                                 userId: user.userId
                               });
                             case 7:
-                              res = _context83.sent;
+                              res = _context85.sent;
                               onSuccess();
                               resolve(res);
-                              _context83.next = 15;
+                              _context85.next = 15;
                               break;
                             case 12:
-                              _context83.prev = 12;
-                              _context83.t0 = _context83["catch"](0);
-                              reject(_context83.t0);
+                              _context85.prev = 12;
+                              _context85.t0 = _context85["catch"](0);
+                              reject(_context85.t0);
                             case 15:
                             case "end":
-                              return _context83.stop();
+                              return _context85.stop();
                           }
-                        }, _callee83, null, [[0, 12]]);
+                        }, _callee85, null, [[0, 12]]);
                       }));
-                      function onContinue(_x73) {
+                      function onContinue(_x75) {
                         return _onContinue3.apply(this, arguments);
                       }
                       return onContinue;
@@ -4848,56 +4925,56 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to add email"));
           case 15:
-            _context84.next = 22;
+            _context86.next = 22;
             break;
           case 17:
-            _context84.prev = 17;
-            _context84.t0 = _context84["catch"](6);
-            if (!(_context84.t0 instanceof TurnkeyError)) {
-              _context84.next = 21;
+            _context86.prev = 17;
+            _context86.t0 = _context86["catch"](6);
+            if (!(_context86.t0 instanceof TurnkeyError)) {
+              _context86.next = 21;
               break;
             }
-            throw _context84.t0;
+            throw _context86.t0;
           case 21:
-            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context84.t0);
+            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context86.t0);
           case 22:
           case "end":
-            return _context84.stop();
+            return _context86.stop();
         }
-      }, _callee84, null, [[6, 17]]);
+      }, _callee86, null, [[6, 17]]);
     }));
-    return function (_x72) {
-      return _ref102.apply(this, arguments);
+    return function (_x74) {
+      return _ref104.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, client, session, user]);
   var handleAddPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref104 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee86(params) {
+    var _ref106 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee88(params) {
       var _masterConfig$auth39, _masterConfig$auth39$;
-      var _ref105, _ref105$successPageDu, successPageDuration, subTitle, title, onSuccess, otpId;
-      return _regeneratorRuntime().wrap(function _callee86$(_context86) {
-        while (1) switch (_context86.prev = _context86.next) {
+      var _ref107, _ref107$successPageDu, successPageDuration, subTitle, title, onSuccess, otpId;
+      return _regeneratorRuntime().wrap(function _callee88$(_context88) {
+        while (1) switch (_context88.prev = _context88.next) {
           case 0:
-            _ref105 = params || {}, _ref105$successPageDu = _ref105.successPageDuration, successPageDuration = _ref105$successPageDu === void 0 ? 2000 : _ref105$successPageDu, subTitle = _ref105.subTitle, title = _ref105.title;
+            _ref107 = params || {}, _ref107$successPageDu = _ref107.successPageDuration, successPageDuration = _ref107$successPageDu === void 0 ? 2000 : _ref107$successPageDu, subTitle = _ref107.subTitle, title = _ref107.title;
             if (client) {
-              _context86.next = 3;
+              _context88.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context86.next = 5;
+              _context88.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
             if (masterConfig) {
-              _context86.next = 7;
+              _context88.next = 7;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 7:
             if ((_masterConfig$auth39 = masterConfig.auth) !== null && _masterConfig$auth39 !== void 0 && (_masterConfig$auth39$ = _masterConfig$auth39.methods) !== null && _masterConfig$auth39$ !== void 0 && _masterConfig$auth39$.smsOtpAuthEnabled) {
-              _context86.next = 9;
+              _context88.next = 9;
               break;
             }
             throw new TurnkeyError("SMS OTP authentication is not enabled in the configuration.", TurnkeyErrorCodes.AUTH_METHOD_NOT_ENABLED);
@@ -4917,12 +4994,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context86.prev = 10;
+            _context88.prev = 10;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context86.next = 15;
+              _context88.next = 15;
               break;
             }
-            return _context86.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context88.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Phone Number",
@@ -4944,14 +5021,14 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to add phone number"));
           case 15:
-            _context86.next = 17;
+            _context88.next = 17;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 17:
-            otpId = _context86.sent;
-            return _context86.abrupt("return", withTurnkeyErrorHandling(function () {
+            otpId = _context88.sent;
+            return _context88.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Phone Number",
@@ -4960,13 +5037,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.phoneNumber,
                     otpId: otpId,
                     onContinue: function () {
-                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee85(otpCode) {
+                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee87(otpCode) {
                         var _yield$verifyOtp4, verificationToken, res;
-                        return _regeneratorRuntime().wrap(function _callee85$(_context85) {
-                          while (1) switch (_context85.prev = _context85.next) {
+                        return _regeneratorRuntime().wrap(function _callee87$(_context87) {
+                          while (1) switch (_context87.prev = _context87.next) {
                             case 0:
-                              _context85.prev = 0;
-                              _context85.next = 3;
+                              _context87.prev = 0;
+                              _context87.next = 3;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -4974,31 +5051,31 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Sms
                               });
                             case 3:
-                              _yield$verifyOtp4 = _context85.sent;
+                              _yield$verifyOtp4 = _context87.sent;
                               verificationToken = _yield$verifyOtp4.verificationToken;
-                              _context85.next = 7;
+                              _context87.next = 7;
                               return updateUserPhoneNumber({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
                                 userId: user.userId
                               });
                             case 7:
-                              res = _context85.sent;
+                              res = _context87.sent;
                               onSuccess();
                               resolve(res);
-                              _context85.next = 15;
+                              _context87.next = 15;
                               break;
                             case 12:
-                              _context85.prev = 12;
-                              _context85.t0 = _context85["catch"](0);
-                              reject(_context85.t0);
+                              _context87.prev = 12;
+                              _context87.t0 = _context87["catch"](0);
+                              reject(_context87.t0);
                             case 15:
                             case "end":
-                              return _context85.stop();
+                              return _context87.stop();
                           }
-                        }, _callee85, null, [[0, 12]]);
+                        }, _callee87, null, [[0, 12]]);
                       }));
-                      function onContinue(_x75) {
+                      function onContinue(_x77) {
                         return _onContinue4.apply(this, arguments);
                       }
                       return onContinue;
@@ -5015,48 +5092,48 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to add phone number"));
           case 19:
-            _context86.next = 26;
+            _context88.next = 26;
             break;
           case 21:
-            _context86.prev = 21;
-            _context86.t0 = _context86["catch"](10);
-            if (!(_context86.t0 instanceof TurnkeyError)) {
-              _context86.next = 25;
+            _context88.prev = 21;
+            _context88.t0 = _context88["catch"](10);
+            if (!(_context88.t0 instanceof TurnkeyError)) {
+              _context88.next = 25;
               break;
             }
-            throw _context86.t0;
+            throw _context88.t0;
           case 25:
-            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context86.t0);
+            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context88.t0);
           case 26:
           case "end":
-            return _context86.stop();
+            return _context88.stop();
         }
-      }, _callee86, null, [[10, 21]]);
+      }, _callee88, null, [[10, 21]]);
     }));
-    return function (_x74) {
-      return _ref104.apply(this, arguments);
+    return function (_x76) {
+      return _ref106.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleRemovePasskey = useCallback(/*#__PURE__*/function () {
-    var _ref106 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee87(params) {
+    var _ref108 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee89(params) {
       var authenticatorId, _params$successPageDu2, successPageDuration, subTitle, title, stampWith, userId;
-      return _regeneratorRuntime().wrap(function _callee87$(_context87) {
-        while (1) switch (_context87.prev = _context87.next) {
+      return _regeneratorRuntime().wrap(function _callee89$(_context89) {
+        while (1) switch (_context89.prev = _context89.next) {
           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) {
-              _context87.next = 3;
+              _context89.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context87.next = 5;
+              _context89.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
-            return _context87.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context89.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Remove Passkey",
@@ -5084,35 +5161,35 @@ var ClientProvider = function ClientProvider(_ref) {
             }, callbacks, "Failed to remove passkey"));
           case 6:
           case "end":
-            return _context87.stop();
+            return _context89.stop();
         }
-      }, _callee87);
+      }, _callee89);
     }));
-    return function (_x76) {
-      return _ref106.apply(this, arguments);
+    return function (_x78) {
+      return _ref108.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleAddPasskey = useCallback(/*#__PURE__*/function () {
-    var _ref107 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee88(params) {
-      var _ref108, name, displayName, _ref108$successPageDu, successPageDuration, stampWith, userId, resPromise;
-      return _regeneratorRuntime().wrap(function _callee88$(_context88) {
-        while (1) switch (_context88.prev = _context88.next) {
+    var _ref109 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee90(params) {
+      var _ref110, name, displayName, _ref110$successPageDu, successPageDuration, stampWith, userId, resPromise;
+      return _regeneratorRuntime().wrap(function _callee90$(_context90) {
+        while (1) switch (_context90.prev = _context90.next) {
           case 0:
-            _ref108 = params || {}, name = _ref108.name, displayName = _ref108.displayName, _ref108$successPageDu = _ref108.successPageDuration, successPageDuration = _ref108$successPageDu === void 0 ? 2000 : _ref108$successPageDu, stampWith = _ref108.stampWith;
+            _ref110 = params || {}, name = _ref110.name, displayName = _ref110.displayName, _ref110$successPageDu = _ref110.successPageDuration, successPageDuration = _ref110$successPageDu === void 0 ? 2000 : _ref110$successPageDu, stampWith = _ref110.stampWith;
             if (client) {
-              _context88.next = 3;
+              _context90.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context88.next = 5;
+              _context90.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || session.userId;
-            _context88.prev = 6;
+            _context90.prev = 6;
             resPromise = addPasskey(_objectSpread2(_objectSpread2(_objectSpread2({}, name && {
               name: name
             }), displayName && {
@@ -5135,51 +5212,51 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             });
-            _context88.next = 11;
+            _context90.next = 11;
             return resPromise;
           case 11:
-            return _context88.abrupt("return", _context88.sent);
+            return _context90.abrupt("return", _context90.sent);
           case 14:
-            _context88.prev = 14;
-            _context88.t0 = _context88["catch"](6);
-            if (!(_context88.t0 instanceof TurnkeyError)) {
-              _context88.next = 18;
+            _context90.prev = 14;
+            _context90.t0 = _context90["catch"](6);
+            if (!(_context90.t0 instanceof TurnkeyError)) {
+              _context90.next = 18;
               break;
             }
-            throw _context88.t0;
+            throw _context90.t0;
           case 18:
-            throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _context88.t0);
+            throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _context90.t0);
           case 19:
           case "end":
-            return _context88.stop();
+            return _context90.stop();
         }
-      }, _callee88, null, [[6, 14]]);
+      }, _callee90, null, [[6, 14]]);
     }));
-    return function (_x77) {
-      return _ref107.apply(this, arguments);
+    return function (_x79) {
+      return _ref109.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleRemoveOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref109 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee89(params) {
+    var _ref111 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee91(params) {
       var providerId, _params$successPageDu3, successPageDuration, subTitle, title, stampWith;
-      return _regeneratorRuntime().wrap(function _callee89$(_context89) {
-        while (1) switch (_context89.prev = _context89.next) {
+      return _regeneratorRuntime().wrap(function _callee91$(_context91) {
+        while (1) switch (_context91.prev = _context91.next) {
           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) {
-              _context89.next = 3;
+              _context91.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context89.next = 5;
+              _context91.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
-            _context89.prev = 5;
-            return _context89.abrupt("return", new Promise(function (resolve, reject) {
+            _context91.prev = 5;
+            return _context91.abrupt("return", new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove OAuth Provider",
                 content: jsx(RemoveOAuthProvider, _objectSpread2(_objectSpread2({
@@ -5202,50 +5279,50 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 9:
-            _context89.prev = 9;
-            _context89.t0 = _context89["catch"](5);
-            if (!(_context89.t0 instanceof TurnkeyError)) {
-              _context89.next = 13;
+            _context91.prev = 9;
+            _context91.t0 = _context91["catch"](5);
+            if (!(_context91.t0 instanceof TurnkeyError)) {
+              _context91.next = 13;
               break;
             }
-            throw _context89.t0;
+            throw _context91.t0;
           case 13:
-            throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _context89.t0);
+            throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _context91.t0);
           case 14:
           case "end":
-            return _context89.stop();
+            return _context91.stop();
         }
-      }, _callee89, null, [[5, 9]]);
+      }, _callee91, null, [[5, 9]]);
     }));
-    return function (_x78) {
-      return _ref109.apply(this, arguments);
+    return function (_x80) {
+      return _ref111.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleAddOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref110 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee91(params) {
+    var _ref112 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee93(params) {
       var providerName, stampWith, onOauthSuccess;
-      return _regeneratorRuntime().wrap(function _callee91$(_context91) {
-        while (1) switch (_context91.prev = _context91.next) {
+      return _regeneratorRuntime().wrap(function _callee93$(_context93) {
+        while (1) switch (_context93.prev = _context93.next) {
           case 0:
             if (client) {
-              _context91.next = 2;
+              _context93.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (session) {
-              _context91.next = 4;
+              _context93.next = 4;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 4:
             providerName = params.providerName, stampWith = params.stampWith;
             onOauthSuccess = /*#__PURE__*/function () {
-              var _ref111 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee90(params) {
-                return _regeneratorRuntime().wrap(function _callee90$(_context90) {
-                  while (1) switch (_context90.prev = _context90.next) {
+              var _ref113 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee92(params) {
+                return _regeneratorRuntime().wrap(function _callee92$(_context92) {
+                  while (1) switch (_context92.prev = _context92.next) {
                     case 0:
-                      _context90.next = 2;
+                      _context92.next = 2;
                       return addOauthProvider({
                         providerName: params.providerName,
                         oidcToken: params.oidcToken,
@@ -5266,99 +5343,99 @@ var ClientProvider = function ClientProvider(_ref) {
                       });
                     case 3:
                     case "end":
-                      return _context90.stop();
+                      return _context92.stop();
                   }
-                }, _callee90);
+                }, _callee92);
               }));
-              return function onOauthSuccess(_x80) {
-                return _ref111.apply(this, arguments);
+              return function onOauthSuccess(_x82) {
+                return _ref113.apply(this, arguments);
               };
             }();
-            _context91.t0 = providerName;
-            _context91.next = _context91.t0 === OAuthProviders.DISCORD ? 9 : _context91.t0 === OAuthProviders.X ? 12 : _context91.t0 === OAuthProviders.GOOGLE ? 15 : _context91.t0 === OAuthProviders.APPLE ? 18 : _context91.t0 === OAuthProviders.FACEBOOK ? 21 : 24;
+            _context93.t0 = providerName;
+            _context93.next = _context93.t0 === OAuthProviders.DISCORD ? 9 : _context93.t0 === OAuthProviders.X ? 12 : _context93.t0 === OAuthProviders.GOOGLE ? 15 : _context93.t0 === OAuthProviders.APPLE ? 18 : _context93.t0 === OAuthProviders.FACEBOOK ? 21 : 24;
             break;
           case 9:
-            _context91.next = 11;
+            _context93.next = 11;
             return handleDiscordOauth({
               openInPage: false,
               onOauthSuccess: onOauthSuccess
             });
           case 11:
-            return _context91.abrupt("break", 25);
+            return _context93.abrupt("break", 25);
           case 12:
-            _context91.next = 14;
+            _context93.next = 14;
             return handleXOauth({
               openInPage: false,
               onOauthSuccess: onOauthSuccess
             });
           case 14:
-            return _context91.abrupt("break", 25);
+            return _context93.abrupt("break", 25);
           case 15:
-            _context91.next = 17;
+            _context93.next = 17;
             return handleGoogleOauth({
               openInPage: false,
               onOauthSuccess: onOauthSuccess
             });
           case 17:
-            return _context91.abrupt("break", 25);
+            return _context93.abrupt("break", 25);
           case 18:
-            _context91.next = 20;
+            _context93.next = 20;
             return handleAppleOauth({
               openInPage: false,
               onOauthSuccess: onOauthSuccess
             });
           case 20:
-            return _context91.abrupt("break", 25);
+            return _context93.abrupt("break", 25);
           case 21:
-            _context91.next = 23;
+            _context93.next = 23;
             return handleFacebookOauth({
               openInPage: false,
               onOauthSuccess: onOauthSuccess
             });
           case 23:
-            return _context91.abrupt("break", 25);
+            return _context93.abrupt("break", 25);
           case 24:
             throw new TurnkeyError("Unsupported OAuth provider: ".concat(providerName), TurnkeyErrorCodes.NOT_FOUND);
           case 25:
           case "end":
-            return _context91.stop();
+            return _context93.stop();
         }
-      }, _callee91);
+      }, _callee93);
     }));
-    return function (_x79) {
-      return _ref110.apply(this, arguments);
+    return function (_x81) {
+      return _ref112.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleConnectExternalWallet = useCallback(/*#__PURE__*/function () {
-    var _ref112 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee92(params) {
+    var _ref114 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee94(params) {
       var _masterConfig$walletC4, _masterConfig$walletC5;
-      var _ref113, _ref113$successPageDu, successPageDuration, providers;
-      return _regeneratorRuntime().wrap(function _callee92$(_context92) {
-        while (1) switch (_context92.prev = _context92.next) {
+      var _ref115, _ref115$successPageDu, successPageDuration, providers;
+      return _regeneratorRuntime().wrap(function _callee94$(_context94) {
+        while (1) switch (_context94.prev = _context94.next) {
           case 0:
-            _ref113 = params || {}, _ref113$successPageDu = _ref113.successPageDuration, successPageDuration = _ref113$successPageDu === void 0 ? 2000 : _ref113$successPageDu;
+            _ref115 = params || {}, _ref115$successPageDu = _ref115.successPageDuration, successPageDuration = _ref115$successPageDu === void 0 ? 2000 : _ref115$successPageDu;
             if (client) {
-              _context92.next = 3;
+              _context94.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context92.next = 5;
+              _context94.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
             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) {
-              _context92.next = 7;
+              _context94.next = 7;
               break;
             }
             throw new TurnkeyError("Wallet connecting is not enabled.", TurnkeyErrorCodes.FEATURE_NOT_ENABLED);
           case 7:
-            _context92.next = 9;
-            return getWalletProviders();
+            _context94.next = 9;
+            return fetchWalletProviders();
           case 9:
-            providers = _context92.sent;
+            providers = _context94.sent;
             pushPage({
               key: "Connect wallet",
               content: jsx(ConnectWalletModal, {
@@ -5368,29 +5445,29 @@ var ClientProvider = function ClientProvider(_ref) {
             });
           case 11:
           case "end":
-            return _context92.stop();
+            return _context94.stop();
         }
-      }, _callee92);
+      }, _callee94);
     }));
-    return function (_x81) {
-      return _ref112.apply(this, arguments);
+    return function (_x83) {
+      return _ref114.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleRemoveUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref114 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee93(params) {
-      var _ref115, _ref115$successPageDu, successPageDuration, stampWith, userId;
-      return _regeneratorRuntime().wrap(function _callee93$(_context93) {
-        while (1) switch (_context93.prev = _context93.next) {
+    var _ref116 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee95(params) {
+      var _ref117, _ref117$successPageDu, successPageDuration, stampWith, userId;
+      return _regeneratorRuntime().wrap(function _callee95$(_context95) {
+        while (1) switch (_context95.prev = _context95.next) {
           case 0:
-            _ref115 = params || {}, _ref115$successPageDu = _ref115.successPageDuration, successPageDuration = _ref115$successPageDu === void 0 ? 2000 : _ref115$successPageDu, stampWith = _ref115.stampWith, userId = _ref115.userId;
+            _ref117 = params || {}, _ref117$successPageDu = _ref117.successPageDuration, successPageDuration = _ref117$successPageDu === void 0 ? 2000 : _ref117$successPageDu, stampWith = _ref117.stampWith, userId = _ref117.userId;
             if (session) {
-              _context93.next = 3;
+              _context95.next = 3;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 3:
-            _context93.prev = 3;
-            return _context93.abrupt("return", new Promise(function (resolve, reject) {
+            _context95.prev = 3;
+            return _context95.abrupt("return", new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Email",
                 content: jsx(RemoveEmail, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5412,40 +5489,40 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 7:
-            _context93.prev = 7;
-            _context93.t0 = _context93["catch"](3);
-            if (!(_context93.t0 instanceof TurnkeyError)) {
-              _context93.next = 11;
+            _context95.prev = 7;
+            _context95.t0 = _context95["catch"](3);
+            if (!(_context95.t0 instanceof TurnkeyError)) {
+              _context95.next = 11;
               break;
             }
-            throw _context93.t0;
+            throw _context95.t0;
           case 11:
-            throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _context93.t0);
+            throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _context95.t0);
           case 12:
           case "end":
-            return _context93.stop();
+            return _context95.stop();
         }
-      }, _callee93, null, [[3, 7]]);
+      }, _callee95, null, [[3, 7]]);
     }));
-    return function (_x82) {
-      return _ref114.apply(this, arguments);
+    return function (_x84) {
+      return _ref116.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [pushPage, masterConfig, client, session, user]);
   var handleRemoveUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref116 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee94(params) {
-      var _ref117, _ref117$successPageDu, successPageDuration, stampWith, userId;
-      return _regeneratorRuntime().wrap(function _callee94$(_context94) {
-        while (1) switch (_context94.prev = _context94.next) {
+    var _ref118 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee96(params) {
+      var _ref119, _ref119$successPageDu, successPageDuration, stampWith, userId;
+      return _regeneratorRuntime().wrap(function _callee96$(_context96) {
+        while (1) switch (_context96.prev = _context96.next) {
           case 0:
-            _ref117 = params || {}, _ref117$successPageDu = _ref117.successPageDuration, successPageDuration = _ref117$successPageDu === void 0 ? 2000 : _ref117$successPageDu, stampWith = _ref117.stampWith, userId = _ref117.userId;
+            _ref119 = params || {}, _ref119$successPageDu = _ref119.successPageDuration, successPageDuration = _ref119$successPageDu === void 0 ? 2000 : _ref119$successPageDu, stampWith = _ref119.stampWith, userId = _ref119.userId;
             if (session) {
-              _context94.next = 3;
+              _context96.next = 3;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 3:
-            _context94.prev = 3;
-            return _context94.abrupt("return", new Promise(function (resolve, reject) {
+            _context96.prev = 3;
+            return _context96.abrupt("return", new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Phone Number",
                 content: jsx(RemovePhoneNumber, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5467,60 +5544,60 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 7:
-            _context94.prev = 7;
-            _context94.t0 = _context94["catch"](3);
-            if (!(_context94.t0 instanceof TurnkeyError)) {
-              _context94.next = 11;
+            _context96.prev = 7;
+            _context96.t0 = _context96["catch"](3);
+            if (!(_context96.t0 instanceof TurnkeyError)) {
+              _context96.next = 11;
               break;
             }
-            throw _context94.t0;
+            throw _context96.t0;
           case 11:
-            throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _context94.t0);
+            throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _context96.t0);
           case 12:
           case "end":
-            return _context94.stop();
+            return _context96.stop();
         }
-      }, _callee94, null, [[3, 7]]);
+      }, _callee96, null, [[3, 7]]);
     }));
-    return function (_x83) {
-      return _ref116.apply(this, arguments);
+    return function (_x85) {
+      return _ref118.apply(this, arguments);
     };
-  }(), [pushPage]);
+  }(), [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 _ref118 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee95() {
+      var _ref120 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee97() {
         var proxyAuthConfig;
-        return _regeneratorRuntime().wrap(function _callee95$(_context95) {
-          while (1) switch (_context95.prev = _context95.next) {
+        return _regeneratorRuntime().wrap(function _callee97$(_context97) {
+          while (1) switch (_context97.prev = _context97.next) {
             case 0:
-              _context95.prev = 0;
+              _context97.prev = 0;
               if (!config.authProxyConfigId) {
-                _context95.next = 6;
+                _context97.next = 6;
                 break;
               }
-              _context95.next = 4;
+              _context97.next = 4;
               return getAuthProxyConfig(config.authProxyConfigId, config.authProxyUrl);
             case 4:
-              proxyAuthConfig = _context95.sent;
+              proxyAuthConfig = _context97.sent;
               proxyAuthConfigRef.current = proxyAuthConfig;
             case 6:
               setMasterConfig(buildConfig(proxyAuthConfig));
-              _context95.next = 12;
+              _context97.next = 12;
               break;
             case 9:
-              _context95.prev = 9;
-              _context95.t0 = _context95["catch"](0);
+              _context97.prev = 9;
+              _context97.t0 = _context97["catch"](0);
               setClientState(ClientState.Error);
             case 12:
             case "end":
-              return _context95.stop();
+              return _context97.stop();
           }
-        }, _callee95, null, [[0, 9]]);
+        }, _callee97, null, [[0, 9]]);
       }));
       return function fetchProxyAuthConfig() {
-        return _ref118.apply(this, arguments);
+        return _ref120.apply(this, arguments);
       };
     }();
     fetchProxyAuthConfig();
@@ -5551,24 +5628,24 @@ var ClientProvider = function ClientProvider(_ref) {
   useEffect(function () {
     if (!client) return;
     var handleRefreshWallets = /*#__PURE__*/function () {
-      var _ref119 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee96() {
-        return _regeneratorRuntime().wrap(function _callee96$(_context96) {
-          while (1) switch (_context96.prev = _context96.next) {
+      var _ref121 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee98() {
+        return _regeneratorRuntime().wrap(function _callee98$(_context98) {
+          while (1) switch (_context98.prev = _context98.next) {
             case 0:
               if (!session) {
-                _context96.next = 3;
+                _context98.next = 3;
                 break;
               }
-              _context96.next = 3;
+              _context98.next = 3;
               return debouncedRefreshWallets();
             case 3:
             case "end":
-              return _context96.stop();
+              return _context98.stop();
           }
-        }, _callee96);
+        }, _callee98);
       }));
       return function handleRefreshWallets() {
-        return _ref119.apply(this, arguments);
+        return _ref121.apply(this, arguments);
       };
     }();
     var cleanup = function cleanup() {};
@@ -5618,7 +5695,7 @@ var ClientProvider = function ClientProvider(_ref) {
       logout: logout,
       loginWithPasskey: loginWithPasskey,
       signUpWithPasskey: signUpWithPasskey,
-      getWalletProviders: getWalletProviders,
+      fetchWalletProviders: fetchWalletProviders,
       connectWalletAccount: connectWalletAccount,
       disconnectWalletAccount: disconnectWalletAccount,
       switchWalletAccountChain: switchWalletAccountChain,
@@ -5641,6 +5718,8 @@ var ClientProvider = function ClientProvider(_ref) {
       signTransaction: signTransaction,
       signAndSendTransaction: signAndSendTransaction,
       fetchUser: fetchUser,
+      fetchOrCreateP256ApiKeyUser: fetchOrCreateP256ApiKeyUser,
+      fetchOrCreatePolicies: fetchOrCreatePolicies,
       refreshUser: refreshUser,
       updateUserEmail: updateUserEmail,
       removeUserEmail: removeUserEmail,