@reown/appkit-core-react-native 0.0.0-refactor-modal-migration-20241004184043 → 1.0.1

package/src/controllers/AccountController.ts

@@ -1,12 +1,8 @@
 import { proxy } from 'valtio';
 import { subscribeKey as subKey } from 'valtio/utils';
-import type { Balance } from '@reown/appkit-common-react-native';
 
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import type { CaipAddress, ConnectedWalletInfo } from '../utils/TypeUtil';
-import { NetworkController } from './NetworkController';
-import { BlockchainApiController } from './BlockchainApiController';
-import { SnackController } from './SnackController';
 
 // -- Types --------------------------------------------- //
 export interface AccountControllerState {
@@ -15,7 +11,6 @@ export interface AccountControllerState {
   address?: string;
   balance?: string;
   balanceSymbol?: string;
-  tokenBalance?: Balance[];
   profileName?: string;
   profileImage?: string;
   addressExplorerUrl?: string;
@@ -26,8 +21,7 @@ type StateKey = keyof AccountControllerState;
 
 // -- State --------------------------------------------- //
 const state = proxy<AccountControllerState>({
-  isConnected: false,
-  tokenBalance: []
+  isConnected: false
 });
 
 // -- Controller ---------------------------------------- //
@@ -56,10 +50,6 @@ export const AccountController = {
     state.balanceSymbol = balanceSymbol;
   },
 
-  setTokenBalance(tokenBalance: AccountControllerState['tokenBalance']) {
-    state.tokenBalance = tokenBalance;
-  },
-
   setProfileName(profileName: AccountControllerState['profileName']) {
     state.profileName = profileName;
   },
@@ -76,29 +66,6 @@ export const AccountController = {
     state.addressExplorerUrl = explorerUrl;
   },
 
-  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;
@@ -108,7 +75,6 @@ export const AccountController = {
     state.profileName = undefined;
     state.profileImage = undefined;
     state.addressExplorerUrl = undefined;
-    state.tokenBalance = [];
     state.connectedWalletInfo = undefined;
   }
 };

package/src/controllers/ApiController.ts

@@ -16,7 +16,6 @@ import { NetworkController } from './NetworkController';
 import { OptionsController } from './OptionsController';
 import { ConnectorController } from './ConnectorController';
 import { ConnectionController } from './ConnectionController';
-import { ApiUtil } from '../utils/ApiUtil';
 
 // -- Helpers ------------------------------------------- //
 const baseUrl = CoreHelperUtil.getApiUrl();
@@ -63,13 +62,18 @@ export const ApiController = {
 
   _getApiHeaders() {
     const { projectId, sdkType, sdkVersion } = OptionsController.state;
+    const reactNativeVersion = [
+      Platform.constants.reactNativeVersion.major,
+      Platform.constants.reactNativeVersion.minor,
+      Platform.constants.reactNativeVersion.patch
+    ].join('.');
 
     return {
       'x-project-id': projectId,
       'x-sdk-type': sdkType,
       'x-sdk-version': sdkVersion,
-      'User-Agent': ApiUtil.getUserAgent(),
-      'Origin': ApiUtil.getOrigin()
+      'User-Agent': `${Platform.OS}-${Platform.Version}@rn-${reactNativeVersion}`,
+      'Origin': CoreHelperUtil.getBundleId()
     };
   },
 

package/src/controllers/BlockchainApiController.ts

@@ -3,16 +3,8 @@ import { proxy } from 'valtio';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { FetchUtil } from '../utils/FetchUtil';
 import type {
-  BlockchainApiBalanceResponse,
-  BlockchainApiGasPriceRequest,
-  BlockchainApiGasPriceResponse,
   BlockchainApiIdentityRequest,
-  BlockchainApiIdentityResponse,
-  BlockchainApiLookupEnsName,
-  BlockchainApiTokenPriceRequest,
-  BlockchainApiTokenPriceResponse,
-  BlockchainApiTransactionsRequest,
-  BlockchainApiTransactionsResponse
+  BlockchainApiIdentityResponse
 } from '../utils/TypeUtil';
 import { OptionsController } from './OptionsController';
 
@@ -44,85 +36,6 @@ export const BlockchainApiController = {
     });
   },
 
