@turnkey/react-wallet-kit 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/providers/client/Provider.mjs

@@ -4,7 +4,7 @@ import { jsx } from 'react/jsx-runtime';
 import { sha256 } from '@noble/hashes/sha2';
 import { bytesToHex } from '@noble/hashes/utils';
 import { useDebouncedCallback, isValidSession, parseOAuthRedirect, handleFacebookPKCEFlow, SESSION_WARNING_THRESHOLD_MS, withTurnkeyErrorHandling, GOOGLE_AUTH_URL, popupWidth, popupHeight, APPLE_AUTH_URL, exchangeCodeForToken, FACEBOOK_AUTH_URL, generateChallengePair } from '../../utils.mjs';
-import { TurnkeyClient, Chain, getAuthProxyConfig, DEFAULT_SESSION_EXPIRATION_IN_SECONDS, OtpType } from '@turnkey/core';
+import { TurnkeyClient, WalletInterfaceType, Chain, getAuthProxyConfig, DEFAULT_SESSION_EXPIRATION_IN_SECONDS, OtpType } from '@turnkey/core';
 import { useState, useRef, useEffect } from 'react';
 import { TurnkeyError, TurnkeyNetworkError, TurnkeyErrorCodes, OAuthProviders } from '@turnkey/sdk-types';
 import { useModal } from '../modal/Hook.mjs';
@@ -66,36 +66,32 @@ var ClientProvider = function ClientProvider(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     session = _useState4[0],
     setSession = _useState4[1];
-  var _useState5 = useState(false),
+  var _useState5 = useState(undefined),
     _useState6 = _slicedToArray(_useState5, 2),
-    autoRefreshSession = _useState6[0],
-    setAutoRefreshSession = _useState6[1];
-  var _useState7 = useState(undefined),
+    masterConfig = _useState6[0],
+    setMasterConfig = _useState6[1];
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    masterConfig = _useState8[0],
-    setMasterConfig = _useState8[1];
-  var _useState9 = useState([]),
+    wallets = _useState8[0],
+    setWallets = _useState8[1];
+  var _useState9 = useState(undefined),
     _useState0 = _slicedToArray(_useState9, 2),
-    wallets = _useState0[0],
-    setWallets = _useState0[1];
-  var _useState1 = useState(undefined),
+    user = _useState0[0],
+    setUser = _useState0[1];
+  var _useState1 = useState(),
     _useState10 = _slicedToArray(_useState1, 2),
-    user = _useState10[0],
-    setUser = _useState10[1];
-  var _useState11 = useState(),
+    clientState = _useState10[0],
+    setClientState = _useState10[1];
+  var _useState11 = useState(AuthState.Unauthenticated),
     _useState12 = _slicedToArray(_useState11, 2),
-    clientState = _useState12[0],
-    setClientState = _useState12[1];
-  var _useState13 = useState(AuthState.Unauthenticated),
-    _useState14 = _slicedToArray(_useState13, 2),
-    authState = _useState14[0],
-    setAuthState = _useState14[1];
+    authState = _useState12[0],
+    setAuthState = _useState12[1];
   var expiryTimeoutsRef = useRef({});
   var proxyAuthConfigRef = useRef(null);
-  var _useState15 = useState(undefined),
-    _useState16 = _slicedToArray(_useState15, 2),
-    allSessions = _useState16[0],
-    setAllSessions = _useState16[1];
+  var _useState13 = useState(undefined),
+    _useState14 = _slicedToArray(_useState13, 2),
+    allSessions = _useState14[0],
+    setAllSessions = _useState14[1];
   var _useModal = useModal(),
     pushPage = _useModal.pushPage,
     closeModal = _useModal.closeModal;
@@ -173,7 +169,7 @@ var ClientProvider = function ClientProvider(_ref) {
   useEffect(function () {
     // authState must be consistent with session state. We found during testing that there are cases where the session and authState can be out of sync in very rare edge cases.
     // This will ensure that they are always in sync and remove the need to setAuthState manually in other places.
-    if (session) {
+    if (session && isValidSession(session)) {
       setAuthState(AuthState.Authenticated);
     } else {
       setAuthState(AuthState.Unauthenticated);
@@ -397,7 +393,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$oauthOrd, _config$auth8, _config$auth$methodOr, _config$auth9, _config$auth0, _config$auth1, _config$auth1$oauthCo, _config$walletConfig, _ref4, _resolvedMethods$wall, _config$walletConfig2, _config$walletConfig3, _config$walletConfig$, _config$walletConfig4, _config$walletConfig5, _config$walletConfig6, _config$walletConfig7, _config$walletConfig8, _config$walletConfig9, _config$walletConfig0, _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$oauthOrd, _config$auth8, _config$auth$methodOr, _config$auth9, _config$auth0, _config$auth1, _config$auth1$oauthCo, _config$auth$autoRefr, _config$auth10, _config$walletConfig, _ref4, _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"),
@@ -423,7 +419,8 @@ var ClientProvider = function ClientProvider(_ref) {
         }),
         sessionExpirationSeconds: proxyAuthConfig === null || proxyAuthConfig === void 0 ? void 0 : proxyAuthConfig.sessionExpirationSeconds,
         methodOrder: methodOrder,
-        oauthOrder: oauthOrder
+        oauthOrder: oauthOrder,
+        autoRefreshSession: (_config$auth$autoRefr = (_config$auth10 = config.auth) === null || _config$auth10 === void 0 ? void 0 : _config$auth10.autoRefreshSession) !== null && _config$auth$autoRefr !== void 0 ? _config$auth$autoRefr : true
       }),
       walletConfig: _objectSpread2(_objectSpread2({}, config.walletConfig), {}, {
         features: _objectSpread2(_objectSpread2({}, (_config$walletConfig = config.walletConfig) === null || _config$walletConfig === void 0 ? void 0 : _config$walletConfig.features), {}, {
@@ -433,10 +430,12 @@ var ClientProvider = function ClientProvider(_ref) {
         }),
         chains: _objectSpread2(_objectSpread2({}, (_config$walletConfig6 = config.walletConfig) === null || _config$walletConfig6 === void 0 ? void 0 : _config$walletConfig6.chains), {}, {
           ethereum: _objectSpread2(_objectSpread2({}, (_config$walletConfig7 = config.walletConfig) === null || _config$walletConfig7 === void 0 ? void 0 : (_config$walletConfig8 = _config$walletConfig7.chains) === null || _config$walletConfig8 === void 0 ? void 0 : _config$walletConfig8.ethereum), {}, {
-            "native": true // Always enable native Ethereum support
+            // keep user's value if provided; default only when undefined
+            "native": (_config$walletConfig$2 = (_config$walletConfig9 = config.walletConfig) === null || _config$walletConfig9 === void 0 ? void 0 : (_config$walletConfig0 = _config$walletConfig9.chains) === null || _config$walletConfig0 === void 0 ? void 0 : (_config$walletConfig1 = _config$walletConfig0.ethereum) === null || _config$walletConfig1 === void 0 ? void 0 : _config$walletConfig1["native"]) !== null && _config$walletConfig$2 !== void 0 ? _config$walletConfig$2 : true
           }),
-          solana: _objectSpread2(_objectSpread2({}, (_config$walletConfig9 = config.walletConfig) === null || _config$walletConfig9 === void 0 ? void 0 : (_config$walletConfig0 = _config$walletConfig9.chains) === null || _config$walletConfig0 === void 0 ? void 0 : _config$walletConfig0.solana), {}, {
-            "native": true // Always enable native Solana support
+          solana: _objectSpread2(_objectSpread2({}, (_config$walletConfig10 = config.walletConfig) === null || _config$walletConfig10 === void 0 ? void 0 : (_config$walletConfig11 = _config$walletConfig10.chains) === null || _config$walletConfig11 === void 0 ? void 0 : _config$walletConfig11.solana), {}, {
+            // keep user's value if provided; default only when undefined
+            "native": (_config$walletConfig$3 = (_config$walletConfig12 = config.walletConfig) === null || _config$walletConfig12 === void 0 ? void 0 : (_config$walletConfig13 = _config$walletConfig12.chains) === null || _config$walletConfig13 === void 0 ? void 0 : (_config$walletConfig14 = _config$walletConfig13.solana) === null || _config$walletConfig14 === void 0 ? void 0 : _config$walletConfig14["native"]) !== null && _config$walletConfig$3 !== void 0 ? _config$walletConfig$3 : true
           })
         })
       }),
@@ -453,7 +452,7 @@ var ClientProvider = function ClientProvider(_ref) {
    */
   var initializeClient = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _masterConfig$passkey, _masterConfig$passkey2, _masterConfig$passkey3, _masterConfig$passkey4, _masterConfig$walletC, _masterConfig$walletC2, _masterConfig$walletC3, _masterConfig$auth$au, _masterConfig$auth3, turnkeyClient, _callbacks$onError, _callbacks$onError2;
+      var _masterConfig$passkey, _masterConfig$passkey2, _masterConfig$passkey3, _masterConfig$passkey4, _masterConfig$walletC, _masterConfig$walletC2, _masterConfig$walletC3, turnkeyClient, _callbacks$onError, _callbacks$onError2;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -485,16 +484,15 @@ var ClientProvider = function ClientProvider(_ref) {
                 walletConnect: masterConfig.walletConfig.walletConnect
               })
             });
-            setAutoRefreshSession((_masterConfig$auth$au = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth3 = masterConfig.auth) === null || _masterConfig$auth3 === void 0 ? void 0 : _masterConfig$auth3.autoRefreshSession) !== null && _masterConfig$auth$au !== void 0 ? _masterConfig$auth$au : false);
-            _context5.next = 8;
+            _context5.next = 7;
             return turnkeyClient.init();
-          case 8:
+          case 7:
             setClient(turnkeyClient);
             // Don't set clientState to ready until we fetch the proxy auth config (See other fetchProxyAuthConfig useEffect)
-            _context5.next = 15;
+            _context5.next = 14;
             break;
-          case 11:
-            _context5.prev = 11;
+          case 10:
+            _context5.prev = 10;
             _context5.t0 = _context5["catch"](2);
             setClientState(ClientState.Error);
             if (_context5.t0 instanceof TurnkeyError || _context5.t0 instanceof TurnkeyNetworkError) {
@@ -502,11 +500,11 @@ var ClientProvider = function ClientProvider(_ref) {
             } else {
               callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError2 = callbacks.onError) === null || _callbacks$onError2 === void 0 ? void 0 : _callbacks$onError2.call(callbacks, new TurnkeyError("Failed to initialize Turnkey client", TurnkeyErrorCodes.INITIALIZE_CLIENT_ERROR, _context5.t0));
             }
-          case 15:
+          case 14:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, null, [[2, 11]]);
+      }, _callee5, null, [[2, 10]]);
     }));
     return function initializeClient() {
       return _ref5.apply(this, arguments);
@@ -518,31 +516,33 @@ var ClientProvider = function ClientProvider(_ref) {
    */
   var initializeSessions = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-      var _allSessions, activeSessionKey, _callbacks$onError3, _callbacks$onError4;
+      var allLocalStorageSessions, activeSessionKey, _callbacks$onError3, _callbacks$onError4;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _context7.prev = 0;
-            _context7.next = 3;
+            setSession(undefined);
+            setAllSessions(undefined);
+            _context7.prev = 2;
+            _context7.next = 5;
             return getAllSessions();
-          case 3:
-            _allSessions = _context7.sent;
-            if (_allSessions) {
-              _context7.next = 6;
+          case 5:
+            allLocalStorageSessions = _context7.sent;
+            if (allLocalStorageSessions) {
+              _context7.next = 8;
               break;
             }
             return _context7.abrupt("return");
-          case 6:
-            _context7.next = 8;
-            return Promise.all(Object.keys(_allSessions).map(/*#__PURE__*/function () {
+          case 8:
+            _context7.next = 10;
+            return Promise.all(Object.keys(allLocalStorageSessions).map(/*#__PURE__*/function () {
               var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(sessionKey) {
                 var session;
                 return _regeneratorRuntime().wrap(function _callee6$(_context6) {
                   while (1) switch (_context6.prev = _context6.next) {
                     case 0:
-                      session = _allSessions === null || _allSessions === void 0 ? void 0 : _allSessions[sessionKey];
+                      session = allLocalStorageSessions === null || allLocalStorageSessions === void 0 ? void 0 : allLocalStorageSessions[sessionKey];
                       if (isValidSession(session)) {
-                        _context6.next = 5;
+                        _context6.next = 12;
                         break;
                       }
                       _context6.next = 4;
@@ -550,13 +550,25 @@ var ClientProvider = function ClientProvider(_ref) {
                         sessionKey: sessionKey
                       });
                     case 4:
+                      _context6.t0 = sessionKey;
+                      _context6.next = 7;
+                      return getActiveSessionKey();
+                    case 7:
+                      _context6.t1 = _context6.sent;
+                      if (!(_context6.t0 === _context6.t1)) {
+                        _context6.next = 10;
+                        break;
+                      }
+                      setSession(undefined);
+                    case 10:
+                      delete allLocalStorageSessions[sessionKey];
                       return _context6.abrupt("return");
-                    case 5:
+                    case 12:
                       scheduleSessionExpiration({
                         sessionKey: sessionKey,
                         expiry: session.expiry
                       });
-                    case 6:
+                    case 13:
                     case "end":
                       return _context6.stop();
                   }
@@ -566,40 +578,46 @@ var ClientProvider = function ClientProvider(_ref) {
                 return _ref7.apply(this, arguments);
               };
             }()));
-          case 8:
-            setAllSessions(_allSessions);
-            _context7.next = 11;
+          case 10:
+            setAllSessions(allLocalStorageSessions || undefined);
+            _context7.next = 13;
             return client === null || client === void 0 ? void 0 : client.getActiveSessionKey();
-          case 11:
+          case 13:
             activeSessionKey = _context7.sent;
             if (!activeSessionKey) {
-              _context7.next = 19;
+              _context7.next = 23;
+              break;
+            }
+            if (allLocalStorageSessions[activeSessionKey]) {
+              _context7.next = 17;
               break;
             }
-            setSession(_allSessions === null || _allSessions === void 0 ? void 0 : _allSessions[activeSessionKey]);
-            _context7.next = 16;
+            return _context7.abrupt("return");
+          case 17:
+            setSession(allLocalStorageSessions[activeSessionKey]);
+            _context7.next = 20;
             return refreshUser();
-          case 16:
-            _context7.next = 18;
+          case 20:
+            _context7.next = 22;
             return refreshWallets();
-          case 18:
+          case 22:
             return _context7.abrupt("return");
-          case 19:
-            _context7.next = 24;
+          case 23:
+            _context7.next = 28;
             break;
-          case 21:
-            _context7.prev = 21;
-            _context7.t0 = _context7["catch"](0);
+          case 25:
+            _context7.prev = 25;
+            _context7.t0 = _context7["catch"](2);
             if (_context7.t0 instanceof TurnkeyError || _context7.t0 instanceof TurnkeyNetworkError) {
               callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError3 = callbacks.onError) === null || _callbacks$onError3 === void 0 ? void 0 : _callbacks$onError3.call(callbacks, _context7.t0);
             } else {
               callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError4 = callbacks.onError) === null || _callbacks$onError4 === void 0 ? void 0 : _callbacks$onError4.call(callbacks, new TurnkeyError("Failed to initialize sessions", TurnkeyErrorCodes.INITIALIZE_SESSION_ERROR, _context7.t0));
             }
-          case 24:
+          case 28:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[0, 21]]);
+      }, _callee7, null, [[2, 25]]);
     }));
     return function initializeSessions() {
       return _ref6.apply(this, arguments);
@@ -630,10 +648,10 @@ var ClientProvider = function ClientProvider(_ref) {
    * @throws {TurnkeyError} If an error occurs while clearing the timeouts.
    */
   function _scheduleSessionExpiration() {
-    _scheduleSessionExpiration = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+    _scheduleSessionExpiration = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
       var sessionKey, expiry, timeUntilExpiry, _beforeExpiry, expireSession, _callbacks$onError0, _callbacks$onError1;
-      return _regeneratorRuntime().wrap(function _callee29$(_context29) {
-        while (1) switch (_context29.prev = _context29.next) {
+      return _regeneratorRuntime().wrap(function _callee31$(_context31) {
+        while (1) switch (_context31.prev = _context31.next) {
           case 0:
             sessionKey = params.sessionKey, expiry = params.expiry;
             try {
@@ -648,97 +666,114 @@ var ClientProvider = function ClientProvider(_ref) {
               }
               timeUntilExpiry = expiry * 1000 - Date.now();
               _beforeExpiry = /*#__PURE__*/function () {
-                var _ref33 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
-                  var _callbacks$beforeSess;
+                var _ref35 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+                  var _callbacks$beforeSess, _masterConfig$auth5;
                   var activeSession, session;
-                  return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-                    while (1) switch (_context27.prev = _context27.next) {
+                  return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+                    while (1) switch (_context29.prev = _context29.next) {
                       case 0:
-                        _context27.next = 2;
+                        _context29.next = 2;
                         return getSession();
                       case 2:
-                        activeSession = _context27.sent;
+                        activeSession = _context29.sent;
                         if (!(!activeSession && expiryTimeoutsRef.current[sessionKey])) {
-                          _context27.next = 7;
+                          _context29.next = 7;
                           break;
                         }
                         clearTimeout(expiryTimeoutsRef.current["".concat(sessionKey, "-warning")]);
                         expiryTimeoutsRef.current["".concat(sessionKey, "-warning")] = setTimeout(_beforeExpiry, 10000);
-                        return _context27.abrupt("return");
+                        return _context29.abrupt("return");
                       case 7:
-                        _context27.next = 9;
+                        _context29.next = 9;
                         return getSession({
                           sessionKey: sessionKey
                         });
                       case 9:
-                        session = _context27.sent;
+                        session = _context29.sent;
                         if (session) {
-                          _context27.next = 12;
+                          _context29.next = 12;
                           break;
                         }
-                        return _context27.abrupt("return");
+                        return _context29.abrupt("return");
                       case 12:
                         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 (!autoRefreshSession) {
-                          _context27.next = 16;
+                        if (!(masterConfig !== null && masterConfig !== void 0 && (_masterConfig$auth5 = masterConfig.auth) !== null && _masterConfig$auth5 !== void 0 && _masterConfig$auth5.autoRefreshSession)) {
+                          _context29.next = 16;
                           break;
                         }
-                        _context27.next = 16;
+                        _context29.next = 16;
                         return refreshSession({
                           expirationSeconds: session.expirationSeconds,
                           sessionKey: sessionKey
                         });
                       case 16:
                       case "end":
-                        return _context27.stop();
+                        return _context29.stop();
                     }
-                  }, _callee27);
+                  }, _callee29);
                 }));
                 return function beforeExpiry() {
-                  return _ref33.apply(this, arguments);
+                  return _ref35.apply(this, arguments);
                 };
               }();
               expireSession = /*#__PURE__*/function () {
-                var _ref34 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
+                var _ref36 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
                   var _callbacks$onSessionE;
                   var expiredSession;
-                  return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-                    while (1) switch (_context28.prev = _context28.next) {
+                  return _regeneratorRuntime().wrap(function _callee30$(_context30) {
+                    while (1) switch (_context30.prev = _context30.next) {
                       case 0:
-                        _context28.next = 2;
+                        _context30.next = 2;
                         return getSession({
                           sessionKey: sessionKey
                         });
                       case 2:
-                        expiredSession = _context28.sent;
+                        expiredSession = _context30.sent;
                         if (expiredSession) {
-                          _context28.next = 5;
+                          _context30.next = 5;
                           break;
                         }
-                        return _context28.abrupt("return");
+                        return _context30.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
                         });
-                        _context28.next = 8;
+                        _context30.next = 8;
+                        return getActiveSessionKey();
+                      case 8:
+                        _context30.t0 = _context30.sent;
+                        _context30.t1 = sessionKey;
+                        if (!(_context30.t0 === _context30.t1)) {
+                          _context30.next = 12;
+                          break;
+                        }
+                        setSession(undefined);
+                      case 12:
+                        setAllSessions(function (prevSessions) {
+                          if (!prevSessions) return prevSessions;
+                          var newSessions = _objectSpread2({}, prevSessions);
+                          delete newSessions[sessionKey];
+                          return newSessions;
+                        });
+                        _context30.next = 15;
                         return clearSession({
                           sessionKey: sessionKey
                         });
-                      case 8:
+                      case 15:
                         delete expiryTimeoutsRef.current[sessionKey];
                         delete expiryTimeoutsRef.current["".concat(sessionKey, "-warning")];
-                        _context28.next = 12;
+                        _context30.next = 19;
                         return logout();
-                      case 12:
+                      case 19:
                       case "end":
-                        return _context28.stop();
+                        return _context30.stop();
                     }
-                  }, _callee28);
+                  }, _callee30);
                 }));
                 return function expireSession() {
-                  return _ref34.apply(this, arguments);
+                  return _ref36.apply(this, arguments);
                 };
               }();
               if (timeUntilExpiry <= SESSION_WARNING_THRESHOLD_MS) {
@@ -756,9 +791,9 @@ var ClientProvider = function ClientProvider(_ref) {
             }
           case 2:
           case "end":
-            return _context29.stop();
+            return _context31.stop();
         }
