@turnkey/react-wallet-kit 1.8.1 → 1.10.0

package/dist/providers/client/Provider.mjs

@@ -876,11 +876,11 @@ var ClientProvider = function ClientProvider(_ref) {
    * @throws {TurnkeyError} If an error occurs while clearing the timers.
    */
   function _initializeWalletProviderListeners() {
-    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee134(walletProviders, onUpdateState) {
+    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee139(walletProviders, onUpdateState) {
       var _masterConfig$walletC0, _masterConfig$walletC1, _masterConfig$walletC10, _masterConfig$walletC11;
       var cleanups, nativeOnly, ethProviders, solProviders, wcProviders, wcProvider, attachEthereumListeners, attachSolanaListeners, _wcProvider$provider, _wcProvider$provider$, standardEvents, unsubscribe;
-      return _regenerator().w(function (_context134) {
-        while (1) switch (_context134.n) {
+      return _regenerator().w(function (_context139) {
+        while (1) switch (_context139.n) {
           case 0:
             attachSolanaListeners = function _attachSolanaListener(provider, onUpdateState) {
               var _provider$features;
@@ -888,19 +888,19 @@ var ClientProvider = function ClientProvider(_ref) {
               var walletEvents = provider === null || provider === void 0 ? void 0 : (_provider$features = provider.features) === null || _provider$features === void 0 ? void 0 : _provider$features["standard:events"];
               if (walletEvents !== null && walletEvents !== void 0 && walletEvents.on) {
                 var offChange = walletEvents.on("change", /*#__PURE__*/function () {
-                  var _ref154 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee132(_evt) {
-                    return _regenerator().w(function (_context132) {
-                      while (1) switch (_context132.n) {
+                  var _ref159 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee137(_evt) {
+                    return _regenerator().w(function (_context137) {
+                      while (1) switch (_context137.n) {
                         case 0:
-                          _context132.n = 1;
+                          _context137.n = 1;
                           return onUpdateState();
                         case 1:
-                          return _context132.a(2);
+                          return _context137.a(2);
                       }
-                    }, _callee132);
+                    }, _callee137);
                   }));
-                  return function (_x111) {
-                    return _ref154.apply(this, arguments);
+                  return function (_x114) {
+                    return _ref159.apply(this, arguments);
                   };
                 }());
                 cleanups.push(offChange);
@@ -914,31 +914,31 @@ var ClientProvider = function ClientProvider(_ref) {
             attachEthereumListeners = function _attachEthereumListen(provider, onUpdateState) {
               if (typeof provider.on !== "function") return;
               var handleChainChanged = /*#__PURE__*/function () {
-                var _ref152 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee130(_chainId) {
-                  return _regenerator().w(function (_context130) {
-                    while (1) switch (_context130.n) {
+                var _ref157 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee135(_chainId) {
+                  return _regenerator().w(function (_context135) {
+                    while (1) switch (_context135.n) {
                       case 0:
-                        return _context130.a(2, onUpdateState());
+                        return _context135.a(2, onUpdateState());
                     }
-                  }, _callee130);
+                  }, _callee135);
                 }));
-                return function handleChainChanged(_x109) {
-                  return _ref152.apply(this, arguments);
+                return function handleChainChanged(_x112) {
+                  return _ref157.apply(this, arguments);
                 };
               }();
               var handleAccountsChanged = /*#__PURE__*/function () {
-                var _ref153 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee131(accounts) {
-                  return _regenerator().w(function (_context131) {
-                    while (1) switch (_context131.n) {
+                var _ref158 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee136(accounts) {
+                  return _regenerator().w(function (_context136) {
+                    while (1) switch (_context136.n) {
                       case 0:
                         if (accounts.length === 0) onUpdateState();
                       case 1:
-                        return _context131.a(2);
+                        return _context136.a(2);
                     }
-                  }, _callee131);
+                  }, _callee136);
                 }));
-                return function handleAccountsChanged(_x110) {
-                  return _ref153.apply(this, arguments);
+                return function handleAccountsChanged(_x113) {
+                  return _ref158.apply(this, arguments);
                 };
               }();
               var handleDisconnect = function handleDisconnect() {
@@ -954,10 +954,10 @@ var ClientProvider = function ClientProvider(_ref) {
               };
             };
             if (!(walletProviders.length === 0)) {
-              _context134.n = 1;
+              _context139.n = 1;
               break;
             }
-            return _context134.a(2, function () {});
+            return _context139.a(2, function () {});
           case 1:
             cleanups = []; // we only want to initialize these listeners for connected walletProviders
             nativeOnly = function nativeOnly(provider) {
@@ -995,82 +995,82 @@ var ClientProvider = function ClientProvider(_ref) {
               if (standardEvents !== null && standardEvents !== void 0 && standardEvents.on) {
                 if (standardEvents !== null && standardEvents !== void 0 && standardEvents.on) {
                   unsubscribe = standardEvents.on("change", /*#__PURE__*/function () {
-                    var _ref155 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee133(evt) {
+                    var _ref160 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee138(evt) {
                       var _callbacks$onError10, providers, currentSession, _wcProviders, wcWallets;
-                      return _regenerator().w(function (_context133) {
-                        while (1) switch (_context133.n) {
+                      return _regenerator().w(function (_context138) {
+                        while (1) switch (_context138.n) {
                           case 0:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "pairingExpired")) {
-                              _context133.n = 1;
+                              _context138.n = 1;
                               break;
                             }
                             debouncedFetchWalletProviders();
-                            return _context133.a(2);
+                            return _context138.a(2);
                           case 1:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "failed")) {
-                              _context133.n = 2;
+                              _context138.n = 2;
                               break;
                             }
                             debouncedFetchWalletProviders();
                             callbacks === null || callbacks === void 0 ? void 0 : (_callbacks$onError10 = callbacks.onError) === null || _callbacks$onError10 === void 0 ? void 0 : _callbacks$onError10.call(callbacks, new TurnkeyError("WalletConnect initialization failed: ".concat(evt.error || "Unknown error"), TurnkeyErrorCodes.WALLET_CONNECT_INITIALIZATION_ERROR, evt.error));
-                            return _context133.a(2);
+                            return _context138.a(2);
                           case 2:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "initialized")) {
-                              _context133.n = 7;
+                              _context138.n = 7;
                               break;
                             }
-                            _context133.n = 3;
+                            _context138.n = 3;
                             return debouncedFetchWalletProviders();
                           case 3:
-                            providers = _context133.v;
-                            _context133.n = 4;
+                            providers = _context138.v;
+                            _context138.n = 4;
                             return getSession();
                           case 4:
-                            currentSession = _context133.v;
+                            currentSession = _context138.v;
                             if (!currentSession) {
-                              _context133.n = 6;
+                              _context138.n = 6;
                               break;
                             }
                             _wcProviders = providers === null || providers === void 0 ? void 0 : providers.filter(function (p) {
                               return p.interfaceType === WalletInterfaceType.WalletConnect;
                             });
-                            _context133.n = 5;
+                            _context138.n = 5;
                             return fetchWallets({
                               walletProviders: _wcProviders,
                               connectedOnly: true
                             });
                           case 5:
-                            wcWallets = _context133.v;
+                            wcWallets = _context138.v;
                             if (wcWallets.length > 0) {
                               setWallets(function (prev) {
                                 return mergeWalletsWithoutDuplicates(prev, wcWallets);
                               });
                             }
                           case 6:
-                            return _context133.a(2);
+                            return _context138.a(2);
                           case 7:
-                            _context133.n = 8;
+                            _context138.n = 8;
                             return onUpdateState();
                           case 8:
-                            return _context133.a(2);
+                            return _context138.a(2);
                         }
-                      }, _callee133);
+                      }, _callee138);
                     }));
-                    return function (_x112) {
-                      return _ref155.apply(this, arguments);
+                    return function (_x115) {
+                      return _ref160.apply(this, arguments);
                     };
                   }());
                   cleanups.push(unsubscribe);
                 }
               }
             }
-            return _context134.a(2, function () {
+            return _context139.a(2, function () {
               cleanups.forEach(function (remove) {
                 return remove();
               });
             });
         }
-      }, _callee134);
+      }, _callee139);
     }));
     return _initializeWalletProviderListeners.apply(this, arguments);
   }
@@ -2776,7 +2776,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref71.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
-  var signAndSendTransaction = useCallback(/*#__PURE__*/function () {
+  var ethSendErc20Transfer = useCallback(/*#__PURE__*/function () {
     var _ref72 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee60(params) {
       return _regenerator().w(function (_context60) {
         while (1) switch (_context60.n) {
@@ -2788,10 +2788,10 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context60.a(2, withTurnkeyErrorHandling(function () {
-              return client.signAndSendTransaction(params);
+              return client.ethSendErc20Transfer(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to sign and send transaction"));
+            }, callbacks, "Failed to send ERC20 transfer"));
         }
       }, _callee60);
     }));
@@ -2799,7 +2799,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref72.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
-  var pollTransactionStatus = useCallback(/*#__PURE__*/function () {
+  var solSendTransaction = useCallback(/*#__PURE__*/function () {
     var _ref73 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee61(params) {
       return _regenerator().w(function (_context61) {
         while (1) switch (_context61.n) {
@@ -2811,18 +2811,18 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context61.a(2, withTurnkeyErrorHandling(function () {
-              return client.pollTransactionStatus(params);
+              return client.solSendTransaction(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to poll transaction status"));
+            }, callbacks, "Failed to send sol transaction"));
         }
       }, _callee61);
     }));
     return function (_x48) {
       return _ref73.apply(this, arguments);
     };
-  }(), [client, callbacks]);
-  var fetchOrCreateP256ApiKeyUser = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, logout]);
+  var signAndSendTransaction = useCallback(/*#__PURE__*/function () {
     var _ref74 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee62(params) {
       return _regenerator().w(function (_context62) {
         while (1) switch (_context62.n) {
@@ -2834,10 +2834,10 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context62.a(2, withTurnkeyErrorHandling(function () {
-              return client.fetchOrCreateP256ApiKeyUser(params);
+              return client.signAndSendTransaction(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to fetch or create delegated access user"));
+            }, callbacks, "Failed to sign and send transaction"));
         }
       }, _callee62);
     }));
@@ -2845,7 +2845,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref74.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
-  var fetchOrCreatePolicies = useCallback(/*#__PURE__*/function () {
+  var pollTransactionStatus = useCallback(/*#__PURE__*/function () {
     var _ref75 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee63(params) {
       return _regenerator().w(function (_context63) {
         while (1) switch (_context63.n) {
@@ -2857,20 +2857,19 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             return _context63.a(2, withTurnkeyErrorHandling(function () {
-              return client.fetchOrCreatePolicies(params);
+              return client.pollTransactionStatus(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to fetch or create delegated access user"));
+            }, callbacks, "Failed to poll transaction status"));
         }
       }, _callee63);
     }));
     return function (_x50) {
       return _ref75.apply(this, arguments);
     };
-  }(), [client, callbacks, logout]);
-  var updateUserEmail = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks]);
+  var fetchOrCreateP256ApiKeyUser = useCallback(/*#__PURE__*/function () {
     var _ref76 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee64(params) {
-      var res;
       return _regenerator().w(function (_context64) {
         while (1) switch (_context64.n) {
           case 0:
@@ -2880,38 +2879,20 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context64.n = 2;
-            return withTurnkeyErrorHandling(function () {
-              return client.updateUserEmail(params);
+            return _context64.a(2, withTurnkeyErrorHandling(function () {
+              return client.fetchOrCreateP256ApiKeyUser(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to update user email");
-          case 2:
-            res = _context64.v;
-            if (!res) {
-              _context64.n = 3;
-              break;
-            }
-            _context64.n = 3;
-            return maybeRefreshUser(_objectSpread2(_objectSpread2({
-              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
-            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
-              organizationId: params.organizationId
-            }), (params === null || params === void 0 ? void 0 : params.userId) && {
-              userId: params.userId
-            }));
-          case 3:
-            return _context64.a(2, res);
+            }, callbacks, "Failed to fetch or create delegated access user"));
         }
       }, _callee64);
     }));
     return function (_x51) {
       return _ref76.apply(this, arguments);
     };
-  }(), [client, callbacks, logout, maybeRefreshUser]);
-  var removeUserEmail = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, logout]);
+  var fetchOrCreatePolicies = useCallback(/*#__PURE__*/function () {
     var _ref77 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee65(params) {
-      var res;
       return _regenerator().w(function (_context65) {
         while (1) switch (_context65.n) {
           case 0:
@@ -2921,36 +2902,19 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context65.n = 2;
-            return withTurnkeyErrorHandling(function () {
-              return client.removeUserEmail(params);
+            return _context65.a(2, withTurnkeyErrorHandling(function () {
+              return client.fetchOrCreatePolicies(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to remove user email");
-          case 2:
-            res = _context65.v;
-            if (!res) {
-              _context65.n = 3;
-              break;
-            }
-            _context65.n = 3;
-            return maybeRefreshUser(_objectSpread2(_objectSpread2({
-              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
-            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
-              organizationId: params.organizationId
-            }), (params === null || params === void 0 ? void 0 : params.userId) && {
-              userId: params.userId
-            }));
-          case 3:
-            return _context65.a(2, res);
+            }, callbacks, "Failed to fetch or create delegated access user"));
         }
       }, _callee65);
     }));
     return function (_x52) {
       return _ref77.apply(this, arguments);
     };
-  }(), [client, callbacks, logout, maybeRefreshUser]);
-  var updateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, logout]);
+  var updateUserEmail = useCallback(/*#__PURE__*/function () {
     var _ref78 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee66(params) {
       var res;
       return _regenerator().w(function (_context66) {
@@ -2964,10 +2928,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context66.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.updateUserPhoneNumber(params);
+              return client.updateUserEmail(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to update user phone number");
+            }, callbacks, "Failed to update user email");
           case 2:
             res = _context66.v;
             if (!res) {
@@ -2991,7 +2955,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref78.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
-  var removeUserPhoneNumber = useCallback(/*#__PURE__*/function () {
+  var removeUserEmail = useCallback(/*#__PURE__*/function () {
     var _ref79 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee67(params) {
       var res;
       return _regenerator().w(function (_context67) {
@@ -3005,10 +2969,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context67.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.removeUserPhoneNumber(params);
+              return client.removeUserEmail(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to remove user phone number");
+            }, callbacks, "Failed to remove user email");
           case 2:
             res = _context67.v;
             if (!res) {
@@ -3032,7 +2996,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref79.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
-  var updateUserName = useCallback(/*#__PURE__*/function () {
+  var updateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref80 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee68(params) {
       var res;
       return _regenerator().w(function (_context68) {
@@ -3046,10 +3010,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context68.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.updateUserName(params);
+              return client.updateUserPhoneNumber(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to update user name");
+            }, callbacks, "Failed to update user phone number");
           case 2:
             res = _context68.v;
             if (!res) {
@@ -3073,7 +3037,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref80.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
-  var addOauthProvider = useCallback(/*#__PURE__*/function () {
+  var removeUserPhoneNumber = useCallback(/*#__PURE__*/function () {
     var _ref81 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee69(params) {
       var res;
       return _regenerator().w(function (_context69) {
@@ -3087,10 +3051,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context69.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.addOauthProvider(params);
+              return client.removeUserPhoneNumber(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to add OAuth provider");
+            }, callbacks, "Failed to remove user phone number");
           case 2:
             res = _context69.v;
             if (!res) {
@@ -3114,7 +3078,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref81.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
-  var removeOauthProviders = useCallback(/*#__PURE__*/function () {
+  var updateUserName = useCallback(/*#__PURE__*/function () {
     var _ref82 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee70(params) {
       var res;
       return _regenerator().w(function (_context70) {
@@ -3128,10 +3092,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context70.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.removeOauthProviders(params);
+              return client.updateUserName(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to remove OAuth providers");
+            }, callbacks, "Failed to update user name");
           case 2:
             res = _context70.v;
             if (!res) {
@@ -3155,7 +3119,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref82.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
-  var addPasskey = useCallback(/*#__PURE__*/function () {
+  var addOauthProvider = useCallback(/*#__PURE__*/function () {
     var _ref83 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee71(params) {
       var res;
       return _regenerator().w(function (_context71) {
@@ -3169,10 +3133,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context71.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.addPasskey(params);
+              return client.addOauthProvider(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to add passkey");
+            }, callbacks, "Failed to add OAuth provider");
           case 2:
             res = _context71.v;
             if (!res) {
@@ -3196,7 +3160,7 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref83.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
-  var removePasskeys = useCallback(/*#__PURE__*/function () {
+  var removeOauthProviders = useCallback(/*#__PURE__*/function () {
     var _ref84 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee72(params) {
       var res;
       return _regenerator().w(function (_context72) {
@@ -3210,10 +3174,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context72.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.removePasskeys(params);
+              return client.removeOauthProviders(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to remove passkeys");
+            }, callbacks, "Failed to remove OAuth providers");
           case 2:
             res = _context72.v;
             if (!res) {
@@ -3237,9 +3201,9 @@ var ClientProvider = function ClientProvider(_ref) {
       return _ref84.apply(this, arguments);
     };
   }(), [client, callbacks, logout, maybeRefreshUser]);
-  var createWallet = useCallback(/*#__PURE__*/function () {
+  var addPasskey = useCallback(/*#__PURE__*/function () {
     var _ref85 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee73(params) {
-      var res, s;
+      var res;
       return _regenerator().w(function (_context73) {
         while (1) switch (_context73.n) {
           case 0:
@@ -3251,27 +3215,25 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context73.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.createWallet(params);
+              return client.addPasskey(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to create wallet");
+            }, callbacks, "Failed to add passkey");
           case 2:
             res = _context73.v;
-            _context73.n = 3;
-            return getSession();
-          case 3:
-            s = _context73.v;
-            if (!(res && s)) {
-              _context73.n = 4;
+            if (!res) {
+              _context73.n = 3;
               break;
             }
-            _context73.n = 4;
-            return maybeRefreshWallets(_objectSpread2({
+            _context73.n = 3;
+            return maybeRefreshUser(_objectSpread2(_objectSpread2({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
               organizationId: params.organizationId
+            }), (params === null || params === void 0 ? void 0 : params.userId) && {
+              userId: params.userId
             }));
-          case 4:
+          case 3:
             return _context73.a(2, res);
         }
       }, _callee73);
@@ -3279,10 +3241,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x60) {
       return _ref85.apply(this, arguments);
     };
-  }(), [client, session, callbacks, logout, maybeRefreshWallets, getSession]);
-  var createWalletAccounts = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, logout, maybeRefreshUser]);
+  var removePasskeys = useCallback(/*#__PURE__*/function () {
     var _ref86 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee74(params) {
-      var res, s;
+      var res;
       return _regenerator().w(function (_context74) {
         while (1) switch (_context74.n) {
           case 0:
@@ -3294,27 +3256,25 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context74.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.createWalletAccounts(params);
+              return client.removePasskeys(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to create wallet accounts");
+            }, callbacks, "Failed to remove passkeys");
           case 2:
             res = _context74.v;
-            _context74.n = 3;
-            return getSession();
-          case 3:
-            s = _context74.v;
-            if (!(res && s)) {
-              _context74.n = 4;
+            if (!res) {
+              _context74.n = 3;
               break;
             }
-            _context74.n = 4;
-            return maybeRefreshWallets(_objectSpread2({
+            _context74.n = 3;
+            return maybeRefreshUser(_objectSpread2(_objectSpread2({
               stampWith: params === null || params === void 0 ? void 0 : params.stampWith
             }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
               organizationId: params.organizationId
+            }), (params === null || params === void 0 ? void 0 : params.userId) && {
+              userId: params.userId
             }));
-          case 4:
+          case 3:
             return _context74.a(2, res);
         }
       }, _callee74);
@@ -3322,8 +3282,8 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x61) {
       return _ref86.apply(this, arguments);
     };
-  }(), [client, session, callbacks, logout, getSession, maybeRefreshWallets]);
-  var exportWallet = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, logout, maybeRefreshUser]);
+  var createWallet = useCallback(/*#__PURE__*/function () {
     var _ref87 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee75(params) {
       var res, s;
       return _regenerator().w(function (_context75) {
@@ -3337,10 +3297,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context75.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.exportWallet(params);
+              return client.createWallet(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to export wallet");
+            }, callbacks, "Failed to create wallet");
           case 2:
             res = _context75.v;
             _context75.n = 3;
@@ -3365,10 +3325,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x62) {
       return _ref87.apply(this, arguments);
     };
-  }(), [client, session, callbacks, logout, getSession, maybeRefreshWallets]);
-  var exportPrivateKey = useCallback(/*#__PURE__*/function () {
+  }(), [client, session, callbacks, logout, maybeRefreshWallets, getSession]);
+  var createWalletAccounts = useCallback(/*#__PURE__*/function () {
     var _ref88 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee76(params) {
-      var res;
+      var res, s;
       return _regenerator().w(function (_context76) {
         while (1) switch (_context76.n) {
           case 0:
@@ -3380,12 +3340,27 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context76.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.exportPrivateKey(params);
+              return client.createWalletAccounts(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to export private key");
+            }, callbacks, "Failed to create wallet accounts");
           case 2:
             res = _context76.v;
+            _context76.n = 3;
+            return getSession();
+          case 3:
+            s = _context76.v;
+            if (!(res && s)) {
+              _context76.n = 4;
+              break;
+            }
+            _context76.n = 4;
+            return maybeRefreshWallets(_objectSpread2({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
+              organizationId: params.organizationId
+            }));
+          case 4:
             return _context76.a(2, res);
         }
       }, _callee76);
@@ -3393,8 +3368,8 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x63) {
       return _ref88.apply(this, arguments);
     };
-  }(), [client, callbacks, logout]);
-  var exportWalletAccount = useCallback(/*#__PURE__*/function () {
+  }(), [client, session, callbacks, logout, getSession, maybeRefreshWallets]);
+  var exportWallet = useCallback(/*#__PURE__*/function () {
     var _ref89 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee77(params) {
       var res, s;
       return _regenerator().w(function (_context77) {
@@ -3408,10 +3383,10 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context77.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.exportWalletAccount(params);
+              return client.exportWallet(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to export wallet accounts");
+            }, callbacks, "Failed to export wallet");
           case 2:
             res = _context77.v;
             _context77.n = 3;
@@ -3436,10 +3411,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x64) {
       return _ref89.apply(this, arguments);
     };
-  }(), [client, callbacks, logout, getSession, maybeRefreshWallets]);
-  var importWallet = useCallback(/*#__PURE__*/function () {
+  }(), [client, session, callbacks, logout, getSession, maybeRefreshWallets]);
+  var exportPrivateKey = useCallback(/*#__PURE__*/function () {
     var _ref90 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee78(params) {
-      var res, s;
+      var res;
       return _regenerator().w(function (_context78) {
         while (1) switch (_context78.n) {
           case 0:
@@ -3451,29 +3426,12 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context78.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.importWallet(params);
+              return client.exportPrivateKey(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to import wallet");
+            }, callbacks, "Failed to export private key");
           case 2:
             res = _context78.v;
-            _context78.n = 3;
-            return getSession();
-          case 3:
-            s = _context78.v;
-            if (!(res && s)) {
-              _context78.n = 4;
-              break;
-            }
-            _context78.n = 4;
-            return maybeRefreshWallets(_objectSpread2(_objectSpread2({
-              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
-            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
-              organizationId: params.organizationId
-            }), (params === null || params === void 0 ? void 0 : params.userId) && {
-              userId: params.userId
-            }));
-          case 4:
             return _context78.a(2, res);
         }
       }, _callee78);
@@ -3481,10 +3439,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x65) {
       return _ref90.apply(this, arguments);
     };
-  }(), [client, callbacks, logout, getSession, maybeRefreshWallets]);
-  var importPrivateKey = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, logout]);
+  var exportWalletAccount = useCallback(/*#__PURE__*/function () {
     var _ref91 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee79(params) {
-      var res;
+      var res, s;
       return _regenerator().w(function (_context79) {
         while (1) switch (_context79.n) {
           case 0:
@@ -3496,12 +3454,27 @@ var ClientProvider = function ClientProvider(_ref) {
           case 1:
             _context79.n = 2;
             return withTurnkeyErrorHandling(function () {
-              return client.importPrivateKey(params);
+              return client.exportWalletAccount(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to import private key");
+            }, callbacks, "Failed to export wallet accounts");
           case 2:
             res = _context79.v;
+            _context79.n = 3;
+            return getSession();
+          case 3:
+            s = _context79.v;
+            if (!(res && s)) {
+              _context79.n = 4;
+              break;
+            }
+            _context79.n = 4;
+            return maybeRefreshWallets(_objectSpread2({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
+              organizationId: params.organizationId
+            }));
+          case 4:
             return _context79.a(2, res);
         }
       }, _callee79);
@@ -3509,9 +3482,10 @@ var ClientProvider = function ClientProvider(_ref) {
     return function (_x66) {
       return _ref91.apply(this, arguments);
     };
-  }(), [client, callbacks, logout]);
-  var deleteSubOrganization = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, logout, getSession, maybeRefreshWallets]);
+  var importWallet = useCallback(/*#__PURE__*/function () {
     var _ref92 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee80(params) {
+      var res, s;
       return _regenerator().w(function (_context80) {
         while (1) switch (_context80.n) {
           case 0:
@@ -3521,21 +3495,42 @@ var ClientProvider = function ClientProvider(_ref) {
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context80.a(2, withTurnkeyErrorHandling(function () {
-              return client.deleteSubOrganization(params);
+            _context80.n = 2;
+            return withTurnkeyErrorHandling(function () {
+              return client.importWallet(params);
             }, function () {
               return logout();
-            }, callbacks, "Failed to delete sub-organization"));
+            }, callbacks, "Failed to import wallet");
+          case 2:
+            res = _context80.v;
+            _context80.n = 3;
+            return getSession();
+          case 3:
+            s = _context80.v;
+            if (!(res && s)) {
+              _context80.n = 4;
+              break;
+            }
+            _context80.n = 4;
+            return maybeRefreshWallets(_objectSpread2(_objectSpread2({
+              stampWith: params === null || params === void 0 ? void 0 : params.stampWith
+            }, (params === null || params === void 0 ? void 0 : params.organizationId) && {
+              organizationId: params.organizationId
+            }), (params === null || params === void 0 ? void 0 : params.userId) && {
+              userId: params.userId
+            }));
+          case 4:
+            return _context80.a(2, res);
         }
       }, _callee80);
     }));
     return function (_x67) {
       return _ref92.apply(this, arguments);
     };
-  }(), [client, callbacks, logout]);
-  var storeSession = useCallback(/*#__PURE__*/function () {
+  }(), [client, callbacks, logout, getSession, maybeRefreshWallets]);
+  var importPrivateKey = useCallback(/*#__PURE__*/function () {
     var _ref93 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee81(params) {
-      var sessionKey, session, allSessions;
+      var res;
       return _regenerator().w(function (_context81) {
         while (1) switch (_context81.n) {
           case 0:
@@ -3546,55 +3541,106 @@ var ClientProvider = function ClientProvider(_ref) {
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             _context81.n = 2;
+            return withTurnkeyErrorHandling(function () {
+              return client.importPrivateKey(params);
+            }, function () {
+              return logout();
+            }, callbacks, "Failed to import private key");
+          case 2:
+            res = _context81.v;
+            return _context81.a(2, res);
+        }
+      }, _callee81);
+    }));
+    return function (_x68) {
+      return _ref93.apply(this, arguments);
+    };
+  }(), [client, callbacks, logout]);
+  var deleteSubOrganization = useCallback(/*#__PURE__*/function () {
+    var _ref94 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee82(params) {
+      return _regenerator().w(function (_context82) {
+        while (1) switch (_context82.n) {
+          case 0:
+            if (client) {
+              _context82.n = 1;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 1:
+            return _context82.a(2, withTurnkeyErrorHandling(function () {
+              return client.deleteSubOrganization(params);
+            }, function () {
+              return logout();
+            }, callbacks, "Failed to delete sub-organization"));
+        }
+      }, _callee82);
+    }));
+    return function (_x69) {
+      return _ref94.apply(this, arguments);
+    };
+  }(), [client, callbacks, logout]);
+  var storeSession = useCallback(/*#__PURE__*/function () {
+    var _ref95 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee83(params) {
+      var sessionKey, session, allSessions;
+      return _regenerator().w(function (_context83) {
+        while (1) switch (_context83.n) {
+          case 0:
+            if (client) {
+              _context83.n = 1;
+              break;
+            }
+            throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 1:
+            _context83.n = 2;
             return withTurnkeyErrorHandling(function () {
               return client.storeSession(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to store session");
           case 2:
-            _context81.n = 3;
+            _context83.n = 3;
             return getActiveSessionKey();
           case 3:
-            sessionKey = _context81.v;
-            _context81.n = 4;
+            sessionKey = _context83.v;
+            _context83.n = 4;
             return getSession(_objectSpread2({}, sessionKey && {
               sessionKey: sessionKey
             }));
           case 4:
-            session = _context81.v;
+            session = _context83.v;
             if (!(session && sessionKey)) {
-              _context81.n = 5;
+              _context83.n = 5;
               break;
             }
-            _context81.n = 5;
+            _context83.n = 5;
             return scheduleSessionExpiration({
               sessionKey: sessionKey,
               expiry: session.expiry
             });
           case 5:
-            _context81.n = 6;
+            _context83.n = 6;
             return getAllSessions();
           case 6:
-            allSessions = _context81.v;
+            allSessions = _context83.v;
             setSession(session);
             setAllSessions(allSessions);
-            _context81.n = 7;
+            _context83.n = 7;
             return Promise.all([maybeRefreshWallets(), maybeRefreshUser()]);
           case 7:
-            return _context81.a(2);
+            return _context83.a(2);
         }
-      }, _callee81);
+      }, _callee83);
     }));
-    return function (_x68) {
-      return _ref93.apply(this, arguments);
+    return function (_x70) {
+      return _ref95.apply(this, arguments);
     };
   }(), [client, callbacks, logout, getActiveSessionKey, getSession, scheduleSessionExpiration, getAllSessions, maybeRefreshWallets, maybeRefreshUser]);
-  var clearAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee82() {
-    return _regenerator().w(function (_context82) {
-      while (1) switch (_context82.n) {
+  var clearAllSessions = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee84() {
+    return _regenerator().w(function (_context84) {
+      while (1) switch (_context84.n) {
         case 0:
           if (client) {
-            _context82.n = 1;
+            _context84.n = 1;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
@@ -3602,30 +3648,30 @@ var ClientProvider = function ClientProvider(_ref) {
           setSession(undefined);
           setAllSessions(undefined);
           clearSessionTimeouts();
-          _context82.n = 2;
+          _context84.n = 2;
           return withTurnkeyErrorHandling(function () {
             return client.clearAllSessions();
           }, function () {
             return logout();
           }, callbacks, "Failed to clear all sessions");
         case 2:
-          return _context82.a(2, _context82.v);
+          return _context84.a(2, _context84.v);
       }
-    }, _callee82);
+    }, _callee84);
   })), [client, callbacks, logout, clearSessionTimeouts]);
   var setActiveSession = useCallback(/*#__PURE__*/function () {
-    var _ref95 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee84(params) {
+    var _ref97 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee86(params) {
       var session, s;
-      return _regenerator().w(function (_context84) {
-        while (1) switch (_context84.n) {
+      return _regenerator().w(function (_context86) {
+        while (1) switch (_context86.n) {
           case 0:
             if (client) {
-              _context84.n = 1;
+              _context86.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context84.n = 2;
+            _context86.n = 2;
             return withTurnkeyErrorHandling(function () {
               return client.getSession({
                 sessionKey: params.sessionKey
@@ -3634,18 +3680,18 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to get session");
           case 2:
-            session = _context84.v;
-            _context84.n = 3;
+            session = _context86.v;
+            _context86.n = 3;
             return getSession();
           case 3:
-            s = _context84.v;
+            s = _context86.v;
             if (s) {
-              _context84.n = 4;
+              _context86.n = 4;
               break;
             }
             throw new TurnkeyError("Session not found.", TurnkeyErrorCodes.NOT_FOUND);
           case 4:
-            _context84.n = 5;
+            _context86.n = 5;
             return withTurnkeyErrorHandling(function () {
               return client.setActiveSession(params);
             }, function () {
@@ -3653,172 +3699,172 @@ var ClientProvider = function ClientProvider(_ref) {
             }, callbacks, "Failed to set active session");
           case 5:
             setSession(session);
-            _context84.n = 6;
-            return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee83() {
-              return _regenerator().w(function (_context83) {
-                while (1) switch (_context83.n) {
+            _context86.n = 6;
+            return withTurnkeyErrorHandling(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee85() {
+              return _regenerator().w(function (_context85) {
+                while (1) switch (_context85.n) {
                   case 0:
-                    _context83.n = 1;
+                    _context85.n = 1;
                     return Promise.all([maybeRefreshWallets(), maybeRefreshUser()]);
                   case 1:
-                    return _context83.a(2);
+                    return _context85.a(2);
                 }
-              }, _callee83);
+              }, _callee85);
             })), function () {
               return logout();
             }, callbacks, "Failed to refresh data after setting active session");
           case 6:
-            return _context84.a(2);
+            return _context86.a(2);
         }
-      }, _callee84);
+      }, _callee86);
     }));
-    return function (_x69) {
-      return _ref95.apply(this, arguments);
+    return function (_x71) {
+      return _ref97.apply(this, arguments);
     };
   }(), [client, callbacks, logout, getSession, maybeRefreshWallets, maybeRefreshUser]);
-  var clearUnusedKeyPairs = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee85() {
-    return _regenerator().w(function (_context85) {
-      while (1) switch (_context85.n) {
+  var clearUnusedKeyPairs = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee87() {
+    return _regenerator().w(function (_context87) {
+      while (1) switch (_context87.n) {
         case 0:
           if (client) {
-            _context85.n = 1;
+            _context87.n = 1;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 1:
-          return _context85.a(2, withTurnkeyErrorHandling(function () {
+          return _context87.a(2, withTurnkeyErrorHandling(function () {
             return client.clearUnusedKeyPairs();
           }, undefined, callbacks, "Failed to clear unused key pairs"));
       }
-    }, _callee85);
+    }, _callee87);
   })), [client, callbacks]);
   var createApiKeyPair = useCallback(/*#__PURE__*/function () {
-    var _ref98 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee86(params) {
-      return _regenerator().w(function (_context86) {
-        while (1) switch (_context86.n) {
+    var _ref100 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee88(params) {
+      return _regenerator().w(function (_context88) {
+        while (1) switch (_context88.n) {
           case 0:
             if (client) {
-              _context86.n = 1;
+              _context88.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context86.a(2, withTurnkeyErrorHandling(function () {
+            return _context88.a(2, withTurnkeyErrorHandling(function () {
               return client.createApiKeyPair(params);
             }, undefined, callbacks, "Failed to create API key pair"));
         }
-      }, _callee86);
+      }, _callee88);
     }));
-    return function (_x70) {
-      return _ref98.apply(this, arguments);
+    return function (_x72) {
+      return _ref100.apply(this, arguments);
     };
   }(), [client, callbacks]);
-  var getProxyAuthConfig = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee87() {
-    return _regenerator().w(function (_context87) {
-      while (1) switch (_context87.n) {
+  var getProxyAuthConfig = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee89() {
+    return _regenerator().w(function (_context89) {
+      while (1) switch (_context89.n) {
         case 0:
           if (client) {
-            _context87.n = 1;
+            _context89.n = 1;
             break;
           }
           throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
         case 1:
-          return _context87.a(2, withTurnkeyErrorHandling(function () {
+          return _context89.a(2, withTurnkeyErrorHandling(function () {
             return client.getProxyAuthConfig();
           }, undefined, callbacks, "Failed to get proxy auth config"));
       }
-    }, _callee87);
+    }, _callee89);
   })), [client, callbacks]);
   var fetchBootProofForAppProof = useCallback(/*#__PURE__*/function () {
-    var _ref100 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee88(params) {
-      return _regenerator().w(function (_context88) {
-        while (1) switch (_context88.n) {
+    var _ref102 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee90(params) {
+      return _regenerator().w(function (_context90) {
+        while (1) switch (_context90.n) {
           case 0:
             if (client) {
-              _context88.n = 1;
+              _context90.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context88.a(2, withTurnkeyErrorHandling(function () {
+            return _context90.a(2, withTurnkeyErrorHandling(function () {
               return client.fetchBootProofForAppProof(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to fetch or create delegated access user"));
         }
-      }, _callee88);
+      }, _callee90);
     }));
-    return function (_x71) {
-      return _ref100.apply(this, arguments);
+    return function (_x73) {
+      return _ref102.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var verifyAppProofs = useCallback(/*#__PURE__*/function () {
-    var _ref101 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee89(params) {
-      return _regenerator().w(function (_context89) {
-        while (1) switch (_context89.n) {
+    var _ref103 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee91(params) {
+      return _regenerator().w(function (_context91) {
+        while (1) switch (_context91.n) {
           case 0:
             if (client) {
-              _context89.n = 1;
+              _context91.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            return _context89.a(2, withTurnkeyErrorHandling(function () {
+            return _context91.a(2, withTurnkeyErrorHandling(function () {
               return client.verifyAppProofs(params);
             }, function () {
               return logout();
             }, callbacks, "Failed to verify app proofs"));
         }
-      }, _callee89);
+      }, _callee91);
     }));
-    return function (_x72) {
-      return _ref101.apply(this, arguments);
+    return function (_x74) {
+      return _ref103.apply(this, arguments);
     };
   }(), [client, callbacks, logout]);
   var handleDiscordOauth = useCallback(/*#__PURE__*/function () {
-    var _ref102 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee91(params) {
+    var _ref104 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee93(params) {
       var _masterConfig$auth21, _masterConfig$auth21$, _masterConfig$auth$oa2, _masterConfig$auth22, _masterConfig$auth22$, _masterConfig$auth23, _masterConfig$auth23$, _masterConfig$auth24;
-      var _ref103, _ref103$clientId, clientId, _ref103$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, authUrl, authWindow;
-      return _regenerator().w(function (_context91) {
-        while (1) switch (_context91.n) {
+      var _ref105, _ref105$clientId, clientId, _ref105$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle, verifier, codeChallenge, authUrl, authWindow;
+      return _regenerator().w(function (_context93) {
+        while (1) switch (_context93.n) {
           case 0:
-            _ref103 = params || {}, _ref103$clientId = _ref103.clientId, clientId = _ref103$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$.discordClientId : _ref103$clientId, _ref103$openInPage = _ref103.openInPage, openInPage = _ref103$openInPage === void 0 ? (_masterConfig$auth$oa2 = 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$oa2 !== void 0 ? _masterConfig$auth$oa2 : false : _ref103$openInPage, additionalParameters = _ref103.additionalState;
+            _ref105 = params || {}, _ref105$clientId = _ref105.clientId, clientId = _ref105$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$.discordClientId : _ref105$clientId, _ref105$openInPage = _ref105.openInPage, openInPage = _ref105$openInPage === void 0 ? (_masterConfig$auth$oa2 = 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$oa2 !== void 0 ? _masterConfig$auth$oa2 : false : _ref105$openInPage, additionalParameters = _ref105.additionalState;
             provider = OAuthProviders.DISCORD;
             if (masterConfig) {
-              _context91.n = 1;
+              _context93.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context91.n = 2;
+              _context93.n = 2;
               break;
             }
             throw new TurnkeyError("Discord Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if ((_masterConfig$auth23 = masterConfig.auth) !== null && _masterConfig$auth23 !== void 0 && (_masterConfig$auth23$ = _masterConfig$auth23.oauthConfig) !== null && _masterConfig$auth23$ !== void 0 && _masterConfig$auth23$.oauthRedirectUri) {
-              _context91.n = 3;
+              _context93.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup";
             redirectUri = (_masterConfig$auth24 = masterConfig.auth) === null || _masterConfig$auth24 === void 0 ? void 0 : _masterConfig$auth24.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context91.n = 4;
+            _context93.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context91.v;
+            publicKey = _context93.v;
             if (publicKey) {
-              _context91.n = 5;
+              _context93.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 5:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair and store verifier
-            _context91.n = 6;
+            _context93.n = 6;
             return generateChallengePair();
           case 6:
-            _yield$generateChalle = _context91.v;
+            _yield$generateChalle = _context93.v;
             verifier = _yield$generateChalle.verifier;
             codeChallenge = _yield$generateChalle.codeChallenge;
             storePKCEVerifier(provider, verifier);
@@ -3834,21 +3880,21 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: additionalParameters
             });
             if (!openInPage) {
-              _context91.n = 7;
+              _context93.n = 7;
               break;
             }
-            return _context91.a(2, redirectToOAuthProvider(authUrl));
+            return _context93.a(2, redirectToOAuthProvider(authUrl));
           case 7:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context91.n = 8;
+              _context93.n = 8;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 8:
             authWindow.location.href = authUrl;
-            return _context91.a(2, new Promise(function (resolve, reject) {
+            return _context93.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -3870,13 +3916,13 @@ var ClientProvider = function ClientProvider(_ref) {
                         completeOauth: completeOauth,
                         onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
                         exchangeCodeForToken: function () {
-                          var _exchangeCodeForToken = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee90(codeVerifier) {
+                          var _exchangeCodeForToken = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee92(codeVerifier) {
                             var _resp$oidcToken;
                             var resp;
-                            return _regenerator().w(function (_context90) {
-                              while (1) switch (_context90.n) {
+                            return _regenerator().w(function (_context92) {
+                              while (1) switch (_context92.n) {
                                 case 0:
-                                  _context90.n = 1;
+                                  _context92.n = 1;
                                   return client === null || client === void 0 ? void 0 : client.httpClient.proxyOAuth2Authenticate({
                                     provider: "OAUTH2_PROVIDER_DISCORD",
                                     authCode: result.authCode,
@@ -3886,12 +3932,12 @@ var ClientProvider = function ClientProvider(_ref) {
                                     nonce: nonce
                                   });
                                 case 1:
-                                  resp = _context90.v;
-                                  return _context90.a(2, (_resp$oidcToken = resp === null || resp === void 0 ? void 0 : resp.oidcToken) !== null && _resp$oidcToken !== void 0 ? _resp$oidcToken : "");
+                                  resp = _context92.v;
+                                  return _context92.a(2, (_resp$oidcToken = resp === null || resp === void 0 ? void 0 : resp.oidcToken) !== null && _resp$oidcToken !== void 0 ? _resp$oidcToken : "");
                               }
-                            }, _callee90);
+                            }, _callee92);
                           }));
-                          function exchangeCodeForToken(_x74) {
+                          function exchangeCodeForToken(_x76) {
                             return _exchangeCodeForToken.apply(this, arguments);
                           }
                           return exchangeCodeForToken;
@@ -3910,56 +3956,56 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
         }
-      }, _callee91);
+      }, _callee93);
     }));
-    return function (_x73) {
-      return _ref102.apply(this, arguments);
+    return function (_x75) {
+      return _ref104.apply(this, arguments);
     };
   }(), [client, callbacks, completeOauth, createApiKeyPair, masterConfig]);
   var handleXOauth = useCallback(/*#__PURE__*/function () {
-    var _ref104 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee93(params) {
+    var _ref106 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee95(params) {
       var _masterConfig$auth25, _masterConfig$auth25$, _masterConfig$auth$oa3, _masterConfig$auth26, _masterConfig$auth26$, _masterConfig$auth27, _masterConfig$auth27$, _masterConfig$auth28;
-      var _ref105, _ref105$clientId, clientId, _ref105$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle2, verifier, codeChallenge, authUrl, authWindow;
-      return _regenerator().w(function (_context93) {
-        while (1) switch (_context93.n) {
+      var _ref107, _ref107$clientId, clientId, _ref107$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle2, verifier, codeChallenge, authUrl, authWindow;
+      return _regenerator().w(function (_context95) {
+        while (1) switch (_context95.n) {
           case 0:
-            _ref105 = params || {}, _ref105$clientId = _ref105.clientId, clientId = _ref105$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$.xClientId : _ref105$clientId, _ref105$openInPage = _ref105.openInPage, openInPage = _ref105$openInPage === void 0 ? (_masterConfig$auth$oa3 = 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$oa3 !== void 0 ? _masterConfig$auth$oa3 : false : _ref105$openInPage, additionalParameters = _ref105.additionalState;
+            _ref107 = params || {}, _ref107$clientId = _ref107.clientId, clientId = _ref107$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$.xClientId : _ref107$clientId, _ref107$openInPage = _ref107.openInPage, openInPage = _ref107$openInPage === void 0 ? (_masterConfig$auth$oa3 = 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$oa3 !== void 0 ? _masterConfig$auth$oa3 : false : _ref107$openInPage, additionalParameters = _ref107.additionalState;
             provider = OAuthProviders.X;
             if (masterConfig) {
-              _context93.n = 1;
+              _context95.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context93.n = 2;
+              _context95.n = 2;
               break;
             }
             throw new TurnkeyError("Twitter Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if ((_masterConfig$auth27 = masterConfig.auth) !== null && _masterConfig$auth27 !== void 0 && (_masterConfig$auth27$ = _masterConfig$auth27.oauthConfig) !== null && _masterConfig$auth27$ !== void 0 && _masterConfig$auth27$.oauthRedirectUri) {
-              _context93.n = 3;
+              _context95.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             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
-            _context93.n = 4;
+            _context95.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context93.v;
+            publicKey = _context95.v;
             if (publicKey) {
-              _context93.n = 5;
+              _context95.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 5:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair and store verifier
-            _context93.n = 6;
+            _context95.n = 6;
             return generateChallengePair();
           case 6:
-            _yield$generateChalle2 = _context93.v;
+            _yield$generateChalle2 = _context95.v;
             verifier = _yield$generateChalle2.verifier;
             codeChallenge = _yield$generateChalle2.codeChallenge;
             storePKCEVerifier(provider, verifier);
@@ -3975,21 +4021,21 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: additionalParameters
             });
             if (!openInPage) {
-              _context93.n = 7;
+              _context95.n = 7;
               break;
             }
-            return _context93.a(2, redirectToOAuthProvider(authUrl));
+            return _context95.a(2, redirectToOAuthProvider(authUrl));
           case 7:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context93.n = 8;
+              _context95.n = 8;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 8:
             authWindow.location.href = authUrl;
-            return _context93.a(2, new Promise(function (resolve, reject) {
+            return _context95.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -4011,13 +4057,13 @@ var ClientProvider = function ClientProvider(_ref) {
                         completeOauth: completeOauth,
                         onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
                         exchangeCodeForToken: function () {
-                          var _exchangeCodeForToken2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee92(codeVerifier) {
+                          var _exchangeCodeForToken2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee94(codeVerifier) {
                             var _resp$oidcToken2;
                             var resp;
-                            return _regenerator().w(function (_context92) {
-                              while (1) switch (_context92.n) {
+                            return _regenerator().w(function (_context94) {
+                              while (1) switch (_context94.n) {
                                 case 0:
-                                  _context92.n = 1;
+                                  _context94.n = 1;
                                   return client === null || client === void 0 ? void 0 : client.httpClient.proxyOAuth2Authenticate({
                                     provider: "OAUTH2_PROVIDER_X",
                                     authCode: result.authCode,
@@ -4027,12 +4073,12 @@ var ClientProvider = function ClientProvider(_ref) {
                                     nonce: nonce
                                   });
                                 case 1:
-                                  resp = _context92.v;
-                                  return _context92.a(2, (_resp$oidcToken2 = resp === null || resp === void 0 ? void 0 : resp.oidcToken) !== null && _resp$oidcToken2 !== void 0 ? _resp$oidcToken2 : "");
+                                  resp = _context94.v;
+                                  return _context94.a(2, (_resp$oidcToken2 = resp === null || resp === void 0 ? void 0 : resp.oidcToken) !== null && _resp$oidcToken2 !== void 0 ? _resp$oidcToken2 : "");
                               }
-                            }, _callee92);
+                            }, _callee94);
                           }));
-                          function exchangeCodeForToken(_x76) {
+                          function exchangeCodeForToken(_x78) {
                             return _exchangeCodeForToken2.apply(this, arguments);
                           }
                           return exchangeCodeForToken;
@@ -4051,47 +4097,47 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
         }
-      }, _callee93);
+      }, _callee95);
     }));
-    return function (_x75) {
-      return _ref104.apply(this, arguments);
+    return function (_x77) {
+      return _ref106.apply(this, arguments);
     };
   }(), [client, callbacks, completeOauth, createApiKeyPair, masterConfig]);
   var handleGoogleOauth = useCallback(/*#__PURE__*/function () {
-    var _ref106 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee94(params) {
+    var _ref108 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee96(params) {
       var _masterConfig$auth29, _masterConfig$auth29$, _masterConfig$auth$oa4, _masterConfig$auth30, _masterConfig$auth30$, _masterConfig$auth31, _masterConfig$auth31$, _masterConfig$auth32;
-      var _ref107, _ref107$clientId, clientId, _ref107$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, authUrl, authWindow;
-      return _regenerator().w(function (_context94) {
-        while (1) switch (_context94.n) {
+      var _ref109, _ref109$clientId, clientId, _ref109$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, authUrl, authWindow;
+      return _regenerator().w(function (_context96) {
+        while (1) switch (_context96.n) {
           case 0:
-            _ref107 = params || {}, _ref107$clientId = _ref107.clientId, clientId = _ref107$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth29 = masterConfig.auth) === null || _masterConfig$auth29 === void 0 ? void 0 : (_masterConfig$auth29$ = _masterConfig$auth29.oauthConfig) === null || _masterConfig$auth29$ === void 0 ? void 0 : _masterConfig$auth29$.googleClientId : _ref107$clientId, _ref107$openInPage = _ref107.openInPage, openInPage = _ref107$openInPage === void 0 ? (_masterConfig$auth$oa4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth30 = masterConfig.auth) === null || _masterConfig$auth30 === void 0 ? void 0 : (_masterConfig$auth30$ = _masterConfig$auth30.oauthConfig) === null || _masterConfig$auth30$ === void 0 ? void 0 : _masterConfig$auth30$.openOauthInPage) !== null && _masterConfig$auth$oa4 !== void 0 ? _masterConfig$auth$oa4 : false : _ref107$openInPage, additionalParameters = _ref107.additionalState;
+            _ref109 = params || {}, _ref109$clientId = _ref109.clientId, clientId = _ref109$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth29 = masterConfig.auth) === null || _masterConfig$auth29 === void 0 ? void 0 : (_masterConfig$auth29$ = _masterConfig$auth29.oauthConfig) === null || _masterConfig$auth29$ === void 0 ? void 0 : _masterConfig$auth29$.googleClientId : _ref109$clientId, _ref109$openInPage = _ref109.openInPage, openInPage = _ref109$openInPage === void 0 ? (_masterConfig$auth$oa4 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth30 = masterConfig.auth) === null || _masterConfig$auth30 === void 0 ? void 0 : (_masterConfig$auth30$ = _masterConfig$auth30.oauthConfig) === null || _masterConfig$auth30$ === void 0 ? void 0 : _masterConfig$auth30$.openOauthInPage) !== null && _masterConfig$auth$oa4 !== void 0 ? _masterConfig$auth$oa4 : false : _ref109$openInPage, additionalParameters = _ref109.additionalState;
             provider = OAuthProviders.GOOGLE;
             if (masterConfig) {
-              _context94.n = 1;
+              _context96.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context94.n = 2;
+              _context96.n = 2;
               break;
             }
             throw new TurnkeyError("Google Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if ((_masterConfig$auth31 = masterConfig.auth) !== null && _masterConfig$auth31 !== void 0 && (_masterConfig$auth31$ = _masterConfig$auth31.oauthConfig) !== null && _masterConfig$auth31$ !== void 0 && _masterConfig$auth31$.oauthRedirectUri) {
-              _context94.n = 3;
+              _context96.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup"; // Google requires no trailing slash
             redirectUri = (_masterConfig$auth32 = masterConfig.auth) === null || _masterConfig$auth32 === void 0 ? void 0 : _masterConfig$auth32.oauthConfig.oauthRedirectUri.replace(/\/$/, ""); // Create key pair and generate nonce
-            _context94.n = 4;
+            _context96.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context94.v;
+            publicKey = _context96.v;
             if (publicKey) {
-              _context94.n = 5;
+              _context96.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -4107,21 +4153,21 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: additionalParameters
             });
             if (!openInPage) {
-              _context94.n = 6;
+              _context96.n = 6;
               break;
             }
-            return _context94.a(2, redirectToOAuthProvider(authUrl));
+            return _context96.a(2, redirectToOAuthProvider(authUrl));
           case 6:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context94.n = 7;
+              _context96.n = 7;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 7:
             authWindow.location.href = authUrl;
-            return _context94.a(2, new Promise(function (resolve, reject) {
+            return _context96.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -4156,47 +4202,47 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
         }
-      }, _callee94);
+      }, _callee96);
     }));
-    return function (_x77) {
-      return _ref106.apply(this, arguments);
+    return function (_x79) {
+      return _ref108.apply(this, arguments);
     };
   }(), [callbacks, completeOauth, createApiKeyPair, masterConfig]);
   var handleAppleOauth = useCallback(/*#__PURE__*/function () {
-    var _ref108 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee95(params) {
+    var _ref110 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee97(params) {
       var _masterConfig$auth33, _masterConfig$auth33$, _masterConfig$auth$oa5, _masterConfig$auth34, _masterConfig$auth34$, _masterConfig$auth35, _masterConfig$auth35$, _masterConfig$auth36;
-      var _ref109, _ref109$clientId, clientId, _ref109$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, authUrl, authWindow;
-      return _regenerator().w(function (_context95) {
-        while (1) switch (_context95.n) {
+      var _ref111, _ref111$clientId, clientId, _ref111$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, authUrl, authWindow;
+      return _regenerator().w(function (_context97) {
+        while (1) switch (_context97.n) {
           case 0:
-            _ref109 = params || {}, _ref109$clientId = _ref109.clientId, clientId = _ref109$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth33 = masterConfig.auth) === null || _masterConfig$auth33 === void 0 ? void 0 : (_masterConfig$auth33$ = _masterConfig$auth33.oauthConfig) === null || _masterConfig$auth33$ === void 0 ? void 0 : _masterConfig$auth33$.appleClientId : _ref109$clientId, _ref109$openInPage = _ref109.openInPage, openInPage = _ref109$openInPage === void 0 ? (_masterConfig$auth$oa5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth34 = masterConfig.auth) === null || _masterConfig$auth34 === void 0 ? void 0 : (_masterConfig$auth34$ = _masterConfig$auth34.oauthConfig) === null || _masterConfig$auth34$ === void 0 ? void 0 : _masterConfig$auth34$.openOauthInPage) !== null && _masterConfig$auth$oa5 !== void 0 ? _masterConfig$auth$oa5 : false : _ref109$openInPage, additionalParameters = _ref109.additionalState;
+            _ref111 = params || {}, _ref111$clientId = _ref111.clientId, clientId = _ref111$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth33 = masterConfig.auth) === null || _masterConfig$auth33 === void 0 ? void 0 : (_masterConfig$auth33$ = _masterConfig$auth33.oauthConfig) === null || _masterConfig$auth33$ === void 0 ? void 0 : _masterConfig$auth33$.appleClientId : _ref111$clientId, _ref111$openInPage = _ref111.openInPage, openInPage = _ref111$openInPage === void 0 ? (_masterConfig$auth$oa5 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth34 = masterConfig.auth) === null || _masterConfig$auth34 === void 0 ? void 0 : (_masterConfig$auth34$ = _masterConfig$auth34.oauthConfig) === null || _masterConfig$auth34$ === void 0 ? void 0 : _masterConfig$auth34$.openOauthInPage) !== null && _masterConfig$auth$oa5 !== void 0 ? _masterConfig$auth$oa5 : false : _ref111$openInPage, additionalParameters = _ref111.additionalState;
             provider = OAuthProviders.APPLE;
             if (masterConfig) {
-              _context95.n = 1;
+              _context97.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context95.n = 2;
+              _context97.n = 2;
               break;
             }
             throw new TurnkeyError("Apple Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if ((_masterConfig$auth35 = masterConfig.auth) !== null && _masterConfig$auth35 !== void 0 && (_masterConfig$auth35$ = _masterConfig$auth35.oauthConfig) !== null && _masterConfig$auth35$ !== void 0 && _masterConfig$auth35$.oauthRedirectUri) {
-              _context95.n = 3;
+              _context97.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup"; // TODO (Amir): Apple needs the '/' at the end. Maybe we should add it if not there?
             redirectUri = (_masterConfig$auth36 = masterConfig.auth) === null || _masterConfig$auth36 === void 0 ? void 0 : _masterConfig$auth36.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context95.n = 4;
+            _context97.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context95.v;
+            publicKey = _context97.v;
             if (publicKey) {
-              _context95.n = 5;
+              _context97.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
@@ -4212,21 +4258,21 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: additionalParameters
             });
             if (!openInPage) {
-              _context95.n = 6;
+              _context97.n = 6;
               break;
             }
-            return _context95.a(2, redirectToOAuthProvider(authUrl));
+            return _context97.a(2, redirectToOAuthProvider(authUrl));
           case 6:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context95.n = 7;
+              _context97.n = 7;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 7:
             authWindow.location.href = authUrl;
-            return _context95.a(2, new Promise(function (resolve, reject) {
+            return _context97.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -4261,56 +4307,56 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
         }
-      }, _callee95);
+      }, _callee97);
     }));
-    return function (_x78) {
-      return _ref108.apply(this, arguments);
+    return function (_x80) {
+      return _ref110.apply(this, arguments);
     };
   }(), [callbacks, completeOauth, createApiKeyPair, masterConfig]);
   var handleFacebookOauth = useCallback(/*#__PURE__*/function () {
-    var _ref110 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee97(params) {
+    var _ref112 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee99(params) {
       var _masterConfig$auth37, _masterConfig$auth37$, _masterConfig$auth$oa6, _masterConfig$auth38, _masterConfig$auth38$, _masterConfig$auth39, _masterConfig$auth39$, _masterConfig$auth40;
-      var _ref111, _ref111$clientId, clientId, _ref111$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle3, verifier, codeChallenge, authUrl, authWindow;
-      return _regenerator().w(function (_context97) {
-        while (1) switch (_context97.n) {
+      var _ref113, _ref113$clientId, clientId, _ref113$openInPage, openInPage, additionalParameters, provider, flow, redirectUri, publicKey, nonce, _yield$generateChalle3, verifier, codeChallenge, authUrl, authWindow;
+      return _regenerator().w(function (_context99) {
+        while (1) switch (_context99.n) {
           case 0:
-            _ref111 = params || {}, _ref111$clientId = _ref111.clientId, clientId = _ref111$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth37 = masterConfig.auth) === null || _masterConfig$auth37 === void 0 ? void 0 : (_masterConfig$auth37$ = _masterConfig$auth37.oauthConfig) === null || _masterConfig$auth37$ === void 0 ? void 0 : _masterConfig$auth37$.facebookClientId : _ref111$clientId, _ref111$openInPage = _ref111.openInPage, openInPage = _ref111$openInPage === void 0 ? (_masterConfig$auth$oa6 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth38 = masterConfig.auth) === null || _masterConfig$auth38 === void 0 ? void 0 : (_masterConfig$auth38$ = _masterConfig$auth38.oauthConfig) === null || _masterConfig$auth38$ === void 0 ? void 0 : _masterConfig$auth38$.openOauthInPage) !== null && _masterConfig$auth$oa6 !== void 0 ? _masterConfig$auth$oa6 : false : _ref111$openInPage, additionalParameters = _ref111.additionalState;
+            _ref113 = params || {}, _ref113$clientId = _ref113.clientId, clientId = _ref113$clientId === void 0 ? masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth37 = masterConfig.auth) === null || _masterConfig$auth37 === void 0 ? void 0 : (_masterConfig$auth37$ = _masterConfig$auth37.oauthConfig) === null || _masterConfig$auth37$ === void 0 ? void 0 : _masterConfig$auth37$.facebookClientId : _ref113$clientId, _ref113$openInPage = _ref113.openInPage, openInPage = _ref113$openInPage === void 0 ? (_masterConfig$auth$oa6 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth38 = masterConfig.auth) === null || _masterConfig$auth38 === void 0 ? void 0 : (_masterConfig$auth38$ = _masterConfig$auth38.oauthConfig) === null || _masterConfig$auth38$ === void 0 ? void 0 : _masterConfig$auth38$.openOauthInPage) !== null && _masterConfig$auth$oa6 !== void 0 ? _masterConfig$auth$oa6 : false : _ref113$openInPage, additionalParameters = _ref113.additionalState;
             provider = OAuthProviders.FACEBOOK;
             if (masterConfig) {
-              _context97.n = 1;
+              _context99.n = 1;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 1:
             if (clientId) {
-              _context97.n = 2;
+              _context99.n = 2;
               break;
             }
             throw new TurnkeyError("Facebook Client ID is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 2:
             if ((_masterConfig$auth39 = masterConfig.auth) !== null && _masterConfig$auth39 !== void 0 && (_masterConfig$auth39$ = _masterConfig$auth39.oauthConfig) !== null && _masterConfig$auth39$ !== void 0 && _masterConfig$auth39$.oauthRedirectUri) {
-              _context97.n = 3;
+              _context99.n = 3;
               break;
             }
             throw new TurnkeyError("OAuth Redirect URI is not configured.", TurnkeyErrorCodes.INVALID_CONFIGURATION);
           case 3:
             flow = openInPage ? "redirect" : "popup";
             redirectUri = (_masterConfig$auth40 = masterConfig.auth) === null || _masterConfig$auth40 === void 0 ? void 0 : _masterConfig$auth40.oauthConfig.oauthRedirectUri; // Create key pair and generate nonce
-            _context97.n = 4;
+            _context99.n = 4;
             return createApiKeyPair();
           case 4:
-            publicKey = _context97.v;
+            publicKey = _context99.v;
             if (publicKey) {
-              _context97.n = 5;
+              _context99.n = 5;
               break;
             }
             throw new Error("Failed to create public key for OAuth.");
           case 5:
             nonce = bytesToHex(sha256(publicKey)); // Generate PKCE challenge pair and store verifier
-            _context97.n = 6;
+            _context99.n = 6;
             return generateChallengePair();
           case 6:
-            _yield$generateChalle3 = _context97.v;
+            _yield$generateChalle3 = _context99.v;
             verifier = _yield$generateChalle3.verifier;
             codeChallenge = _yield$generateChalle3.codeChallenge;
             storePKCEVerifier(provider, verifier);
@@ -4326,21 +4372,21 @@ var ClientProvider = function ClientProvider(_ref) {
               additionalState: additionalParameters
             });
             if (!openInPage) {
-              _context97.n = 7;
+              _context99.n = 7;
               break;
             }
-            return _context97.a(2, redirectToOAuthProvider(authUrl));
+            return _context99.a(2, redirectToOAuthProvider(authUrl));
           case 7:
             // Popup flow
             authWindow = openOAuthPopup();
             if (authWindow) {
-              _context97.n = 8;
+              _context99.n = 8;
               break;
             }
             throw new Error("Failed to open ".concat(capitalizeProviderName(provider), " login window."));
           case 8:
             authWindow.location.href = authUrl;
-            return _context97.a(2, new Promise(function (resolve, reject) {
+            return _context99.a(2, new Promise(function (resolve, reject) {
               var interval = setInterval(function () {
                 try {
                   if (authWindow.closed) {
@@ -4362,20 +4408,20 @@ var ClientProvider = function ClientProvider(_ref) {
                         completeOauth: completeOauth,
                         onOauthSuccess: params === null || params === void 0 ? void 0 : params.onOauthSuccess,
                         exchangeCodeForToken: function () {
-                          var _exchangeCodeForToken3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee96(codeVerifier) {
+                          var _exchangeCodeForToken3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee98(codeVerifier) {
                             var tokenData;
-                            return _regenerator().w(function (_context96) {
-                              while (1) switch (_context96.n) {
+                            return _regenerator().w(function (_context98) {
+                              while (1) switch (_context98.n) {
                                 case 0:
-                                  _context96.n = 1;
+                                  _context98.n = 1;
                                   return exchangeFacebookCodeForToken(clientId, redirectUri, result.authCode, codeVerifier);
                                 case 1:
-                                  tokenData = _context96.v;
-                                  return _context96.a(2, tokenData.id_token);
+                                  tokenData = _context98.v;
+                                  return _context98.a(2, tokenData.id_token);
                               }
-                            }, _callee96);
+                            }, _callee98);
                           }));
-                          function exchangeCodeForToken(_x80) {
+                          function exchangeCodeForToken(_x82) {
                             return _exchangeCodeForToken3.apply(this, arguments);
                           }
                           return exchangeCodeForToken;
@@ -4394,18 +4440,18 @@ var ClientProvider = function ClientProvider(_ref) {
               }
             }));
         }
-      }, _callee97);
+      }, _callee99);
     }));
-    return function (_x79) {
-      return _ref110.apply(this, arguments);
+    return function (_x81) {
+      return _ref112.apply(this, arguments);
     };
   }(), [callbacks, completeOauth, createApiKeyPair, masterConfig]);
   var handleLogin = useCallback(/*#__PURE__*/function () {
-    var _ref112 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee98(params) {
+    var _ref114 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee100(params) {
       var _masterConfig$ui, _params$logoDark, _masterConfig$ui2, _params$logoLight, _masterConfig$ui3, _params$title;
       var logo;
-      return _regenerator().w(function (_context98) {
-        while (1) switch (_context98.n) {
+      return _regenerator().w(function (_context100) {
+        while (1) switch (_context100.n) {
           case 0:
             logo = masterConfig !== null && masterConfig !== void 0 && (_masterConfig$ui = masterConfig.ui) !== null && _masterConfig$ui !== void 0 && _masterConfig$ui.darkMode ? (_params$logoDark = params === null || params === void 0 ? void 0 : params.logoDark) !== null && _params$logoDark !== void 0 ? _params$logoDark : masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$ui2 = masterConfig.ui) === null || _masterConfig$ui2 === void 0 ? void 0 : _masterConfig$ui2.logoDark : (_params$logoLight = params === null || params === void 0 ? void 0 : params.logoLight) !== null && _params$logoLight !== void 0 ? _params$logoLight : masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$ui3 = masterConfig.ui) === null || _masterConfig$ui3 === void 0 ? void 0 : _masterConfig$ui3.logoLight;
             pushPage({
@@ -4419,22 +4465,22 @@ var ClientProvider = function ClientProvider(_ref) {
               showTitle: logo ? false : true
             });
           case 1:
-            return _context98.a(2);
+            return _context100.a(2);
         }
-      }, _callee98);
+      }, _callee100);
     }));
-    return function (_x81) {
-      return _ref112.apply(this, arguments);
+    return function (_x83) {
+      return _ref114.apply(this, arguments);
     };
   }(), [pushPage, masterConfig]);
   var handleExportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref113 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee99(params) {
+    var _ref115 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee101(params) {
       var walletId, targetPublicKey, stampWith, organizationId;
-      return _regenerator().w(function (_context99) {
-        while (1) switch (_context99.n) {
+      return _regenerator().w(function (_context101) {
+        while (1) switch (_context101.n) {
           case 0:
             walletId = params.walletId, targetPublicKey = params.targetPublicKey, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context99.a(2, new Promise(function (resolve, reject) {
+            return _context101.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export wallet",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4460,20 +4506,20 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee99);
+      }, _callee101);
     }));
-    return function (_x82) {
-      return _ref113.apply(this, arguments);
+    return function (_x84) {
+      return _ref115.apply(this, arguments);
     };
   }(), [pushPage]);
   var handleExportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref114 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee100(params) {
+    var _ref116 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee102(params) {
       var privateKeyId, targetPublicKey, keyFormat, stampWith, organizationId;
-      return _regenerator().w(function (_context100) {
-        while (1) switch (_context100.n) {
+      return _regenerator().w(function (_context102) {
+        while (1) switch (_context102.n) {
           case 0:
             privateKeyId = params.privateKeyId, targetPublicKey = params.targetPublicKey, keyFormat = params.keyFormat, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context100.a(2, new Promise(function (resolve, reject) {
+            return _context102.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export private key",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4501,20 +4547,20 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee100);
+      }, _callee102);
     }));
-    return function (_x83) {
-      return _ref114.apply(this, arguments);
+    return function (_x85) {
+      return _ref116.apply(this, arguments);
     };
   }(), [pushPage]);
   var handleExportWalletAccount = useCallback(/*#__PURE__*/function () {
-    var _ref115 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee101(params) {
+    var _ref117 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee103(params) {
       var address, targetPublicKey, keyFormat, stampWith, organizationId;
-      return _regenerator().w(function (_context101) {
-        while (1) switch (_context101.n) {
+      return _regenerator().w(function (_context103) {
+        while (1) switch (_context103.n) {
           case 0:
             address = params.address, targetPublicKey = params.targetPublicKey, keyFormat = params.keyFormat, stampWith = params.stampWith, organizationId = params.organizationId;
-            return _context101.a(2, new Promise(function (resolve, reject) {
+            return _context103.a(2, new Promise(function (resolve, reject) {
               return pushPage({
                 key: "Export wallet account",
                 content: jsx(ExportComponent, _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
@@ -4542,21 +4588,21 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee101);
+      }, _callee103);
     }));
-    return function (_x84) {
-      return _ref115.apply(this, arguments);
+    return function (_x86) {
+      return _ref117.apply(this, arguments);
     };
   }(), [pushPage]);
   var handleImportWallet = useCallback(/*#__PURE__*/function () {
-    var _ref116 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee102(params) {
-      var _ref117, defaultWalletAccounts, _ref117$successPageDu, successPageDuration, stampWith, walletName, clearClipboardOnPaste, organizationId, userId, _t11;
-      return _regenerator().w(function (_context102) {
-        while (1) switch (_context102.p = _context102.n) {
+    var _ref118 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee104(params) {
+      var _ref119, defaultWalletAccounts, _ref119$successPageDu, successPageDuration, stampWith, walletName, clearClipboardOnPaste, organizationId, userId, _t11;
+      return _regenerator().w(function (_context104) {
+        while (1) switch (_context104.p = _context104.n) {
           case 0:
-            _ref117 = params || {}, defaultWalletAccounts = _ref117.defaultWalletAccounts, _ref117$successPageDu = _ref117.successPageDuration, successPageDuration = _ref117$successPageDu === void 0 ? 2000 : _ref117$successPageDu, stampWith = _ref117.stampWith, walletName = _ref117.walletName, clearClipboardOnPaste = _ref117.clearClipboardOnPaste, organizationId = _ref117.organizationId, userId = _ref117.userId;
-            _context102.p = 1;
-            return _context102.a(2, withTurnkeyErrorHandling(function () {
+            _ref119 = params || {}, defaultWalletAccounts = _ref119.defaultWalletAccounts, _ref119$successPageDu = _ref119.successPageDuration, successPageDuration = _ref119$successPageDu === void 0 ? 2000 : _ref119$successPageDu, stampWith = _ref119.stampWith, walletName = _ref119.walletName, clearClipboardOnPaste = _ref119.clearClipboardOnPaste, organizationId = _ref119.organizationId, userId = _ref119.userId;
+            _context104.p = 1;
+            return _context104.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import wallet",
@@ -4589,33 +4635,33 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 2:
-            _context102.p = 2;
-            _t11 = _context102.v;
+            _context104.p = 2;
+            _t11 = _context104.v;
             if (!(_t11 instanceof TurnkeyError)) {
-              _context102.n = 3;
+              _context104.n = 3;
               break;
             }
             throw _t11;
           case 3:
             throw new TurnkeyError("Failed to import wallet.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t11);
           case 4:
-            return _context102.a(2);
+            return _context104.a(2);
         }
-      }, _callee102, null, [[1, 2]]);
+      }, _callee104, null, [[1, 2]]);
     }));
-    return function (_x85) {
-      return _ref116.apply(this, arguments);
+    return function (_x87) {
+      return _ref118.apply(this, arguments);
     };
   }(), [pushPage, logout]);
   var handleImportPrivateKey = useCallback(/*#__PURE__*/function () {
-    var _ref118 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee103(params) {
-      var _ref119, curve, addressFormats, _ref119$successPageDu, successPageDuration, stampWith, keyName, keyFormat, clearClipboardOnPaste, organizationId, _t12;
-      return _regenerator().w(function (_context103) {
-        while (1) switch (_context103.p = _context103.n) {
+    var _ref120 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee105(params) {
+      var _ref121, curve, addressFormats, _ref121$successPageDu, successPageDuration, stampWith, keyName, keyFormat, clearClipboardOnPaste, organizationId, _t12;
+      return _regenerator().w(function (_context105) {
+        while (1) switch (_context105.p = _context105.n) {
           case 0:
-            _ref119 = params || {}, curve = _ref119.curve, addressFormats = _ref119.addressFormats, _ref119$successPageDu = _ref119.successPageDuration, successPageDuration = _ref119$successPageDu === void 0 ? 2000 : _ref119$successPageDu, stampWith = _ref119.stampWith, keyName = _ref119.keyName, keyFormat = _ref119.keyFormat, clearClipboardOnPaste = _ref119.clearClipboardOnPaste, organizationId = _ref119.organizationId;
-            _context103.p = 1;
-            return _context103.a(2, withTurnkeyErrorHandling(function () {
+            _ref121 = params || {}, curve = _ref121.curve, addressFormats = _ref121.addressFormats, _ref121$successPageDu = _ref121.successPageDuration, successPageDuration = _ref121$successPageDu === void 0 ? 2000 : _ref121$successPageDu, stampWith = _ref121.stampWith, keyName = _ref121.keyName, keyFormat = _ref121.keyFormat, clearClipboardOnPaste = _ref121.clearClipboardOnPaste, organizationId = _ref121.organizationId;
+            _context105.p = 1;
+            return _context105.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 return pushPage({
                   key: "Import private key",
@@ -4647,51 +4693,51 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 2:
-            _context103.p = 2;
-            _t12 = _context103.v;
+            _context105.p = 2;
+            _t12 = _context105.v;
             if (!(_t12 instanceof TurnkeyError)) {
-              _context103.n = 3;
+              _context105.n = 3;
               break;
             }
             throw _t12;
           case 3:
             throw new TurnkeyError("Failed to import private key.", TurnkeyErrorCodes.IMPORT_WALLET_ERROR, _t12);
           case 4:
-            return _context103.a(2);
+            return _context105.a(2);
         }
-      }, _callee103, null, [[1, 2]]);
+      }, _callee105, null, [[1, 2]]);
     }));
-    return function (_x86) {
-      return _ref118.apply(this, arguments);
+    return function (_x88) {
+      return _ref120.apply(this, arguments);
     };
   }(), [pushPage, logout]);
   var handleUpdateUserName = useCallback(/*#__PURE__*/function () {
-    var _ref120 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee104(params) {
-      var _ref121, _ref121$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, _params$userId, res, _t13;
-      return _regenerator().w(function (_context104) {
-        while (1) switch (_context104.p = _context104.n) {
+    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;
+      return _regenerator().w(function (_context106) {
+        while (1) switch (_context106.p = _context106.n) {
           case 0:
-            _ref121 = params || {}, _ref121$successPageDu = _ref121.successPageDuration, successPageDuration = _ref121$successPageDu === void 0 ? 2000 : _ref121$successPageDu, subTitle = _ref121.subTitle, title = _ref121.title, stampWith = _ref121.stampWith;
+            _ref123 = params || {}, _ref123$successPageDu = _ref123.successPageDuration, successPageDuration = _ref123$successPageDu === void 0 ? 2000 : _ref123$successPageDu, subTitle = _ref123.subTitle, title = _ref123.title, stampWith = _ref123.stampWith;
             if (client) {
-              _context104.n = 1;
+              _context106.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context104.n = 2;
+            _context106.n = 2;
             return getSession();
           case 2:
-            s = _context104.v;
+            s = _context106.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context104.n = 3;
+              _context106.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (user === null || user === void 0 ? void 0 : user.userId);
             if (userId) {
-              _context104.n = 4;
+              _context106.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to update a user name.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -4711,12 +4757,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context104.p = 5;
+            _context106.p = 5;
             if (!(!(params !== null && params !== void 0 && params.userName) && (params === null || params === void 0 ? void 0 : params.userName) !== "")) {
-              _context104.n = 6;
+              _context106.n = 6;
               break;
             }
-            return _context104.a(2, withTurnkeyErrorHandling(function () {
+            return _context106.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update User Name",
@@ -4744,7 +4790,7 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context104.n = 7;
+            _context106.n = 7;
             return updateUserName(_objectSpread2({
               userName: params.userName,
               userId: (_params$userId = params.userId) !== null && _params$userId !== void 0 ? _params$userId : user.userId,
@@ -4753,71 +4799,71 @@ var ClientProvider = function ClientProvider(_ref) {
               organizationId: organizationId
             }));
           case 7:
-            res = _context104.v;
+            res = _context106.v;
             onSuccess();
-            return _context104.a(2, res);
+            return _context106.a(2, res);
           case 8:
-            _context104.n = 11;
+            _context106.n = 11;
             break;
           case 9:
-            _context104.p = 9;
-            _t13 = _context104.v;
+            _context106.p = 9;
+            _t13 = _context106.v;
             if (!(_t13 instanceof TurnkeyError)) {
-              _context104.n = 10;
+              _context106.n = 10;
               break;
             }
             throw _t13;
           case 10:
             throw new TurnkeyError("Failed to update user name.", TurnkeyErrorCodes.UPDATE_USER_NAME_ERROR, _t13);
           case 11:
-            return _context104.a(2);
+            return _context106.a(2);
         }
-      }, _callee104, null, [[5, 9]]);
+      }, _callee106, null, [[5, 9]]);
     }));
-    return function (_x87) {
-      return _ref120.apply(this, arguments);
+    return function (_x89) {
+      return _ref122.apply(this, arguments);
     };
   }(), [client, getSession, user, pushPage, closeModal, updateUserName, logout]);
   var handleUpdateUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref122 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee106(params) {
+    var _ref124 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee108(params) {
       var _masterConfig$auth41, _masterConfig$auth41$;
-      var _ref123, _ref123$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t15;
-      return _regenerator().w(function (_context106) {
-        while (1) switch (_context106.p = _context106.n) {
+      var _ref125, _ref125$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t15;
+      return _regenerator().w(function (_context108) {
+        while (1) switch (_context108.p = _context108.n) {
           case 0:
-            _ref123 = params || {}, _ref123$successPageDu = _ref123.successPageDuration, successPageDuration = _ref123$successPageDu === void 0 ? 2000 : _ref123$successPageDu, subTitle = _ref123.subTitle, title = _ref123.title, stampWith = _ref123.stampWith;
+            _ref125 = params || {}, _ref125$successPageDu = _ref125.successPageDuration, successPageDuration = _ref125$successPageDu === void 0 ? 2000 : _ref125$successPageDu, subTitle = _ref125.subTitle, title = _ref125.title, stampWith = _ref125.stampWith;
             if (client) {
-              _context106.n = 1;
+              _context108.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             if (masterConfig) {
-              _context106.n = 2;
+              _context108.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 2:
             if ((_masterConfig$auth41 = masterConfig.auth) !== null && _masterConfig$auth41 !== void 0 && (_masterConfig$auth41$ = _masterConfig$auth41.methods) !== null && _masterConfig$auth41$ !== void 0 && _masterConfig$auth41$.smsOtpAuthEnabled) {
-              _context106.n = 3;
+              _context108.n = 3;
               break;
             }
             throw new TurnkeyError("SMS OTP authentication is not enabled in the configuration.", TurnkeyErrorCodes.AUTH_METHOD_NOT_ENABLED);
           case 3:
-            _context106.n = 4;
+            _context108.n = 4;
             return getSession();
           case 4:
-            s = _context106.v;
+            s = _context108.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context106.n = 5;
+              _context108.n = 5;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 5:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context106.n = 6;
+              _context108.n = 6;
               break;
             }
             throw new TurnkeyError("A user ID is required to update a phone number.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -4837,12 +4883,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context106.p = 7;
+            _context108.p = 7;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context106.n = 8;
+              _context108.n = 8;
               break;
             }
-            return _context106.a(2, withTurnkeyErrorHandling(function () {
+            return _context108.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Phone Number",
@@ -4870,14 +4916,14 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 8:
-            _context106.n = 9;
+            _context108.n = 9;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 9:
-            otpId = _context106.v;
-            return _context106.a(2, withTurnkeyErrorHandling(function () {
+            otpId = _context108.v;
+            return _context108.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 var _masterConfig$auth42, _masterConfig$auth43;
                 pushPage({
@@ -4889,13 +4935,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     otpLength: ((_masterConfig$auth42 = masterConfig.auth) === null || _masterConfig$auth42 === void 0 ? void 0 : _masterConfig$auth42.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
                     alphanumeric: (_masterConfig$auth43 = masterConfig.auth) === null || _masterConfig$auth43 === void 0 ? void 0 : _masterConfig$auth43.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee105(otpCode) {
+                      var _onContinue = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee107(otpCode) {
                         var _yield$verifyOtp, verificationToken, res, _t14;
-                        return _regenerator().w(function (_context105) {
-                          while (1) switch (_context105.p = _context105.n) {
+                        return _regenerator().w(function (_context107) {
+                          while (1) switch (_context107.p = _context107.n) {
                             case 0:
-                              _context105.p = 0;
-                              _context105.n = 1;
+                              _context107.p = 0;
+                              _context107.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -4903,9 +4949,9 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Sms
                               });
                             case 1:
-                              _yield$verifyOtp = _context105.v;
+                              _yield$verifyOtp = _context107.v;
                               verificationToken = _yield$verifyOtp.verificationToken;
-                              _context105.n = 2;
+                              _context107.n = 2;
                               return updateUserPhoneNumber(_objectSpread2({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
@@ -4915,21 +4961,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               }));
                             case 2:
-                              res = _context105.v;
+                              res = _context107.v;
                               onSuccess();
                               resolve(res);
-                              _context105.n = 4;
+                              _context107.n = 4;
                               break;
                             case 3:
-                              _context105.p = 3;
-                              _t14 = _context105.v;
+                              _context107.p = 3;
+                              _t14 = _context107.v;
                               reject(_t14);
                             case 4:
-                              return _context105.a(2);
+                              return _context107.a(2);
                           }
-                        }, _callee105, null, [[0, 3]]);
+                        }, _callee107, null, [[0, 3]]);
                       }));
-                      function onContinue(_x89) {
+                      function onContinue(_x91) {
                         return _onContinue.apply(this, arguments);
                       }
                       return onContinue;
@@ -4948,54 +4994,54 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to update phone number"));
           case 10:
-            _context106.n = 13;
+            _context108.n = 13;
             break;
           case 11:
-            _context106.p = 11;
-            _t15 = _context106.v;
+            _context108.p = 11;
+            _t15 = _context108.v;
             if (!(_t15 instanceof TurnkeyError)) {
-              _context106.n = 12;
+              _context108.n = 12;
               break;
             }
             throw _t15;
           case 12:
             throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t15);
           case 13:
-            return _context106.a(2);
+            return _context108.a(2);
         }
-      }, _callee106, null, [[7, 11]]);
+      }, _callee108, null, [[7, 11]]);
     }));
-    return function (_x88) {
-      return _ref122.apply(this, arguments);
+    return function (_x90) {
+      return _ref124.apply(this, arguments);
     };
   }(), [client, masterConfig, getSession, pushPage, closeModal, logout, initOtp, verifyOtp, updateUserPhoneNumber, user, callbacks]);
   var handleUpdateUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref124 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee108(params) {
-      var _ref125, _ref125$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t17;
-      return _regenerator().w(function (_context108) {
-        while (1) switch (_context108.p = _context108.n) {
+    var _ref126 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee110(params) {
+      var _ref127, _ref127$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t17;
+      return _regenerator().w(function (_context110) {
+        while (1) switch (_context110.p = _context110.n) {
           case 0:
-            _ref125 = params || {}, _ref125$successPageDu = _ref125.successPageDuration, successPageDuration = _ref125$successPageDu === void 0 ? 2000 : _ref125$successPageDu, subTitle = _ref125.subTitle, title = _ref125.title, stampWith = _ref125.stampWith;
+            _ref127 = params || {}, _ref127$successPageDu = _ref127.successPageDuration, successPageDuration = _ref127$successPageDu === void 0 ? 2000 : _ref127$successPageDu, subTitle = _ref127.subTitle, title = _ref127.title, stampWith = _ref127.stampWith;
             if (client) {
-              _context108.n = 1;
+              _context110.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context108.n = 2;
+            _context110.n = 2;
             return getSession();
           case 2:
-            s = _context108.v;
+            s = _context110.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context108.n = 3;
+              _context110.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context108.n = 4;
+              _context110.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to update an email.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5015,12 +5061,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context108.p = 5;
+            _context110.p = 5;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context108.n = 6;
+              _context110.n = 6;
               break;
             }
-            return _context108.a(2, withTurnkeyErrorHandling(function () {
+            return _context110.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Update Email",
@@ -5048,14 +5094,14 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context108.n = 7;
+            _context110.n = 7;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 7:
-            otpId = _context108.v;
-            return _context108.a(2, withTurnkeyErrorHandling(function () {
+            otpId = _context110.v;
+            return _context110.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 var _masterConfig$auth44, _masterConfig$auth45;
                 pushPage({
@@ -5067,13 +5113,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth44 = masterConfig.auth) === null || _masterConfig$auth44 === void 0 ? void 0 : _masterConfig$auth44.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
                     alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth45 = masterConfig.auth) === null || _masterConfig$auth45 === void 0 ? void 0 : _masterConfig$auth45.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee107(otpCode) {
+                      var _onContinue2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee109(otpCode) {
                         var _yield$verifyOtp2, verificationToken, res, _t16;
-                        return _regenerator().w(function (_context107) {
-                          while (1) switch (_context107.p = _context107.n) {
+                        return _regenerator().w(function (_context109) {
+                          while (1) switch (_context109.p = _context109.n) {
                             case 0:
-                              _context107.p = 0;
-                              _context107.n = 1;
+                              _context109.p = 0;
+                              _context109.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -5081,9 +5127,9 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Email
                               });
                             case 1:
-                              _yield$verifyOtp2 = _context107.v;
+                              _yield$verifyOtp2 = _context109.v;
                               verificationToken = _yield$verifyOtp2.verificationToken;
-                              _context107.n = 2;
+                              _context109.n = 2;
                               return updateUserEmail(_objectSpread2({
                                 email: params.email,
                                 verificationToken: verificationToken,
@@ -5093,21 +5139,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               }));
                             case 2:
-                              res = _context107.v;
+                              res = _context109.v;
                               onSuccess();
                               resolve(res);
-                              _context107.n = 4;
+                              _context109.n = 4;
                               break;
                             case 3:
-                              _context107.p = 3;
-                              _t16 = _context107.v;
+                              _context109.p = 3;
+                              _t16 = _context109.v;
                               reject(_t16);
                             case 4:
-                              return _context107.a(2);
+                              return _context109.a(2);
                           }
-                        }, _callee107, null, [[0, 3]]);
+                        }, _callee109, null, [[0, 3]]);
                       }));
-                      function onContinue(_x91) {
+                      function onContinue(_x93) {
                         return _onContinue2.apply(this, arguments);
                       }
                       return onContinue;
@@ -5124,54 +5170,54 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to update email"));
           case 8:
-            _context108.n = 11;
+            _context110.n = 11;
             break;
           case 9:
-            _context108.p = 9;
-            _t17 = _context108.v;
+            _context110.p = 9;
+            _t17 = _context110.v;
             if (!(_t17 instanceof TurnkeyError)) {
-              _context108.n = 10;
+              _context110.n = 10;
               break;
             }
             throw _t17;
           case 10:
             throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t17);
           case 11:
-            return _context108.a(2);
+            return _context110.a(2);
         }
-      }, _callee108, null, [[5, 9]]);
+      }, _callee110, null, [[5, 9]]);
     }));
-    return function (_x90) {
-      return _ref124.apply(this, arguments);
+    return function (_x92) {
+      return _ref126.apply(this, arguments);
     };
   }(), [client, getSession, pushPage, closeModal, logout, initOtp, masterConfig, verifyOtp, updateUserEmail, user, callbacks]);
   var handleAddEmail = 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, _t19;
-      return _regenerator().w(function (_context110) {
-        while (1) switch (_context110.p = _context110.n) {
+    var _ref128 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee112(params) {
+      var _ref129, _ref129$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t19;
+      return _regenerator().w(function (_context112) {
+        while (1) switch (_context112.p = _context112.n) {
           case 0:
-            _ref127 = params || {}, _ref127$successPageDu = _ref127.successPageDuration, successPageDuration = _ref127$successPageDu === void 0 ? 2000 : _ref127$successPageDu, subTitle = _ref127.subTitle, title = _ref127.title, stampWith = _ref127.stampWith;
+            _ref129 = params || {}, _ref129$successPageDu = _ref129.successPageDuration, successPageDuration = _ref129$successPageDu === void 0 ? 2000 : _ref129$successPageDu, subTitle = _ref129.subTitle, title = _ref129.title, stampWith = _ref129.stampWith;
             if (client) {
-              _context110.n = 1;
+              _context112.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context110.n = 2;
+            _context112.n = 2;
             return getSession();
           case 2:
-            s = _context110.v;
+            s = _context112.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context110.n = 3;
+              _context112.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context110.n = 4;
+              _context112.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to add an email.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5191,12 +5237,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context110.p = 5;
+            _context112.p = 5;
             if (!(!(params !== null && params !== void 0 && params.email) && (params === null || params === void 0 ? void 0 : params.email) !== "")) {
-              _context110.n = 6;
+              _context112.n = 6;
               break;
             }
-            return _context110.a(2, withTurnkeyErrorHandling(function () {
+            return _context112.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Email",
@@ -5224,14 +5270,14 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }));
           case 6:
-            _context110.n = 7;
+            _context112.n = 7;
             return initOtp({
               otpType: OtpType.Email,
               contact: params.email
             });
           case 7:
-            otpId = _context110.v;
-            return _context110.a(2, withTurnkeyErrorHandling(function () {
+            otpId = _context112.v;
+            return _context112.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 var _masterConfig$auth46, _masterConfig$auth47;
                 pushPage({
@@ -5243,13 +5289,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     otpLength: (masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth46 = masterConfig.auth) === null || _masterConfig$auth46 === void 0 ? void 0 : _masterConfig$auth46.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
                     alphanumeric: masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth47 = masterConfig.auth) === null || _masterConfig$auth47 === void 0 ? void 0 : _masterConfig$auth47.otpAlphanumeric,
                     onContinue: function () {
-                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee109(otpCode) {
+                      var _onContinue3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee111(otpCode) {
                         var _yield$verifyOtp3, verificationToken, res, _t18;
-                        return _regenerator().w(function (_context109) {
-                          while (1) switch (_context109.p = _context109.n) {
+                        return _regenerator().w(function (_context111) {
+                          while (1) switch (_context111.p = _context111.n) {
                             case 0:
-                              _context109.p = 0;
-                              _context109.n = 1;
+                              _context111.p = 0;
+                              _context111.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -5257,9 +5303,9 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Email
                               });
                             case 1:
-                              _yield$verifyOtp3 = _context109.v;
+                              _yield$verifyOtp3 = _context111.v;
                               verificationToken = _yield$verifyOtp3.verificationToken;
-                              _context109.n = 2;
+                              _context111.n = 2;
                               return updateUserEmail({
                                 email: params.email,
                                 verificationToken: verificationToken,
@@ -5268,21 +5314,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               });
                             case 2:
-                              res = _context109.v;
+                              res = _context111.v;
                               onSuccess();
                               resolve(res);
-                              _context109.n = 4;
+                              _context111.n = 4;
                               break;
                             case 3:
-                              _context109.p = 3;
-                              _t18 = _context109.v;
+                              _context111.p = 3;
+                              _t18 = _context111.v;
                               reject(_t18);
                             case 4:
-                              return _context109.a(2);
+                              return _context111.a(2);
                           }
-                        }, _callee109, null, [[0, 3]]);
+                        }, _callee111, null, [[0, 3]]);
                       }));
-                      function onContinue(_x93) {
+                      function onContinue(_x95) {
                         return _onContinue3.apply(this, arguments);
                       }
                       return onContinue;
@@ -5299,67 +5345,67 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add email"));
           case 8:
-            _context110.n = 11;
+            _context112.n = 11;
             break;
           case 9:
-            _context110.p = 9;
-            _t19 = _context110.v;
+            _context112.p = 9;
+            _t19 = _context112.v;
             if (!(_t19 instanceof TurnkeyError)) {
-              _context110.n = 10;
+              _context112.n = 10;
               break;
             }
             throw _t19;
           case 10:
             throw new TurnkeyError("Failed to initialize OTP for email verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t19);
           case 11:
-            return _context110.a(2);
+            return _context112.a(2);
         }
-      }, _callee110, null, [[5, 9]]);
+      }, _callee112, null, [[5, 9]]);
     }));
-    return function (_x92) {
-      return _ref126.apply(this, arguments);
+    return function (_x94) {
+      return _ref128.apply(this, arguments);
     };
   }(), [client, getSession, pushPage, closeModal, user, logout, initOtp, masterConfig, verifyOtp, updateUserEmail, callbacks]);
   var handleAddPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref128 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee112(params) {
+    var _ref130 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee114(params) {
       var _masterConfig$auth48, _masterConfig$auth48$;
-      var _ref129, _ref129$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t21;
-      return _regenerator().w(function (_context112) {
-        while (1) switch (_context112.p = _context112.n) {
+      var _ref131, _ref131$successPageDu, successPageDuration, subTitle, title, stampWith, s, organizationId, userId, onSuccess, otpId, _t21;
+      return _regenerator().w(function (_context114) {
+        while (1) switch (_context114.p = _context114.n) {
           case 0:
-            _ref129 = params || {}, _ref129$successPageDu = _ref129.successPageDuration, successPageDuration = _ref129$successPageDu === void 0 ? 2000 : _ref129$successPageDu, subTitle = _ref129.subTitle, title = _ref129.title, stampWith = _ref129.stampWith;
+            _ref131 = params || {}, _ref131$successPageDu = _ref131.successPageDuration, successPageDuration = _ref131$successPageDu === void 0 ? 2000 : _ref131$successPageDu, subTitle = _ref131.subTitle, title = _ref131.title, stampWith = _ref131.stampWith;
             if (client) {
-              _context112.n = 1;
+              _context114.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             if (masterConfig) {
-              _context112.n = 2;
+              _context114.n = 2;
               break;
             }
             throw new TurnkeyError("Config is not ready yet!", TurnkeyErrorCodes.CONFIG_NOT_INITIALIZED);
           case 2:
             if ((_masterConfig$auth48 = masterConfig.auth) !== null && _masterConfig$auth48 !== void 0 && (_masterConfig$auth48$ = _masterConfig$auth48.methods) !== null && _masterConfig$auth48$ !== void 0 && _masterConfig$auth48$.smsOtpAuthEnabled) {
-              _context112.n = 3;
+              _context114.n = 3;
               break;
             }
             throw new TurnkeyError("SMS OTP authentication is not enabled in the configuration.", TurnkeyErrorCodes.AUTH_METHOD_NOT_ENABLED);
           case 3:
-            _context112.n = 4;
+            _context114.n = 4;
             return getSession();
           case 4:
-            s = _context112.v;
+            s = _context114.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context112.n = 5;
+              _context114.n = 5;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 5:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context112.n = 6;
+              _context114.n = 6;
               break;
             }
             throw new TurnkeyError("A user ID is required to add a phone number.", TurnkeyErrorCodes.INVALID_REQUEST);
@@ -5379,12 +5425,12 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             };
-            _context112.p = 7;
+            _context114.p = 7;
             if (!(!(params !== null && params !== void 0 && params.phoneNumber) && (params === null || params === void 0 ? void 0 : params.phoneNumber) !== "")) {
-              _context112.n = 8;
+              _context114.n = 8;
               break;
             }
-            return _context112.a(2, withTurnkeyErrorHandling(function () {
+            return _context114.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Add Phone Number",
@@ -5412,14 +5458,14 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add phone number"));
           case 8:
-            _context112.n = 9;
+            _context114.n = 9;
             return initOtp({
               otpType: OtpType.Sms,
               contact: params.phoneNumber
             });
           case 9:
-            otpId = _context112.v;
-            return _context112.a(2, withTurnkeyErrorHandling(function () {
+            otpId = _context114.v;
+            return _context114.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 var _masterConfig$auth49, _masterConfig$auth50;
                 pushPage({
@@ -5431,13 +5477,13 @@ var ClientProvider = function ClientProvider(_ref) {
                     otpLength: ((_masterConfig$auth49 = masterConfig.auth) === null || _masterConfig$auth49 === void 0 ? void 0 : _masterConfig$auth49.otpLength) !== undefined ? Number(masterConfig.auth.otpLength) : undefined,
                     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 _callee111(otpCode) {
+                      var _onContinue4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee113(otpCode) {
                         var _yield$verifyOtp4, verificationToken, res, _t20;
-                        return _regenerator().w(function (_context111) {
-                          while (1) switch (_context111.p = _context111.n) {
+                        return _regenerator().w(function (_context113) {
+                          while (1) switch (_context113.p = _context113.n) {
                             case 0:
-                              _context111.p = 0;
-                              _context111.n = 1;
+                              _context113.p = 0;
+                              _context113.n = 1;
                               return verifyOtp({
                                 otpId: otpId,
                                 otpCode: otpCode,
@@ -5445,9 +5491,9 @@ var ClientProvider = function ClientProvider(_ref) {
                                 otpType: OtpType.Sms
                               });
                             case 1:
-                              _yield$verifyOtp4 = _context111.v;
+                              _yield$verifyOtp4 = _context113.v;
                               verificationToken = _yield$verifyOtp4.verificationToken;
-                              _context111.n = 2;
+                              _context113.n = 2;
                               return updateUserPhoneNumber({
                                 phoneNumber: params.phoneNumber,
                                 verificationToken: verificationToken,
@@ -5456,21 +5502,21 @@ var ClientProvider = function ClientProvider(_ref) {
                                 stampWith: stampWith
                               });
                             case 2:
-                              res = _context111.v;
+                              res = _context113.v;
                               onSuccess();
                               resolve(res);
-                              _context111.n = 4;
+                              _context113.n = 4;
                               break;
                             case 3:
-                              _context111.p = 3;
-                              _t20 = _context111.v;
+                              _context113.p = 3;
+                              _t20 = _context113.v;
                               reject(_t20);
                             case 4:
-                              return _context111.a(2);
+                              return _context113.a(2);
                           }
-                        }, _callee111, null, [[0, 3]]);
+                        }, _callee113, null, [[0, 3]]);
                       }));
-                      function onContinue(_x95) {
+                      function onContinue(_x97) {
                         return _onContinue4.apply(this, arguments);
                       }
                       return onContinue;
@@ -5489,52 +5535,52 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to add phone number"));
           case 10:
-            _context112.n = 13;
+            _context114.n = 13;
             break;
           case 11:
-            _context112.p = 11;
-            _t21 = _context112.v;
+            _context114.p = 11;
+            _t21 = _context114.v;
             if (!(_t21 instanceof TurnkeyError)) {
-              _context112.n = 12;
+              _context114.n = 12;
               break;
             }
             throw _t21;
           case 12:
             throw new TurnkeyError("Failed to initialize OTP for sms verification.", TurnkeyErrorCodes.INIT_OTP_ERROR, _t21);
           case 13:
-            return _context112.a(2);
+            return _context114.a(2);
         }
-      }, _callee112, null, [[7, 11]]);
+      }, _callee114, null, [[7, 11]]);
     }));
-    return function (_x94) {
-      return _ref128.apply(this, arguments);
+    return function (_x96) {
+      return _ref130.apply(this, arguments);
     };
   }(), [client, masterConfig, getSession, pushPage, closeModal, user, logout, callbacks, initOtp, verifyOtp, updateUserPhoneNumber]);
   var handleRemovePasskey = useCallback(/*#__PURE__*/function () {
-    var _ref130 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee113(params) {
+    var _ref132 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee115(params) {
       var authenticatorId, _params$successPageDu2, successPageDuration, subTitle, title, stampWith, userId, s, organizationId;
-      return _regenerator().w(function (_context113) {
-        while (1) switch (_context113.n) {
+      return _regenerator().w(function (_context115) {
+        while (1) switch (_context115.n) {
           case 0:
             authenticatorId = params.authenticatorId, _params$successPageDu2 = params.successPageDuration, successPageDuration = _params$successPageDu2 === void 0 ? 2000 : _params$successPageDu2, subTitle = params.subTitle, title = params.title, stampWith = params.stampWith, userId = params.userId;
             if (client) {
-              _context113.n = 1;
+              _context115.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context113.n = 2;
+            _context115.n = 2;
             return getSession();
           case 2:
-            s = _context113.v;
+            s = _context115.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context113.n = 3;
+              _context115.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
-            return _context113.a(2, withTurnkeyErrorHandling(function () {
+            return _context115.a(2, withTurnkeyErrorHandling(function () {
               return new Promise(function (resolve, reject) {
                 pushPage({
                   key: "Remove Passkey",
@@ -5565,44 +5611,44 @@ var ClientProvider = function ClientProvider(_ref) {
               return logout();
             }, callbacks, "Failed to remove passkey"));
         }
-      }, _callee113);
+      }, _callee115);
     }));
-    return function (_x96) {
-      return _ref130.apply(this, arguments);
+    return function (_x98) {
+      return _ref132.apply(this, arguments);
     };
   }(), [client, getSession, pushPage, logout, callbacks]);
   var handleAddPasskey = useCallback(/*#__PURE__*/function () {
-    var _ref131 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee114(params) {
-      var _ref132, name, displayName, _ref132$successPageDu, successPageDuration, stampWith, s, organizationId, userId, resPromise, _t22;
-      return _regenerator().w(function (_context114) {
-        while (1) switch (_context114.p = _context114.n) {
+    var _ref133 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee116(params) {
+      var _ref134, name, displayName, _ref134$successPageDu, successPageDuration, stampWith, s, organizationId, userId, resPromise, _t22;
+      return _regenerator().w(function (_context116) {
+        while (1) switch (_context116.p = _context116.n) {
           case 0:
-            _ref132 = params || {}, name = _ref132.name, displayName = _ref132.displayName, _ref132$successPageDu = _ref132.successPageDuration, successPageDuration = _ref132$successPageDu === void 0 ? 2000 : _ref132$successPageDu, stampWith = _ref132.stampWith;
+            _ref134 = params || {}, name = _ref134.name, displayName = _ref134.displayName, _ref134$successPageDu = _ref134.successPageDuration, successPageDuration = _ref134$successPageDu === void 0 ? 2000 : _ref134$successPageDu, stampWith = _ref134.stampWith;
             if (client) {
-              _context114.n = 1;
+              _context116.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context114.n = 2;
+            _context116.n = 2;
             return getSession();
           case 2:
-            s = _context114.v;
+            s = _context116.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context114.n = 3;
+              _context116.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context114.n = 4;
+              _context116.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID or a valid session is required to add a passkey.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 4:
-            _context114.p = 4;
+            _context116.p = 4;
             resPromise = addPasskey(_objectSpread2(_objectSpread2(_objectSpread2({}, name && {
               name: name
             }), displayName && {
@@ -5627,55 +5673,55 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false
               });
             });
-            _context114.n = 5;
+            _context116.n = 5;
             return resPromise;
           case 5:
-            return _context114.a(2, _context114.v);
+            return _context116.a(2, _context116.v);
           case 6:
-            _context114.p = 6;
-            _t22 = _context114.v;
+            _context116.p = 6;
+            _t22 = _context116.v;
             if (!(_t22 instanceof TurnkeyError)) {
-              _context114.n = 7;
+              _context116.n = 7;
               break;
             }
             throw _t22;
           case 7:
             throw new TurnkeyError("Failed to add passkey in handler.", TurnkeyErrorCodes.ADD_PASSKEY_ERROR, _t22);
           case 8:
-            return _context114.a(2);
+            return _context116.a(2);
         }
-      }, _callee114, null, [[4, 6]]);
+      }, _callee116, null, [[4, 6]]);
     }));
-    return function (_x97) {
-      return _ref131.apply(this, arguments);
+    return function (_x99) {
+      return _ref133.apply(this, arguments);
     };
   }(), [client, getSession, addPasskey, pushPage, closeModal]);
   var handleRemoveOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref133 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee115(params) {
+    var _ref135 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee117(params) {
       var providerId, _params$successPageDu3, successPageDuration, subTitle, title, stampWith, s, organizationId, _t23;
-      return _regenerator().w(function (_context115) {
-        while (1) switch (_context115.p = _context115.n) {
+      return _regenerator().w(function (_context117) {
+        while (1) switch (_context117.p = _context117.n) {
           case 0:
             providerId = params.providerId, _params$successPageDu3 = params.successPageDuration, successPageDuration = _params$successPageDu3 === void 0 ? 2000 : _params$successPageDu3, subTitle = params.subTitle, title = params.title, stampWith = params.stampWith;
             if (client) {
-              _context115.n = 1;
+              _context117.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
-            _context115.n = 2;
+            _context117.n = 2;
             return getSession();
           case 2:
-            s = _context115.v;
+            s = _context117.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context115.n = 3;
+              _context117.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
-            _context115.p = 3;
-            return _context115.a(2, new Promise(function (resolve, reject) {
+            _context117.p = 3;
+            return _context117.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove OAuth Provider",
                 content: jsx(RemoveOAuthProvider, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5703,69 +5749,69 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 4:
-            _context115.p = 4;
-            _t23 = _context115.v;
+            _context117.p = 4;
+            _t23 = _context117.v;
             if (!(_t23 instanceof TurnkeyError)) {
-              _context115.n = 5;
+              _context117.n = 5;
               break;
             }
             throw _t23;
           case 5:
             throw new TurnkeyError("Failed to remove OAuth provider in handler.", TurnkeyErrorCodes.REMOVE_OAUTH_PROVIDER_ERROR, _t23);
           case 6:
-            return _context115.a(2);
+            return _context117.a(2);
         }
-      }, _callee115, null, [[3, 4]]);
+      }, _callee117, null, [[3, 4]]);
     }));
-    return function (_x98) {
-      return _ref133.apply(this, arguments);
+    return function (_x100) {
+      return _ref135.apply(this, arguments);
     };
   }(), [client, getSession, pushPage]);
   var handleAddOauthProvider = useCallback(/*#__PURE__*/function () {
-    var _ref134 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee118(params) {
+    var _ref136 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee120(params) {
       var _masterConfig$auth$oa7, _masterConfig$auth51, _masterConfig$auth51$;
       var providerName, stampWith, _params$successPageDu4, successPageDuration, _params$openInPage, openInPage, s, organizationId, userId;
-      return _regenerator().w(function (_context118) {
-        while (1) switch (_context118.n) {
+      return _regenerator().w(function (_context120) {
+        while (1) switch (_context120.n) {
           case 0:
             if (client) {
-              _context118.n = 1;
+              _context120.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             providerName = params.providerName, stampWith = params.stampWith, _params$successPageDu4 = params.successPageDuration, successPageDuration = _params$successPageDu4 === void 0 ? 2000 : _params$successPageDu4, _params$openInPage = params.openInPage, openInPage = _params$openInPage === void 0 ? (_masterConfig$auth$oa7 = masterConfig === null || masterConfig === void 0 ? void 0 : (_masterConfig$auth51 = masterConfig.auth) === null || _masterConfig$auth51 === void 0 ? void 0 : (_masterConfig$auth51$ = _masterConfig$auth51.oauthConfig) === null || _masterConfig$auth51$ === void 0 ? void 0 : _masterConfig$auth51$.openOauthInPage) !== null && _masterConfig$auth$oa7 !== void 0 ? _masterConfig$auth$oa7 : false : _params$openInPage;
-            _context118.n = 2;
+            _context120.n = 2;
             return getSession();
           case 2:
-            s = _context118.v;
+            s = _context120.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context118.n = 3;
+              _context120.n = 3;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 3:
             userId = (params === null || params === void 0 ? void 0 : params.userId) || (s === null || s === void 0 ? void 0 : s.userId);
             if (userId) {
-              _context118.n = 4;
+              _context120.n = 4;
               break;
             }
             throw new TurnkeyError("A user ID is required to add an OAuth provider.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 4:
-            return _context118.a(2, new Promise(/*#__PURE__*/function () {
-              var _ref135 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee117(resolve, reject) {
+            return _context120.a(2, new Promise(/*#__PURE__*/function () {
+              var _ref137 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee119(resolve, reject) {
                 var onOauthSuccess, additionalState, _t24, _t25;
-                return _regenerator().w(function (_context117) {
-                  while (1) switch (_context117.p = _context117.n) {
+                return _regenerator().w(function (_context119) {
+                  while (1) switch (_context119.p = _context119.n) {
                     case 0:
-                      _context117.p = 0;
+                      _context119.p = 0;
                       onOauthSuccess = /*#__PURE__*/function () {
-                        var _ref136 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee116(params) {
-                          return _regenerator().w(function (_context116) {
-                            while (1) switch (_context116.n) {
+                        var _ref138 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee118(params) {
+                          return _regenerator().w(function (_context118) {
+                            while (1) switch (_context118.n) {
                               case 0:
-                                _context116.n = 1;
+                                _context118.n = 1;
                                 return addOauthProvider({
                                   providerName: params.providerName,
                                   oidcToken: params.oidcToken,
@@ -5788,12 +5834,12 @@ var ClientProvider = function ClientProvider(_ref) {
                                   showTitle: false
                                 });
                               case 2:
-                                return _context116.a(2);
+                                return _context118.a(2);
                             }
-                          }, _callee116);
+                          }, _callee118);
                         }));
-                        return function onOauthSuccess(_x102) {
-                          return _ref136.apply(this, arguments);
+                        return function onOauthSuccess(_x104) {
+                          return _ref138.apply(this, arguments);
                         };
                       }();
                       if (openInPage) {
@@ -5812,10 +5858,10 @@ var ClientProvider = function ClientProvider(_ref) {
                         openModal: "true"
                       }) : undefined;
                       _t24 = providerName;
-                      _context117.n = _t24 === OAuthProviders.DISCORD ? 1 : _t24 === OAuthProviders.X ? 3 : _t24 === OAuthProviders.GOOGLE ? 5 : _t24 === OAuthProviders.APPLE ? 7 : _t24 === OAuthProviders.FACEBOOK ? 9 : 11;
+                      _context119.n = _t24 === OAuthProviders.DISCORD ? 1 : _t24 === OAuthProviders.X ? 3 : _t24 === OAuthProviders.GOOGLE ? 5 : _t24 === OAuthProviders.APPLE ? 7 : _t24 === OAuthProviders.FACEBOOK ? 9 : 11;
                       break;
                     case 1:
-                      _context117.n = 2;
+                      _context119.n = 2;
                       return handleDiscordOauth(_objectSpread2(_objectSpread2({
                         openInPage: openInPage
                       }, additionalState && {
@@ -5824,9 +5870,9 @@ var ClientProvider = function ClientProvider(_ref) {
                         onOauthSuccess: onOauthSuccess
                       }));
                     case 2:
-                      return _context117.a(2, _context117.v);
+                      return _context119.a(2, _context119.v);
                     case 3:
-                      _context117.n = 4;
+                      _context119.n = 4;
                       return handleXOauth(_objectSpread2(_objectSpread2({
                         openInPage: openInPage
                       }, additionalState && {
@@ -5835,9 +5881,9 @@ var ClientProvider = function ClientProvider(_ref) {
                         onOauthSuccess: onOauthSuccess
                       }));
                     case 4:
-                      return _context117.a(2, _context117.v);
+                      return _context119.a(2, _context119.v);
                     case 5:
-                      _context117.n = 6;
+                      _context119.n = 6;
                       return handleGoogleOauth(_objectSpread2(_objectSpread2({
                         openInPage: openInPage
                       }, additionalState && {
@@ -5846,9 +5892,9 @@ var ClientProvider = function ClientProvider(_ref) {
                         onOauthSuccess: onOauthSuccess
                       }));
                     case 6:
-                      return _context117.a(2, _context117.v);
+                      return _context119.a(2, _context119.v);
                     case 7:
-                      _context117.n = 8;
+                      _context119.n = 8;
                       return handleAppleOauth(_objectSpread2(_objectSpread2({
                         openInPage: openInPage
                       }, additionalState && {
@@ -5857,9 +5903,9 @@ var ClientProvider = function ClientProvider(_ref) {
                         onOauthSuccess: onOauthSuccess
                       }));
                     case 8:
-                      return _context117.a(2, _context117.v);
+                      return _context119.a(2, _context119.v);
                     case 9:
-                      _context117.n = 10;
+                      _context119.n = 10;
                       return handleFacebookOauth(_objectSpread2(_objectSpread2({
                         openInPage: openInPage
                       }, additionalState && {
@@ -5868,53 +5914,53 @@ var ClientProvider = function ClientProvider(_ref) {
                         onOauthSuccess: onOauthSuccess
                       }));
                     case 10:
-                      return _context117.a(2, _context117.v);
+                      return _context119.a(2, _context119.v);
                     case 11:
                       throw new TurnkeyError("Unsupported OAuth provider: ".concat(providerName), TurnkeyErrorCodes.NOT_FOUND);
                     case 12:
-                      _context117.n = 14;
+                      _context119.n = 14;
                       break;
                     case 13:
-                      _context117.p = 13;
-                      _t25 = _context117.v;
+                      _context119.p = 13;
+                      _t25 = _context119.v;
                       reject(_t25);
                     case 14:
-                      return _context117.a(2);
+                      return _context119.a(2);
                   }
-                }, _callee117, null, [[0, 13]]);
+                }, _callee119, null, [[0, 13]]);
               }));
-              return function (_x100, _x101) {
-                return _ref135.apply(this, arguments);
+              return function (_x102, _x103) {
+                return _ref137.apply(this, arguments);
               };
             }()));
         }
-      }, _callee118);
+      }, _callee120);
     }));
-    return function (_x99) {
-      return _ref134.apply(this, arguments);
+    return function (_x101) {
+      return _ref136.apply(this, arguments);
     };
   }(), [client, getSession, addOauthProvider, pushPage, closeModal, handleDiscordOauth, handleXOauth, handleGoogleOauth, handleAppleOauth, handleFacebookOauth]);
   var handleConnectExternalWallet = useCallback(/*#__PURE__*/function () {
-    var _ref137 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee119(params) {
+    var _ref139 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee121(params) {
       var _masterConfig$walletC4, _masterConfig$walletC5;
-      var _ref138, _ref138$successPageDu, successPageDuration;
-      return _regenerator().w(function (_context119) {
-        while (1) switch (_context119.n) {
+      var _ref140, _ref140$successPageDu, successPageDuration;
+      return _regenerator().w(function (_context121) {
+        while (1) switch (_context121.n) {
           case 0:
-            _ref138 = params || {}, _ref138$successPageDu = _ref138.successPageDuration, successPageDuration = _ref138$successPageDu === void 0 ? 2000 : _ref138$successPageDu;
+            _ref140 = params || {}, _ref140$successPageDu = _ref140.successPageDuration, successPageDuration = _ref140$successPageDu === void 0 ? 2000 : _ref140$successPageDu;
             if (client) {
-              _context119.n = 1;
+              _context121.n = 1;
               break;
             }
             throw new TurnkeyError("Client is not initialized.", TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
           case 1:
             if (masterConfig !== null && masterConfig !== void 0 && (_masterConfig$walletC4 = masterConfig.walletConfig) !== null && _masterConfig$walletC4 !== void 0 && (_masterConfig$walletC5 = _masterConfig$walletC4.features) !== null && _masterConfig$walletC5 !== void 0 && _masterConfig$walletC5.connecting) {
-              _context119.n = 2;
+              _context121.n = 2;
               break;
             }
             throw new TurnkeyError("Wallet connecting is not enabled.", TurnkeyErrorCodes.FEATURE_NOT_ENABLED);
           case 2:
-            return _context119.a(2, new Promise(function (resolve, reject) {
+            return _context121.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Connect wallet",
                 content: jsx(ConnectWalletModal, {
@@ -5932,32 +5978,32 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee119);
+      }, _callee121);
     }));
-    return function (_x103) {
-      return _ref137.apply(this, arguments);
+    return function (_x105) {
+      return _ref139.apply(this, arguments);
     };
   }(), [client, masterConfig, fetchWalletProviders, pushPage]);
   var handleRemoveUserEmail = useCallback(/*#__PURE__*/function () {
-    var _ref139 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee120(params) {
-      var _ref140, _ref140$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t26;
-      return _regenerator().w(function (_context120) {
-        while (1) switch (_context120.p = _context120.n) {
+    var _ref141 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee122(params) {
+      var _ref142, _ref142$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t26;
+      return _regenerator().w(function (_context122) {
+        while (1) switch (_context122.p = _context122.n) {
           case 0:
-            _ref140 = params || {}, _ref140$successPageDu = _ref140.successPageDuration, successPageDuration = _ref140$successPageDu === void 0 ? 2000 : _ref140$successPageDu, stampWith = _ref140.stampWith, userId = _ref140.userId;
-            _context120.n = 1;
+            _ref142 = params || {}, _ref142$successPageDu = _ref142.successPageDuration, successPageDuration = _ref142$successPageDu === void 0 ? 2000 : _ref142$successPageDu, stampWith = _ref142.stampWith, userId = _ref142.userId;
+            _context122.n = 1;
             return getSession();
           case 1:
-            s = _context120.v;
+            s = _context122.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context120.n = 2;
+              _context122.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context120.p = 2;
-            return _context120.a(2, new Promise(function (resolve, reject) {
+            _context122.p = 2;
+            return _context122.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Email",
                 content: jsx(RemoveEmail, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -5984,44 +6030,44 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context120.p = 3;
-            _t26 = _context120.v;
+            _context122.p = 3;
+            _t26 = _context122.v;
             if (!(_t26 instanceof TurnkeyError)) {
-              _context120.n = 4;
+              _context122.n = 4;
               break;
             }
             throw _t26;
           case 4:
             throw new TurnkeyError("Failed to remove user email.", TurnkeyErrorCodes.UPDATE_USER_EMAIL_ERROR, _t26);
           case 5:
-            return _context120.a(2);
+            return _context122.a(2);
         }
-      }, _callee120, null, [[2, 3]]);
+      }, _callee122, null, [[2, 3]]);
     }));
-    return function (_x104) {
-      return _ref139.apply(this, arguments);
+    return function (_x106) {
+      return _ref141.apply(this, arguments);
     };
   }(), [getSession, pushPage]);
   var handleRemoveUserPhoneNumber = useCallback(/*#__PURE__*/function () {
-    var _ref141 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee121(params) {
-      var _ref142, _ref142$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t27;
-      return _regenerator().w(function (_context121) {
-        while (1) switch (_context121.p = _context121.n) {
+    var _ref143 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee123(params) {
+      var _ref144, _ref144$successPageDu, successPageDuration, stampWith, userId, s, organizationId, _t27;
+      return _regenerator().w(function (_context123) {
+        while (1) switch (_context123.p = _context123.n) {
           case 0:
-            _ref142 = params || {}, _ref142$successPageDu = _ref142.successPageDuration, successPageDuration = _ref142$successPageDu === void 0 ? 2000 : _ref142$successPageDu, stampWith = _ref142.stampWith, userId = _ref142.userId;
-            _context121.n = 1;
+            _ref144 = params || {}, _ref144$successPageDu = _ref144.successPageDuration, successPageDuration = _ref144$successPageDu === void 0 ? 2000 : _ref144$successPageDu, stampWith = _ref144.stampWith, userId = _ref144.userId;
+            _context123.n = 1;
             return getSession();
           case 1:
-            s = _context121.v;
+            s = _context123.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context121.n = 2;
+              _context123.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context121.p = 2;
-            return _context121.a(2, new Promise(function (resolve, reject) {
+            _context123.p = 2;
+            return _context123.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Remove Phone Number",
                 content: jsx(RemovePhoneNumber, _objectSpread2(_objectSpread2(_objectSpread2({
@@ -6048,110 +6094,218 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context121.p = 3;
-            _t27 = _context121.v;
+            _context123.p = 3;
+            _t27 = _context123.v;
             if (!(_t27 instanceof TurnkeyError)) {
-              _context121.n = 4;
+              _context123.n = 4;
               break;
             }
             throw _t27;
           case 4:
             throw new TurnkeyError("Failed to remove user phone number.", TurnkeyErrorCodes.UPDATE_USER_PHONE_NUMBER_ERROR, _t27);
           case 5:
-            return _context121.a(2);
+            return _context123.a(2);
         }
-      }, _callee121, null, [[2, 3]]);
+      }, _callee123, null, [[2, 3]]);
     }));
-    return function (_x105) {
-      return _ref141.apply(this, arguments);
+    return function (_x107) {
+      return _ref143.apply(this, arguments);
     };
   }(), [getSession, pushPage]);
   var handleSendTransaction = useCallback(/*#__PURE__*/function () {
-    var _ref143 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee123(params) {
-      var session, organizationId, transaction, icon, stampWith, _params$successPageDu5, successPageDuration, from, to, caip2, value, data, nonce, gasLimit, maxFeePerGas, maxPriorityFeePerGas, sponsor, cleanedData;
-      return _regenerator().w(function (_context123) {
-        while (1) switch (_context123.n) {
+    var _ref145 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee126(params) {
+      var session, organizationId, transaction, icon, stampWith, _params$successPageDu5, successPageDuration, caip2, isSolanaTransaction;
+      return _regenerator().w(function (_context126) {
+        while (1) switch (_context126.n) {
           case 0:
-            _context123.n = 1;
+            _context126.n = 1;
             return getSession();
           case 1:
-            session = _context123.v;
+            session = _context126.v;
             organizationId = params.organizationId || (session === null || session === void 0 ? void 0 : session.organizationId);
             if (organizationId) {
-              _context123.n = 2;
+              _context126.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
             transaction = params.transaction, icon = params.icon, stampWith = params.stampWith, _params$successPageDu5 = params.successPageDuration, successPageDuration = _params$successPageDu5 === void 0 ? 2000 : _params$successPageDu5;
-            from = transaction.from, to = transaction.to, caip2 = transaction.caip2, value = transaction.value, data = transaction.data, nonce = transaction.nonce, gasLimit = transaction.gasLimit, maxFeePerGas = transaction.maxFeePerGas, maxPriorityFeePerGas = transaction.maxPriorityFeePerGas, sponsor = transaction.sponsor;
-            cleanedData = data && data !== "0x" && data !== "" ? data : undefined;
-            return _context123.a(2, new Promise(function (resolve, reject) {
+            caip2 = transaction.caip2;
+            isSolanaTransaction = caip2.startsWith("solana:");
+            return _context126.a(2, new Promise(function (resolve, reject) {
               var action = /*#__PURE__*/function () {
-                var _ref144 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee122() {
-                  var _pollResult$eth;
-                  var tx, sendTransactionStatusId, pollResult, txHash;
-                  return _regenerator().w(function (_context122) {
-                    while (1) switch (_context122.n) {
+                var _ref146 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee125() {
+                  var _pollResult$eth$txHas, _pollResult$eth;
+                  var sendTransactionStatusId, pollResult, txHash, _t28;
+                  return _regenerator().w(function (_context125) {
+                    while (1) switch (_context125.n) {
                       case 0:
-                        tx = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
-                          from: from,
-                          to: to,
-                          caip2: caip2,
-                          sponsor: sponsor !== null && sponsor !== void 0 ? sponsor : false
-                        }, value ? {
-                          value: value
-                        } : {}), cleanedData ? {
-                          data: cleanedData
-                        } : {}), nonce ? {
-                          nonce: nonce
-                        } : {}), gasLimit ? {
-                          gasLimit: gasLimit
-                        } : {}), maxFeePerGas ? {
-                          maxFeePerGas: maxFeePerGas
-                        } : {}), maxPriorityFeePerGas ? {
-                          maxPriorityFeePerGas: maxPriorityFeePerGas
+                        if (!isSolanaTransaction) {
+                          _context125.n = 2;
+                          break;
+                        }
+                        _context125.n = 1;
+                        return solSendTransaction({
+                          organizationId: organizationId,
+                          transaction: transaction,
+                          stampWith: stampWith
+                        });
+                      case 1:
+                        _t28 = _context125.v;
+                        _context125.n = 4;
+                        break;
+                      case 2:
+                        _context125.n = 3;
+                        return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee124() {
+                          var from, to, value, data, nonce, gasLimit, maxFeePerGas, maxPriorityFeePerGas, sponsor, cleanedData, tx;
+                          return _regenerator().w(function (_context124) {
+                            while (1) switch (_context124.n) {
+                              case 0:
+                                from = transaction.from, to = transaction.to, value = transaction.value, data = transaction.data, nonce = transaction.nonce, gasLimit = transaction.gasLimit, maxFeePerGas = transaction.maxFeePerGas, maxPriorityFeePerGas = transaction.maxPriorityFeePerGas, sponsor = transaction.sponsor;
+                                cleanedData = data && data !== "0x" && data !== "" ? data : undefined;
+                                tx = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+                                  from: from,
+                                  to: to,
+                                  caip2: caip2,
+                                  sponsor: sponsor !== null && sponsor !== void 0 ? sponsor : false
+                                }, value ? {
+                                  value: value
+                                } : {}), cleanedData ? {
+                                  data: cleanedData
+                                } : {}), nonce ? {
+                                  nonce: nonce
+                                } : {}), gasLimit ? {
+                                  gasLimit: gasLimit
+                                } : {}), maxFeePerGas ? {
+                                  maxFeePerGas: maxFeePerGas
+                                } : {}), maxPriorityFeePerGas ? {
+                                  maxPriorityFeePerGas: maxPriorityFeePerGas
+                                } : {});
+                                return _context124.a(2, ethSendTransaction({
+                                  organizationId: organizationId,
+                                  transaction: tx,
+                                  stampWith: stampWith
+                                }));
+                            }
+                          }, _callee124);
+                        }))();
+                      case 3:
+                        _t28 = _context125.v;
+                      case 4:
+                        sendTransactionStatusId = _t28;
+                        if (sendTransactionStatusId) {
+                          _context125.n = 5;
+                          break;
+                        }
+                        throw new TurnkeyError("Missing sendTransactionStatusId", TurnkeyErrorCodes.BAD_RESPONSE);
+                      case 5:
+                        _context125.n = 6;
+                        return pollTransactionStatus({
+                          organizationId: organizationId,
+                          sendTransactionStatusId: sendTransactionStatusId
+                        });
+                      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;
+                        return _context125.a(2, txHash ? {
+                          txHash: txHash
                         } : {});
-                        _context122.n = 1;
-                        return ethSendTransaction({
+                    }
+                  }, _callee125);
+                }));
+                return function action() {
+                  return _ref146.apply(this, arguments);
+                };
+              }();
+              pushPage({
+                key: "Send Transaction",
+                showTitle: false,
+                preventBack: true,
+                onClose: function onClose() {
+                  return reject(new TurnkeyError("User canceled the transaction.", TurnkeyErrorCodes.USER_CANCELED));
+                },
+                content: jsx(SendTransactionPage, {
+                  icon: icon !== null && icon !== void 0 ? icon : getChainLogo(caip2),
+                  action: action,
+                  caip2: caip2,
+                  successPageDuration: successPageDuration,
+                  onSuccess: function onSuccess() {
+                    return resolve();
+                  },
+                  onError: function onError(err) {
+                    return reject(err);
+                  }
+                })
+              });
+            }));
+        }
+      }, _callee126);
+    }));
+    return function (_x108) {
+      return _ref145.apply(this, arguments);
+    };
+  }(), [ethSendTransaction, getSession, pollTransactionStatus, pushPage, solSendTransaction]);
+  var handleSendErc20Transfer = useCallback(/*#__PURE__*/function () {
+    var _ref148 = _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) {
+          case 0:
+            _context128.n = 1;
+            return getSession();
+          case 1:
+            session = _context128.v;
+            organizationId = params.organizationId || (session === null || session === void 0 ? void 0 : session.organizationId);
+            if (organizationId) {
+              _context128.n = 2;
+              break;
+            }
+            throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
+          case 2:
+            transfer = params.transfer, icon = params.icon, stampWith = params.stampWith, _params$successPageDu6 = params.successPageDuration, successPageDuration = _params$successPageDu6 === void 0 ? 2000 : _params$successPageDu6;
+            caip2 = transfer.caip2;
+            return _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 sendTransactionStatusId, pollResult, txHash;
+                  return _regenerator().w(function (_context127) {
+                    while (1) switch (_context127.n) {
+                      case 0:
+                        _context127.n = 1;
+                        return ethSendErc20Transfer({
                           organizationId: organizationId,
-                          transaction: tx,
+                          transfer: transfer,
                           stampWith: stampWith
                         });
                       case 1:
-                        sendTransactionStatusId = _context122.v;
+                        sendTransactionStatusId = _context127.v;
                         if (sendTransactionStatusId) {
-                          _context122.n = 2;
+                          _context127.n = 2;
                           break;
                         }
-                        throw new TurnkeyError("Missing sendTransactionStatusId", TurnkeyErrorCodes.ETH_SEND_TRANSACTION_ERROR);
+                        throw new TurnkeyError("Missing sendTransactionStatusId", TurnkeyErrorCodes.BAD_RESPONSE);
                       case 2:
-                        _context122.n = 3;
+                        _context127.n = 3;
                         return pollTransactionStatus({
                           organizationId: organizationId,
                           sendTransactionStatusId: sendTransactionStatusId
                         });
                       case 3:
-                        pollResult = _context122.v;
-                        txHash = pollResult === null || pollResult === void 0 ? void 0 : (_pollResult$eth = pollResult.eth) === null || _pollResult$eth === void 0 ? void 0 : _pollResult$eth.txHash;
-                        if (txHash) {
-                          _context122.n = 4;
-                          break;
-                        }
-                        throw new TurnkeyError("Missing txHash in transaction result", TurnkeyErrorCodes.POLL_TRANSACTION_STATUS_ERROR);
-                      case 4:
-                        return _context122.a(2, {
+                        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;
+                        return _context127.a(2, txHash ? {
                           txHash: txHash
-                        });
+                        } : {});
                     }
-                  }, _callee122);
+                  }, _callee127);
                 }));
                 return function action() {
-                  return _ref144.apply(this, arguments);
+                  return _ref149.apply(this, arguments);
                 };
               }();
               pushPage({
-                key: "Send Transaction",
+                key: "Send ERC20 Transfer",
                 showTitle: false,
                 preventBack: true,
                 onClose: function onClose() {
@@ -6172,55 +6326,55 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee123);
+      }, _callee128);
     }));
-    return function (_x106) {
-      return _ref143.apply(this, arguments);
+    return function (_x109) {
+      return _ref148.apply(this, arguments);
     };
-  }(), [pushPage, client]);
+  }(), [ethSendErc20Transfer, getSession, pollTransactionStatus, pushPage]);
   var handleOnRamp = useCallback(/*#__PURE__*/function () {
-    var _ref145 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee126(params) {
+    var _ref150 = _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$successPageDu6, successPageDuration, _params$openInNewTab, openInNewTab, s, organizationId, cryptoCurrencyCode, network, openNewTab, _t30;
-      return _regenerator().w(function (_context126) {
-        while (1) switch (_context126.n) {
+      var walletAccount, fiatCurrencyAmount, fiatCurrencyCode, paymentMethod, countrySubdivisionCode, urlForSignature, countryCode, _params$onrampProvide, onrampProvider, _params$sandboxMode, sandboxMode, _params$successPageDu7, successPageDuration, _params$openInNewTab, openInNewTab, s, organizationId, cryptoCurrencyCode, network, openNewTab, _t31;
+      return _regenerator().w(function (_context131) {
+        while (1) switch (_context131.n) {
           case 0:
-            walletAccount = params.walletAccount, fiatCurrencyAmount = params.fiatCurrencyAmount, fiatCurrencyCode = params.fiatCurrencyCode, paymentMethod = params.paymentMethod, countrySubdivisionCode = params.countrySubdivisionCode, urlForSignature = params.urlForSignature, countryCode = params.countryCode, _params$onrampProvide = params.onrampProvider, onrampProvider = _params$onrampProvide === void 0 ? "FIAT_ON_RAMP_PROVIDER_MOONPAY" : _params$onrampProvide, _params$sandboxMode = params.sandboxMode, sandboxMode = _params$sandboxMode === void 0 ? true : _params$sandboxMode, _params$successPageDu6 = params.successPageDuration, successPageDuration = _params$successPageDu6 === void 0 ? 2000 : _params$successPageDu6, _params$openInNewTab = params.openInNewTab, openInNewTab = _params$openInNewTab === void 0 ? false : _params$openInNewTab;
-            _context126.n = 1;
+            walletAccount = params.walletAccount, fiatCurrencyAmount = params.fiatCurrencyAmount, fiatCurrencyCode = params.fiatCurrencyCode, paymentMethod = params.paymentMethod, countrySubdivisionCode = params.countrySubdivisionCode, urlForSignature = params.urlForSignature, countryCode = params.countryCode, _params$onrampProvide = params.onrampProvider, onrampProvider = _params$onrampProvide === void 0 ? "FIAT_ON_RAMP_PROVIDER_MOONPAY" : _params$onrampProvide, _params$sandboxMode = params.sandboxMode, sandboxMode = _params$sandboxMode === void 0 ? true : _params$sandboxMode, _params$successPageDu7 = params.successPageDuration, successPageDuration = _params$successPageDu7 === void 0 ? 2000 : _params$successPageDu7, _params$openInNewTab = params.openInNewTab, openInNewTab = _params$openInNewTab === void 0 ? false : _params$openInNewTab;
+            _context131.n = 1;
             return getSession();
           case 1:
-            s = _context126.v;
+            s = _context131.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context126.n = 2;
+              _context131.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _t30 = true;
-            _context126.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;
+            _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;
             break;
           case 3:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.ETHEREUM;
             network = FiatOnRampBlockchainNetwork.ETHEREUM;
-            return _context126.a(3, 7);
+            return _context131.a(3, 7);
           case 4:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.BITCOIN;
             network = FiatOnRampBlockchainNetwork.BITCOIN;
-            return _context126.a(3, 7);
+            return _context131.a(3, 7);
           case 5:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.SOLANA;
             network = FiatOnRampBlockchainNetwork.SOLANA;
-            return _context126.a(3, 7);
+            return _context131.a(3, 7);
           case 6:
             cryptoCurrencyCode = FiatOnRampCryptoCurrency.ETHEREUM;
             network = FiatOnRampBlockchainNetwork.ETHEREUM;
-            return _context126.a(3, 7);
+            return _context131.a(3, 7);
           case 7:
             openNewTab = openInNewTab || isMobile;
             cryptoCurrencyCode = params.cryptoCurrencyCode || cryptoCurrencyCode;
             network = params.network || network;
-            return _context126.a(2, new Promise(function (resolve, reject) {
+            return _context131.a(2, new Promise(function (resolve, reject) {
               var OnRampContainer = function OnRampContainer() {
                 var _useState15 = useState(false),
                   _useState16 = _slicedToArray(_useState15, 2),
@@ -6239,25 +6393,25 @@ var ClientProvider = function ClientProvider(_ref) {
                   };
                 }, []);
                 var action = /*#__PURE__*/function () {
-                  var _ref146 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee125() {
-                    var _client$httpClient, onRampWindow, result, popupWidth, popupHeight, left, top, onRampTransactionId, _t29;
-                    return _regenerator().w(function (_context125) {
-                      while (1) switch (_context125.p = _context125.n) {
+                  var _ref151 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee130() {
+                    var _client$httpClient, onRampWindow, result, popupWidth, popupHeight, left, top, onRampTransactionId, _t30;
+                    return _regenerator().w(function (_context130) {
+                      while (1) switch (_context130.p = _context130.n) {
                         case 0:
-                          _context125.p = 0;
+                          _context130.p = 0;
                           onRampWindow = null;
                           if (!openNewTab) {
-                            _context125.n = 1;
+                            _context130.n = 1;
                             break;
                           }
                           onRampWindow = window.open("", "_blank");
                           if (onRampWindow) {
-                            _context125.n = 1;
+                            _context130.n = 1;
                             break;
                           }
                           throw new Error("Failed to open On Ramp tab.");
                         case 1:
-                          _context125.n = 2;
+                          _context130.n = 2;
                           return client === null || client === void 0 ? void 0 : (_client$httpClient = client.httpClient) === null || _client$httpClient === void 0 ? void 0 : _client$httpClient.initFiatOnRamp(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
                             onrampProvider: onrampProvider,
                             walletAddress: walletAccount.address,
@@ -6281,19 +6435,19 @@ var ClientProvider = function ClientProvider(_ref) {
                             urlForSignature: urlForSignature
                           } : {}));
                         case 2:
-                          result = _context125.v;
+                          result = _context130.v;
                           if (result !== null && result !== void 0 && result.onRampUrl) {
-                            _context125.n = 3;
+                            _context130.n = 3;
                             break;
                           }
                           throw new Error("Missing onRampUrl");
                         case 3:
                           if (!(openNewTab && onRampWindow)) {
-                            _context125.n = 4;
+                            _context130.n = 4;
                             break;
                           }
                           onRampWindow.location.href = result.onRampUrl.toString();
-                          _context125.n = 5;
+                          _context130.n = 5;
                           break;
                         case 4:
                           popupWidth = 500;
@@ -6302,54 +6456,54 @@ var ClientProvider = function ClientProvider(_ref) {
                           top = window.screenY + (window.innerHeight - popupHeight) / 2;
                           onRampWindow = window.open(result.onRampUrl.toString(), "_blank", "width=".concat(popupWidth, ",height=").concat(popupHeight, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
                           if (onRampWindow) {
-                            _context125.n = 5;
+                            _context130.n = 5;
                             break;
                           }
                           throw new Error("Failed to open On Ramp window.");
                         case 5:
                           onRampTransactionId = result.onRampTransactionId;
                           if (onRampTransactionId) {
-                            _context125.n = 6;
+                            _context130.n = 6;
                             break;
                           }
                           throw new Error("No onRampTransactionId returned");
                         case 6:
-                          return _context125.a(2, new Promise(function (resolveAction, rejectAction) {
-                            pollingRef.current = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee124() {
-                              var _onRampWindow, _client$httpClient2, currentUrl, _onRampWindow2, _onRampWindow3, resp, status, _onRampWindow4, _t28;
-                              return _regenerator().w(function (_context124) {
-                                while (1) switch (_context124.p = _context124.n) {
+                          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;
+                              return _regenerator().w(function (_context129) {
+                                while (1) switch (_context129.p = _context129.n) {
                                   case 0:
-                                    _context124.p = 0;
+                                    _context129.p = 0;
                                     if (!(onrampProvider === "FIAT_ON_RAMP_PROVIDER_COINBASE" && (_onRampWindow = onRampWindow) !== null && _onRampWindow !== void 0 && _onRampWindow.closed)) {
-                                      _context124.n = 1;
+                                      _context129.n = 1;
                                       break;
                                     }
                                     cleanup();
                                     rejectAction(new Error("On-ramp popup closed by user"));
-                                    return _context124.a(2);
+                                    return _context129.a(2);
                                   case 1:
                                     currentUrl = "";
                                     try {
                                       currentUrl = ((_onRampWindow2 = onRampWindow) === null || _onRampWindow2 === void 0 ? void 0 : _onRampWindow2.location.href) || "";
                                     } catch (_unused6) {}
                                     if (!(currentUrl && currentUrl.startsWith(window.location.origin))) {
-                                      _context124.n = 2;
+                                      _context129.n = 2;
                                       break;
                                     }
                                     cleanup();
                                     (_onRampWindow3 = onRampWindow) === null || _onRampWindow3 === void 0 ? void 0 : _onRampWindow3.close();
                                     setCompleted(true);
                                     resolveAction();
-                                    return _context124.a(2);
+                                    return _context129.a(2);
                                   case 2:
-                                    _context124.n = 3;
+                                    _context129.n = 3;
                                     return client === null || client === void 0 ? void 0 : (_client$httpClient2 = client.httpClient) === null || _client$httpClient2 === void 0 ? void 0 : _client$httpClient2.getOnRampTransactionStatus({
                                       transactionId: onRampTransactionId,
                                       refresh: true
                                     });
                                   case 3:
-                                    resp = _context124.v;
+                                    resp = _context129.v;
                                     status = resp === null || resp === void 0 ? void 0 : resp.transactionStatus;
                                     if (["COMPLETED", "FAILED", "CANCELLED"].includes(status !== null && status !== void 0 ? status : "")) {
                                       cleanup();
@@ -6359,30 +6513,30 @@ var ClientProvider = function ClientProvider(_ref) {
                                       setCompleted(true);
                                       resolveAction();
                                     }
-                                    _context124.n = 5;
+                                    _context129.n = 5;
                                     break;
                                   case 4:
-                                    _context124.p = 4;
-                                    _t28 = _context124.v;
-                                    console.warn("Polling error (ignored):", _t28);
+                                    _context129.p = 4;
+                                    _t29 = _context129.v;
+                                    console.warn("Polling error (ignored):", _t29);
                                   case 5:
-                                    return _context124.a(2);
+                                    return _context129.a(2);
                                 }
-                              }, _callee124, null, [[0, 4]]);
+                              }, _callee129, null, [[0, 4]]);
                             })), 3000);
                           }));
                         case 7:
-                          _context125.p = 7;
-                          _t29 = _context125.v;
+                          _context130.p = 7;
+                          _t30 = _context130.v;
                           cleanup();
-                          throw _t29;
+                          throw _t30;
                         case 8:
-                          return _context125.a(2);
+                          return _context130.a(2);
                       }
-                    }, _callee125, null, [[0, 7]]);
+                    }, _callee130, null, [[0, 7]]);
                   }));
                   return function action() {
-                    return _ref146.apply(this, arguments);
+                    return _ref151.apply(this, arguments);
                   };
                 }();
                 return jsx(OnRampPage, {
@@ -6415,32 +6569,32 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
         }
-      }, _callee126);
+      }, _callee131);
     }));
-    return function (_x107) {
-      return _ref145.apply(this, arguments);
+    return function (_x110) {
+      return _ref150.apply(this, arguments);
     };
   }(), [getSession, client, pushPage]);
   var handleVerifyAppProofs = useCallback(/*#__PURE__*/function () {
-    var _ref148 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee127(params) {
-      var _ref149, appProofs, _ref149$successPageDu, successPageDuration, stampWith, s, organizationId, _t31;
-      return _regenerator().w(function (_context127) {
-        while (1) switch (_context127.p = _context127.n) {
+    var _ref153 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee132(params) {
+      var _ref154, appProofs, _ref154$successPageDu, successPageDuration, stampWith, s, organizationId, _t32;
+      return _regenerator().w(function (_context132) {
+        while (1) switch (_context132.p = _context132.n) {
           case 0:
-            _ref149 = params || {}, appProofs = _ref149.appProofs, _ref149$successPageDu = _ref149.successPageDuration, successPageDuration = _ref149$successPageDu === void 0 ? 3000 : _ref149$successPageDu, stampWith = _ref149.stampWith;
-            _context127.n = 1;
+            _ref154 = params || {}, appProofs = _ref154.appProofs, _ref154$successPageDu = _ref154.successPageDuration, successPageDuration = _ref154$successPageDu === void 0 ? 3000 : _ref154$successPageDu, stampWith = _ref154.stampWith;
+            _context132.n = 1;
             return getSession();
           case 1:
-            s = _context127.v;
+            s = _context132.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context127.n = 2;
+              _context132.n = 2;
               break;
             }
             throw new TurnkeyError("A session or passed in organization ID is required.", TurnkeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context127.p = 2;
-            return _context127.a(2, new Promise(function (resolve, reject) {
+            _context132.p = 2;
+            return _context132.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Verify app proofs",
                 showTurnkeyBranding: false,
@@ -6466,60 +6620,60 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context127.p = 3;
-            _t31 = _context127.v;
-            if (!(_t31 instanceof TurnkeyError)) {
-              _context127.n = 4;
+            _context132.p = 3;
+            _t32 = _context132.v;
+            if (!(_t32 instanceof TurnkeyError)) {
+              _context132.n = 4;
               break;
             }
-            throw _t31;
+            throw _t32;
           case 4:
-            throw new TurnkeyError("Failed to verify app proofs.", TurnkeyErrorCodes.VERIFY_APP_PROOFS_ERROR, _t31);
+            throw new TurnkeyError("Failed to verify app proofs.", TurnkeyErrorCodes.VERIFY_APP_PROOFS_ERROR, _t32);
           case 5:
-            return _context127.a(2);
+            return _context132.a(2);
         }
-      }, _callee127, null, [[2, 3]]);
+      }, _callee132, null, [[2, 3]]);
     }));
-    return function (_x108) {
-      return _ref148.apply(this, arguments);
+    return function (_x111) {
+      return _ref153.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 _ref150 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee128() {
+      var _ref155 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee133() {
         var proxyAuthConfig;
-        return _regenerator().w(function (_context128) {
-          while (1) switch (_context128.p = _context128.n) {
+        return _regenerator().w(function (_context133) {
+          while (1) switch (_context133.p = _context133.n) {
             case 0:
-              _context128.p = 0;
+              _context133.p = 0;
               if (!shouldFetchWalletKitConfig) {
-                _context128.n = 2;
+                _context133.n = 2;
                 break;
               }
-              _context128.n = 1;
+              _context133.n = 1;
               return getAuthProxyConfig(config.authProxyConfigId,
               // Can assert safely. See shouldFetchWalletKitConfig definition.
               config.authProxyUrl);
             case 1:
-              proxyAuthConfig = _context128.v;
+              proxyAuthConfig = _context133.v;
               proxyAuthConfigRef.current = proxyAuthConfig;
             case 2:
               setMasterConfig(buildConfig(proxyAuthConfig));
-              _context128.n = 4;
+              _context133.n = 4;
               break;
             case 3:
-              _context128.p = 3;
-              _context128.v;
+              _context133.p = 3;
+              _context133.v;
               setClientState(ClientState.Error);
             case 4:
-              return _context128.a(2);
+              return _context133.a(2);
           }
-        }, _callee128, null, [[0, 3]]);
+        }, _callee133, null, [[0, 3]]);
       }));
       return function fetchProxyAuthConfig() {
-        return _ref150.apply(this, arguments);
+        return _ref155.apply(this, arguments);
       };
     }();
     fetchProxyAuthConfig();
@@ -6552,34 +6706,34 @@ var ClientProvider = function ClientProvider(_ref) {
   var debouncedFetchWalletProviders = useDebouncedCallback(fetchWalletProviders, 100);
   useEffect(function () {
     var handleUpdateState = /*#__PURE__*/function () {
-      var _ref151 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee129() {
+      var _ref156 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee134() {
         var currentSession;
-        return _regenerator().w(function (_context129) {
-          while (1) switch (_context129.n) {
+        return _regenerator().w(function (_context134) {
+          while (1) switch (_context134.n) {
             case 0:
-              _context129.n = 1;
+              _context134.n = 1;
               return getSession();
             case 1:
-              currentSession = _context129.v;
+              currentSession = _context134.v;
               if (!currentSession) {
-                _context129.n = 3;
+                _context134.n = 3;
                 break;
               }
-              _context129.n = 2;
+              _context134.n = 2;
               return debouncedRefreshWallets();
             case 2:
-              _context129.n = 4;
+              _context134.n = 4;
               break;
             case 3:
-              _context129.n = 4;
+              _context134.n = 4;
               return debouncedFetchWalletProviders();
             case 4:
-              return _context129.a(2);
+              return _context134.a(2);
           }
-        }, _callee129);
+        }, _callee134);
       }));
       return function handleUpdateState() {
-        return _ref151.apply(this, arguments);
+        return _ref156.apply(this, arguments);
       };
     }();
     var cleanup = function cleanup() {};
@@ -6660,6 +6814,8 @@ var ClientProvider = function ClientProvider(_ref) {
       signMessage: signMessage,
       signTransaction: signTransaction,
       ethSendTransaction: ethSendTransaction,
+      ethSendErc20Transfer: ethSendErc20Transfer,
+      solSendTransaction: solSendTransaction,
       signAndSendTransaction: signAndSendTransaction,
       pollTransactionStatus: pollTransactionStatus,
       fetchUser: fetchUser,
@@ -6722,7 +6878,8 @@ var ClientProvider = function ClientProvider(_ref) {
       handleRemoveUserPhoneNumber: handleRemoveUserPhoneNumber,
       handleVerifyAppProofs: handleVerifyAppProofs,
       handleOnRamp: handleOnRamp,
-      handleSendTransaction: handleSendTransaction
+      handleSendTransaction: handleSendTransaction,
+      handleSendErc20Transfer: handleSendErc20Transfer
     },
     children: children
   });