@reown/appkit-core-react-native 0.0.0-feat-onramp-20250626195202 → 0.0.0-feat-multi-social-20250630195637

package/lib/commonjs/controllers/ConnectionsController.js

@@ -0,0 +1,217 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ConnectionsController = void 0;
+var _valtio = require("valtio");
+var _utils = require("valtio/utils");
+var _appkitCommonReactNative = require("@reown/appkit-common-react-native");
+var _StorageUtil = require("../utils/StorageUtil");
+// -- Types --------------------------------------------- //
+
+//TODO: balance could be elsewhere
+
+// -- State --------------------------------------------- //
+const baseState = (0, _valtio.proxy)({
+  activeNamespace: undefined,
+  connections: new Map(),
+  networks: []
+});
+const derivedState = (0, _utils.derive)({
+  activeAddress: get => {
+    const snap = get(baseState);
+    if (!snap.activeNamespace) {
+      return undefined;
+    }
+    const connection = snap.connections.get(snap.activeNamespace);
+    if (!connection || !connection.accounts || connection.accounts.length === 0) {
+      return undefined;
+    }
+
+    //TODO: what happens if there are several accounts on the same chain?
+    const activeAccount = connection.accounts.find(account => account.startsWith(connection.caipNetwork));
+    return activeAccount;
+  },
+  activeBalance: get => {
+    const snap = get(baseState);
+    if (!snap.activeNamespace) return undefined;
+    const connection = snap.connections.get(snap.activeNamespace);
+    if (!connection || !connection.accounts || connection.accounts.length === 0) {
+      return undefined;
+    }
+    const activeAccount = connection.accounts.find(account => account.startsWith(connection.caipNetwork));
+    if (!connection || !connection.balances || !activeAccount || Object.keys(connection.balances).length === 0) {
+      return undefined;
+    }
+    return connection.balances[activeAccount];
+  },
+  activeNetwork: get => {
+    const snap = get(baseState);
+    if (!snap.activeNamespace) return undefined;
+    const connection = snap.connections.get(snap.activeNamespace);
+    if (!connection) return undefined;
+    return snap.networks.find(network => network.chainNamespace === snap.activeNamespace && network.id?.toString() === connection.caipNetwork?.split(':')[1]);
+  },
+  activeCaipNetworkId: get => {
+    const snap = get(baseState);
+    if (!snap.activeNamespace) return undefined;
+    const connection = snap.connections.get(snap.activeNamespace);
+    if (!connection) return undefined;
+    return connection.caipNetwork;
+  },
+  walletInfo: get => {
+    const snap = get(baseState);
+    if (!snap.activeNamespace) return undefined;
+    return snap.connections.get(snap.activeNamespace)?.wallet;
+  }
+}, {
+  proxy: baseState // Link derived proxy to the base state proxy
+});
+
+// -- Controller ---------------------------------------- //
+const ConnectionsController = exports.ConnectionsController = {
+  state: derivedState,
+  setActiveNamespace(namespace) {
+    baseState.activeNamespace = namespace;
+    _StorageUtil.StorageUtil.setActiveNamespace(namespace);
+  },
+  storeConnection({
+    namespace,
+    adapter,
+    accounts,
+    chains,
+    wallet,
+    caipNetwork
+  }) {
+    const newConnectionEntry = {
+      balances: {},
+      caipNetwork: caipNetwork ?? chains[0],
+      adapter: (0, _valtio.ref)(adapter),
+      accounts,
+      chains,
+      wallet
+    };
+
+    // Create a new Map to ensure Valtio detects the change
+    const newConnectionsMap = new Map(baseState.connections);
+    newConnectionsMap.set(namespace, newConnectionEntry);
+    baseState.connections = newConnectionsMap;
+  },
+  updateAccounts(namespace, accounts) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) {
+      return;
+    }
+    const newConnectionsMap = new Map(baseState.connections);
+    const updatedConnection = {
+      ...connection,
+      accounts
+    };
+    newConnectionsMap.set(namespace, updatedConnection);
+    baseState.connections = newConnectionsMap;
+  },
+  updateBalance(namespace, address, balance) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) {
+      return;
+    }
+    const newBalances = {
+      ...connection.balances,
+      [address]: balance
+    };
+    const updatedConnection = {
+      ...connection,
+      balances: newBalances
+    };
+    const newConnectionsMap = new Map(baseState.connections);
+    newConnectionsMap.set(namespace, updatedConnection);
+    baseState.connections = newConnectionsMap;
+  },
+  setActiveNetwork(namespace, networkId) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) {
+      return;
+    }
+    baseState.connections.set(namespace, {
+      ...connection,
+      caipNetwork: networkId
+    });
+  },
+  setNetworks(networks) {
+    baseState.networks = networks;
+  },
+  getConnectedNetworks() {
+    return baseState.networks.filter(network => baseState.connections.get(network.chainNamespace)?.accounts.some(account => account.startsWith(network.caipNetworkId)));
+  },
+  async disconnect(namespace, isInternal = true) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) return;
+
+    // Get the current connector from the adapter
+    const connector = connection.adapter.connector;
+    if (!connector) return;
+
+    // Find all namespaces that use the same connector
+    const namespacesUsingConnector = Array.from(baseState.connections.keys()).filter(ns => baseState.connections.get(ns)?.adapter.connector === connector);
+
+    // Unsubscribe all event listeners from the adapter
+    namespacesUsingConnector.forEach(ns => {
+      const _connection = baseState.connections.get(ns);
+      if (_connection?.adapter) {
+        _connection.adapter.removeAllListeners();
+      }
+    });
+
+    // Disconnect the adapter
+    if (isInternal) {
+      await connection.adapter.disconnect();
+    }
+
+    // Remove all namespaces that used this connector
+    const newConnectionsMap = new Map(baseState.connections);
+    namespacesUsingConnector.forEach(ns => {
+      newConnectionsMap.delete(ns);
+    });
+    baseState.connections = newConnectionsMap;
+
+    // Remove activeNamespace if it is in the list of namespaces using the connector
+    if (baseState.activeNamespace && (baseState.activeNamespace === namespace || namespacesUsingConnector.includes(baseState.activeNamespace))) {
+      baseState.activeNamespace = undefined;
+      _StorageUtil.StorageUtil.setActiveNamespace(undefined);
+    }
+  },
+  parseUnits(value, decimals) {
+    if (!baseState.activeNamespace) return undefined;
+    return baseState.connections.get(baseState.activeNamespace)?.adapter.parseUnits(value, decimals);
+  },
+  async signMessage(address, message) {
+    if (!baseState.activeNamespace) return undefined;
+    const [namespace, chainId, plainAddress] = address.split(':');
+    if (!namespace || namespace !== baseState.activeNamespace || !chainId || !plainAddress) {
+      return undefined;
+    }
+    const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
+    if (adapter instanceof _appkitCommonReactNative.EVMAdapter && plainAddress && chainId) {
+      return adapter.signMessage(plainAddress, message, chainId);
+    }
+    return undefined;
+  },
+  async sendTransaction(args) {
+    if (!baseState.activeNamespace) return undefined;
+    const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
+    if (adapter instanceof _appkitCommonReactNative.EVMAdapter) {
+      return adapter.sendTransaction(args);
+    }
+    return undefined;
+  },
+  async estimateGas(args) {
+    if (!baseState.activeNamespace || baseState.activeNamespace !== 'eip155') return undefined;
+    const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
+    if (adapter instanceof _appkitCommonReactNative.EVMAdapter) {
+      return adapter.estimateGas(args);
+    }
+    return undefined;
+  }
+};
+//# sourceMappingURL=ConnectionsController.js.map

