@0xkey-io/react-wallet-kit 0.1.0 → 0.2.0

package/dist/providers/client/Provider.mjs

@@ -11,9 +11,9 @@ import { generateChallengePair, exchangeFacebookCodeForToken } from '../../utils
 import { capitalizeProviderName, getProviderIcon } from '../../utils/oauth/helpers.mjs';
 import { useWalletProviderState, useDebouncedCallback, isValidSession, withZeroXKeyErrorHandling, SESSION_WARNING_THRESHOLD_MS, mergeWalletsWithoutDuplicates } from '../../utils/utils.mjs';
 import { setCappedTimeoutInMap, clearKey, setTimeoutInMap, clearKeys, clearAll } from '../../utils/timers.mjs';
-import { DEFAULT_SESSION_EXPIRATION_IN_SECONDS, OtpType, ZeroXKeyClient, Chain, WalletInterfaceType, getAuthProxyConfig, WalletSource } from '@0xkey-io/core';
+import { DEFAULT_SESSION_EXPIRATION_IN_SECONDS, OtpType, OnRampError, OnRampErrorCode, inferOnRampAssetFromWalletAccount, assertOnRampProviderSupported, pollOnRampTransactionStatus, initOnRampFlow, ZeroXKeyClient, Chain, WalletInterfaceType, getAuthProxyConfig, WalletSource } from '@0xkey-io/core';
 import { useState, useRef, useCallback, useEffect } from 'react';
-import { ZeroXKeyError, ZeroXKeyErrorCodes, ZeroXKeyNetworkError, AuthAction, OAuthProviders, FiatOnRampCryptoCurrency, FiatOnRampBlockchainNetwork } from '@0xkey-io/sdk-types';
+import { ZeroXKeyError, ZeroXKeyErrorCodes, ZeroXKeyNetworkError, AuthAction, OAuthProviders } from '@0xkey-io/sdk-types';
 import { useModal } from '../modal/Hook.mjs';
 import { AuthState, ClientState, AuthMethod, ExportType, ImportType } from '../../types/base.mjs';
 import { AuthComponent } from '../../components/auth/index.mjs';
