@reown/appkit-core-react-native 2.0.0 → 2.0.1

package/lib/module/controllers/LogController.js

@@ -0,0 +1,185 @@
+"use strict";
+
+import { proxy } from 'valtio';
+import { OptionsController } from './OptionsController';
+import { sanitizeString, sanitizeStackTrace, sanitizeValue, sanitizeData } from '../utils/LogUtils';
+import { CoreHelperUtil } from '../utils/CoreHelperUtil';
+
+// -- Types --------------------------------------------- //
+
+// -- Constants ----------------------------------------- //
+const MAX_LOGS_COUNT = 300; // Prevent memory issues
+
+// -- State --------------------------------------------- //
+const state = proxy({
+  logs: []
+});
+const generateLogId = () => {
+  return CoreHelperUtil.getUUID();
+};
+const logToConsole = entry => {
+  const {
+    debug
+  } = OptionsController.state;
+  if (!debug) {
+    return;
+  }
+  const location = entry.fileName && entry.functionName ? `[${entry.fileName}:${entry.functionName}]` : entry.fileName ? `[${entry.fileName}]` : '';
+  const logMessage = `[AppKit] ${location} ${entry.message}`;
+  switch (entry.level) {
+    case 'error':
+      // eslint-disable-next-line no-console
+      console.error(logMessage);
+      break;
+    case 'warn':
+      console.warn(logMessage);
+      break;
+    case 'debug':
+      // eslint-disable-next-line no-console
+      console.debug(logMessage);
+      break;
+    case 'info':
+    default:
+      // eslint-disable-next-line no-console
+      console.log(logMessage);
+      break;
+  }
+};
+
+// -- Controller ---------------------------------------- //
+export const LogController = {
+  state,
+  /**
+   * Destroy the LogController (cleanup resources)
+   */
+  destroy() {
+    // Clear all logs
+    state.logs = [];
+  },
+  /**
+   * Send a general log entry
+   */
+  sendLog(level, message, fileName, functionName, data) {
+    if (!OptionsController.state.debug) {
+      return;
+    }
+    const entry = {
+      id: generateLogId(),
+      timestamp: Date.now(),
+      level,
+      message: sanitizeString(message),
+      fileName,
+      functionName,
+      data: sanitizeData(data)
+    };
+    state.logs.push(entry);
+
+    // Enforce maximum log count
+    if (state.logs.length > MAX_LOGS_COUNT) {
+      state.logs = state.logs.slice(-MAX_LOGS_COUNT);
+    }
+    logToConsole(entry);
+  },
+  /**
+   * Send an error log entry - convenience method for try/catch blocks
+   */
+  sendError(error, fileName, functionName, additionalData) {
+    let message;
+    let data = sanitizeData(additionalData) || {};
+    if (error instanceof Error) {
+      message = error.message || 'Error occurred';
+      // Sanitize stack trace to remove sensitive file paths
+      data['stack'] = error.stack ? sanitizeStackTrace(error.stack) : undefined;
+      data['name'] = error.name;
+
+      // Sanitize any additional properties on the error object
+      const errorProps = {};
+      Object.getOwnPropertyNames(error).forEach(prop => {
+        if (prop !== 'message' && prop !== 'stack' && prop !== 'name') {
+          errorProps[prop] = error[prop];
+        }
+      });
+      if (Object.keys(errorProps).length > 0) {
+        Object.assign(data, sanitizeValue(errorProps));
+      }
+    } else if (typeof error === 'string') {
+      message = error;
+    } else if (error && typeof error === 'object' && 'message' in error) {
+      // Handle error-like objects (e.g., RPC errors, custom error objects)
+      message = String(error.message) || 'Error occurred';
+      // Include all properties of the error object
+      Object.assign(data, sanitizeValue(error));
+    } else {
+      message = 'Unknown error occurred';
+      // Sanitize the original error object
+      data['originalError'] = sanitizeValue(error);
+    }
+
+    // Note: sanitization happens in sendLog method
+    this.sendLog('error', message, fileName, functionName, data);
+  },
+  /**
+   * Send an info log entry
+   */
+  sendInfo(message, fileName, functionName, data) {
+    this.sendLog('info', message, fileName, functionName, data);
+  },
+  /**
+   * Send a warning log entry
+   */
+  sendWarn(message, fileName, functionName, data) {
+    this.sendLog('warn', message, fileName, functionName, data);
+  },
+  /**
+   * Send a debug log entry
+   */
+  sendDebug(message, fileName, functionName, data) {
+    this.sendLog('debug', message, fileName, functionName, data);
+  },
+  /**
+   * Get all logs
+   */
+  getLogs() {
+    return [...state.logs];
+  },
+  /**
+   * Get logs by level
+   */
+  getLogsByLevel(level) {
+    return state.logs.filter(log => log.level === level);
+  },
+  /**
+   * Get recent logs (last N entries)
+   */
+  getRecentLogs(count = 100) {
+    return state.logs.slice(-count);
+  },
+  /**
+   * Clear all logs
+   */
+  clearLogs() {
+    state.logs = [];
+  },
+  /**
+   * Export logs as JSON string for debugging
+   */
+  exportLogs() {
+    return JSON.stringify(state.logs, null, 2);
+  },
+  /**
+   * Get logs count by level
+   */
+  getLogsStats() {
+    const stats = {
+      info: 0,
+      warn: 0,
+      error: 0,
+      debug: 0
+    };
+    state.logs.forEach(log => {
+      stats[log.level]++;
+    });
+    return stats;
+  }
+};
+//# sourceMappingURL=LogController.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["proxy","OptionsController","sanitizeString","sanitizeStackTrace","sanitizeValue","sanitizeData","CoreHelperUtil","MAX_LOGS_COUNT","state","logs","generateLogId","getUUID","logToConsole","entry","debug","location","fileName","functionName","logMessage","message","level","console","error","warn","log","LogController","destroy","sendLog","data","id","timestamp","Date","now","push","length","slice","sendError","additionalData","Error","stack","undefined","name","errorProps","Object","getOwnPropertyNames","forEach","prop","keys","assign","String","sendInfo","sendWarn","sendDebug","getLogs","getLogsByLevel","filter","getRecentLogs","count","clearLogs","exportLogs","JSON","stringify","getLogsStats","stats","info"],"sourceRoot":"../../../src","sources":["controllers/LogController.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/controllers/ModalController.js