-      }, _callee29);
+      }, _callee31);
     }));
     return _scheduleSessionExpiration.apply(this, arguments);
   }
@@ -792,7 +827,7 @@ var ClientProvider = function ClientProvider(_ref) {
    */
   var handlePostAuth = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-      var sessionKey, _session, _allSessions2, _callbacks$onError7, _callbacks$onError8;
+      var sessionKey, _session, _allSessions, _callbacks$onError7, _callbacks$onError8;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
@@ -820,9 +855,9 @@ var ClientProvider = function ClientProvider(_ref) {
             _context8.next = 12;
             return client.getAllSessions();
           case 12:
-            _allSessions2 = _context8.sent;
+            _allSessions = _context8.sent;
             setSession(_session);
-            setAllSessions(_allSessions2);
+            setAllSessions(_allSessions);
             _context8.next = 17;
             return refreshWallets();
           case 17:
@@ -878,24 +913,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _createPasskey.apply(this, arguments);
   }
   function _createPasskey() {
-    _createPasskey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
-      return _regeneratorRuntime().wrap(function _callee30$(_context30) {
-        while (1) switch (_context30.prev = _context30.next) {
+    _createPasskey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+      return _regeneratorRuntime().wrap(function _callee32$(_context32) {
+        while (1) switch (_context32.prev = _context32.next) {
           case 0:
             if (client) {
-              _context30.next = 2;
+              _context32.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context30.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context32.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.createPasskey(_objectSpread2({}, params));
             }, callbacks, "Failed to create passkey"));
           case 3:
           case "end":
-            return _context30.stop();
+            return _context32.stop();
         }
-      }, _callee30);
+      }, _callee32);
     }));
     return _createPasskey.apply(this, arguments);
   }
@@ -903,12 +938,12 @@ var ClientProvider = function ClientProvider(_ref) {
     return _logout.apply(this, arguments);
   }
   function _logout() {
-    _logout = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-      return _regeneratorRuntime().wrap(function _callee31$(_context31) {
-        while (1) switch (_context31.prev = _context31.next) {
+    _logout = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+      return _regeneratorRuntime().wrap(function _callee33$(_context33) {
+        while (1) switch (_context33.prev = _context33.next) {
           case 0:
             if (client) {
-              _context31.next = 2;
+              _context33.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
@@ -917,12 +952,12 @@ var ClientProvider = function ClientProvider(_ref) {
               return client.logout(params);
             }, callbacks, "Failed to logout");
             handlePostLogout();
-            return _context31.abrupt("return");
+            return _context33.abrupt("return");
           case 5:
           case "end":
-            return _context31.stop();
+            return _context33.stop();
         }
-      }, _callee31);
+      }, _callee33);
     }));
     return _logout.apply(this, arguments);
   }
@@ -930,40 +965,40 @@ var ClientProvider = function ClientProvider(_ref) {
     return _loginWithPasskey.apply(this, arguments);
   }
   function _loginWithPasskey() {
-    _loginWithPasskey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+    _loginWithPasskey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee34(params) {
       var _masterConfig$auth$se, _masterConfig$auth6;
       var expirationSeconds, res;
-      return _regeneratorRuntime().wrap(function _callee32$(_context32) {
-        while (1) switch (_context32.prev = _context32.next) {
+      return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+        while (1) switch (_context34.prev = _context34.next) {
           case 0:
             if (client) {
-              _context32.next = 2;
+              _context34.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             expirationSeconds = (_masterConfig$auth$se = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth6 = masterConfig.auth) === null || _masterConfig$auth6 === void 0 ? void 0 : _masterConfig$auth6.sessionExpirationSeconds) !== null && _masterConfig$auth$se !== void 0 ? _masterConfig$auth$se : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
-            _context32.next = 5;
+            _context34.next = 5;
             return withTurnkeyErrorHandling(function () {
               return client.loginWithPasskey(_objectSpread2(_objectSpread2({}, params), {}, {
                 expirationSeconds: expirationSeconds
               }));
             }, callbacks, "Failed to login with passkey");
           case 5:
-            res = _context32.sent;
+            res = _context34.sent;
             if (!res) {
-              _context32.next = 9;
+              _context34.next = 9;
               break;
             }
-            _context32.next = 9;
+            _context34.next = 9;
             return handlePostAuth();
           case 9:
-            return _context32.abrupt("return", res);
+            return _context34.abrupt("return", res);
           case 10:
           case "end":
-            return _context32.stop();
+            return _context34.stop();
         }
-      }, _callee32);
+      }, _callee34);
     }));
     return _loginWithPasskey.apply(this, arguments);
   }
@@ -971,20 +1006,20 @@ var ClientProvider = function ClientProvider(_ref) {
     return _signUpWithPasskey.apply(this, arguments);
   }
   function _signUpWithPasskey() {
-    _signUpWithPasskey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
-      var _params$createSubOrgP, _params, _masterConfig$auth7, _masterConfig$auth7$c, _masterConfig$auth$se2, _masterConfig$auth8, _ref35, _params$passkeyDispla, _params2, _masterConfig$auth9, _masterConfig$auth9$c, _masterConfig$auth9$c2;
+    _signUpWithPasskey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
+      var _params$createSubOrgP, _params, _masterConfig$auth7, _masterConfig$auth7$c, _masterConfig$auth$se2, _masterConfig$auth8, _ref37, _params$passkeyDispla, _params2, _masterConfig$auth9, _masterConfig$auth9$c, _masterConfig$auth9$c2;
       var createSubOrgParams, expirationSeconds, websiteName, timestamp, passkeyName, res;
-      return _regeneratorRuntime().wrap(function _callee33$(_context33) {
-        while (1) switch (_context33.prev = _context33.next) {
+      return _regeneratorRuntime().wrap(function _callee35$(_context35) {
+        while (1) switch (_context35.prev = _context35.next) {
           case 0:
             if (client) {
-              _context33.next = 2;
+              _context35.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (masterConfig) {
-              _context33.next = 4;
+              _context35.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -1002,8 +1037,8 @@ var ClientProvider = function ClientProvider(_ref) {
             }); // We allow passkeyName to be passed in thru the provider or thru the params of this function directly.
             // This is because signUpWithPasskey will create a new passkey using that name.
             // Any extra authenticators will be created after the first one. (see core implementation)
-            passkeyName = (_ref35 = (_params$passkeyDispla = (_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.passkeyDisplayName) !== null && _params$passkeyDispla !== void 0 ? _params$passkeyDispla : (_masterConfig$auth9 = masterConfig.auth) === null || _masterConfig$auth9 === void 0 ? void 0 : (_masterConfig$auth9$c = _masterConfig$auth9.createSuborgParams) === null || _masterConfig$auth9$c === void 0 ? void 0 : (_masterConfig$auth9$c2 = _masterConfig$auth9$c.passkeyAuth) === null || _masterConfig$auth9$c2 === void 0 ? void 0 : _masterConfig$auth9$c2.passkeyName) !== null && _ref35 !== void 0 ? _ref35 : "".concat(websiteName, "-").concat(timestamp);
-            _context33.next = 12;
+            passkeyName = (_ref37 = (_params$passkeyDispla = (_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.passkeyDisplayName) !== null && _params$passkeyDispla !== void 0 ? _params$passkeyDispla : (_masterConfig$auth9 = masterConfig.auth) === null || _masterConfig$auth9 === void 0 ? void 0 : (_masterConfig$auth9$c = _masterConfig$auth9.createSuborgParams) === null || _masterConfig$auth9$c === void 0 ? void 0 : (_masterConfig$auth9$c2 = _masterConfig$auth9$c.passkeyAuth) === null || _masterConfig$auth9$c2 === void 0 ? void 0 : _masterConfig$auth9$c2.passkeyName) !== null && _ref37 !== void 0 ? _ref37 : "".concat(websiteName, "-").concat(timestamp);
+            _context35.next = 12;
             return withTurnkeyErrorHandling(function () {
               return client.signUpWithPasskey(_objectSpread2(_objectSpread2({}, params), {}, {
                 passkeyDisplayName: passkeyName,
@@ -1011,20 +1046,20 @@ var ClientProvider = function ClientProvider(_ref) {
               }));
             }, callbacks, "Failed to sign up with passkey");
           case 12:
-            res = _context33.sent;
+            res = _context35.sent;
             if (!res) {
-              _context33.next = 16;
+              _context35.next = 16;
               break;
             }
-            _context33.next = 16;
+            _context35.next = 16;
             return handlePostAuth();
           case 16:
-            return _context33.abrupt("return", res);
+            return _context35.abrupt("return", res);
           case 17:
           case "end":
-            return _context33.stop();
+            return _context35.stop();
         }
-      }, _callee33);
+      }, _callee35);
     }));
     return _signUpWithPasskey.apply(this, arguments);
   }
@@ -1032,25 +1067,25 @@ var ClientProvider = function ClientProvider(_ref) {
     return _getWalletProviders.apply(this, arguments);
   }
   function _getWalletProviders() {
-    _getWalletProviders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee34(chain) {
-      return _regeneratorRuntime().wrap(function _callee34$(_context34) {
-        while (1) switch (_context34.prev = _context34.next) {
+    _getWalletProviders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee36(chain) {
+      return _regeneratorRuntime().wrap(function _callee36$(_context36) {
+        while (1) switch (_context36.prev = _context36.next) {
           case 0:
             if (client) {
-              _context34.next = 2;
+              _context36.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context34.next = 4;
+            _context36.next = 4;
             return client.getWalletProviders(chain);
           case 4:
-            return _context34.abrupt("return", _context34.sent);
+            return _context36.abrupt("return", _context36.sent);
           case 5:
           case "end":
-            return _context34.stop();
+            return _context36.stop();
         }
-      }, _callee34);
+      }, _callee36);
     }));
     return _getWalletProviders.apply(this, arguments);
   }
@@ -1058,26 +1093,26 @@ var ClientProvider = function ClientProvider(_ref) {
     return _connectWalletAccount.apply(this, arguments);
   }
   function _connectWalletAccount() {
-    _connectWalletAccount = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee35(walletProvider) {
-      return _regeneratorRuntime().wrap(function _callee35$(_context35) {
-        while (1) switch (_context35.prev = _context35.next) {
+    _connectWalletAccount = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee37(walletProvider) {
+      return _regeneratorRuntime().wrap(function _callee37$(_context37) {
+        while (1) switch (_context37.prev = _context37.next) {
           case 0:
             if (client) {
-              _context35.next = 2;
+              _context37.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context35.next = 4;
+            _context37.next = 4;
             return client.connectWalletAccount(walletProvider);
           case 4:
-            _context35.next = 6;
+            _context37.next = 6;
             return refreshWallets();
           case 6:
           case "end":
-            return _context35.stop();
+            return _context37.stop();
         }
-      }, _callee35);
+      }, _callee37);
     }));
     return _connectWalletAccount.apply(this, arguments);
   }
@@ -1085,30 +1120,30 @@ var ClientProvider = function ClientProvider(_ref) {
     return _disconnectWalletAccount.apply(this, arguments);
   }
   function _disconnectWalletAccount() {
-    _disconnectWalletAccount = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee36(walletProvider) {
-      return _regeneratorRuntime().wrap(function _callee36$(_context36) {
-        while (1) switch (_context36.prev = _context36.next) {
+    _disconnectWalletAccount = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee38(walletProvider) {
+      return _regeneratorRuntime().wrap(function _callee38$(_context38) {
+        while (1) switch (_context38.prev = _context38.next) {
           case 0:
             if (client) {
-              _context36.next = 2;
+              _context38.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context36.next = 4;
+            _context38.next = 4;
             return client.disconnectWalletAccount(walletProvider);
           case 4:
             if (!session) {
-              _context36.next = 7;
+              _context38.next = 7;
               break;
             }
-            _context36.next = 7;
+            _context38.next = 7;
             return refreshWallets();
           case 7:
           case "end":
-            return _context36.stop();
+            return _context38.stop();
         }
-      }, _callee36);
+      }, _callee38);
     }));
     return _disconnectWalletAccount.apply(this, arguments);
   }
@@ -1116,23 +1151,23 @@ var ClientProvider = function ClientProvider(_ref) {
     return _switchWalletProviderChain.apply(this, arguments);
   } // TODO: MOE PLEASE COMMENT THESE
   function _switchWalletProviderChain() {
-    _switchWalletProviderChain = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee37(walletProvider, chainOrId) {
-      return _regeneratorRuntime().wrap(function _callee37$(_context37) {
-        while (1) switch (_context37.prev = _context37.next) {
+    _switchWalletProviderChain = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee39(walletProvider, chainOrId) {
+      return _regeneratorRuntime().wrap(function _callee39$(_context39) {
+        while (1) switch (_context39.prev = _context39.next) {
           case 0:
             if (client) {
-              _context37.next = 2;
+              _context39.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context37.next = 4;
+            _context39.next = 4;
             return client.switchWalletProviderChain(walletProvider, chainOrId);
           case 4:
           case "end":
-            return _context37.stop();
+            return _context39.stop();
         }
-      }, _callee37);
+      }, _callee39);
     }));
     return _switchWalletProviderChain.apply(this, arguments);
   }
@@ -1140,10 +1175,11 @@ var ClientProvider = function ClientProvider(_ref) {
     return _initializeProviders.apply(this, arguments);
   }
   function _initializeProviders() {
-    _initializeProviders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee38(getWalletProviders, onWalletsChanged) {
-      var cleanups, _yield$Promise$all, _yield$Promise$all2, ethProviders, solProviders, attachEthereumListeners, attachSolanaListeners;
-      return _regeneratorRuntime().wrap(function _callee38$(_context38) {
-        while (1) switch (_context38.prev = _context38.next) {
+    _initializeProviders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee40(getWalletProviders, onWalletsChanged) {
+      var _masterConfig$walletC6, _masterConfig$walletC7, _masterConfig$walletC8, _masterConfig$walletC9;
+      var cleanups, nativeOnly, ethProviders, solProviders, attachEthereumListeners, attachSolanaListeners;
+      return _regeneratorRuntime().wrap(function _callee40$(_context40) {
+        while (1) switch (_context40.prev = _context40.next) {
           case 0:
             attachSolanaListeners = function _attachSolanaListener(provider, onWalletsChanged) {
               var _provider$features;
@@ -1184,14 +1220,39 @@ var ClientProvider = function ClientProvider(_ref) {
                 provider.removeListener("disconnect", handleDisconnect);
               };
             };
-            cleanups = [];
-            _context38.next = 5;
-            return Promise.all([getWalletProviders(Chain.Ethereum), getWalletProviders(Chain.Solana)]);
-          case 5:
-            _yield$Promise$all = _context38.sent;
-            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
-            ethProviders = _yield$Promise$all2[0];
-            solProviders = _yield$Promise$all2[1];
+            cleanups = []; // we only want to initialize these listeners for native wallet providers
+            // and not WalletConnect
+            nativeOnly = function nativeOnly(p) {
+              return p.interfaceType !== WalletInterfaceType.WalletConnect;
+            };
+            if (!(masterConfig !== null && masterConfig !== void 0 && (_masterConfig$walletC6 = masterConfig.walletConfig) !== null && _masterConfig$walletC6 !== void 0 && (_masterConfig$walletC7 = _masterConfig$walletC6.chains.ethereum) !== null && _masterConfig$walletC7 !== void 0 && _masterConfig$walletC7["native"])) {
+              _context40.next = 10;
+              break;
+            }
+            _context40.next = 7;
+            return getWalletProviders(Chain.Ethereum);
+          case 7:
+            _context40.t0 = _context40.sent.filter(nativeOnly);
+            _context40.next = 11;
+            break;
+          case 10:
+            _context40.t0 = [];
+          case 11:
+            ethProviders = _context40.t0;
+            if (!(masterConfig !== null && masterConfig !== void 0 && (_masterConfig$walletC8 = masterConfig.walletConfig) !== null && _masterConfig$walletC8 !== void 0 && (_masterConfig$walletC9 = _masterConfig$walletC8.chains.solana) !== null && _masterConfig$walletC9 !== void 0 && _masterConfig$walletC9["native"])) {
+              _context40.next = 18;
+              break;
+            }
+            _context40.next = 15;
+            return getWalletProviders(Chain.Solana);
+          case 15:
+            _context40.t1 = _context40.sent.filter(nativeOnly);
+            _context40.next = 19;
+            break;
+          case 18:
+            _context40.t1 = [];
+          case 19:
+            solProviders = _context40.t1;
             ethProviders.forEach(function (p) {
               var cleanup = attachEthereumListeners(p.provider, onWalletsChanged);
               if (cleanup) cleanups.push(cleanup);
@@ -1200,16 +1261,16 @@ var ClientProvider = function ClientProvider(_ref) {
               var cleanup = attachSolanaListeners(p.provider, onWalletsChanged);
               if (cleanup) cleanups.push(cleanup);
             });
-            return _context38.abrupt("return", function () {
+            return _context40.abrupt("return", function () {
               cleanups.forEach(function (remove) {
                 return remove();
               });
             });
-          case 12:
+          case 23:
           case "end":
-            return _context38.stop();
+            return _context40.stop();
         }
-      }, _callee38);
+      }, _callee40);
     }));
     return _initializeProviders.apply(this, arguments);
   }
@@ -1217,40 +1278,40 @@ var ClientProvider = function ClientProvider(_ref) {
     return _loginWithWallet.apply(this, arguments);
   }
   function _loginWithWallet() {
-    _loginWithWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
+    _loginWithWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
       var _masterConfig$auth$se3, _masterConfig$auth0;
       var expirationSeconds, res;
-      return _regeneratorRuntime().wrap(function _callee39$(_context39) {
-        while (1) switch (_context39.prev = _context39.next) {
+      return _regeneratorRuntime().wrap(function _callee41$(_context41) {
+        while (1) switch (_context41.prev = _context41.next) {
           case 0:
             if (client) {
-              _context39.next = 2;
+              _context41.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             expirationSeconds = (_masterConfig$auth$se3 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth0 = masterConfig.auth) === null || _masterConfig$auth0 === void 0 ? void 0 : _masterConfig$auth0.sessionExpirationSeconds) !== null && _masterConfig$auth$se3 !== void 0 ? _masterConfig$auth$se3 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
-            _context39.next = 5;
+            _context41.next = 5;
             return withTurnkeyErrorHandling(function () {
               return client.loginWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
                 expirationSeconds: expirationSeconds
               }));
             }, callbacks, "Failed to login with wallet");
           case 5:
-            res = _context39.sent;
+            res = _context41.sent;
             if (!res) {
-              _context39.next = 9;
+              _context41.next = 9;
               break;
             }
-            _context39.next = 9;
+            _context41.next = 9;
             return handlePostAuth();
           case 9:
-            return _context39.abrupt("return", res);
+            return _context41.abrupt("return", res);
           case 10:
           case "end":
-            return _context39.stop();
+            return _context41.stop();
         }
-      }, _callee39);
+      }, _callee41);
     }));
     return _loginWithWallet.apply(this, arguments);
   }
@@ -1258,20 +1319,20 @@ var ClientProvider = function ClientProvider(_ref) {
     return _signUpWithWallet.apply(this, arguments);
   }
   function _signUpWithWallet() {
-    _signUpWithWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
+    _signUpWithWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
       var _params$createSubOrgP2, _masterConfig$auth1, _masterConfig$auth1$c, _masterConfig$auth$se4, _masterConfig$auth10;
       var createSubOrgParams, expirationSeconds, res;
-      return _regeneratorRuntime().wrap(function _callee40$(_context40) {
-        while (1) switch (_context40.prev = _context40.next) {
+      return _regeneratorRuntime().wrap(function _callee42$(_context42) {
+        while (1) switch (_context42.prev = _context42.next) {
           case 0:
             if (client) {
-              _context40.next = 2;
+              _context42.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (masterConfig) {
-              _context40.next = 4;
+              _context42.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -1282,30 +1343,30 @@ var ClientProvider = function ClientProvider(_ref) {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
             expirationSeconds = (_masterConfig$auth$se4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth10 = masterConfig.auth) === null || _masterConfig$auth10 === void 0 ? void 0 : _masterConfig$auth10.sessionExpirationSeconds) !== null && _masterConfig$auth$se4 !== void 0 ? _masterConfig$auth$se4 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
-            _context40.next = 9;
+            _context42.next = 9;
             return withTurnkeyErrorHandling(function () {
               return client.signUpWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
                 expirationSeconds: expirationSeconds
               }));
             }, callbacks, "Failed to sign up with wallet");
           case 9:
-            res = _context40.sent;
+            res = _context42.sent;
             if (!res) {
-              _context40.next = 15;
+              _context42.next = 15;
               break;
             }
-            _context40.next = 13;
+            _context42.next = 13;
             return handlePostAuth();
           case 13:
-            _context40.next = 15;
+            _context42.next = 15;
             break;
           case 15:
-            return _context40.abrupt("return", res);
+            return _context42.abrupt("return", res);
           case 16:
           case "end":
-            return _context40.stop();
+            return _context42.stop();
         }
-      }, _callee40);
+      }, _callee42);
     }));
     return _signUpWithWallet.apply(this, arguments);
   }
@@ -1313,20 +1374,20 @@ var ClientProvider = function ClientProvider(_ref) {
     return _loginOrSignupWithWallet.apply(this, arguments);
   }
   function _loginOrSignupWithWallet() {
-    _loginOrSignupWithWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
+    _loginOrSignupWithWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
       var _params$createSubOrgP3, _masterConfig$auth11, _masterConfig$auth11$, _masterConfig$auth$se5, _masterConfig$auth12;
       var createSubOrgParams, expirationSeconds, res;
-      return _regeneratorRuntime().wrap(function _callee41$(_context41) {
-        while (1) switch (_context41.prev = _context41.next) {
+      return _regeneratorRuntime().wrap(function _callee43$(_context43) {
+        while (1) switch (_context43.prev = _context43.next) {
           case 0:
             if (client) {
-              _context41.next = 2;
+              _context43.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (masterConfig) {
-              _context41.next = 4;
+              _context43.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -1337,30 +1398,30 @@ var ClientProvider = function ClientProvider(_ref) {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
             expirationSeconds = (_masterConfig$auth$se5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth12 = masterConfig.auth) === null || _masterConfig$auth12 === void 0 ? void 0 : _masterConfig$auth12.sessionExpirationSeconds) !== null && _masterConfig$auth$se5 !== void 0 ? _masterConfig$auth$se5 : DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
-            _context41.next = 9;
+            _context43.next = 9;
             return withTurnkeyErrorHandling(function () {
               return client.loginOrSignupWithWallet(_objectSpread2(_objectSpread2({}, params), {}, {
                 expirationSeconds: expirationSeconds
               }));
             }, callbacks, "Failed to login or sign up with wallet");
           case 9:
-            res = _context41.sent;
+            res = _context43.sent;
             if (!res) {
-              _context41.next = 15;
+              _context43.next = 15;
               break;
             }
-            _context41.next = 13;
+            _context43.next = 13;
             return handlePostAuth();
           case 13:
-            _context41.next = 15;
+            _context43.next = 15;
             break;
           case 15:
-            return _context41.abrupt("return", res);
+            return _context43.abrupt("return", res);
           case 16:
           case "end":
-            return _context41.stop();
+            return _context43.stop();
         }
-      }, _callee41);
+      }, _callee43);
     }));
     return _loginOrSignupWithWallet.apply(this, arguments);
   }
@@ -1368,24 +1429,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _initOtp.apply(this, arguments);
   }
   function _initOtp() {
-    _initOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee42(params) {
-      return _regeneratorRuntime().wrap(function _callee42$(_context42) {
-        while (1) switch (_context42.prev = _context42.next) {
+    _initOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee44(params) {
+      return _regeneratorRuntime().wrap(function _callee44$(_context44) {
+        while (1) switch (_context44.prev = _context44.next) {
           case 0:
             if (client) {
-              _context42.next = 2;
+              _context44.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context42.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context44.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.initOtp(params);
             }, callbacks, "Failed to initialize OTP"));
           case 3:
           case "end":
-            return _context42.stop();
+            return _context44.stop();
         }
-      }, _callee42);
+      }, _callee44);
     }));
     return _initOtp.apply(this, arguments);
   }