-  fetchTransactions({
-    account,
-    projectId,
-    cursor,
-    onramp,
-    signal,
-    cache
-  }: BlockchainApiTransactionsRequest) {
-    return state.api.get<BlockchainApiTransactionsResponse>({
-      path: `/v1/account/${account}/history`,
-      params: {
-        projectId,
-        cursor,
-        onramp
-      },
-      signal,
-      cache
-    });
-  },
-
-  fetchTokenPrice({ projectId, addresses }: BlockchainApiTokenPriceRequest) {
-    return state.api.post<BlockchainApiTokenPriceResponse>({
-      path: '/v1/fungible/price',
-      body: {
-        projectId,
-        currency: 'usd',
-        addresses
-      },
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    });
-  },
-
-  fetchGasPrice({ projectId, chainId }: BlockchainApiGasPriceRequest) {
-    const { sdkType, sdkVersion } = OptionsController.state;
-
-    return state.api.get<BlockchainApiGasPriceResponse>({
-      path: `/v1/convert/gas-price`,
-      headers: {
-        'Content-Type': 'application/json',
-        'x-sdk-type': sdkType,
-        'x-sdk-version': sdkVersion
-      },
-      params: {
-        projectId,
-        chainId
-      }
-    });
-  },
-
-  async getBalance(address: string, chainId?: string, forceUpdate?: string) {
-    const { sdkType, sdkVersion } = OptionsController.state;
-
-    return state.api.get<BlockchainApiBalanceResponse>({
-      path: `/v1/account/${address}/balance`,
-      headers: {
-        'x-sdk-type': sdkType,
-        'x-sdk-version': sdkVersion
-      },
-      params: {
-        currency: 'usd',
-        projectId: OptionsController.state.projectId,
-        chainId,
-        forceUpdate
-      }
-    });
-  },
-
-  async lookupEnsName(name: string) {
-    return state.api.get<BlockchainApiLookupEnsName>({
-      path: `/v1/profile/account/${name}`,
-      params: {
-        projectId: OptionsController.state.projectId,
-        apiVersion: '2'
-      }
-    });
-  },
-
   setClientId(clientId: string | null) {
     state.clientId = clientId;
     state.api = new FetchUtil({ baseUrl, clientId });

package/src/controllers/ConnectionController.ts

@@ -2,15 +2,9 @@ import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, ref } from 'valtio';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { StorageUtil } from '../utils/StorageUtil';
-import type {
-  Connector,
-  SendTransactionArgs,
-  WcWallet,
-  WriteContractArgs
-} from '../utils/TypeUtil';
+import type { Connector, WcWallet } from '../utils/TypeUtil';
 import { RouterController } from './RouterController';
 import { ConnectorController } from './ConnectorController';
-import type { SocialProvider } from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
 export interface ConnectExternalOptions {
@@ -27,13 +21,7 @@ export interface ConnectionControllerClient {
   ) => Promise<void>;
   connectExternal?: (options: ConnectExternalOptions) => Promise<void>;
   signMessage: (message: string) => Promise<string>;
-  sendTransaction: (args: SendTransactionArgs) => Promise<`0x${string}` | null>;
-  parseUnits: (value: string, decimals: number) => bigint;
-  formatUnits: (value: bigint, decimals: number) => string;
-  writeContract: (args: WriteContractArgs) => Promise<`0x${string}` | null>;
   disconnect: () => Promise<void>;
-  getEnsAddress: (value: string) => Promise<false | string>;
-  getEnsAvatar: (value: string) => Promise<false | string>;
 }
 
 export interface ConnectionControllerState {
@@ -49,7 +37,6 @@ export interface ConnectionControllerState {
   pressedWallet?: WcWallet;
   recentWallets?: WcWallet[];
   connectedWalletImageUrl?: string;
-  connectedSocialProvider?: SocialProvider;
 }
 
 type StateKey = keyof ConnectionControllerState;
@@ -135,40 +122,6 @@ export const ConnectionController = {
     }
   },
 
