@rango-dev/widget-embedded 0.1.10-next.92 → 0.1.10-next.94

package/dist/widget-embedded.cjs.production.min.js

@@ -12,15 +12,15 @@ var reactRouterDom = require('react-router-dom');
 var zustand = require('zustand');
 var BigNumber = require('bignumber.js');
 var BigNumber__default = _interopDefault(BigNumber);
-var middleware = require('zustand/middleware');
-var rangoSdk = require('rango-sdk');
 var walletsShared = require('@rango-dev/wallets-shared');
 var rangoTypes = require('rango-types');
 var walletsCore = require('@rango-dev/wallets-core');
+var middleware = require('zustand/middleware');
+var rangoSdk = require('rango-sdk');
+var shallow = require('zustand/shallow');
 var reactI18next = require('react-i18next');
 var theme = require('@rango-dev/ui/src/theme');
 var providerAll = require('@rango-dev/provider-all');
-var shallow = require('zustand/shallow');
 var queueManagerReact = require('@rango-dev/queue-manager-react');
 var copy = _interopDefault(require('copy-to-clipboard'));
 var i18n = _interopDefault(require('i18next'));
@@ -70,117 +70,6 @@ function shadeColor(color, percent) {
   return '#' + RR + GG + BB;
 }
 
-const getBestRouteToTokenUsdPrice = bestRoute => bestRoute?.result?.swaps[bestRoute?.result?.swaps.length - 1].to.usdPrice;
-function isNumberOfSwapsChanged(route1, route2) {
-  const route1Swaps = route1.result?.swaps || [];
-  const route2Swaps = route2.result?.swaps || [];
-  return route1Swaps.length !== route2Swaps.length;
-}
-function isRouteSwappersUpdated(route1, route2) {
-  const route1Swappers = route1.result?.swaps.map(swap => swap.swapperId) || [];
-  const route2Swappers = route2.result?.swaps.map(swap => swap.swapperId) || [];
-  return !areEqual(route1Swappers, route2Swappers);
-}
-function isRouteInternalCoinsUpdated(route1, route2) {
-  const route1InternalCoins = route1.result?.swaps.map(swap => swap.to.symbol) || [];
-  const route2InternalCoins = route2.result?.swaps.map(swap => swap.to.symbol) || [];
-  return !areEqual(route1InternalCoins, route2InternalCoins);
-}
-const isRouteChanged = (route1, route2) => {
-  return isNumberOfSwapsChanged(route1, route2) || isRouteSwappersUpdated(route1, route2) || isRouteInternalCoinsUpdated(route1, route2);
-};
-const getRequiredBalanceOfWallet = (selectedWallet, fee) => {
-  if (fee === null) return null;
-  const relatedFeeStatus = fee?.find(item => item.blockchain === selectedWallet.chain)?.wallets.find(wallet => wallet.address?.toLowerCase() === selectedWallet.address.toLowerCase());
-  if (!relatedFeeStatus) return null;
-  return relatedFeeStatus.requiredAssets;
-};
-
-const createSelectors = _store => {
-  let store = _store;
-  store.use = {};
-  for (let k of Object.keys(store.getState())) {
-    store.use[k] = () => store(s => s[k]);
-  }
-  return store;
-};
-
-const httpService = /*#__PURE__*/new rangoSdk.RangoClient(process.env.REACT_APP_API_KEY);
-
-const SLIPPAGES = [0.5, 1, 3, 5, 8, 13, 20];
-const DEFAULT_SLIPPAGE = 1;
-const HIGH_SLIPPAGE = 5;
-const MAX_SLIPPAGE = 100;
-const MIN_SLIPPGAE = 0;
-
-const useMetaStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()(set => ({
-  meta: {
-    blockchains: [],
-    popularTokens: [],
-    swappers: [],
-    tokens: []
-  },
-  loadingStatus: 'loading',
-  fetchMeta: async () => {
-    try {
-      const response = await httpService.getAllMetadata();
-      const chainThatHasTokenInMetaResponse = removeDuplicateFrom(response.tokens.map(t => t.blockchain));
-      const enabledChains = response.blockchains.filter(chain => chain.enabled && chainThatHasTokenInMetaResponse.includes(chain.name));
-      response.blockchains = enabledChains.sort((a, b) => a.sort - b.sort);
-      set({
-        meta: response,
-        loadingStatus: 'success'
-      });
-    } catch (error) {
-      set({
-        loadingStatus: 'failed'
-      });
-    }
-  }
-})));
-
-const useSettingsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()( /*#__PURE__*/middleware.persist( /*#__PURE__*/middleware.subscribeWithSelector(set => ({
-  slippage: DEFAULT_SLIPPAGE,
-  customSlippage: null,
-  infiniteApprove: false,
-  disabledLiquiditySources: [],
-  theme: 'auto',
-  setSlippage: slippage => set(() => ({
-    slippage: slippage
-  })),
-  setCustomSlippage: customSlippage => set(() => ({
-    customSlippage: customSlippage
-  })),
-  toggleAllLiquiditySources: () => set(state => {
-    const {
-      swappers
-    } = useMetaStore.getState().meta;
-    const swappersGroup = removeDuplicateFrom(swappers.map(swapper => swapper.swapperGroup));
-    if (swappersGroup.length === state.disabledLiquiditySources.length) return {
-      disabledLiquiditySources: []
-    };else {
-      return {
-        disabledLiquiditySources: swappersGroup
-      };
-    }
-  }),
-  toggleInfiniteApprove: () => set(state => ({
-    infiniteApprove: !state.infiniteApprove
-  })),
-  toggleLiquiditySource: name => set(state => {
-    if (state.disabledLiquiditySources.includes(name)) return {
-      disabledLiquiditySources: state.disabledLiquiditySources.filter(liquiditySource => liquiditySource != name)
-    };else return {
-      disabledLiquiditySources: state.disabledLiquiditySources.concat(name)
-    };
-  }),
-  setTheme: theme => set(() => ({
-    theme
-  }))
-})), {
-  name: 'user-settings'
-})));
-
 const secondsToString = s => {
   const seconds = (s % 60).toString().padStart(2, '0');
   const minutes = parseInt((s / 60).toString()).toString().padStart(2, '0');
@@ -239,15 +128,17 @@ function getlistWallet(getState, getWalletInfo, list) {
     const {
       name,
       img: image,
-      installLink
+      installLink,
+      showOnMobile
     } = getWalletInfo(type);
     const state = getStateWallet(getState(type));
     return {
       name,
       image,
-      installLink,
+      installLink: walletsShared.detectInstallLink(installLink),
       state,
-      type
+      type,
+      showOnMobile: typeof showOnMobile === 'undefined' ? false : true
     };
   });
 }
@@ -395,18 +286,12 @@ function numberWithThousandSeperator(number) {
   parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
   return parts.join('.');
 }