@@ -1393,24 +1454,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _verifyOtp.apply(this, arguments);
   }
   function _verifyOtp() {
-    _verifyOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
-      return _regeneratorRuntime().wrap(function _callee43$(_context43) {
-        while (1) switch (_context43.prev = _context43.next) {
+    _verifyOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee45(params) {
+      return _regeneratorRuntime().wrap(function _callee45$(_context45) {
+        while (1) switch (_context45.prev = _context45.next) {
           case 0:
             if (client) {
-              _context43.next = 2;
+              _context45.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context43.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context45.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.verifyOtp(params);
             }, callbacks, "Failed to verify OTP"));
           case 3:
           case "end":
-            return _context43.stop();
+            return _context45.stop();
         }
-      }, _callee43);
+      }, _callee45);
     }));
     return _verifyOtp.apply(this, arguments);
   }
@@ -1418,39 +1479,39 @@ var ClientProvider = function ClientProvider(_ref) {
     return _loginWithOtp.apply(this, arguments);
   }
   function _loginWithOtp() {
-    _loginWithOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee44(params) {
+    _loginWithOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee46(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee44$(_context44) {
-        while (1) switch (_context44.prev = _context44.next) {
+      return _regeneratorRuntime().wrap(function _callee46$(_context46) {
+        while (1) switch (_context46.prev = _context46.next) {
           case 0:
             if (client) {
-              _context44.next = 2;
+              _context46.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context44.next = 4;
+            _context46.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.loginWithOtp(params);
             }, callbacks, "Failed to login with OTP");
           case 4:
-            res = _context44.sent;
+            res = _context46.sent;
             if (!res) {
-              _context44.next = 10;
+              _context46.next = 10;
               break;
             }
-            _context44.next = 8;
+            _context46.next = 8;
             return handlePostAuth();
           case 8:
-            _context44.next = 10;
+            _context46.next = 10;
             break;
           case 10:
-            return _context44.abrupt("return", res);
+            return _context46.abrupt("return", res);
           case 11:
           case "end":
-            return _context44.stop();
+            return _context46.stop();
         }
-      }, _callee44);
+      }, _callee46);
     }));
     return _loginWithOtp.apply(this, arguments);
   }
@@ -1458,20 +1519,20 @@ var ClientProvider = function ClientProvider(_ref) {
     return _signUpWithOtp.apply(this, arguments);
   }
   function _signUpWithOtp() {
-    _signUpWithOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee45(params) {
+    _signUpWithOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee47(params) {
       var _masterConfig$auth13;
       var createSubOrgParams, res;
-      return _regeneratorRuntime().wrap(function _callee45$(_context45) {
-        while (1) switch (_context45.prev = _context45.next) {
+      return _regeneratorRuntime().wrap(function _callee47$(_context47) {
+        while (1) switch (_context47.prev = _context47.next) {
           case 0:
             if (client) {
-              _context45.next = 2;
+              _context47.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (masterConfig) {
-              _context45.next = 4;
+              _context47.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -1488,28 +1549,28 @@ var ClientProvider = function ClientProvider(_ref) {
             params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
-            _context45.next = 9;
+            _context47.next = 9;
             return withTurnkeyErrorHandling(function () {
               return client.signUpWithOtp(params);
             }, callbacks, "Failed to sign up with OTP");
           case 9:
-            res = _context45.sent;
+            res = _context47.sent;
             if (!res) {
-              _context45.next = 15;
+              _context47.next = 15;
               break;
             }
-            _context45.next = 13;
+            _context47.next = 13;
             return handlePostAuth();
           case 13:
-            _context45.next = 15;
+            _context47.next = 15;
             break;
           case 15:
-            return _context45.abrupt("return", res);
+            return _context47.abrupt("return", res);
           case 16:
           case "end":
-            return _context45.stop();
+            return _context47.stop();
         }
-      }, _callee45);
+      }, _callee47);
     }));
     return _signUpWithOtp.apply(this, arguments);
   }
@@ -1517,20 +1578,20 @@ var ClientProvider = function ClientProvider(_ref) {
     return _completeOtp.apply(this, arguments);
   }
   function _completeOtp() {
-    _completeOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee46(params) {
+    _completeOtp = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee48(params) {
       var _masterConfig$auth14;
       var createSubOrgParams, res;
-      return _regeneratorRuntime().wrap(function _callee46$(_context46) {
-        while (1) switch (_context46.prev = _context46.next) {
+      return _regeneratorRuntime().wrap(function _callee48$(_context48) {
+        while (1) switch (_context48.prev = _context48.next) {
           case 0:
             if (client) {
-              _context46.next = 2;
+              _context48.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (masterConfig) {
-              _context46.next = 4;
+              _context48.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -1547,28 +1608,28 @@ var ClientProvider = function ClientProvider(_ref) {
             params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
-            _context46.next = 9;
+            _context48.next = 9;
             return withTurnkeyErrorHandling(function () {
               return client.completeOtp(params);
             }, callbacks, "Failed to complete OTP");
           case 9:
-            res = _context46.sent;
+            res = _context48.sent;
             if (!res) {
-              _context46.next = 15;
+              _context48.next = 15;
               break;
             }
-            _context46.next = 13;
+            _context48.next = 13;
             return handlePostAuth();
           case 13:
-            _context46.next = 15;
+            _context48.next = 15;
             break;
           case 15:
-            return _context46.abrupt("return", res);
+            return _context48.abrupt("return", res);
           case 16:
           case "end":
-            return _context46.stop();
+            return _context48.stop();
         }
-      }, _callee46);
+      }, _callee48);
     }));
     return _completeOtp.apply(this, arguments);
   }
@@ -1576,20 +1637,20 @@ var ClientProvider = function ClientProvider(_ref) {
     return _completeOauth.apply(this, arguments);
   }
   function _completeOauth() {
-    _completeOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee47(params) {
+    _completeOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee49(params) {
       var _params$createSubOrgP4, _masterConfig$auth15, _masterConfig$auth15$;
       var createSubOrgParams, res;
-      return _regeneratorRuntime().wrap(function _callee47$(_context47) {
-        while (1) switch (_context47.prev = _context47.next) {
+      return _regeneratorRuntime().wrap(function _callee49$(_context49) {
+        while (1) switch (_context49.prev = _context49.next) {
           case 0:
             if (client) {
-              _context47.next = 2;
+              _context49.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (masterConfig) {
-              _context47.next = 4;
+              _context49.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -1599,28 +1660,28 @@ var ClientProvider = function ClientProvider(_ref) {
             params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
-            _context47.next = 8;
+            _context49.next = 8;
             return withTurnkeyErrorHandling(function () {
               return client.completeOauth(params);
             }, callbacks, "Failed to complete OAuth");
           case 8:
-            res = _context47.sent;
+            res = _context49.sent;
             if (!res) {
-              _context47.next = 14;
+              _context49.next = 14;
               break;
             }
-            _context47.next = 12;
+            _context49.next = 12;
             return handlePostAuth();
           case 12:
-            _context47.next = 14;
+            _context49.next = 14;
             break;
           case 14:
-            return _context47.abrupt("return", res);
+            return _context49.abrupt("return", res);
           case 15:
           case "end":
-            return _context47.stop();
+            return _context49.stop();
         }
-      }, _callee47);
+      }, _callee49);
     }));
     return _completeOauth.apply(this, arguments);
   }
@@ -1628,39 +1689,39 @@ var ClientProvider = function ClientProvider(_ref) {
     return _loginWithOauth.apply(this, arguments);
   }
   function _loginWithOauth() {
-    _loginWithOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee48(params) {
+    _loginWithOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee50(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee48$(_context48) {
-        while (1) switch (_context48.prev = _context48.next) {
+      return _regeneratorRuntime().wrap(function _callee50$(_context50) {
+        while (1) switch (_context50.prev = _context50.next) {
           case 0:
             if (client) {
-              _context48.next = 2;
+              _context50.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context48.next = 4;
+            _context50.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.loginWithOauth(params);
             }, callbacks, "Failed to login with OAuth");
           case 4:
-            res = _context48.sent;
+            res = _context50.sent;
             if (!res) {
-              _context48.next = 10;
+              _context50.next = 10;
               break;
             }
-            _context48.next = 8;
+            _context50.next = 8;
             return handlePostAuth();
           case 8:
-            _context48.next = 10;
+            _context50.next = 10;
             break;
           case 10:
-            return _context48.abrupt("return", res);
+            return _context50.abrupt("return", res);
           case 11:
           case "end":
-            return _context48.stop();
+            return _context50.stop();
         }
-      }, _callee48);
+      }, _callee50);
     }));
     return _loginWithOauth.apply(this, arguments);
   }
@@ -1668,20 +1729,20 @@ var ClientProvider = function ClientProvider(_ref) {
     return _signUpWithOauth.apply(this, arguments);
   }
   function _signUpWithOauth() {
-    _signUpWithOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee49(params) {
+    _signUpWithOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee51(params) {
       var _params$createSubOrgP5, _masterConfig$auth16, _masterConfig$auth16$;
       var createSubOrgParams, res;
-      return _regeneratorRuntime().wrap(function _callee49$(_context49) {
-        while (1) switch (_context49.prev = _context49.next) {
+      return _regeneratorRuntime().wrap(function _callee51$(_context51) {
+        while (1) switch (_context51.prev = _context51.next) {
           case 0:
             if (client) {
-              _context49.next = 2;
+              _context51.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (masterConfig) {
-              _context49.next = 4;
+              _context51.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -1691,25 +1752,25 @@ var ClientProvider = function ClientProvider(_ref) {
             params = createSubOrgParams !== undefined ? _objectSpread2(_objectSpread2({}, params), {}, {
               createSubOrgParams: createSubOrgParams
             }) : _objectSpread2({}, params);
-            _context49.next = 8;
+            _context51.next = 8;
             return withTurnkeyErrorHandling(function () {
               return client.signUpWithOauth(params);
             }, callbacks, "Failed to sign up with OAuth");
           case 8:
-            res = _context49.sent;
+            res = _context51.sent;
             if (!res) {
-              _context49.next = 12;
+              _context51.next = 12;
               break;
             }
-            _context49.next = 12;
+            _context51.next = 12;
             return handlePostAuth();
           case 12:
-            return _context49.abrupt("return", res);
+            return _context51.abrupt("return", res);
           case 13:
           case "end":
-            return _context49.stop();
+            return _context51.stop();
         }
-      }, _callee49);
+      }, _callee51);
     }));
     return _signUpWithOauth.apply(this, arguments);
   }
@@ -1717,24 +1778,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _fetchWallets.apply(this, arguments);
   }
   function _fetchWallets() {
-    _fetchWallets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee50(params) {
-      return _regeneratorRuntime().wrap(function _callee50$(_context50) {
-        while (1) switch (_context50.prev = _context50.next) {
+    _fetchWallets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee52(params) {
+      return _regeneratorRuntime().wrap(function _callee52$(_context52) {
+        while (1) switch (_context52.prev = _context52.next) {
           case 0:
             if (client) {
-              _context50.next = 2;
+              _context52.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context50.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context52.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.fetchWallets(params);
             }, callbacks, "Failed to fetch wallets"));
           case 3:
           case "end":
-            return _context50.stop();
+            return _context52.stop();
         }
-      }, _callee50);
+      }, _callee52);
     }));
     return _fetchWallets.apply(this, arguments);
   }
@@ -1742,24 +1803,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _fetchWalletAccounts.apply(this, arguments);
   }
   function _fetchWalletAccounts() {
-    _fetchWalletAccounts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee51(params) {
-      return _regeneratorRuntime().wrap(function _callee51$(_context51) {
-        while (1) switch (_context51.prev = _context51.next) {
+    _fetchWalletAccounts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee53(params) {
+      return _regeneratorRuntime().wrap(function _callee53$(_context53) {
+        while (1) switch (_context53.prev = _context53.next) {
           case 0:
             if (client) {
-              _context51.next = 2;
+              _context53.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context51.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context53.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.fetchWalletAccounts(params);
             }, callbacks, "Failed to fetch wallet accounts"));
           case 3:
           case "end":
-            return _context51.stop();
+            return _context53.stop();
         }
-      }, _callee51);
+      }, _callee53);
     }));
     return _fetchWalletAccounts.apply(this, arguments);
   }
@@ -1767,24 +1828,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _signMessage.apply(this, arguments);
   }
   function _signMessage() {
-    _signMessage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee52(params) {
-      return _regeneratorRuntime().wrap(function _callee52$(_context52) {
-        while (1) switch (_context52.prev = _context52.next) {
+    _signMessage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee54(params) {
+      return _regeneratorRuntime().wrap(function _callee54$(_context54) {
+        while (1) switch (_context54.prev = _context54.next) {
           case 0:
             if (client) {
-              _context52.next = 2;
+              _context54.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context52.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context54.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.signMessage(params);
             }, callbacks, "Failed to sign message"));
           case 3:
           case "end":
-            return _context52.stop();
+            return _context54.stop();
         }
-      }, _callee52);
+      }, _callee54);
     }));
     return _signMessage.apply(this, arguments);
   }
@@ -1792,19 +1853,19 @@ var ClientProvider = function ClientProvider(_ref) {
     return _handleSignMessage.apply(this, arguments);
   }
   function _handleSignMessage() {
-    _handleSignMessage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee53(params) {
+    _handleSignMessage = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee55(params) {
       var _params$successPageDu3, successPageDuration;
-      return _regeneratorRuntime().wrap(function _callee53$(_context53) {
-        while (1) switch (_context53.prev = _context53.next) {
+      return _regeneratorRuntime().wrap(function _callee55$(_context55) {
+        while (1) switch (_context55.prev = _context55.next) {
           case 0:
             _params$successPageDu3 = params.successPageDuration, successPageDuration = _params$successPageDu3 === void 0 ? 2000 : _params$successPageDu3;
             if (client) {
-              _context53.next = 3;
+              _context55.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
-            return _context53.abrupt("return", new Promise(function (resolve, reject) {
+            return _context55.abrupt("return", new Promise(function (resolve, reject) {
               pushPage({
                 key: "Sign Message",
                 content: jsx(SignMessageModal, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -1830,9 +1891,9 @@ var ClientProvider = function ClientProvider(_ref) {
             }));
           case 4:
           case "end":
-            return _context53.stop();
+            return _context55.stop();
         }
-      }, _callee53);
+      }, _callee55);
     }));
     return _handleSignMessage.apply(this, arguments);
   }
@@ -1840,24 +1901,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _signTransaction.apply(this, arguments);
   }
   function _signTransaction() {
-    _signTransaction = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee54(params) {
-      return _regeneratorRuntime().wrap(function _callee54$(_context54) {
-        while (1) switch (_context54.prev = _context54.next) {
+    _signTransaction = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee56(params) {
+      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:
-            return _context54.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context56.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.signTransaction(params);
             }, callbacks, "Failed to sign transaction"));
           case 3:
           case "end":
-            return _context54.stop();
+            return _context56.stop();
         }
-      }, _callee54);
+      }, _callee56);
     }));
     return _signTransaction.apply(this, arguments);
   }
@@ -1865,24 +1926,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _signAndSendTransaction.apply(this, arguments);
   }
   function _signAndSendTransaction() {
-    _signAndSendTransaction = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee55(params) {
-      return _regeneratorRuntime().wrap(function _callee55$(_context55) {
-        while (1) switch (_context55.prev = _context55.next) {
+    _signAndSendTransaction = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee57(params) {
+      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:
-            return _context55.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context57.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.signAndSendTransaction(params);
             }, callbacks, "Failed to sign transaction"));
           case 3:
           case "end":
-            return _context55.stop();
+            return _context57.stop();
         }
-      }, _callee55);
+      }, _callee57);
     }));
     return _signAndSendTransaction.apply(this, arguments);
   }
