@turnkey/react-wallet-kit 1.10.0 → 1.11.1

package/dist/providers/client/Provider.mjs

@@ -3,7 +3,12 @@ import { slicedToArray as _slicedToArray, asyncToGenerator as _asyncToGenerator,
 import { jsx } from 'react/jsx-runtime';
 import { sha256 } from '@noble/hashes/sha2';
 import { bytesToHex } from '@noble/hashes/utils';
-import { parseOAuthResponse, completeOAuthPopup, openOAuthPopup, capitalizeProviderName, storePKCEVerifier, buildOAuthUrl, generateChallengePair, redirectToOAuthProvider, exchangeFacebookCodeForToken, storeOAuthAddProviderMetadata, cleanupOAuthUrlPreserveSearch, getOAuthAddProviderMetadata, hasPKCEVerifier, OAUTH_INTENT_ADD_PROVIDER, getProviderIcon, clearOAuthAddProviderMetadata, completeOAuthFlow, cleanupOAuthUrl, handlePKCEFlow } from '../../utils/oauth.mjs';
+import { storePKCEVerifier, storeOAuthAddProviderMetadata, clearAllOAuthData, getOAuthAddProviderMetadata, hasPKCEVerifier, OAUTH_INTENT_ADD_PROVIDER } from '../../utils/oauth/storage.mjs';
+import '../../utils/oauth/config.mjs';
+import { parseOAuthResponse, openOAuthPopup, buildOAuthUrl, redirectToOAuthProvider, cleanupOAuthUrlPreserveSearch, cleanupOAuthUrl } from '../../utils/oauth/url.mjs';
+import { completeOAuthPopup, completeOAuthFlow, completePKCEFlow } from '../../utils/oauth/completion.mjs';
+import { generateChallengePair, exchangeFacebookCodeForToken } from '../../utils/oauth/pkce.mjs';
+import { capitalizeProviderName, getProviderIcon } from '../../utils/oauth/helpers.mjs';
 import { useWalletProviderState, useDebouncedCallback, isValidSession, withTurnkeyErrorHandling, SESSION_WARNING_THRESHOLD_MS, mergeWalletsWithoutDuplicates } from '../../utils/utils.mjs';
 import { setCappedTimeoutInMap, clearKey, setTimeoutInMap, clearKeys, clearAll } from '../../utils/timers.mjs';
 import { DEFAULT_SESSION_EXPIRATION_IN_SECONDS, OtpType, TurnkeyClient, Chain, WalletInterfaceType, getAuthProxyConfig, WalletSource } from '@turnkey/core';
@@ -117,8 +122,9 @@ var ClientProvider = function ClientProvider(_ref) {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
       var withModalWrapper, result, code, provider, publicKey, oauthIntent, sessionKey, nonce, openModal, isAddProvider, metadata, completePKCERedirect, _masterConfig$auth, _masterConfig$auth$oa, _masterConfig$auth2, _masterConfig$auth2$o, clientId, redirectURI, hasVerifier, _masterConfig$auth3, _masterConfig$auth3$o, _masterConfig$auth4, _masterConfig$auth4$o, _clientId, _redirectURI, _hasVerifier, _masterConfig$auth5, _masterConfig$auth5$o, _masterConfig$auth6, _masterConfig$auth6$o, _clientId2, _redirectURI2, _hasVerifier2, _result, idToken, _provider, _publicKey, _openModal, _sessionKey, _oauthIntent, _isAddProvider, _metadata, resolvedProvider, action;
       return _regenerator().w(function (_context1) {
-        while (1) switch (_context1.n) {
+        while (1) switch (_context1.p = _context1.n) {
           case 0:
+            _context1.p = 0;
             if (!(!window.location.hash && !window.location.search)) {
               _context1.n = 1;
               break;
@@ -133,9 +139,9 @@ var ClientProvider = function ClientProvider(_ref) {
              */
             withModalWrapper = /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(params) {
-                var provider, isAddProvider, metadata, openModal, _action, providerDisplayName, icon, _t2;
+                var provider, isAddProvider, metadata, openModal, _action, providerDisplayName, icon;
                 return _regenerator().w(function (_context2) {
-                  while (1) switch (_context2.p = _context2.n) {
+                  while (1) switch (_context2.n) {
                     case 0:
                       provider = params.provider, isAddProvider = params.isAddProvider, metadata = params.metadata, openModal = params.openModal, _action = params.action;
                       providerDisplayName = capitalizeProviderName(provider);
@@ -182,9 +188,6 @@ var ClientProvider = function ClientProvider(_ref) {
                                     case 2:
                                       _context.p = 2;
                                       _t = _context.v;
-                                      if (isAddProvider) {
-                                        clearOAuthAddProviderMetadata();
-                                      }
                                       reject(_t);
                                       popPage();
                                     case 3:
@@ -204,34 +207,20 @@ var ClientProvider = function ClientProvider(_ref) {
                           }),
                           showTitle: false,
                           onClose: function onClose() {
-                            if (isAddProvider) {
-                              clearOAuthAddProviderMetadata();
-                            }
                             reject(new TurnkeyError(isAddProvider ? "User canceled the ".concat(providerDisplayName, " add provider process.") : "User canceled the ".concat(providerDisplayName, " authentication process."), TurnkeyErrorCodes.USER_CANCELED));
                           }
                         });
                       });
                     case 1:
-                      _context2.n = 5;
+                      _context2.n = 3;
                       break;
                     case 2:
-                      _context2.p = 2;
                       _context2.n = 3;
                       return _action();
                     case 3:
-                      _context2.n = 5;
-                      break;
-                    case 4:
-                      _context2.p = 4;
-                      _t2 = _context2.v;
-                      if (isAddProvider) {
-                        clearOAuthAddProviderMetadata();
-                      }
-                      throw _t2;
-                    case 5:
                       return _context2.a(2);
                   }
-                }, _callee2, null, [[2, 4]]);
+                }, _callee2);
               }));
               return function withModalWrapper(_x) {
                 return _ref3.apply(this, arguments);
@@ -260,7 +249,7 @@ var ClientProvider = function ClientProvider(_ref) {
             metadata = isAddProvider ? getOAuthAddProviderMetadata() : null;
             /**
              * Helper to complete PKCE redirect flow with optional modal wrapper.
-             * Uses handlePKCEFlow from oauth utils for the core logic.
+             * Uses completePKCEFlow from oauth utils for the core logic.
              * We put this in a separate function to avoid duplicating for each provider.
              */
             completePKCERedirect = /*#__PURE__*/function () {
@@ -271,13 +260,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     case 0:
                       action = /*#__PURE__*/function () {
                         var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
-                          var providerDisplayName, _t3;
+                          var providerDisplayName, _t2;
                           return _regenerator().w(function (_context4) {
                             while (1) switch (_context4.p = _context4.n) {
                               case 0:
                                 _context4.p = 0;
                                 _context4.n = 1;
-                                return handlePKCEFlow({
+                                return completePKCEFlow({
                                   publicKey: publicKey,
                                   providerName: providerName,
                                   sessionKey: sessionKey !== null && sessionKey !== void 0 ? sessionKey : undefined,
@@ -300,8 +289,6 @@ var ClientProvider = function ClientProvider(_ref) {
                                               stampWith: metadata.stampWith
                                             }));
                                           case 1:
-                                            clearOAuthAddProviderMetadata();
-                                          case 2:
                                             return _context3.a(2);
                                         }
                                       }, _callee3);
@@ -317,12 +304,12 @@ var ClientProvider = function ClientProvider(_ref) {
                                 break;
                               case 2:
                                 _context4.p = 2;
-                                _t3 = _context4.v;
+                                _t2 = _context4.v;
                                 if (callbacks !== null && callbacks !== void 0 && callbacks.onError) {
                                   providerDisplayName = capitalizeProviderName(providerName);
-                                  callbacks.onError(_t3 instanceof TurnkeyError ? _t3 : new TurnkeyError("".concat(providerDisplayName, " authentication failed"), TurnkeyErrorCodes.OAUTH_SIGNUP_ERROR, _t3));
+                                  callbacks.onError(_t2 instanceof TurnkeyError ? _t2 : new TurnkeyError("".concat(providerDisplayName, " authentication failed"), TurnkeyErrorCodes.OAUTH_SIGNUP_ERROR, _t2));
                                 }
-                                throw _t3;
+                                throw _t2;
                               case 3:
                                 return _context4.a(2);
                             }
@@ -530,8 +517,6 @@ var ClientProvider = function ClientProvider(_ref) {
                                     stampWith: _metadata.stampWith
                                   }));
                                 case 1:
-                                  clearOAuthAddProviderMetadata();
-                                case 2:
                                   return _context9.a(2);
                               }
                             }, _callee9);
@@ -562,9 +547,13 @@ var ClientProvider = function ClientProvider(_ref) {
             // Clean up the URL after processing
             cleanupOAuthUrlPreserveSearch();
           case 12:
+            _context1.p = 12;
+            clearAllOAuthData();
+            return _context1.f(12);
+          case 13:
             return _context1.a(2);
         }
-      }, _callee1);
+      }, _callee1, null, [[0,, 12, 13]]);
     }));
     return function completeRedirectOauth() {
       return _ref2.apply(this, arguments);
@@ -662,7 +651,7 @@ var ClientProvider = function ClientProvider(_ref) {
    */
   var initializeClient = /*#__PURE__*/function () {
     var _ref13 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
-      var _masterConfig$passkey, _masterConfig$passkey2, _masterConfig$passkey3, _masterConfig$passkey4, _masterConfig$walletC, _masterConfig$walletC2, _masterConfig$walletC3, turnkeyClient, _callbacks$onError, _callbacks$onError2, _t4;
+      var _masterConfig$passkey, _masterConfig$passkey2, _masterConfig$passkey3, _masterConfig$passkey4, _masterConfig$walletC, _masterConfig$walletC2, _masterConfig$walletC3, turnkeyClient, _callbacks$onError, _callbacks$onError2, _t3;
       return _regenerator().w(function (_context10) {
         while (1) switch (_context10.p = _context10.n) {
           case 0:
@@ -704,12 +693,12 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 3:
             _context10.p = 3;
-            _t4 = _context10.v;
+            _t3 = _context10.v;
             setClientState(ClientState.Error);
-            if (_t4 instanceof TurnkeyError || _t4 instanceof TurnkeyNetworkError) {
-              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError = callbacks.onError) === null || _callbacks$onError === void 0 ? void 0 : _callbacks$onError.call(callbacks, _t4);
+            if (_t3 instanceof TurnkeyError || _t3 instanceof TurnkeyNetworkError) {
+              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError = callbacks.onError) === null || _callbacks$onError === void 0 ? void 0 : _callbacks$onError.call(callbacks, _t3);
             } 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, _t4));
+              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, _t3));
             }
           case 4:
             return _context10.a(2);
