@reown/appkit-core-react-native 0.0.0-fix-approved-networks-20250822000414 → 0.0.0-fix-ui-changes-20250828183750

package/lib/module/controllers/SnackController.js

@@ -1,3 +1,5 @@
+"use strict";
+
 import { proxy } from 'valtio';
 import { OptionsController } from './OptionsController';
 
@@ -11,23 +13,47 @@ const state = proxy({
   long: false
 });
 
+// -- Private Variables --------------------------------- //
+let hideTimeout = null;
+
+// -- Private Functions --------------------------------- //
+const clearHideTimeout = () => {
+  if (hideTimeout) {
+    clearTimeout(hideTimeout);
+    hideTimeout = null;
+  }
+};
+const scheduleAutoHide = long => {
+  clearHideTimeout();
+  const duration = long ? 15000 : 2200;
+  hideTimeout = setTimeout(() => {
+    SnackController.hide();
+  }, duration);
+};
+
 // -- Controller ---------------------------------------- //
 export const SnackController = {
   state,
-  showSuccess(message) {
+  showSuccess(message, long = false) {
     state.message = message;
     state.variant = 'success';
     state.open = true;
+    state.long = long;
+    scheduleAutoHide(long);
   },
-  showError(message) {
+  showError(message, long = false) {
     state.message = message;
     state.variant = 'error';
     state.open = true;
+    state.long = long;
+    scheduleAutoHide(long);
   },
-  showLoading(message) {
+  showLoading(message, long = false) {
     state.message = message;
     state.variant = 'loading';
     state.open = true;
+    state.long = long;
+    scheduleAutoHide(long);
   },
   showInternalError(error) {
     const {
@@ -38,6 +64,7 @@ export const SnackController = {
       state.variant = 'error';
       state.open = true;
       state.long = true;
+      scheduleAutoHide(true);
     }
     if (error.longMessage) {
       // eslint-disable-next-line no-console
@@ -45,10 +72,9 @@ export const SnackController = {
     }
   },
   hide() {
+    clearHideTimeout();
     state.open = false;
     state.long = false;
-    state.message = '';
-    state.variant = 'success';
   }
 };
 //# sourceMappingURL=SnackController.js.map

package/lib/module/controllers/SnackController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","OptionsController","state","message","variant","open","long","SnackController","showSuccess","showError","showLoading","showInternalError","error","debug","shortMessage","longMessage","console","hide"],"sourceRoot":"../../../src","sources":["controllers/SnackController.ts"],"mappings":"AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,iBAAiB,QAAQ,qBAAqB;;AAEvD;;AAaA;AACA,MAAMC,KAAK,GAAGF,KAAK,CAAuB;EACxCG,OAAO,EAAE,EAAE;EACXC,OAAO,EAAE,SAAS;EAClBC,IAAI,EAAE,KAAK;EACXC,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,eAAe,GAAG;EAC7BL,KAAK;EAELM,WAAWA,CAACL,OAAwC,EAAE;IACpDD,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,SAAS;IACzBF,KAAK,CAACG,IAAI,GAAG,IAAI;EACnB,CAAC;EAEDI,SAASA,CAACN,OAAwC,EAAE;IAClDD,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,OAAO;IACvBF,KAAK,CAACG,IAAI,GAAG,IAAI;EACnB,CAAC;EAEDK,WAAWA,CAACP,OAAwC,EAAE;IACpDD,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,SAAS;IACzBF,KAAK,CAACG,IAAI,GAAG,IAAI;EACnB,CAAC;EAEDM,iBAAiBA,CAACC,KAAc,EAAE;IAChC,MAAM;MAAEC;IAAM,CAAC,GAAGZ,iBAAiB,CAACC,KAAK;IAEzC,IAAIW,KAAK,EAAE;MACTX,KAAK,CAACC,OAAO,GAAGS,KAAK,CAACE,YAAY;MAClCZ,KAAK,CAACE,OAAO,GAAG,OAAO;MACvBF,KAAK,CAACG,IAAI,GAAG,IAAI;MACjBH,KAAK,CAACI,IAAI,GAAG,IAAI;IACnB;IAEA,IAAIM,KAAK,CAACG,WAAW,EAAE;MACrB;MACAC,OAAO,CAACJ,KAAK,CAACA,KAAK,CAACG,WAAW,CAAC;IAClC;EACF,CAAC;EAEDE,IAAIA,CAAA,EAAG;IACLf,KAAK,CAACG,IAAI,GAAG,KAAK;IAClBH,KAAK,CAACI,IAAI,GAAG,KAAK;IAClBJ,KAAK,CAACC,OAAO,GAAG,EAAE;IAClBD,KAAK,CAACE,OAAO,GAAG,SAAS;EAC3B;AACF,CAAC"}
+{"version":3,"names":["proxy","OptionsController","state","message","variant","open","long","hideTimeout","clearHideTimeout","clearTimeout","scheduleAutoHide","duration","setTimeout","SnackController","hide","showSuccess","showError","showLoading","showInternalError","error","debug","shortMessage","longMessage","console"],"sourceRoot":"../../../src","sources":["controllers/SnackController.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,iBAAiB,QAAQ,qBAAqB;;AAEvD;;AAaA;AACA,MAAMC,KAAK,GAAGF,KAAK,CAAuB;EACxCG,OAAO,EAAE,EAAE;EACXC,OAAO,EAAE,SAAS;EAClBC,IAAI,EAAE,KAAK;EACXC,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA,IAAIC,WAAkC,GAAG,IAAI;;AAE7C;AACA,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;EAC7B,IAAID,WAAW,EAAE;IACfE,YAAY,CAACF,WAAW,CAAC;IACzBA,WAAW,GAAG,IAAI;EACpB;AACF,CAAC;AAED,MAAMG,gBAAgB,GAAIJ,IAAa,IAAK;EAC1CE,gBAAgB,CAAC,CAAC;EAElB,MAAMG,QAAQ,GAAGL,IAAI,GAAG,KAAK,GAAG,IAAI;EACpCC,WAAW,GAAGK,UAAU,CAAC,MAAM;IAC7BC,eAAe,CAACC,IAAI,CAAC,CAAC;EACxB,CAAC,EAAEH,QAAQ,CAAC;AACd,CAAC;;AAED;AACA,OAAO,MAAME,eAAe,GAAG;EAC7BX,KAAK;EAELa,WAAWA,CAACZ,OAAwC,EAAEG,IAAI,GAAG,KAAK,EAAE;IAClEJ,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,SAAS;IACzBF,KAAK,CAACG,IAAI,GAAG,IAAI;IACjBH,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjBI,gBAAgB,CAACJ,IAAI,CAAC;EACxB,CAAC;EAEDU,SAASA,CAACb,OAAwC,EAAEG,IAAI,GAAG,KAAK,EAAE;IAChEJ,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,OAAO;IACvBF,KAAK,CAACG,IAAI,GAAG,IAAI;IACjBH,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjBI,gBAAgB,CAACJ,IAAI,CAAC;EACxB,CAAC;EAEDW,WAAWA,CAACd,OAAwC,EAAEG,IAAI,GAAG,KAAK,EAAE;IAClEJ,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,SAAS;IACzBF,KAAK,CAACG,IAAI,GAAG,IAAI;IACjBH,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjBI,gBAAgB,CAACJ,IAAI,CAAC;EACxB,CAAC;EAEDY,iBAAiBA,CAACC,KAAc,EAAE;IAChC,MAAM;MAAEC;IAAM,CAAC,GAAGnB,iBAAiB,CAACC,KAAK;IAEzC,IAAIkB,KAAK,EAAE;MACTlB,KAAK,CAACC,OAAO,GAAGgB,KAAK,CAACE,YAAY;MAClCnB,KAAK,CAACE,OAAO,GAAG,OAAO;MACvBF,KAAK,CAACG,IAAI,GAAG,IAAI;MACjBH,KAAK,CAACI,IAAI,GAAG,IAAI;MACjBI,gBAAgB,CAAC,IAAI,CAAC;IACxB;IAEA,IAAIS,KAAK,CAACG,WAAW,EAAE;MACrB;MACAC,OAAO,CAACJ,KAAK,CAACA,KAAK,CAACG,WAAW,CAAC;IAClC;EACF,CAAC;EAEDR,IAAIA,CAAA,EAAG;IACLN,gBAAgB,CAAC,CAAC;IAClBN,KAAK,CAACG,IAAI,GAAG,KAAK;IAClBH,KAAK,CAACI,IAAI,GAAG,KAAK;EACpB;AACF,CAAC","ignoreList":[]}

package/lib/module/controllers/SwapController.js

@@ -1,20 +1,19 @@
+"use strict";
+
 import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, subscribe as sub } from 'valtio';
 import { NumberUtil } 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';
 import { SnackController } from './SnackController';
 import { RouterController } from './RouterController';
-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';
 
 // -- Constants ---------------------------------------- //
 export const INITIAL_GAS_LIMIT = 150000;
@@ -32,8 +31,7 @@ class TransactionError extends Error {
 // -- State --------------------------------------------- //
 const initialState = {
   // Loading states
-  initializing: false,
-  initialized: false,
+  loadingTokens: false,
   loadingPrices: false,
   loadingQuote: false,
   loadingApprovalTransaction: false,
@@ -53,7 +51,6 @@ const initialState = {
   toTokenAmount: '',
   toTokenPriceInUSD: 0,
   networkPrice: '0',
-  networkBalanceInUSD: '0',
   networkTokenSymbol: '',
   inputError: undefined,
   // Request values
@@ -72,7 +69,9 @@ const initialState = {
   maxSlippage: undefined,
   providerFee: undefined
 };
-const state = proxy(initialState);
+const state = proxy({
+  ...initialState
+});
 
 // -- Controller ---------------------------------------- //
 export const SwapController = {
@@ -84,10 +83,17 @@ export const SwapController = {
     return subKey(state, key, callback);
   },
   getParams() {
-    const caipAddress = AccountController.state.caipAddress;
-    const address = CoreHelperUtil.getPlainAddress(caipAddress);
-    const networkAddress = NetworkController.getActiveNetworkTokenAddress();
-    const type = ConnectorController.state.connectedConnector;
+    const {
+      activeAddress,
+      activeNamespace,
+      activeNetwork,
+      connection
+    } = ConnectionsController.state;
+    const address = CoreHelperUtil.getPlainAddress(activeAddress);
+    if (!activeNamespace || !activeNetwork) {
+      throw new Error('No active namespace or network found to swap the tokens from.');
+    }
+    const networkAddress = `${activeNetwork.caipNetworkId}:${ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]}`;
     if (!address) {
       throw new Error('No address found to swap the tokens from.');
     }
@@ -96,8 +102,9 @@ export const SwapController = {
     const invalidSourceTokenAmount = !state.sourceTokenAmount;
     return {
       networkAddress,
+      network: activeNetwork,
       fromAddress: address,
-      fromCaipAddress: caipAddress,
+      fromCaipAddress: activeAddress,
       sourceTokenAddress: state.sourceToken?.address,
       toTokenAddress: state.toToken?.address,
       toTokenAmount: state.toTokenAmount,
@@ -107,12 +114,12 @@ export const SwapController = {
       invalidToToken,
       invalidSourceToken,
       invalidSourceTokenAmount,
-      availableToSwap: caipAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
-      isAuthConnector: type === 'AUTH'
+      availableToSwap: activeAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
+      isAuthConnector: !!connection?.properties?.provider
     };
   },
   switchTokens() {
-    if (state.initializing || !state.initialized) {
+    if (state.loadingTokens) {
       return;
     }
     let newSourceToken = state.toToken ? {
@@ -132,35 +139,32 @@ export const SwapController = {
     this.setToTokenAmount('');
     this.swapTokens();
   },
-  resetState() {
-    state.myTokensWithBalance = initialState.myTokensWithBalance;
-    state.tokensPriceMap = initialState.tokensPriceMap;
-    state.initialized = initialState.initialized;
-    state.sourceToken = initialState.sourceToken;
-    state.sourceTokenAmount = initialState.sourceTokenAmount;
-    state.sourceTokenPriceInUSD = initialState.sourceTokenPriceInUSD;
-    state.toToken = initialState.toToken;
-    state.toTokenAmount = initialState.toTokenAmount;
-    state.toTokenPriceInUSD = initialState.toTokenPriceInUSD;
-    state.networkPrice = initialState.networkPrice;
-    state.networkTokenSymbol = initialState.networkTokenSymbol;
-    state.networkBalanceInUSD = initialState.networkBalanceInUSD;
-    state.inputError = initialState.inputError;
-  },
   async fetchTokens() {
-    const {
-      networkAddress
-    } = this.getParams();
-    await this.getTokenList();
-    await this.getNetworkTokenPrice();
-    await this.getMyTokensWithBalance();
-    const networkToken = state.tokens?.find(token => token.address === networkAddress);
-    if (networkToken) {
-      state.networkTokenSymbol = networkToken.symbol;
+    try {
+      const {
+        networkAddress
+      } = this.getParams();
+      state.loadingTokens = true;
+      await this.getTokenList();
+      await this.getNetworkTokenPrice();
+      await this.getMyTokensWithBalance();
+      const networkToken = state.tokens?.find(token => token.address === networkAddress);
+      if (networkToken) {
+        state.networkTokenSymbol = networkToken.symbol;
+      }
+
+      // Set default source token if not set
+      if (!state.sourceToken && state.myTokensWithBalance?.length) {
+        const sourceToken = state.myTokensWithBalance?.find(token => token.address.startsWith(networkAddress)) || state.myTokensWithBalance?.[0];
+        this.setSourceToken(sourceToken);
+        this.setSourceTokenAmount('1');
+      }
+    } catch (error) {
+      SnackController.showError('Failed to initialize swap');
+      RouterController.goBack();
+    } finally {
+      state.loadingTokens = false;
     }
-    const sourceToken = state.myTokensWithBalance?.find(token => token.address.startsWith(networkAddress)) || state.myTokensWithBalance?.[0];
-    this.setSourceToken(sourceToken);
-    this.setSourceTokenAmount('1');
   },
   async getTokenList() {
     const tokens = await SwapApiUtil.getTokenList();
@@ -182,15 +186,19 @@ export const SwapController = {
     }, {});
   },
   async getMyTokensWithBalance(forceUpdate) {
-    const balances = await SwapApiUtil.getMyTokensWithBalance(forceUpdate);
-    if (!balances) {
+    await ConnectionsController.fetchBalance(forceUpdate);
+    const swapBalances = SwapApiUtil.mapBalancesToSwapTokens(ConnectionsController.state.balances);
+    if (!swapBalances) {
       return;
     }
     await this.getInitialGasPrice();
-    this.setBalances(balances);
+    this.setBalances(swapBalances);
   },
-  getFilteredPopularTokens() {
-    return state.popularTokens?.filter(token => !state.myTokensWithBalance?.some(t => t.address === token.address));
+  getFilteredPopularTokens(balances) {
+    if (!balances) {
+      return state.popularTokens;
+    }
+    return state.popularTokens?.filter(token => !balances.some(t => t.address === token.address));
   },
   setSourceToken(sourceToken) {
     if (!sourceToken) {
@@ -208,31 +216,17 @@ export const SwapController = {
       state.toTokenAmount = '';
     }
   },
-  async initializeState() {
-    if (state.initializing) {
-      return;
-    }
-    state.initializing = true;
-    if (!state.initialized) {
-      try {
-        await this.fetchTokens();
-        state.initialized = true;
-      } catch (error) {
-        state.initialized = false;
-        SnackController.showError('Failed to initialize swap');
-        RouterController.goBack();
-      }
-    }
-    state.initializing = false;
-  },
   async getAddressPrice(address) {
+    const [namespace, chain] = address.split(':');
+    const networkId = `${namespace}:${chain}`;
     const existPrice = state.tokensPriceMap[address];
     if (existPrice) {
       return existPrice;
     }
     const response = await BlockchainApiController.fetchTokenPrice({
       projectId: OptionsController.state.projectId,
-      addresses: [address]
+      addresses: [address],
+      caipNetworkId: networkId
     });
     const fungibles = response?.fungibles || [];
     const allTokens = [...(state.tokens || []), ...(state.myTokensWithBalance || [])];
@@ -246,9 +240,12 @@ export const SwapController = {
     const {
       networkAddress
     } = this.getParams();
+    const [namespace, chain] = networkAddress.split(':');
+    const networkId = `${namespace}:${chain}`;
     const response = await BlockchainApiController.fetchTokenPrice({
       projectId: OptionsController.state.projectId,
-      addresses: [networkAddress]
+      addresses: [networkAddress],
+      caipNetworkId: networkId
     });
     const token = response?.fungibles?.[0];
     const price = token?.price.toString() || '0';
@@ -279,19 +276,10 @@ export const SwapController = {
     return SwapCalculationUtil.getProviderFeePrice(state.sourceTokenAmount, state.sourceTokenPriceInUSD);
   },
   setBalances(balances) {
-    const {
-      networkAddress
-    } = this.getParams();
-    const caipNetwork = NetworkController.state.caipNetwork;
-    if (!caipNetwork) {
-      return;
-    }
-    const networkToken = balances.find(token => token.address === networkAddress);
+    state.myTokensWithBalance = balances;
     balances.forEach(token => {
       state.tokensPriceMap[token.address] = token.price || 0;
     });
-    state.myTokensWithBalance = balances.filter(token => token.address?.startsWith(caipNetwork.id));
-    state.networkBalanceInUSD = networkToken ? NumberUtil.multiply(networkToken.quantity.numeric, networkToken.price).toString() : '0';
   },
   setToToken(toToken) {
     if (!toToken) {
@@ -326,36 +314,42 @@ export const SwapController = {
   },
   // -- Swap ---------------------------------------------- //
   async swapTokens() {
-    const address = AccountController.state.address;
+    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;
     }
     state.loadingQuote = true;
     const amountDecimal = NumberUtil.bigNumber(state.sourceTokenAmount).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()
-    });
-    state.loadingQuote = false;
-    const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
-    if (!quoteToAmount) {
-      return;
-    }
-    const toTokenAmount = NumberUtil.bigNumber(quoteToAmount).dividedBy(10 ** toToken.decimals).toString();
-    this.setToTokenAmount(toTokenAmount);
-    const isInsufficientToken = this.hasInsufficientToken(state.sourceTokenAmount, sourceToken.address);
-    if (isInsufficientToken) {
-      state.inputError = 'Insufficient balance';
-    } else {
-      state.inputError = undefined;
-      this.setTransactionDetails();
+    try {
+      const quoteResponse = await BlockchainApiController.fetchSwapQuote({
+        userAddress: address,
+        projectId: OptionsController.state.projectId,
+        from: sourceToken.address,
+        to: toToken.address,
+        gasPrice: state.gasFee,
+        amount: amountDecimal.toString()
+      });
+      const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
+      if (!quoteToAmount) {
+        state.loadingQuote = false;
+        return;
+      }
+      const toTokenAmount = NumberUtil.bigNumber(quoteToAmount).dividedBy(10 ** toToken.decimals).toString();
+      this.setToTokenAmount(toTokenAmount);
+      const isInsufficientToken = this.hasInsufficientToken(state.sourceTokenAmount, sourceToken.address);
+      if (isInsufficientToken) {
+        state.inputError = 'Insufficient balance';
+      } else {
+        state.inputError = undefined;
+        this.setTransactionDetails();
+      }
+    } catch (error) {
+      SnackController.showError('Failed to get swap quote');
+    } finally {
+      state.loadingQuote = false;
     }
   },
   // -- Create Transactions -------------------------------------- //
@@ -419,7 +413,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,
         to: CoreHelperUtil.getPlainAddress(response.tx.to),
         data: response.tx.data
@@ -469,7 +463,7 @@ export const SwapController = {
     if (!fromCaipAddress || !sourceTokenAmount || !sourceToken || !toToken) {
       return undefined;
     }
-    const amount = ConnectionController.parseUnits(sourceTokenAmount, sourceToken.decimals)?.toString();
+    const amount = ConnectionsController.parseUnits(sourceTokenAmount, sourceToken.decimals)?.toString();
     try {
       const response = await BlockchainApiController.generateSwapCalldata({
         projectId: OptionsController.state.projectId,
@@ -508,39 +502,29 @@ export const SwapController = {
   async sendTransactionForApproval(data) {
     const {
       fromAddress,
-      isAuthConnector
+      network
     } = this.getParams();
     state.loadingApprovalTransaction = true;
-    const approveLimitMessage = `Approve limit increase in your wallet`;
-    if (isAuthConnector) {
-      RouterController.pushTransactionStack({
-        view: null,
-        goBack: true,
-        onSuccess() {
-          SnackController.showLoading(approveLimitMessage);
-        }
-      });
-    } else {
-      SnackController.showLoading(approveLimitMessage);
-    }
+    SnackController.showLoading('Approve limit increase in your wallet');
     try {
-      await ConnectionController.sendTransaction({
+      await ConnectionsController.sendTransaction({
         address: fromAddress,
         to: data.to,
         data: data.data,
         value: BigInt(data.value),
         gasPrice: BigInt(data.gasPrice),
-        chainNamespace: 'eip155'
+        chainNamespace: ConnectionsController.state.activeNamespace,
+        network
       });
       await this.swapTokens();
       await this.getTransaction();
       state.approvalTransaction = undefined;
-      state.loadingApprovalTransaction = false;
     } catch (err) {
       const error = err;
       state.transactionError = error?.shortMessage;
-      state.loadingApprovalTransaction = false;
       SnackController.showError(error?.shortMessage ?? 'Transaction error');
+    } finally {
+      state.loadingApprovalTransaction = false;
     }
   },
   async sendTransactionForSwap(data) {
@@ -549,57 +533,45 @@ export const SwapController = {
     }
     const {
       fromAddress,
-      toTokenAmount,
-      isAuthConnector
+      isAuthConnector,
+      network
     } = this.getParams();
     state.loadingTransaction = true;
-    const snackbarPendingMessage = `Swapping ${state.sourceToken?.symbol} to ${NumberUtil.formatNumberToLocalString(toTokenAmount, 3)} ${state.toToken?.symbol}`;
-    const snackbarSuccessMessage = `Swapped ${state.sourceToken?.symbol} to ${NumberUtil.formatNumberToLocalString(toTokenAmount, 3)} ${state.toToken?.symbol}`;
-    if (isAuthConnector) {
-      RouterController.pushTransactionStack({
-        view: 'Account',
-        goBack: false,
-        onSuccess() {
-          SnackController.showLoading(snackbarPendingMessage);
-          SwapController.resetState();
-        }
-      });
-    } else {
-      SnackController.showLoading('Confirm transaction in your wallet');
-    }
+    const snackbarSuccessMessage = `Swapped ${state.sourceToken?.symbol} to ${state.toToken?.symbol}`;
+    SnackController.showLoading('Confirm transaction in your wallet');
     try {
-      const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].join(',');
-      const transactionHash = await ConnectionController.sendTransaction({
+      const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].filter(Boolean);
+      const transactionHash = await ConnectionsController.sendTransaction({
         address: fromAddress,
         to: data.to,
         data: data.data,
         gas: data.gas,
         gasPrice: BigInt(data.gasPrice),
         value: data.value,
-        chainNamespace: 'eip155'
+        chainNamespace: ConnectionsController.state.activeNamespace,
+        network
       });
       state.loadingTransaction = false;
-      SnackController.showSuccess(snackbarSuccessMessage);
+      SnackController.showSuccess(snackbarSuccessMessage, true);
       EventsController.sendEvent({
         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 || '',
           swapToAmount: this.state.toTokenAmount || '',
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
         }
       });
-      SwapController.resetState();
-      if (!isAuthConnector) {
-        RouterController.replace('AccountDefault');
-      }
+      RouterController.replace(isAuthConnector ? 'Account' : 'AccountDefault');
+      SwapController.clearTokens();
       SwapController.getMyTokensWithBalance(forceUpdateAddresses);
-      AccountController.fetchTokenBalance();
       setTimeout(() => {
-        TransactionsController.fetchTransactions(AccountController.state.address, true);
+        if (ConnectionsController.state.activeAddress) {
+          TransactionsController.fetchTransactions(ConnectionsController.state.activeAddress, true);
+        }
       }, 5000);
       return transactionHash;
     } catch (err) {
@@ -612,26 +584,59 @@ 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 || '',
           swapToAmount: this.state.toTokenAmount || '',
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
         }
       });
       return undefined;
     }
   },
+  clearTransactionLoaders() {
+    state.loadingApprovalTransaction = false;
+    state.loadingBuildTransaction = false;
+    state.loadingTransaction = false;
+  },
+  clearTokens() {
+    state.sourceToken = initialState.sourceToken;
+    state.sourceTokenAmount = initialState.sourceTokenAmount;
+    state.sourceTokenPriceInUSD = initialState.sourceTokenPriceInUSD;
+    state.toToken = initialState.toToken;
+    state.toTokenAmount = initialState.toTokenAmount;
+    state.toTokenPriceInUSD = initialState.toTokenPriceInUSD;
+    state.inputError = initialState.inputError;
+    state.loadingApprovalTransaction = initialState.loadingApprovalTransaction;
+    state.loadingBuildTransaction = initialState.loadingBuildTransaction;
+    state.loadingTransaction = initialState.loadingTransaction;
+    state.fetchError = initialState.fetchError;
+    state.transactionError = initialState.transactionError;
+    state.swapTransaction = initialState.swapTransaction;
+    state.approvalTransaction = initialState.approvalTransaction;
+  },
+  resetState() {
+    this.clearTokens();
+    state.myTokensWithBalance = initialState.myTokensWithBalance;
+    state.tokensPriceMap = initialState.tokensPriceMap;
+    state.networkPrice = initialState.networkPrice;
+    state.networkTokenSymbol = initialState.networkTokenSymbol;
+  },
   // -- Checks -------------------------------------------- //
   hasInsufficientToken(sourceTokenAmount, sourceTokenAddress) {
+    const {
+      balances
+    } = ConnectionsController.state;
+    const networkToken = balances?.find(t => t.address === undefined);
+    const networkBalanceInUSD = networkToken ? NumberUtil.multiply(networkToken.quantity?.numeric ?? '0', networkToken.price).toString() : '0';
     const isInsufficientSourceTokenForSwap = SwapCalculationUtil.isInsufficientSourceTokenForSwap(sourceTokenAmount, sourceTokenAddress, state.myTokensWithBalance);
     let insufficientNetworkTokenForGas = true;
-    if (AccountController.state.preferredAccountType === 'smartAccount') {
+    if (ConnectionsController.state.accountType === 'smartAccount') {
       // Smart Accounts may pay gas in any ERC20 token
       insufficientNetworkTokenForGas = false;
     } else {
-      insufficientNetworkTokenForGas = SwapCalculationUtil.isInsufficientNetworkTokenForGas(state.networkBalanceInUSD, state.gasPriceInUSD);
+      insufficientNetworkTokenForGas = SwapCalculationUtil.isInsufficientNetworkTokenForGas(networkBalanceInUSD, state.gasPriceInUSD);
     }
     return insufficientNetworkTokenForGas || isInsufficientSourceTokenForSwap;
   },