package/lib/commonjs/controllers/ConnectionsController.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_valtio","require","_utils","_appkitCommonReactNative","_StorageUtil","baseState","proxy","activeNamespace","undefined","connections","Map","networks","derivedState","derive","activeAddress","get","snap","connection","accounts","length","activeAccount","find","account","startsWith","caipNetwork","activeBalance","balances","Object","keys","activeNetwork","network","chainNamespace","id","toString","split","activeCaipNetworkId","walletInfo","wallet","ConnectionsController","exports","state","setActiveNamespace","namespace","StorageUtil","storeConnection","adapter","chains","newConnectionEntry","ref","newConnectionsMap","set","updateAccounts","updatedConnection","updateBalance","address","balance","newBalances","setActiveNetwork","networkId","setNetworks","getConnectedNetworks","filter","some","caipNetworkId","disconnect","isInternal","connector","namespacesUsingConnector","Array","from","ns","forEach","_connection","removeAllListeners","delete","includes","parseUnits","value","decimals","signMessage","message","chainId","plainAddress","EVMAdapter","sendTransaction","args","estimateGas"],"sourceRoot":"../../../src","sources":["controllers/ConnectionsController.ts"],"mappings":"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"}

package/lib/commonjs/controllers/ConnectorController.js

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

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

@@ -1 +1 @@
-{"version":3,"names":["_utils","require","_valtio","_StorageUtil","state","proxy","connectors","ConnectorController","exports","subscribeKey","key","callback","subKey","setConnectors","map","c","ref","addConnector","connector","getConnectors","getAuthConnector","find","type","setConnectedConnector","connectorType","saveStorage","connectedConnector","StorageUtil","removeConnectedConnector","setAuthLoading","loading","authLoading"],"sourceRoot":"../../../src","sources":["controllers/ConnectorController.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,YAAA,GAAAF,OAAA;AAEA;;AASA;AACA,MAAMG,KAAK,GAAG,IAAAC,aAAK,EAA2B;EAC5CC,UAAU,EAAE;AACd,CAAC,CAAC;;AAEF;AACO,MAAMC,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,GAAG;EACjCH,KAAK;EAELK,YAAYA,CAAqBC,GAAM,EAAEC,QAAsD,EAAE;IAC/F,OAAO,IAAAC,mBAAM,EAACR,KAAK,EAAEM,GAAG,EAAEC,QAAQ,CAAC;EACrC,CAAC;EAEDE,aAAaA,CAACP,UAAkD,EAAE;IAChEF,KAAK,CAACE,UAAU,GAAGA,UAAU,CAACQ,GAAG,CAACC,CAAC,IAAI,IAAAC,WAAG,EAACD,CAAC,CAAC,CAAC;EAChD,CAAC;EAEDE,YAAYA,CAACC,SAAoB,EAAE;IACjCd,KAAK,CAACE,UAAU,GAAG,CAAC,GAAGF,KAAK,CAACE,UAAU,EAAE,IAAAU,WAAG,EAACE,SAAS,CAAC,CAAC;EAC1D,CAAC;EAEDC,aAAaA,CAAA,EAAG;IACd,OAAOf,KAAK,CAACE,UAAU;EACzB,CAAC;EAEDc,gBAAgBA,CAAA,EAAG;IACjB,OAAOhB,KAAK,CAACE,UAAU,CAACe,IAAI,CAACN,CAAC,IAAIA,CAAC,CAACO,IAAI,KAAK,MAAM,CAAC;EACtD,CAAC;EAEDC,qBAAqBA,CACnBC,aAA6D,EAC7DC,WAAW,GAAG,IAAI,EAClB;IACArB,KAAK,CAACsB,kBAAkB,GAAGF,aAAa;IAExC,IAAIC,WAAW,EAAE;MACf,IAAID,aAAa,EAAE;QACjBG,wBAAW,CAACJ,qBAAqB,CAACC,aAAa,CAAC;MAClD,CAAC,MAAM;QACLG,wBAAW,CAACC,wBAAwB,CAAC,CAAC;MACxC;IACF;EACF,CAAC;EAEDC,cAAcA,CAACC,OAAgD,EAAE;IAC/D1B,KAAK,CAAC2B,WAAW,GAAGD,OAAO;EAC7B;AACF,CAAC"}
+{"version":3,"names":["_utils","require","_valtio","_StorageUtil","state","proxy","connectors","ConnectorController","exports","subscribeKey","key","callback","subKey","setConnectors","map","c","ref","addConnector","connector","getConnectors","getAuthConnector","find","type","setConnectedConnector","connectorType","saveStorage","connectedConnector","StorageUtil","removeConnectedConnector","setAuthLoading","loading","authLoading"],"sourceRoot":"../../../src","sources":["controllers/ConnectorController.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,YAAA,GAAAF,OAAA;AAEA;;AASA;AACA,MAAMG,KAAK,GAAG,IAAAC,aAAK,EAA2B;EAC5CC,UAAU,EAAE;AACd,CAAC,CAAC;;AAEF;AACO,MAAMC,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,GAAG;EACjCH,KAAK;EAELK,YAAYA,CAAqBC,GAAM,EAAEC,QAAsD,EAAE;IAC/F,OAAO,IAAAC,mBAAM,EAACR,KAAK,EAAEM,GAAG,EAAEC,QAAQ,CAAC;EACrC,CAAC;EAEDE,aAAaA,CAACP,UAAkD,EAAE;IAChEF,KAAK,CAACE,UAAU,GAAGA,UAAU,CAACQ,GAAG,CAACC,CAAC,IAAI,IAAAC,WAAG,EAACD,CAAC,CAAC,CAAC;EAChD,CAAC;EAEDE,YAAYA,CAACC,SAAoB,EAAE;IACjCd,KAAK,CAACE,UAAU,GAAG,CAAC,GAAGF,KAAK,CAACE,UAAU,EAAE,IAAAU,WAAG,EAACE,SAAS,CAAC,CAAC;EAC1D,CAAC;EAEDC,aAAaA,CAAA,EAAG;IACd,OAAOf,KAAK,CAACE,UAAU;EACzB,CAAC;EAEDc,gBAAgBA,CAAA,EAAG;IACjB,OAAOhB,KAAK,CAACE,UAAU,CAACe,IAAI,CAACN,CAAC,IAAIA,CAAC,CAACO,IAAI,KAAK,MAAM,CAAC;EACtD,CAAC;EAEDC,qBAAqBA,CACnBC,aAA6D,EAC7DC,WAAW,GAAG,IAAI,EAClB;IACArB,KAAK,CAACsB,kBAAkB,GAAGF,aAAa;IAExC,IAAIC,WAAW,EAAE;MACf,IAAID,aAAa,EAAE;QACjB;QACAG,wBAAW,CAACJ,qBAAqB,CAACC,aAAa,CAAC;MAClD,CAAC,MAAM;QACLG,wBAAW,CAACC,wBAAwB,CAAC,CAAC;MACxC;IACF;EACF,CAAC;EAEDC,cAAcA,CAACC,OAAgD,EAAE;IAC/D1B,KAAK,CAAC2B,WAAW,GAAGD,OAAO;EAC7B;AACF,CAAC"}

package/lib/commonjs/controllers/EnsController.js

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EnsController = void 0;
-var _utils = require("valtio/utils");
-var _valtio = require("valtio");
+var _utils = require("valtio/vanilla/utils");
+var _vanilla = require("valtio/vanilla");
 var _BlockchainApiController = require("./BlockchainApiController");
 // -- Types --------------------------------------------- //
 
 // -- State --------------------------------------------- //
-const state = (0, _valtio.proxy)({
+const state = (0, _vanilla.proxy)({
   loading: false
 });
 
@@ -18,7 +18,7 @@ const state = (0, _valtio.proxy)({
 const EnsController = exports.EnsController = {
   state,
   subscribe(callback) {
-    return (0, _valtio.subscribe)(state, () => callback(state));
+    return (0, _vanilla.subscribe)(state, () => callback(state));
   },
   subscribeKey(key, callback) {
     return (0, _utils.subscribeKey)(state, key, callback);

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

@@ -1 +1 @@
-{"version":3,"names":["_utils","require","_valtio","_BlockchainApiController","state","proxy","loading","EnsController","exports","subscribe","callback","sub","subscribeKey","key","subKey","resolveName","name","BlockchainApiController","lookupEnsName","e","error","Error","reasons","description"],"sourceRoot":"../../../src","sources":["controllers/EnsController.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AAGA;;AAQA;AACA,MAAMG,KAAK,GAAG,IAAAC,aAAK,EAAqB;EACtCC,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACO,MAAMC,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAG;EAC3BH,KAAK;EAELK,SAASA,CAACC,QAAgD,EAAE;IAC1D,OAAO,IAAAC,iBAAG,EAACP,KAAK,EAAE,MAAMM,QAAQ,CAACN,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDQ,YAAYA,CAAqBC,GAAM,EAAEH,QAAgD,EAAE;IACzF,OAAO,IAAAI,mBAAM,EAACV,KAAK,EAAES,GAAG,EAAEH,QAAQ,CAAC;EACrC,CAAC;EAED,MAAMK,WAAWA,CAACC,IAAY,EAAE;IAC9B,IAAI;MACF,OAAO,MAAMC,gDAAuB,CAACC,aAAa,CAACF,IAAI,CAAC;IAC1D,CAAC,CAAC,OAAOG,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":["_utils","require","_vanilla","_BlockchainApiController","state","proxy","loading","EnsController","exports","subscribe","callback","sub","subscribeKey","key","subKey","resolveName","name","BlockchainApiController","lookupEnsName","e","error","Error","reasons","description"],"sourceRoot":"../../../src","sources":["controllers/EnsController.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AAGA;;AAQA;AACA,MAAMG,KAAK,GAAG,IAAAC,cAAK,EAAqB;EACtCC,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACO,MAAMC,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAG;EAC3BH,KAAK;EAELK,SAASA,CAACC,QAAgD,EAAE;IAC1D,OAAO,IAAAC,kBAAG,EAACP,KAAK,EAAE,MAAMM,QAAQ,CAACN,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDQ,YAAYA,CAAqBC,GAAM,EAAEH,QAAgD,EAAE;IACzF,OAAO,IAAAI,mBAAM,EAACV,KAAK,EAAES,GAAG,EAAEH,QAAQ,CAAC;EACrC,CAAC;EAED,MAAMK,WAAWA,CAACC,IAAY,EAAE;IAC9B,IAAI;MACF,OAAO,MAAMC,gDAAuB,CAACC,aAAa,CAACF,IAAI,CAAC;IAC1D,CAAC,CAAC,OAAOG,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/commonjs/controllers/EventsController.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EventsController = void 0;
-var _valtio = require("valtio");
+var _vanilla = require("valtio/vanilla");
 var _ApiController = require("./ApiController");
 var _OptionsController = require("./OptionsController");
 var _CoreHelperUtil = require("../utils/CoreHelperUtil");
@@ -19,7 +19,7 @@ const excluded = ['MODAL_CREATED'];
 // -- Types --------------------------------------------- //
 
 // -- State --------------------------------------------- //
-const state = (0, _valtio.proxy)({
+const state = (0, _vanilla.proxy)({
   timestamp: Date.now(),
   data: {
     type: 'track',
@@ -31,10 +31,10 @@ const state = (0, _valtio.proxy)({
 const EventsController = exports.EventsController = {
   state,
   subscribe(callback) {
-    return (0, _valtio.subscribe)(state, () => callback(state));
+    return (0, _vanilla.subscribe)(state, () => callback(state));
   },
   subscribeEvent(event, callback) {
-    return (0, _valtio.subscribe)(state, () => {
+    return (0, _vanilla.subscribe)(state, () => {
       if (state.data.event === event) {
         callback(state);
       }

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

@@ -1 +1 @@
-{"version":3,"names":["_valtio","require","_ApiController","_OptionsController","_CoreHelperUtil","_FetchUtil","baseUrl","CoreHelperUtil","getAnalyticsUrl","api","FetchUtil","excluded","state","proxy","timestamp","Date","now","data","type","event","EventsController","exports","subscribe","callback","sub","subscribeEvent","_sendAnalyticsEvent","includes","post","path","headers","ApiController","_getApiHeaders","body","eventId","getUUID","bundleId","getBundleId","props","sendEvent","prefetchPromise","OptionsController","enableAnalytics"],"sourceRoot":"../../../src","sources":["controllers/EventsController.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AAGA;AACA,MAAMK,OAAO,GAAGC,8BAAc,CAACC,eAAe,CAAC,CAAC;AAChD,MAAMC,GAAG,GAAG,IAAIC,oBAAS,CAAC;EAAEJ;AAAQ,CAAC,CAAC;AACtC,MAAMK,QAAQ,GAAG,CAAC,eAAe,CAAC;;AAElC;;AAMA;AACA,MAAMC,KAAK,GAAG,IAAAC,aAAK,EAAwB;EACzCC,SAAS,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;EACrBC,IAAI,EAAE;IACJC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAE,eAAe,CAAC;EACzB;AACF,CAAC,CAAC;;AAEF;AACO,MAAMC,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAG;EAC9BR,KAAK;EAELU,SAASA,CAACC,QAAmD,EAAE;IAC7D,OAAO,IAAAC,iBAAG,EAACZ,KAAK,EAAE,MAAMW,QAAQ,CAACX,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDa,cAAcA,CAACN,KAAgB,EAAEI,QAAmD,EAAE;IACpF,OAAO,IAAAC,iBAAG,EAACZ,KAAK,EAAE,MAAM;MACtB,IAAIA,KAAK,CAACK,IAAI,CAACE,KAAK,KAAKA,KAAK,EAAE;QAC9BI,QAAQ,CAACX,KAAK,CAAC;MACjB;IACF,CAAC,CAAC;EACJ,CAAC;EAED,MAAMc,mBAAmBA,CAACT,IAAmC,EAAEH,SAAiB,EAAE;IAChF,IAAIH,QAAQ,CAACgB,QAAQ,CAACV,IAAI,CAACE,KAAK,CAAC,EAAE;MACjC;IACF;IAEA,IAAI;MACF,MAAMV,GAAG,CAACmB,IAAI,CAAC;QACbC,IAAI,EAAE,IAAI;QACVC,OAAO,EAAEC,4BAAa,CAACC,cAAc,CAAC,CAAC;QACvCC,IAAI,EAAE;UACJC,OAAO,EAAE3B,8BAAc,CAAC4B,OAAO,CAAC,CAAC;UACjCC,QAAQ,EAAE7B,8BAAc,CAAC8B,WAAW,CAAC,CAAC;UACtCvB,SAAS;UACTwB,KAAK,EAAErB;QACT;MACF,CAAC,CAAC;IACJ,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ,CAAC;EAED,MAAMsB,SAASA,CAACtB,IAAmC,EAAE;IACnD,MAAMH,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAC5BJ,KAAK,CAACE,SAAS,GAAGA,SAAS;IAC3BF,KAAK,CAACK,IAAI,GAAGA,IAAI;IACjB,MAAMc,4BAAa,CAACnB,KAAK,CAAC4B,eAAe;IAEzC,IAAIC,oCAAiB,CAAC7B,KAAK,CAAC8B,eAAe,EAAE;MAC3CtB,gBAAgB,CAACM,mBAAmB,CAACT,IAAI,EAAEH,SAAS,CAAC;IACvD;EACF;AACF,CAAC"}
+{"version":3,"names":["_vanilla","require","_ApiController","_OptionsController","_CoreHelperUtil","_FetchUtil","baseUrl","CoreHelperUtil","getAnalyticsUrl","api","FetchUtil","excluded","state","proxy","timestamp","Date","now","data","type","event","EventsController","exports","subscribe","callback","sub","subscribeEvent","_sendAnalyticsEvent","includes","post","path","headers","ApiController","_getApiHeaders","body","eventId","getUUID","bundleId","getBundleId","props","sendEvent","prefetchPromise","OptionsController","enableAnalytics"],"sourceRoot":"../../../src","sources":["controllers/EventsController.ts"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AAGA;AACA,MAAMK,OAAO,GAAGC,8BAAc,CAACC,eAAe,CAAC,CAAC;AAChD,MAAMC,GAAG,GAAG,IAAIC,oBAAS,CAAC;EAAEJ;AAAQ,CAAC,CAAC;AACtC,MAAMK,QAAQ,GAAG,CAAC,eAAe,CAAC;;AAElC;;AAMA;AACA,MAAMC,KAAK,GAAG,IAAAC,cAAK,EAAwB;EACzCC,SAAS,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC;EACrBC,IAAI,EAAE;IACJC,IAAI,EAAE,OAAO;IACbC,KAAK,EAAE,eAAe,CAAC;EACzB;AACF,CAAC,CAAC;;AAEF;AACO,MAAMC,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAG;EAC9BR,KAAK;EAELU,SAASA,CAACC,QAAmD,EAAE;IAC7D,OAAO,IAAAC,kBAAG,EAACZ,KAAK,EAAE,MAAMW,QAAQ,CAACX,KAAK,CAAC,CAAC;EAC1C,CAAC;EAEDa,cAAcA,CAACN,KAAgB,EAAEI,QAAmD,EAAE;IACpF,OAAO,IAAAC,kBAAG,EAACZ,KAAK,EAAE,MAAM;MACtB,IAAIA,KAAK,CAACK,IAAI,CAACE,KAAK,KAAKA,KAAK,EAAE;QAC9BI,QAAQ,CAACX,KAAK,CAAC;MACjB;IACF,CAAC,CAAC;EACJ,CAAC;EAED,MAAMc,mBAAmBA,CAACT,IAAmC,EAAEH,SAAiB,EAAE;IAChF,IAAIH,QAAQ,CAACgB,QAAQ,CAACV,IAAI,CAACE,KAAK,CAAC,EAAE;MACjC;IACF;IAEA,IAAI;MACF,MAAMV,GAAG,CAACmB,IAAI,CAAC;QACbC,IAAI,EAAE,IAAI;QACVC,OAAO,EAAEC,4BAAa,CAACC,cAAc,CAAC,CAAC;QACvCC,IAAI,EAAE;UACJC,OAAO,EAAE3B,8BAAc,CAAC4B,OAAO,CAAC,CAAC;UACjCC,QAAQ,EAAE7B,8BAAc,CAAC8B,WAAW,CAAC,CAAC;UACtCvB,SAAS;UACTwB,KAAK,EAAErB;QACT;MACF,CAAC,CAAC;IACJ,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ,CAAC;EAED,MAAMsB,SAASA,CAACtB,IAAmC,EAAE;IACnD,MAAMH,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC;IAC5BJ,KAAK,CAACE,SAAS,GAAGA,SAAS;IAC3BF,KAAK,CAACK,IAAI,GAAGA,IAAI;IACjB,MAAMc,4BAAa,CAACnB,KAAK,CAAC4B,eAAe;IAEzC,IAAIC,oCAAiB,CAAC7B,KAAK,CAAC8B,eAAe,EAAE;MAC3CtB,gBAAgB,CAACM,mBAAmB,CAACT,IAAI,EAAEH,SAAS,CAAC;IACvD;EACF;AACF,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"names":["_valtio","require","_AccountController","_RouterController","_PublicStateController","_EventsController","_ApiController","_ConnectorController","state","proxy","open","loading","ModalController","exports","options","ApiController","prefetchPromise","connected","AccountController","isConnected","view","RouterController","reset","isUniversalWallet","ConnectorController","connectedConnector","PublicStateController","set","EventsController","sendEvent","type","event","properties","close","setLoading"],"sourceRoot":"../../../src","sources":["controllers/ModalController.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,iBAAA,GAAAJ,OAAA;AACA,IAAAK,cAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AAEA;;AAYA;AACA,MAAMO,KAAK,GAAG,IAAAC,aAAK,EAAuB;EACxCC,IAAI,EAAE,KAAK;EACXC,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACO,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAC7BJ,KAAK;EAEL,MAAME,IAAIA,CAACI,OAA0C,EAAE;IACrD,MAAMC,4BAAa,CAACP,KAAK,CAACQ,eAAe;IACzC,MAAMC,SAAS,GAAGC,oCAAiB,CAACV,KAAK,CAACW,WAAW;IACrD,IAAIL,OAAO,EAAEM,IAAI,EAAE;MACjBC,kCAAgB,CAACC,KAAK,CAACR,OAAO,CAACM,IAAI,CAAC;IACtC,CAAC,MAAM,IAAIF,oCAAiB,CAACV,KAAK,CAACW,WAAW,EAAE;MAC9C,MAAMI,iBAAiB,GAAGC,wCAAmB,CAAChB,KAAK,CAACiB,kBAAkB,KAAK,MAAM;MACjFJ,kCAAgB,CAACC,KAAK,CAACC,iBAAiB,GAAG,SAAS,GAAG,gBAAgB,CAAC;IAC1E,CAAC,MAAM;MACLF,kCAAgB,CAACC,KAAK,CAAC,SAAS,CAAC;IACnC;IACAd,KAAK,CAACE,IAAI,GAAG,IAAI;IACjBgB,4CAAqB,CAACC,GAAG,CAAC;MAAEjB,IAAI,EAAE;IAAK,CAAC,CAAC;IACzCkB,kCAAgB,CAACC,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,YAAY;MACnBC,UAAU,EAAE;QAAEf;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDgB,KAAKA,CAAA,EAAG;IACN,MAAMhB,SAAS,GAAGC,oCAAiB,CAACV,KAAK,CAACW,WAAW;IACrDX,KAAK,CAACE,IAAI,GAAG,KAAK;IAClBgB,4CAAqB,CAACC,GAAG,CAAC;MAAEjB,IAAI,EAAE;IAAM,CAAC,CAAC;IAC1CkB,kCAAgB,CAACC,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,aAAa;MACpBC,UAAU,EAAE;QAAEf;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDiB,UAAUA,CAACvB,OAAwC,EAAE;IACnDH,KAAK,CAACG,OAAO,GAAGA,OAAO;EACzB;AACF,CAAC"}
+{"version":3,"names":["_valtio","require","_AccountController","_RouterController","_PublicStateController","_EventsController","_ApiController","_ConnectorController","state","proxy","open","loading","ModalController","exports","options","ApiController","prefetchPromise","connected","AccountController","isConnected","view","RouterController","reset","isUniversalWallet","ConnectorController","connectedConnector","PublicStateController","set","EventsController","sendEvent","type","event","properties","close","setLoading"],"sourceRoot":"../../../src","sources":["controllers/ModalController.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAEA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,iBAAA,GAAAJ,OAAA;AACA,IAAAK,cAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AAEA;;AAYA;AACA,MAAMO,KAAK,GAAG,IAAAC,aAAK,EAAuB;EACxCC,IAAI,EAAE,KAAK;EACXC,OAAO,EAAE;AACX,CAAC,CAAC;;AAEF;AACO,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAC7BJ,KAAK;EAEL,MAAME,IAAIA,CAACI,OAA0C,EAAE;IACrD,MAAMC,4BAAa,CAACP,KAAK,CAACQ,eAAe;IACzC,MAAMC,SAAS,GAAGC,oCAAiB,CAACV,KAAK,CAACW,WAAW;IACrD,IAAIL,OAAO,EAAEM,IAAI,EAAE;MACjBC,kCAAgB,CAACC,KAAK,CAACR,OAAO,CAACM,IAAI,CAAC;IACtC,CAAC,MAAM,IAAIF,oCAAiB,CAACV,KAAK,CAACW,WAAW,EAAE;MAC9C,MAAMI,iBAAiB,GAAGC,wCAAmB,CAAChB,KAAK,CAACiB,kBAAkB,KAAK,MAAM;MACjFJ,kCAAgB,CAACC,KAAK,CAACC,iBAAiB,GAAG,SAAS,GAAG,gBAAgB,CAAC;IAC1E,CAAC,MAAM;MACLF,kCAAgB,CAACC,KAAK,CAAC,SAAS,CAAC;IACnC;IACAd,KAAK,CAACE,IAAI,GAAG,IAAI;IACjBgB,4CAAqB,CAACC,GAAG,CAAC;MAAEjB,IAAI,EAAE;IAAK,CAAC,CAAC;IACzCkB,kCAAgB,CAACC,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,YAAY;MACnBC,UAAU,EAAE;QAAEf;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDgB,KAAKA,CAAA,EAAG;IACN,MAAMhB,SAAS,GAAGC,oCAAiB,CAACV,KAAK,CAACW,WAAW;IACrDX,KAAK,CAACE,IAAI,GAAG,KAAK;IAClBgB,4CAAqB,CAACC,GAAG,CAAC;MAAEjB,IAAI,EAAE;IAAM,CAAC,CAAC;IAC1CkB,kCAAgB,CAACC,SAAS,CAAC;MACzBC,IAAI,EAAE,OAAO;MACbC,KAAK,EAAE,aAAa;MACpBC,UAAU,EAAE;QAAEf;MAAU;IAC1B,CAAC,CAAC;EACJ,CAAC;EAEDiB,UAAUA,CAACvB,OAAwC,EAAE;IACnDH,KAAK,CAACG,OAAO,GAAGA,OAAO;EACzB;AACF,CAAC"}

package/lib/commonjs/controllers/OnRampController.js

@@ -25,23 +25,23 @@ const mapErrorMessage = errorCode => {
   const errorMap = {
     [_ConstantsUtil.OnRampErrorType.AMOUNT_TOO_LOW]: {
       type: _ConstantsUtil.OnRampErrorType.AMOUNT_TOO_LOW,
-      message: 'The amount is too low'
+      message: 'Amount is too low'
     },
     [_ConstantsUtil.OnRampErrorType.AMOUNT_TOO_HIGH]: {
       type: _ConstantsUtil.OnRampErrorType.AMOUNT_TOO_HIGH,
-      message: 'The amount is too high'
+      message: 'Amount is too high'
     },
     [_ConstantsUtil.OnRampErrorType.INVALID_AMOUNT]: {
       type: _ConstantsUtil.OnRampErrorType.INVALID_AMOUNT,
-      message: 'Enter a valid amount'
+      message: 'Please adjust amount'
     },
     [_ConstantsUtil.OnRampErrorType.INCOMPATIBLE_REQUEST]: {
       type: _ConstantsUtil.OnRampErrorType.INCOMPATIBLE_REQUEST,
-      message: 'Enter a valid amount'
+      message: 'Try different amount or payment method'
     },
     [_ConstantsUtil.OnRampErrorType.BAD_REQUEST]: {
       type: _ConstantsUtil.OnRampErrorType.BAD_REQUEST,
-      message: 'Enter a valid amount'
+      message: 'Try different amount or payment method'
     }
   };
   return errorMap[errorCode] || {
@@ -76,19 +76,19 @@ const OnRampController = exports.OnRampController = {
     state.selectedCountry = country;
     state.loading = true;
     if (updateCurrency) {
-      const currencyCode = state.countriesDefaults?.find(d => d.countryCode === country.countryCode)?.defaultCurrencyCode || 'USD';
+      const currencyCode = _ConstantsUtil.ConstantsUtil.COUNTRY_CURRENCIES[country.countryCode] || '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.StorageUtil.setOnRampPreferredCountry(country);
   },
   setSelectedPaymentMethod(paymentMethod) {
     state.selectedPaymentMethod = paymentMethod;
+    this.clearQuotes();
   },
   setPurchaseCurrency(currency) {
     state.purchaseCurrency = currency;
@@ -122,7 +122,7 @@ const OnRampController = exports.OnRampController = {
       const defaultCurrency = _ConstantsUtil.ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[_NetworkController.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;
@@ -156,23 +156,6 @@ const OnRampController = exports.OnRampController = {
       };
     }
   },
-  async fetchCountriesDefaults() {
-    try {
-      let countriesDefaults = await _StorageUtil.StorageUtil.getOnRampCountriesDefaults();
-      if (!countriesDefaults.length) {
-        countriesDefaults = (await _BlockchainApiController.BlockchainApiController.fetchOnRampCountriesDefaults()) ?? [];
-        if (countriesDefaults.length) {
-          _StorageUtil.StorageUtil.setOnRampCountriesDefaults(countriesDefaults);
-        }
-      }
-      state.countriesDefaults = countriesDefaults;
-    } catch (error) {
-      state.error = {
-        type: _ConstantsUtil.OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
-        message: 'Failed to load countries defaults'
-      };
-    }
-  },
   async fetchServiceProviders() {
     try {
       let serviceProviders = await _StorageUtil.StorageUtil.getOnRampServiceProviders();
@@ -195,7 +178,7 @@ const OnRampController = exports.OnRampController = {
       const paymentMethods = await _BlockchainApiController.BlockchainApiController.fetchOnRampPaymentMethods({
         countries: state.selectedCountry?.countryCode
       });
-      const defaultCountryPaymentMethods = state.countriesDefaults?.find(d => d.countryCode === state.selectedCountry?.countryCode)?.defaultPaymentMethods || [];
+      const defaultCountryPaymentMethods = _ConstantsUtil.ConstantsUtil.COUNTRY_DEFAULT_PAYMENT_METHOD[state.selectedCountry?.countryCode];
       state.paymentMethods = paymentMethods?.sort((a, b) => {
         const aIndex = defaultCountryPaymentMethods?.indexOf(a.paymentMethod);
         const bIndex = defaultCountryPaymentMethods?.indexOf(b.paymentMethod);
@@ -204,7 +187,8 @@ const OnRampController = exports.OnRampController = {
         if (bIndex === -1) return -1;
         return aIndex - bIndex;
       }) || [];
-      state.selectedPaymentMethod = state.paymentMethods[0];
+      state.selectedPaymentMethod = paymentMethods?.[0] || undefined;
+      this.clearQuotes();
     } catch (error) {
       state.error = {
         type: _ConstantsUtil.OnRampErrorType.FAILED_TO_LOAD_METHODS,
@@ -248,7 +232,7 @@ const OnRampController = exports.OnRampController = {
       }
       state.paymentCurrencies = fiatCurrencies || [];
       if (countryCode) {
-        currencyCode = state.countriesDefaults?.find(d => d.countryCode === countryCode)?.defaultCurrencyCode || 'USD';
+        currencyCode = _ConstantsUtil.ConstantsUtil.COUNTRY_CURRENCIES[countryCode];
       }
       const preferredCurrency = await _StorageUtil.StorageUtil.getOnRampPreferredFiatCurrency();
       const defaultCurrency = preferredCurrency || fiatCurrencies?.find(c => c.currencyCode === currencyCode) || fiatCurrencies?.[0] || undefined;
@@ -284,47 +268,26 @@ const OnRampController = exports.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.AccountController.state.address
       };
-      const response = await _BlockchainApiController.BlockchainApiController.getOnRampQuotes(body, currentSignal);
+      const response = await _BlockchainApiController.BlockchainApiController.getOnRampQuotes(body, quotesAbortController.signal);
       if (!response || !response.length) {
         throw new Error('No quotes available');
       }
       const quotes = response.sort((a, b) => b.customerScore - a.customerScore);
       state.quotes = quotes;
-
-      //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);
+      state.selectedQuote = quotes[0];
+      state.selectedServiceProvider = state.serviceProviders.find(sp => sp.serviceProvider === quotes[0]?.serviceProvider);
     } catch (error) {
       if (error.name === 'AbortError') {
         // Do nothing, another request was made
@@ -340,9 +303,7 @@ const OnRampController = exports.OnRampController = {
       this.clearQuotes();
       state.error = mapErrorMessage(error?.code || 'UNKNOWN_ERROR');
     } finally {
-      if (!currentSignal.aborted) {
-        state.quotesLoading = false;
-      }
+      state.quotesLoading = false;
     }
   },
   canGenerateQuote() {
@@ -383,7 +344,7 @@ const OnRampController = exports.OnRampController = {
       if (!quote) {
         throw new Error('Invalid quote');
       }
-      const body = {
+      const widget = await _BlockchainApiController.BlockchainApiController.getOnRampWidget({
         countryCode: quote.countryCode,
         destinationCurrencyCode: quote.destinationCurrencyCode,
         paymentMethodType: quote.paymentMethodType,
@@ -392,8 +353,7 @@ const OnRampController = exports.OnRampController = {
         sourceCurrencyCode: quote.sourceCurrencyCode,
         walletAddress: _AccountController.AccountController.state.address,
         redirectUrl: metadata?.redirect?.universal ?? metadata?.redirect?.native
-      };
-      const widget = await _BlockchainApiController.BlockchainApiController.getOnRampWidget(body);
+      });
       if (!widget || !widget.widgetUrl) {
         throw new Error('Invalid widget response');
       }
@@ -435,7 +395,7 @@ const OnRampController = exports.OnRampController = {
     try {
       await this.fetchCountries();
       await this.fetchServiceProviders();
-      await Promise.all([this.fetchCountriesDefaults(), this.fetchPaymentMethods(), this.fetchFiatLimits(), this.fetchCryptoCurrencies(), this.fetchFiatCurrencies()]);
+      await Promise.all([this.fetchPaymentMethods(), this.fetchFiatLimits(), this.fetchCryptoCurrencies(), this.fetchFiatCurrencies()]);
     } catch (error) {
       if (!state.error) {
         state.error = {