-const sortedTokens = (tokens, position, balance) => {
-  if (!tokens) return [];
-  const walletSymbols = new Set((balance || []).flatMap(a => a.balances || []).filter(b => (new BigNumber__default(b?.rawAmount) || ZERO).gt(0)).map(b => `${b?.chain}.${b?.symbol}.${b?.address}`));
-  let sortedList = [...tokens.filter(t => !t.address && walletSymbols.size && position === 'to'), ...tokens.filter(t => !(position === 'to' && !t.address) && walletSymbols.has(`${t.blockchain}.${t.symbol}.${t.address}`)).sort((tokenA, tokenB) => compareBalance(tokenA, tokenB, balance)), ...tokens.filter(t => !walletSymbols.has(`${t.blockchain}.${t.symbol}.${t.address}`) && !t.address && (!walletSymbols.size || position === 'from')), ...tokens.filter(t => !walletSymbols.has(`${t.blockchain}.${t.symbol}.${t.address}`) && t.address && !t.isSecondaryCoin), ...tokens.filter(t => !walletSymbols.has(`${t.blockchain}.${t.symbol}.${t.address}`) && t.isSecondaryCoin)];
-  return sortedList;
-};
-const compareBalance = (tokenA, tokenB, wallet) => {
-  if (!tokenA.usdPrice || !tokenB.usdPrice) return 0;
-  const tokenAUsdValue = new BigNumber__default(getBalanceFromWallet(wallet, tokenA.blockchain, tokenA.symbol, tokenA.address)?.amount || ZERO).multipliedBy(tokenA.usdPrice);
-  const tokenBUsdValue = new BigNumber__default(getBalanceFromWallet(wallet, tokenB.blockchain, tokenB.symbol, tokenB.address)?.amount || ZERO).multipliedBy(tokenB.usdPrice);
-  if (tokenAUsdValue.gt(tokenBUsdValue)) return -1;
-  return 1;
+const sortTokens = tokens => {
+  let walletConnected = !!tokens.some(token => token.balance);
+  if (!walletConnected) {
+    return tokens.filter(token => !token.address).concat(tokens.filter(token => token.address && !token.isSecondaryCoin), tokens.filter(token => token.isSecondaryCoin));
+  }
+  return tokens.filter(token => !!token.balance).sort((tokenA, tokenB) => parseFloat(tokenB.balance?.usdValue || '0') - parseFloat(tokenA.balance?.usdValue || '0')).concat(tokens.filter(token => !token.balance && !token.isSecondaryCoin), tokens.filter(token => !token.balance && token.isSecondaryCoin));
 };
 const getUsdPrice = (blockchain, symbol, address, allTokens) => {
   const token = allTokens?.find(t => t.blockchain === blockchain && t.symbol?.toUpperCase() === symbol?.toUpperCase() && t.address === address);
@@ -423,6 +308,45 @@ const getKeplrCompatibleConnectedWallets = selectableWallets => {
   const connectedWalletTypes = new Set(selectableWallets.map(a => a.walletType.toString()));
   return walletsShared.KEPLR_COMPATIBLE_WALLETS.filter(compatibleWallet => connectedWalletTypes.has(compatibleWallet));
 };
+function getTokensWithBalance(tokens, balances) {
+  return tokens.map(_ref2 => {
+    let {
+      balance,
+      ...otherProps
+    } = _ref2;
+    const tokenAmount = numberToString(new BigNumber__default(getBalanceFromWallet(balances, otherProps.blockchain, otherProps.symbol, otherProps.address)?.amount || ZERO));
+    let tokenUsdValue = '';
+    if (otherProps.usdPrice) tokenUsdValue = numberToString(new BigNumber__default(getBalanceFromWallet(balances, otherProps.blockchain, otherProps.symbol, otherProps.address)?.amount || ZERO).multipliedBy(otherProps.usdPrice));
+    return {
+      ...otherProps,
+      ...(tokenAmount !== '0' && {
+        balance: {
+          amount: tokenAmount,
+          usdValue: tokenUsdValue
+        }
+      })
+    };
+  });
+}
+function getSortedTokens(chain, tokens, balances, otherChainTokens) {
+  const fromChainEqueulsToToChain = chain?.name === otherChainTokens[0]?.name;
+  if (fromChainEqueulsToToChain) return otherChainTokens;
+  const filteredTokens = tokens.filter(token => token.blockchain === chain?.name);
+  return sortTokens(getTokensWithBalance(filteredTokens, balances));
+}
+function tokensAreEqual(tokenA, tokenB) {
+  return tokenA?.blockchain === tokenB?.blockchain && tokenA?.name === tokenB?.name && tokenA?.address === tokenB?.address;
+}
+function getDefaultToken(sortedTokens, otherToken) {
+  let selectedToken;
+  const firstToken = sortedTokens[0];
+  const secondToken = sortedTokens[1];
+  if (sortedTokens.length === 1) selectedToken = firstToken;else if (tokensAreEqual(firstToken, otherToken)) selectedToken = secondToken;else selectedToken = firstToken;
+  return selectedToken;
+}
+function sortWalletsBasedOnState(wallets) {
+  return wallets.sort((a, b) => Number(b.state === ui.WalletState.CONNECTED) - Number(a.state === ui.WalletState.CONNECTED) || Number(b.state === ui.WalletState.DISCONNECTED) - Number(a.state === ui.WalletState.DISCONNECTED));
+}
 
 function getOutputRatio(inputUsdValue, outputUsdValue) {
   if (inputUsdValue.lte(ZERO) || outputUsdValue.lte(ZERO)) return 0;
@@ -590,10 +514,10 @@ function calculatePendingSwap(inputAmount, bestRoute, wallets, settings, validat
         transferTransaction: null,
         diagnosisUrl: null,
         internalSteps: null,
-        fromBlockchainLogo: fromBlockchain.logo,
-        toBlockchainLogo: toBlockchain.logo,
-        swapperLogo: swapper?.logo,
-        swapperType: swapperType
+        fromBlockchainLogo: fromBlockchain?.logo || '',
+        toBlockchainLogo: toBlockchain?.logo || '',
+        swapperLogo: swapper?.logo || '',
+        swapperType: swapperType || ''
       };
     }) || []
   };
