@reown/appkit-core-react-native 0.0.0-feat-multichain-20250724181758 → 0.0.0-feat-multichain-20250725183909

package/src/controllers/AccountController.ts

@@ -1,38 +1,16 @@
 import { proxy } from 'valtio';
 import { subscribeKey as subKey } from 'valtio/utils';
-import type { AccountType, CaipAddress } from '@reown/appkit-common-react-native';
-
-import { CoreHelperUtil } from '../utils/CoreHelperUtil';
-import type { ConnectedWalletInfo, BlockchainApiBalance } from '../utils/TypeUtil';
-// import { NetworkController } from './NetworkController';
-// import { BlockchainApiController } from './BlockchainApiController';
-// import { SnackController } from './SnackController';
 
 // -- Types --------------------------------------------- //
 export interface AccountControllerState {
-  isConnected: boolean;
-  caipAddress?: CaipAddress;
-  address?: string;
-  balance?: string;
-  balanceSymbol?: string;
-  tokenBalance?: BlockchainApiBalance[];
   profileName?: string;
   profileImage?: string;
-  addressExplorerUrl?: string;
-  connectedWalletInfo?: ConnectedWalletInfo;
-  preferredAccountType?: AccountType;
-  smartAccountDeployed?: boolean;
 }
 
 type StateKey = keyof AccountControllerState;
 
 // -- State --------------------------------------------- //
-const state = proxy<AccountControllerState>({
-  isConnected: false,
-  tokenBalance: [],
-  smartAccountDeployed: false,
-  preferredAccountType: 'eoa'
-});
+const state = proxy<AccountControllerState>({});
 
 // -- Controller ---------------------------------------- //
 export const AccountController = {
@@ -42,28 +20,6 @@ export const AccountController = {
     return subKey(state, key, callback);
   },
 
-  setIsConnected(isConnected: AccountControllerState['isConnected']) {
-    state.isConnected = isConnected;
-  },
-
-  setCaipAddress(caipAddress: AccountControllerState['caipAddress']) {
-    const address = caipAddress ? CoreHelperUtil.getPlainAddress(caipAddress) : undefined;
-    state.caipAddress = caipAddress;
-    state.address = address;
-  },
-
-  setBalance(
-    balance: AccountControllerState['balance'],
-    balanceSymbol: AccountControllerState['balanceSymbol']
-  ) {
-    state.balance = balance;
-    state.balanceSymbol = balanceSymbol;
-  },
-
-  setTokenBalance(tokenBalance: AccountControllerState['tokenBalance']) {
-    state.tokenBalance = tokenBalance;
-  },
-
   setProfileName(profileName: AccountControllerState['profileName']) {
     state.profileName = profileName;
   },
@@ -72,53 +28,8 @@ export const AccountController = {
     state.profileImage = profileImage;
   },
 
-  setConnectedWalletInfo(connectedWalletInfo: AccountControllerState['connectedWalletInfo']) {
-    state.connectedWalletInfo = connectedWalletInfo;
-  },
-
-  setAddressExplorerUrl(explorerUrl: AccountControllerState['addressExplorerUrl']) {
-    state.addressExplorerUrl = explorerUrl;
-  },
-
-  setPreferredAccountType(accountType: AccountControllerState['preferredAccountType']) {
-    state.preferredAccountType = accountType;
-  },
-
-  setSmartAccountDeployed(smartAccountDeployed: AccountControllerState['smartAccountDeployed']) {
-    state.smartAccountDeployed = smartAccountDeployed;
-  },
-
-  async fetchTokenBalance() {
-    // const chainId = NetworkController.state.caipNetwork?.id;
-    // const address = AccountController.state.address;
-    // try {
-    //   if (address && chainId) {
-    //     const response = await BlockchainApiController.getBalance(address, chainId);
-    //     if (!response) {
-    //       throw new Error('Failed to fetch token balance');
-    //     }
-    //     const filteredBalances = response.balances.filter(
-    //       balance => balance.quantity.decimals !== '0'
-    //     );
-    //     this.setTokenBalance(filteredBalances);
-    //   }
-    // } catch (error) {
-    //   SnackController.showError('Failed to fetch token balance');
-    // }
-  },
-
   resetAccount() {
-    state.isConnected = false;
-    state.caipAddress = undefined;
-    state.address = undefined;
-    state.balance = undefined;
-    state.balanceSymbol = undefined;
     state.profileName = undefined;
     state.profileImage = undefined;
-    state.addressExplorerUrl = undefined;
-    state.tokenBalance = [];
-    state.connectedWalletInfo = undefined;
-    state.preferredAccountType = 'eoa';
-    state.smartAccountDeployed = false;
   }
 };