@@ -865,11 +865,11 @@ var ClientProvider = function ClientProvider(_ref) {
    * @throws {ZeroXKeyError} If an error occurs while clearing the timers.
    */
   function _initializeWalletProviderListeners() {
-    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee139(walletProviders, onUpdateState) {
+    _initializeWalletProviderListeners = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee138(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 (_context139) {
-        while (1) switch (_context139.n) {
+      return _regenerator().w(function (_context138) {
+        while (1) switch (_context138.n) {
           case 0:
             attachSolanaListeners = function _attachSolanaListener(provider, onUpdateState) {
               var _provider$features;
@@ -877,19 +877,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 _ref160 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee137(_evt) {
-                    return _regenerator().w(function (_context137) {
-                      while (1) switch (_context137.n) {
+                  var _ref159 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee136(_evt) {
+                    return _regenerator().w(function (_context136) {
+                      while (1) switch (_context136.n) {
                         case 0:
-                          _context137.n = 1;
+                          _context136.n = 1;
                           return onUpdateState();
                         case 1:
-                          return _context137.a(2);
+                          return _context136.a(2);
                       }
-                    }, _callee137);
+                    }, _callee136);
                   }));
                   return function (_x114) {
-                    return _ref160.apply(this, arguments);
+                    return _ref159.apply(this, arguments);
                   };
                 }());
                 cleanups.push(offChange);
@@ -903,31 +903,31 @@ var ClientProvider = function ClientProvider(_ref) {
             attachEthereumListeners = function _attachEthereumListen(provider, onUpdateState) {
               if (typeof provider.on !== "function") return;
               var handleChainChanged = /*#__PURE__*/function () {
-                var _ref158 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee135(_chainId) {
-                  return _regenerator().w(function (_context135) {
-                    while (1) switch (_context135.n) {
+                var _ref157 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee134(_chainId) {
+                  return _regenerator().w(function (_context134) {
+                    while (1) switch (_context134.n) {
                       case 0:
-                        return _context135.a(2, onUpdateState());
+                        return _context134.a(2, onUpdateState());
                     }
-                  }, _callee135);
+                  }, _callee134);
                 }));
                 return function handleChainChanged(_x112) {
-                  return _ref158.apply(this, arguments);
+                  return _ref157.apply(this, arguments);
                 };
               }();
               var handleAccountsChanged = /*#__PURE__*/function () {
-                var _ref159 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee136(accounts) {
-                  return _regenerator().w(function (_context136) {
-                    while (1) switch (_context136.n) {
+                var _ref158 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee135(accounts) {
+                  return _regenerator().w(function (_context135) {
+                    while (1) switch (_context135.n) {
                       case 0:
                         if (accounts.length === 0) onUpdateState();
                       case 1:
-                        return _context136.a(2);
+                        return _context135.a(2);
                     }
-                  }, _callee136);
+                  }, _callee135);
                 }));
                 return function handleAccountsChanged(_x113) {
-                  return _ref159.apply(this, arguments);
+                  return _ref158.apply(this, arguments);
                 };
               }();
               var handleDisconnect = function handleDisconnect() {
@@ -943,10 +943,10 @@ var ClientProvider = function ClientProvider(_ref) {
               };
             };
             if (!(walletProviders.length === 0)) {
-              _context139.n = 1;
+              _context138.n = 1;
               break;
             }
-            return _context139.a(2, function () {});
+            return _context138.a(2, function () {});
           case 1:
             cleanups = []; // we only want to initialize these listeners for connected walletProviders
             nativeOnly = function nativeOnly(provider) {
@@ -984,82 +984,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 _ref161 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee138(evt) {
+                    var _ref160 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee137(evt) {
                       var _callbacks$onError10, providers, currentSession, _wcProviders, wcWallets;
-                      return _regenerator().w(function (_context138) {
-                        while (1) switch (_context138.n) {
+                      return _regenerator().w(function (_context137) {
+                        while (1) switch (_context137.n) {
                           case 0:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "pairingExpired")) {
-                              _context138.n = 1;
+                              _context137.n = 1;
                               break;
                             }
                             debouncedFetchWalletProviders();
-                            return _context138.a(2);
+                            return _context137.a(2);
                           case 1:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "failed")) {
-                              _context138.n = 2;
+                              _context137.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 ZeroXKeyError("WalletConnect initialization failed: ".concat(evt.error || "Unknown error"), ZeroXKeyErrorCodes.WALLET_CONNECT_INITIALIZATION_ERROR, evt.error));
-                            return _context138.a(2);
+                            return _context137.a(2);
                           case 2:
                             if (!((evt === null || evt === void 0 ? void 0 : evt.type) === "initialized")) {
-                              _context138.n = 7;
+                              _context137.n = 7;
                               break;
                             }
-                            _context138.n = 3;
+                            _context137.n = 3;
                             return debouncedFetchWalletProviders();
                           case 3:
-                            providers = _context138.v;
-                            _context138.n = 4;
+                            providers = _context137.v;
+                            _context137.n = 4;
                             return getSession();
                           case 4:
-                            currentSession = _context138.v;
+                            currentSession = _context137.v;
                             if (!currentSession) {
-                              _context138.n = 6;
+                              _context137.n = 6;
                               break;
                             }
                             _wcProviders = providers === null || providers === void 0 ? void 0 : providers.filter(function (p) {
                               return p.interfaceType === WalletInterfaceType.WalletConnect;
                             });
-                            _context138.n = 5;
+                            _context137.n = 5;
                             return fetchWallets({
                               walletProviders: _wcProviders,
                               connectedOnly: true
                             });
                           case 5:
-                            wcWallets = _context138.v;
+                            wcWallets = _context137.v;
                             if (wcWallets.length > 0) {
                               setWallets(function (prev) {
                                 return mergeWalletsWithoutDuplicates(prev, wcWallets);
                               });
                             }
                           case 6:
-                            return _context138.a(2);
+                            return _context137.a(2);
                           case 7:
-                            _context138.n = 8;
+                            _context137.n = 8;
                             return onUpdateState();
                           case 8:
-                            return _context138.a(2);
+                            return _context137.a(2);
                         }
-                      }, _callee138);
+                      }, _callee137);
                     }));
                     return function (_x115) {
-                      return _ref161.apply(this, arguments);
+                      return _ref160.apply(this, arguments);
                     };
                   }());
                   cleanups.push(unsubscribe);
                 }
               }
             }
-            return _context139.a(2, function () {
+            return _context138.a(2, function () {
               cleanups.forEach(function (remove) {
                 return remove();
               });
             });
         }
-      }, _callee139);
+      }, _callee138);
     }));
     return _initializeWalletProviderListeners.apply(this, arguments);
   }