@@ -637,7 +561,8 @@ function getMinRequiredSlippage(route) {
 }
 function hasProperSlippage(userSlippage, minRequiredSlippage) {
   if (!minRequiredSlippage) return true;
-  return parseFloat(userSlippage) > minRequiredSlippage;
+  //@ts-ignore
+  return parseFloat(userSlippage) >= parseFloat(minRequiredSlippage);
 }
 function createBestRouteRequestBody(fromToken, toToken, inputAmount, wallets, selectedWallets, disabledLiquiditySources, slippage, checkPrerequisites) {
   const selectedWalletsMap = selectedWallets.reduce((selectedWalletsMap, selectedWallet) => (selectedWalletsMap[selectedWallet.chain] = selectedWallet.address, selectedWalletsMap), {});
@@ -679,9 +604,10 @@ function getWalletsForNewSwap(selectedWallets) {
   return wallets;
 }
 function getRouteOutputAmount(route) {
-  return route.result?.outputAmount || null;
+  return route?.result?.outputAmount || null;
 }
 function getPercentageChange(oldValue, newValue) {
+  if (!oldValue || !newValue) return null;
   return new BigNumber__default(newValue).div(new BigNumber__default(oldValue)).minus(1).multipliedBy(100);
 }
 function isOutputAmountChangedALot(oldRoute, newRoute) {
@@ -689,6 +615,7 @@ function isOutputAmountChangedALot(oldRoute, newRoute) {
   const newOutputAmount = getRouteOutputAmount(newRoute);
   if (!oldOutputAmount || !newOutputAmount) return false;
   const percentageChange = getPercentageChange(oldOutputAmount, newOutputAmount);
+  if (!percentageChange) return true;
   return percentageChange.toNumber() <= -1;
 }
 function getBalanceWarnings(route, selectedWallets) {
@@ -706,7 +633,242 @@ function getBalanceWarnings(route, selectedWallets) {
     const warningMessage = `Needs ≈ ${requiredAmount} ${symbol}${reason}, but you have ${currentAmount} ${symbol} in your ${asset.asset.blockchain} wallet.`;
     return warningMessage;
   });
-}
+}
+
+function searchParamsToToken(tokens, searchParams, chain) {
+  if (!chain) return null;
+  return tokens.find(token => {
+    const symbolAndAddress = searchParams?.split('--');
+    if (symbolAndAddress?.length === 1) return token.symbol === symbolAndAddress[0] && token.address === null && token.blockchain === chain.name;
+    return token.symbol === symbolAndAddress?.[0] && token.address === symbolAndAddress?.[1] && token.blockchain === chain.name;
+  }) || null;
+}
+function getBestRouteToTokenUsdPrice(bestRoute) {
+  return bestRoute?.result?.swaps[bestRoute?.result?.swaps.length - 1].to.usdPrice;
+}
+function isNumberOfSwapsChanged(route1, route2) {
+  const route1Swaps = route1.result?.swaps || [];
+  const route2Swaps = route2.result?.swaps || [];
+  return route1Swaps.length !== route2Swaps.length;
+}
+function isRouteSwappersUpdated(route1, route2) {
+  const route1Swappers = route1.result?.swaps.map(swap => swap.swapperId) || [];
+  const route2Swappers = route2.result?.swaps.map(swap => swap.swapperId) || [];
+  return !areEqual(route1Swappers, route2Swappers);
+}
+function isRouteInternalCoinsUpdated(route1, route2) {
+  const route1InternalCoins = route1.result?.swaps.map(swap => swap.to.symbol) || [];
+  const route2InternalCoins = route2.result?.swaps.map(swap => swap.to.symbol) || [];
+  return !areEqual(route1InternalCoins, route2InternalCoins);
+}
+function isRouteChanged(route1, route2) {
+  return isNumberOfSwapsChanged(route1, route2) || isRouteSwappersUpdated(route1, route2) || isRouteInternalCoinsUpdated(route1, route2);
+}
+function getRequiredBalanceOfWallet(selectedWallet, fee) {
+  if (fee === null) return null;
+  const relatedFeeStatus = fee?.find(item => item.blockchain === selectedWallet.chain)?.wallets.find(wallet => wallet.address?.toLowerCase() === selectedWallet.address.toLowerCase());
+  if (!relatedFeeStatus) return null;
+  return relatedFeeStatus.requiredAssets;
+}
+function isRouteParametersChanged(prevParams, currentParams) {
+  return prevParams.fromChain?.name !== currentParams.fromChain?.name || prevParams.toChain?.name !== currentParams.toChain?.name || prevParams.fromToken?.symbol !== currentParams.fromToken?.symbol || prevParams.toToken?.symbol !== currentParams.toToken?.symbol || prevParams.fromToken?.blockchain !== currentParams.fromToken?.blockchain || prevParams.toToken?.blockchain !== currentParams.toToken?.blockchain || prevParams.fromToken?.address !== currentParams.fromToken?.address || prevParams.toToken?.address !== currentParams.toToken?.address || prevParams.inputAmount !== currentParams.inputAmount || prevParams.slippage !== currentParams.slippage || prevParams.customSlippage !== currentParams.customSlippage || prevParams.disabledLiquiditySources?.length !== currentParams.disabledLiquiditySources?.length;
+}
+function getBestRouteWithCalculatedFees(bestRoute, tokens) {
+  if (!bestRoute || !bestRoute.result) return null;
+  const swapsWithFee = (bestRoute?.result?.swaps || []).map(swap => ({
+    ...swap,
+    feeInUsd: numberToString(getUsdFeeOfStep(swap, tokens), 0, 2)
+  }));
+  return {
+    ...bestRoute,
+    result: {
+      ...bestRoute.result,
+      swaps: swapsWithFee
+    }
+  };
+}
+
+const createSelectors = _store => {
+  let store = _store;
+  store.use = {};
+  for (let k of Object.keys(store.getState())) {
+    store.use[k] = () => store(s => s[k]);
+  }
+  return store;
+};
+
+const httpService = /*#__PURE__*/new rangoSdk.RangoClient(process.env.REACT_APP_API_KEY);
+
+const SLIPPAGES = [0.5, 1, 3, 5, 8, 13, 20];
+const DEFAULT_SLIPPAGE = 1;
+const HIGH_SLIPPAGE = 5;
+const MAX_SLIPPAGE = 100;
+const MIN_SLIPPGAE = 0;
+
+const useMetaStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()(set => ({
+  meta: {
+    blockchains: [],
+    popularTokens: [],
+    swappers: [],
+    tokens: []
+  },
+  loadingStatus: 'loading',
+  fetchMeta: async () => {
+    try {
+      const response = await httpService.getAllMetadata();
+      const chainThatHasTokenInMetaResponse = removeDuplicateFrom(response.tokens.map(t => t.blockchain));
+      const enabledChains = response.blockchains.filter(chain => chain.enabled && chainThatHasTokenInMetaResponse.includes(chain.name));
+      response.blockchains = enabledChains.sort((a, b) => a.sort - b.sort);
+      set({
+        meta: response,
+        loadingStatus: 'success'
+      });
+    } catch (error) {
+      set({
+        loadingStatus: 'failed'
+      });
+    }
+  }
+})));
+
+const useSettingsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()( /*#__PURE__*/middleware.persist( /*#__PURE__*/middleware.subscribeWithSelector(set => ({
+  slippage: DEFAULT_SLIPPAGE,
+  customSlippage: null,
+  infiniteApprove: false,
+  disabledLiquiditySources: [],
+  theme: 'auto',
+  setSlippage: slippage => set(() => ({
+    slippage: slippage
+  })),
+  setCustomSlippage: customSlippage => set(() => ({
+    customSlippage: customSlippage
+  })),
+  toggleAllLiquiditySources: () => set(state => {
+    const {
+      swappers
+    } = useMetaStore.getState().meta;
+    const swappersGroup = removeDuplicateFrom(swappers.map(swapper => swapper.swapperGroup));
+    if (swappersGroup.length === state.disabledLiquiditySources.length) return {
+      disabledLiquiditySources: []
+    };else {
+      return {
+        disabledLiquiditySources: swappersGroup
+      };
+    }
+  }),
+  toggleInfiniteApprove: () => set(state => ({
+    infiniteApprove: !state.infiniteApprove
+  })),
+  toggleLiquiditySource: name => set(state => {
+    if (state.disabledLiquiditySources.includes(name)) return {
+      disabledLiquiditySources: state.disabledLiquiditySources.filter(liquiditySource => liquiditySource != name)
+    };else return {
+      disabledLiquiditySources: state.disabledLiquiditySources.concat(name)
+    };
+  }),
+  setTheme: theme => set(() => ({
+    theme
+  }))
+})), {
+  name: 'user-settings'
+})));
+
+const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()( /*#__PURE__*/middleware.subscribeWithSelector(set => ({
+  accounts: [],
+  balances: [],
+  selectedWallets: [],
+  connectWallet: accounts => {
+    const tokens = useMetaStore.getState().meta.tokens;
+    set(state => ({
+      accounts: state.accounts.concat(accounts),
+      balances: state.balances.concat(accounts.map(account => ({
+        balances: [],
+        address: account.address,
+        chain: account.chain,
+        loading: true,
+        walletType: account.walletType,
+        error: false,
+        explorerUrl: null
+      })))
+    }));
+    accounts.forEach(async account => {
+      try {
+        const response = await httpService.getWalletsDetails([{
+          address: account.address,
+          blockchain: account.chain
+        }]);
+        const retrivedBalance = response.wallets[0];
+        if (retrivedBalance) {
+          set(state => ({
+            balances: state.balances.map(balance => {
+              return isAccountAndBalanceMatched(account, balance) ? makeBalanceFor(account, retrivedBalance, tokens) : balance;
+            })
+          }));
+        } else throw new Error('Wallet not found');
+      } catch (error) {
+        set(state => ({
+          balances: state.balances.map(balance => {
+            return isAccountAndBalanceMatched(account, balance) ? resetBalanceState(balance) : balance;
+          })
+        }));
+      }
+    });
+  },
+  disconnectWallet: walletType => {
+    set(state => ({
+      accounts: state.accounts.filter(account => account.walletType !== walletType),
+      balances: state.balances.filter(balance => balance.walletType !== walletType),
+      selectedWallets: state.selectedWallets.filter(wallet => wallet.walletType != walletType)
+    }));
+  },
+  initSelectedWallets: () => set(state => {
+    const requiredChains = getRequiredChains(useBestRouteStore.getState().bestRoute);
+    const connectedWallets = state.accounts;
+    const selectedWallets = [];
+    requiredChains.forEach(chain => {
+      const anyWalletSelected = !!state.selectedWallets.find(wallet => wallet.chain === chain);
+      if (!anyWalletSelected) {
+        const firstWalletWithMatchedChain = connectedWallets.find(wallet => wallet.chain === chain);
+        if (!!firstWalletWithMatchedChain) selectedWallets.push({
+          address: firstWalletWithMatchedChain.address,
+          chain: firstWalletWithMatchedChain.chain,
+          walletType: firstWalletWithMatchedChain.walletType
+        });
+      }
+    });
+    return {
+      selectedWallets: state.selectedWallets.concat(selectedWallets)
+    };
+  }),
+  setSelectedWallet: wallet => set(state => ({
+    selectedWallets: state.selectedWallets.filter(selectedWallet => selectedWallet.chain !== wallet.chain).concat({
+      chain: wallet.chain,
+      address: wallet.address,
+      walletType: wallet.walletType
+    })
+  })),
+  clearConnectedWallet: () => set(() => ({
+    accounts: [],
+    balances: [],
+    selectedWallets: []
+  }))
+}))));
+useWalletsStore.subscribe(state => state.balances, balances => {
+  useBestRouteStore.setState(_ref => {
+    let {
+      sourceTokens,
+      destinationTokens
+    } = _ref;
+    const sourceTokensWithBalance = getTokensWithBalance(sourceTokens, balances);
+    const destinationTokensWithBalance = getTokensWithBalance(destinationTokens, balances);
+    return {
+      sourceTokens: sortTokens(sourceTokensWithBalance),
+      destinationTokens: sortTokens(destinationTokensWithBalance)
+    };
+  });
+}, {
+  equalityFn: shallow.shallow
+});
 
 const getUsdValue = (token, amount) => new BigNumber__default(amount || ZERO).multipliedBy(token?.usdPrice || 0);
 const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()( /*#__PURE__*/middleware.subscribeWithSelector(set => ({
@@ -721,6 +883,8 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.cre
   bestRoute: null,
   loading: false,
   error: '',
+  sourceTokens: [],
+  destinationTokens: [],
   setBestRoute: bestRoute => set(state => {
     let outputAmount = null;
     let outputUsdValue = ZERO;
@@ -736,27 +900,62 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.cre
       })
     };
   }),
-  setFromChain: chain => set(() => ({
-    fromChain: chain
-  })),
+  setFromChain: (chain, setDefaultToken) => {
+    set(state => {
+      if (state.fromChain?.name === chain?.name) return {};
+      const tokens = useMetaStore.getState().meta.tokens;
+      const balances = useWalletsStore.getState().balances;
+      const sortedTokens = getSortedTokens(chain, tokens, balances, state.destinationTokens);
+      const fromToken = getDefaultToken(sortedTokens, state.toToken);
+      return {
+        fromChain: chain,
+        sourceTokens: sortedTokens,
+        ...(setDefaultToken && {
+          fromToken
+        }),
+        ...(!!state.inputAmount && {
+          inputUsdValue: getUsdValue(fromToken, state.inputAmount)
+        })
+      };
+    });
+  },
   setFromToken: token => set(state => ({
     fromToken: token,
     ...(!!state.inputAmount && {
       inputUsdValue: getUsdValue(token, state.inputAmount)
     })
   })),
-  setToChain: chain => set(() => ({
-    toChain: chain
-  })),
+  setToChain: (chain, setDefaultToken) => {
+    set(state => {
+      if (state.toChain?.name === chain?.name) return {};
+      const tokens = useMetaStore.getState().meta.tokens;
+      const balances = useWalletsStore.getState().balances;
+      const sortedTokens = getSortedTokens(chain, tokens, balances, state.destinationTokens);
+      return {
+        toChain: chain,
+        destinationTokens: sortedTokens,
+        ...(setDefaultToken && {
+          toToken: getDefaultToken(sortedTokens, state.fromToken)
+        })
+      };
+    });
+  },
   setToToken: token => set(() => ({
     toToken: token
   })),
-  setInputAmount: amount => set(state => ({
-    inputAmount: amount,
-    ...(!!state.fromToken && {
-      inputUsdValue: getUsdValue(state.fromToken, amount)
-    })
-  }))
+  setInputAmount: amount => {
+    set(state => ({
+      inputAmount: amount,
+      ...(!amount && {
+        outputAmount: new BigNumber__default(0),
+        outputUsdValue: new BigNumber__default(0),
+        bestRoute: null
+      }),
+      ...(!!state.fromToken && {
+        inputUsdValue: getUsdValue(state.fromToken, amount)
+      })
+    }));
+  }
 }))));
 const bestRoute = (bestRouteStore, settingsStore) => {
   let abortController = null;
@@ -774,11 +973,13 @@ const bestRoute = (bestRouteStore, settingsStore) => {
     if (!fromToken || !toToken || !inputAmount) return;
     abortController?.abort();
     abortController = new AbortController();
-    const userSlippage = customSlippage | slippage;
+    const userSlippage = !!customSlippage ? customSlippage : slippage;
     const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, [], [], disabledLiquiditySources, userSlippage, false);
     bestRouteStore.setState({
       loading: true,
-      bestRoute: null
+      bestRoute: null,
+      outputAmount: null,
+      outputUsdValue: new BigNumber__default(0)
     });
     httpService.getBestRoute(requestBody, {
       signal: abortController.signal
@@ -807,7 +1008,7 @@ const bestRoute = (bestRouteStore, settingsStore) => {
     inputAmount: state.inputAmount
   }), fetchBestRoute.bind(null), {
     equalityFn: (prevState, state) => {
-      if (prevState.fromChain?.name !== state.fromChain?.name || prevState.toChain?.name !== state.toChain?.name || prevState.fromToken?.symbol !== state.fromToken?.symbol || prevState.toToken?.symbol !== state.toToken?.symbol || prevState.fromToken?.blockchain !== state.fromToken?.blockchain || prevState.toToken?.blockchain !== state.toToken?.blockchain || prevState.fromToken?.address !== state.fromToken?.address || prevState.toToken?.address !== state.toToken?.address || prevState.inputAmount !== state.inputAmount) return false;else return true;
+      if (isRouteParametersChanged(prevState, state)) return false;else return true;
     }
   });
   useSettingsStore.subscribe(state => ({
@@ -816,7 +1017,7 @@ const bestRoute = (bestRouteStore, settingsStore) => {
     disabledLiquiditySources: state.disabledLiquiditySources
   }), fetchBestRoute.bind(null), {
     equalityFn: (prevState, state) => {
-      if (prevState.slippage !== state.slippage || prevState.customSlippage !== state.customSlippage || prevState.disabledLiquiditySources.length !== state.disabledLiquiditySources.length) return false;else return true;
+      if (isRouteParametersChanged(prevState, state)) return false;else return true;
     }
   });
   return {
@@ -847,13 +1048,6 @@ const useUiStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()(s
   })
 })));
 