package/src/controllers/BlockchainApiController.ts

@@ -32,7 +32,8 @@ import type {
   OnRampQuote,
   BlockchainApiOnRampWidgetRequest,
   BlockchainApiOnRampQuotesRequest,
-  OnRampFiatLimit
+  OnRampFiatLimit,
+  OnRampCountryDefaults
 } from '../utils/TypeUtil';
 import { OptionsController } from './OptionsController';
 import { ConstantsUtil } from '../utils/ConstantsUtil';
@@ -56,6 +57,8 @@ const getHeaders = () => {
   };
 };
 
+export const EXCLUDED_ONRAMP_PROVIDERS = ['BINANCECONNECT', 'COINBASEPAY'];
+
 // -- Types --------------------------------------------- //
 type WithCaipNetworkId = { caipNetworkId: CaipNetworkId };
 
@@ -330,17 +333,6 @@ export const BlockchainApiController = {
     });
   },
 
-  async fetchOnRampCountries() {
-    return await state.api.get<OnRampCountry[]>({
-      path: '/v1/onramp/providers/properties',
-      headers: getHeaders(),
-      params: {
-        projectId: OptionsController.state.projectId,
-        type: 'countries'
-      }
-    });
-  },
-
   async fetchOnRampServiceProviders() {
     return await state.api.get<OnRampServiceProvider[]>({
       path: '/v1/onramp/providers',
@@ -351,48 +343,39 @@ export const BlockchainApiController = {
     });
   },
 
+  async fetchOnRampCountries() {
+    return await this.fetchProperties<OnRampCountry[]>('countries');
+  },
+
   async fetchOnRampPaymentMethods(params: { countries?: string }) {
-    return await state.api.get<OnRampPaymentMethod[]>({
-      path: '/v1/onramp/providers/properties',
-      headers: getHeaders(),
-      params: {
-        projectId: OptionsController.state.projectId,
-        type: 'payment-methods',
-        ...params
-      }
-    });
+    return await this.fetchProperties<OnRampPaymentMethod[]>('payment-methods', params);
   },
 
   async fetchOnRampCryptoCurrencies(params: { countries?: string }) {
-    return await state.api.get<OnRampCryptoCurrency[]>({
-      path: '/v1/onramp/providers/properties',
-      headers: getHeaders(),
-      params: {
-        projectId: OptionsController.state.projectId,
-        type: 'crypto-currencies',
-        ...params
-      }
-    });
+    return await this.fetchProperties<OnRampCryptoCurrency[]>('crypto-currencies', params);
   },
 
   async fetchOnRampFiatCurrencies() {
-    return await state.api.get<OnRampFiatCurrency[]>({
-      path: '/v1/onramp/providers/properties',
-      headers: getHeaders(),
-      params: {
-        projectId: OptionsController.state.projectId,
-        type: 'fiat-currencies'
-      }
-    });
+    return await this.fetchProperties<OnRampFiatCurrency[]>('fiat-currencies');
   },
 
   async fetchOnRampFiatLimits() {
-    return await state.api.get<OnRampFiatLimit[]>({
+    return await this.fetchProperties<OnRampFiatLimit[]>('fiat-purchases-limits');
+  },
+
+  async fetchOnRampCountriesDefaults() {
+    return await this.fetchProperties<OnRampCountryDefaults[]>('countries-defaults');
+  },
+
+  async fetchProperties<T>(type: string, params?: Record<string, string>) {
+    return await state.api.get<T>({
       path: '/v1/onramp/providers/properties',
       headers: getHeaders(),
       params: {
         projectId: OptionsController.state.projectId,
-        type: 'fiat-purchases-limits'
+        type,
+        excludeProviders: EXCLUDED_ONRAMP_PROVIDERS.join(','),
+        ...params
       }
     });
   },

package/src/controllers/ConnectionsController.ts

@@ -1,5 +1,5 @@
 import { proxy, ref } from 'valtio';
-import { derive } from 'valtio/utils';
+import { derive } from 'derive-valtio';
 import {
   EVMAdapter,
   type AppKitNetwork,

package/src/controllers/EnsController.ts

@@ -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';
 import type { BlockchainApiEnsError } from '../utils/TypeUtil';
 

package/src/controllers/EventsController.ts

@@ -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/src/controllers/ModalController.ts

@@ -1,6 +1,5 @@
 import { proxy } from 'valtio';
-import type { RouterControllerState } from './RouterController';
-import { RouterController } from './RouterController';
+import { RouterController, type RouterControllerState } from './RouterController';
 import { PublicStateController } from './PublicStateController';
 import { EventsController } from './EventsController';
 import { ApiController } from './ApiController';