@@ -726,7 +715,7 @@ var ClientProvider = function ClientProvider(_ref) {
    */
   var initializeSessions = /*#__PURE__*/function () {
     var _ref14 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
-      var allLocalStorageSessions, activeSessionKey, _yield$Promise$all, _yield$Promise$all2, _wallets, _callbacks$onError3, _callbacks$onError4, _t7;
+      var allLocalStorageSessions, activeSessionKey, _yield$Promise$all, _yield$Promise$all2, _wallets, _callbacks$onError3, _callbacks$onError4, _t6;
       return _regenerator().w(function (_context12) {
         while (1) switch (_context12.p = _context12.n) {
           case 0:
@@ -746,7 +735,7 @@ var ClientProvider = function ClientProvider(_ref) {
             _context12.n = 4;
             return Promise.all(Object.keys(allLocalStorageSessions).map(/*#__PURE__*/function () {
               var _ref15 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(sessionKey) {
-                var session, _t5, _t6;
+                var session, _t4, _t5;
                 return _regenerator().w(function (_context11) {
                   while (1) switch (_context11.n) {
                     case 0:
@@ -760,12 +749,12 @@ var ClientProvider = function ClientProvider(_ref) {
                         sessionKey: sessionKey
                       });
                     case 1:
-                      _t5 = sessionKey;
+                      _t4 = sessionKey;
                       _context11.n = 2;
                       return getActiveSessionKey();
                     case 2:
-                      _t6 = _context11.v;
-                      if (!(_t5 === _t6)) {
+                      _t5 = _context11.v;
+                      if (!(_t4 === _t5)) {
                         _context11.n = 3;
                         break;
                       }
@@ -829,11 +818,11 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 9:
             _context12.p = 9;
-            _t7 = _context12.v;
-            if (_t7 instanceof TurnkeyError || _t7 instanceof TurnkeyNetworkError) {
-              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError3 = callbacks.onError) === null || _callbacks$onError3 === void 0 ? void 0 : _callbacks$onError3.call(callbacks, _t7);
+            _t6 = _context12.v;
+            if (_t6 instanceof TurnkeyError || _t6 instanceof TurnkeyNetworkError) {
+              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError3 = callbacks.onError) === null || _callbacks$onError3 === void 0 ? void 0 : _callbacks$onError3.call(callbacks, _t6);
             } 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, _t7));
+              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, _t6));
             }
           case 10:
             return _context12.a(2);
@@ -888,7 +877,7 @@ var ClientProvider = function ClientProvider(_ref) {
               var walletEvents = provider === null || provider === void 0 ? void 0 : (_provider$features = provider.features) === null || _provider$features === void 0 ? void 0 : _provider$features["standard:events"];
               if (walletEvents !== null && walletEvents !== void 0 && walletEvents.on) {
                 var offChange = walletEvents.on("change", /*#__PURE__*/function () {
-                  var _ref159 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee137(_evt) {
+                  var _ref160 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee137(_evt) {
                     return _regenerator().w(function (_context137) {
                       while (1) switch (_context137.n) {
                         case 0:
@@ -900,7 +889,7 @@ var ClientProvider = function ClientProvider(_ref) {
                     }, _callee137);
                   }));
                   return function (_x114) {
-                    return _ref159.apply(this, arguments);
+                    return _ref160.apply(this, arguments);
                   };
                 }());
                 cleanups.push(offChange);
@@ -914,7 +903,7 @@ var ClientProvider = function ClientProvider(_ref) {
             attachEthereumListeners = function _attachEthereumListen(provider, onUpdateState) {
               if (typeof provider.on !== "function") return;
               var handleChainChanged = /*#__PURE__*/function () {
-                var _ref157 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee135(_chainId) {
+                var _ref158 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee135(_chainId) {
                   return _regenerator().w(function (_context135) {
                     while (1) switch (_context135.n) {
                       case 0:
@@ -923,11 +912,11 @@ var ClientProvider = function ClientProvider(_ref) {
                   }, _callee135);
                 }));
                 return function handleChainChanged(_x112) {
-                  return _ref157.apply(this, arguments);
+                  return _ref158.apply(this, arguments);
                 };
               }();
               var handleAccountsChanged = /*#__PURE__*/function () {
-                var _ref158 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee136(accounts) {
+                var _ref159 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee136(accounts) {
                   return _regenerator().w(function (_context136) {
                     while (1) switch (_context136.n) {
                       case 0:
@@ -938,7 +927,7 @@ var ClientProvider = function ClientProvider(_ref) {
                   }, _callee136);
                 }));
                 return function handleAccountsChanged(_x113) {
-                  return _ref158.apply(this, arguments);
+                  return _ref159.apply(this, arguments);
                 };
               }();
               var handleDisconnect = function handleDisconnect() {
@@ -995,7 +984,7 @@ var ClientProvider = function ClientProvider(_ref) {
               if (standardEvents !== null && standardEvents !== void 0 && standardEvents.on) {
                 if (standardEvents !== null && standardEvents !== void 0 && standardEvents.on) {
                   unsubscribe = standardEvents.on("change", /*#__PURE__*/function () {
-                    var _ref160 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee138(evt) {
+                    var _ref161 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee138(evt) {
                       var _callbacks$onError10, providers, currentSession, _wcProviders, wcWallets;
                       return _regenerator().w(function (_context138) {
                         while (1) switch (_context138.n) {
@@ -1057,7 +1046,7 @@ var ClientProvider = function ClientProvider(_ref) {
                       }, _callee138);
                     }));
                     return function (_x115) {
-                      return _ref160.apply(this, arguments);
+                      return _ref161.apply(this, arguments);
                     };
                   }());
                   cleanups.push(unsubscribe);
@@ -1105,7 +1094,7 @@ var ClientProvider = function ClientProvider(_ref) {
    */
   var handlePostAuth = /*#__PURE__*/function () {
     var _ref16 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(params) {
-      var method, action, identifier, appProofs, _masterConfig$auth7, _callbacks$onAuthenti, sessionKey, _session, _allSessions, _callbacks$onError7, _callbacks$onError8, _t8;
+      var method, action, identifier, appProofs, _masterConfig$auth7, _callbacks$onAuthenti, sessionKey, _session, _allSessions, _callbacks$onError7, _callbacks$onError8, _t7;
       return _regenerator().w(function (_context13) {
         while (1) switch (_context13.p = _context13.n) {
           case 0:
@@ -1159,11 +1148,11 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 8:
             _context13.p = 8;
-            _t8 = _context13.v;
-            if (_t8 instanceof TurnkeyError || _t8 instanceof TurnkeyNetworkError) {
-              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError7 = callbacks.onError) === null || _callbacks$onError7 === void 0 ? void 0 : _callbacks$onError7.call(callbacks, _t8);
+            _t7 = _context13.v;
+            if (_t7 instanceof TurnkeyError || _t7 instanceof TurnkeyNetworkError) {
+              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError7 = callbacks.onError) === null || _callbacks$onError7 === void 0 ? void 0 : _callbacks$onError7.call(callbacks, _t7);
             } else {
-              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError8 = callbacks.onError) === null || _callbacks$onError8 === void 0 ? void 0 : _callbacks$onError8.call(callbacks, new TurnkeyError("Failed to handle post-authentication", TurnkeyErrorCodes.HANDLE_POST_AUTH_ERROR, _t8));
+              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError8 = callbacks.onError) === null || _callbacks$onError8 === void 0 ? void 0 : _callbacks$onError8.call(callbacks, new TurnkeyError("Failed to handle post-authentication", TurnkeyErrorCodes.HANDLE_POST_AUTH_ERROR, _t7));
             }
           case 9:
             return _context13.a(2);
@@ -1559,7 +1548,7 @@ var ClientProvider = function ClientProvider(_ref) {
   var clearSession = useCallback(/*#__PURE__*/function () {
     var _ref33 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee29(params) {
       var _params$sessionKey;
-      var sessionKey, newAllSessions, _t9;
+      var sessionKey, newAllSessions, _t8;
       return _regenerator().w(function (_context29) {
         while (1) switch (_context29.n) {
           case 0:
@@ -1583,16 +1572,16 @@ var ClientProvider = function ClientProvider(_ref) {
               _context29.n = 3;
               break;
             }
-            _t9 = _params$sessionKey;
+            _t8 = _params$sessionKey;
             _context29.n = 5;
             break;
           case 3:
             _context29.n = 4;
             return getActiveSessionKey();
           case 4:
-            _t9 = _context29.v;
+            _t8 = _context29.v;
           case 5:
-            sessionKey = _t9;
+            sessionKey = _t8;
             if (sessionKey) {
               _context29.n = 6;
               break;
@@ -1630,7 +1619,7 @@ var ClientProvider = function ClientProvider(_ref) {
    */
   var scheduleSessionExpiration = useCallback(/*#__PURE__*/function () {
     var _ref35 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee32(params) {
-      var sessionKey, expiry, warnKey, now, expiryMs, timeUntilExpiry, _runRefresh, expireSession, warnAt, _callbacks$onError0, _callbacks$onError1, _t10;
+      var sessionKey, expiry, warnKey, now, expiryMs, timeUntilExpiry, _runRefresh, expireSession, warnAt, _callbacks$onError0, _callbacks$onError1, _t1;
       return _regenerator().w(function (_context32) {
         while (1) switch (_context32.p = _context32.n) {
           case 0:
@@ -1697,7 +1686,7 @@ var ClientProvider = function ClientProvider(_ref) {
             expireSession = /*#__PURE__*/function () {
               var _ref37 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee31() {
                 var _callbacks$onSessionE;
-                var expiredSession, _t0, _t1;
+                var expiredSession, _t9, _t0;
                 return _regenerator().w(function (_context31) {
                   while (1) switch (_context31.n) {
                     case 0:
@@ -1719,9 +1708,9 @@ var ClientProvider = function ClientProvider(_ref) {
                       _context31.n = 3;
                       return getActiveSessionKey();
                     case 3:
-                      _t0 = _context31.v;
-                      _t1 = sessionKey;
-                      if (!(_t0 === _t1)) {
+                      _t9 = _context31.v;
+                      _t0 = sessionKey;
+                      if (!(_t9 === _t0)) {
                         _context31.n = 4;
                         break;
                       }
@@ -1774,11 +1763,11 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 4:
             _context32.p = 4;
-            _t10 = _context32.v;
-            if (_t10 instanceof TurnkeyError || _t10 instanceof TurnkeyNetworkError) {
-              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError0 = callbacks.onError) === null || _callbacks$onError0 === void 0 ? void 0 : _callbacks$onError0.call(callbacks, _t10);
+            _t1 = _context32.v;
+            if (_t1 instanceof TurnkeyError || _t1 instanceof TurnkeyNetworkError) {
+              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError0 = callbacks.onError) === null || _callbacks$onError0 === void 0 ? void 0 : _callbacks$onError0.call(callbacks, _t1);
             } else {
-              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError1 = callbacks.onError) === null || _callbacks$onError1 === void 0 ? void 0 : _callbacks$onError1.call(callbacks, new TurnkeyError("Failed to schedule session expiration for ".concat(sessionKey), TurnkeyErrorCodes.SCHEDULE_SESSION_EXPIRY_ERROR, _t10));
+              callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError1 = callbacks.onError) === null || _callbacks$onError1 === void 0 ? void 0 : _callbacks$onError1.call(callbacks, new TurnkeyError("Failed to schedule session expiration for ".concat(sessionKey), TurnkeyErrorCodes.SCHEDULE_SESSION_EXPIRY_ERROR, _t1));
             }
           case 5:
             return _context32.a(2);
@@ -4596,7 +4585,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [pushPage]);
   var handleImportWallet = useCallback(/*#__PURE__*/function () {
     var _ref118 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee104(params) {
-      var _ref119, defaultWalletAccounts, _ref119$successPageDu, successPageDuration, stampWith, walletName, clearClipboardOnPaste, organizationId, userId, _t11;
+      var _ref119, defaultWalletAccounts, _ref119$successPageDu, successPageDuration, stampWith, walletName, clearClipboardOnPaste, organizationId, userId, _t10;
       return _regenerator().w(function (_context104) {
         while (1) switch (_context104.p = _context104.n) {
           case 0:
@@ -4636,14 +4625,14 @@ var ClientProvider = function ClientProvider(_ref) {
             }));
           case 2:
             _context104.p = 2;
-            _t11 = _context104.v;
-            if (!(_t11 instanceof TurnkeyError)) {
+            _t10 = _context104.v;
+            if (!(_t10 instanceof TurnkeyError)) {
               _context104.n = 3;
               break;
             }
-            throw _t11;
+            throw _t10;
           case 3:
-            throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t11);
+            throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t10);
           case 4:
             return _context104.a(2);
         }
@@ -4655,7 +4644,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [pushPage, logout]);
   var handleImportPrivateKey = useCallback(/*#__PURE__*/function () {
     var _ref120 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee105(params) {
-      var _ref121, curve, addressFormats, _ref121$successPageDu, successPageDuration, stampWith, keyName, keyFormat, clearClipboardOnPaste, organizationId, _t12;
+      var _ref121, curve, addressFormats, _ref121$successPageDu, successPageDuration, stampWith, keyName, keyFormat, clearClipboardOnPaste, organizationId, _t11;
       return _regenerator().w(function (_context105) {
         while (1) switch (_context105.p = _context105.n) {
           case 0:
@@ -4694,14 +4683,14 @@ var ClientProvider = function ClientProvider(_ref) {
             }));
           case 2:
             _context105.p = 2;
-            _t12 = _context105.v;
-            if (!(_t12 instanceof TurnkeyError)) {
+            _t11 = _context105.v;
+            if (!(_t11 instanceof TurnkeyError)) {
               _context105.n = 3;
               break;
             }
-            throw _t12;
+            throw _t11;
           case 3:
-            throw new TurnkeyError("Failed to import private key.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t12);
+            throw new TurnkeyError("Failed to import private key.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t11);
           case 4:
             return _context105.a(2);
         }
@@ -4713,7 +4702,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [pushPage, logout]);
   var handleUpdateUserName = useCallback(/*#__PURE__*/function () {
     var _ref122 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee106(params) {
-      var _ref123, _ref123$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _params$userId, res, _t13;
+      var _ref123, _ref123$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _params$userId, res, _t12;
       return _regenerator().w(function (_context106) {
         while (1) switch (_context106.p = _context106.n) {
           case 0:
@@ -4807,14 +4796,14 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 9:
             _context106.p = 9;
-            _t13 = _context106.v;
-            if (!(_t13 instanceof TurnkeyError)) {
+            _t12 = _context106.v;
+            if (!(_t12 instanceof TurnkeyError)) {
               _context106.n = 10;
               break;
             }
-            throw _t13;
+            throw _t12;
           case 10:
-            throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _t13);
+            throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _t12);
           case 11:
             return _context106.a(2);
         }
@@ -4827,7 +4816,7 @@ var ClientProvider = function ClientProvider(_ref) {
   var handleUpdateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref124 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee108(params) {
       var _masterConfig$auth41, _masterConfig$auth41$;
-      var _ref125, _ref125$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t15;
+      var _ref125, _ref125$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t14;
       return _regenerator().w(function (_context108) {
         while (1) switch (_context108.p = _context108.n) {
           case 0:
@@ -4936,7 +4925,7 @@ var ClientProvider = function ClientProvider(_ref) {
                     alphanumeric: (_masterConfig$auth43 = masterConfig.auth) === null || _masterConfig$auth43 === void 0 ? void 0 : _masterConfig$auth43.otpAlphanumeric,
                     onContinue: function () {
                       var _onContinue = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee107(otpCode) {
-                        var _yield$verifyOtp, verificationToken, res, _t14;
+                        var _yield$verifyOtp, verificationToken, res, _t13;
                         return _regenerator().w(function (_context107) {
                           while (1) switch (_context107.p = _context107.n) {
                             case 0:
@@ -4968,8 +4957,8 @@ var ClientProvider = function ClientProvider(_ref) {
                               break;
                             case 3:
                               _context107.p = 3;
-                              _t14 = _context107.v;
-                              reject(_t14);
+                              _t13 = _context107.v;
+                              reject(_t13);
                             case 4:
                               return _context107.a(2);
                           }
@@ -4998,14 +4987,14 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 11:
             _context108.p = 11;
-            _t15 = _context108.v;
-            if (!(_t15 instanceof TurnkeyError)) {
+            _t14 = _context108.v;
+            if (!(_t14 instanceof TurnkeyError)) {
               _context108.n = 12;
               break;
             }
-            throw _t15;
+            throw _t14;
           case 12:
-            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t15);
+            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t14);
           case 13:
             return _context108.a(2);
         }
@@ -5017,7 +5006,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [client, masterConfig, getSession, pushPage, closeModal, logout, initOtp, verifyOtp, updateUserPhoneNumber, user, callbacks]);
   var handleUpdateUserEmail = useCallback(/*#__PURE__*/function () {
     var _ref126 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee110(params) {
-      var _ref127, _ref127$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t17;
+      var _ref127, _ref127$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t16;
       return _regenerator().w(function (_context110) {
         while (1) switch (_context110.p = _context110.n) {
           case 0:
@@ -5114,7 +5103,7 @@ var ClientProvider = function ClientProvider(_ref) {
                     alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth45 = masterConfig.auth) === null || _masterConfig$auth45 === void 0 ? void 0 : _masterConfig$auth45.otpAlphanumeric,
                     onContinue: function () {
                       var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee109(otpCode) {
-                        var _yield$verifyOtp2, verificationToken, res, _t16;
+                        var _yield$verifyOtp2, verificationToken, res, _t15;
                         return _regenerator().w(function (_context109) {
                           while (1) switch (_context109.p = _context109.n) {
                             case 0:
@@ -5146,8 +5135,8 @@ var ClientProvider = function ClientProvider(_ref) {
                               break;
                             case 3:
                               _context109.p = 3;
-                              _t16 = _context109.v;
-                              reject(_t16);
+                              _t15 = _context109.v;
+                              reject(_t15);
                             case 4:
                               return _context109.a(2);
                           }
@@ -5174,14 +5163,14 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 9:
             _context110.p = 9;
-            _t17 = _context110.v;
-            if (!(_t17 instanceof TurnkeyError)) {
+            _t16 = _context110.v;
+            if (!(_t16 instanceof TurnkeyError)) {
               _context110.n = 10;
               break;
             }
-            throw _t17;
+            throw _t16;
           case 10:
-            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t17);
+            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t16);
           case 11:
             return _context110.a(2);
         }
@@ -5193,7 +5182,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [client, getSession, pushPage, closeModal, logout, initOtp, masterConfig, verifyOtp, updateUserEmail, user, callbacks]);
   var handleAddEmail = useCallback(/*#__PURE__*/function () {
     var _ref128 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee112(params) {
-      var _ref129, _ref129$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t19;
+      var _ref129, _ref129$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t18;
       return _regenerator().w(function (_context112) {
         while (1) switch (_context112.p = _context112.n) {
           case 0:
@@ -5290,7 +5279,7 @@ var ClientProvider = function ClientProvider(_ref) {
                     alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth47 = masterConfig.auth) === null || _masterConfig$auth47 === void 0 ? void 0 : _masterConfig$auth47.otpAlphanumeric,
                     onContinue: function () {
                       var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee111(otpCode) {
-                        var _yield$verifyOtp3, verificationToken, res, _t18;
+                        var _yield$verifyOtp3, verificationToken, res, _t17;
                         return _regenerator().w(function (_context111) {
                           while (1) switch (_context111.p = _context111.n) {
                             case 0:
@@ -5321,8 +5310,8 @@ var ClientProvider = function ClientProvider(_ref) {
                               break;
                             case 3:
                               _context111.p = 3;
-                              _t18 = _context111.v;
-                              reject(_t18);
+                              _t17 = _context111.v;
+                              reject(_t17);
                             case 4:
                               return _context111.a(2);
                           }
@@ -5349,14 +5338,14 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 9:
             _context112.p = 9;
-            _t19 = _context112.v;
-            if (!(_t19 instanceof TurnkeyError)) {
+            _t18 = _context112.v;
+            if (!(_t18 instanceof TurnkeyError)) {
               _context112.n = 10;
               break;
             }
-            throw _t19;
+            throw _t18;
           case 10:
-            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t19);
+            throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t18);
           case 11:
             return _context112.a(2);
         }
@@ -5369,7 +5358,7 @@ var ClientProvider = function ClientProvider(_ref) {
   var handleAddPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref130 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee114(params) {
       var _masterConfig$auth48, _masterConfig$auth48$;
-      var _ref131, _ref131$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t21;
+      var _ref131, _ref131$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t20;
       return _regenerator().w(function (_context114) {
         while (1) switch (_context114.p = _context114.n) {
           case 0:
@@ -5478,7 +5467,7 @@ var ClientProvider = function ClientProvider(_ref) {
                     alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth50 = masterConfig.auth) === null || _masterConfig$auth50 === void 0 ? void 0 : _masterConfig$auth50.otpAlphanumeric,
                     onContinue: function () {
                       var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee113(otpCode) {
-                        var _yield$verifyOtp4, verificationToken, res, _t20;
+                        var _yield$verifyOtp4, verificationToken, res, _t19;
                         return _regenerator().w(function (_context113) {
                           while (1) switch (_context113.p = _context113.n) {
                             case 0:
@@ -5509,8 +5498,8 @@ var ClientProvider = function ClientProvider(_ref) {
                               break;
                             case 3:
                               _context113.p = 3;
-                              _t20 = _context113.v;
-                              reject(_t20);
+                              _t19 = _context113.v;
+                              reject(_t19);
                             case 4:
                               return _context113.a(2);
                           }
@@ -5539,14 +5528,14 @@ var ClientProvider = function ClientProvider(_ref) {
             break;
           case 11:
             _context114.p = 11;
-            _t21 = _context114.v;
-            if (!(_t21 instanceof TurnkeyError)) {
+            _t20 = _context114.v;
+            if (!(_t20 instanceof TurnkeyError)) {
               _context114.n = 12;
               break;
             }
-            throw _t21;
+            throw _t20;
           case 12:
-            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t21);
+            throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t20);
           case 13:
             return _context114.a(2);
         }
@@ -5619,7 +5608,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [client, getSession, pushPage, logout, callbacks]);
   var handleAddPasskey = useCallback(/*#__PURE__*/function () {
     var _ref133 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee116(params) {
-      var _ref134, name, displayName, _ref134$successPageDu, successPageDuration, stampWith, s, organizationId, userId, resPromise, _t22;
+      var _ref134, name, displayName, _ref134$successPageDu, successPageDuration, stampWith, s, organizationId, userId, resPromise, _t21;
       return _regenerator().w(function (_context116) {
         while (1) switch (_context116.p = _context116.n) {
           case 0:
@@ -5679,14 +5668,14 @@ var ClientProvider = function ClientProvider(_ref) {
             return _context116.a(2, _context116.v);
           case 6:
             _context116.p = 6;
-            _t22 = _context116.v;
-            if (!(_t22 instanceof TurnkeyError)) {
+            _t21 = _context116.v;
+            if (!(_t21 instanceof TurnkeyError)) {
               _context116.n = 7;
               break;
             }
-            throw _t22;
+            throw _t21;
           case 7:
-            throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _t22);
+            throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _t21);
           case 8:
             return _context116.a(2);
         }
@@ -5698,7 +5687,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [client, getSession, addPasskey, pushPage, closeModal]);
   var handleRemoveOauthProvider = useCallback(/*#__PURE__*/function () {
     var _ref135 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee117(params) {
-      var providerId, _params$successPageDu3, successPageDuration, subTitle, title, stampWith, s, organizationId, _t23;
+      var providerId, _params$successPageDu3, successPageDuration, subTitle, title, stampWith, s, organizationId, _t22;
       return _regenerator().w(function (_context117) {
         while (1) switch (_context117.p = _context117.n) {
           case 0:
@@ -5750,14 +5739,14 @@ var ClientProvider = function ClientProvider(_ref) {
             }));
           case 4:
             _context117.p = 4;
-            _t23 = _context117.v;
-            if (!(_t23 instanceof TurnkeyError)) {
+            _t22 = _context117.v;
+            if (!(_t22 instanceof TurnkeyError)) {
               _context117.n = 5;
               break;
             }
-            throw _t23;
+            throw _t22;
           case 5:
-            throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _t23);
+            throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _t22);
           case 6:
             return _context117.a(2);
         }
@@ -5801,7 +5790,7 @@ var ClientProvider = function ClientProvider(_ref) {
           case 4:
             return _context120.a(2, new Promise(/*#__PURE__*/function () {
               var _ref137 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee119(resolve, reject) {
-                var onOauthSuccess, additionalState, _t24, _t25;
+                var onOauthSuccess, additionalState, _t23, _t24;
                 return _regenerator().w(function (_context119) {
                   while (1) switch (_context119.p = _context119.n) {
                     case 0:
@@ -5857,8 +5846,8 @@ var ClientProvider = function ClientProvider(_ref) {
                       }, successPageDuration > 0 && {
                         openModal: "true"
                       }) : undefined;
-                      _t24 = providerName;
-                      _context119.n = _t24 === OAuthProviders.DISCORD ? 1 : _t24 === OAuthProviders.X ? 3 : _t24 === OAuthProviders.GOOGLE ? 5 : _t24 === OAuthProviders.APPLE ? 7 : _t24 === OAuthProviders.FACEBOOK ? 9 : 11;
+                      _t23 = providerName;
+                      _context119.n = _t23 === OAuthProviders.DISCORD ? 1 : _t23 === OAuthProviders.X ? 3 : _t23 === OAuthProviders.GOOGLE ? 5 : _t23 === OAuthProviders.APPLE ? 7 : _t23 === OAuthProviders.FACEBOOK ? 9 : 11;
                       break;
                     case 1:
                       _context119.n = 2;
@@ -5922,8 +5911,8 @@ var ClientProvider = function ClientProvider(_ref) {
                       break;
                     case 13:
                       _context119.p = 13;
-                      _t25 = _context119.v;
-                      reject(_t25);
+                      _t24 = _context119.v;
+                      reject(_t24);
                     case 14:
                       return _context119.a(2);
                   }
@@ -5986,7 +5975,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [client, masterConfig, fetchWalletProviders, pushPage]);
   var handleRemoveUserEmail = useCallback(/*#__PURE__*/function () {
     var _ref141 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee122(params) {
-      var _ref142, _ref142$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t26;
+      var _ref142, _ref142$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t25;
       return _regenerator().w(function (_context122) {
         while (1) switch (_context122.p = _context122.n) {
           case 0:
@@ -6031,14 +6020,14 @@ var ClientProvider = function ClientProvider(_ref) {
             }));
           case 3:
             _context122.p = 3;
-            _t26 = _context122.v;
-            if (!(_t26 instanceof TurnkeyError)) {
+            _t25 = _context122.v;
+            if (!(_t25 instanceof TurnkeyError)) {
               _context122.n = 4;
               break;
             }
-            throw _t26;
+            throw _t25;
           case 4:
-            throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _t26);
+            throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _t25);
           case 5:
             return _context122.a(2);
         }
@@ -6050,7 +6039,7 @@ var ClientProvider = function ClientProvider(_ref) {
   }(), [getSession, pushPage]);
   var handleRemoveUserPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref143 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee123(params) {
-      var _ref144, _ref144$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t27;
+      var _ref144, _ref144$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t26;
       return _regenerator().w(function (_context123) {
         while (1) switch (_context123.p = _context123.n) {
           case 0:
@@ -6095,14 +6084,14 @@ var ClientProvider = function ClientProvider(_ref) {
             }));
           case 3:
             _context123.p = 3;
-            _t27 = _context123.v;
-            if (!(_t27 instanceof TurnkeyError)) {
+            _t26 = _context123.v;
+            if (!(_t26 instanceof TurnkeyError)) {
               _context123.n = 4;
               break;
             }
-            throw _t27;
+            throw _t26;
           case 4:
-            throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _t27);
+            throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _t26);
           case 5:
             return _context123.a(2);
         }
@@ -6135,8 +6124,8 @@ var ClientProvider = function ClientProvider(_ref) {
             return _context126.a(2, new Promise(function (resolve, reject) {
               var action = /*#__PURE__*/function () {
                 var _ref146 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee125() {
-                  var _pollResult$eth$txHas, _pollResult$eth;
-                  var sendTransactionStatusId, pollResult, txHash, _t28;
+                  var _ref148, _txDetails$eth$txHash, _txDetails$eth, _txDetails$solana;
+                  var sendTransactionStatusId, pollResult, txDetails, txHash, _t27;
                   return _regenerator().w(function (_context125) {
                     while (1) switch (_context125.n) {
                       case 0:
@@ -6151,7 +6140,7 @@ var ClientProvider = function ClientProvider(_ref) {
                           stampWith: stampWith
                         });
                       case 1:
-                        _t28 = _context125.v;
+                        _t27 = _context125.v;
                         _context125.n = 4;
                         break;
                       case 2:
@@ -6190,9 +6179,9 @@ var ClientProvider = function ClientProvider(_ref) {
                           }, _callee124);
                         }))();
                       case 3:
-                        _t28 = _context125.v;
+                        _t27 = _context125.v;
                       case 4:
-                        sendTransactionStatusId = _t28;
+                        sendTransactionStatusId = _t27;
                         if (sendTransactionStatusId) {
                           _context125.n = 5;
                           break;
@@ -6206,7 +6195,8 @@ var ClientProvider = function ClientProvider(_ref) {
                         });
                       case 6:
                         pollResult = _context125.v;
-                        txHash = (_pollResult$eth$txHas = pollResult === null || pollResult === void 0 ? void 0 : (_pollResult$eth = pollResult.eth) === null || _pollResult$eth === void 0 ? void 0 : _pollResult$eth.txHash) !== null && _pollResult$eth$txHas !== void 0 ? _pollResult$eth$txHas : pollResult === null || pollResult === void 0 ? void 0 : pollResult.txHash;
+                        txDetails = pollResult;
+                        txHash = (_ref148 = (_txDetails$eth$txHash = (_txDetails$eth = txDetails.eth) === null || _txDetails$eth === void 0 ? void 0 : _txDetails$eth.txHash) !== null && _txDetails$eth$txHash !== void 0 ? _txDetails$eth$txHash : (_txDetails$solana = txDetails.solana) === null || _txDetails$solana === void 0 ? void 0 : _txDetails$solana.signature) !== null && _ref148 !== void 0 ? _ref148 : txDetails.txHash;
                         return _context125.a(2, txHash ? {
                           txHash: txHash
                         } : {});
@@ -6246,7 +6236,7 @@ var ClientProvider = function ClientProvider(_ref) {
     };
   }(), [ethSendTransaction, getSession, pollTransactionStatus, pushPage, solSendTransaction]);
   var handleSendErc20Transfer = useCallback(/*#__PURE__*/function () {
-    var _ref148 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee128(params) {
+    var _ref149 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee128(params) {
       var session, organizationId, transfer, icon, stampWith, _params$successPageDu6, successPageDuration, caip2;
       return _regenerator().w(function (_context128) {
         while (1) switch (_context128.n) {
@@ -6266,8 +6256,8 @@ var ClientProvider = function ClientProvider(_ref) {
             caip2 = transfer.caip2;
             return _context128.a(2, new Promise(function (resolve, reject) {
               var action = /*#__PURE__*/function () {
-                var _ref149 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee127() {
-                  var _pollResult$eth$txHas2, _pollResult$eth2;
+                var _ref150 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee127() {
+                  var _pollResult$eth$txHas, _pollResult$eth;
                   var sendTransactionStatusId, pollResult, txHash;
                   return _regenerator().w(function (_context127) {
                     while (1) switch (_context127.n) {
@@ -6293,7 +6283,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         });
                       case 3:
                         pollResult = _context127.v;
-                        txHash = (_pollResult$eth$txHas2 = pollResult === null || pollResult === void 0 ? void 0 : (_pollResult$eth2 = pollResult.eth) === null || _pollResult$eth2 === void 0 ? void 0 : _pollResult$eth2.txHash) !== null && _pollResult$eth$txHas2 !== void 0 ? _pollResult$eth$txHas2 : pollResult === null || pollResult === void 0 ? void 0 : pollResult.txHash;
+                        txHash = (_pollResult$eth$txHas = pollResult === null || pollResult === void 0 ? void 0 : (_pollResult$eth = pollResult.eth) === null || _pollResult$eth === void 0 ? void 0 : _pollResult$eth.txHash) !== null && _pollResult$eth$txHas !== void 0 ? _pollResult$eth$txHas : pollResult === null || pollResult === void 0 ? void 0 : pollResult.txHash;
                         return _context127.a(2, txHash ? {
                           txHash: txHash
                         } : {});
@@ -6301,7 +6291,7 @@ var ClientProvider = function ClientProvider(_ref) {
                   }, _callee127);
                 }));
                 return function action() {
-                  return _ref149.apply(this, arguments);
+                  return _ref150.apply(this, arguments);
                 };
               }();
               pushPage({
@@ -6329,13 +6319,13 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee128);
     }));
     return function (_x109) {
-      return _ref148.apply(this, arguments);
+      return _ref149.apply(this, arguments);
     };
   }(), [ethSendErc20Transfer, getSession, pollTransactionStatus, pushPage]);
   var handleOnRamp = useCallback(/*#__PURE__*/function () {
-    var _ref150 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee131(params) {
+    var _ref151 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee131(params) {
       var _walletAccount$addres;
-      var walletAccount, fiatCurrencyAmount, fiatCurrencyCode, paymentMethod, countrySubdivisionCode, urlForSignature, countryCode, _params$onrampProvide, onrampProvider, _params$sandboxMode, sandboxMode, _params$successPageDu7, successPageDuration, _params$openInNewTab, openInNewTab, s, organizationId, cryptoCurrencyCode, network, openNewTab, _t31;
+      var walletAccount, fiatCurrencyAmount, fiatCurrencyCode, paymentMethod, countrySubdivisionCode, urlForSignature, countryCode, _params$onrampProvide, onrampProvider, _params$sandboxMode, sandboxMode, _params$successPageDu7, successPageDuration, _params$openInNewTab, openInNewTab, s, organizationId, cryptoCurrencyCode, network, openNewTab, _t30;
       return _regenerator().w(function (_context131) {
         while (1) switch (_context131.n) {
           case 0:
@@ -6351,8 +6341,8 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _t31 = true;
-            _context131.n = _t31 === (walletAccount.addressFormat === "ADDRESS_FORMAT_ETHEREUM") ? 3 : _t31 === ((_walletAccount$addres = walletAccount.addressFormat) === null || _walletAccount$addres === void 0 ? void 0 : _walletAccount$addres.includes("ADDRESS_FORMAT_BITCOIN")) ? 4 : _t31 === (walletAccount.addressFormat === "ADDRESS_FORMAT_SOLANA") ? 5 : 6;
+            _t30 = true;
+            _context131.n = _t30 === (walletAccount.addressFormat === "ADDRESS_FORMAT_ETHEREUM") ? 3 : _t30 === ((_walletAccount$addres = walletAccount.addressFormat) === null || _walletAccount$addres === void 0 ? void 0 : _walletAccount$addres.includes("ADDRESS_FORMAT_BITCOIN")) ? 4 : _t30 === (walletAccount.addressFormat === "ADDRESS_FORMAT_SOLANA") ? 5 : 6;
             break;
           case 3:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.ETHEREUM;
@@ -6393,8 +6383,8 @@ var ClientProvider = function ClientProvider(_ref) {
                   };
                 }, []);
                 var action = /*#__PURE__*/function () {
-                  var _ref151 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee130() {
-                    var _client$httpClient, onRampWindow, result, popupWidth, popupHeight, left, top, onRampTransactionId, _t30;
+                  var _ref152 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee130() {
+                    var _client$httpClient, onRampWindow, result, popupWidth, popupHeight, left, top, onRampTransactionId, _t29;
                     return _regenerator().w(function (_context130) {
                       while (1) switch (_context130.p = _context130.n) {
                         case 0:
@@ -6470,7 +6460,7 @@ var ClientProvider = function ClientProvider(_ref) {
                         case 6:
                           return _context130.a(2, new Promise(function (resolveAction, rejectAction) {
                             pollingRef.current = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee129() {
-                              var _onRampWindow, _client$httpClient2, currentUrl, _onRampWindow2, _onRampWindow3, resp, status, _onRampWindow4, _t29;
+                              var _onRampWindow, _client$httpClient2, currentUrl, _onRampWindow2, _onRampWindow3, resp, status, _onRampWindow4, _t28;
                               return _regenerator().w(function (_context129) {
                                 while (1) switch (_context129.p = _context129.n) {
                                   case 0:
@@ -6517,8 +6507,8 @@ var ClientProvider = function ClientProvider(_ref) {
                                     break;
                                   case 4:
                                     _context129.p = 4;
-                                    _t29 = _context129.v;
-                                    console.warn("Polling error (ignored):", _t29);
+                                    _t28 = _context129.v;
+                                    console.warn("Polling error (ignored):", _t28);
                                   case 5:
                                     return _context129.a(2);
                                 }
@@ -6527,16 +6517,16 @@ var ClientProvider = function ClientProvider(_ref) {
                           }));
                         case 7:
                           _context130.p = 7;
-                          _t30 = _context130.v;
+                          _t29 = _context130.v;
                           cleanup();
-                          throw _t30;
+                          throw _t29;
                         case 8:
                           return _context130.a(2);
                       }
                     }, _callee130, null, [[0, 7]]);
                   }));
                   return function action() {
-                    return _ref151.apply(this, arguments);
+                    return _ref152.apply(this, arguments);
                   };
                 }();
                 return jsx(OnRampPage, {
@@ -6572,16 +6562,16 @@ var ClientProvider = function ClientProvider(_ref) {
       }, _callee131);
     }));
     return function (_x110) {
-      return _ref150.apply(this, arguments);
+      return _ref151.apply(this, arguments);
     };
   }(), [getSession, client, pushPage]);
   var handleVerifyAppProofs = useCallback(/*#__PURE__*/function () {
-    var _ref153 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee132(params) {
-      var _ref154, appProofs, _ref154$successPageDu, successPageDuration, stampWith, s, organizationId, _t32;
+    var _ref154 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee132(params) {
+      var _ref155, appProofs, _ref155$successPageDu, successPageDuration, stampWith, s, organizationId, _t31;
       return _regenerator().w(function (_context132) {
         while (1) switch (_context132.p = _context132.n) {
           case 0:
-            _ref154 = params || {}, appProofs = _ref154.appProofs, _ref154$successPageDu = _ref154.successPageDuration, successPageDuration = _ref154$successPageDu === void 0 ? 3000 : _ref154$successPageDu, stampWith = _ref154.stampWith;
+            _ref155 = params || {}, appProofs = _ref155.appProofs, _ref155$successPageDu = _ref155.successPageDuration, successPageDuration = _ref155$successPageDu === void 0 ? 3000 : _ref155$successPageDu, stampWith = _ref155.stampWith;
             _context132.n = 1;
             return getSession();
           case 1:
@@ -6621,28 +6611,28 @@ var ClientProvider = function ClientProvider(_ref) {
             }));
           case 3:
             _context132.p = 3;
-            _t32 = _context132.v;
-            if (!(_t32 instanceof TurnkeyError)) {
+            _t31 = _context132.v;
+            if (!(_t31 instanceof TurnkeyError)) {
               _context132.n = 4;
               break;
             }
-            throw _t32;
+            throw _t31;
           case 4:
-            throw new TurnkeyError("Failed to verify app proofs.", TurnkeyErrorCodes.VERIFY_APP_PROOFS_ERROR, _t32);
+            throw new TurnkeyError("Failed to verify app proofs.", TurnkeyErrorCodes.VERIFY_APP_PROOFS_ERROR, _t31);
           case 5:
             return _context132.a(2);
         }
       }, _callee132, null, [[2, 3]]);
     }));
     return function (_x111) {
-      return _ref153.apply(this, arguments);
+      return _ref154.apply(this, arguments);
     };
   }(), [getSession, pushPage]);
   useEffect(function () {
     if (proxyAuthConfigRef.current) return;
     // Only fetch the proxy auth config once. Use that to build the master config.
     var fetchProxyAuthConfig = /*#__PURE__*/function () {
-      var _ref155 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee133() {
+      var _ref156 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee133() {
         var proxyAuthConfig;
         return _regenerator().w(function (_context133) {
           while (1) switch (_context133.p = _context133.n) {
@@ -6673,7 +6663,7 @@ var ClientProvider = function ClientProvider(_ref) {
         }, _callee133, null, [[0, 3]]);
       }));
       return function fetchProxyAuthConfig() {
-        return _ref155.apply(this, arguments);
+        return _ref156.apply(this, arguments);
       };
     }();
     fetchProxyAuthConfig();
@@ -6706,7 +6696,7 @@ var ClientProvider = function ClientProvider(_ref) {
   var debouncedFetchWalletProviders = useDebouncedCallback(fetchWalletProviders, 100);
   useEffect(function () {
     var handleUpdateState = /*#__PURE__*/function () {
-      var _ref156 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee134() {
+      var _ref157 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee134() {
         var currentSession;
         return _regenerator().w(function (_context134) {
           while (1) switch (_context134.n) {
@@ -6733,7 +6723,7 @@ var ClientProvider = function ClientProvider(_ref) {
         }, _callee134);
       }));
       return function handleUpdateState() {
-        return _ref156.apply(this, arguments);
+        return _ref157.apply(this, arguments);
       };
     }();
     var cleanup = function cleanup() {};