@reown/appkit-core-react-native 2.0.0-alpha.0 → 2.0.0-alpha.1

package/src/controllers/SwapController.ts

@@ -1,10 +1,9 @@
 import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, subscribe as sub } from 'valtio';
-import { NumberUtil } from '@reown/appkit-common-react-native';
+import { NumberUtil, type CaipAddress } from '@reown/appkit-common-react-native';
 
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 import { SwapApiUtil } from '../utils/SwapApiUtil';
-import { NetworkController } from './NetworkController';
 import { BlockchainApiController } from './BlockchainApiController';
 import { OptionsController } from './OptionsController';
 import { SwapCalculationUtil } from '../utils/SwapCalculationUtil';
@@ -14,7 +13,6 @@ import type { SwapInputTarget, SwapTokenWithBalance } from '../utils/TypeUtil';
 import { ConnectorController } from './ConnectorController';
 import { AccountController } from './AccountController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
-import { ConnectionController } from './ConnectionController';
 import { TransactionsController } from './TransactionsController';
 import { EventsController } from './EventsController';
 import { ConnectionsController } from './ConnectionsController';
@@ -166,9 +164,7 @@ export const SwapController = {
       throw new Error('No active namespace or network found to swap the tokens from.');
     }
 
-    const networkAddress = `${activeNetwork.caipNetworkId ?? 'eip155:1'}:${
-      ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]
-    }`;
+    const networkAddress: CaipAddress = `${activeNetwork.caipNetworkId}:${ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]}`;
 
     const type = ConnectorController.state.connectedConnector;
 