@@ -1890,24 +1951,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _fetchUser.apply(this, arguments);
   }
   function _fetchUser() {
-    _fetchUser = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee56(params) {
-      return _regeneratorRuntime().wrap(function _callee56$(_context56) {
-        while (1) switch (_context56.prev = _context56.next) {
+    _fetchUser = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee58(params) {
+      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:
-            return _context56.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context58.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.fetchUser(params);
             }, callbacks, "Failed to fetch user"));
           case 3:
           case "end":
-            return _context56.stop();
+            return _context58.stop();
         }
-      }, _callee56);
+      }, _callee58);
     }));
     return _fetchUser.apply(this, arguments);
   }
@@ -1915,38 +1976,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _updateUserEmail.apply(this, arguments);
   }
   function _updateUserEmail() {
-    _updateUserEmail = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee57(params) {
+    _updateUserEmail = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee59(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee57$(_context57) {
-        while (1) switch (_context57.prev = _context57.next) {
+      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:
-            _context57.next = 4;
+            _context59.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.updateUserEmail(params);
             }, callbacks, "Failed to update user email");
           case 4:
-            res = _context57.sent;
+            res = _context59.sent;
             if (!res) {
-              _context57.next = 8;
+              _context59.next = 8;
               break;
             }
-            _context57.next = 8;
+            _context59.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context57.abrupt("return", res);
+            return _context59.abrupt("return", res);
           case 9:
           case "end":
-            return _context57.stop();
+            return _context59.stop();
         }
-      }, _callee57);
+      }, _callee59);
     }));
     return _updateUserEmail.apply(this, arguments);
   }
@@ -1954,38 +2015,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _removeUserEmail.apply(this, arguments);
   }
   function _removeUserEmail() {
-    _removeUserEmail = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee58(params) {
+    _removeUserEmail = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee60(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee58$(_context58) {
-        while (1) switch (_context58.prev = _context58.next) {
+      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:
-            _context58.next = 4;
+            _context60.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.removeUserEmail(params);
             }, callbacks, "Failed to remove user email");
           case 4:
-            res = _context58.sent;
+            res = _context60.sent;
             if (!res) {
-              _context58.next = 8;
+              _context60.next = 8;
               break;
             }
-            _context58.next = 8;
+            _context60.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context58.abrupt("return", res);
+            return _context60.abrupt("return", res);
           case 9:
           case "end":
-            return _context58.stop();
+            return _context60.stop();
         }
-      }, _callee58);
+      }, _callee60);
     }));
     return _removeUserEmail.apply(this, arguments);
   }
@@ -1993,38 +2054,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _updateUserPhoneNumber.apply(this, arguments);
   }
   function _updateUserPhoneNumber() {
-    _updateUserPhoneNumber = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee59(params) {
+    _updateUserPhoneNumber = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee61(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee59$(_context59) {
-        while (1) switch (_context59.prev = _context59.next) {
+      return _regeneratorRuntime().wrap(function _callee61$(_context61) {
+        while (1) switch (_context61.prev = _context61.next) {
           case 0:
             if (client) {
-              _context59.next = 2;
+              _context61.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context59.next = 4;
+            _context61.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.updateUserPhoneNumber(params);
             }, callbacks, "Failed to update user phone number");
           case 4:
-            res = _context59.sent;
+            res = _context61.sent;
             if (!res) {
-              _context59.next = 8;
+              _context61.next = 8;
               break;
             }
-            _context59.next = 8;
+            _context61.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context59.abrupt("return", res);
+            return _context61.abrupt("return", res);
           case 9:
           case "end":
-            return _context59.stop();
+            return _context61.stop();
         }
-      }, _callee59);
+      }, _callee61);
     }));
     return _updateUserPhoneNumber.apply(this, arguments);
   }
@@ -2032,38 +2093,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _removeUserPhoneNumber.apply(this, arguments);
   }
   function _removeUserPhoneNumber() {
-    _removeUserPhoneNumber = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee60(params) {
+    _removeUserPhoneNumber = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee62(params) {
       var res;
-      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.removeUserPhoneNumber(params);
             }, callbacks, "Failed to remove user phone number");
           case 4:
-            res = _context60.sent;
+            res = _context62.sent;
             if (!res) {
-              _context60.next = 8;
+              _context62.next = 8;
               break;
             }
-            _context60.next = 8;
+            _context62.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context60.abrupt("return", res);
+            return _context62.abrupt("return", res);
           case 9:
           case "end":
-            return _context60.stop();
+            return _context62.stop();
         }
-      }, _callee60);
+      }, _callee62);
     }));
     return _removeUserPhoneNumber.apply(this, arguments);
   }
@@ -2071,38 +2132,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _updateUserName.apply(this, arguments);
   }
   function _updateUserName() {
-    _updateUserName = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee61(params) {
+    _updateUserName = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee63(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee61$(_context61) {
-        while (1) switch (_context61.prev = _context61.next) {
+      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:
-            _context61.next = 4;
+            _context63.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.updateUserName(params);
             }, callbacks, "Failed to update user name");
           case 4:
-            res = _context61.sent;
+            res = _context63.sent;
             if (!res) {
-              _context61.next = 8;
+              _context63.next = 8;
               break;
             }
-            _context61.next = 8;
+            _context63.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context61.abrupt("return", res);
+            return _context63.abrupt("return", res);
           case 9:
           case "end":
-            return _context61.stop();
+            return _context63.stop();
         }
-      }, _callee61);
+      }, _callee63);
     }));
     return _updateUserName.apply(this, arguments);
   }
@@ -2110,38 +2171,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _addOauthProvider.apply(this, arguments);
   }
   function _addOauthProvider() {
-    _addOauthProvider = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee62(params) {
+    _addOauthProvider = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee64(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee62$(_context62) {
-        while (1) switch (_context62.prev = _context62.next) {
+      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:
-            _context62.next = 4;
+            _context64.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.addOauthProvider(params);
             }, callbacks, "Failed to add OAuth provider");
           case 4:
-            res = _context62.sent;
+            res = _context64.sent;
             if (!res) {
-              _context62.next = 8;
+              _context64.next = 8;
               break;
             }
-            _context62.next = 8;
+            _context64.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context62.abrupt("return", res);
+            return _context64.abrupt("return", res);
           case 9:
           case "end":
-            return _context62.stop();
+            return _context64.stop();
         }
-      }, _callee62);
+      }, _callee64);
     }));
     return _addOauthProvider.apply(this, arguments);
   }
@@ -2149,38 +2210,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _removeOauthProviders.apply(this, arguments);
   }
   function _removeOauthProviders() {
-    _removeOauthProviders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee63(params) {
+    _removeOauthProviders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee65(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee63$(_context63) {
-        while (1) switch (_context63.prev = _context63.next) {
+      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:
-            _context63.next = 4;
+            _context65.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.removeOauthProviders(params);
             }, callbacks, "Failed to remove OAuth providers");
           case 4:
-            res = _context63.sent;
+            res = _context65.sent;
             if (!res) {
-              _context63.next = 8;
+              _context65.next = 8;
               break;
             }
-            _context63.next = 8;
+            _context65.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context63.abrupt("return", res);
+            return _context65.abrupt("return", res);
           case 9:
           case "end":
-            return _context63.stop();
+            return _context65.stop();
         }
-      }, _callee63);
+      }, _callee65);
     }));
     return _removeOauthProviders.apply(this, arguments);
   }
@@ -2188,38 +2249,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _addPasskey.apply(this, arguments);
   }
   function _addPasskey() {
-    _addPasskey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee64(params) {
+    _addPasskey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee66(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee64$(_context64) {
-        while (1) switch (_context64.prev = _context64.next) {
+      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:
-            _context64.next = 4;
+            _context66.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.addPasskey(params);
             }, callbacks, "Failed to add passkey");
           case 4:
-            res = _context64.sent;
+            res = _context66.sent;
             if (!res) {
-              _context64.next = 8;
+              _context66.next = 8;
               break;
             }
-            _context64.next = 8;
+            _context66.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context64.abrupt("return", res);
+            return _context66.abrupt("return", res);
           case 9:
           case "end":
-            return _context64.stop();
+            return _context66.stop();
         }
-      }, _callee64);
+      }, _callee66);
     }));
     return _addPasskey.apply(this, arguments);
   }
@@ -2227,38 +2288,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _removePasskeys.apply(this, arguments);
   }
   function _removePasskeys() {
-    _removePasskeys = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee65(params) {
+    _removePasskeys = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee67(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee65$(_context65) {
-        while (1) switch (_context65.prev = _context65.next) {
+      return _regeneratorRuntime().wrap(function _callee67$(_context67) {
+        while (1) switch (_context67.prev = _context67.next) {
           case 0:
             if (client) {
-              _context65.next = 2;
+              _context67.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context65.next = 4;
+            _context67.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.removePasskeys(params);
             }, callbacks, "Failed to remove passkeys");
           case 4:
-            res = _context65.sent;
+            res = _context67.sent;
             if (!res) {
-              _context65.next = 8;
+              _context67.next = 8;
               break;
             }
-            _context65.next = 8;
+            _context67.next = 8;
             return refreshUser({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context65.abrupt("return", res);
+            return _context67.abrupt("return", res);
           case 9:
           case "end":
-            return _context65.stop();
+            return _context67.stop();
         }
-      }, _callee65);
+      }, _callee67);
     }));
     return _removePasskeys.apply(this, arguments);
   }
@@ -2266,38 +2327,38 @@ var ClientProvider = function ClientProvider(_ref) {
     return _createWallet.apply(this, arguments);
   }
   function _createWallet() {
-    _createWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee66(params) {
+    _createWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee68(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee66$(_context66) {
-        while (1) switch (_context66.prev = _context66.next) {
+      return _regeneratorRuntime().wrap(function _callee68$(_context68) {
+        while (1) switch (_context68.prev = _context68.next) {
           case 0:
             if (client) {
-              _context66.next = 2;
+              _context68.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context66.next = 4;
+            _context68.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.createWallet(params);
             }, callbacks, "Failed to create wallet");
           case 4:
-            res = _context66.sent;
+            res = _context68.sent;
             if (!res) {
-              _context66.next = 8;
+              _context68.next = 8;
               break;
             }
-            _context66.next = 8;
+            _context68.next = 8;
             return refreshWallets({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context66.abrupt("return", res);
+            return _context68.abrupt("return", res);
           case 9:
           case "end":
-            return _context66.stop();
+            return _context68.stop();
         }
-      }, _callee66);
+      }, _callee68);
     }));
     return _createWallet.apply(this, arguments);
   }
@@ -2305,235 +2366,334 @@ var ClientProvider = function ClientProvider(_ref) {
     return _createWalletAccounts.apply(this, arguments);
   }
   function _createWalletAccounts() {
-    _createWalletAccounts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee67(params) {
+    _createWalletAccounts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee69(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee67$(_context67) {
-        while (1) switch (_context67.prev = _context67.next) {
+      return _regeneratorRuntime().wrap(function _callee69$(_context69) {
+        while (1) switch (_context69.prev = _context69.next) {
           case 0:
             if (client) {
-              _context67.next = 2;
+              _context69.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context67.next = 4;
+            _context69.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.createWalletAccounts(params);
             }, callbacks, "Failed to create wallet accounts");
           case 4:
-            res = _context67.sent;
+            res = _context69.sent;
             if (!res) {
-              _context67.next = 8;
+              _context69.next = 8;
               break;
             }
-            _context67.next = 8;
+            _context69.next = 8;
             return refreshWallets({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context67.abrupt("return", res);
+            return _context69.abrupt("return", res);
           case 9:
           case "end":
-            return _context67.stop();
+            return _context69.stop();
+        }
+      }, _callee69);
+    }));
+    return _createWalletAccounts.apply(this, arguments);
+  }
+  function exportWallet(_x41) {
+    return _exportWallet.apply(this, arguments);
+  }
+  function _exportWallet() {
+    _exportWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee70(params) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee70$(_context70) {
+        while (1) switch (_context70.prev = _context70.next) {
+          case 0:
+            if (client) {
+              _context70.next = 2;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 2:
+            _context70.next = 4;
+            return withTurnkeyErrorHandling(function () {
+              return client.exportWallet(params);
+            }, callbacks, "Failed to export wallet");
+          case 4:
+            res = _context70.sent;
+            if (!res) {
+              _context70.next = 8;
+              break;
+            }
+            _context70.next = 8;
+            return refreshWallets({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            });
+          case 8:
+            return _context70.abrupt("return", res);
+          case 9:
+          case "end":
+            return _context70.stop();
+        }
+      }, _callee70);
+    }));
+    return _exportWallet.apply(this, arguments);
+  }
+  function exportPrivateKey(_x42) {
+    return _exportPrivateKey.apply(this, arguments);
+  }
+  function _exportPrivateKey() {
+    _exportPrivateKey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee71(params) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee71$(_context71) {
+        while (1) switch (_context71.prev = _context71.next) {
+          case 0:
+            if (client) {
+              _context71.next = 2;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 2:
+            _context71.next = 4;
+            return withTurnkeyErrorHandling(function () {
+              return client.exportPrivateKey(params);
+            }, callbacks, "Failed to export private key");
+          case 4:
+            res = _context71.sent;
+            return _context71.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context71.stop();
         }
-      }, _callee67);
+      }, _callee71);
     }));
-    return _createWalletAccounts.apply(this, arguments);
+    return _exportPrivateKey.apply(this, arguments);
   }
-  function exportWallet(_x41) {
-    return _exportWallet.apply(this, arguments);
+  function exportWalletAccount(_x43) {
+    return _exportWalletAccount.apply(this, arguments);
   }
-  function _exportWallet() {
-    _exportWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee68(params) {
+  function _exportWalletAccount() {
+    _exportWalletAccount = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee72(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee68$(_context68) {
-        while (1) switch (_context68.prev = _context68.next) {
+      return _regeneratorRuntime().wrap(function _callee72$(_context72) {
+        while (1) switch (_context72.prev = _context72.next) {
           case 0:
             if (client) {
-              _context68.next = 2;
+              _context72.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context68.next = 4;
+            _context72.next = 4;
             return withTurnkeyErrorHandling(function () {
-              return client.exportWallet(params);
-            }, callbacks, "Failed to export wallet");
+              return client.exportWalletAccount(params);
+            }, callbacks, "Failed to export wallet accounts");
           case 4:
-            res = _context68.sent;
+            res = _context72.sent;
             if (!res) {
-              _context68.next = 8;
+              _context72.next = 8;
               break;
             }
-            _context68.next = 8;
+            _context72.next = 8;
             return refreshWallets({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context68.abrupt("return", res);
+            return _context72.abrupt("return", res);
           case 9:
           case "end":
-            return _context68.stop();
+            return _context72.stop();
         }
-      }, _callee68);
+      }, _callee72);
     }));
-    return _exportWallet.apply(this, arguments);
+    return _exportWalletAccount.apply(this, arguments);
   }
-  function importWallet(_x42) {
+  function importWallet(_x44) {
     return _importWallet.apply(this, arguments);
   }
   function _importWallet() {
-    _importWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee69(params) {
+    _importWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee73(params) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee69$(_context69) {
-        while (1) switch (_context69.prev = _context69.next) {
+      return _regeneratorRuntime().wrap(function _callee73$(_context73) {
+        while (1) switch (_context73.prev = _context73.next) {
           case 0:
             if (client) {
-              _context69.next = 2;
+              _context73.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context69.next = 4;
+            _context73.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.importWallet(params);
             }, callbacks, "Failed to import wallet");
           case 4:
-            res = _context69.sent;
+            res = _context73.sent;
             if (!res) {
-              _context69.next = 8;
+              _context73.next = 8;
               break;
             }
-            _context69.next = 8;
+            _context73.next = 8;
             return refreshWallets({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             });
           case 8:
-            return _context69.abrupt("return", res);
+            return _context73.abrupt("return", res);
           case 9:
           case "end":
-            return _context69.stop();
+            return _context73.stop();
         }
-      }, _callee69);
+      }, _callee73);
     }));
     return _importWallet.apply(this, arguments);
   }
-  function deleteSubOrganization(_x43) {
+  function importPrivateKey(_x45) {
+    return _importPrivateKey.apply(this, arguments);
+  }
+  function _importPrivateKey() {
+    _importPrivateKey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee74(params) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee74$(_context74) {
+        while (1) switch (_context74.prev = _context74.next) {
+          case 0:
+            if (client) {
+              _context74.next = 2;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 2:
+            _context74.next = 4;
+            return withTurnkeyErrorHandling(function () {
+              return client.importPrivateKey(params);
+            }, callbacks, "Failed to import private key");
+          case 4:
+            res = _context74.sent;
+            return _context74.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context74.stop();
+        }
+      }, _callee74);
+    }));
+    return _importPrivateKey.apply(this, arguments);
+  }
+  function deleteSubOrganization(_x46) {
     return _deleteSubOrganization.apply(this, arguments);
   }
   function _deleteSubOrganization() {
-    _deleteSubOrganization = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee70(params) {
-      return _regeneratorRuntime().wrap(function _callee70$(_context70) {
-        while (1) switch (_context70.prev = _context70.next) {
+    _deleteSubOrganization = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee75(params) {
+      return _regeneratorRuntime().wrap(function _callee75$(_context75) {
+        while (1) switch (_context75.prev = _context75.next) {
           case 0:
             if (client) {
-              _context70.next = 2;
+              _context75.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context70.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context75.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.deleteSubOrganization(params);
             }, callbacks, "Failed to delete sub-organization"));
           case 3:
           case "end":
-            return _context70.stop();
+            return _context75.stop();
         }
-      }, _callee70);
+      }, _callee75);
     }));
     return _deleteSubOrganization.apply(this, arguments);
   }