-function searchParamsToToken(tokens, searchParams) {
-  return tokens.find(token => {
-    const symbolAndAddress = searchParams?.split('--');
-    if (symbolAndAddress?.length === 1) return token.symbol === symbolAndAddress[0] && token.address === null;
-    return token.symbol === symbolAndAddress?.[0] && token.address === symbolAndAddress?.[1];
-  }) || null;
-}
 function UpdateUrl() {
   const firstRender = React.useRef(true);
   const [searchParams, setSearchParams] = reactRouterDom.useSearchParams();
@@ -961,15 +1155,15 @@ function UpdateUrl() {
   }, [location.pathname, inputAmount]);
   React.useEffect(() => {
     if (loadingStatus === 'success') {
-      const fronChainString = searchParams.get(SearchParams.FROM_CHAIN);
+      const fromChainString = searchParams.get(SearchParams.FROM_CHAIN);
       const fromTokenString = searchParams.get(SearchParams.FROM_TOKEN);
       const toChainString = searchParams.get(SearchParams.TO_CHAIN);
       const toTokenString = searchParams.get(SearchParams.TO_TOKEN);
       const fromAmount = searchParams.get(SearchParams.FROM_AMOUNT);
-      const fromChain = blockchains.find(blockchain => blockchain.name === fronChainString);
-      const fromToken = searchParamsToToken(tokens, fromTokenString);
+      const fromChain = blockchains.find(blockchain => blockchain.name === fromChainString);
+      const fromToken = searchParamsToToken(tokens, fromTokenString, fromChain || null);
       const toChain = blockchains.find(blockchain => blockchain.name === toChainString);
-      const toToken = searchParamsToToken(tokens, toTokenString);
+      const toToken = searchParamsToToken(tokens, toTokenString, toChain || null);
       if (!!fromChain) {
         setFromChain(fromChain);
         if (!!fromToken) setFromToken(fromToken);
@@ -1040,92 +1234,11 @@ function Header(props) {
   return React__default.createElement(HeaderContainer, null, React__default.createElement(ui.Typography, {
     variant: "h4",
     className: titleStyle()
-  }, t(title.toLocaleLowerCase()) || title), React__default.createElement(HeaderButtons, {
+  }, title ? t(title.toLocaleLowerCase()) : ''), React__default.createElement(HeaderButtons, {
     onClickRefresh: onClickRefresh
   }));
 }
 
-const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()( /*#__PURE__*/middleware.subscribeWithSelector(set => ({
-  accounts: [],
-  balances: [],
-  selectedWallets: [],
-  connectWallet: accounts => {
-    const tokens = useMetaStore.getState().meta.tokens;
-    set(state => ({
-      accounts: state.accounts.concat(accounts),
-      balances: state.balances.concat(accounts.map(account => ({
-        balances: [],
-        address: account.address,
-        chain: account.chain,
-        loading: true,
-        walletType: account.walletType,
-        error: false,
-        explorerUrl: null
-      })))
-    }));
-    accounts.forEach(async account => {
-      try {
-        const response = await httpService.getWalletsDetails([{
-          address: account.address,
-          blockchain: account.chain
-        }]);
-        const retrivedBalance = response.wallets[0];
-        if (retrivedBalance) {
-          set(state => ({
-            balances: state.balances.map(balance => {
-              return isAccountAndBalanceMatched(account, balance) ? makeBalanceFor(account, retrivedBalance, tokens) : balance;
-            })
-          }));
-        } else throw new Error('Wallet not found');
-      } catch (error) {
-        set(state => ({
-          balances: state.balances.map(balance => {
-            return isAccountAndBalanceMatched(account, balance) ? resetBalanceState(balance) : balance;
-          })
-        }));
-      }
-    });
-  },
-  disconnectWallet: walletType => {
-    set(state => ({
-      accounts: state.accounts.filter(account => account.walletType !== walletType),
-      balances: state.balances.filter(balance => balance.walletType !== walletType),
-      selectedWallets: state.selectedWallets.filter(wallet => wallet.walletType != walletType)
-    }));
-  },
-  initSelectedWallets: () => set(state => {
-    const requiredChains = getRequiredChains(useBestRouteStore.getState().bestRoute);
-    const connectedWallets = state.accounts;
-    const selectedWallets = [];
-    requiredChains.forEach(chain => {
-      const anyWalletSelected = !!state.selectedWallets.find(wallet => wallet.chain === chain);
-      if (!anyWalletSelected) {
-        const firstWalletWithMatchedChain = connectedWallets.find(wallet => wallet.chain === chain);
-        if (!!firstWalletWithMatchedChain) selectedWallets.push({
-          address: firstWalletWithMatchedChain.address,
-          chain: firstWalletWithMatchedChain.chain,
-          walletType: firstWalletWithMatchedChain.walletType
-        });
-      }
-    });
-    return {
-      selectedWallets: state.selectedWallets.concat(selectedWallets)
-    };
-  }),
-  setSelectedWallet: wallet => set(state => ({
-    selectedWallets: state.selectedWallets.filter(selectedWallet => selectedWallet.chain !== wallet.chain).concat({
-      chain: wallet.chain,
-      address: wallet.address,
-      walletType: wallet.walletType
-    })
-  })),
-  clearConnectedWallet: () => set(() => ({
-    accounts: [],
-    balances: [],
-    selectedWallets: []
-  }))
-}))));
-
 const Box = /*#__PURE__*/ui.styled('div', {
   display: 'flex',
   flexDirection: 'column',
@@ -1543,7 +1656,7 @@ function ChangeSlippageButton() {
     type: "primary",
     variant: "contained",
     size: "small",
-    onClick: navigate.bind(null, navigationRoutes.settings)
+    onClick: () => navigate(navigationRoutes.settings)
   }, "Change Slippage");
 }
 
@@ -1555,7 +1668,7 @@ function HighSlippageWarning(props) {
     type: "warning"
   }, React__default.createElement(ui.Typography, {
     variant: "body2"
-  }, "slippage is high=> Caution, your slippage is high (=", selectedSlippage, "). Your trade may be front run.", React__default.createElement(ChangeSlippageButton, null)));
+  }, "Caution, your slippage is high (=", selectedSlippage, "). Your trade may be front run.", React__default.createElement(ChangeSlippageButton, null)));
 }
 
 function ConfirmSwapExtraMessages(props) {
@@ -1589,12 +1702,6 @@ function useNavigateBack() {
   };
 }
 