-  setConnectedSocialProvider(provider: ConnectionControllerState['connectedSocialProvider']) {
-    state.connectedSocialProvider = provider;
-
-    if (provider) {
-      StorageUtil.setConnectedSocialProvider(provider);
-    } else {
-      StorageUtil.removeConnectedSocialProvider();
-    }
-  },
-
-  parseUnits(value: string, decimals: number) {
-    return this._getClient().parseUnits(value, decimals);
-  },
-
-  formatUnits(value: bigint, decimals: number) {
-    return this._getClient().formatUnits(value, decimals);
-  },
-
-  async sendTransaction(args: SendTransactionArgs) {
-    return this._getClient().sendTransaction(args);
-  },
-
-  async writeContract(args: WriteContractArgs) {
-    return this._getClient().writeContract(args);
-  },
-
-  async getEnsAddress(value: string) {
-    return this._getClient().getEnsAddress(value);
-  },
-
-  async getEnsAvatar(value: string) {
-    return this._getClient().getEnsAvatar(value);
-  },
-
   clearUri() {
     state.wcUri = undefined;
     state.wcPairingExpiry = undefined;
@@ -180,18 +133,15 @@ export const ConnectionController = {
     this.clearUri();
     state.pressedWallet = undefined;
     state.connectedWalletImageUrl = undefined;
-    state.connectedSocialProvider = undefined;
     ConnectorController.setConnectedConnector(undefined);
     StorageUtil.removeWalletConnectDeepLink();
     StorageUtil.removeConnectedWalletImageUrl();
     StorageUtil.removeConnectedConnector();
-    StorageUtil.removeConnectedSocialProvider();
   },
 
   async disconnect() {
     await this._getClient().disconnect();
     this.resetWcConnection();
-    // remove transactions
     RouterController.reset('Connect');
   }
 };

package/src/controllers/EventsController.ts

@@ -1,3 +1,4 @@
+import { Platform } from 'react-native';
 import { proxy, subscribe as sub } from 'valtio/vanilla';
 import { ApiController } from './ApiController';
 import { OptionsController } from './OptionsController';
@@ -33,6 +34,17 @@ export const EventsController = {
     return sub(state, () => callback(state));
   },
 