-  function storeSession(_x44) {
+  function storeSession(_x47) {
     return _storeSession.apply(this, arguments);
   }
   function _storeSession() {
-    _storeSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee71(params) {
+    _storeSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee76(params) {
       var sessionKey, session, allSessions;
-      return _regeneratorRuntime().wrap(function _callee71$(_context71) {
-        while (1) switch (_context71.prev = _context71.next) {
+      return _regeneratorRuntime().wrap(function _callee76$(_context76) {
+        while (1) switch (_context76.prev = _context76.next) {
           case 0:
             if (client) {
-              _context71.next = 2;
+              _context76.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context71.next = 4;
+            _context76.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.storeSession(params);
             }, callbacks, "Failed to store session");
           case 4:
-            _context71.next = 6;
+            _context76.next = 6;
             return getActiveSessionKey();
           case 6:
-            sessionKey = _context71.sent;
-            _context71.next = 9;
+            sessionKey = _context76.sent;
+            _context76.next = 9;
             return getSession(_objectSpread2({}, sessionKey && {
               sessionKey: sessionKey
             }));
           case 9:
-            session = _context71.sent;
+            session = _context76.sent;
             if (!(session && sessionKey)) {
-              _context71.next = 13;
+              _context76.next = 13;
               break;
             }
-            _context71.next = 13;
+            _context76.next = 13;
             return scheduleSessionExpiration({
               sessionKey: sessionKey,
               expiry: session.expiry
             });
           case 13:
-            _context71.next = 15;
+            _context76.next = 15;
             return getAllSessions();
           case 15:
-            allSessions = _context71.sent;
+            allSessions = _context76.sent;
             setSession(session);
             setAllSessions(allSessions);
-            return _context71.abrupt("return");
+            return _context76.abrupt("return");
           case 19:
           case "end":
-            return _context71.stop();
+            return _context76.stop();
         }
-      }, _callee71);
+      }, _callee76);
     }));
     return _storeSession.apply(this, arguments);
   }
-  function clearSession(_x45) {
+  function clearSession(_x48) {
     return _clearSession.apply(this, arguments);
   }
   function _clearSession() {
-    _clearSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee72(params) {
+    _clearSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee77(params) {
       var session, allSessions;
-      return _regeneratorRuntime().wrap(function _callee72$(_context72) {
-        while (1) switch (_context72.prev = _context72.next) {
+      return _regeneratorRuntime().wrap(function _callee77$(_context77) {
+        while (1) switch (_context77.prev = _context77.next) {
           case 0:
             if (client) {
-              _context72.next = 2;
+              _context77.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context72.next = 4;
+            _context77.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.clearSession(params);
             }, callbacks, "Failed to clear session");
           case 4:
-            _context72.next = 6;
+            _context77.next = 6;
             return getSession();
           case 6:
-            session = _context72.sent;
-            _context72.next = 9;
+            session = _context77.sent;
+            _context77.next = 9;
             return getAllSessions();
           case 9:
-            allSessions = _context72.sent;
+            allSessions = _context77.sent;
             setSession(session);
             setAllSessions(allSessions);
-            return _context72.abrupt("return");
+            return _context77.abrupt("return");
           case 13:
           case "end":
-            return _context72.stop();
+            return _context77.stop();
         }
-      }, _callee72);
+      }, _callee77);
     }));
     return _clearSession.apply(this, arguments);
   }
@@ -2541,76 +2701,76 @@ var ClientProvider = function ClientProvider(_ref) {
     return _clearAllSessions.apply(this, arguments);
   }
   function _clearAllSessions() {
-    _clearAllSessions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee73() {
-      return _regeneratorRuntime().wrap(function _callee73$(_context73) {
-        while (1) switch (_context73.prev = _context73.next) {
+    _clearAllSessions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee78() {
+      return _regeneratorRuntime().wrap(function _callee78$(_context78) {
+        while (1) switch (_context78.prev = _context78.next) {
           case 0:
             if (client) {
-              _context73.next = 2;
+              _context78.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             setSession(undefined);
             setAllSessions(undefined);
-            _context73.next = 6;
+            _context78.next = 6;
             return withTurnkeyErrorHandling(function () {
               return client.clearAllSessions();
             }, callbacks, "Failed to clear all sessions");
           case 6:
-            return _context73.abrupt("return", _context73.sent);
+            return _context78.abrupt("return", _context78.sent);
           case 7:
           case "end":
-            return _context73.stop();
+            return _context78.stop();
         }
-      }, _callee73);
+      }, _callee78);
     }));
     return _clearAllSessions.apply(this, arguments);
   }
-  function refreshSession(_x46) {
+  function refreshSession(_x49) {
     return _refreshSession.apply(this, arguments);
   }
   function _refreshSession() {
-    _refreshSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee74(params) {
+    _refreshSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee79(params) {
       var _params$sessionKey;
       var activeSessionKey, sessionKey, res, session, allSessions;
-      return _regeneratorRuntime().wrap(function _callee74$(_context74) {
-        while (1) switch (_context74.prev = _context74.next) {
+      return _regeneratorRuntime().wrap(function _callee79$(_context79) {
+        while (1) switch (_context79.prev = _context79.next) {
           case 0:
             if (client) {
-              _context74.next = 2;
+              _context79.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context74.next = 4;
+            _context79.next = 4;
             return client.getActiveSessionKey();
           case 4:
-            activeSessionKey = _context74.sent;
+            activeSessionKey = _context79.sent;
             if (activeSessionKey) {
-              _context74.next = 7;
+              _context79.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;
-            _context74.next = 10;
+            _context79.next = 10;
             return withTurnkeyErrorHandling(function () {
               return client.refreshSession(_objectSpread2({}, params));
             }, callbacks, "Failed to refresh session");
           case 10:
-            res = _context74.sent;
-            _context74.next = 13;
+            res = _context79.sent;
+            _context79.next = 13;
             return getSession({
               sessionKey: sessionKey
             });
           case 13:
-            session = _context74.sent;
+            session = _context79.sent;
             if (!(session && sessionKey)) {
-              _context74.next = 17;
+              _context79.next = 17;
               break;
             }
-            _context74.next = 17;
+            _context79.next = 17;
             return scheduleSessionExpiration(_objectSpread2({
               sessionKey: sessionKey,
               expiry: session.expiry
@@ -2618,43 +2778,43 @@ var ClientProvider = function ClientProvider(_ref) {
               expirationSeconds: params === null || params === void 0 ? void 0 : params.expirationSeconds
             }));
           case 17:
-            _context74.next = 19;
+            _context79.next = 19;
             return getAllSessions();
           case 19:
-            allSessions = _context74.sent;
+            allSessions = _context79.sent;
             setSession(session);
             setAllSessions(allSessions);
-            return _context74.abrupt("return", res);
+            return _context79.abrupt("return", res);
           case 23:
           case "end":
-            return _context74.stop();
+            return _context79.stop();
         }
-      }, _callee74);
+      }, _callee79);
     }));
     return _refreshSession.apply(this, arguments);
   }
-  function getSession(_x47) {
+  function getSession(_x50) {
     return _getSession.apply(this, arguments);
   }
   function _getSession() {
-    _getSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee75(params) {
-      return _regeneratorRuntime().wrap(function _callee75$(_context75) {
-        while (1) switch (_context75.prev = _context75.next) {
+    _getSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee80(params) {
+      return _regeneratorRuntime().wrap(function _callee80$(_context80) {
+        while (1) switch (_context80.prev = _context80.next) {
           case 0:
             if (client) {
-              _context75.next = 2;
+              _context80.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context75.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context80.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.getSession(params);
             }, callbacks, "Failed to get session"));
           case 3:
           case "end":
-            return _context75.stop();
+            return _context80.stop();
         }
-      }, _callee75);
+      }, _callee80);
     }));
     return _getSession.apply(this, arguments);
   }
@@ -2662,68 +2822,68 @@ var ClientProvider = function ClientProvider(_ref) {
     return _getAllSessions.apply(this, arguments);
   }
   function _getAllSessions() {
-    _getAllSessions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee76() {
-      return _regeneratorRuntime().wrap(function _callee76$(_context76) {
-        while (1) switch (_context76.prev = _context76.next) {
+    _getAllSessions = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee81() {
+      return _regeneratorRuntime().wrap(function _callee81$(_context81) {
+        while (1) switch (_context81.prev = _context81.next) {
           case 0:
             if (client) {
-              _context76.next = 2;
+              _context81.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context76.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context81.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.getAllSessions();
             }, callbacks, "Failed to get all sessions"));
           case 3:
           case "end":
-            return _context76.stop();
+            return _context81.stop();
         }
-      }, _callee76);
+      }, _callee81);
     }));
     return _getAllSessions.apply(this, arguments);
   }
-  function setActiveSession(_x48) {
+  function setActiveSession(_x51) {
     return _setActiveSession.apply(this, arguments);
   }
   function _setActiveSession() {
-    _setActiveSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee77(params) {
+    _setActiveSession = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee82(params) {
       var session;
-      return _regeneratorRuntime().wrap(function _callee77$(_context77) {
-        while (1) switch (_context77.prev = _context77.next) {
+      return _regeneratorRuntime().wrap(function _callee82$(_context82) {
+        while (1) switch (_context82.prev = _context82.next) {
           case 0:
             if (client) {
-              _context77.next = 2;
+              _context82.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            _context77.next = 4;
+            _context82.next = 4;
             return withTurnkeyErrorHandling(function () {
               return client.getSession({
                 sessionKey: params.sessionKey
               });
             }, callbacks, "Failed to get session");
           case 4:
-            session = _context77.sent;
+            session = _context82.sent;
             if (session) {
-              _context77.next = 7;
+              _context82.next = 7;
               break;
             }
             throw new TurnkeyError("Session not found.", TurnkeyErrorCodes.NOT_FOUND);
           case 7:
-            _context77.next = 9;
+            _context82.next = 9;
             return withTurnkeyErrorHandling(function () {
               return client.setActiveSession(params);
             }, callbacks, "Failed to set active session");
           case 9:
             setSession(session);
-            return _context77.abrupt("return");
+            return _context82.abrupt("return");
           case 11:
           case "end":
-            return _context77.stop();
+            return _context82.stop();
         }
-      }, _callee77);
+      }, _callee82);
     }));
     return _setActiveSession.apply(this, arguments);
   }
@@ -2731,24 +2891,24 @@ var ClientProvider = function ClientProvider(_ref) {
     return _getActiveSessionKey.apply(this, arguments);
   }
   function _getActiveSessionKey() {
-    _getActiveSessionKey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee78() {
-      return _regeneratorRuntime().wrap(function _callee78$(_context78) {
-        while (1) switch (_context78.prev = _context78.next) {
+    _getActiveSessionKey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee83() {
+      return _regeneratorRuntime().wrap(function _callee83$(_context83) {
+        while (1) switch (_context83.prev = _context83.next) {
           case 0:
             if (client) {
-              _context78.next = 2;
+              _context83.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context78.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context83.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.getActiveSessionKey();
             }, callbacks, "Failed to get active session key"));
           case 3:
           case "end":
-            return _context78.stop();
+            return _context83.stop();
         }
-      }, _callee78);
+      }, _callee83);
     }));
     return _getActiveSessionKey.apply(this, arguments);
   }
@@ -2756,49 +2916,49 @@ var ClientProvider = function ClientProvider(_ref) {
     return _clearUnusedKeyPairs.apply(this, arguments);
   }
   function _clearUnusedKeyPairs() {
-    _clearUnusedKeyPairs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee79() {
-      return _regeneratorRuntime().wrap(function _callee79$(_context79) {
-        while (1) switch (_context79.prev = _context79.next) {
+    _clearUnusedKeyPairs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee84() {
+      return _regeneratorRuntime().wrap(function _callee84$(_context84) {
+        while (1) switch (_context84.prev = _context84.next) {
           case 0:
             if (client) {
-              _context79.next = 2;
+              _context84.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context79.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context84.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.clearUnusedKeyPairs();
             }, callbacks, "Failed to clear unused key pairs"));
           case 3:
           case "end":
-            return _context79.stop();
+            return _context84.stop();
         }
-      }, _callee79);
+      }, _callee84);
     }));
     return _clearUnusedKeyPairs.apply(this, arguments);
   }
-  function createApiKeyPair(_x49) {
+  function createApiKeyPair(_x52) {
     return _createApiKeyPair.apply(this, arguments);
   }
   function _createApiKeyPair() {
-    _createApiKeyPair = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee80(params) {
-      return _regeneratorRuntime().wrap(function _callee80$(_context80) {
-        while (1) switch (_context80.prev = _context80.next) {
+    _createApiKeyPair = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee85(params) {
+      return _regeneratorRuntime().wrap(function _callee85$(_context85) {
+        while (1) switch (_context85.prev = _context85.next) {
           case 0:
             if (client) {
-              _context80.next = 2;
+              _context85.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context80.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context85.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.createApiKeyPair(params);
             }, callbacks, "Failed to create API key pair"));
           case 3:
           case "end":
-            return _context80.stop();
+            return _context85.stop();
         }
-      }, _callee80);
+      }, _callee85);
     }));
     return _createApiKeyPair.apply(this, arguments);
   }