-const useConfirmSwapStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()( /*#__PURE__*/middleware.subscribeWithSelector(() => ({
-  loading: false,
-  errors: [],
-  warnings: [],
-  proceedAnyway: false
-}))));
 var ConfirmSwapErrorTypes;
 (function (ConfirmSwapErrorTypes) {
   ConfirmSwapErrorTypes[ConfirmSwapErrorTypes["NO_ROUTE"] = 0] = "NO_ROUTE";
@@ -1610,161 +1717,6 @@ var ConfirmSwapWarningTypes;
   ConfirmSwapWarningTypes[ConfirmSwapWarningTypes["ROUTE_AND_OUTPUT_AMOUNT_UPDATED"] = 3] = "ROUTE_AND_OUTPUT_AMOUNT_UPDATED";
   ConfirmSwapWarningTypes[ConfirmSwapWarningTypes["INSUFFICIENT_BALANCE"] = 4] = "INSUFFICIENT_BALANCE";
 })(ConfirmSwapWarningTypes || (ConfirmSwapWarningTypes = {}));
-const confirmSwap = async () => {
-  const {
-    fromToken,
-    toToken,
-    inputAmount,
-    bestRoute: initialRoute,
-    inputUsdValue,
-    setBestRoute
-  } = useBestRouteStore.getState();
-  const {
-    accounts,
-    selectedWallets
-  } = useWalletsStore.getState();
-  const {
-    proceedAnyway
-  } = useConfirmSwapStore.getState();
-  const {
-    disabledLiquiditySources,
-    slippage,
-    customSlippage
-  } = useSettingsStore.getState();
-  const {
-    meta
-  } = useMetaStore.getState();
-  const userSlippage = customSlippage || slippage;
-  if (!fromToken || !toToken || !inputAmount || !initialRoute) return undefined;
-  if (proceedAnyway) {
-    const swapSettings = {
-      slippage: userSlippage.toString(),
-      disabledSwappersGroups: disabledLiquiditySources
-    };
-    const newSwap = calculatePendingSwap(inputAmount.toString(), initialRoute, getWalletsForNewSwap(selectedWallets), swapSettings, false, meta);
-    console.log('new swap:', newSwap);
-    // queueManager?.create('swap', { swapDetails: newSwap });
-    useConfirmSwapStore.setState({
-      errors: [],
-      warnings: [],
-      proceedAnyway: false
-    });
-    return newSwap;
-  }
-  let abortController = new AbortController();
-  useConfirmSwapStore.setState({
-    loading: true
-  });
-  const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, accounts, selectedWallets, disabledLiquiditySources, userSlippage, true);
-  const unsubscribeFromBestRouteStore = useBestRouteStore.subscribe(state => state.bestRoute, () => {
-    abortController.abort();
-  }, {
-    equalityFn: shallow.shallow
-  });
-  const unsubscribeFromWalletsStore = useWalletsStore.subscribe(state => state.selectedWallets, () => {
-    abortController?.abort();
-  }, {
-    equalityFn: (prevState, state) => {
-      const selectedWalletsChanged = !state.every(wallet => !!prevState.find(prevWallet => wallet.address === prevWallet.address && wallet.chain === prevWallet.chain));
-      if (selectedWalletsChanged) return false;else return true;
-    }
-  });
-  const newSwap = await httpService.getBestRoute(requestBody, {
-    signal: abortController.signal
-  }).then(confiremedRoute => {
-    useConfirmSwapStore.setState({
-      loading: false
-    });
-    if (!confiremedRoute.result || !new BigNumber__default(confiremedRoute.requestAmount).isEqualTo(new BigNumber__default(inputAmount || '-1'))) {
-      useConfirmSwapStore.setState(prevState => ({
-        errors: prevState.errors.concat({
-          type: ConfirmSwapErrorTypes.NO_ROUTE
-        })
-      }));
-      return undefined;
-    }
-    const confirmSwap = {
-      loading: false,
-      errors: [],
-      warnings: [],
-      proceedAnyway
-    };
-    const routeChanged = isRouteChanged(initialRoute, confiremedRoute);
-    if (routeChanged) {
-      setBestRoute(confiremedRoute);
-      const newRouteOutputUsdValue = new BigNumber__default(confiremedRoute.result?.outputAmount || '0').multipliedBy(toToken.usdPrice || 0);
-      const outputRatio = getOutputRatio(inputUsdValue, newRouteOutputUsdValue);
-      const highValueLoss = outputRatioHasWarning(inputUsdValue, outputRatio);
-      if (isNumberOfSwapsChanged(initialRoute, confiremedRoute)) confirmSwap.warnings.push({
-        type: ConfirmSwapWarningTypes.ROUTE_UPDATED
-      });else if (isRouteSwappersUpdated(initialRoute, confiremedRoute)) confirmSwap.warnings.push({
-        type: ConfirmSwapWarningTypes.ROUTE_SWAPPERS_UPDATED
-      });else isRouteInternalCoinsUpdated(initialRoute, confiremedRoute);
-      confirmSwap.warnings.push({
-        type: ConfirmSwapWarningTypes.ROUTE_COINS_UPDATED
-      });
-      if (highValueLoss) confirmSwap.errors.push({
-        type: ConfirmSwapErrorTypes.ROUTE_UPDATED_WITH_HIGH_VALUE_LOSS
-      });else if (isOutputAmountChangedALot(initialRoute, confiremedRoute)) confirmSwap.warnings.push({
-        type: ConfirmSwapWarningTypes.ROUTE_AND_OUTPUT_AMOUNT_UPDATED,
-        newOutputAmount: numberToString(getRouteOutputAmount(confiremedRoute)),
-        percentageChange: numberToString(getPercentageChange(getRouteOutputAmount(initialRoute), getRouteOutputAmount(confiremedRoute)), null, 2)
-      });
-    }
-    const balanceWarnings = getBalanceWarnings(confiremedRoute, selectedWallets);
-    const enoughBalance = balanceWarnings.length === 0;
-    if (!enoughBalance) confirmSwap.warnings.push({
-      type: ConfirmSwapWarningTypes.INSUFFICIENT_BALANCE,
-      messages: balanceWarnings
-    });
-    const minRequiredSlippage = getMinRequiredSlippage(initialRoute);
-    if (!hasProperSlippage(userSlippage.toString(), minRequiredSlippage)) confirmSwap.errors.push({
-      type: ConfirmSwapErrorTypes.INSUFFICIENT_SLIPPAGE,
-      minRequiredSlippage
-    });
-    const noErrors = confirmSwap.errors.length === 0;
-    const noWarnings = confirmSwap.warnings.length === 0;
-    if ((noErrors || !noErrors && proceedAnyway) && (noWarnings || !noWarnings && proceedAnyway)) {
-      const swapSettings = {
-        slippage: userSlippage.toString(),
-        disabledSwappersGroups: disabledLiquiditySources
-      };
-      const newSwap = calculatePendingSwap(inputAmount.toString(), confiremedRoute, getWalletsForNewSwap(selectedWallets), swapSettings, false, meta);
-      console.log('new swap:', newSwap);
-      return newSwap;
-    } else if (!proceedAnyway) {
-      confirmSwap.proceedAnyway = true;
-      useConfirmSwapStore.setState(confirmSwap);
-    }
-    return undefined;
-  }).then(result => {
-    abortController = null;
-    unsubscribeFromBestRouteStore();
-    unsubscribeFromWalletsStore();
-    return result;
-  }).catch(error => {
-    abortController = null;
-    if (error.code === 'ERR_CANCELED') {
-      useConfirmSwapStore.setState({
-        errors: [],
-        warnings: [],
-        loading: false,
-        proceedAnyway: false
-      });
-      unsubscribeFromBestRouteStore();
-      unsubscribeFromWalletsStore();
-    }
-    const status = error.response?.status;
-    useConfirmSwapStore.setState(prevState => ({
-      loading: false,
-      errors: prevState.errors.concat({
-        type: ConfirmSwapErrorTypes.REQUEST_FAILED,
-        status
-      })
-    }));
-  });
-  return newSwap || undefined;
-};
 
 function MinRequiredSlippage(_ref) {
   let {
@@ -1772,7 +1724,7 @@ function MinRequiredSlippage(_ref) {
   } = _ref;
   return React__default.createElement(ui.Typography, {
     variant: "body2"
-  }, "slippage is low => We recommend you to increase slippage to at least", minRequiredSlippage, "for this route.", React__default.createElement(ChangeSlippageButton, null));
+  }, "We recommend you to increase slippage to at least \u00A0", minRequiredSlippage, "\u00A0 for this route.", React__default.createElement(ChangeSlippageButton, null));
 }
 
 function ConfirmSwapErrors(errors) {
@@ -1800,13 +1752,40 @@ function ConfirmSwapErrors(errors) {
   });
 }
 