@@ -6340,59 +6340,63 @@ var ClientProvider = function ClientProvider(_ref) {
     };
   }(), [ethSendErc20Transfer, getSession, pollTransactionStatus, pushPage]);
   var handleOnRamp = useCallback(/*#__PURE__*/function () {
-    var _ref151 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee131(params) {
-      var _walletAccount$addres;
-      var walletAccount, fiatCurrencyAmount, fiatCurrencyCode, paymentMethod, countrySubdivisionCode, urlForSignature, countryCode, _params$onrampProvide, onrampProvider, _params$sandboxMode, sandboxMode, _params$successPageDu7, successPageDuration, _params$openInNewTab, openInNewTab, s, organizationId, cryptoCurrencyCode, network, openNewTab, _t30;
-      return _regenerator().w(function (_context131) {
-        while (1) switch (_context131.n) {
+    var _ref151 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee130(params) {
+      var _params$cryptoCurrenc, _params$network;
+      var walletAccount, fiatCurrencyAmount, fiatCurrencyCode, paymentMethod, countrySubdivisionCode, urlForSignature, countryCode, _params$onrampProvide, onrampProvider, _params$successPageDu7, successPageDuration, _params$openInNewTab, openInNewTab, openMode, polling, onStatusChange, s, organizationId, inferredAsset, cryptoCurrencyCode, network, resolvedOpenMode;
+      return _regenerator().w(function (_context130) {
+        while (1) switch (_context130.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$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();
+            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$successPageDu7 = params.successPageDuration, successPageDuration = _params$successPageDu7 === void 0 ? 2000 : _params$successPageDu7, _params$openInNewTab = params.openInNewTab, openInNewTab = _params$openInNewTab === void 0 ? false : _params$openInNewTab, openMode = params.openMode, polling = params.polling, onStatusChange = params.onStatusChange;
+            if (!(params.sandboxMode === undefined)) {
+              _context130.n = 1;
+              break;
+            }
+            throw new OnRampError(OnRampErrorCode.SANDBOX_MODE_REQUIRED, "sandboxMode must be explicitly set for on-ramp flows.");
           case 1:
-            s = _context131.v;
+            // Fail fast (before opening any modal/window) when the provider has no
+            // supported runtime, so callers get a typed error instead of a popup.
+            assertOnRampProviderSupported(onrampProvider);
+            if (client !== null && client !== void 0 && client.httpClient) {
+              _context130.n = 2;
+              break;
+            }
+            throw new ZeroXKeyError("Client is not initialized.", ZeroXKeyErrorCodes.CLIENT_NOT_INITIALIZED);
+          case 2:
+            _context130.n = 3;
+            return getSession();
+          case 3:
+            s = _context130.v;
             organizationId = (params === null || params === void 0 ? void 0 : params.organizationId) || (s === null || s === void 0 ? void 0 : s.organizationId);
             if (organizationId) {
-              _context131.n = 2;
+              _context130.n = 4;
               break;
             }
             throw new ZeroXKeyError("A session or passed in organization ID is required.", ZeroXKeyErrorCodes.INVALID_REQUEST);
-          case 2:
-            _t30 = true;
-            _context131.n = _t30 === (walletAccount.addressFormat === "ADDRESS_FORMAT_ETHEREUM") ? 3 : _t30 === ((_walletAccount$addres = walletAccount.addressFormat) === null || _walletAccount$addres === void 0 ? void 0 : _walletAccount$addres.includes("ADDRESS_FORMAT_BITCOIN")) ? 4 : _t30 === (walletAccount.addressFormat === "ADDRESS_FORMAT_SOLANA") ? 5 : 6;
-            break;
-          case 3:
-            cryptoCurrencyCode = FiatOnRampCryptoCurrency.ETHEREUM;
-            network = FiatOnRampBlockchainNetwork.ETHEREUM;
-            return _context131.a(3, 7);
           case 4:
-            cryptoCurrencyCode = FiatOnRampCryptoCurrency.BITCOIN;
-            network = FiatOnRampBlockchainNetwork.BITCOIN;
-            return _context131.a(3, 7);
+            inferredAsset = params.network && params.cryptoCurrencyCode ? undefined : inferOnRampAssetFromWalletAccount(walletAccount);
+            cryptoCurrencyCode = (_params$cryptoCurrenc = params.cryptoCurrencyCode) !== null && _params$cryptoCurrenc !== void 0 ? _params$cryptoCurrenc : inferredAsset === null || inferredAsset === void 0 ? void 0 : inferredAsset.cryptoCurrencyCode;
+            network = (_params$network = params.network) !== null && _params$network !== void 0 ? _params$network : inferredAsset === null || inferredAsset === void 0 ? void 0 : inferredAsset.network;
+            if (!(!cryptoCurrencyCode || !network)) {
+              _context130.n = 5;
+              break;
+            }
+            throw new OnRampError(OnRampErrorCode.ASSET_REQUIRED, "network and cryptoCurrencyCode are required for on-ramp flows.");
           case 5:
-            cryptoCurrencyCode = FiatOnRampCryptoCurrency.SOLANA;
-            network = FiatOnRampBlockchainNetwork.SOLANA;
-            return _context131.a(3, 7);
-          case 6:
-            cryptoCurrencyCode = FiatOnRampCryptoCurrency.ETHEREUM;
-            network = FiatOnRampBlockchainNetwork.ETHEREUM;
-            return _context131.a(3, 7);
-          case 7:
-            openNewTab = openInNewTab || isMobile;
-            cryptoCurrencyCode = params.cryptoCurrencyCode || cryptoCurrencyCode;
-            network = params.network || network;
-            return _context131.a(2, new Promise(function (resolve, reject) {
+            resolvedOpenMode = openMode !== null && openMode !== void 0 ? openMode : openInNewTab || isMobile ? "newTab" : "popup";
+            return _context130.a(2, new Promise(function (resolve, reject) {
               var OnRampContainer = function OnRampContainer() {
                 var _useState15 = useState(false),
                   _useState16 = _slicedToArray(_useState15, 2),
                   completed = _useState16[0],
                   setCompleted = _useState16[1];
-                var pollingRef = useRef(null);
+                var _useState17 = useState(),
+                  _useState18 = _slicedToArray(_useState17, 2),
+                  result = _useState18[0],
+                  setResult = _useState18[1];
+                var abortRef = useRef(null);
                 var cleanup = function cleanup() {
-                  if (pollingRef.current) {
-                    clearInterval(pollingRef.current);
-                    pollingRef.current = null;
-                  }
+                  var _abortRef$current;
+                  return (_abortRef$current = abortRef.current) === null || _abortRef$current === void 0 ? void 0 : _abortRef$current.abort();
                 };
                 useEffect(function () {
                   return function () {
@@ -6400,33 +6404,36 @@ var ClientProvider = function ClientProvider(_ref) {
                   };
                 }, []);
                 var action = /*#__PURE__*/function () {
-                  var _ref152 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee130() {
-                    var _client$httpClient, onRampWindow, result, popupWidth, popupHeight, left, top, onRampTransactionId, _t29;
-                    return _regenerator().w(function (_context130) {
-                      while (1) switch (_context130.p = _context130.n) {
+                  var _ref152 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee129() {
+                    var _initResult$signedUrl, _polling$refresh, onRampWindow, initResult, providerUrl, popupWidth, popupHeight, left, top, status, _onRampWindow, _t28;
+                    return _regenerator().w(function (_context129) {
+                      while (1) switch (_context129.p = _context129.n) {
                         case 0:
-                          _context130.p = 0;
+                          _context129.p = 0;
                           onRampWindow = null;
-                          if (!openNewTab) {
-                            _context130.n = 1;
+                          if (!(resolvedOpenMode === "newTab")) {
+                            _context129.n = 1;
                             break;
                           }
                           onRampWindow = window.open("", "_blank");
                           if (onRampWindow) {
-                            _context130.n = 1;
+                            _context129.n = 1;
                             break;
                           }
-                          throw new Error("Failed to open On Ramp tab.");
+                          throw new OnRampError(OnRampErrorCode.POPUP_BLOCKED, "Failed to open On Ramp tab.");
                         case 1:
-                          _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({
+                          _context129.n = 2;
+                          return initOnRampFlow(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+                            runtimeClient: client.httpClient,
                             onrampProvider: onrampProvider,
                             walletAddress: walletAccount.address,
                             network: network,
                             cryptoCurrencyCode: cryptoCurrencyCode,
-                            sandboxMode: sandboxMode,
-                            organizationId: organizationId
-                          }, fiatCurrencyCode ? {
+                            organizationId: organizationId,
+                            sandboxMode: params.sandboxMode
+                          }, params.stampWith ? {
+                            stampWith: params.stampWith
+                          } : {}), fiatCurrencyCode ? {
                             fiatCurrencyCode: fiatCurrencyCode
                           } : {}), fiatCurrencyAmount ? {
                             fiatCurrencyAmount: fiatCurrencyAmount
@@ -6436,111 +6443,84 @@ var ClientProvider = function ClientProvider(_ref) {
                             countryCode: countryCode
                           } : {}), countrySubdivisionCode ? {
                             countrySubdivisionCode: countrySubdivisionCode
-                          } : {}), sandboxMode !== undefined ? {
-                            sandboxMode: sandboxMode
                           } : {}), urlForSignature ? {
                             urlForSignature: urlForSignature
                           } : {}));
                         case 2:
-                          result = _context130.v;
-                          if (result !== null && result !== void 0 && result.onRampUrl) {
-                            _context130.n = 3;
+                          initResult = _context129.v;
+                          onStatusChange === null || onStatusChange === void 0 ? void 0 : onStatusChange(initResult);
+                          if (!(resolvedOpenMode === "returnUrl")) {
+                            _context129.n = 3;
                             break;
                           }
-                          throw new Error("Missing onRampUrl");
+                          setResult(initResult);
+                          setCompleted(true);
+                          return _context129.a(2);
                         case 3:
-                          if (!(openNewTab && onRampWindow)) {
-                            _context130.n = 4;
+                          providerUrl = (_initResult$signedUrl = initResult.signedUrl) !== null && _initResult$signedUrl !== void 0 ? _initResult$signedUrl : initResult.onRampUrl;
+                          if (!(resolvedOpenMode === "newTab" && onRampWindow)) {
+                            _context129.n = 4;
                             break;
                           }
-                          onRampWindow.location.href = result.onRampUrl.toString();
-                          _context130.n = 5;
+                          onRampWindow.location.href = providerUrl;
+                          _context129.n = 5;
                           break;
                         case 4:
                           popupWidth = 500;
                           popupHeight = 600;
                           left = window.screenX + (window.innerWidth - popupWidth) / 2;
                           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"));
+                          onRampWindow = window.open(providerUrl, "_blank", "width=".concat(popupWidth, ",height=").concat(popupHeight, ",top=").concat(top, ",left=").concat(left, ",scrollbars=yes,resizable=yes"));
                           if (onRampWindow) {
-                            _context130.n = 5;
+                            _context129.n = 5;
                             break;
                           }
-                          throw new Error("Failed to open On Ramp window.");
+                          throw new OnRampError(OnRampErrorCode.POPUP_BLOCKED, "Failed to open On Ramp window.");
                         case 5:
-                          onRampTransactionId = result.onRampTransactionId;
-                          if (onRampTransactionId) {
-                            _context130.n = 6;
-                            break;
-                          }
-                          throw new Error("No onRampTransactionId returned");
+                          abortRef.current = new AbortController();
+                          _context129.n = 6;
+                          return pollOnRampTransactionStatus(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+                            runtimeClient: client.httpClient,
+                            organizationId: organizationId,
+                            transactionId: initResult.onRampTransactionId,
+                            refresh: (_polling$refresh = polling === null || polling === void 0 ? void 0 : polling.refresh) !== null && _polling$refresh !== void 0 ? _polling$refresh : true,
+                            signal: abortRef.current.signal,
+                            onStatusUpdate: function onStatusUpdate(polledStatus) {
+                              onStatusChange === null || onStatusChange === void 0 ? void 0 : onStatusChange(_objectSpread2(_objectSpread2({}, initResult), {}, {
+                                status: polledStatus
+                              }));
+                            }
+                          }, params.stampWith ? {
+                            stampWith: params.stampWith
+                          } : {}), polling !== null && polling !== void 0 && polling.intervalMs ? {
+                            intervalMs: polling.intervalMs
+                          } : {}), polling !== null && polling !== void 0 && polling.timeoutMs ? {
+                            timeoutMs: polling.timeoutMs
+                          } : {}), polling !== null && polling !== void 0 && polling.maxConsecutiveErrors ? {
+                            maxConsecutiveErrors: polling.maxConsecutiveErrors
+                          } : {}));
                         case 6:
-                          return _context130.a(2, new Promise(function (resolveAction, rejectAction) {
-                            pollingRef.current = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee129() {
-                              var _onRampWindow, _client$httpClient2, currentUrl, _onRampWindow2, _onRampWindow3, resp, status, _onRampWindow4, _t28;
-                              return _regenerator().w(function (_context129) {
-                                while (1) switch (_context129.p = _context129.n) {
-                                  case 0:
-                                    _context129.p = 0;
-                                    if (!(onrampProvider === "FIAT_ON_RAMP_PROVIDER_COINBASE" && (_onRampWindow = onRampWindow) !== null && _onRampWindow !== void 0 && _onRampWindow.closed)) {
-                                      _context129.n = 1;
-                                      break;
-                                    }
-                                    cleanup();
-                                    rejectAction(new Error("On-ramp popup closed by user"));
-                                    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))) {
-                                      _context129.n = 2;
-                                      break;
-                                    }
-                                    cleanup();
-                                    (_onRampWindow3 = onRampWindow) === null || _onRampWindow3 === void 0 ? void 0 : _onRampWindow3.close();
-                                    setCompleted(true);
-                                    resolveAction();
-                                    return _context129.a(2);
-                                  case 2:
-                                    _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 = _context129.v;
-                                    status = resp === null || resp === void 0 ? void 0 : resp.transactionStatus;
-                                    if (["COMPLETED", "FAILED", "CANCELLED"].includes(status !== null && status !== void 0 ? status : "")) {
-                                      cleanup();
-                                      try {
-                                        (_onRampWindow4 = onRampWindow) === null || _onRampWindow4 === void 0 ? void 0 : _onRampWindow4.close();
-                                      } catch (_unused7) {}
-                                      setCompleted(true);
-                                      resolveAction();
-                                    }
-                                    _context129.n = 5;
-                                    break;
-                                  case 4:
-                                    _context129.p = 4;
-                                    _t28 = _context129.v;
-                                    console.warn("Polling error (ignored):", _t28);
-                                  case 5:
-                                    return _context129.a(2);
-                                }
-                              }, _callee129, null, [[0, 4]]);
-                            })), 3000);
+                          status = _context129.v;
+                          try {
+                            (_onRampWindow = onRampWindow) === null || _onRampWindow === void 0 ? void 0 : _onRampWindow.close();
+                          } catch (_unused6) {}
+                          // The terminal status was already emitted via onStatusUpdate
+                          // inside pollOnRampTransactionStatus; avoid a duplicate callback.
+                          setResult(_objectSpread2(_objectSpread2({}, initResult), {}, {
+                            status: status
                           }));
+                          setCompleted(true);
+                          _context129.n = 8;
+                          break;
                         case 7:
-                          _context130.p = 7;
-                          _t29 = _context130.v;
+                          _context129.p = 7;
+                          _t28 = _context129.v;
                           cleanup();
-                          throw _t29;
+                          throw _t28;
                         case 8:
-                          return _context130.a(2);
+                          return _context129.a(2);
                       }
-                    }, _callee130, null, [[0, 7]]);
+                    }, _callee129, null, [[0, 7]]);
                   }));
                   return function action() {
                     return _ref152.apply(this, arguments);
@@ -6554,11 +6534,12 @@ var ClientProvider = function ClientProvider(_ref) {
                   }),
                   onrampProvider: onrampProvider,
                   action: action,
-                  sandboxMode: sandboxMode,
+                  sandboxMode: params.sandboxMode,
                   completed: completed,
+                  result: result,
                   successPageDuration: successPageDuration,
-                  onSuccess: function onSuccess() {
-                    return resolve();
+                  onSuccess: function onSuccess(resolvedResult) {
+                    return resolve(resolvedResult);
                   },
                   onError: function onError(err) {
                     return reject(err);
@@ -6571,37 +6552,37 @@ var ClientProvider = function ClientProvider(_ref) {
                 showTitle: false,
                 preventBack: true,
                 onClose: function onClose() {
-                  return reject(new ZeroXKeyError("User canceled the onramp process.", ZeroXKeyErrorCodes.USER_CANCELED));
+                  reject(new OnRampError(OnRampErrorCode.USER_ABORTED, "User canceled the onramp process."));
                 }
               });
             }));
         }
-      }, _callee131);
+      }, _callee130);
     }));
     return function (_x110) {
       return _ref151.apply(this, arguments);
     };
   }(), [getSession, client, pushPage]);
   var handleVerifyAppProofs = useCallback(/*#__PURE__*/function () {
-    var _ref154 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee132(params) {
-      var _ref155, appProofs, _ref155$successPageDu, successPageDuration, stampWith, s, organizationId, _t31;
-      return _regenerator().w(function (_context132) {
-        while (1) switch (_context132.p = _context132.n) {
+    var _ref153 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee131(params) {
+      var _ref154, appProofs, _ref154$successPageDu, successPageDuration, stampWith, s, organizationId, _t29;
+      return _regenerator().w(function (_context131) {
+        while (1) switch (_context131.p = _context131.n) {
           case 0:
-            _ref155 = params || {}, appProofs = _ref155.appProofs, _ref155$successPageDu = _ref155.successPageDuration, successPageDuration = _ref155$successPageDu === void 0 ? 3000 : _ref155$successPageDu, stampWith = _ref155.stampWith;
-            _context132.n = 1;
+            _ref154 = params || {}, appProofs = _ref154.appProofs, _ref154$successPageDu = _ref154.successPageDuration, successPageDuration = _ref154$successPageDu === void 0 ? 3000 : _ref154$successPageDu, stampWith = _ref154.stampWith;
+            _context131.n = 1;
             return getSession();
           case 1:
-            s = _context132.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) {
-              _context132.n = 2;
+              _context131.n = 2;
               break;
             }
             throw new ZeroXKeyError("A session or passed in organization ID is required.", ZeroXKeyErrorCodes.INVALID_REQUEST);
           case 2:
-            _context132.p = 2;
-            return _context132.a(2, new Promise(function (resolve, reject) {
+            _context131.p = 2;
+            return _context131.a(2, new Promise(function (resolve, reject) {
               pushPage({
                 key: "Verify app proofs",
                 content: jsx(VerifyPage, _objectSpread2(_objectSpread2({
@@ -6626,60 +6607,60 @@ var ClientProvider = function ClientProvider(_ref) {
               });
             }));
           case 3:
-            _context132.p = 3;
-            _t31 = _context132.v;
-            if (!(_t31 instanceof ZeroXKeyError)) {
-              _context132.n = 4;
+            _context131.p = 3;
+            _t29 = _context131.v;
+            if (!(_t29 instanceof ZeroXKeyError)) {
+              _context131.n = 4;
               break;
             }
-            throw _t31;
+            throw _t29;
           case 4:
-            throw new ZeroXKeyError("Failed to verify app proofs.", ZeroXKeyErrorCodes.VERIFY_APP_PROOFS_ERROR, _t31);
+            throw new ZeroXKeyError("Failed to verify app proofs.", ZeroXKeyErrorCodes.VERIFY_APP_PROOFS_ERROR, _t29);
           case 5:
-            return _context132.a(2);
+            return _context131.a(2);
         }
-      }, _callee132, null, [[2, 3]]);
+      }, _callee131, null, [[2, 3]]);
     }));
     return function (_x111) {
-      return _ref154.apply(this, arguments);
+      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 _ref156 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee133() {
+      var _ref155 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee132() {
         var proxyAuthConfig;
-        return _regenerator().w(function (_context133) {
-          while (1) switch (_context133.p = _context133.n) {
+        return _regenerator().w(function (_context132) {
+          while (1) switch (_context132.p = _context132.n) {
             case 0:
-              _context133.p = 0;
+              _context132.p = 0;
               if (!shouldFetchWalletKitConfig) {
-                _context133.n = 2;
+                _context132.n = 2;
                 break;
               }
-              _context133.n = 1;
+              _context132.n = 1;
               return getAuthProxyConfig(config.authProxyConfigId,
               // Can assert safely. See shouldFetchWalletKitConfig definition.
               config.authProxyUrl);
             case 1:
-              proxyAuthConfig = _context133.v;
+              proxyAuthConfig = _context132.v;
               proxyAuthConfigRef.current = proxyAuthConfig;
             case 2:
               setMasterConfig(buildConfig(proxyAuthConfig));
-              _context133.n = 4;
+              _context132.n = 4;
               break;
             case 3:
-              _context133.p = 3;
-              _context133.v;
+              _context132.p = 3;
+              _context132.v;
               setClientState(ClientState.Error);
             case 4:
-              return _context133.a(2);
+              return _context132.a(2);
           }
-        }, _callee133, null, [[0, 3]]);
+        }, _callee132, null, [[0, 3]]);
       }));
       return function fetchProxyAuthConfig() {
-        return _ref156.apply(this, arguments);
+        return _ref155.apply(this, arguments);
       };
     }();
     fetchProxyAuthConfig();
@@ -6712,34 +6693,34 @@ var ClientProvider = function ClientProvider(_ref) {
   var debouncedFetchWalletProviders = useDebouncedCallback(fetchWalletProviders, 100);
   useEffect(function () {
     var handleUpdateState = /*#__PURE__*/function () {
-      var _ref157 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee134() {
+      var _ref156 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee133() {
         var currentSession;
-        return _regenerator().w(function (_context134) {
-          while (1) switch (_context134.n) {
+        return _regenerator().w(function (_context133) {
+          while (1) switch (_context133.n) {
             case 0:
-              _context134.n = 1;
+              _context133.n = 1;
               return getSession();
             case 1:
-              currentSession = _context134.v;
+              currentSession = _context133.v;
               if (!currentSession) {
-                _context134.n = 3;
+                _context133.n = 3;
                 break;
               }
-              _context134.n = 2;
+              _context133.n = 2;
               return debouncedRefreshWallets();
             case 2:
-              _context134.n = 4;
+              _context133.n = 4;
               break;
             case 3:
-              _context134.n = 4;
+              _context133.n = 4;
               return debouncedFetchWalletProviders();
             case 4:
-              return _context134.a(2);
+              return _context133.a(2);
           }
-        }, _callee134);
+        }, _callee133);
       }));
       return function handleUpdateState() {
-        return _ref157.apply(this, arguments);
+        return _ref156.apply(this, arguments);
       };
     }();
     var cleanup = function cleanup() {};