@reown/appkit-core-react-native 0.0.0-fix-approved-networks-20250822000414 → 0.0.0-fix-improvements-20250827190629

package/src/controllers/OnRampController.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 {
   type OnRampPaymentMethod,
   type OnRampCountry,
@@ -12,17 +12,16 @@ import {
   type OnRampErrorTypeValues,
   type OnRampCountryDefaults,
   BlockchainOnRampError
-} from '../utils/TypeUtil';
+} 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 { EventsController } from './EventsController';
 import { BlockchainApiController, EXCLUDED_ONRAMP_PROVIDERS } from './BlockchainApiController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Helpers ------------------------------------------- //
 
@@ -188,16 +187,16 @@ export const OnRampController = {
 
   updateSelectedPurchaseCurrency() {
     let selectedCurrency;
-    if (NetworkController.state.caipNetwork?.id) {
+    if (ConnectionsController.state.activeNetwork?.caipNetworkId) {
       const defaultCurrency =
         ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[
-          NetworkController.state.caipNetwork
-            ?.id as keyof typeof ConstantsUtil.NETWORK_DEFAULT_CURRENCIES
+          ConnectionsController.state.activeNetwork
+            ?.caipNetworkId as keyof typeof ConstantsUtil.NETWORK_DEFAULT_CURRENCIES
         ];
       selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
     }
 
-    state.purchaseCurrency = selectedCurrency ?? state.purchaseCurrencies?.[0] ?? undefined;
+    state.purchaseCurrency = selectedCurrency ?? undefined;
   },
 
   getServiceProviderImage(serviceProviderName?: string) {
@@ -328,16 +327,16 @@ export const OnRampController = {
       state.purchaseCurrencies = cryptoCurrencies || [];
 
       let selectedCurrency;
-      if (NetworkController.state.caipNetwork?.id) {
+      if (ConnectionsController.state.activeNetwork?.caipNetworkId) {
         const defaultCurrency =
           ConstantsUtil.NETWORK_DEFAULT_CURRENCIES[
-            NetworkController.state.caipNetwork
-              ?.id as keyof typeof ConstantsUtil.NETWORK_DEFAULT_CURRENCIES
-          ] || 'ETH';
+            ConnectionsController.state.activeNetwork
+              ?.caipNetworkId as keyof typeof ConstantsUtil.NETWORK_DEFAULT_CURRENCIES
+          ];
         selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
       }
 
-      state.purchaseCurrency = selectedCurrency || cryptoCurrencies?.[0] || undefined;
+      state.purchaseCurrency = selectedCurrency || undefined;
     } catch (error) {
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_CURRENCIES,
@@ -420,7 +419,7 @@ export const OnRampController = {
         !state.selectedCountry?.countryCode ||
         !state.purchaseCurrency?.currencyCode ||
         !state.paymentCurrency?.currencyCode ||
-        !AccountController.state.address
+        !ConnectionsController.state.activeAddress
       ) {
         throw new BlockchainOnRampError(OnRampErrorType.UNKNOWN, 'Invalid quote parameters');
       }
@@ -430,12 +429,20 @@ export const OnRampController = {
       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,
         destinationCurrencyCode: state.purchaseCurrency.currencyCode,
         sourceAmount: state.paymentAmount!,
         sourceCurrencyCode: state.paymentCurrency.currencyCode,
-        walletAddress: AccountController.state.address,
+        walletAddress: plainAddress,
         excludeProviders: EXCLUDED_ONRAMP_PROVIDERS
       };
 
@@ -524,7 +531,7 @@ export const OnRampController = {
       state.paymentCurrency?.currencyCode &&
       state.selectedCountry &&
       !state.loading &&
-      AccountController.state.address
+      ConnectionsController.state.activeAddress
     );
   },
 
@@ -551,6 +558,10 @@ export const OnRampController = {
   },
 
   async generateWidget({ quote }: { quote: OnRampQuote }) {
+    if (!ConnectionsController.state.activeAddress) {
+      throw new Error('No active address');
+    }
+
     const metadata = OptionsController.state.metadata;
     const eventProperties = {
       asset: quote.destinationCurrencyCode,
@@ -567,6 +578,14 @@ export const OnRampController = {
         throw new Error('Invalid quote');
       }
 
+      const plainAddress = CoreHelperUtil.getPlainAddress(
+        ConnectionsController.state.activeAddress
+      );
+
+      if (!plainAddress) {
+        throw new Error('Invalid address');
+      }
+
       const body = {
         countryCode: quote.countryCode,
         destinationCurrencyCode: quote.destinationCurrencyCode,
@@ -574,7 +593,7 @@ export const OnRampController = {
         serviceProvider: quote.serviceProvider,
         sourceAmount: quote.sourceAmount,
         sourceCurrencyCode: quote.sourceCurrencyCode,
-        walletAddress: AccountController.state.address!,
+        walletAddress: plainAddress,
         redirectUrl: metadata?.redirect?.universal ?? metadata?.redirect?.native
       };
 

package/src/controllers/OptionsController.ts

@@ -1,13 +1,15 @@
 import { proxy, ref } from 'valtio';
 import type {
+  Storage,
+  Metadata,
+  AppKitNetwork,
   CustomWallet,
   Features,
-  Metadata,
   ProjectId,
   SdkType,
-  SdkVersion,
-  Tokens
-} from '../utils/TypeUtil';
+  SdkVersion
+} from '@reown/appkit-common-react-native';
+
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 
 // -- Types --------------------------------------------- //
@@ -17,12 +19,12 @@ export interface ClipboardClient {
 
 export interface OptionsControllerState {
   projectId: ProjectId;
-  _clipboardClient?: ClipboardClient;
+  clipboardClient?: ClipboardClient;
+  storage?: Storage;
   includeWalletIds?: string[];
   excludeWalletIds?: string[];
   featuredWalletIds?: string[];
   customWallets?: CustomWallet[];
-  tokens?: Tokens;
   enableAnalytics?: boolean;
   sdkType: SdkType;
   sdkVersion: SdkVersion;
@@ -31,14 +33,17 @@ export interface OptionsControllerState {
   isOnRampEnabled?: boolean;
   features?: Features;
   debug?: boolean;
+  defaultNetwork?: AppKitNetwork;
+  requestedNetworks?: AppKitNetwork[];
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<OptionsControllerState>({
   projectId: '',
   sdkType: 'appkit',
-  sdkVersion: 'react-native-wagmi-undefined',
+  sdkVersion: 'react-native-undefined-undefined',
   features: ConstantsUtil.DEFAULT_FEATURES,
+  customWallets: [],
   debug: false
 });
 
@@ -47,7 +52,7 @@ export const OptionsController = {
   state,
 
   setClipboardClient(client: ClipboardClient) {
-    state._clipboardClient = ref(client);
+    state.clipboardClient = ref(client);
   },
 
   setProjectId(projectId: OptionsControllerState['projectId']) {
@@ -66,10 +71,6 @@ export const OptionsController = {
     state.featuredWalletIds = featuredWalletIds;
   },
 
-  setTokens(tokens: OptionsControllerState['tokens']) {
-    state.tokens = tokens;
-  },
-
   setCustomWallets(customWallets: OptionsControllerState['customWallets']) {
     state.customWallets = customWallets;
   },
@@ -102,12 +103,34 @@ export const OptionsController = {
     state.isOnRampEnabled = isOnRampEnabled;
   },
 
+  setStorage(storage?: OptionsControllerState['storage']) {
+    if (storage) {
+      state.storage = ref(storage);
+    }
+  },
+
+  setDefaultNetwork(defaultNetwork?: OptionsControllerState['defaultNetwork']) {
+    state.defaultNetwork = defaultNetwork;
+  },
+
+  setRequestedNetworks(requestedNetworks?: OptionsControllerState['requestedNetworks']) {
+    state.requestedNetworks = requestedNetworks;
+  },
+
   isClipboardAvailable() {
-    return !!state._clipboardClient;
+    return !!state.clipboardClient;
+  },
+
+  getStorage() {
+    if (!state.storage) {
+      throw new Error('AppKit: Storage is not set');
+    }
+
+    return state.storage;
   },
 
   copyToClipboard(value: string) {
-    const client = state._clipboardClient;
+    const client = state.clipboardClient;
     if (client) {
       client?.setString(value);
     }

package/src/controllers/PublicStateController.ts

@@ -1,6 +1,6 @@
 import { proxy, subscribe as sub } from 'valtio';
 import { subscribeKey as subKey } from 'valtio/utils';
-import type { CaipNetworkId } from '../utils/TypeUtil.js';
+import type { CaipNetworkId } from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
 export interface PublicStateControllerState {

package/src/controllers/RouterController.ts

@@ -1,22 +1,12 @@
 import { proxy } from 'valtio';
 import type {
+  AppKitNetwork,
+  SocialProvider,
   WcWallet,
-  CaipNetwork,
-  Connector,
-  SwapInputTarget,
   OnRampTransactionResult
-} from '../utils/TypeUtil';
+} from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
-type TransactionAction = {
-  goBack: boolean;
-  view: RouterControllerState['view'] | null;
-  close?: boolean;
-  replace?: boolean;
-  onSuccess?: () => void;
-  onCancel?: () => void;
-};
-
 export interface RouterControllerState {
   view:
     | 'Account'
@@ -27,11 +17,7 @@ export interface RouterControllerState {
     | 'ConnectingExternal'
     | 'ConnectingSiwe'
     | 'ConnectingSocial'
-    | 'ConnectingFarcaster'
     | 'ConnectingWalletConnect'
-    | 'Create'
-    | 'EmailVerifyDevice'
-    | 'EmailVerifyOtp'
     | 'GetWallet'
     | 'Networks'
     | 'OnRamp'
@@ -41,15 +27,10 @@ export interface RouterControllerState {
     | 'OnRampTransaction'
     | 'SwitchNetwork'
     | 'Swap'
-    | 'SwapSelectToken'
     | 'SwapPreview'
     | 'Transactions'
     | 'UnsupportedChain'
-    | 'UpdateEmailPrimaryOtp'
-    | 'UpdateEmailSecondaryOtp'
-    | 'UpdateEmailWallet'
     | 'UpgradeEmailWallet'
-    | 'UpgradeToSmartAccount'
     | 'WalletCompatibleNetworks'
     | 'WalletReceive'
     | 'WalletSend'
@@ -58,62 +39,41 @@ export interface RouterControllerState {
     | 'WhatIsANetwork'
     | 'WhatIsAWallet';
   history: RouterControllerState['view'][];
+  navigationDirection: 'forward' | 'backward' | 'none';
   data?: {
-    connector?: Connector;
     wallet?: WcWallet;
-    network?: CaipNetwork;
-    email?: string;
-    newEmail?: string;
-    swapTarget?: SwapInputTarget;
+    network?: AppKitNetwork;
     onrampResult?: OnRampTransactionResult;
+    socialProvider?: SocialProvider;
   };
-  transactionStack: TransactionAction[];
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<RouterControllerState>({
   view: 'Connect',
   history: ['Connect'],
-  transactionStack: []
+  navigationDirection: 'none'
 });
 
 // -- Controller ---------------------------------------- //
 export const RouterController = {
   state,
 
-  push(view: RouterControllerState['view'], data?: RouterControllerState['data']) {
+  push(
+    view: RouterControllerState['view'],
+    data?: RouterControllerState['data'],
+    direction: 'forward' | 'backward' = 'forward'
+  ) {
     if (view !== state.view) {
+      state.navigationDirection = direction;
       state.view = view;
       state.history = [...state.history, view];
       state.data = data;
     }
   },
 
-  pushTransactionStack(action: TransactionAction) {
-    state.transactionStack = [...state.transactionStack, action];
-  },
-
-  popTransactionStack(cancel?: boolean) {
-    const action = state.transactionStack.pop();
-
-    if (!action) {
-      return;
-    }
-
-    if (cancel) {
-      this.goBack();
-      action?.onCancel?.();
-    } else {
-      if (action.goBack) {
-        this.goBack();
-      } else if (action.view) {
-        this.reset(action.view);
-      }
-      action?.onSuccess?.();
-    }
-  },
-
   reset(view: RouterControllerState['view'], data?: RouterControllerState['data']) {
+    state.navigationDirection = 'none';
     state.view = view;
     state.history = [view];
     state.data = data;
@@ -121,6 +81,7 @@ export const RouterController = {
 
   replace(view: RouterControllerState['view'], data?: RouterControllerState['data']) {
     if (state.history.length >= 1 && state.history.at(-1) !== view) {
+      state.navigationDirection = 'none';
       state.view = view;
       state.history[state.history.length - 1] = view;
       state.data = data;
@@ -132,6 +93,7 @@ export const RouterController = {
       state.history.pop();
       const [last] = state.history.slice(-1);
       if (last) {
+        state.navigationDirection = 'backward';
         state.view = last;
       }
     }
@@ -142,6 +104,7 @@ export const RouterController = {
       state.history = state.history.slice(0, historyIndex + 1);
       const [last] = state.history.slice(-1);
       if (last) {
+        state.navigationDirection = 'backward';
         state.view = last;
       }
     }