@@ -1,10 +1,11 @@
+"use strict";
+
 import { proxy } from 'valtio';
-import { AccountController } from './AccountController';
 import { RouterController } from './RouterController';
 import { PublicStateController } from './PublicStateController';
 import { EventsController } from './EventsController';
 import { ApiController } from './ApiController';
-import { ConnectorController } from './ConnectorController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Types --------------------------------------------- //
 
@@ -19,11 +20,14 @@ export const ModalController = {
   state,
   async open(options) {
     await ApiController.state.prefetchPromise;
-    const connected = AccountController.state.isConnected;
+    const isConnected = ConnectionsController.state.isConnected;
+    const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
     if (options?.view) {
+      if (options.view === 'Account' && !isUniversalWallet) {
+        options.view = 'AccountDefault';
+      }
       RouterController.reset(options.view);
-    } else if (AccountController.state.isConnected) {
-      const isUniversalWallet = ConnectorController.state.connectedConnector === 'AUTH';
+    } else if (isConnected) {
       RouterController.reset(isUniversalWallet ? 'Account' : 'AccountDefault');
     } else {
       RouterController.reset('Connect');
@@ -36,12 +40,12 @@ export const ModalController = {
       type: 'track',
       event: 'MODAL_OPEN',
       properties: {
-        connected
+        connected: isConnected
       }
     });
   },
   close() {
-    const connected = AccountController.state.isConnected;
+    const connected = ConnectionsController.state.isConnected;
     state.open = false;
     PublicStateController.set({
       open: false

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","RouterController","PublicStateController","EventsController","ApiController","ConnectionsController","state","open","loading","ModalController","options","prefetchPromise","isConnected","isUniversalWallet","connection","properties","provider","view","reset","set","sendEvent","type","event","connected","close","setLoading"],"sourceRoot":"../../../src","sources":["controllers/ModalController.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,gBAAgB,QAAoC,oBAAoB;AACjF,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,qBAAqB,QAAQ,yBAAyB;;AAE/D;;AAYA;AACA,MAAMC,KAAK,GAAGN,KAAK,CAAuB;EACxCO,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,WAAW,GAAGP,qBAAqB,CAACC,KAAK,CAACM,WAAW;IAC3D,MAAMC,iBAAiB,GAAG,CAAC,CAACR,qBAAqB,CAACC,KAAK,CAACQ,UAAU,EAAEC,UAAU,EAAEC,QAAQ;IACxF,IAAIN,OAAO,EAAEO,IAAI,EAAE;MACjB,IAAIP,OAAO,CAACO,IAAI,KAAK,SAAS,IAAI,CAACJ,iBAAiB,EAAE;QACpDH,OAAO,CAACO,IAAI,GAAG,gBAAgB;MACjC;MAEAhB,gBAAgB,CAACiB,KAAK,CAACR,OAAO,CAACO,IAAI,CAAC;IACtC,CAAC,MAAM,IAAIL,WAAW,EAAE;MACtBX,gBAAgB,CAACiB,KAAK,CAACL,iBAAiB,GAAG,SAAS,GAAG,gBAAgB,CAAC;IAC1E,CAAC,MAAM;MACLZ,gBAAgB,CAACiB,KAAK,CAAC,SAAS,CAAC;IACnC;IACAZ,KAAK,CAACC,IAAI,GAAG,IAAI;IACjBL,qBAAqB,CAACiB,GAAG,CAAC;MAAEZ,IAAI,EAAE;IAAK,CAAC,CAAC;IACzCJ,gBAAgB,CAACiB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,YAAY;MACnBP,UAAU,EAAE;QAAEQ,SAAS,EAAEX;MAAY;IACvC,CAAC,CAAC;EACJ,CAAC;EAEDY,KAAKA,CAAA,EAAG;IACN,MAAMD,SAAS,GAAGlB,qBAAqB,CAACC,KAAK,CAACM,WAAW;IACzDN,KAAK,CAACC,IAAI,GAAG,KAAK;IAClBL,qBAAqB,CAACiB,GAAG,CAAC;MAAEZ,IAAI,EAAE;IAAM,CAAC,CAAC;IAC1CJ,gBAAgB,CAACiB,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,aAAa;MACpBP,UAAU,EAAE;QAAEQ;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDE,UAAUA,CAACjB,OAAwC,EAAE;IACnDF,KAAK,CAACE,OAAO,GAAGA,OAAO;EACzB;AACF,CAAC","ignoreList":[]}

package/lib/module/controllers/OnRampController.js

@@ -1,14 +1,17 @@
-import { subscribeKey as subKey } from 'valtio/vanilla/utils';
-import { proxy, subscribe as sub } from 'valtio/vanilla';
+"use strict";
+
+import { subscribeKey as subKey } from 'valtio/utils';
+import { proxy, subscribe as sub } from 'valtio';
+import { BlockchainOnRampError } from '@reown/appkit-common-react-native';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
-import { NetworkController } from './NetworkController';
-import { AccountController } from './AccountController';
 import { OptionsController } from './OptionsController';
 import { ConstantsUtil, OnRampErrorType } from '../utils/ConstantsUtil';
 import { StorageUtil } from '../utils/StorageUtil';
 import { SnackController } from './SnackController';
+import { LogController } from './LogController';
 import { EventsController } from './EventsController';
-import { BlockchainApiController } from './BlockchainApiController';
+import { BlockchainApiController, EXCLUDED_ONRAMP_PROVIDERS } from './BlockchainApiController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Helpers ------------------------------------------- //
 
@@ -20,23 +23,27 @@ 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'
+    },
+    [OnRampErrorType.NO_VALID_QUOTES]: {
+      type: OnRampErrorType.NO_VALID_QUOTES,
+      message: 'No quotes available'
     }
   };
   return errorMap[errorCode] || {
@@ -68,22 +75,34 @@ export const OnRampController = {
     return subKey(state, key, callback);
   },
   async setSelectedCountry(country, updateCurrency = true) {
-    state.selectedCountry = country;
-    state.loading = true;
-    if (updateCurrency) {
-      const currencyCode = ConstantsUtil.COUNTRY_CURRENCIES[country.countryCode] || 'USD';
-      const currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
-      if (currency) {
-        this.setPaymentCurrency(currency);
+    try {
+      state.selectedCountry = country;
+      state.loading = true;
+      if (updateCurrency) {
+        const currencyCode = state.countriesDefaults?.find(d => d.countryCode === country.countryCode)?.defaultCurrencyCode || 'USD';
+        let currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
+        if (!currency) {
+          currency = state.paymentCurrencies?.find(c => c.currencyCode === 'USD');
+        }
+        if (currency) {
+          this.setPaymentCurrency(currency);
+        }
       }
+      await Promise.all([this.fetchPaymentMethods(), this.fetchCryptoCurrencies()]);
+      this.clearQuotes();
+      state.loading = false;
+      StorageUtil.setOnRampPreferredCountry(country);
+    } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'setSelectedCountry');
+      state.loading = false;
+      state.error = {
+        type: OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
+        message: 'Failed to load countries'
+      };
     }
-    await Promise.all([this.fetchPaymentMethods(), this.fetchCryptoCurrencies()]);
-    state.loading = false;
-    StorageUtil.setOnRampPreferredCountry(country);
   },
   setSelectedPaymentMethod(paymentMethod) {
     state.selectedPaymentMethod = paymentMethod;
-    this.clearQuotes();
   },
   setPurchaseCurrency(currency) {
     state.purchaseCurrency = currency;
@@ -113,11 +132,11 @@ export const OnRampController = {
   },
   updateSelectedPurchaseCurrency() {
     let selectedCurrency;
-    if (NetworkController.state.caipNetwork?.id) {
-      const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[NetworkController.state.caipNetwork?.id];
+    if (ConnectionsController.state.activeNetwork?.caipNetworkId) {
+      const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[ConnectionsController.state.activeNetwork?.caipNetworkId];
       selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
     }
-    state.purchaseCurrency = selectedCurrency || state.purchaseCurrencies?.[0] || undefined;
+    state.purchaseCurrency = selectedCurrency ?? undefined;
   },
   getServiceProviderImage(serviceProviderName) {
     if (!serviceProviderName) return undefined;
@@ -145,12 +164,31 @@ export const OnRampController = {
         state.selectedCountry = countries.find(c => c.countryCode === countryCode) || countries[0] || undefined;
       }
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchCountries');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
         message: 'Failed to load countries'
       };
     }
   },
+  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) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchCountriesDefaults');
+      state.error = {
+        type: OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
+        message: 'Failed to load countries defaults'
+      };
+    }
+  },
   async fetchServiceProviders() {
     try {
       let serviceProviders = await StorageUtil.getOnRampServiceProviders();
@@ -162,6 +200,7 @@ export const OnRampController = {
       }
       state.serviceProviders = serviceProviders || [];
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchServiceProviders');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_PROVIDERS,
         message: 'Failed to load service providers'
@@ -173,7 +212,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,9 +221,9 @@ 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) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchPaymentMethods');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_METHODS,
         message: 'Failed to load payment methods'
@@ -200,12 +239,13 @@ export const OnRampController = {
       });
       state.purchaseCurrencies = cryptoCurrencies || [];
       let selectedCurrency;