@@ -2806,135 +2966,135 @@ var ClientProvider = function ClientProvider(_ref) {
     return _getProxyAuthConfig.apply(this, arguments);
   }
   function _getProxyAuthConfig() {
-    _getProxyAuthConfig = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee81() {
-      return _regeneratorRuntime().wrap(function _callee81$(_context81) {
-        while (1) switch (_context81.prev = _context81.next) {
+    _getProxyAuthConfig = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee86() {
+      return _regeneratorRuntime().wrap(function _callee86$(_context86) {
+        while (1) switch (_context86.prev = _context86.next) {
           case 0:
             if (client) {
-              _context81.next = 2;
+              _context86.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
-            return _context81.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context86.abrupt("return", withTurnkeyErrorHandling(function () {
               return client.getProxyAuthConfig();
             }, callbacks, "Failed to get proxy auth config"));
           case 3:
           case "end":
-            return _context81.stop();
+            return _context86.stop();
         }
-      }, _callee81);
+      }, _callee86);
     }));
     return _getProxyAuthConfig.apply(this, arguments);
   }
-  function refreshUser(_x50) {
+  function refreshUser(_x53) {
     return _refreshUser.apply(this, arguments);
   }
   function _refreshUser() {
-    _refreshUser = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee82(params) {
-      var _ref36, stampWith, user;
-      return _regeneratorRuntime().wrap(function _callee82$(_context82) {
-        while (1) switch (_context82.prev = _context82.next) {
+    _refreshUser = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee87(params) {
+      var _ref38, stampWith, user;
+      return _regeneratorRuntime().wrap(function _callee87$(_context87) {
+        while (1) switch (_context87.prev = _context87.next) {
           case 0:
-            _ref36 = params || {}, stampWith = _ref36.stampWith;
+            _ref38 = params || {}, stampWith = _ref38.stampWith;
             if (client) {
-              _context82.next = 3;
+              _context87.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
-            _context82.next = 5;
+            _context87.next = 5;
             return withTurnkeyErrorHandling(function () {
               return fetchUser({
                 stampWith: stampWith
               });
             }, callbacks, "Failed to refresh user");
           case 5:
-            user = _context82.sent;
+            user = _context87.sent;
             if (user) {
               setUser(user);
             }
           case 7:
           case "end":
-            return _context82.stop();
+            return _context87.stop();
         }
-      }, _callee82);
+      }, _callee87);
     }));
     return _refreshUser.apply(this, arguments);
   }
-  function refreshWallets(_x51) {
+  function refreshWallets(_x54) {
     return _refreshWallets.apply(this, arguments);
   }
   function _refreshWallets() {
-    _refreshWallets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee83(params) {
-      var _ref37, stampWith, wallets;
-      return _regeneratorRuntime().wrap(function _callee83$(_context83) {
-        while (1) switch (_context83.prev = _context83.next) {
+    _refreshWallets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee88(params) {
+      var _ref39, stampWith, wallets;
+      return _regeneratorRuntime().wrap(function _callee88$(_context88) {
+        while (1) switch (_context88.prev = _context88.next) {
           case 0:
-            _ref37 = params || {}, stampWith = _ref37.stampWith;
+            _ref39 = params || {}, stampWith = _ref39.stampWith;
             if (client) {
-              _context83.next = 3;
+              _context88.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
-            _context83.next = 5;
+            _context88.next = 5;
             return withTurnkeyErrorHandling(function () {
               return fetchWallets({
                 stampWith: stampWith
               });
             }, callbacks, "Failed to refresh wallets");
           case 5:
-            wallets = _context83.sent;
+            wallets = _context88.sent;
             if (wallets) {
               setWallets(wallets);
             }
           case 7:
           case "end":
-            return _context83.stop();
+            return _context88.stop();
         }
-      }, _callee83);
+      }, _callee88);
     }));
     return _refreshWallets.apply(this, arguments);
   }
-  function handleGoogleOauth(_x52) {
+  function handleGoogleOauth(_x55) {
     return _handleGoogleOauth.apply(this, arguments);
   }
   function _handleGoogleOauth() {
-    _handleGoogleOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee84(params) {
+    _handleGoogleOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee89(params) {
       var _masterConfig$auth17, _masterConfig$auth17$, _masterConfig$auth$oa2, _masterConfig$auth18, _masterConfig$auth18$;
-      var _ref38, _ref38$clientId, clientId, _ref38$openInPage, openInPage, additionalParameters, _masterConfig$auth19, _masterConfig$auth19$, _masterConfig$auth20, flow, redirectURI, publicKey, nonce, googleAuthUrl, state, additionalState, width, height, left, top, authWindow;
-      return _regeneratorRuntime().wrap(function _callee84$(_context84) {
-        while (1) switch (_context84.prev = _context84.next) {
+      var _ref40, _ref40$clientId, clientId, _ref40$openInPage, openInPage, additionalParameters, _masterConfig$auth19, _masterConfig$auth19$, _masterConfig$auth20, flow, redirectURI, publicKey, nonce, googleAuthUrl, state, additionalState, width, height, left, top, authWindow;
+      return _regeneratorRuntime().wrap(function _callee89$(_context89) {
+        while (1) switch (_context89.prev = _context89.next) {
           case 0:
-            _ref38 = params || {}, _ref38$clientId = _ref38.clientId, clientId = _ref38$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth17 = masterConfig.auth) === null || _masterConfig$auth17 === void 0 ? void 0 : (_masterConfig$auth17$ = _masterConfig$auth17.oauthConfig) === null || _masterConfig$auth17$ === void 0 ? void 0 : _masterConfig$auth17$.googleClientId : _ref38$clientId, _ref38$openInPage = _ref38.openInPage, openInPage = _ref38$openInPage === void 0 ? (_masterConfig$auth$oa2 = 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$.openOauthInPage) !== null && _masterConfig$auth$oa2 !== void 0 ? _masterConfig$auth$oa2 : false : _ref38$openInPage, additionalParameters = _ref38.additionalState;
-            _context84.prev = 1;
+            _ref40 = params || {}, _ref40$clientId = _ref40.clientId, clientId = _ref40$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth17 = masterConfig.auth) === null || _masterConfig$auth17 === void 0 ? void 0 : (_masterConfig$auth17$ = _masterConfig$auth17.oauthConfig) === null || _masterConfig$auth17$ === void 0 ? void 0 : _masterConfig$auth17$.googleClientId : _ref40$clientId, _ref40$openInPage = _ref40.openInPage, openInPage = _ref40$openInPage === void 0 ? (_masterConfig$auth$oa2 = 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$.openOauthInPage) !== null && _masterConfig$auth$oa2 !== void 0 ? _masterConfig$auth$oa2 : false : _ref40$openInPage, additionalParameters = _ref40.additionalState;
+            _context89.prev = 1;
             if (masterConfig) {
-              _context84.next = 4;
+              _context89.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             if (clientId) {
-              _context84.next = 6;
+              _context89.next = 6;
               break;
             }
             throw new TurnkeyError("Google Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 6:
             if ((_masterConfig$auth19 = masterConfig.auth) !== null && _masterConfig$auth19 !== void 0 && (_masterConfig$auth19$ = _masterConfig$auth19.oauthConfig) !== null && _masterConfig$auth19$ !== void 0 && _masterConfig$auth19$.oauthRedirectUri) {
-              _context84.next = 8;
+              _context89.next = 8;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 8:
             flow = openInPage ? "redirect" : "popup";
             redirectURI = (_masterConfig$auth20 = masterConfig.auth) === null || _masterConfig$auth20 === void 0 ? void 0 : _masterConfig$auth20.oauthConfig.oauthRedirectUri.replace(/\/$/, ""); // Create key pair and generate nonce
-            _context84.next = 12;
+            _context89.next = 12;
             return createApiKeyPair();
           case 12:
-            publicKey = _context84.sent;
+            publicKey = _context89.sent;
             if (publicKey) {
-              _context84.next = 15;
+              _context89.next = 15;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -2950,10 +3110,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 (_ref39) {
-                var _ref40 = _slicedToArray(_ref39, 2),
-                  key = _ref40[0],
-                  value = _ref40[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref41) {
+                var _ref42 = _slicedToArray(_ref41, 2),
+                  key = _ref42[0],
+                  value = _ref42[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -2962,12 +3122,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             googleAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context84.next = 31;
+              _context89.next = 31;
               break;
             }
             // Redirect current page to Google Auth
             window.location.href = googleAuthUrl.toString();
-            return _context84.abrupt("return", new Promise(function (_, reject) {
+            return _context89.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
@@ -2987,7 +3147,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) {
-              _context84.next = 38;
+              _context89.next = 38;
               break;
             }
             throw new Error("Failed to open Google login window.");
@@ -2995,7 +3155,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 _context84.abrupt("return", new Promise(function (resolve, reject) {
+            return _context89.abrupt("return", new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -3043,46 +3203,46 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 40:
-            _context84.next = 45;
+            _context89.next = 45;
             break;
           case 42:
-            _context84.prev = 42;
-            _context84.t0 = _context84["catch"](1);
-            throw _context84.t0;
+            _context89.prev = 42;
+            _context89.t0 = _context89["catch"](1);
+            throw _context89.t0;
           case 45:
           case "end":
-            return _context84.stop();
+            return _context89.stop();
         }
-      }, _callee84, null, [[1, 42]]);
+      }, _callee89, null, [[1, 42]]);
     }));
     return _handleGoogleOauth.apply(this, arguments);
   }
-  function handleAppleOauth(_x53) {
+  function handleAppleOauth(_x56) {
     return _handleAppleOauth.apply(this, arguments);
   }
   function _handleAppleOauth() {
-    _handleAppleOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee85(params) {
+    _handleAppleOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee90(params) {
       var _masterConfig$auth21, _masterConfig$auth21$, _masterConfig$auth$oa3, _masterConfig$auth22, _masterConfig$auth22$;
-      var _ref41, _ref41$clientId, clientId, _ref41$openInPage, openInPage, additionalParameters, _masterConfig$auth23, _masterConfig$auth23$, _masterConfig$auth24, flow, redirectURI, publicKey, nonce, appleAuthUrl, state, additionalState, width, height, left, top, authWindow;
-      return _regeneratorRuntime().wrap(function _callee85$(_context85) {
-        while (1) switch (_context85.prev = _context85.next) {
+      var _ref43, _ref43$clientId, clientId, _ref43$openInPage, openInPage, additionalParameters, _masterConfig$auth23, _masterConfig$auth23$, _masterConfig$auth24, flow, redirectURI, publicKey, nonce, appleAuthUrl, state, additionalState, width, height, left, top, authWindow;
+      return _regeneratorRuntime().wrap(function _callee90$(_context90) {
+        while (1) switch (_context90.prev = _context90.next) {
           case 0:
-            _ref41 = params || {}, _ref41$clientId = _ref41.clientId, clientId = _ref41$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth21 = masterConfig.auth) === null || _masterConfig$auth21 === void 0 ? void 0 : (_masterConfig$auth21$ = _masterConfig$auth21.oauthConfig) === null || _masterConfig$auth21$ === void 0 ? void 0 : _masterConfig$auth21$.appleClientId : _ref41$clientId, _ref41$openInPage = _ref41.openInPage, openInPage = _ref41$openInPage === void 0 ? (_masterConfig$auth$oa3 = 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$.openOauthInPage) !== null && _masterConfig$auth$oa3 !== void 0 ? _masterConfig$auth$oa3 : false : _ref41$openInPage, additionalParameters = _ref41.additionalState;
-            _context85.prev = 1;
+            _ref43 = params || {}, _ref43$clientId = _ref43.clientId, clientId = _ref43$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth21 = masterConfig.auth) === null || _masterConfig$auth21 === void 0 ? void 0 : (_masterConfig$auth21$ = _masterConfig$auth21.oauthConfig) === null || _masterConfig$auth21$ === void 0 ? void 0 : _masterConfig$auth21$.appleClientId : _ref43$clientId, _ref43$openInPage = _ref43.openInPage, openInPage = _ref43$openInPage === void 0 ? (_masterConfig$auth$oa3 = 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$.openOauthInPage) !== null && _masterConfig$auth$oa3 !== void 0 ? _masterConfig$auth$oa3 : false : _ref43$openInPage, additionalParameters = _ref43.additionalState;
+            _context90.prev = 1;
             if (masterConfig) {
-              _context85.next = 4;
+              _context90.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             if (clientId) {
-              _context85.next = 6;
+              _context90.next = 6;
               break;
             }
             throw new TurnkeyError("Apple Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 6:
             if ((_masterConfig$auth23 = masterConfig.auth) !== null && _masterConfig$auth23 !== void 0 && (_masterConfig$auth23$ = _masterConfig$auth23.oauthConfig) !== null && _masterConfig$auth23$ !== void 0 && _masterConfig$auth23$.oauthRedirectUri) {
-              _context85.next = 8;
+              _context90.next = 8;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
@@ -3090,12 +3250,12 @@ var ClientProvider = function ClientProvider(_ref) {
             flow = openInPage ? "redirect" : "popup";
             redirectURI = (_masterConfig$auth24 = masterConfig.auth) === null || _masterConfig$auth24 === void 0 ? void 0 : _masterConfig$auth24.oauthConfig.oauthRedirectUri; // TODO (Amir): Apple needs the '/' at the end. Maybe we should add it if not there?
             // Create key pair and generate nonce
-            _context85.next = 12;
+            _context90.next = 12;
             return createApiKeyPair();
           case 12:
-            publicKey = _context85.sent;
+            publicKey = _context90.sent;
             if (publicKey) {
-              _context85.next = 15;
+              _context90.next = 15;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -3110,10 +3270,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 (_ref42) {
-                var _ref43 = _slicedToArray(_ref42, 2),
-                  key = _ref43[0],
-                  value = _ref43[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref44) {
+                var _ref45 = _slicedToArray(_ref44, 2),
+                  key = _ref45[0],
+                  value = _ref45[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -3122,12 +3282,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             appleAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context85.next = 30;
+              _context90.next = 30;
               break;
             }
             // Redirect current page to Apple Auth
             window.location.href = appleAuthUrl.toString();
-            return _context85.abrupt("return", new Promise(function (_, reject) {
+            return _context90.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."));
@@ -3145,14 +3305,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) {
-              _context85.next = 37;
+              _context90.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 _context85.abrupt("return", new Promise(function (resolve, reject) {
+            return _context90.abrupt("return", new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -3200,67 +3360,67 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 39:
-            _context85.next = 44;
+            _context90.next = 44;
             break;
           case 41:
-            _context85.prev = 41;
-            _context85.t0 = _context85["catch"](1);
-            throw _context85.t0;
+            _context90.prev = 41;
+            _context90.t0 = _context90["catch"](1);
+            throw _context90.t0;
           case 44:
           case "end":
-            return _context85.stop();
+            return _context90.stop();
         }
-      }, _callee85, null, [[1, 41]]);
+      }, _callee90, null, [[1, 41]]);
     }));
     return _handleAppleOauth.apply(this, arguments);
   }
-  function handleFacebookOauth(_x54) {
+  function handleFacebookOauth(_x57) {
     return _handleFacebookOauth.apply(this, arguments);
   }
   function _handleFacebookOauth() {
-    _handleFacebookOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee86(params) {
+    _handleFacebookOauth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee91(params) {
       var _masterConfig$auth25, _masterConfig$auth25$, _masterConfig$auth$oa4, _masterConfig$auth26, _masterConfig$auth26$;
-      var _ref44, _ref44$clientId, clientId, _ref44$openInPage, openInPage, additionalParameters, _masterConfig$auth27, _masterConfig$auth27$, _masterConfig$auth28, flow, redirectURI, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, facebookAuthUrl, state, additionalState, width, height, left, top, authWindow;
-      return _regeneratorRuntime().wrap(function _callee86$(_context86) {
-        while (1) switch (_context86.prev = _context86.next) {
+      var _ref46, _ref46$clientId, clientId, _ref46$openInPage, openInPage, additionalParameters, _masterConfig$auth27, _masterConfig$auth27$, _masterConfig$auth28, flow, redirectURI, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, facebookAuthUrl, state, additionalState, width, height, left, top, authWindow;
+      return _regeneratorRuntime().wrap(function _callee91$(_context91) {
+        while (1) switch (_context91.prev = _context91.next) {
           case 0:
-            _ref44 = params || {}, _ref44$clientId = _ref44.clientId, clientId = _ref44$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth25 = masterConfig.auth) === null || _masterConfig$auth25 === void 0 ? void 0 : (_masterConfig$auth25$ = _masterConfig$auth25.oauthConfig) === null || _masterConfig$auth25$ === void 0 ? void 0 : _masterConfig$auth25$.facebookClientId : _ref44$clientId, _ref44$openInPage = _ref44.openInPage, openInPage = _ref44$openInPage === void 0 ? (_masterConfig$auth$oa4 = 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$.openOauthInPage) !== null && _masterConfig$auth$oa4 !== void 0 ? _masterConfig$auth$oa4 : false : _ref44$openInPage, additionalParameters = _ref44.additionalState;
-            _context86.prev = 1;
+            _ref46 = params || {}, _ref46$clientId = _ref46.clientId, clientId = _ref46$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth25 = masterConfig.auth) === null || _masterConfig$auth25 === void 0 ? void 0 : (_masterConfig$auth25$ = _masterConfig$auth25.oauthConfig) === null || _masterConfig$auth25$ === void 0 ? void 0 : _masterConfig$auth25$.facebookClientId : _ref46$clientId, _ref46$openInPage = _ref46.openInPage, openInPage = _ref46$openInPage === void 0 ? (_masterConfig$auth$oa4 = 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$.openOauthInPage) !== null && _masterConfig$auth$oa4 !== void 0 ? _masterConfig$auth$oa4 : false : _ref46$openInPage, additionalParameters = _ref46.additionalState;
+            _context91.prev = 1;
             if (masterConfig) {
-              _context86.next = 4;
+              _context91.next = 4;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 4:
             if (clientId) {
-              _context86.next = 6;
+              _context91.next = 6;
               break;
             }
             throw new TurnkeyError("Facebook Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 6:
             if ((_masterConfig$auth27 = masterConfig.auth) !== null && _masterConfig$auth27 !== void 0 && (_masterConfig$auth27$ = _masterConfig$auth27.oauthConfig) !== null && _masterConfig$auth27$ !== void 0 && _masterConfig$auth27$.oauthRedirectUri) {
-              _context86.next = 8;
+              _context91.next = 8;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 8:
             flow = openInPage ? "redirect" : "popup";
             redirectURI = (_masterConfig$auth28 = masterConfig.auth) === null || _masterConfig$auth28 === void 0 ? void 0 : _masterConfig$auth28.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context86.next = 12;
+            _context91.next = 12;
             return createApiKeyPair();
           case 12:
-            publicKey = _context86.sent;
+            publicKey = _context91.sent;
             if (publicKey) {
-              _context86.next = 15;
+              _context91.next = 15;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 15:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair
-            _context86.next = 18;
+            _context91.next = 18;
             return generateChallengePair();
           case 18:
-            _yield$generateChalle = _context86.sent;
+            _yield$generateChalle = _context91.sent;
             verifier = _yield$generateChalle.verifier;
             codeChallenge = _yield$generateChalle.codeChallenge;
             // Store verifier for later token exchange
@@ -3277,10 +3437,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 (_ref45) {
-                var _ref46 = _slicedToArray(_ref45, 2),
-                  key = _ref46[0],
-                  value = _ref46[1];
+              additionalState = Object.entries(additionalParameters).map(function (_ref47) {
+                var _ref48 = _slicedToArray(_ref47, 2),
+                  key = _ref48[0],
+                  value = _ref48[1];
                 return "".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
               }).join("&");
               if (additionalState) {
@@ -3289,12 +3449,12 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             facebookAuthUrl.searchParams.set("state", state);
             if (!openInPage) {
-              _context86.next = 38;
+              _context91.next = 38;
               break;
             }
             // Redirect current page to Facebook Auth
             window.location.href = facebookAuthUrl.toString();
-            return _context86.abrupt("return", new Promise(function (_, reject) {
+            return _context91.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."));
@@ -3312,14 +3472,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) {
-              _context86.next = 45;
+              _context91.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 _context86.abrupt("return", new Promise(function (resolve, reject) {
+            return _context91.abrupt("return", new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   // Check if window was closed without completing auth
@@ -3377,17 +3537,17 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
           case 47:
-            _context86.next = 52;
+            _context91.next = 52;
             break;
           case 49:
-            _context86.prev = 49;
-            _context86.t0 = _context86["catch"](1);
-            throw _context86.t0;
+            _context91.prev = 49;
+            _context91.t0 = _context91["catch"](1);
+            throw _context91.t0;
           case 52:
           case "end":
-            return _context86.stop();
+            return _context91.stop();
         }
-      }, _callee86, null, [[1, 49]]);
+      }, _callee91, null, [[1, 49]]);
     }));
     return _handleFacebookOauth.apply(this, arguments);
   }
@@ -3410,19 +3570,18 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref9.apply(this, arguments);
     };
   }();
-  var handleExport = /*#__PURE__*/function () {
+  var handleExportWallet = /*#__PURE__*/function () {
     var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(params) {
-      var _wallets$;
-      var walletId, exportType, targetPublicKey, stampWith;
+      var walletId, targetPublicKey, stampWith;
       return _regeneratorRuntime().wrap(function _callee0$(_context0) {
         while (1) switch (_context0.prev = _context0.next) {
           case 0:
-            walletId = params.walletId, exportType = params.exportType, targetPublicKey = params.targetPublicKey, stampWith = params.stampWith;
+            walletId = params.walletId, targetPublicKey = params.targetPublicKey, stampWith = params.stampWith;
             pushPage({
               key: "Export Wallet",
               content: jsx(ExportComponent, _objectSpread2(_objectSpread2({
-                walletId: walletId !== null && walletId !== void 0 ? walletId : (_wallets$ = wallets[0]) === null || _wallets$ === void 0 ? void 0 : _wallets$.walletId,
-                exportType: exportType !== null && exportType !== void 0 ? exportType : ExportType.Wallet
+                target: walletId,
+                exportType: ExportType.Wallet
               }, targetPublicKey !== undefined ? {
                 targetPublicKey: targetPublicKey
               } : {}), stampWith !== undefined ? {
@@ -3435,19 +3594,75 @@ var ClientProvider = function ClientProvider(_ref) {
         }
       }, _callee0);
     }));
-    return function handleExport(_x55) {
+    return function handleExportWallet(_x58) {
       return _ref0.apply(this, arguments);
     };
   }();
-  var handleImport = /*#__PURE__*/function () {
+  var handleExportPrivateKey = /*#__PURE__*/function () {
     var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee1(params) {
-      var _ref10, defaultWalletAccounts, _ref10$successPageDur, successPageDuration, stampWith;
+      var privateKeyId, targetPublicKey, stampWith;
       return _regeneratorRuntime().wrap(function _callee1$(_context1) {
         while (1) switch (_context1.prev = _context1.next) {
           case 0:
-            _ref10 = params || {}, defaultWalletAccounts = _ref10.defaultWalletAccounts, _ref10$successPageDur = _ref10.successPageDuration, successPageDuration = _ref10$successPageDur === void 0 ? 2000 : _ref10$successPageDur, stampWith = _ref10.stampWith;
-            _context1.prev = 1;
-            return _context1.abrupt("return", withTurnkeyErrorHandling(function () {
+            privateKeyId = params.privateKeyId, targetPublicKey = params.targetPublicKey, stampWith = params.stampWith;
+            pushPage({
+              key: "Export Private Key",
+              content: jsx(ExportComponent, _objectSpread2(_objectSpread2({
+                target: privateKeyId,
+                exportType: ExportType.PrivateKey
+              }, targetPublicKey !== undefined ? {
+                targetPublicKey: targetPublicKey
+              } : {}), stampWith !== undefined ? {
+                stampWith: stampWith
+              } : {}))
+            });
+          case 2:
+          case "end":
+            return _context1.stop();
+        }
+      }, _callee1);
+    }));
+    return function handleExportPrivateKey(_x59) {
+      return _ref1.apply(this, arguments);
+    };
+  }();
+  var handleExportWalletAccount = /*#__PURE__*/function () {
+    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
+      var address, targetPublicKey, stampWith;
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
+          case 0:
+            address = params.address, targetPublicKey = params.targetPublicKey, stampWith = params.stampWith;
+            pushPage({
+              key: "Export Wallet Account",
+              content: jsx(ExportComponent, _objectSpread2(_objectSpread2({
+                target: address,
+                exportType: ExportType.WalletAccount
+              }, targetPublicKey !== undefined ? {
+                targetPublicKey: targetPublicKey
+              } : {}), stampWith !== undefined ? {
+                stampWith: stampWith
+              } : {}))
+            });
+          case 2:
+          case "end":
+            return _context10.stop();
+        }
+      }, _callee10);
+    }));
+    return function handleExportWalletAccount(_x60) {
+      return _ref10.apply(this, arguments);
+    };
+  }();
+  var handleImportWallet = /*#__PURE__*/function () {
+    var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(params) {
+      var _ref12, defaultWalletAccounts, _ref12$successPageDur, successPageDuration, stampWith;
+      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
+          case 0:
+            _ref12 = params || {}, defaultWalletAccounts = _ref12.defaultWalletAccounts, _ref12$successPageDur = _ref12.successPageDuration, successPageDuration = _ref12$successPageDur === void 0 ? 2000 : _ref12$successPageDur, stampWith = _ref12.stampWith;
+            _context11.prev = 1;
+            return _context11.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import Wallet",
@@ -3469,40 +3684,40 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 5:
-            _context1.prev = 5;
-            _context1.t0 = _context1["catch"](1);
-            if (!(_context1.t0 instanceof TurnkeyError)) {
-              _context1.next = 9;
+            _context11.prev = 5;
+            _context11.t0 = _context11["catch"](1);
+            if (!(_context11.t0 instanceof TurnkeyError)) {
+              _context11.next = 9;
               break;
             }
-            throw _context1.t0;
+            throw _context11.t0;
           case 9:
-            throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _context1.t0);
+            throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _context11.t0);
           case 10:
           case "end":
-            return _context1.stop();
+            return _context11.stop();
         }
-      }, _callee1, null, [[1, 5]]);
+      }, _callee11, null, [[1, 5]]);
     }));
-    return function handleImport(_x56) {
-      return _ref1.apply(this, arguments);
+    return function handleImportWallet(_x61) {
+      return _ref11.apply(this, arguments);
     };
   }();
   var handleUpdateUserName = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-      var _ref12, _ref12$successPageDur, successPageDuration, subTitle, title, stampWith, onSuccess, res;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+    var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
+      var _ref14, _ref14$successPageDur, successPageDuration, subTitle, title, stampWith, onSuccess, res;
+      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            _ref12 = params || {}, _ref12$successPageDur = _ref12.successPageDuration, successPageDuration = _ref12$successPageDur === void 0 ? 2000 : _ref12$successPageDur, subTitle = _ref12.subTitle, title = _ref12.title, stampWith = _ref12.stampWith;
+            _ref14 = params || {}, _ref14$successPageDur = _ref14.successPageDuration, successPageDuration = _ref14$successPageDur === void 0 ? 2000 : _ref14$successPageDur, subTitle = _ref14.subTitle, title = _ref14.title, stampWith = _ref14.stampWith;
             if (client) {
-              _context10.next = 3;
+              _context12.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context10.next = 5;
+              _context12.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
@@ -3522,12 +3737,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context10.prev = 6;
+            _context12.prev = 6;
             if (!(!(params !== null && params !== void 0 && params.userName) && (params === null || params === void 0 ? void 0 : params.userName) !== "")) {
-              _context10.next = 11;
+              _context12.next = 11;
               break;
             }
-            return _context10.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context12.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update User Name",
@@ -3550,67 +3765,67 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 11:
-            _context10.next = 13;
+            _context12.next = 13;
             return updateUserName({
               userName: params.userName,
               userId: user.userId,
               stampWith: stampWith
             });
           case 13:
-            res = _context10.sent;
+            res = _context12.sent;
             onSuccess();
-            return _context10.abrupt("return", res);
+            return _context12.abrupt("return", res);
           case 16:
-            _context10.next = 23;
+            _context12.next = 23;
             break;
           case 18:
-            _context10.prev = 18;
-            _context10.t0 = _context10["catch"](6);
-            if (!(_context10.t0 instanceof TurnkeyError)) {
-              _context10.next = 22;
+            _context12.prev = 18;
+            _context12.t0 = _context12["catch"](6);
+            if (!(_context12.t0 instanceof TurnkeyError)) {
+              _context12.next = 22;
               break;
             }
-            throw _context10.t0;
+            throw _context12.t0;
           case 22:
-            throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _context10.t0);
+            throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _context12.t0);
           case 23:
           case "end":
-            return _context10.stop();
+            return _context12.stop();
         }
-      }, _callee10, null, [[6, 18]]);
+      }, _callee12, null, [[6, 18]]);
     }));
-    return function handleUpdateUserName(_x57) {
-      return _ref11.apply(this, arguments);
+    return function handleUpdateUserName(_x62) {
+      return _ref13.apply(this, arguments);
     };
   }();
   var handleUpdateUserPhoneNumber = /*#__PURE__*/function () {
-    var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
-      var _masterConfig$auth4, _masterConfig$auth4$m;
-      var _ref14, _ref14$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+    var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
+      var _masterConfig$auth3, _masterConfig$auth3$m;
+      var _ref16, _ref16$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
+      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            _ref14 = params || {}, _ref14$successPageDur = _ref14.successPageDuration, successPageDuration = _ref14$successPageDur === void 0 ? 2000 : _ref14$successPageDur, subTitle = _ref14.subTitle, title = _ref14.title;
+            _ref16 = params || {}, _ref16$successPageDur = _ref16.successPageDuration, successPageDuration = _ref16$successPageDur === void 0 ? 2000 : _ref16$successPageDur, subTitle = _ref16.subTitle, title = _ref16.title;
             if (client) {
-              _context12.next = 3;
+              _context14.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context12.next = 5;
+              _context14.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
             if (masterConfig) {
-              _context12.next = 7;
+              _context14.next = 7;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 7:
-            if ((_masterConfig$auth4 = masterConfig.auth) !== null && _masterConfig$auth4 !== void 0 && (_masterConfig$auth4$m = _masterConfig$auth4.methods) !== null && _masterConfig$auth4$m !== void 0 && _masterConfig$auth4$m.smsOtpAuthEnabled) {
-              _context12.next = 9;
+            if ((_masterConfig$auth3 = masterConfig.auth) !== null && _masterConfig$auth3 !== void 0 && (_masterConfig$auth3$m = _masterConfig$auth3.methods) !== null && _masterConfig$auth3$m !== void 0 && _masterConfig$auth3$m.smsOtpAuthEnabled) {
+              _context14.next = 9;
               break;
             }
             throw new TurnkeyError("SMS OTP authentication is not enabled in the configuration.", TurnkeyErrorCodes.AUTH_METHOD_NOT_ENABLED);
@@ -3630,12 +3845,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context12.prev = 10;
+            _context14.prev = 10;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context12.next = 15;
+              _context14.next = 15;
               break;
             }
-            return _context12.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context14.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Phone Number",
@@ -3657,14 +3872,14 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 15:
-            _context12.next = 17;
+            _context14.next = 17;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 17:
-            otpId = _context12.sent;
-            return _context12.abrupt("return", withTurnkeyErrorHandling(function () {
+            otpId = _context14.sent;
+            return _context14.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Phone Number",
@@ -3673,13 +3888,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.phoneNumber,
                     otpId: otpId,
                     onContinue: function () {
-                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(otpCode) {
+                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(otpCode) {
                         var _yield$verifyOtp, verificationToken, res;
-                        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-                          while (1) switch (_context11.prev = _context11.next) {
+                        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+                          while (1) switch (_context13.prev = _context13.next) {
                             case 0:
-                              _context11.prev = 0;
-                              _context11.next = 3;
+                              _context13.prev = 0;
+                              _context13.next = 3;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -3687,31 +3902,31 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Sms
                               });
                             case 3:
-                              _yield$verifyOtp = _context11.sent;
+                              _yield$verifyOtp = _context13.sent;
                               verificationToken = _yield$verifyOtp.verificationToken;
-                              _context11.next = 7;
+                              _context13.next = 7;
                               return updateUserPhoneNumber({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
                                 userId: user.userId
                               });
                             case 7:
-                              res = _context11.sent;
+                              res = _context13.sent;
                               onSuccess();
                               resolve(res);
-                              _context11.next = 15;
+                              _context13.next = 15;
                               break;
                             case 12:
-                              _context11.prev = 12;
-                              _context11.t0 = _context11["catch"](0);
-                              reject(_context11.t0);
+                              _context13.prev = 12;
+                              _context13.t0 = _context13["catch"](0);
+                              reject(_context13.t0);
                             case 15:
                             case "end":
-                              return _context11.stop();
+                              return _context13.stop();
                           }
-                        }, _callee11, null, [[0, 12]]);
+                        }, _callee13, null, [[0, 12]]);
                       }));
-                      function onContinue(_x59) {
+                      function onContinue(_x64) {
                         return _onContinue.apply(this, arguments);
                       }
                       return onContinue;
@@ -3728,43 +3943,43 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to update phone number"));
           case 19:
-            _context12.next = 26;
+            _context14.next = 26;
             break;
           case 21:
-            _context12.prev = 21;
-            _context12.t0 = _context12["catch"](10);
-            if (!(_context12.t0 instanceof TurnkeyError)) {
-              _context12.next = 25;
+            _context14.prev = 21;
+            _context14.t0 = _context14["catch"](10);
+            if (!(_context14.t0 instanceof TurnkeyError)) {
+              _context14.next = 25;
               break;
             }
-            throw _context12.t0;
+            throw _context14.t0;
           case 25:
-            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context12.t0);
+            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context14.t0);
           case 26:
           case "end":
-            return _context12.stop();
+            return _context14.stop();
         }
-      }, _callee12, null, [[10, 21]]);
+      }, _callee14, null, [[10, 21]]);
     }));
-    return function handleUpdateUserPhoneNumber(_x58) {
-      return _ref13.apply(this, arguments);
+    return function handleUpdateUserPhoneNumber(_x63) {
+      return _ref15.apply(this, arguments);
     };
   }();
   var handleUpdateUserEmail = /*#__PURE__*/function () {
-    var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
-      var _ref16, _ref16$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
-      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+    var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
+      var _ref18, _ref18$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
+      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+        while (1) switch (_context16.prev = _context16.next) {
           case 0:
-            _ref16 = params || {}, _ref16$successPageDur = _ref16.successPageDuration, successPageDuration = _ref16$successPageDur === void 0 ? 2000 : _ref16$successPageDur, subTitle = _ref16.subTitle, title = _ref16.title;
+            _ref18 = params || {}, _ref18$successPageDur = _ref18.successPageDuration, successPageDuration = _ref18$successPageDur === void 0 ? 2000 : _ref18$successPageDur, subTitle = _ref18.subTitle, title = _ref18.title;
             if (client) {
-              _context14.next = 3;
+              _context16.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context14.next = 5;
+              _context16.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
@@ -3784,12 +3999,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context14.prev = 6;
+            _context16.prev = 6;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context14.next = 11;
+              _context16.next = 11;
               break;
             }
-            return _context14.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context16.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Email",
@@ -3811,14 +4026,14 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 11:
-            _context14.next = 13;
+            _context16.next = 13;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 13:
-            otpId = _context14.sent;
-            return _context14.abrupt("return", withTurnkeyErrorHandling(function () {
+            otpId = _context16.sent;
+            return _context16.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Email",
@@ -3827,13 +4042,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.email,
                     otpId: otpId,
                     onContinue: function () {
-                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(otpCode) {
+                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(otpCode) {
                         var _yield$verifyOtp2, verificationToken, res;
-                        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-                          while (1) switch (_context13.prev = _context13.next) {
+                        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+                          while (1) switch (_context15.prev = _context15.next) {
                             case 0:
-                              _context13.prev = 0;
-                              _context13.next = 3;
+                              _context15.prev = 0;
+                              _context15.next = 3;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -3841,31 +4056,31 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Email
                               });
                             case 3:
-                              _yield$verifyOtp2 = _context13.sent;
+                              _yield$verifyOtp2 = _context15.sent;
                               verificationToken = _yield$verifyOtp2.verificationToken;
-                              _context13.next = 7;
+                              _context15.next = 7;
                               return updateUserEmail({
                                 email: params.email,
                                 verificationToken: verificationToken,
                                 userId: user.userId
                               });
                             case 7:
-                              res = _context13.sent;
+                              res = _context15.sent;
                               onSuccess();
                               resolve(res);
-                              _context13.next = 15;
+                              _context15.next = 15;
                               break;
                             case 12:
-                              _context13.prev = 12;
-                              _context13.t0 = _context13["catch"](0);
-                              reject(_context13.t0);
+                              _context15.prev = 12;
+                              _context15.t0 = _context15["catch"](0);
+                              reject(_context15.t0);
                             case 15:
                             case "end":
-                              return _context13.stop();
+                              return _context15.stop();
                           }
-                        }, _callee13, null, [[0, 12]]);
+                        }, _callee15, null, [[0, 12]]);
                       }));
-                      function onContinue(_x61) {
+                      function onContinue(_x66) {
                         return _onContinue2.apply(this, arguments);
                       }
                       return onContinue;
@@ -3880,43 +4095,43 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to update email"));
           case 15:
-            _context14.next = 22;
+            _context16.next = 22;
             break;
           case 17:
-            _context14.prev = 17;
-            _context14.t0 = _context14["catch"](6);
-            if (!(_context14.t0 instanceof TurnkeyError)) {
-              _context14.next = 21;
+            _context16.prev = 17;
+            _context16.t0 = _context16["catch"](6);
+            if (!(_context16.t0 instanceof TurnkeyError)) {
+              _context16.next = 21;
               break;
             }
-            throw _context14.t0;
+            throw _context16.t0;
           case 21:
-            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context14.t0);
+            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context16.t0);
           case 22:
           case "end":
-            return _context14.stop();
+            return _context16.stop();
         }
-      }, _callee14, null, [[6, 17]]);
+      }, _callee16, null, [[6, 17]]);
     }));
-    return function handleUpdateUserEmail(_x60) {
-      return _ref15.apply(this, arguments);
+    return function handleUpdateUserEmail(_x65) {
+      return _ref17.apply(this, arguments);
     };
   }();
   var handleAddEmail = /*#__PURE__*/function () {
-    var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
-      var _ref18, _ref18$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
-      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
+    var _ref19 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
+      var _ref20, _ref20$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
+      return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+        while (1) switch (_context18.prev = _context18.next) {
           case 0:
-            _ref18 = params || {}, _ref18$successPageDur = _ref18.successPageDuration, successPageDuration = _ref18$successPageDur === void 0 ? 2000 : _ref18$successPageDur, subTitle = _ref18.subTitle, title = _ref18.title;
+            _ref20 = params || {}, _ref20$successPageDur = _ref20.successPageDuration, successPageDuration = _ref20$successPageDur === void 0 ? 2000 : _ref20$successPageDur, subTitle = _ref20.subTitle, title = _ref20.title;
             if (client) {
-              _context16.next = 3;
+              _context18.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context16.next = 5;
+              _context18.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
@@ -3936,12 +4151,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context16.prev = 6;
+            _context18.prev = 6;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context16.next = 11;
+              _context18.next = 11;
               break;
             }
-            return _context16.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context18.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Email",
@@ -3963,14 +4178,14 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 11:
-            _context16.next = 13;
+            _context18.next = 13;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 13:
-            otpId = _context16.sent;
-            return _context16.abrupt("return", withTurnkeyErrorHandling(function () {
+            otpId = _context18.sent;
+            return _context18.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Email",
@@ -3979,13 +4194,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.email,
                     otpId: otpId,
                     onContinue: function () {
-                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(otpCode) {
+                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17(otpCode) {
                         var _yield$verifyOtp3, verificationToken, res;
-                        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-                          while (1) switch (_context15.prev = _context15.next) {
+                        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+                          while (1) switch (_context17.prev = _context17.next) {
                             case 0:
-                              _context15.prev = 0;
-                              _context15.next = 3;
+                              _context17.prev = 0;
+                              _context17.next = 3;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -3993,31 +4208,31 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Email
                               });
                             case 3:
-                              _yield$verifyOtp3 = _context15.sent;
+                              _yield$verifyOtp3 = _context17.sent;
                               verificationToken = _yield$verifyOtp3.verificationToken;
-                              _context15.next = 7;
+                              _context17.next = 7;
                               return updateUserEmail({
                                 email: params.email,
                                 verificationToken: verificationToken,
                                 userId: user.userId
                               });
                             case 7:
-                              res = _context15.sent;
+                              res = _context17.sent;
                               onSuccess();
                               resolve(res);
-                              _context15.next = 15;
+                              _context17.next = 15;
                               break;
                             case 12:
-                              _context15.prev = 12;
-                              _context15.t0 = _context15["catch"](0);
-                              reject(_context15.t0);
+                              _context17.prev = 12;
+                              _context17.t0 = _context17["catch"](0);
+                              reject(_context17.t0);
                             case 15:
                             case "end":
-                              return _context15.stop();
+                              return _context17.stop();
                           }
-                        }, _callee15, null, [[0, 12]]);
+                        }, _callee17, null, [[0, 12]]);
                       }));
-                      function onContinue(_x63) {
+                      function onContinue(_x68) {
                         return _onContinue3.apply(this, arguments);
                       }
                       return onContinue;
@@ -4032,56 +4247,56 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to add email"));
           case 15:
-            _context16.next = 22;
+            _context18.next = 22;
             break;
           case 17:
-            _context16.prev = 17;
-            _context16.t0 = _context16["catch"](6);
-            if (!(_context16.t0 instanceof TurnkeyError)) {
-              _context16.next = 21;
+            _context18.prev = 17;
+            _context18.t0 = _context18["catch"](6);
+            if (!(_context18.t0 instanceof TurnkeyError)) {
+              _context18.next = 21;
               break;
             }
-            throw _context16.t0;
+            throw _context18.t0;
           case 21:
-            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context16.t0);
+            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context18.t0);
           case 22:
           case "end":
-            return _context16.stop();
+            return _context18.stop();
         }
-      }, _callee16, null, [[6, 17]]);
+      }, _callee18, null, [[6, 17]]);
     }));
-    return function handleAddEmail(_x62) {
-      return _ref17.apply(this, arguments);
+    return function handleAddEmail(_x67) {
+      return _ref19.apply(this, arguments);
     };
   }();
   var handleAddPhoneNumber = /*#__PURE__*/function () {
-    var _ref19 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-      var _masterConfig$auth5, _masterConfig$auth5$m;
-      var _ref20, _ref20$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
-      return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-        while (1) switch (_context18.prev = _context18.next) {
+    var _ref21 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
+      var _masterConfig$auth4, _masterConfig$auth4$m;
+      var _ref22, _ref22$successPageDur, successPageDuration, subTitle, title, onSuccess, otpId;
+      return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+        while (1) switch (_context20.prev = _context20.next) {
           case 0:
-            _ref20 = params || {}, _ref20$successPageDur = _ref20.successPageDuration, successPageDuration = _ref20$successPageDur === void 0 ? 2000 : _ref20$successPageDur, subTitle = _ref20.subTitle, title = _ref20.title;
+            _ref22 = params || {}, _ref22$successPageDur = _ref22.successPageDuration, successPageDuration = _ref22$successPageDur === void 0 ? 2000 : _ref22$successPageDur, subTitle = _ref22.subTitle, title = _ref22.title;
             if (client) {
-              _context18.next = 3;
+              _context20.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context18.next = 5;
+              _context20.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
             if (masterConfig) {
-              _context18.next = 7;
+              _context20.next = 7;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 7:
-            if ((_masterConfig$auth5 = masterConfig.auth) !== null && _masterConfig$auth5 !== void 0 && (_masterConfig$auth5$m = _masterConfig$auth5.methods) !== null && _masterConfig$auth5$m !== void 0 && _masterConfig$auth5$m.smsOtpAuthEnabled) {
-              _context18.next = 9;
+            if ((_masterConfig$auth4 = masterConfig.auth) !== null && _masterConfig$auth4 !== void 0 && (_masterConfig$auth4$m = _masterConfig$auth4.methods) !== null && _masterConfig$auth4$m !== void 0 && _masterConfig$auth4$m.smsOtpAuthEnabled) {
+              _context20.next = 9;
               break;
             }
             throw new TurnkeyError("SMS OTP authentication is not enabled in the configuration.", TurnkeyErrorCodes.AUTH_METHOD_NOT_ENABLED);
@@ -4101,12 +4316,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context18.prev = 10;
+            _context20.prev = 10;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context18.next = 15;
+              _context20.next = 15;
               break;
             }
-            return _context18.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context20.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Phone Number",
@@ -4128,14 +4343,14 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to add phone number"));
           case 15:
-            _context18.next = 17;
+            _context20.next = 17;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 17:
-            otpId = _context18.sent;
-            return _context18.abrupt("return", withTurnkeyErrorHandling(function () {
+            otpId = _context20.sent;
+            return _context20.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Phone Number",
@@ -4144,13 +4359,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     contact: params.phoneNumber,
                     otpId: otpId,
                     onContinue: function () {
-                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17(otpCode) {
+                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(otpCode) {
                         var _yield$verifyOtp4, verificationToken, res;
-                        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-                          while (1) switch (_context17.prev = _context17.next) {
+                        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+                          while (1) switch (_context19.prev = _context19.next) {
                             case 0:
-                              _context17.prev = 0;
-                              _context17.next = 3;
+                              _context19.prev = 0;
+                              _context19.next = 3;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -4158,31 +4373,31 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Sms
                               });
                             case 3:
-                              _yield$verifyOtp4 = _context17.sent;
+                              _yield$verifyOtp4 = _context19.sent;
                               verificationToken = _yield$verifyOtp4.verificationToken;
-                              _context17.next = 7;
+                              _context19.next = 7;
                               return updateUserPhoneNumber({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
                                 userId: user.userId
                               });
                             case 7:
-                              res = _context17.sent;
+                              res = _context19.sent;
                               onSuccess();
                               resolve(res);
-                              _context17.next = 15;
+                              _context19.next = 15;
                               break;
                             case 12:
-                              _context17.prev = 12;
-                              _context17.t0 = _context17["catch"](0);
-                              reject(_context17.t0);
+                              _context19.prev = 12;
+                              _context19.t0 = _context19["catch"](0);
+                              reject(_context19.t0);
                             case 15:
                             case "end":
-                              return _context17.stop();
+                              return _context19.stop();
                           }
-                        }, _callee17, null, [[0, 12]]);
+                        }, _callee19, null, [[0, 12]]);
                       }));
-                      function onContinue(_x65) {
+                      function onContinue(_x70) {
                         return _onContinue4.apply(this, arguments);
                       }
                       return onContinue;
@@ -4199,48 +4414,48 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }, callbacks, "Failed to add phone number"));
           case 19:
-            _context18.next = 26;
+            _context20.next = 26;
             break;
           case 21:
-            _context18.prev = 21;
-            _context18.t0 = _context18["catch"](10);
-            if (!(_context18.t0 instanceof TurnkeyError)) {
-              _context18.next = 25;
+            _context20.prev = 21;
+            _context20.t0 = _context20["catch"](10);
+            if (!(_context20.t0 instanceof TurnkeyError)) {
+              _context20.next = 25;
               break;
             }
-            throw _context18.t0;
+            throw _context20.t0;
           case 25:
-            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context18.t0);
+            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _context20.t0);
           case 26:
           case "end":
-            return _context18.stop();
+            return _context20.stop();
         }
-      }, _callee18, null, [[10, 21]]);
+      }, _callee20, null, [[10, 21]]);
     }));