@@ -291,7 +287,6 @@ export const SwapController = {
 
   async getMyTokensWithBalance(forceUpdate?: string) {
     const balances = await SwapApiUtil.getMyTokensWithBalance(forceUpdate);
-
     if (!balances) {
       return;
     }
@@ -410,7 +405,7 @@ export const SwapController = {
 
   setBalances(balances: SwapTokenWithBalance[]) {
     const { networkAddress } = this.getParams();
-    const caipNetwork = NetworkController.state.caipNetwork;
+    const caipNetwork = ConnectionsController.state.activeNetwork;
 
     if (!caipNetwork) {
       return;
@@ -422,7 +417,9 @@ export const SwapController = {
       state.tokensPriceMap[token.address] = token.price || 0;
     });
 
-    state.myTokensWithBalance = balances.filter(token => token.address?.startsWith(caipNetwork.id));
+    state.myTokensWithBalance = balances.filter(
+      token => token.address?.startsWith(caipNetwork.caipNetworkId)
+    );
 
     state.networkBalanceInUSD = networkToken
       ? NumberUtil.multiply(networkToken.quantity.numeric, networkToken.price).toString()
@@ -473,12 +470,12 @@ export const SwapController = {
 
   // -- Swap ---------------------------------------------- //
   async swapTokens() {
-    const address = AccountController.state.address as `${string}:${string}:${string}`;
+    const address = ConnectionsController.state.activeAddress;
     const sourceToken = state.sourceToken;
     const toToken = state.toToken;
     const haveSourceTokenAmount = NumberUtil.bigNumber(state.sourceTokenAmount).isGreaterThan(0);
 
-    if (!toToken || !sourceToken || state.loadingPrices || !haveSourceTokenAmount) {
+    if (!toToken || !sourceToken || state.loadingPrices || !haveSourceTokenAmount || !address) {
       return;
     }
 
@@ -488,39 +485,44 @@ export const SwapController = {
       .multipliedBy(10 ** sourceToken.decimals)
       .integerValue();
 
-    const quoteResponse = await BlockchainApiController.fetchSwapQuote({
-      userAddress: address,
-      projectId: OptionsController.state.projectId,
-      from: sourceToken.address,
-      to: toToken.address,
-      gasPrice: state.gasFee,
-      amount: amountDecimal.toString()
-    });
+    try {
+      const quoteResponse = await BlockchainApiController.fetchSwapQuote({
+        userAddress: address,
+        projectId: OptionsController.state.projectId,
+        from: sourceToken.address,
+        to: toToken.address,
+        gasPrice: state.gasFee,
+        amount: amountDecimal.toString()
+      });
 
-    state.loadingQuote = false;
+      state.loadingQuote = false;
 
-    const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
+      const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
 
-    if (!quoteToAmount) {
-      return;
-    }
+      if (!quoteToAmount) {
+        return;
+      }
 
-    const toTokenAmount = NumberUtil.bigNumber(quoteToAmount)
-      .dividedBy(10 ** toToken.decimals)
-      .toString();
+      const toTokenAmount = NumberUtil.bigNumber(quoteToAmount)
+        .dividedBy(10 ** toToken.decimals)
+        .toString();
 
-    this.setToTokenAmount(toTokenAmount);
+      this.setToTokenAmount(toTokenAmount);
 
-    const isInsufficientToken = this.hasInsufficientToken(
-      state.sourceTokenAmount,
-      sourceToken.address
-    );
+      const isInsufficientToken = this.hasInsufficientToken(
+        state.sourceTokenAmount,
+        sourceToken.address
+      );
 
-    if (isInsufficientToken) {
-      state.inputError = 'Insufficient balance';
-    } else {
-      state.inputError = undefined;
-      this.setTransactionDetails();
+      if (isInsufficientToken) {
+        state.inputError = 'Insufficient balance';
+      } else {
+        state.inputError = undefined;
+        this.setTransactionDetails();
+      }
+    } catch (error) {
+      SnackController.showError('Failed to get swap quote');
+      state.loadingQuote = false;
     }
   },
 
@@ -589,7 +591,7 @@ export const SwapController = {
       if (!response) {
         throw new Error('createAllowanceTransaction - No response from generateApproveCalldata');
       }
-      const gasLimit = await ConnectionController.estimateGas({
+      const gasLimit = await ConnectionsController.estimateGas({
         address: fromAddress as `0x${string}`,
         to: CoreHelperUtil.getPlainAddress(response.tx.to) as `0x${string}`,
         data: response.tx.data
@@ -642,7 +644,7 @@ export const SwapController = {
       return undefined;
     }
 
-    const amount = ConnectionController.parseUnits(
+    const amount = ConnectionsController.parseUnits(
       sourceTokenAmount,
       sourceToken.decimals
     )?.toString();
@@ -710,13 +712,13 @@ export const SwapController = {
     }
 
     try {
-      await ConnectionController.sendTransaction({
+      await ConnectionsController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         value: BigInt(data.value),
         gasPrice: BigInt(data.gasPrice),
-        chainNamespace: 'eip155'
+        chainNamespace: ConnectionsController.state.activeNamespace
       });
 
       await this.swapTokens();
@@ -735,7 +737,6 @@ export const SwapController = {
     if (!data) {
       return undefined;
     }
-
     const { fromAddress, toTokenAmount, isAuthConnector } = this.getParams();
 
     state.loadingTransaction = true;
@@ -762,14 +763,14 @@ export const SwapController = {
 
     try {
       const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].join(',');
-      const transactionHash = await ConnectionController.sendTransaction({
+      const transactionHash = await ConnectionsController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         gas: data.gas,
         gasPrice: BigInt(data.gasPrice),
         value: data.value,
-        chainNamespace: 'eip155'
+        chainNamespace: ConnectionsController.state.activeNamespace
       });
 
       state.loadingTransaction = false;
@@ -778,7 +779,7 @@ export const SwapController = {
         type: 'track',
         event: 'SWAP_SUCCESS',
         properties: {
-          network: NetworkController.state.caipNetwork?.id || '',
+          network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
@@ -810,7 +811,7 @@ export const SwapController = {
         event: 'SWAP_ERROR',
         properties: {
           message: error?.shortMessage ?? error?.message ?? 'Unknown',
-          network: NetworkController.state.caipNetwork?.id || '',
+          network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',

package/src/utils/ConstantsUtil.ts

@@ -3,7 +3,7 @@ import type { Features } from './TypeUtil';
 
 //TODO: enable this again after implemented
 const defaultFeatures: Features = {
-  swaps: false,
+  swaps: true,
   onramp: false,
   email: false,
   emailShowWallets: false,
@@ -135,6 +135,116 @@ export const ConstantsUtil = {
     'WNT'
   ],
 
+  //TODO: replace with supported chains from backend
+  ACTIVITY_SUPPORTED_CHAINS: [
+    // Arbitrum
+    'eip155:42161',
+    // BNB Chain
+    'eip155:56',
+    // Ethereum
+    'eip155:1',
+    // Blast
+    'eip155:81457',
+    // Ape Chain
+    'eip155:99999',
+    // Avalanche
+    'eip155:43114',
+    // Abstract
+    'eip155:900',
+    // opBNB
+    'eip155:204',
+    // Astar zkEVM
+    'eip155:3776',
+    // ZKsync Era
+    'eip155:324',
+    // Berachain
+    'eip155:80085',
+    // BOB
+    'eip155:60808',
+    // Cyber
+    'eip155:7560',
+    // Degen Chain
+    'eip155:666666666',
+    // Fraxtal
+    'eip155:252',
+    // Gravity Alpha
+    'eip155:10003',
+    // Ink
+    'eip155:999',
+    // Lens
+    'eip155:1348',
+    // Lisk
+    'eip155:113',
+    // Mode
+    'eip155:34443',
+    // Base
+    'eip155:8453',
+    // Mantle
+    'eip155:5000',
+    // Optimism
+    'eip155:10',
+    // Polygon
+    'eip155:137',
+    // Celo
+    'eip155:42220',
+    // Manta Pacific
+    'eip155:169',
+    // Gnosis Chain
+    'eip155:100',
+    // Fantom
+    'eip155:250',
+    // Ronin
+    'eip155:2020',
+    // Linea
+    'eip155:59144',
+    // Metis Andromeda
+    'eip155:1088',
+    // Aurora
+    'eip155:1313161554',
+    // XDC
+    'eip155:50',
+    // Cronos zkEVM
+    'eip155:1030',
+    // Polygon zkEVM
+    'eip155:1101',
+    // Polynomial
+    'eip155:80001',
+    // Rari
+    'eip155:1380012617',
+    // Redstone
+    'eip155:690',
+    // Scroll
+    'eip155:534352',
+    // Sei
+    'eip155:1329',
+    // Soneium
+    'eip155:1499',
+    // Sonic
+    'eip155:7007',
+    // Swellchain
+    'eip155:7777777',
+    // Taiko
+    'eip155:167000',
+    // Viction
+    'eip155:88',
+    // Unichain
+    'eip155:12345',
+    // Wonder
+    'eip155:8787',
+    // X Layer
+    'eip155:196',
+    // World Chain
+    'eip155:2008',
+    // ZERϴ
+    'eip155:77777',
+    // ZkLink Nova
+    'eip155:810180',
+    // re.al
+    'eip155:666',
+    // Zora
+    'eip155:7777777'
+  ],
+
   SWAP_SUPPORTED_NETWORKS: [
     // Ethereum'
     'eip155:1',

package/src/utils/SwapApiUtil.ts

@@ -1,18 +1,19 @@
 import { BlockchainApiController } from '../controllers/BlockchainApiController';
 import { OptionsController } from '../controllers/OptionsController';
-import { NetworkController } from '../controllers/NetworkController';
 import type {
   BlockchainApiBalanceResponse,
   BlockchainApiSwapAllowanceRequest,
   SwapTokenWithBalance
 } from './TypeUtil';
 import { AccountController } from '../controllers/AccountController';
-import { ConnectionController } from '../controllers/ConnectionController';
 import { ConnectionsController } from '../controllers/ConnectionsController';
+import type { CaipNetworkId } from '@reown/appkit-common-react-native';
+import { ConstantsUtil } from './ConstantsUtil';
 
 export const SwapApiUtil = {
   async getTokenList() {
-    const chainId = ConnectionsController.state.activeNetwork?.caipNetworkId ?? 'eip155:1';
+    const chainId: CaipNetworkId =
+      ConnectionsController.state.activeNetwork?.caipNetworkId ?? 'eip155:1';
     const response = await BlockchainApiController.fetchSwapTokens({
       projectId: OptionsController.state.projectId,
       chainId
@@ -54,7 +55,7 @@ export const SwapApiUtil = {
 
     if (response?.allowance && sourceTokenAmount && sourceTokenDecimals) {
       const parsedValue =
-        ConnectionController.parseUnits(sourceTokenAmount, sourceTokenDecimals) || 0;
+        ConnectionsController.parseUnits(sourceTokenAmount, sourceTokenDecimals) || 0;
       const hasAllowance = BigInt(response.allowance) >= parsedValue;
 
       return hasAllowance;
@@ -84,12 +85,17 @@ export const SwapApiUtil = {
   },
 
   mapBalancesToSwapTokens(balances?: BlockchainApiBalanceResponse['balances']) {
+    const { activeNamespace, activeCaipNetworkId } = ConnectionsController.state;
+    const address = activeNamespace
+      ? ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]
+      : undefined;
+
     return (
       balances?.map(
         token =>
           ({
             ...token,
-            address: token?.address || NetworkController.getActiveNetworkTokenAddress(),
+            address: token?.address ?? `${token?.chainId ?? activeCaipNetworkId}:${address}`,
             decimals: parseInt(token.quantity.decimals, 10),
             logoUri: token.iconUrl,
             eip2612: false
@@ -100,7 +106,7 @@ export const SwapApiUtil = {
 
   async fetchGasPrice() {
     const projectId = OptionsController.state.projectId;
-    const caipNetwork = NetworkController.state.caipNetwork;
+    const caipNetwork = ConnectionsController.state.activeNetwork;
 
     if (!caipNetwork) {
       return null;
@@ -108,7 +114,7 @@ export const SwapApiUtil = {
 
     return await BlockchainApiController.fetchGasPrice({
       projectId,
-      chainId: caipNetwork.id
+      chainId: caipNetwork.caipNetworkId
     });
   }
 };

package/src/utils/TypeUtil.ts

@@ -6,7 +6,8 @@ import type {
   SocialProvider,
   ThemeMode,
   Transaction,
-  ConnectorType
+  ConnectorType,
+  Metadata
 } from '@reown/appkit-common-react-native';
 
 import { OnRampErrorType } from './ConstantsUtil';
@@ -339,18 +340,6 @@ export type BlockchainApiOnRampWidgetResponse = {
 };
 
 // -- OptionsController Types ---------------------------------------------------
-export type Metadata = {
-  name: string;
-  description: string;
-  url: string;
-  icons: string[];
-  redirect?: {
-    native?: string;
-    universal?: string;
-    linkMode?: boolean;
-  };
-};
-
 export type CustomWallet = Pick<
   WcWallet,
   | 'id'