-      if (NetworkController.state.caipNetwork?.id) {
-        const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[NetworkController.state.caipNetwork?.id] || 'ETH';
+      if (ConnectionsController.state.activeNetwork?.caipNetworkId) {
+        const defaultCurrency = ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[ConnectionsController.state.activeNetwork?.caipNetworkId];
         selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
       }
-      state.purchaseCurrency = selectedCurrency || cryptoCurrencies?.[0] || undefined;
+      state.purchaseCurrency = selectedCurrency || undefined;
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchCryptoCurrencies');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_CURRENCIES,
         message: 'Failed to load crypto currencies'
@@ -227,7 +267,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;
@@ -235,6 +275,7 @@ export const OnRampController = {
         this.setPaymentCurrency(defaultCurrency);
       }
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchFiatCurrencies');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_CURRENCIES,
         message: 'Failed to load fiat currencies'
@@ -254,36 +295,63 @@ export const OnRampController = {
       state.error = undefined;
     }
   },
-  getQuotesDebounced: CoreHelperUtil.debounce(function () {
-    OnRampController.getQuotes();
-  }, 500),
   async getQuotes() {
-    if (!state.paymentAmount || state.paymentAmount <= 0) {
+    if (!this.canGenerateQuote()) {
       this.clearQuotes();
       return;
     }
-    state.quotesLoading = true;
-    state.error = undefined;
     this.abortGetQuotes(false);
     quotesAbortController = new AbortController();
+    const currentSignal = quotesAbortController.signal;
     try {
+      if (!state.selectedCountry?.countryCode || !state.purchaseCurrency?.currencyCode || !state.paymentCurrency?.currencyCode || !ConnectionsController.state.activeAddress) {
+        throw new BlockchainOnRampError(OnRampErrorType.UNKNOWN, 'Invalid quote parameters');
+      }
+      state.quotesLoading = true;
+      state.selectedQuote = undefined;
+      state.selectedServiceProvider = undefined;
+      state.error = undefined;
+      const plainAddress = CoreHelperUtil.getPlainAddress(ConnectionsController.state.activeAddress);
+      if (!plainAddress) {
+        throw new Error('Invalid address');
+      }
       const body = {
-        countryCode: state.selectedCountry?.countryCode,
-        paymentMethodType: state.selectedPaymentMethod?.paymentMethod,
-        destinationCurrencyCode: state.purchaseCurrency?.currencyCode,
+        countryCode: state.selectedCountry.countryCode,
+        destinationCurrencyCode: state.purchaseCurrency.currencyCode,
         sourceAmount: state.paymentAmount,
-        sourceCurrencyCode: state.paymentCurrency?.currencyCode,
-        walletAddress: AccountController.state.address
+        sourceCurrencyCode: state.paymentCurrency.currencyCode,
+        walletAddress: plainAddress,
+        excludeProviders: EXCLUDED_ONRAMP_PROVIDERS
       };
-      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');
+        throw new BlockchainOnRampError(OnRampErrorType.NO_VALID_QUOTES, 'No valid quotes');
       }
       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) {
+      LogController.sendError(error, 'OnRampController.ts', 'getQuotes');
       if (error.name === 'AbortError') {
         // Do nothing, another request was made
         return;
@@ -298,11 +366,13 @@ export const OnRampController = {
       this.clearQuotes();
       state.error = mapErrorMessage(error?.code || 'UNKNOWN_ERROR');
     } finally {
-      state.quotesLoading = false;
+      if (!currentSignal.aborted) {
+        state.quotesLoading = false;
+      }
     }
   },
   canGenerateQuote() {
-    return !!(state.selectedCountry?.countryCode && state.selectedPaymentMethod?.paymentMethod && state.purchaseCurrency?.currencyCode && state.paymentAmount && state.paymentAmount > 0 && state.paymentCurrency?.currencyCode && state.selectedCountry && !state.loading && AccountController.state.address);
+    return !!(state.selectedCountry?.countryCode && state.selectedPaymentMethod?.paymentMethod && state.purchaseCurrency?.currencyCode && state.paymentAmount && state.paymentAmount > 0 && state.paymentCurrency?.currencyCode && state.selectedCountry && !state.loading && ConnectionsController.state.activeAddress);
   },
   async fetchFiatLimits() {
     try {
@@ -315,6 +385,7 @@ export const OnRampController = {
       }
       state.paymentCurrenciesLimits = limits;
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchFiatLimits');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_LIMITS,
         message: 'Failed to load fiat limits'
@@ -325,6 +396,9 @@ export const OnRampController = {
   async generateWidget({
     quote
   }) {
+    if (!ConnectionsController.state.activeAddress) {
+      throw new Error('No active address');
+    }
     const metadata = OptionsController.state.metadata;
     const eventProperties = {
       asset: quote.destinationCurrencyCode,
@@ -339,16 +413,21 @@ export const OnRampController = {
       if (!quote) {
         throw new Error('Invalid quote');
       }
-      const widget = await BlockchainApiController.getOnRampWidget({
+      const plainAddress = CoreHelperUtil.getPlainAddress(ConnectionsController.state.activeAddress);
+      if (!plainAddress) {
+        throw new Error('Invalid address');
+      }
+      const body = {
         countryCode: quote.countryCode,
         destinationCurrencyCode: quote.destinationCurrencyCode,
         paymentMethodType: quote.paymentMethodType,
         serviceProvider: quote.serviceProvider,
         sourceAmount: quote.sourceAmount,
         sourceCurrencyCode: quote.sourceCurrencyCode,
-        walletAddress: AccountController.state.address,
+        walletAddress: plainAddress,
         redirectUrl: metadata?.redirect?.universal ?? metadata?.redirect?.native
-      });
+      };
+      const widget = await BlockchainApiController.getOnRampWidget(body);
       if (!widget || !widget.widgetUrl) {
         throw new Error('Invalid widget response');
       }
@@ -360,6 +439,9 @@ export const OnRampController = {
       state.widgetUrl = widget.widgetUrl;
       return widget;
     } catch (e) {
+      LogController.sendError(e, 'OnRampController.ts', 'generateWidget', {
+        quote
+      });
       EventsController.sendEvent({
         type: 'track',
         event: 'BUY_FAIL',
@@ -390,8 +472,9 @@ 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) {
+      LogController.sendError(error, 'OnRampController.ts', 'loadOnRampData');
       if (!state.error) {
         state.error = {
           type: OnRampErrorType.FAILED_TO_LOAD,