-    return function handleAddPhoneNumber(_x64) {
-      return _ref19.apply(this, arguments);
+    return function handleAddPhoneNumber(_x69) {
+      return _ref21.apply(this, arguments);
     };
   }();
   var handleRemovePasskey = /*#__PURE__*/function () {
-    var _ref21 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
+    var _ref23 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
       var authenticatorId, _params$successPageDu, successPageDuration, subTitle, title, stampWith, userId;
-      return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-        while (1) switch (_context19.prev = _context19.next) {
+      return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+        while (1) switch (_context21.prev = _context21.next) {
           case 0:
             authenticatorId = params.authenticatorId, _params$successPageDu = params.successPageDuration, successPageDuration = _params$successPageDu === void 0 ? 2000 : _params$successPageDu, subTitle = params.subTitle, title = params.title, stampWith = params.stampWith, userId = params.userId;
             if (client) {
-              _context19.next = 3;
+              _context21.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context19.next = 5;
+              _context21.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
-            return _context19.abrupt("return", withTurnkeyErrorHandling(function () {
+            return _context21.abrupt("return", withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Remove Passkey",
@@ -4268,35 +4483,35 @@ var ClientProvider = function ClientProvider(_ref) {
             }, callbacks, "Failed to remove passkey"));
           case 6:
           case "end":
-            return _context19.stop();
+            return _context21.stop();
         }
-      }, _callee19);
+      }, _callee21);
     }));
