@reown/appkit-core-react-native 0.0.0-feat-multi-siwe-20250623183423 → 0.0.0-feat-onramp-20250626173252

package/lib/module/controllers/BlockchainApiController.js

@@ -4,8 +4,6 @@ import { FetchUtil } from '../utils/FetchUtil';
 import { OptionsController } from './OptionsController';
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 import { ApiUtil } from '../utils/ApiUtil';
-import { ConnectionsController } from './ConnectionsController';
-import { SnackController } from './SnackController';
 
 // -- Helpers ------------------------------------------- //
 const baseUrl = CoreHelperUtil.getBlockchainApiUrl();
@@ -30,46 +28,15 @@ const state = proxy({
   clientId: null,
   api: new FetchUtil({
     baseUrl
-  }),
-  supportedChains: {
-    http: [],
-    ws: []
-  }
+  })
 });
 
 // -- Controller ---------------------------------------- //
 export const BlockchainApiController = {
   state,
-  async isNetworkSupported(networkId) {
-    if (!networkId) {
-      return false;
-    }
-    try {
-      if (!state.supportedChains.http.length) {
-        await BlockchainApiController.getSupportedNetworks();
-      }
-    } catch (e) {
-      return false;
-    }
-    return state.supportedChains.http.includes(networkId);
-  },
-  async getSupportedNetworks() {
-    const supportedChains = await state.api.get({
-      path: 'v1/supported-chains'
-    });
-    state.supportedChains = supportedChains;
-    return supportedChains;
-  },
-  async fetchIdentity({
+  fetchIdentity({
     address
   }) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      return {
-        avatar: '',
-        name: ''
-      };
-    }
     return state.api.get({
       path: `/v1/identity/${address}`,
       params: {
@@ -78,48 +45,31 @@ export const BlockchainApiController = {
       headers: getHeaders()
     });
   },
-  async fetchTransactions({
+  fetchTransactions({
     account,
     projectId,
     cursor,
     onramp,
     signal,
-    cache,
-    chainId
+    cache
   }) {
-    const _chainId = chainId ?? ConnectionsController.state.activeCaipNetworkId;
-    const isSupported = await BlockchainApiController.isNetworkSupported(_chainId);
-    if (!isSupported) {
-      return {
-        data: [],
-        next: undefined
-      };
-    }
-    const response = await state.api.get({
+    return state.api.get({
       path: `/v1/account/${account}/history`,
       headers: getHeaders(),
       params: {
         projectId,
         cursor,
-        onramp,
-        chainId: _chainId
+        onramp
       },
       signal,
       cache
     });
-    return response;
   },
-  async fetchTokenPrice({
+  fetchTokenPrice({
     projectId,
     addresses
   }) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      return {
-        fungibles: []
-      };
-    }
-    const response = await state.api.post({
+    return state.api.post({
       path: '/v1/fungible/price',
       body: {
         projectId,
@@ -128,19 +78,12 @@ export const BlockchainApiController = {
       },
       headers: getHeaders()
     });
-    return response;
   },
-  async fetchSwapAllowance({
+  fetchSwapAllowance({
     projectId,
     tokenAddress,
     userAddress
   }) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      return {
-        allowance: '0'
-      };
-    }
     return state.api.get({
       path: `/v1/convert/allowance`,
       params: {
@@ -151,14 +94,10 @@ export const BlockchainApiController = {
       headers: getHeaders()
     });
   },
-  async fetchGasPrice({
+  fetchGasPrice({
     projectId,
     chainId
   }) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      throw new Error('Network not supported for Gas Price');
-    }
     return state.api.get({
       path: `/v1/convert/gas-price`,
       headers: getHeaders(),
@@ -168,7 +107,7 @@ export const BlockchainApiController = {
       }
     });
   },
-  async fetchSwapQuote({
+  fetchSwapQuote({
     projectId,
     amount,
     userAddress,
@@ -176,12 +115,6 @@ export const BlockchainApiController = {
     to,
     gasPrice
   }) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      return {
-        quotes: []
-      };
-    }
     return state.api.get({
       path: `/v1/convert/quotes`,
       headers: getHeaders(),
@@ -195,16 +128,10 @@ export const BlockchainApiController = {
       }
     });
   },
-  async fetchSwapTokens({
+  fetchSwapTokens({
     projectId,
     chainId
   }) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      return {
-        tokens: []
-      };
-    }
     return state.api.get({
       path: `/v1/convert/tokens`,
       headers: getHeaders(),
@@ -214,17 +141,13 @@ export const BlockchainApiController = {
       }
     });
   },
-  async generateSwapCalldata({
+  generateSwapCalldata({
     amount,
     from,
     projectId,
     to,
     userAddress
   }) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      throw new Error('Network not supported for Swaps');
-    }
     return state.api.post({
       path: '/v1/convert/build-transaction',
       headers: getHeaders(),
@@ -240,16 +163,12 @@ export const BlockchainApiController = {
       }
     });
   },
-  async generateApproveCalldata({
+  generateApproveCalldata({
     from,
     projectId,
     to,
     userAddress
   }) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      throw new Error('Network not supported for Swaps');
-    }
     return state.api.get({
       path: `/v1/convert/build-approve`,
       headers: getHeaders(),
@@ -262,13 +181,6 @@ export const BlockchainApiController = {
     });
   },
   async getBalance(address, chainId, forceUpdate) {
-    const isSupported = await BlockchainApiController.isNetworkSupported(ConnectionsController.state.activeCaipNetworkId);
-    if (!isSupported) {
-      SnackController.showError('Token Balance Unavailable');
-      return {
-        balances: []
-      };
-    }
     return state.api.get({
       path: `/v1/account/${address}/balance`,
       headers: getHeaders(),
@@ -351,6 +263,16 @@ export const BlockchainApiController = {
       }
     });
   },
+  async fetchOnRampCountriesDefaults() {
+    return await state.api.get({
+      path: '/v1/onramp/providers/properties',
+      headers: getHeaders(),
+      params: {
+        projectId: OptionsController.state.projectId,
+        type: 'countries-defaults'
+      }
+    });
+  },
   async getOnRampQuotes(body, signal) {
     return await state.api.post({
       path: '/v1/onramp/multi/quotes',

package/lib/module/controllers/BlockchainApiController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","CoreHelperUtil","FetchUtil","OptionsController","ConstantsUtil","ApiUtil","ConnectionsController","SnackController","baseUrl","getBlockchainApiUrl","getHeaders","sdkType","sdkVersion","state","getUserAgent","getOrigin","clientId","api","supportedChains","http","ws","BlockchainApiController","isNetworkSupported","networkId","length","getSupportedNetworks","e","includes","get","path","fetchIdentity","address","isSupported","activeCaipNetworkId","avatar","name","params","projectId","headers","fetchTransactions","account","cursor","onramp","signal","cache","chainId","_chainId","data","next","undefined","response","fetchTokenPrice","addresses","fungibles","post","body","currency","fetchSwapAllowance","tokenAddress","userAddress","allowance","fetchGasPrice","Error","fetchSwapQuote","amount","from","to","gasPrice","quotes","fetchSwapTokens","tokens","generateSwapCalldata","eip155","slippage","CONVERT_SLIPPAGE_TOLERANCE","generateApproveCalldata","getBalance","forceUpdate","showError","balances","lookupEnsName","apiVersion","fetchOnRampCountries","type","fetchOnRampServiceProviders","fetchOnRampPaymentMethods","fetchOnRampCryptoCurrencies","fetchOnRampFiatCurrencies","fetchOnRampFiatLimits","getOnRampQuotes","getOnRampWidget","sessionData","setClientId"],"sourceRoot":"../../../src","sources":["controllers/BlockchainApiController.ts"],"mappings":"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"}
+{"version":3,"names":["proxy","CoreHelperUtil","FetchUtil","OptionsController","ConstantsUtil","ApiUtil","baseUrl","getBlockchainApiUrl","getHeaders","sdkType","sdkVersion","state","getUserAgent","getOrigin","clientId","api","BlockchainApiController","fetchIdentity","address","get","path","params","projectId","headers","fetchTransactions","account","cursor","onramp","signal","cache","fetchTokenPrice","addresses","post","body","currency","fetchSwapAllowance","tokenAddress","userAddress","fetchGasPrice","chainId","fetchSwapQuote","amount","from","to","gasPrice","fetchSwapTokens","generateSwapCalldata","eip155","slippage","CONVERT_SLIPPAGE_TOLERANCE","generateApproveCalldata","getBalance","forceUpdate","lookupEnsName","name","apiVersion","fetchOnRampCountries","type","fetchOnRampServiceProviders","fetchOnRampPaymentMethods","fetchOnRampCryptoCurrencies","fetchOnRampFiatCurrencies","fetchOnRampFiatLimits","fetchOnRampCountriesDefaults","getOnRampQuotes","getOnRampWidget","sessionData","setClientId"],"sourceRoot":"../../../src","sources":["controllers/BlockchainApiController.ts"],"mappings":"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"}

package/lib/module/controllers/ConnectionController.js

@@ -54,13 +54,6 @@ export const ConnectionController = {
   removePressedWallet() {
     state.pressedWallet = undefined;
   },
-  setWcPromise(wcPromise) {
-    state.wcPromise = wcPromise;
-  },
-  setWcUri(wcUri) {
-    state.wcUri = wcUri;
-    state.wcPairingExpiry = CoreHelperUtil.getPairingExpiry();
-  },
   setRecentWallets(wallets) {
     state.recentWallets = wallets;
   },
@@ -119,6 +112,7 @@ export const ConnectionController = {
     StorageUtil.removeWalletConnectDeepLink();
   },
   async disconnect() {
+    await this._getClient().disconnect();
     this.resetWcConnection();
     // remove transactions
     // RouterController.reset('Connect');

package/lib/module/controllers/ConnectionController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","ref","subscribeKey","subKey","CoreHelperUtil","StorageUtil","ConnectorController","state","wcError","ConnectionController","key","callback","_getClient","_client","Error","setClient","client","connectWalletConnect","walletUniversalLink","wcPromise","uri","wcUri","wcPairingExpiry","getPairingExpiry","connectExternal","options","setConnectedConnector","type","signMessage","message","setWcLinking","wcLinking","removeWcLinking","undefined","setWcError","setPressedWallet","wallet","pressedWallet","removePressedWallet","setWcPromise","setWcUri","setRecentWallets","wallets","recentWallets","setSelectedSocialProvider","provider","selectedSocialProvider","setConnectedWalletImageUrl","url","connectedWalletImageUrl","removeConnectedWalletImageUrl","setConnectedSocialProvider","connectedSocialProvider","removeConnectedSocialProvider","parseUnits","value","decimals","formatUnits","sendTransaction","args","estimateGas","writeContract","getEnsAddress","getEnsAvatar","clearUri","resetWcConnection","removeWalletConnectDeepLink","disconnect"],"sourceRoot":"../../../src","sources":["controllers/ConnectionController.ts"],"mappings":"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"}
+{"version":3,"names":["proxy","ref","subscribeKey","subKey","CoreHelperUtil","StorageUtil","ConnectorController","state","wcError","ConnectionController","key","callback","_getClient","_client","Error","setClient","client","connectWalletConnect","walletUniversalLink","wcPromise","uri","wcUri","wcPairingExpiry","getPairingExpiry","connectExternal","options","setConnectedConnector","type","signMessage","message","setWcLinking","wcLinking","removeWcLinking","undefined","setWcError","setPressedWallet","wallet","pressedWallet","removePressedWallet","setRecentWallets","wallets","recentWallets","setSelectedSocialProvider","provider","selectedSocialProvider","setConnectedWalletImageUrl","url","connectedWalletImageUrl","removeConnectedWalletImageUrl","setConnectedSocialProvider","connectedSocialProvider","removeConnectedSocialProvider","parseUnits","value","decimals","formatUnits","sendTransaction","args","estimateGas","writeContract","getEnsAddress","getEnsAvatar","clearUri","resetWcConnection","removeWalletConnectDeepLink","disconnect"],"sourceRoot":"../../../src","sources":["controllers/ConnectionController.ts"],"mappings":"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"}

package/lib/module/controllers/ConnectorController.js

@@ -31,7 +31,6 @@ export const ConnectorController = {
     state.connectedConnector = connectorType;
     if (saveStorage) {
       if (connectorType) {
-        //TODO: Check this
         StorageUtil.setConnectedConnector(connectorType);
       } else {
         StorageUtil.removeConnectedConnector();

package/lib/module/controllers/ConnectorController.js.map

@@ -1 +1 @@
-{"version":3,"names":["subscribeKey","subKey","proxy","ref","StorageUtil","state","connectors","ConnectorController","key","callback","setConnectors","map","c","addConnector","connector","getConnectors","getAuthConnector","find","type","setConnectedConnector","connectorType","saveStorage","connectedConnector","removeConnectedConnector","setAuthLoading","loading","authLoading"],"sourceRoot":"../../../src","sources":["controllers/ConnectorController.ts"],"mappings":"AACA,SAASA,YAAY,IAAIC,MAAM,QAAQ,cAAc;AACrD,SAASC,KAAK,EAAEC,GAAG,QAAQ,QAAQ;AAEnC,SAASC,WAAW,QAAQ,sBAAsB;;AAElD;;AASA;AACA,MAAMC,KAAK,GAAGH,KAAK,CAA2B;EAC5CI,UAAU,EAAE;AACd,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,mBAAmB,GAAG;EACjCF,KAAK;EAELL,YAAYA,CAAqBQ,GAAM,EAAEC,QAAsD,EAAE;IAC/F,OAAOR,MAAM,CAACI,KAAK,EAAEG,GAAG,EAAEC,QAAQ,CAAC;EACrC,CAAC;EAEDC,aAAaA,CAACJ,UAAkD,EAAE;IAChED,KAAK,CAACC,UAAU,GAAGA,UAAU,CAACK,GAAG,CAACC,CAAC,IAAIT,GAAG,CAACS,CAAC,CAAC,CAAC;EAChD,CAAC;EAEDC,YAAYA,CAACC,SAAoB,EAAE;IACjCT,KAAK,CAACC,UAAU,GAAG,CAAC,GAAGD,KAAK,CAACC,UAAU,EAAEH,GAAG,CAACW,SAAS,CAAC,CAAC;EAC1D,CAAC;EAEDC,aAAaA,CAAA,EAAG;IACd,OAAOV,KAAK,CAACC,UAAU;EACzB,CAAC;EAEDU,gBAAgBA,CAAA,EAAG;IACjB,OAAOX,KAAK,CAACC,UAAU,CAACW,IAAI,CAACL,CAAC,IAAIA,CAAC,CAACM,IAAI,KAAK,MAAM,CAAC;EACtD,CAAC;EAEDC,qBAAqBA,CACnBC,aAA6D,EAC7DC,WAAW,GAAG,IAAI,EAClB;IACAhB,KAAK,CAACiB,kBAAkB,GAAGF,aAAa;IAExC,IAAIC,WAAW,EAAE;MACf,IAAID,aAAa,EAAE;QACjB;QACAhB,WAAW,CAACe,qBAAqB,CAACC,aAAa,CAAC;MAClD,CAAC,MAAM;QACLhB,WAAW,CAACmB,wBAAwB,CAAC,CAAC;MACxC;IACF;EACF,CAAC;EAEDC,cAAcA,CAACC,OAAgD,EAAE;IAC/DpB,KAAK,CAACqB,WAAW,GAAGD,OAAO;EAC7B;AACF,CAAC"}
+{"version":3,"names":["subscribeKey","subKey","proxy","ref","StorageUtil","state","connectors","ConnectorController","key","callback","setConnectors","map","c","addConnector","connector","getConnectors","getAuthConnector","find","type","setConnectedConnector","connectorType","saveStorage","connectedConnector","removeConnectedConnector","setAuthLoading","loading","authLoading"],"sourceRoot":"../../../src","sources":["controllers/ConnectorController.ts"],"mappings":"AACA,SAASA,YAAY,IAAIC,MAAM,QAAQ,cAAc;AACrD,SAASC,KAAK,EAAEC,GAAG,QAAQ,QAAQ;AAEnC,SAASC,WAAW,QAAQ,sBAAsB;;AAElD;;AASA;AACA,MAAMC,KAAK,GAAGH,KAAK,CAA2B;EAC5CI,UAAU,EAAE;AACd,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,mBAAmB,GAAG;EACjCF,KAAK;EAELL,YAAYA,CAAqBQ,GAAM,EAAEC,QAAsD,EAAE;IAC/F,OAAOR,MAAM,CAACI,KAAK,EAAEG,GAAG,EAAEC,QAAQ,CAAC;EACrC,CAAC;EAEDC,aAAaA,CAACJ,UAAkD,EAAE;IAChED,KAAK,CAACC,UAAU,GAAGA,UAAU,CAACK,GAAG,CAACC,CAAC,IAAIT,GAAG,CAACS,CAAC,CAAC,CAAC;EAChD,CAAC;EAEDC,YAAYA,CAACC,SAAoB,EAAE;IACjCT,KAAK,CAACC,UAAU,GAAG,CAAC,GAAGD,KAAK,CAACC,UAAU,EAAEH,GAAG,CAACW,SAAS,CAAC,CAAC;EAC1D,CAAC;EAEDC,aAAaA,CAAA,EAAG;IACd,OAAOV,KAAK,CAACC,UAAU;EACzB,CAAC;EAEDU,gBAAgBA,CAAA,EAAG;IACjB,OAAOX,KAAK,CAACC,UAAU,CAACW,IAAI,CAACL,CAAC,IAAIA,CAAC,CAACM,IAAI,KAAK,MAAM,CAAC;EACtD,CAAC;EAEDC,qBAAqBA,CACnBC,aAA6D,EAC7DC,WAAW,GAAG,IAAI,EAClB;IACAhB,KAAK,CAACiB,kBAAkB,GAAGF,aAAa;IAExC,IAAIC,WAAW,EAAE;MACf,IAAID,aAAa,EAAE;QACjBhB,WAAW,CAACe,qBAAqB,CAACC,aAAa,CAAC;MAClD,CAAC,MAAM;QACLhB,WAAW,CAACmB,wBAAwB,CAAC,CAAC;MACxC;IACF;EACF,CAAC;EAEDC,cAAcA,CAACC,OAAgD,EAAE;IAC/DpB,KAAK,CAACqB,WAAW,GAAGD,OAAO;EAC7B;AACF,CAAC"}

package/lib/module/controllers/EnsController.js

@@ -1,5 +1,5 @@
-import { subscribeKey as subKey } from 'valtio/vanilla/utils';
-import { proxy, subscribe as sub } from 'valtio/vanilla';
+import { subscribeKey as subKey } from 'valtio/utils';
+import { proxy, subscribe as sub } from 'valtio';
 import { BlockchainApiController } from './BlockchainApiController';
 
 // -- Types --------------------------------------------- //

package/lib/module/controllers/EnsController.js.map

@@ -1 +1 @@
-{"version":3,"names":["subscribeKey","subKey","proxy","subscribe","sub","BlockchainApiController","state","loading","EnsController","callback","key","resolveName","name","lookupEnsName","e","error","Error","reasons","description"],"sourceRoot":"../../../src","sources":["controllers/EnsController.ts"],"mappings":"AAAA,SAASA,YAAY,IAAIC,MAAM,QAAQ,sBAAsB;AAC7D,SAASC,KAAK,EAAEC,SAAS,IAAIC,GAAG,QAAQ,gBAAgB;AACxD,SAASC,uBAAuB,QAAQ,2BAA2B;;AAGnE;;AAQA;AACA,MAAMC,KAAK,GAAGJ,KAAK,CAAqB;EACtCK,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,aAAa,GAAG;EAC3BF,KAAK;EAELH,SAASA,CAACM,QAAgD,EAAE;IAC1D,OAAOL,GAAG,CAACE,KAAK,EAAE,MAAMG,QAAQ,CAACH,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDN,YAAYA,CAAqBU,GAAM,EAAED,QAAgD,EAAE;IACzF,OAAOR,MAAM,CAACK,KAAK,EAAEI,GAAG,EAAED,QAAQ,CAAC;EACrC,CAAC;EAED,MAAME,WAAWA,CAACC,IAAY,EAAE;IAC9B,IAAI;MACF,OAAO,MAAMP,uBAAuB,CAACQ,aAAa,CAACD,IAAI,CAAC;IAC1D,CAAC,CAAC,OAAOE,CAAC,EAAE;MACV,MAAMC,KAAK,GAAGD,CAA0B;MACxC,MAAM,IAAIE,KAAK,CAACD,KAAK,EAAEE,OAAO,GAAG,CAAC,CAAC,EAAEC,WAAW,IAAI,sBAAsB,CAAC;IAC7E;EACF;AACF,CAAC"}
+{"version":3,"names":["subscribeKey","subKey","proxy","subscribe","sub","BlockchainApiController","state","loading","EnsController","callback","key","resolveName","name","lookupEnsName","e","error","Error","reasons","description"],"sourceRoot":"../../../src","sources":["controllers/EnsController.ts"],"mappings":"AAAA,SAASA,YAAY,IAAIC,MAAM,QAAQ,cAAc;AACrD,SAASC,KAAK,EAAEC,SAAS,IAAIC,GAAG,QAAQ,QAAQ;AAChD,SAASC,uBAAuB,QAAQ,2BAA2B;;AAGnE;;AAQA;AACA,MAAMC,KAAK,GAAGJ,KAAK,CAAqB;EACtCK,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,aAAa,GAAG;EAC3BF,KAAK;EAELH,SAASA,CAACM,QAAgD,EAAE;IAC1D,OAAOL,GAAG,CAACE,KAAK,EAAE,MAAMG,QAAQ,CAACH,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDN,YAAYA,CAAqBU,GAAM,EAAED,QAAgD,EAAE;IACzF,OAAOR,MAAM,CAACK,KAAK,EAAEI,GAAG,EAAED,QAAQ,CAAC;EACrC,CAAC;EAED,MAAME,WAAWA,CAACC,IAAY,EAAE;IAC9B,IAAI;MACF,OAAO,MAAMP,uBAAuB,CAACQ,aAAa,CAACD,IAAI,CAAC;IAC1D,CAAC,CAAC,OAAOE,CAAC,EAAE;MACV,MAAMC,KAAK,GAAGD,CAA0B;MACxC,MAAM,IAAIE,KAAK,CAACD,KAAK,EAAEE,OAAO,GAAG,CAAC,CAAC,EAAEC,WAAW,IAAI,sBAAsB,CAAC;IAC7E;EACF;AACF,CAAC"}

package/lib/module/controllers/EventsController.js

@@ -1,4 +1,4 @@
-import { proxy, subscribe as sub } from 'valtio/vanilla';
+import { proxy, subscribe as sub } from 'valtio';
 import { ApiController } from './ApiController';
 import { OptionsController } from './OptionsController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';

package/lib/module/controllers/EventsController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","subscribe","sub","ApiController","OptionsController","CoreHelperUtil","FetchUtil","baseUrl","getAnalyticsUrl","api","excluded","state","timestamp","Date","now","data","type","event","EventsController","callback","subscribeEvent","_sendAnalyticsEvent","includes","post","path","headers","_getApiHeaders","body","eventId","getUUID","bundleId","getBundleId","props","sendEvent","prefetchPromise","enableAnalytics"],"sourceRoot":"../../../src","sources":["controllers/EventsController.ts"],"mappings":"AAAA,SAASA,KAAK,EAAEC,SAAS,IAAIC,GAAG,QAAQ,gBAAgB;AACxD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,iBAAiB,QAAQ,qBAAqB;AACvD,SAASC,cAAc,QAAQ,yBAAyB;AACxD,SAASC,SAAS,QAAQ,oBAAoB;AAG9C;AACA,MAAMC,OAAO,GAAGF,cAAc,CAACG,eAAe,CAAC,CAAC;AAChD,MAAMC,GAAG,GAAG,IAAIH,SAAS,CAAC;EAAEC;AAAQ,CAAC,CAAC;AACtC,MAAMG,QAAQ,GAAG,CAAC,eAAe,CAAC;;AAElC;;AAMA;AACA,MAAMC,KAAK,GAAGX,KAAK,CAAwB;EACzCY,SAAS,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;EACrBC,IAAI,EAAE;IACJC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAE,eAAe,CAAC;EACzB;AACF,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,gBAAgB,GAAG;EAC9BP,KAAK;EAELV,SAASA,CAACkB,QAAmD,EAAE;IAC7D,OAAOjB,GAAG,CAACS,KAAK,EAAE,MAAMQ,QAAQ,CAACR,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDS,cAAcA,CAACH,KAAgB,EAAEE,QAAmD,EAAE;IACpF,OAAOjB,GAAG,CAACS,KAAK,EAAE,MAAM;MACtB,IAAIA,KAAK,CAACI,IAAI,CAACE,KAAK,KAAKA,KAAK,EAAE;QAC9BE,QAAQ,CAACR,KAAK,CAAC;MACjB;IACF,CAAC,CAAC;EACJ,CAAC;EAED,MAAMU,mBAAmBA,CAACN,IAAmC,EAAEH,SAAiB,EAAE;IAChF,IAAIF,QAAQ,CAACY,QAAQ,CAACP,IAAI,CAACE,KAAK,CAAC,EAAE;MACjC;IACF;IAEA,IAAI;MACF,MAAMR,GAAG,CAACc,IAAI,CAAC;QACbC,IAAI,EAAE,IAAI;QACVC,OAAO,EAAEtB,aAAa,CAACuB,cAAc,CAAC,CAAC;QACvCC,IAAI,EAAE;UACJC,OAAO,EAAEvB,cAAc,CAACwB,OAAO,CAAC,CAAC;UACjCC,QAAQ,EAAEzB,cAAc,CAAC0B,WAAW,CAAC,CAAC;UACtCnB,SAAS;UACToB,KAAK,EAAEjB;QACT;MACF,CAAC,CAAC;IACJ,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ,CAAC;EAED,MAAMkB,SAASA,CAAClB,IAAmC,EAAE;IACnD,MAAMH,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAC5BH,KAAK,CAACC,SAAS,GAAGA,SAAS;IAC3BD,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjB,MAAMZ,aAAa,CAACQ,KAAK,CAACuB,eAAe;IAEzC,IAAI9B,iBAAiB,CAACO,KAAK,CAACwB,eAAe,EAAE;MAC3CjB,gBAAgB,CAACG,mBAAmB,CAACN,IAAI,EAAEH,SAAS,CAAC;IACvD;EACF;AACF,CAAC"}
+{"version":3,"names":["proxy","subscribe","sub","ApiController","OptionsController","CoreHelperUtil","FetchUtil","baseUrl","getAnalyticsUrl","api","excluded","state","timestamp","Date","now","data","type","event","EventsController","callback","subscribeEvent","_sendAnalyticsEvent","includes","post","path","headers","_getApiHeaders","body","eventId","getUUID","bundleId","getBundleId","props","sendEvent","prefetchPromise","enableAnalytics"],"sourceRoot":"../../../src","sources":["controllers/EventsController.ts"],"mappings":"AAAA,SAASA,KAAK,EAAEC,SAAS,IAAIC,GAAG,QAAQ,QAAQ;AAChD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,iBAAiB,QAAQ,qBAAqB;AACvD,SAASC,cAAc,QAAQ,yBAAyB;AACxD,SAASC,SAAS,QAAQ,oBAAoB;AAG9C;AACA,MAAMC,OAAO,GAAGF,cAAc,CAACG,eAAe,CAAC,CAAC;AAChD,MAAMC,GAAG,GAAG,IAAIH,SAAS,CAAC;EAAEC;AAAQ,CAAC,CAAC;AACtC,MAAMG,QAAQ,GAAG,CAAC,eAAe,CAAC;;AAElC;;AAMA;AACA,MAAMC,KAAK,GAAGX,KAAK,CAAwB;EACzCY,SAAS,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;EACrBC,IAAI,EAAE;IACJC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAE,eAAe,CAAC;EACzB;AACF,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,gBAAgB,GAAG;EAC9BP,KAAK;EAELV,SAASA,CAACkB,QAAmD,EAAE;IAC7D,OAAOjB,GAAG,CAACS,KAAK,EAAE,MAAMQ,QAAQ,CAACR,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDS,cAAcA,CAACH,KAAgB,EAAEE,QAAmD,EAAE;IACpF,OAAOjB,GAAG,CAACS,KAAK,EAAE,MAAM;MACtB,IAAIA,KAAK,CAACI,IAAI,CAACE,KAAK,KAAKA,KAAK,EAAE;QAC9BE,QAAQ,CAACR,KAAK,CAAC;MACjB;IACF,CAAC,CAAC;EACJ,CAAC;EAED,MAAMU,mBAAmBA,CAACN,IAAmC,EAAEH,SAAiB,EAAE;IAChF,IAAIF,QAAQ,CAACY,QAAQ,CAACP,IAAI,CAACE,KAAK,CAAC,EAAE;MACjC;IACF;IAEA,IAAI;MACF,MAAMR,GAAG,CAACc,IAAI,CAAC;QACbC,IAAI,EAAE,IAAI;QACVC,OAAO,EAAEtB,aAAa,CAACuB,cAAc,CAAC,CAAC;QACvCC,IAAI,EAAE;UACJC,OAAO,EAAEvB,cAAc,CAACwB,OAAO,CAAC,CAAC;UACjCC,QAAQ,EAAEzB,cAAc,CAAC0B,WAAW,CAAC,CAAC;UACtCnB,SAAS;UACToB,KAAK,EAAEjB;QACT;MACF,CAAC,CAAC;IACJ,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ,CAAC;EAED,MAAMkB,SAASA,CAAClB,IAAmC,EAAE;IACnD,MAAMH,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAC5BH,KAAK,CAACC,SAAS,GAAGA,SAAS;IAC3BD,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjB,MAAMZ,aAAa,CAACQ,KAAK,CAACuB,eAAe;IAEzC,IAAI9B,iBAAiB,CAACO,KAAK,CAACwB,eAAe,EAAE;MAC3CjB,gBAAgB,CAACG,mBAAmB,CAACN,IAAI,EAAEH,SAAS,CAAC;IACvD;EACF;AACF,CAAC"}

package/lib/module/controllers/ModalController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","AccountController","RouterController","PublicStateController","EventsController","ApiController","ConnectorController","state","open","loading","ModalController","options","prefetchPromise","connected","isConnected","view","reset","isUniversalWallet","connectedConnector","set","sendEvent","type","event","properties","close","setLoading"],"sourceRoot":"../../../src","sources":["controllers/ModalController.ts"],"mappings":"AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,iBAAiB,QAAQ,qBAAqB;AAEvD,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,mBAAmB,QAAQ,uBAAuB;;AAE3D;;AAYA;AACA,MAAMC,KAAK,GAAGP,KAAK,CAAuB;EACxCQ,IAAI,EAAE,KAAK;EACXC,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,eAAe,GAAG;EAC7BH,KAAK;EAEL,MAAMC,IAAIA,CAACG,OAA0C,EAAE;IACrD,MAAMN,aAAa,CAACE,KAAK,CAACK,eAAe;IACzC,MAAMC,SAAS,GAAGZ,iBAAiB,CAACM,KAAK,CAACO,WAAW;IACrD,IAAIH,OAAO,EAAEI,IAAI,EAAE;MACjBb,gBAAgB,CAACc,KAAK,CAACL,OAAO,CAACI,IAAI,CAAC;IACtC,CAAC,MAAM,IAAId,iBAAiB,CAACM,KAAK,CAACO,WAAW,EAAE;MAC9C,MAAMG,iBAAiB,GAAGX,mBAAmB,CAACC,KAAK,CAACW,kBAAkB,KAAK,MAAM;MACjFhB,gBAAgB,CAACc,KAAK,CAACC,iBAAiB,GAAG,SAAS,GAAG,gBAAgB,CAAC;IAC1E,CAAC,MAAM;MACLf,gBAAgB,CAACc,KAAK,CAAC,SAAS,CAAC;IACnC;IACAT,KAAK,CAACC,IAAI,GAAG,IAAI;IACjBL,qBAAqB,CAACgB,GAAG,CAAC;MAAEX,IAAI,EAAE;IAAK,CAAC,CAAC;IACzCJ,gBAAgB,CAACgB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,YAAY;MACnBC,UAAU,EAAE;QAAEV;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDW,KAAKA,CAAA,EAAG;IACN,MAAMX,SAAS,GAAGZ,iBAAiB,CAACM,KAAK,CAACO,WAAW;IACrDP,KAAK,CAACC,IAAI,GAAG,KAAK;IAClBL,qBAAqB,CAACgB,GAAG,CAAC;MAAEX,IAAI,EAAE;IAAM,CAAC,CAAC;IAC1CJ,gBAAgB,CAACgB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,aAAa;MACpBC,UAAU,EAAE;QAAEV;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDY,UAAUA,CAAChB,OAAwC,EAAE;IACnDF,KAAK,CAACE,OAAO,GAAGA,OAAO;EACzB;AACF,CAAC"}
+{"version":3,"names":["proxy","AccountController","RouterController","PublicStateController","EventsController","ApiController","ConnectorController","state","open","loading","ModalController","options","prefetchPromise","connected","isConnected","view","reset","isUniversalWallet","connectedConnector","set","sendEvent","type","event","properties","close","setLoading"],"sourceRoot":"../../../src","sources":["controllers/ModalController.ts"],"mappings":"AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,iBAAiB,QAAQ,qBAAqB;AACvD,SAASC,gBAAgB,QAAoC,oBAAoB;AACjF,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,mBAAmB,QAAQ,uBAAuB;;AAE3D;;AAYA;AACA,MAAMC,KAAK,GAAGP,KAAK,CAAuB;EACxCQ,IAAI,EAAE,KAAK;EACXC,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,eAAe,GAAG;EAC7BH,KAAK;EAEL,MAAMC,IAAIA,CAACG,OAA0C,EAAE;IACrD,MAAMN,aAAa,CAACE,KAAK,CAACK,eAAe;IACzC,MAAMC,SAAS,GAAGZ,iBAAiB,CAACM,KAAK,CAACO,WAAW;IACrD,IAAIH,OAAO,EAAEI,IAAI,EAAE;MACjBb,gBAAgB,CAACc,KAAK,CAACL,OAAO,CAACI,IAAI,CAAC;IACtC,CAAC,MAAM,IAAId,iBAAiB,CAACM,KAAK,CAACO,WAAW,EAAE;MAC9C,MAAMG,iBAAiB,GAAGX,mBAAmB,CAACC,KAAK,CAACW,kBAAkB,KAAK,MAAM;MACjFhB,gBAAgB,CAACc,KAAK,CAACC,iBAAiB,GAAG,SAAS,GAAG,gBAAgB,CAAC;IAC1E,CAAC,MAAM;MACLf,gBAAgB,CAACc,KAAK,CAAC,SAAS,CAAC;IACnC;IACAT,KAAK,CAACC,IAAI,GAAG,IAAI;IACjBL,qBAAqB,CAACgB,GAAG,CAAC;MAAEX,IAAI,EAAE;IAAK,CAAC,CAAC;IACzCJ,gBAAgB,CAACgB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,YAAY;MACnBC,UAAU,EAAE;QAAEV;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDW,KAAKA,CAAA,EAAG;IACN,MAAMX,SAAS,GAAGZ,iBAAiB,CAACM,KAAK,CAACO,WAAW;IACrDP,KAAK,CAACC,IAAI,GAAG,KAAK;IAClBL,qBAAqB,CAACgB,GAAG,CAAC;MAAEX,IAAI,EAAE;IAAM,CAAC,CAAC;IAC1CJ,gBAAgB,CAACgB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,aAAa;MACpBC,UAAU,EAAE;QAAEV;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDY,UAAUA,CAAChB,OAAwC,EAAE;IACnDF,KAAK,CAACE,OAAO,GAAGA,OAAO;EACzB;AACF,CAAC"}

package/lib/module/controllers/OnRampController.js

@@ -20,23 +20,23 @@ const mapErrorMessage = errorCode => {
   const errorMap = {
     [OnRampErrorType.AMOUNT_TOO_LOW]: {
       type: OnRampErrorType.AMOUNT_TOO_LOW,
-      message: 'Amount is too low'
+      message: 'The amount is too low'
     },
     [OnRampErrorType.AMOUNT_TOO_HIGH]: {
       type: OnRampErrorType.AMOUNT_TOO_HIGH,
-      message: 'Amount is too high'
+      message: 'The amount is too high'
     },
     [OnRampErrorType.INVALID_AMOUNT]: {
       type: OnRampErrorType.INVALID_AMOUNT,
-      message: 'Please adjust amount'
+      message: 'Enter a valid amount'
     },
     [OnRampErrorType.INCOMPATIBLE_REQUEST]: {
       type: OnRampErrorType.INCOMPATIBLE_REQUEST,
-      message: 'Try different amount or payment method'
+      message: 'Enter a valid amount'
     },
     [OnRampErrorType.BAD_REQUEST]: {
       type: OnRampErrorType.BAD_REQUEST,
-      message: 'Try different amount or payment method'
+      message: 'Enter a valid amount'
     }
   };
   return errorMap[errorCode] || {
@@ -71,19 +71,19 @@ export const OnRampController = {
     state.selectedCountry = country;
     state.loading = true;
     if (updateCurrency) {
-      const currencyCode = ConstantsUtil.COUNTRY_CURRENCIES[country.countryCode] || 'USD';
+      const currencyCode = state.countriesDefaults?.find(d => d.countryCode === country.countryCode)?.defaultCurrencyCode || 'USD';
       const currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
       if (currency) {
         this.setPaymentCurrency(currency);
       }
     }
     await Promise.all([this.fetchPaymentMethods(), this.fetchCryptoCurrencies()]);
+    this.clearQuotes();
     state.loading = false;
     StorageUtil.setOnRampPreferredCountry(country);
   },
   setSelectedPaymentMethod(paymentMethod) {
     state.selectedPaymentMethod = paymentMethod;
-    this.clearQuotes();
   },
   setPurchaseCurrency(currency) {
     state.purchaseCurrency = currency;
@@ -117,7 +117,7 @@ export const OnRampController = {
       const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[NetworkController.state.caipNetwork?.id];
       selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
     }
-    state.purchaseCurrency = selectedCurrency || state.purchaseCurrencies?.[0] || undefined;
+    state.purchaseCurrency = selectedCurrency ?? state.purchaseCurrencies?.[0] ?? undefined;
   },
   getServiceProviderImage(serviceProviderName) {
     if (!serviceProviderName) return undefined;
@@ -151,6 +151,23 @@ export const OnRampController = {
       };
     }
   },
+  async fetchCountriesDefaults() {
+    try {
+      let countriesDefaults = await StorageUtil.getOnRampCountriesDefaults();
+      if (!countriesDefaults.length) {
+        countriesDefaults = (await BlockchainApiController.fetchOnRampCountriesDefaults()) ?? [];
+        if (countriesDefaults.length) {
+          StorageUtil.setOnRampCountriesDefaults(countriesDefaults);
+        }
+      }
+      state.countriesDefaults = countriesDefaults;
+    } catch (error) {
+      state.error = {
+        type: OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
+        message: 'Failed to load countries defaults'
+      };
+    }
+  },
   async fetchServiceProviders() {
     try {
       let serviceProviders = await StorageUtil.getOnRampServiceProviders();
@@ -173,7 +190,7 @@ export const OnRampController = {
       const paymentMethods = await BlockchainApiController.fetchOnRampPaymentMethods({
         countries: state.selectedCountry?.countryCode
       });
-      const defaultCountryPaymentMethods = ConstantsUtil.COUNTRY_DEFAULT_PAYMENT_METHOD[state.selectedCountry?.countryCode];
+      const defaultCountryPaymentMethods = state.countriesDefaults?.find(d => d.countryCode === state.selectedCountry?.countryCode)?.defaultPaymentMethods || [];
       state.paymentMethods = paymentMethods?.sort((a, b) => {
         const aIndex = defaultCountryPaymentMethods?.indexOf(a.paymentMethod);
         const bIndex = defaultCountryPaymentMethods?.indexOf(b.paymentMethod);
@@ -182,8 +199,7 @@ export const OnRampController = {
         if (bIndex === -1) return -1;
         return aIndex - bIndex;
       }) || [];
-      state.selectedPaymentMethod = paymentMethods?.[0] || undefined;
-      this.clearQuotes();
+      state.selectedPaymentMethod = state.paymentMethods[0];
     } catch (error) {
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_METHODS,
@@ -227,7 +243,7 @@ export const OnRampController = {
       }
       state.paymentCurrencies = fiatCurrencies || [];
       if (countryCode) {
-        currencyCode = ConstantsUtil.COUNTRY_CURRENCIES[countryCode];
+        currencyCode = state.countriesDefaults?.find(d => d.countryCode === countryCode)?.defaultCurrencyCode || 'USD';
       }
       const preferredCurrency = await StorageUtil.getOnRampPreferredFiatCurrency();
       const defaultCurrency = preferredCurrency || fiatCurrencies?.find(c => c.currencyCode === currencyCode) || fiatCurrencies?.[0] || undefined;
@@ -263,26 +279,47 @@ export const OnRampController = {
       return;
     }
     state.quotesLoading = true;
+    state.selectedQuote = undefined;
+    state.selectedServiceProvider = undefined;
     state.error = undefined;
     this.abortGetQuotes(false);
     quotesAbortController = new AbortController();
+    const currentSignal = quotesAbortController.signal;
     try {
       const body = {
         countryCode: state.selectedCountry?.countryCode,
-        paymentMethodType: state.selectedPaymentMethod?.paymentMethod,
         destinationCurrencyCode: state.purchaseCurrency?.currencyCode,
         sourceAmount: state.paymentAmount,
         sourceCurrencyCode: state.paymentCurrency?.currencyCode,
         walletAddress: AccountController.state.address
       };
-      const response = await BlockchainApiController.getOnRampQuotes(body, quotesAbortController.signal);
+      const response = await BlockchainApiController.getOnRampQuotes(body, currentSignal);
       if (!response || !response.length) {
         throw new Error('No quotes available');
       }
       const quotes = response.sort((a, b) => b.customerScore - a.customerScore);
       state.quotes = quotes;
-      state.selectedQuote = quotes[0];
-      state.selectedServiceProvider = state.serviceProviders.find(sp => sp.serviceProvider === quotes[0]?.serviceProvider);
+
+      //Replace payment method if it's not in the quotes
+      const isValidPaymentMethod = state.selectedPaymentMethod && quotes.some(quote => quote.paymentMethodType === state.selectedPaymentMethod?.paymentMethod);
+      if (!isValidPaymentMethod) {
+        const countryMethods = state.countriesDefaults?.find(d => d.countryCode === state.selectedCountry?.countryCode)?.defaultPaymentMethods || [];
+        const availableQuoteMethods = new Set(quotes.map(q => q.paymentMethodType));
+        let newPaymentMethodType;
+        for (const dpm of countryMethods) {
+          if (availableQuoteMethods.has(dpm)) {
+            newPaymentMethodType = dpm;
+            break;
+          }
+        }
+        if (newPaymentMethodType) {
+          state.selectedPaymentMethod = state.paymentMethods.find(m => m.paymentMethod === newPaymentMethodType) || state.paymentMethods.find(method => method.paymentMethod === quotes[0]?.paymentMethodType);
+        } else {
+          state.selectedPaymentMethod = state.paymentMethods.find(method => method.paymentMethod === quotes[0]?.paymentMethodType);
+        }
+      }
+      state.selectedQuote = quotes.find(quote => quote.paymentMethodType === state.selectedPaymentMethod?.paymentMethod);
+      state.selectedServiceProvider = state.serviceProviders.find(sp => sp.serviceProvider === state.selectedQuote?.serviceProvider);
     } catch (error) {
       if (error.name === 'AbortError') {
         // Do nothing, another request was made
@@ -298,7 +335,9 @@ export const OnRampController = {
       this.clearQuotes();
       state.error = mapErrorMessage(error?.code || 'UNKNOWN_ERROR');
     } finally {
-      state.quotesLoading = false;
+      if (!currentSignal.aborted) {
+        state.quotesLoading = false;
+      }
     }
   },
   canGenerateQuote() {
@@ -339,7 +378,7 @@ export const OnRampController = {
       if (!quote) {
         throw new Error('Invalid quote');
       }
-      const widget = await BlockchainApiController.getOnRampWidget({
+      const body = {
         countryCode: quote.countryCode,
         destinationCurrencyCode: quote.destinationCurrencyCode,
         paymentMethodType: quote.paymentMethodType,
@@ -348,7 +387,8 @@ export const OnRampController = {
         sourceCurrencyCode: quote.sourceCurrencyCode,
         walletAddress: AccountController.state.address,
         redirectUrl: metadata?.redirect?.universal ?? metadata?.redirect?.native
-      });
+      };
+      const widget = await BlockchainApiController.getOnRampWidget(body);
       if (!widget || !widget.widgetUrl) {
         throw new Error('Invalid widget response');
       }
@@ -390,7 +430,7 @@ export const OnRampController = {
     try {
       await this.fetchCountries();
       await this.fetchServiceProviders();
-      await Promise.all([this.fetchPaymentMethods(), this.fetchFiatLimits(), this.fetchCryptoCurrencies(), this.fetchFiatCurrencies()]);
+      await Promise.all([this.fetchCountriesDefaults(), this.fetchPaymentMethods(), this.fetchFiatLimits(), this.fetchCryptoCurrencies(), this.fetchFiatCurrencies()]);
     } catch (error) {
       if (!state.error) {
         state.error = {