+  _getApiHeaders() {
+    const { projectId, sdkType, sdkVersion } = OptionsController.state;
+
+    return {
+      'x-project-id': projectId,
+      'x-sdk-type': sdkType,
+      'x-sdk-version': sdkVersion,
+      'User-Agent': `${Platform.OS}-${Platform.Version}`
+    };
+  },
+
   async _sendAnalyticsEvent(data: EventsControllerState['data'], timestamp: number) {
     if (excluded.includes(data.event)) {
       return;
@@ -41,7 +53,7 @@ export const EventsController = {
     try {
       await api.post({
         path: '/e',
-        headers: ApiController._getApiHeaders(),
+        headers: this._getApiHeaders(),
         body: {
           eventId: CoreHelperUtil.getUUID(),
           bundleId: CoreHelperUtil.getBundleId(),

package/src/controllers/ModalController.ts

@@ -5,7 +5,6 @@ import { RouterController } from './RouterController';
 import { PublicStateController } from './PublicStateController';
 import { EventsController } from './EventsController';
 import { ApiController } from './ApiController';
-import { ConnectorController } from './ConnectorController';
 
 // -- Types --------------------------------------------- //
 export interface ModalControllerState {
@@ -35,8 +34,7 @@ export const ModalController = {
     if (options?.view) {
       RouterController.reset(options.view);
     } else if (AccountController.state.isConnected) {
-      const isUniversalWallet = ConnectorController.state.connectedConnector === 'AUTH';
-      RouterController.reset(isUniversalWallet ? 'Account' : 'AccountDefault');
+      RouterController.reset('Account');
     } else {
       RouterController.reset('Connect');
     }

package/src/controllers/NetworkController.ts

@@ -63,12 +63,6 @@ export const NetworkController = {
     state.approvedCaipNetworkIds = data.approvedCaipNetworkIds;
   },
 
-  getApprovedCaipNetworks() {
-    return state.approvedCaipNetworkIds
-      ?.map(id => state.requestedCaipNetworks?.find(network => network.id === id))
-      .filter(Boolean) as CaipNetwork[];
-  },
-
   async switchActiveNetwork(network: NetworkControllerState['caipNetwork']) {
     await this._getClient().switchCaipNetwork(network);
     state.caipNetwork = network;

package/src/controllers/OptionsController.ts

@@ -1,13 +1,5 @@
 import { proxy, ref } from 'valtio';
-import type {
-  CustomWallet,
-  Features,
-  Metadata,
-  ProjectId,
-  SdkVersion,
-  Tokens
-} from '../utils/TypeUtil';
-import { ConstantsUtil } from '../utils/ConstantsUtil';
+import type { CustomWallet, Metadata, ProjectId, SdkVersion, Tokens } from '../utils/TypeUtil';
 
 // -- Types --------------------------------------------- //
 export interface ClipboardClient {
@@ -27,15 +19,13 @@ export interface OptionsControllerState {
   sdkVersion: SdkVersion;
   metadata?: Metadata;
   isSiweEnabled?: boolean;
-  features?: Features;
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<OptionsControllerState>({
   projectId: '',
   sdkType: 'appkit',
-  sdkVersion: 'react-native-wagmi-undefined',
-  features: ConstantsUtil.DEFAULT_FEATURES
+  sdkVersion: 'react-native-wagmi-undefined'
 });
 
 // -- Controller ---------------------------------------- //
@@ -86,10 +76,6 @@ export const OptionsController = {
     state.isSiweEnabled = isSiweEnabled;
   },
 
-  setFeatures(features: OptionsControllerState['features']) {
-    state.features = { ...ConstantsUtil.DEFAULT_FEATURES, ...features };
-  },
-
   isClipboardAvailable() {
     return !!state._clipboardClient;
   },
@@ -97,7 +83,7 @@ export const OptionsController = {
   copyToClipboard(value: string) {
     const client = state._clipboardClient;
     if (client) {
-      client?.setString(value);
+      client.setString(value);
     }
   }
 };

package/src/controllers/RouterController.ts

@@ -1,46 +1,26 @@
 import { proxy } from 'valtio';
 import type { WcWallet, CaipNetwork, Connector } from '../utils/TypeUtil';
-import type { SocialProvider } 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'
-    | 'AccountDefault'
-    | 'AllWallets'
     | 'Connect'
-    | 'ConnectSocials'
-    | 'ConnectingExternal'
-    | 'ConnectingSiwe'
-    | 'ConnectingSocial'
-    | 'ConnectingFarcaster'
     | 'ConnectingWalletConnect'
-    | 'EmailVerifyDevice'
-    | 'EmailVerifyOtp'
-    | 'GetWallet'
+    | 'ConnectingExternal'
     | 'Networks'
     | 'SwitchNetwork'
-    | 'Transactions'
+    | 'AllWallets'
+    | 'WhatIsAWallet'
+    | 'WhatIsANetwork'
+    | 'GetWallet'
+    | 'EmailVerifyDevice'
+    | 'EmailVerifyOtp'
+    | 'UpdateEmailWallet'
     | 'UpdateEmailPrimaryOtp'
     | 'UpdateEmailSecondaryOtp'
-    | 'UpdateEmailWallet'
     | 'UpgradeEmailWallet'
-    | 'WalletCompatibleNetworks'
-    | 'WalletReceive'
-    | 'WalletSend'
-    | 'WalletSendPreview'
-    | 'WalletSendSelectToken'
-    | 'WhatIsANetwork'
-    | 'WhatIsAWallet';
+    | 'ConnectingSiwe';
   history: RouterControllerState['view'][];
   data?: {
     connector?: Connector;
@@ -48,16 +28,13 @@ export interface RouterControllerState {
     network?: CaipNetwork;
     email?: string;
     newEmail?: string;
-    socialProvider?: SocialProvider;
   };
-  transactionStack: TransactionAction[];
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<RouterControllerState>({
   view: 'Connect',
-  history: ['Connect'],
-  transactionStack: []
+  history: ['Connect']
 });
 
 // -- Controller ---------------------------------------- //
@@ -72,30 +49,6 @@ export const RouterController = {
     }
   },
 
-  pushTransactionStack(action: TransactionAction) {
-    state.transactionStack.push(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']) {
     state.view = view;
     state.history = [view];

package/src/index.ts

@@ -1,65 +1,52 @@
 // -- Controllers -------------------------------------------------------------
-export {
-  ModalController,
-  type ModalControllerArguments,
-  type ModalControllerState
-} from './controllers/ModalController';
+export { ModalController } from './controllers/ModalController';
+export type { ModalControllerArguments, ModalControllerState } from './controllers/ModalController';
 
-export { RouterController, type RouterControllerState } from './controllers/RouterController';
+export { RouterController } from './controllers/RouterController';
+export type { RouterControllerState } from './controllers/RouterController';
 
-export { AccountController, type AccountControllerState } from './controllers/AccountController';
+export { AccountController } from './controllers/AccountController';
+export type { AccountControllerState } from './controllers/AccountController';
 
-export {
-  NetworkController,
-  type NetworkControllerClient,
-  type NetworkControllerState
+export { NetworkController } from './controllers/NetworkController';
+export type {
+  NetworkControllerClient,
+  NetworkControllerState
 } from './controllers/NetworkController';
 
-export {
-  ConnectionController,
-  type ConnectionControllerClient,
-  type ConnectionControllerState
+export { ConnectionController } from './controllers/ConnectionController';
+export type {
+  ConnectionControllerClient,
+  ConnectionControllerState
 } from './controllers/ConnectionController';
 
-export {
-  ConnectorController,
-  type ConnectorControllerState
-} from './controllers/ConnectorController';
+export { ConnectorController } from './controllers/ConnectorController';
+export type { ConnectorControllerState } from './controllers/ConnectorController';
 
-export { SnackController, type SnackControllerState } from './controllers/SnackController';
+export { SnackController } from './controllers/SnackController';
+export type { SnackControllerState } from './controllers/SnackController';
 
-export { ApiController, type ApiControllerState } from './controllers/ApiController';
+export { ApiController } from './controllers/ApiController';
+export type { ApiControllerState } from './controllers/ApiController';
 
-export { AssetController, type AssetControllerState } from './controllers/AssetController';
+export { AssetController } from './controllers/AssetController';
+export type { AssetControllerState } from './controllers/AssetController';
 
-export { ThemeController, type ThemeControllerState } from './controllers/ThemeController';
+export { ThemeController } from './controllers/ThemeController';
+export type { ThemeControllerState } from './controllers/ThemeController';
 
-export { OptionsController, type OptionsControllerState } from './controllers/OptionsController';
+export { OptionsController } from './controllers/OptionsController';
+export type { OptionsControllerState } from './controllers/OptionsController';
 
-export {
-  PublicStateController,
-  type PublicStateControllerState
-} from './controllers/PublicStateController';
+export { PublicStateController } from './controllers/PublicStateController';
+export type { PublicStateControllerState } from './controllers/PublicStateController';
 
 export { BlockchainApiController } from './controllers/BlockchainApiController';
 
-export { SwapController, type SwapControllerState } from './controllers/SwapController';
-
-export { EventsController, type EventsControllerState } from './controllers/EventsController';
-
-export { EnsController, type EnsControllerState } from './controllers/EnsController';
-
-export {
-  TransactionsController,
-  type TransactionsControllerState
-} from './controllers/TransactionsController';
-
-export { SendController, type SendControllerState } from './controllers/SendController';
-
-export { WebviewController, type WebviewControllerState } from './controllers/WebviewController';
+export { EventsController } from './controllers/EventsController';
+export type { EventsControllerState } from './controllers/EventsController';
 
 // -- Utils -------------------------------------------------------------------
-export { ApiUtil } from './utils/ApiUtil';
 export { AssetUtil } from './utils/AssetUtil';
 export { ConstantsUtil } from './utils/ConstantsUtil';
 export { CoreHelperUtil } from './utils/CoreHelperUtil';

package/src/utils/ConstantsUtil.ts

@@ -1,11 +1,3 @@
-import type { Features } from './TypeUtil';
-
-const defaultFeatures: Features = {
-  email: true,
-  emailShowWallets: true,
-  socials: ['x', 'discord', 'github', 'apple', 'facebook', 'farcaster']
-};
-
 export const ConstantsUtil = {
   FOUR_MINUTES_MS: 240000,
 
@@ -15,9 +7,5 @@ export const ConstantsUtil = {
 
   EMAIL_REGEX: /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+$/,
 
-  LINKING_ERROR: 'LINKING_ERROR',
-
-  NATIVE_TOKEN_ADDRESS: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
-
-  DEFAULT_FEATURES: defaultFeatures
+  LINKING_ERROR: 'LINKING_ERROR'
 };