-    return function handleRemovePasskey(_x66) {
-      return _ref21.apply(this, arguments);
+    return function handleRemovePasskey(_x71) {
+      return _ref23.apply(this, arguments);
     };
   }();
   var handleAddPasskey = /*#__PURE__*/function () {
-    var _ref22 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
-      var _ref23, name, displayName, _ref23$successPageDur, successPageDuration, stampWith, userId, resPromise;
-      return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-        while (1) switch (_context20.prev = _context20.next) {
+    var _ref24 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
+      var _ref25, name, displayName, _ref25$successPageDur, successPageDuration, stampWith, userId, resPromise;
+      return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+        while (1) switch (_context22.prev = _context22.next) {
           case 0:
-            _ref23 = params || {}, name = _ref23.name, displayName = _ref23.displayName, _ref23$successPageDur = _ref23.successPageDuration, successPageDuration = _ref23$successPageDur === void 0 ? 2000 : _ref23$successPageDur, stampWith = _ref23.stampWith;
+            _ref25 = params || {}, name = _ref25.name, displayName = _ref25.displayName, _ref25$successPageDur = _ref25.successPageDuration, successPageDuration = _ref25$successPageDur === void 0 ? 2000 : _ref25$successPageDur, stampWith = _ref25.stampWith;
             if (client) {
-              _context20.next = 3;
+              _context22.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context20.next = 5;
+              _context22.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;
-            _context20.prev = 6;
+            _context22.prev = 6;
             resPromise = addPasskey(_objectSpread2(_objectSpread2(_objectSpread2({}, name && {
               name: name
             }), displayName && {
@@ -4319,51 +4534,51 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             });
-            _context20.next = 11;
+            _context22.next = 11;
             return resPromise;
           case 11:
-            return _context20.abrupt("return", _context20.sent);
+            return _context22.abrupt("return", _context22.sent);
           case 14:
-            _context20.prev = 14;
-            _context20.t0 = _context20["catch"](6);
-            if (!(_context20.t0 instanceof TurnkeyError)) {
-              _context20.next = 18;
+            _context22.prev = 14;
+            _context22.t0 = _context22["catch"](6);
+            if (!(_context22.t0 instanceof TurnkeyError)) {
+              _context22.next = 18;
               break;
             }
-            throw _context20.t0;
+            throw _context22.t0;
           case 18:
-            throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _context20.t0);
+            throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _context22.t0);
           case 19:
           case "end":
-            return _context20.stop();
+            return _context22.stop();
         }
-      }, _callee20, null, [[6, 14]]);
+      }, _callee22, null, [[6, 14]]);
     }));
-    return function handleAddPasskey(_x67) {
-      return _ref22.apply(this, arguments);
+    return function handleAddPasskey(_x72) {
+      return _ref24.apply(this, arguments);
     };
   }();
   var handleRemoveOauthProvider = /*#__PURE__*/function () {
-    var _ref24 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
+    var _ref26 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
       var providerId, _params$successPageDu2, successPageDuration, subTitle, title, stampWith;
-      return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-        while (1) switch (_context21.prev = _context21.next) {
+      return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+        while (1) switch (_context23.prev = _context23.next) {
           case 0:
             providerId = params.providerId, _params$successPageDu2 = params.successPageDuration, successPageDuration = _params$successPageDu2 === void 0 ? 2000 : _params$successPageDu2, subTitle = params.subTitle, title = params.title, stampWith = params.stampWith;
             if (client) {
-              _context21.next = 3;
+              _context23.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context21.next = 5;
+              _context23.next = 5;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 5:
-            _context21.prev = 5;
-            return _context21.abrupt("return", new Promise(function (resolve, reject) {
+            _context23.prev = 5;
+            return _context23.abrupt("return", new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove OAuth Provider",
                 content: jsx(RemoveOAuthProvider, _objectSpread2(_objectSpread2({
@@ -4386,50 +4601,50 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 9:
-            _context21.prev = 9;
-            _context21.t0 = _context21["catch"](5);
-            if (!(_context21.t0 instanceof TurnkeyError)) {
-              _context21.next = 13;
+            _context23.prev = 9;
+            _context23.t0 = _context23["catch"](5);
+            if (!(_context23.t0 instanceof TurnkeyError)) {
+              _context23.next = 13;
               break;
             }
-            throw _context21.t0;
+            throw _context23.t0;
           case 13:
-            throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _context21.t0);
+            throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _context23.t0);
           case 14:
           case "end":
-            return _context21.stop();
+            return _context23.stop();
         }
-      }, _callee21, null, [[5, 9]]);
+      }, _callee23, null, [[5, 9]]);
     }));
-    return function handleRemoveOauthProvider(_x68) {
-      return _ref24.apply(this, arguments);
+    return function handleRemoveOauthProvider(_x73) {
+      return _ref26.apply(this, arguments);
     };
   }();
   var handleAddOauthProvider = /*#__PURE__*/function () {
-    var _ref25 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
+    var _ref27 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
       var providerName, stampWith, onOauthSuccess;
-      return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-        while (1) switch (_context23.prev = _context23.next) {
+      return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+        while (1) switch (_context25.prev = _context25.next) {
           case 0:
             if (client) {
-              _context23.next = 2;
+              _context25.next = 2;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 2:
             if (session) {
-              _context23.next = 4;
+              _context25.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 _ref26 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
-                return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-                  while (1) switch (_context22.prev = _context22.next) {
+              var _ref28 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
+                return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+                  while (1) switch (_context24.prev = _context24.next) {
                     case 0:
-                      _context22.next = 2;
+                      _context24.next = 2;
                       return addOauthProvider({
                         providerName: params.providerName,
                         oidcToken: params.oidcToken,
@@ -4450,83 +4665,83 @@ var ClientProvider = function ClientProvider(_ref) {
                       });
                     case 3:
                     case "end":
-                      return _context22.stop();
+                      return _context24.stop();
                   }
-                }, _callee22);
+                }, _callee24);
               }));
-              return function onOauthSuccess(_x70) {
-                return _ref26.apply(this, arguments);
+              return function onOauthSuccess(_x75) {
+                return _ref28.apply(this, arguments);
               };
             }();
-            _context23.t0 = providerName;
-            _context23.next = _context23.t0 === OAuthProviders.GOOGLE ? 9 : _context23.t0 === OAuthProviders.APPLE ? 12 : _context23.t0 === OAuthProviders.FACEBOOK ? 15 : 18;
+            _context25.t0 = providerName;
+            _context25.next = _context25.t0 === OAuthProviders.GOOGLE ? 9 : _context25.t0 === OAuthProviders.APPLE ? 12 : _context25.t0 === OAuthProviders.FACEBOOK ? 15 : 18;
             break;
           case 9:
-            _context23.next = 11;
+            _context25.next = 11;
             return handleGoogleOauth({
               openInPage: false,
               onOauthSuccess: onOauthSuccess
             });
           case 11:
-            return _context23.abrupt("break", 19);
+            return _context25.abrupt("break", 19);
           case 12:
-            _context23.next = 14;
+            _context25.next = 14;
             return handleAppleOauth({
               openInPage: false,
               onOauthSuccess: onOauthSuccess
             });
           case 14:
-            return _context23.abrupt("break", 19);
+            return _context25.abrupt("break", 19);
           case 15:
-            _context23.next = 17;
+            _context25.next = 17;
             return handleFacebookOauth({
               openInPage: false,
               onOauthSuccess: onOauthSuccess
             });
           case 17:
-            return _context23.abrupt("break", 19);
+            return _context25.abrupt("break", 19);
           case 18:
             throw new TurnkeyError("Unsupported OAuth provider: ".concat(providerName), TurnkeyErrorCodes.NOT_FOUND);
           case 19:
           case "end":
-            return _context23.stop();
+            return _context25.stop();
         }
-      }, _callee23);
+      }, _callee25);
     }));
-    return function handleAddOauthProvider(_x69) {
-      return _ref25.apply(this, arguments);
+    return function handleAddOauthProvider(_x74) {
+      return _ref27.apply(this, arguments);
     };
   }();
   var handleLinkExternalWallet = /*#__PURE__*/function () {
-    var _ref27 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
+    var _ref29 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
       var _masterConfig$walletC4, _masterConfig$walletC5;
-      var _ref28, _ref28$successPageDur, successPageDuration, providers;
-      return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-        while (1) switch (_context24.prev = _context24.next) {
+      var _ref30, _ref30$successPageDur, successPageDuration, providers;
+      return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+        while (1) switch (_context26.prev = _context26.next) {
           case 0:
-            _ref28 = params || {}, _ref28$successPageDur = _ref28.successPageDuration, successPageDuration = _ref28$successPageDur === void 0 ? 2000 : _ref28$successPageDur;
+            _ref30 = params || {}, _ref30$successPageDur = _ref30.successPageDuration, successPageDuration = _ref30$successPageDur === void 0 ? 2000 : _ref30$successPageDur;
             if (client) {
-              _context24.next = 3;
+              _context26.next = 3;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 3:
             if (session) {
-              _context24.next = 5;
+              _context26.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) {
-              _context24.next = 7;
+              _context26.next = 7;
               break;
             }
             throw new TurnkeyError("Wallet connecting is not enabled.", TurnkeyErrorCodes.FEATURE_NOT_ENABLED);
           case 7:
-            _context24.next = 9;
+            _context26.next = 9;
             return getWalletProviders();
           case 9:
-            providers = _context24.sent;
+            providers = _context26.sent;
             pushPage({
               key: "Link Wallet",
               content: jsx(LinkWalletModal, {
@@ -4536,29 +4751,29 @@ var ClientProvider = function ClientProvider(_ref) {
             });
           case 11:
           case "end":
-            return _context24.stop();
+            return _context26.stop();
         }
-      }, _callee24);
+      }, _callee26);
     }));
-    return function handleLinkExternalWallet(_x71) {
-      return _ref27.apply(this, arguments);
+    return function handleLinkExternalWallet(_x76) {
+      return _ref29.apply(this, arguments);
     };
   }();
   var handleRemoveUserEmail = /*#__PURE__*/function () {
-    var _ref29 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
-      var _ref30, _ref30$successPageDur, successPageDuration, stampWith, userId;
-      return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-        while (1) switch (_context25.prev = _context25.next) {
+    var _ref31 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
+      var _ref32, _ref32$successPageDur, successPageDuration, stampWith, userId;
+      return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+        while (1) switch (_context27.prev = _context27.next) {
           case 0:
-            _ref30 = params || {}, _ref30$successPageDur = _ref30.successPageDuration, successPageDuration = _ref30$successPageDur === void 0 ? 2000 : _ref30$successPageDur, stampWith = _ref30.stampWith, userId = _ref30.userId;
+            _ref32 = params || {}, _ref32$successPageDur = _ref32.successPageDuration, successPageDuration = _ref32$successPageDur === void 0 ? 2000 : _ref32$successPageDur, stampWith = _ref32.stampWith, userId = _ref32.userId;
             if (session) {
-              _context25.next = 3;
+              _context27.next = 3;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 3:
-            _context25.prev = 3;
-            return _context25.abrupt("return", new Promise(function (resolve, reject) {
+            _context27.prev = 3;
+            return _context27.abrupt("return", new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Email",
                 content: jsx(RemoveEmail, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -4580,40 +4795,40 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 7:
-            _context25.prev = 7;
-            _context25.t0 = _context25["catch"](3);
-            if (!(_context25.t0 instanceof TurnkeyError)) {
-              _context25.next = 11;
+            _context27.prev = 7;
+            _context27.t0 = _context27["catch"](3);
+            if (!(_context27.t0 instanceof TurnkeyError)) {
+              _context27.next = 11;
               break;
             }
-            throw _context25.t0;
+            throw _context27.t0;
           case 11:
-            throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _context25.t0);
+            throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _context27.t0);
           case 12:
           case "end":
-            return _context25.stop();
+            return _context27.stop();
         }
-      }, _callee25, null, [[3, 7]]);
+      }, _callee27, null, [[3, 7]]);
     }));
-    return function handleRemoveUserEmail(_x72) {
-      return _ref29.apply(this, arguments);
+    return function handleRemoveUserEmail(_x77) {
+      return _ref31.apply(this, arguments);
     };
   }();
   var handleRemoveUserPhoneNumber = /*#__PURE__*/function () {
-    var _ref31 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
-      var _ref32, _ref32$successPageDur, successPageDuration, stampWith, userId;
-      return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-        while (1) switch (_context26.prev = _context26.next) {
+    var _ref33 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
+      var _ref34, _ref34$successPageDur, successPageDuration, stampWith, userId;
+      return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+        while (1) switch (_context28.prev = _context28.next) {
           case 0:
-            _ref32 = params || {}, _ref32$successPageDur = _ref32.successPageDuration, successPageDuration = _ref32$successPageDur === void 0 ? 2000 : _ref32$successPageDur, stampWith = _ref32.stampWith, userId = _ref32.userId;
+            _ref34 = params || {}, _ref34$successPageDur = _ref34.successPageDuration, successPageDuration = _ref34$successPageDur === void 0 ? 2000 : _ref34$successPageDur, stampWith = _ref34.stampWith, userId = _ref34.userId;
             if (session) {
-              _context26.next = 3;
+              _context28.next = 3;
               break;
             }
             throw new TurnkeyError("No active session found.", TurnkeyErrorCodes.NO_SESSION_FOUND);
           case 3:
-            _context26.prev = 3;
-            return _context26.abrupt("return", new Promise(function (resolve, reject) {
+            _context28.prev = 3;
+            return _context28.abrupt("return", new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Phone Number",
                 content: jsx(RemovePhoneNumber, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -4635,23 +4850,23 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 7:
-            _context26.prev = 7;
-            _context26.t0 = _context26["catch"](3);
-            if (!(_context26.t0 instanceof TurnkeyError)) {
-              _context26.next = 11;
+            _context28.prev = 7;
+            _context28.t0 = _context28["catch"](3);
+            if (!(_context28.t0 instanceof TurnkeyError)) {
+              _context28.next = 11;
               break;
             }
-            throw _context26.t0;
+            throw _context28.t0;
           case 11:
-            throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _context26.t0);
+            throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _context28.t0);
           case 12:
           case "end":
-            return _context26.stop();
+            return _context28.stop();
         }
-      }, _callee26, null, [[3, 7]]);
+      }, _callee28, null, [[3, 7]]);
     }));
-    return function handleRemoveUserPhoneNumber(_x73) {
-      return _ref31.apply(this, arguments);
+    return function handleRemoveUserPhoneNumber(_x78) {
+      return _ref33.apply(this, arguments);
     };
   }();
   return jsx(ClientContext.Provider, {
@@ -4703,7 +4918,10 @@ var ClientProvider = function ClientProvider(_ref) {
       createWallet: createWallet,
       createWalletAccounts: createWalletAccounts,
       exportWallet: exportWallet,
+      exportPrivateKey: exportPrivateKey,
+      exportWalletAccount: exportWalletAccount,
       importWallet: importWallet,
+      importPrivateKey: importPrivateKey,
       deleteSubOrganization: deleteSubOrganization,
       storeSession: storeSession,
       clearSession: clearSession,
@@ -4720,8 +4938,10 @@ var ClientProvider = function ClientProvider(_ref) {
       handleGoogleOauth: handleGoogleOauth,
       handleAppleOauth: handleAppleOauth,
       handleFacebookOauth: handleFacebookOauth,
-      handleExport: handleExport,
-      handleImport: handleImport,
+      handleExportWallet: handleExportWallet,
+      handleExportPrivateKey: handleExportPrivateKey,
+      handleExportWalletAccount: handleExportWalletAccount,
+      handleImportWallet: handleImportWallet,
       handleUpdateUserEmail: handleUpdateUserEmail,
       handleUpdateUserPhoneNumber: handleUpdateUserPhoneNumber,
       handleUpdateUserName: handleUpdateUserName,