+const List = /*#__PURE__*/ui.styled('ul', {
+  variants: {
+    showListStyle: {
+      true: {
+        paddingLeft: '$24'
+      }
+    }
+  }
+});
+const ListItem = /*#__PURE__*/ui.styled('li', {
+  variants: {
+    showListStyle: {
+      true: {
+        listStyleType: 'disc',
+        listStylePosition: 'outside'
+      }
+    }
+  }
+});
+const Message = /*#__PURE__*/ui.styled(ui.Typography, {
+  display: 'block'
+});
 function BalanceWarnings(_ref) {
   let {
     messages
   } = _ref;
-  return React__default.createElement("div", null, messages.map(warning => React__default.createElement(ui.Typography, {
+  const showListStyle = messages.length > 1;
+  return React__default.createElement(List, {
+    showListStyle: showListStyle
+  }, messages.map(warning => React__default.createElement(ListItem, {
+    showListStyle: showListStyle
+  }, React__default.createElement(Message, {
     variant: "body2"
-  }, warning)));
+  }, warning))));
 }
 
 function ConfirmSwapWarnings(warnings) {
@@ -1839,6 +1818,137 @@ function ConfirmSwapWarnings(warnings) {
   });
 }
 
+function useConfirmSwap() {
+  const fromToken = useBestRouteStore.use.fromToken();
+  const toToken = useBestRouteStore.use.toToken();
+  const inputAmount = useBestRouteStore.use.inputAmount();
+  const initialRoute = useBestRouteStore.use.bestRoute();
+  const setBestRoute = useBestRouteStore.use.setBestRoute();
+  const inputUsdValue = useBestRouteStore.use.inputUsdValue();
+  const accounts = useWalletsStore.use.accounts();
+  const selectedWallets = useWalletsStore.use.selectedWallets();
+  const meta = useMetaStore.use.meta();
+  const customSlippage = useSettingsStore.use.customSlippage();
+  const slippage = useSettingsStore.use.slippage();
+  const disabledLiquiditySources = useSettingsStore.use.disabledLiquiditySources();
+  const userSlippage = customSlippage || slippage;
+  const proceedAnywayRef = React.useRef(false);
+  const confiremedRouteRef = React.useRef(null);
+  let abortControllerRef = React.useRef(null);
+  const [loading, setLoading] = React.useState(false);
+  const [errors, setErrors] = React.useState([]);
+  const [warnings, setWarnings] = React.useState([]);
+  React.useEffect(() => {
+    return () => abortControllerRef.current?.abort();
+  }, []);
+  if (!fromToken || !toToken || !inputAmount || !initialRoute) return {
+    loading: false,
+    warnings: [],
+    errors: [],
+    confirmSwap: null
+  };
+  const confirmSwap = async () => {
+    if (proceedAnywayRef.current) {
+      const swapSettings = {
+        slippage: userSlippage.toString(),
+        disabledSwappersGroups: disabledLiquiditySources
+      };
+      if (errors.length > 0) setErrors([]);
+      if (warnings.length > 0) setWarnings([]);
+      proceedAnywayRef.current = false;
+      if (confiremedRouteRef.current) {
+        const newSwap = calculatePendingSwap(inputAmount.toString(), confiremedRouteRef.current, getWalletsForNewSwap(selectedWallets), swapSettings, false, meta);
+        return newSwap;
+      }
+      return;
+    }
+    abortControllerRef.current = new AbortController();
+    setLoading(true);
+    const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, accounts, selectedWallets, disabledLiquiditySources, userSlippage, true);
+    try {
+      const confiremedRoute = await httpService.getBestRoute(requestBody, {
+        signal: abortControllerRef.current?.signal
+      });
+      abortControllerRef.current = null;
+      setLoading(false);
+      if (!confiremedRoute.result || !new BigNumber__default(confiremedRoute.requestAmount).isEqualTo(new BigNumber__default(inputAmount || '-1'))) {
+        setErrors(prevState => prevState.concat({
+          type: ConfirmSwapErrorTypes.NO_ROUTE
+        }));
+        return;
+      }
+      const confirmSwapState = {
+        errors: [],
+        warnings: []
+      };
+      const routeChanged = isRouteChanged(initialRoute, confiremedRoute);
+      if (routeChanged) {
+        setBestRoute(confiremedRoute);
+        const newRouteOutputUsdValue = new BigNumber__default(confiremedRoute.result?.outputAmount || '0').multipliedBy(toToken.usdPrice || 0);
+        const outputRatio = getOutputRatio(inputUsdValue, newRouteOutputUsdValue);
+        const highValueLoss = outputRatioHasWarning(inputUsdValue, outputRatio);
+        if (highValueLoss) confirmSwapState.errors.push({
+          type: ConfirmSwapErrorTypes.ROUTE_UPDATED_WITH_HIGH_VALUE_LOSS
+        });else if (isOutputAmountChangedALot(initialRoute, confiremedRoute)) confirmSwapState.warnings.push({
+          type: ConfirmSwapWarningTypes.ROUTE_AND_OUTPUT_AMOUNT_UPDATED,
+          newOutputAmount: numberToString(getRouteOutputAmount(confiremedRoute)),
+          percentageChange: numberToString(getPercentageChange(getRouteOutputAmount(initialRoute), getRouteOutputAmount(confiremedRoute)), null, 2)
+        });else if (isRouteInternalCoinsUpdated(initialRoute, confiremedRoute)) confirmSwapState.warnings.push({
+          type: ConfirmSwapWarningTypes.ROUTE_COINS_UPDATED
+        });else if (isNumberOfSwapsChanged(initialRoute, confiremedRoute)) confirmSwapState.warnings.push({
+          type: ConfirmSwapWarningTypes.ROUTE_UPDATED
+        });else if (isRouteSwappersUpdated(initialRoute, confiremedRoute)) confirmSwapState.warnings.push({
+          type: ConfirmSwapWarningTypes.ROUTE_SWAPPERS_UPDATED
+        });
+      }
+      const balanceWarnings = getBalanceWarnings(confiremedRoute, selectedWallets);
+      const enoughBalance = balanceWarnings.length === 0;
+      if (!enoughBalance) confirmSwapState.warnings.push({
+        type: ConfirmSwapWarningTypes.INSUFFICIENT_BALANCE,
+        messages: balanceWarnings
+      });
+      const minRequiredSlippage = getMinRequiredSlippage(initialRoute);
+      if (!hasProperSlippage(userSlippage.toString(), minRequiredSlippage)) confirmSwapState.errors.push({
+        type: ConfirmSwapErrorTypes.INSUFFICIENT_SLIPPAGE,
+        minRequiredSlippage
+      });
+      const noErrors = confirmSwapState.errors.length === 0;
+      const noWarnings = confirmSwapState.warnings.length === 0;
+      if ((noErrors || !noErrors && proceedAnywayRef.current) && (noWarnings || !noWarnings && proceedAnywayRef.current)) {
+        const swapSettings = {
+          slippage: userSlippage.toString(),
+          disabledSwappersGroups: disabledLiquiditySources
+        };
+        const newSwap = calculatePendingSwap(inputAmount.toString(), confiremedRoute, getWalletsForNewSwap(selectedWallets), swapSettings, false, meta);
+        return newSwap;
+      } else if (!proceedAnywayRef.current) {
+        proceedAnywayRef.current = true;
+        setErrors(confirmSwapState.errors);
+        setWarnings(confirmSwapState.warnings);
+        confiremedRouteRef.current = confiremedRoute;
+      }
+      return;
+    } catch (error) {
+      if (error?.code === 'ERR_CANCELED') {
+        return;
+      }
+      const status = error?.response?.status;
+      setLoading(false);
+      setErrors([{
+        type: ConfirmSwapErrorTypes.REQUEST_FAILED,
+        status
+      }]);
+      return;
+    }
+  };
+  return {
+    loading,
+    warnings,
+    errors,
+    confirmSwap
+  };
+}
+
 function ConfirmSwapPage() {
   const setSelectedSwap = useUiStore.use.setSelectedSwap();
   const {
@@ -1849,15 +1959,23 @@ function ConfirmSwapPage() {
   } = queueManagerReact.useManager();
   const navigate = reactRouterDom.useNavigate();
   const bestRoute = useBestRouteStore.use.bestRoute();
-  const loading = useConfirmSwapStore.use.loading();
-  const warnings = useConfirmSwapStore.use.warnings();
-  const errors = useConfirmSwapStore.use.errors();
+  const fetchingBestRoute = useBestRouteStore.use.loading();
+  const {
+    tokens
+  } = useMetaStore.use.meta();
   const slippage = useSettingsStore.use.slippage();
   const customSlippage = useSettingsStore.use.customSlippage();
   const selectedSlippage = customSlippage || slippage;
+  const {
+    loading,
+    errors,
+    warnings,
+    confirmSwap
+  } = useConfirmSwap();
+  const showHighSlippageWarning = !errors.find(error => error.type === ConfirmSwapErrorTypes.INSUFFICIENT_SLIPPAGE);
   return React__default.createElement(ui.ConfirmSwap, {
     onConfirm: () => {
-      confirmSwap().then(swap => {
+      confirmSwap?.().then(swap => {
         if (swap) {
           manager?.create('swap', {
             swapDetails: swap
@@ -1870,15 +1988,15 @@ function ConfirmSwapPage() {
       });
     },
     onBack: navigateBackFrom.bind(null, navigationRoutes.confirmSwap),
-    bestRoute: bestRoute,
+    bestRoute: getBestRouteWithCalculatedFees(bestRoute, tokens),
     loading: loading,
     errors: ConfirmSwapErrors(errors),
     warnings: ConfirmSwapWarnings(warnings),
-    extraMessages: React__default.createElement(ConfirmSwapExtraMessages, {
+    extraMessages: showHighSlippageWarning && React__default.createElement(ConfirmSwapExtraMessages, {
       selectedSlippage: selectedSlippage
     }),
     confirmButtonTitle: warnings.length > 0 || errors.length > 0 ? 'Proceed anyway!' : 'Confirm swap!',
-    confirmButtonDisabled: errors.length > 0
+    confirmButtonDisabled: fetchingBestRoute
   });
 }
 
@@ -1971,8 +2089,6 @@ function SelectChainPage(props) {
   const toChain = useBestRouteStore.use.toChain();
   const setFromChain = useBestRouteStore.use.setFromChain();
   const setToChain = useBestRouteStore.use.setToChain();
-  const setFromToken = useBestRouteStore.use.setFromToken();
-  const setToToken = useBestRouteStore.use.setToToken();
   const {
     navigateBackFrom
   } = useNavigateBack();
@@ -1982,9 +2098,7 @@ function SelectChainPage(props) {
     selected: type === 'from' ? fromChain : toChain,
     loadingStatus: loadingStatus,
     onChange: chain => {
-      if (type === 'from') setFromChain(chain);else setToChain(chain);
-      if (type === 'from' && fromChain?.name != chain.name) setFromToken(null);
-      if (type === 'to' && toChain?.name != chain.name) setToToken(null);
+      if (type === 'from') setFromChain(chain, true);else setToChain(chain, true);
       navigateBackFrom(navigationRoutes.fromChain);
     },
     onBack: navigateBackFrom.bind(null, navigationRoutes.fromChain)
@@ -1999,34 +2113,18 @@ function SelectTokenPage(props) {
     type,
     supportedTokens
   } = props;
-  const tokens = supportedTokens === 'all' ? useMetaStore.use.meta().tokens : supportedTokens;
-  const fromChain = useBestRouteStore.use.fromChain();
-  const toChain = useBestRouteStore.use.toChain();
+  const sourceTokens = useBestRouteStore.use.sourceTokens();
+  const destinationTokens = useBestRouteStore.use.destinationTokens();
+  const supportedSourceTokens = supportedTokens === 'all' ? sourceTokens : sourceTokens.filter(token => supportedTokens.some(supportedToken => tokensAreEqual(supportedToken, token)));
+  const supportedDestinationTokens = supportedTokens === 'all' ? destinationTokens : destinationTokens.filter(token => supportedTokens.some(supportedToken => tokensAreEqual(supportedToken, token)));
+  console.log(supportedSourceTokens);
   const fromToken = useBestRouteStore.use.fromToken();
   const toToken = useBestRouteStore.use.toToken();
   const setFromToken = useBestRouteStore.use.setFromToken();
   const setToToken = useBestRouteStore.use.setToToken();
-  const balance = useWalletsStore.use.balances();
-  const tokenWithSelectedChain = tokens.filter(token => {
-    if (type === 'from') return token.blockchain === fromChain?.name;
-    return token.blockchain === toChain?.name;
-  });
-  const TokensWithBalance = tokenWithSelectedChain.map(token => {
-    const tokenAmount = numberToString(new BigNumber__default(getBalanceFromWallet(balance, token.blockchain, token.symbol, token.address)?.amount || ZERO));
-    let tokenUsdValue = '';
-    if (token.usdPrice) tokenUsdValue = numberToString(new BigNumber__default(getBalanceFromWallet(balance, token.blockchain, token.symbol, token.address)?.amount || ZERO).multipliedBy(token.usdPrice));
-    return {
-      ...token,
-      balance: {
-        amount: tokenAmount !== '0' ? tokenAmount : '',
-        usdValue: tokenUsdValue !== '0' ? tokenUsdValue : ''
-      }
-    };
-  });
-  const sortedTokenList = sortedTokens(TokensWithBalance, type, balance);
   return React__default.createElement(ui.TokenSelector, {
     type: type === 'from' ? 'Source' : 'Destination',
-    list: sortedTokenList,
+    list: type == 'from' ? supportedSourceTokens : supportedDestinationTokens,
     selected: type === 'from' ? fromToken : toToken,
     onChange: token => {
       if (type === 'from') setFromToken(token);else setToToken(token);
@@ -2075,7 +2173,7 @@ function SettingsPage(_ref) {
     slippages: SLIPPAGES,
     selectedSlippage: slippage,
     onSlippageChange: slippage => setSlippage(slippage),
-    onLiquiditySourcesClick: navigate.bind(null, navigationRoutes.liquiditySources),
+    onLiquiditySourcesClick: () => navigate(navigationRoutes.liquiditySources),
     onBack: navigateBackFrom.bind(null, navigationRoutes.settings),
     liquiditySources: supportedUniqueSwappersGroups,
     selectedLiquiditySources: supportedUniqueSwappersGroups.filter(s => s.selected),
@@ -2116,6 +2214,8 @@ function WalletsPage(_ref) {
     connect
   } = walletsCore.useWallets();
   const wallets = getlistWallet(state, getWalletInfo, supportedWallets === 'all' ? Object.values(walletsShared.WalletType) : supportedWallets);
+  let sortedWallets = walletsShared.detectMobileScreens() ? wallets.filter(wallet => wallet.showOnMobile) : wallets;
+  sortedWallets = sortWalletsBasedOnState(sortedWallets);
   const [walletErrorMessage, setWalletErrorMessage] = React.useState('');
   const toggleConnectWalletsButton = useUiStore.use.toggleConnectWalletsButton();
   const {
@@ -2134,7 +2234,7 @@ function WalletsPage(_ref) {
         await connect(type);
       }
     } catch (e) {
-      setWalletErrorMessage('Error: ' + e.message);
+      setWalletErrorMessage('Error: ' + e?.message);
     }
   };
   React.useEffect(() => {
@@ -2142,15 +2242,15 @@ function WalletsPage(_ref) {
     return () => toggleConnectWalletsButton();
   }, []);
   return React__default.createElement(ui.SecondaryPage, {
-    title: t('Select Wallet'),
+    title: t('Select Wallet') || '',
     textField: false,
     onBack: navigateBackFrom.bind(null, navigationRoutes.wallets)
   }, React__default.createElement(React__default.Fragment, null, walletErrorMessage && React__default.createElement(AlertContainer, null, React__default.createElement(ui.Alert, {
     type: "error"
   }, React__default.createElement(ui.Typography, {
     variant: "body2"
-  }, walletErrorMessage))), React__default.createElement(ListContainer, null, wallets.map((info, index) => React__default.createElement(ui.Wallet, Object.assign({}, info, {
-    key: index,
+  }, walletErrorMessage))), React__default.createElement(ListContainer, null, sortedWallets.map((wallet, index) => React__default.createElement(ui.Wallet, Object.assign({}, wallet, {
+    key: `${index}-${wallet.type}`,
     onClick: onSelectWallet
   }))))));
 }
@@ -2248,59 +2348,50 @@ function SwapDetailsPage() {
   });
 }
 
-const AppRoutes = _ref => {
-  let {
-    fromChains = 'all',
-    toChains = 'all',
-    fromTokens = 'all',
-    toTokens = 'all',
-    liquiditySources = 'all',
-    wallets = 'all',
-    title,
-    multiWallets = true,
-    titleSize,
-    titleWeight
-  } = _ref;
+function AppRoutes(props) {
+  const {
+    configs
+  } = props;
   return reactRouterDom.useRoutes([{
     path: navigationRoutes.home,
     element: React__default.createElement(Home, {
-      title: title,
-      titleSize: titleSize,
-      titleWeight: titleWeight
+      title: configs?.title,
+      titleSize: configs?.titleSize,
+      titleWeight: configs?.titleWeight
     })
   }, {
     path: navigationRoutes.fromChain,
     element: React__default.createElement(SelectChainPage, {
       type: "from",
-      supportedChains: fromChains
+      supportedChains: configs?.fromChains || 'all'
     })
   }, {
     path: navigationRoutes.toChain,
     element: React__default.createElement(SelectChainPage, {
       type: "to",
-      supportedChains: toChains
+      supportedChains: configs?.toChains || 'all'
     })
   }, {
     path: navigationRoutes.fromToken + '/*',
     element: React__default.createElement(SelectTokenPage, {
       type: "from",
-      supportedTokens: fromTokens
+      supportedTokens: configs?.fromTokens || 'all'
     })
   }, {
     path: navigationRoutes.toToken,
     element: React__default.createElement(SelectTokenPage, {
       type: "to",
-      supportedTokens: toTokens
+      supportedTokens: configs?.toTokens || 'all'
     })
   }, {
     path: navigationRoutes.settings,
     element: React__default.createElement(SettingsPage, {
-      supportedSwappers: liquiditySources
+      supportedSwappers: configs?.liquiditySources || 'all'
     })
   }, {
     path: navigationRoutes.liquiditySources,
     element: React__default.createElement(LiquiditySourcePage, {
-      supportedSwappers: liquiditySources
+      supportedSwappers: configs?.liquiditySources || 'all'
     })
   }, {
     path: navigationRoutes.swaps,
@@ -2311,8 +2402,8 @@ const AppRoutes = _ref => {
   }, {
     path: navigationRoutes.wallets,
     element: React__default.createElement(WalletsPage, {
-      supportedWallets: wallets,
-      multiWallets: multiWallets
+      supportedWallets: configs?.wallets || 'all',
+      multiWallets: typeof configs?.multiWallets === 'undefined' ? true : configs.multiWallets
     })
   }, {
     path: navigationRoutes.confirmSwap,
@@ -2321,7 +2412,7 @@ const AppRoutes = _ref => {
     path: navigationRoutes.confirmWallets,
     element: React__default.createElement(ConfirmWalletsPage, null)
   }]);
-};
+}
 
 const Header$1 = /*#__PURE__*/ui.styled('div', {
   display: 'flex',
@@ -2349,13 +2440,6 @@ function Layout(_ref) {
     getWalletInfo
   } = walletsCore.useWallets();
   const connectedWalletsImages = removeDuplicateFrom(getSelectableWallets(accounts, selectedWallets, getWalletInfo).map(w => w.image));
-  const {
-    fromChain,
-    toChain,
-    toToken,
-    fromToken,
-    fromAmount
-  } = configs;
   const setFromChain = useBestRouteStore.use.setFromChain();
   const setFromToken = useBestRouteStore.use.setFromToken();
   const setToChain = useBestRouteStore.use.setToChain();
@@ -2367,16 +2451,16 @@ function Layout(_ref) {
     t
   } = reactI18next.useTranslation();
   React.useEffect(() => {
-    setToChain(toChain);
-    setToToken(toToken);
-  }, [toChain, toToken]);
+    setToChain(configs?.toChain || null);
+    setToToken(configs?.toToken || null);
+  }, [configs?.toChain, configs?.toToken]);
   React.useEffect(() => {
-    setInputAmount(fromAmount.toString());
-  }, [fromAmount]);
+    setInputAmount(configs?.fromAmount?.toString() || '');
+  }, [configs?.fromAmount]);
   React.useEffect(() => {
-    setFromToken(fromToken);
-    setFromChain(fromChain);
-  }, [fromToken, fromChain]);
+    setFromToken(configs?.fromToken || null);
+    setFromChain(configs?.fromChain || null);
+  }, [configs?.fromToken, configs?.fromChain]);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(Header$1, null, React__default.createElement(ui.Button, {
     size: "small",
     suffix: React__default.createElement(ui.AddWalletIcon, {
@@ -2392,7 +2476,9 @@ function Layout(_ref) {
     src: walletImage
   })) : React__default.createElement(React__default.Fragment, null), React__default.createElement(ui.Typography, {
     variant: "body2"
-  }, !accounts?.length ? t('Connect Wallet') : `$${totalBalance || 0}`))), React__default.createElement(AppRoutes, Object.assign({}, configs)));
+  }, !accounts?.length ? t('Connect Wallet') : `$${totalBalance || 0}`))), React__default.createElement(AppRoutes, {
+    configs: configs
+  }));
 }
 
 const globalStyles = /*#__PURE__*/ui.globalCss({
@@ -2667,7 +2753,10 @@ function QueueManager(props) {
       console.log('[notifier]', message);
     }
   };
-  return React__default.createElement(queueManagerReact.Provider, {
+  return React__default.createElement(queueManagerReact.Provider
+  //@ts-ignore
+  , {
+    //@ts-ignore
     queuesDefs: [queueManagerRangoPreset.swapQueueDef],
     context: context,
     onPersistedDataLoaded: _manager => {},