@rango-dev/widget-embedded 0.1.16-next.0 → 0.1.16-next.10

package/dist/widget-embedded.cjs.development.js

@@ -37,24 +37,6 @@ function removeDuplicateFrom(array) {
 function areEqual(array1, array2) {
   return array1.length === array2.length && array1.every((v, i) => v === array2[i]);
 }
-function shadeColor(color, percent) {
-  var R = parseInt(color.substring(1, 3), 16);
-  var G = parseInt(color.substring(3, 5), 16);
-  var B = parseInt(color.substring(5, 7), 16);
-  R = R * (100 + percent) / 100;
-  G = G * (100 + percent) / 100;
-  B = B * (100 + percent) / 100;
-  R = R < 255 ? R : 255;
-  G = G < 255 ? G : 255;
-  B = B < 255 ? B : 255;
-  R = Math.round(R);
-  G = Math.round(G);
-  B = Math.round(B);
-  var RR = R.toString(16).length == 1 ? '0' + R.toString(16) : R.toString(16);
-  var GG = G.toString(16).length == 1 ? '0' + G.toString(16) : G.toString(16);
-  var BB = B.toString(16).length == 1 ? '0' + B.toString(16) : B.toString(16);
-  return '#' + RR + GG + BB;
-}
 function debounce(fn, time) {
   let timeoutId;
   return wrapper;
@@ -318,8 +300,8 @@ function getStateWallet(state) {
       return ui.WalletState.DISCONNECTED;
   }
 }
+const excludedWallets = [walletsShared.WalletType.UNKNOWN, walletsShared.WalletType.LEAP];
 function getlistWallet(getState, getWalletInfo, list) {
-  const excludedWallets = [walletsShared.WalletType.UNKNOWN, walletsShared.WalletType.TERRA_STATION, walletsShared.WalletType.LEAP];
   return list.filter(wallet => !excludedWallets.includes(wallet)).map(type => {
     const {
       name,
@@ -402,27 +384,27 @@ function getRequiredChains(route) {
   });
   return wallets;
 }
-function getSelectableWallets(accounts, selectedWallets, getWalletInfo) {
-  const connectedWallets = accounts.map(account => ({
-    address: account.address,
-    walletType: account.walletType,
-    chain: account.chain,
-    image: getWalletInfo(account.walletType).img,
-    name: getWalletInfo(account.walletType).name,
-    selected: !!selectedWallets.find(wallet => wallet.chain === account.chain && wallet.walletType === account.walletType)
+function getSelectableWallets(connectedWallets, selectedWallets, getWalletInfo) {
+  const selectableWallets = connectedWallets.map(connectedWallet => ({
+    address: connectedWallet.address,
+    walletType: connectedWallet.walletType,
+    chain: connectedWallet.chain,
+    image: getWalletInfo(connectedWallet.walletType).img,
+    name: getWalletInfo(connectedWallet.walletType).name,
+    selected: !!selectedWallets.find(selectedWallet => selectedWallet.chain === connectedWallet.chain && selectedWallet.walletType === connectedWallet.walletType)
   }));
-  return connectedWallets;
+  return selectableWallets;
 }
-function getBalanceFromWallet(balances, chain, symbol, address) {
-  if (balances.length === 0) return null;
-  const selectedChainBalances = balances.filter(balance => balance.chain === chain);
-  if (selectedChainBalances.length === 0) return null;
-  return selectedChainBalances.map(a => a.balances?.find(bl => address !== null && bl.address === address || address === null && bl.address === address && bl.symbol === symbol) || null).filter(b => b !== null).sort((a, b) => parseFloat(b?.amount || '0') - parseFloat(a?.amount || '1')).find(() => true) || null;
+function getBalanceFromWallet(connectedWallets, chain, symbol, address) {
+  if (connectedWallets.length === 0) return null;
+  const selectedChainWallets = connectedWallets.filter(wallet => wallet.chain === chain);
+  if (selectedChainWallets.length === 0) return null;
+  return selectedChainWallets.map(wallet => wallet.balances?.find(balance => address !== null && balance.address === address || address === null && balance.address === address && balance.symbol === symbol) || null).filter(balance => balance !== null).sort((a, b) => parseFloat(b?.amount || '0') - parseFloat(a?.amount || '1')).find(() => true) || null;
 }
-function isAccountAndBalanceMatched(account, balance) {
-  return account.address === balance.address && account.chain === balance.chain && account.walletType === balance.walletType;
+function isAccountAndWalletMatched(account, connectedWallet) {
+  return account.address === connectedWallet.address && account.chain === connectedWallet.chain && account.walletType === connectedWallet.walletType;
 }
-function makeBalanceFor(account, retrivedBalance, tokens) {
+function makeBalanceFor(wallet, retrivedBalance, tokens) {
   const {
     address,
     blockChain: chain,
@@ -435,7 +417,7 @@ function makeBalanceFor(account, retrivedBalance, tokens) {
     loading: false,
     error: false,
     explorerUrl,
-    walletType: account.walletType,
+    walletType: wallet.walletType,
     balances: balances?.map(tokenBalance => ({
       chain,
       symbol: tokenBalance.asset.symbol,
@@ -449,16 +431,16 @@ function makeBalanceFor(account, retrivedBalance, tokens) {
     })) || []
   };
 }
-function resetBalanceState(balance) {
+function resetConnectedWalletState(connectedWallet) {
   return {
-    ...balance,
+    ...connectedWallet,
     loading: false,
     error: true
   };
 }
-const calculateWalletUsdValue = balance => {
+const calculateWalletUsdValue = connectedWallet => {
   const uniqueAccountAddresses = new Set();
-  const uniqueBalane = balance?.reduce((acc, current) => {
+  const uniqueBalane = connectedWallet?.reduce((acc, current) => {
     return acc.findIndex(i => i.address === current.address && i.chain === current.chain) === -1 ? [...acc, current] : acc;
   }, []);
   const modifiedWalletBlockchains = uniqueBalane?.map(chain => {
@@ -504,15 +486,15 @@ 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) {
+function getTokensWithBalance(tokens, connectedWallets) {
   return tokens.map(_ref2 => {
     let {
       balance,
       ...otherProps
     } = _ref2;
-    const tokenAmount = numberToString(new BigNumber__default(getBalanceFromWallet(balances, otherProps.blockchain, otherProps.symbol, otherProps.address)?.amount || ZERO));
+    const tokenAmount = numberToString(new BigNumber__default(getBalanceFromWallet(connectedWallets, 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));
+    if (otherProps.usdPrice) tokenUsdValue = numberToString(new BigNumber__default(getBalanceFromWallet(connectedWallets, otherProps.blockchain, otherProps.symbol, otherProps.address)?.amount || ZERO).multipliedBy(otherProps.usdPrice));
     return {
       ...otherProps,
       ...(tokenAmount !== '0' && {
@@ -524,11 +506,11 @@ function getTokensWithBalance(tokens, balances) {
     };
   });
 }
-function getSortedTokens(chain, tokens, balances, otherChainTokens) {
+function getSortedTokens(chain, tokens, connectedWallets, 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));
+  return sortTokens(getTokensWithBalance(filteredTokens, connectedWallets));
 }
 function tokensAreEqual(tokenA, tokenB) {
   return tokenA?.blockchain === tokenB?.blockchain && tokenA?.symbol === tokenB?.symbol && tokenA?.address === tokenB?.address;
@@ -609,12 +591,12 @@ function LimitErrorMessage(bestRoute) {
     recommendation
   };
 }
-function getSwapButtonState(loadingMetaStatus, accounts, loading, bestRoute, hasLimitError, highValueLoss, priceImpactCanNotBeComputed, needsToWarnEthOnPath, inputAmount) {
+function getSwapButtonState(loadingMetaStatus, connectedWallets, loading, bestRoute, hasLimitError, highValueLoss, priceImpactCanNotBeComputed, needsToWarnEthOnPath, inputAmount) {
   if (loadingMetaStatus !== 'success') return {
     title: 'Connect Wallet',
     disabled: true
   };
-  if (accounts.length == 0) return {
+  if (connectedWallets.length == 0) return {
     title: 'Connect Wallet',
     disabled: false
   };
@@ -826,14 +808,12 @@ function shouldRetrySwap(pendingSwap) {
 }
 
 const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()( /*#__PURE__*/middleware.subscribeWithSelector((set, get) => ({
-  accounts: [],
-  balances: [],
+  connectedWallets: [],
   selectedWallets: [],
   connectWallet: accounts => {
     const getOneOfWalletsDetails = get().getOneOfWalletsDetails;
     set(state => ({
-      accounts: state.accounts.concat(accounts),
-      balances: state.balances.concat(accounts.map(account => ({
+      connectedWallets: state.connectedWallets.concat(accounts.map(account => ({
         balances: [],
         address: account.address,
         chain: account.chain,
@@ -847,14 +827,13 @@ const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.creat
   },
   disconnectWallet: walletType => {
     set(state => ({
-      accounts: state.accounts.filter(account => account.walletType !== walletType),
-      balances: state.balances.filter(balance => balance.walletType !== walletType),
+      connectedWallets: state.connectedWallets.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 connectedWallets = state.connectedWallets;
     const selectedWallets = [];
     requiredChains.forEach(chain => {
       const anyWalletSelected = !!state.selectedWallets.find(wallet => wallet.chain === chain);
@@ -879,14 +858,13 @@ const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.creat
     })
   })),
   clearConnectedWallet: () => set(() => ({
-    accounts: [],
-    balances: [],
+    connectedWallets: [],
     selectedWallets: []
   })),
   getOneOfWalletsDetails: async account => {
     const tokens = useMetaStore.getState().meta.tokens;
     set(state => ({
-      balances: state.balances.map(balance => {
+      connectedWallets: state.connectedWallets.map(balance => {
         return balance.address === account.address && balance.chain === account.chain ? {
           ...balance,
           loading: true
@@ -901,28 +879,28 @@ const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.creat
       const retrivedBalance = response.wallets[0];
       if (retrivedBalance) {
         set(state => ({
-          balances: state.balances.map(balance => {
-            return isAccountAndBalanceMatched(account, balance) ? makeBalanceFor(account, retrivedBalance, tokens) : balance;
+          connectedWallets: state.connectedWallets.map(connectedWallet => {
+            return isAccountAndWalletMatched(account, connectedWallet) ? makeBalanceFor(account, retrivedBalance, tokens) : connectedWallet;
           })
         }));
       } else throw new Error('Wallet not found');
     } catch (error) {
       set(state => ({
-        balances: state.balances.map(balance => {
-          return isAccountAndBalanceMatched(account, balance) ? resetBalanceState(balance) : balance;
+        connectedWallets: state.connectedWallets.map(balance => {
+          return isAccountAndWalletMatched(account, balance) ? resetConnectedWalletState(balance) : balance;
         })
       }));
     }
   }
 }))));
-useWalletsStore.subscribe(state => state.balances, balances => {
+useWalletsStore.subscribe(state => state.connectedWallets, connectedWallets => {
   useBestRouteStore.setState(_ref => {
     let {
       sourceTokens,
       destinationTokens
     } = _ref;
-    const sourceTokensWithBalance = getTokensWithBalance(sourceTokens, balances);
-    const destinationTokensWithBalance = getTokensWithBalance(destinationTokens, balances);
+    const sourceTokensWithBalance = getTokensWithBalance(sourceTokens, connectedWallets);
+    const destinationTokensWithBalance = getTokensWithBalance(destinationTokens, connectedWallets);
     return {
       sourceTokens: sortTokens(sourceTokensWithBalance),
       destinationTokens: sortTokens(destinationTokensWithBalance)
@@ -931,7 +909,7 @@ useWalletsStore.subscribe(state => state.balances, balances => {
 }, {
   equalityFn: shallow.shallow
 });
-const fetchingBalanceSelector = state => !!state.balances.find(wallet => wallet.loading);
+const fetchingBalanceSelector = state => !!state.connectedWallets.find(wallet => wallet.loading);
 
 const getUsdValue = (token, amount) => new BigNumber__default(amount || ZERO).multipliedBy(token?.usdPrice || 0);
 const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.create()( /*#__PURE__*/middleware.subscribeWithSelector(set => ({
@@ -975,8 +953,8 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.cre
     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 connectedWallets = useWalletsStore.getState().connectedWallets;
+      const sortedTokens = getSortedTokens(chain, tokens, connectedWallets, state.destinationTokens);
       const fromToken = getDefaultToken(sortedTokens, state.toToken);
       return {
         fromChain: chain,
@@ -1000,8 +978,8 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.cre
     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);
+      const connectedWallets = useWalletsStore.getState().connectedWallets;
+      const sortedTokens = getSortedTokens(chain, tokens, connectedWallets, state.destinationTokens);
       return {
         toChain: chain,
         destinationTokens: sortedTokens,
@@ -1033,7 +1011,7 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.cre
       tokens,
       blockchains
     } = useMetaStore.getState().meta;
-    const balances = useWalletsStore.getState().balances;
+    const connectedWallets = useWalletsStore.getState().connectedWallets;
     const failedIndex = pendingSwap.status === 'failed' ? pendingSwap.steps.findIndex(s => s.status === 'failed') : null;
     if (failedIndex === null || failedIndex < 0) return;
     const firstStep = pendingSwap.steps[0];
@@ -1050,8 +1028,8 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.cre
       symbol: lastStep.toSymbol,
       address: lastStep.toSymbolAddress
     }));
-    const sortedSourceTokens = getSortedTokens(fromChain, tokens, balances, []);
-    const sortedDestinationTokens = getSortedTokens(toChain, tokens, balances, []);
+    const sortedSourceTokens = getSortedTokens(fromChain, tokens, connectedWallets, []);
+    const sortedDestinationTokens = getSortedTokens(toChain, tokens, connectedWallets, []);
     const inputAmount = pendingSwap.inputAmount;
     set({
       fromChain,
@@ -1371,10 +1349,10 @@ const Container = /*#__PURE__*/ui.styled('div', {
   variants: {
     type: {
       filled: {
-        backgroundColor: '$neutrals300'
+        backgroundColor: '$neutral100'
       },
       outlined: {
-        border: '1px solid $neutrals300'
+        border: '1px solid $neutral100'
       }
     }
   },
@@ -1410,14 +1388,14 @@ const Container = /*#__PURE__*/ui.styled('div', {
 const ImagePlaceholder = /*#__PURE__*/ui.styled('span', {
   width: '24px',
   height: '24px',
-  backgroundColor: '$neutrals300',
+  backgroundColor: '$neutral100',
   borderRadius: '99999px'
 });
 const OutputContainer = /*#__PURE__*/ui.styled('div', {
   windth: '100%',
   height: '$48',
   borderRadius: '$5',
-  backgroundColor: '$background',
+  backgroundColor: '$surface',
   border: '1px solid transparent',
   position: 'relative',
   display: 'flex',
@@ -1451,10 +1429,10 @@ function TokenPreview(props) {
     className: "head"
   }, React__default.createElement(ui.Typography, {
     variant: "body2",
-    color: "neutrals800"
+    color: "neutral800"
   }, props.label), React__default.createElement("div", null, percentageChange, props.usdValue && React__default.createElement(ui.Typography, {
     variant: "caption",
-    color: "neutrals600",
+    color: "neutral600",
     className: "usd-value"
   }, `$${numberToString(props.usdValue)}`))), React__default.createElement("div", {
     className: "form"
@@ -1497,8 +1475,8 @@ const Container$1 = /*#__PURE__*/ui.styled('div', {
   justifyContent: 'space-between',
   padding: '$8',
   borderRadius: '$5',
-  backgroundColor: '$neutrals300',
-  color: '$neutrals800',
+  backgroundColor: '$neutral100',
+  color: '$neutral800',
   fontSize: '$12',
   '.routes': {
     display: 'flex',
@@ -1558,7 +1536,7 @@ function useConfirmSwap() {
   const setBestRoute = useBestRouteStore.use.setBestRoute();
   const inputUsdValue = useBestRouteStore.use.inputUsdValue();
   const affiliateRef = useSettingsStore.use.affiliateRef();
-  const accounts = useWalletsStore.use.accounts();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
   const selectedWallets = useWalletsStore.use.selectedWallets();
   const meta = useMetaStore.use.meta();
   const customSlippage = useSettingsStore.use.customSlippage();
@@ -1597,7 +1575,7 @@ function useConfirmSwap() {
     }
     abortControllerRef.current = new AbortController();
     setLoading(true);
-    const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, accounts, selectedWallets, disabledLiquiditySources, userSlippage, affiliateRef, initialRoute);
+    const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, connectedWallets, selectedWallets, disabledLiquiditySources, userSlippage, affiliateRef, initialRoute);
     try {
       const confiremedRoute = await httpService().getBestRoute(requestBody, {
         signal: abortControllerRef.current?.signal
@@ -1841,7 +1819,7 @@ function ConfirmSwapPage() {
     tokens
   } = useMetaStore.use.meta();
   const loadingMetaStatus = useMetaStore.use.loadingStatus();
-  const accounts = useWalletsStore.use.accounts();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
   const selectedWallets = useWalletsStore.use.selectedWallets();
   const initSelectedWallets = useWalletsStore.use.initSelectedWallets();
   const setSelectedWallet = useWalletsStore.use.setSelectedWallet();
@@ -1850,6 +1828,7 @@ function ConfirmSwapPage() {
   const inputUsdValue = useBestRouteStore.use.inputUsdValue();
   const outputUsdValue = useBestRouteStore.use.outputUsdValue();
   const setInputAmount = useBestRouteStore.use.setInputAmount();
+  const [dbErrorMessage, setDbErrorMessage] = React.useState('');
   const bestRouteloadingStatus = getBestRouteStatus(fetchingBestRoute, !!fetchingBestRouteError);
   const {
     manager
@@ -1874,7 +1853,7 @@ function ConfirmSwapPage() {
   React.useEffect(() => {
     initSelectedWallets();
   }, []);
-  const selectableWallets = getSelectableWallets(accounts, selectedWallets, getWalletInfo);
+  const selectableWallets = getSelectableWallets(connectedWallets, selectedWallets, getWalletInfo);
   const handleConnectChain = wallet => {
     const network = wallet;
     getKeplrCompatibleConnectedWallets(selectableWallets).forEach(compatibleWallet => connect?.(compatibleWallet, network));
@@ -1884,21 +1863,25 @@ function ConfirmSwapPage() {
     requiredWallets: getRequiredChains(bestRoute),
     selectableWallets: selectableWallets,
     onBack: navigateBackFrom.bind(null, navigationRoutes.confirmSwap),
-    onConfirm: () => {
-      confirmSwap?.().then(swap => {
+    onConfirm: async () => {
+      confirmSwap?.().then(async swap => {
         if (swap) {
-          manager?.create('swap', {
-            swapDetails: swap
-          }, {
-            id: swap.requestId
-          });
-          setSelectedSwap(swap.requestId);
-          navigate('/' + navigationRoutes.swaps + `/${swap.requestId}`, {
-            replace: true
-          });
-          setTimeout(() => {
-            setInputAmount('');
-          }, 0);
+          try {
+            await manager?.create('swap', {
+              swapDetails: swap
+            }, {
+              id: swap.requestId
+            });
+            setSelectedSwap(swap.requestId);
+            navigate('/' + navigationRoutes.swaps + `/${swap.requestId}`, {
+              replace: true
+            });
+            setTimeout(() => {
+              setInputAmount('');
+            }, 0);
+          } catch (e) {
+            setDbErrorMessage('Error: ' + e?.message);
+          }
         }
       });
     },
@@ -1945,7 +1928,7 @@ function ConfirmSwapPage() {
       totalFee: numberToString(totalFeeInUsd, 0, 2)
     }),
     loading: fetchingConfirmedRoute,
-    errors: ConfirmSwapErrors(errors),
+    errors: dbErrorMessage ? [dbErrorMessage, ...ConfirmSwapErrors(errors)] : ConfirmSwapErrors(errors),
     warnings: ConfirmSwapWarnings(warnings),
     extraMessages: React__default.createElement(React__default.Fragment, null, loadingMetaStatus === 'failed' && React__default.createElement(ui.LoadingFailedAlert, null), loadingMetaStatus === 'failed' && showHighSlippageWarning && React__default.createElement(ui.Spacer, {
       direction: "vertical"
@@ -2039,10 +2022,11 @@ const Container$2 = /*#__PURE__*/ui.styled('div', {
   variants: {
     type: {
       filled: {
-        backgroundColor: '$neutrals300'
+        backgroundColor: '$neutral100'
       },
       outlined: {
-        border: '1px solid $neutrals300'
+        border: '1px solid $neutral100',
+        backgroundColor: '$surface'
       }
     }
   },
@@ -2090,14 +2074,14 @@ const Options = /*#__PURE__*/ui.styled('div', {
 const ImagePlaceholder$1 = /*#__PURE__*/ui.styled('span', {
   width: '24px',
   height: '24px',
-  backgroundColor: '$neutrals300',
+  backgroundColor: '$neutral100',
   borderRadius: '99999px'
 });
 const OutputContainer$1 = /*#__PURE__*/ui.styled('div', {
   windth: '100%',
   height: '$48',
   borderRadius: '$5',
-  backgroundColor: '$background',
+  backgroundColor: '$surface',
   border: '1px solid transparent',
   position: 'relative',
   display: 'flex',
@@ -2119,14 +2103,14 @@ function TokenInfo(props) {
   const setInputAmount = useBestRouteStore.use.setInputAmount();
   const bestRoute = useBestRouteStore.use.bestRoute();
   const inputAmount = useBestRouteStore.use.inputAmount();
-  const balances = useWalletsStore.use.balances();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
   const fetchingBestRoute = useBestRouteStore.use.loading();
   const navigate = reactRouterDom.useNavigate();
   const {
     t
   } = reactI18next.useTranslation();
-  const tokenBalance = !!fromChain && !!fromToken ? numberToString(getBalanceFromWallet(balances, fromChain?.name, fromToken?.symbol, fromToken?.address)?.amount || '0', 8) : '0';
-  const tokenBalanceReal = !!fromChain && !!fromToken ? numberToString(getBalanceFromWallet(balances, fromChain?.name, fromToken?.symbol, fromToken?.address)?.amount || '0', getBalanceFromWallet(balances, fromChain?.name, fromToken?.symbol, fromToken?.address)?.decimal) : '0';
+  const tokenBalance = !!fromChain && !!fromToken ? numberToString(getBalanceFromWallet(connectedWallets, fromChain?.name, fromToken?.symbol, fromToken?.address)?.amount || '0', 8) : '0';
+  const tokenBalanceReal = !!fromChain && !!fromToken ? numberToString(getBalanceFromWallet(connectedWallets, fromChain?.name, fromToken?.symbol, fromToken?.address)?.amount || '0', getBalanceFromWallet(connectedWallets, fromChain?.name, fromToken?.symbol, fromToken?.address)?.decimal) : '0';
   const ItemSuffix = React__default.createElement("div", {
     style: {
       display: 'flex',
@@ -2143,7 +2127,7 @@ function TokenInfo(props) {
     className: "head"
   }, React__default.createElement(ui.Typography, {
     variant: "body2",
-    color: "neutrals800"
+    color: "neutral800"
   }, t(type)), props.type === 'From' ? React__default.createElement(Options, null, React__default.createElement("div", {
     className: "balance",
     onClick: () => {
@@ -2151,7 +2135,7 @@ function TokenInfo(props) {
     }
   }, React__default.createElement(ui.Typography, {
     variant: "body3",
-    color: "neutrals600"
+    color: "neutral600"
   }, `${t('Balance')}: ${tokenBalance} ${fromToken?.symbol || ''}`), React__default.createElement(ui.Spacer, {
     size: 4
   }), React__default.createElement(ui.Button, {
@@ -2165,7 +2149,7 @@ function TokenInfo(props) {
     outputUsdValue: props.outputUsdValue
   }), React__default.createElement("div", null, React__default.createElement(ui.Typography, {
     variant: "caption",
-    color: "neutrals600"
+    color: "neutral600"
   }, `$${numberToString(props.outputUsdValue)}`)))), React__default.createElement("div", {
     className: "form"
   }, React__default.createElement(ui.Button, {
@@ -2221,7 +2205,7 @@ function TokenInfo(props) {
       }
     }, React__default.createElement(ui.Typography, {
       variant: "caption",
-      color: "neutrals800"
+      color: "neutral800"
     }, `$${numberToString(inputUsdValue)}`)),
     value: props.inputAmount || '',
     min: 0,
@@ -2257,7 +2241,7 @@ function BottomLogo() {
   } = reactI18next.useTranslation();
   return React__default.createElement(Container$3, null, React__default.createElement(ui.Typography, {
     variant: "caption",
-    color: "$neutrals600"
+    color: "$neutral600"
   }, t('Powered By')), React__default.createElement(StyledAnchor, {
     href: "https://rango.exchange",
     target: "_blank"
@@ -2401,7 +2385,7 @@ function Home() {
   const fetchingBestRoute = useBestRouteStore.use.loading();
   const bestRouteError = useBestRouteStore.use.error();
   const loadingMetaStatus = useMetaStore.use.loadingStatus();
-  const accounts = useWalletsStore.use.accounts();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
   const setCurrentPage = useUiStore.use.setCurrentPage();
   const switchFromAndTo = useBestRouteStore.use.switchFromAndTo();
   const errorMessage = loadingMetaStatus === 'failed' ? errorMessages.genericServerError : bestRouteError;
@@ -2415,7 +2399,7 @@ function Home() {
     swap
   } = LimitErrorMessage(bestRoute);
   const priceImpactCanNotBeComputed = !canComputePriceImpact(bestRoute, inputAmount, inputUsdValue, outputUsdValue);
-  const swapButtonState = getSwapButtonState(loadingMetaStatus, accounts, fetchingBestRoute, bestRoute, hasLimitError(bestRoute), highValueLoss, priceImpactCanNotBeComputed, needsToWarnEthOnPath, inputAmount);
+  const swapButtonState = getSwapButtonState(loadingMetaStatus, connectedWallets, fetchingBestRoute, bestRoute, hasLimitError(bestRoute), highValueLoss, priceImpactCanNotBeComputed, needsToWarnEthOnPath, inputAmount);
   const totalFeeInUsd = getTotalFeeInUsd(bestRoute, tokens);
   const highFee = hasHighFee(totalFeeInUsd);
   React.useEffect(() => {
@@ -2575,7 +2559,8 @@ function SelectTokenPage(props) {
 
 function SettingsPage(_ref) {
   let {
-    supportedSwappers
+    supportedSwappers,
+    singleTheme
   } = _ref;
   const slippage = useSettingsStore.use.slippage();
   const setSlippage = useSettingsStore.use.setSlippage();
@@ -2617,6 +2602,7 @@ function SettingsPage(_ref) {
     onBack: navigateBackFrom.bind(null, navigationRoutes.settings),
     liquiditySources: supportedUniqueSwappersGroups,
     selectedLiquiditySources: supportedUniqueSwappersGroups.filter(s => s.selected),
+    singleTheme: singleTheme,
     customSlippage: customSlippage || NaN,
     onCustomSlippageChange: setCustomSlippage,
     minSlippage: MIN_SLIPPGAE,
@@ -2928,6 +2914,7 @@ function AppRoutes(props) {
   }, {
     path: navigationRoutes.settings,
     element: React__default.createElement(SettingsPage, {
+      singleTheme: config?.theme?.singleTheme,
       supportedSwappers: config?.liquiditySources
     })
   }, {
@@ -2974,14 +2961,13 @@ function Layout(_ref) {
   } = _ref;
   const navigate = reactRouterDom.useNavigate();
   const {
-    balances,
-    accounts,
+    connectedWallets,
     selectedWallets
   } = useWalletsStore();
   const {
     getWalletInfo
   } = walletsCore.useWallets();
-  const connectedWalletsImages = removeDuplicateFrom(getSelectableWallets(accounts, selectedWallets, getWalletInfo).map(w => w.image));
+  const connectedWalletsImages = removeDuplicateFrom(getSelectableWallets(connectedWallets, selectedWallets, getWalletInfo).map(w => w.image));
   const {
     blockchains,
     tokens
@@ -2992,7 +2978,7 @@ function Layout(_ref) {
   const setToToken = useBestRouteStore.use.setToToken();
   const setInputAmount = useBestRouteStore.use.setInputAmount();
   const setAffiliateRef = useSettingsStore.use.setAffiliateRef();
-  const totalBalance = calculateWalletUsdValue(balances);
+  const totalBalance = calculateWalletUsdValue(connectedWallets);
   const connectWalletsButtonDisabled = useUiStore.use.connectWalletsButtonDisabled();
   const loadingMetaStatus = useMetaStore.use.loadingStatus();
   const fetchingBalance = useWalletsStore(fetchingBalanceSelector);
@@ -3000,20 +2986,24 @@ function Layout(_ref) {
     t
   } = reactI18next.useTranslation();
   React.useEffect(() => {
-    const chain = blockchains.find(chain => chain.name === config?.to?.blockchain);
-    const token = tokens.find(t => tokensAreEqual(t, config?.to?.token || null));
-    setToChain(chain || null);
-    setToToken(token || null);
-  }, [config?.to?.token, config?.to?.blockchain]);
+    if (loadingMetaStatus === 'success') {
+      const chain = blockchains.find(chain => chain.name === config?.to?.blockchain);
+      const token = tokens.find(t => tokensAreEqual(t, config?.to?.token || null));
+      setToChain(chain || null);
+      setToToken(token || null);
+    }
+  }, [config?.to?.token, config?.to?.blockchain, loadingMetaStatus]);
   React.useEffect(() => {
     setInputAmount(config?.amount?.toString() || '');
   }, [config?.amount]);
   React.useEffect(() => {
-    const chain = blockchains.find(chain => chain.name === config?.from?.blockchain);
-    const token = tokens.find(t => tokensAreEqual(t, config?.from?.token || null));
-    setFromChain(chain || null);
-    setFromToken(token || null);
-  }, [config?.from?.token, config?.from?.blockchain]);
+    if (loadingMetaStatus === 'success') {
+      const chain = blockchains.find(chain => chain.name === config?.from?.blockchain);
+      const token = tokens.find(t => tokensAreEqual(t, config?.from?.token || null));
+      setFromChain(chain || null);
+      setFromToken(token || null);
+    }
+  }, [config?.from?.token, config?.from?.blockchain, loadingMetaStatus]);
   React.useEffect(() => {
     setAffiliateRef(config?.affiliateRef || null);
   }, [config?.affiliateRef]);
@@ -3038,7 +3028,7 @@ function Layout(_ref) {
     className: "balance"
   }, React__default.createElement(ui.Typography, {
     variant: "body2"
-  }, !accounts?.length ? t('Connect Wallet') : `$${totalBalance || 0}`), fetchingBalance && React__default.createElement(ui.Spinner, null)))), React__default.createElement(AppRoutes, {
+  }, !connectedWallets?.length ? t('Connect Wallet') : `$${totalBalance || 0}`), fetchingBalance && React__default.createElement(ui.Spinner, null)))), React__default.createElement(AppRoutes, {
     config: config
   }));
 }
@@ -3072,89 +3062,66 @@ function useTheme(_ref) {
   const theme = useSettingsStore.use.theme();
   const fetchMeta = useMetaStore.use.fetchMeta();
   const setTheme = useSettingsStore.use.setTheme();
-  const primary = themeColors?.primary || '#5FA425',
-    background = themeColors?.background || '#fff',
-    foreground = themeColors?.foreground || '#000',
-    error = themeColors?.error || '#FF0000',
-    warning = themeColors?.warning || '#F5A623',
-    success = themeColors?.success || '#0070F3';
-  const colors = {
-    neutrals200: '#FAFAFA',
-    neutrals300: '#f2f2f2',
-    neutrals400: '#dedede',
-    neutrals500: '#cccccc',
-    neutrals600: '#acacac',
-    neutrals700: '#444444',
-    neutrals800: '#333333',
-    neutrals900: '#111111',
-    primary,
-    primary100: shadeColor(primary, 15),
-    primary200: shadeColor(primary, -10),
-    primary300: shadeColor(primary, -15),
-    primary400: shadeColor(primary, -20),
-    primary500: shadeColor(primary, -25),
-    primary600: shadeColor(primary, -30),
-    primary700: shadeColor(primary, -35),
-    primary800: shadeColor(primary, -40),
-    primary900: shadeColor(primary, -45),
+  const light = themeColors?.light;
+  const dark = themeColors?.dark;
+  const neutral = light?.neutral || '#fafafa';
+  const background = light?.background || '#fff';
+  const foreground = light?.foreground || '#000';
+  const darkColors = {
+    ...ui.generateRangeColors('primary', 'dark', dark?.primary),
+    ...ui.generateRangeColors('error', 'dark', dark?.error),
+    ...ui.generateRangeColors('warning', 'dark', dark?.warning),
+    ...ui.generateRangeColors('success', 'dark', dark?.success),
+    ...ui.generateRangeColors('neutral', 'dark', dark?.neutral),
+    surface: dark?.surface,
+    background: dark?.background,
+    foreground: dark?.foreground
+  };
+  const lightColors = {
+    surface: light?.surface || '#fff',
+    ...ui.generateRangeColors('primary', 'light', light?.primary || '#5FA425'),
+    ...ui.generateRangeColors('error', 'light', light?.error || '#FF0000'),
+    ...ui.generateRangeColors('warning', 'light', light?.warning || '#F5A623'),
+    ...ui.generateRangeColors('success', 'light', light?.success || '#0070F3'),
+    ...ui.generateRangeColors('neutral', 'light', neutral),
     background,
-    foreground,
-    error,
-    error100: shadeColor(error, 50),
-    error300: shadeColor(error, -10),
-    error500: shadeColor(error, -20),
-    error700: shadeColor(error, -30),
-    warning,
-    warning100: shadeColor(warning, 50),
-    warning300: shadeColor(warning, -10),
-    warning500: shadeColor(warning, -20),
-    warning700: shadeColor(warning, -30),
-    success,
-    success100: shadeColor(success, 50),
-    success300: shadeColor(success, -10),
-    success500: shadeColor(success, -20),
-    success700: shadeColor(success, -30)
+    foreground
   };
   const customeLightTheme = ui.createTheme({
-    colors,
+    colors: lightColors,
     radii: {
       5: `${borderRadius}px`
     },
     shadows: {
-      s: '0px 3px 5px 3px #f0f2f5, 0px 6px 10px 3px #f0f2f5, 0px 1px 18px 3px #f0f2f5'
+      s: `0px 3px 5px 3px ${light?.neutral || '#f0f2f5'} ,0px 6px 10px 3px ${light?.neutral || '#f0f2f5'}, 0px 1px 18px 3px ${light?.neutral || '#f0f2f5'}`
     }
   });
   const customeDarkTheme = ui.createTheme({
     colors: {
-      ...colors,
-      neutrals200: '#111111',
-      neutrals300: '#333333',
-      neutrals400: '#444444',
-      neutrals500: '#acacac',
-      neutrals600: '#cccccc',
-      neutrals700: '#dedede',
-      neutrals800: '#f2f2f2',
-      neutrals900: '#FAFAFA',
+      ...lightColors,
+      ...ui.generateRangeColors('neutral', 'dark', '#111111'),
       foreground: background,
-      background: foreground
+      background: foreground,
+      surface: '#000',
+      ...JSON.parse(JSON.stringify(darkColors))
     },
     radii: {
       5: `${borderRadius}px`
     },
     shadows: {
-      s: '0px 3px 5px 3px #222, 0px 6px 10px 3px #222, 0px 1px 18px 3px #222'
+      s: `0px 3px 5px 3px ${dark?.neutral || '#222'}, 0px 6px 10px 3px ${dark?.neutral || '#222'}, 0px 1px 18px 3px ${dark?.neutral || '#222'}`
     }
   });
-  const [OSTheme, setOSTheme] = React.useState(customeLightTheme);
+  const [OSTheme, setOSTheme] = React.useState('light');
   React.useEffect(() => {
     (async () => {
       await fetchMeta();
     })();
     const switchTheme = event => {
-      if (event.matches) setOSTheme(customeDarkTheme);else setOSTheme(customeLightTheme);
+      if (event.matches) setOSTheme('dark');else setOSTheme('light');
     };
     if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-      setOSTheme(customeDarkTheme);
+      setOSTheme('dark');
     }
     window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', switchTheme);
     return () => {
@@ -3173,7 +3140,7 @@ function useTheme(_ref) {
     classList.add(`font_${fontFamily.replace(/ /g, '')}`);
   }, [fontFamily]);
   const getActiveTheme = () => {
-    if (theme === 'auto') return OSTheme;else return theme === 'dark' ? customeDarkTheme : customeLightTheme;
+    if (theme === 'auto') return OSTheme === 'dark' ? customeDarkTheme : customeLightTheme;else return theme === 'dark' ? customeDarkTheme : customeLightTheme;
   };
   return {
     activeTheme: getActiveTheme()
@@ -3274,13 +3241,12 @@ function QueueManager(props) {
     });
   }, []);
   const getOneOfWalletsDetails = useWalletsStore.use.getOneOfWalletsDetails();
-  const accounts = useWalletsStore.use.accounts();
   const {
     blockchains
   } = useMetaStore.use.meta();
-  const balances = useWalletsStore.use.balances();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
   const wallets = {
-    blockchains: balances.map(wallet => ({
+    blockchains: connectedWallets.map(wallet => ({
       accounts: [wallet],
       name: wallet.chain
     }))
@@ -3306,8 +3272,8 @@ function QueueManager(props) {
     const outputAmount = data.step?.outputAmount || '';
     const step = data.step || lastStep;
     if (data.eventType === 'task_completed' || data.eventType === 'step_completed_with_output' && lastStep?.id !== data.step?.id || !!outputAmount) {
-      const fromAccount = accounts.find(account => account.chain === step?.fromBlockchain);
-      const toAccount = step?.fromBlockchain !== step?.toBlockchain && accounts.find(account => account.chain === step?.toBlockchain);
+      const fromAccount = connectedWallets.find(account => account.chain === step?.fromBlockchain);
+      const toAccount = step?.fromBlockchain !== step?.toBlockchain && connectedWallets.find(wallet => wallet.chain === step?.toBlockchain);
       fromAccount && getOneOfWalletsDetails(fromAccount);
       toAccount && getOneOfWalletsDetails(toAccount);
     }
@@ -3329,10 +3295,7 @@ function QueueManager(props) {
     state,
     notifier
   };
-  return React__default.createElement(queueManagerReact.Provider
-  //@ts-ignore
-  , {
-    //@ts-ignore
+  return React__default.createElement(queueManagerReact.Provider, {
     queuesDefs: [swapQueueDef],
     context: context,
     onPersistedDataLoaded: manager => {
@@ -3410,6 +3373,7 @@ const Widget = _ref => {
     providers: providers,
     onUpdateState: onUpdateState
   }, React__default.createElement("div", {
+    id: "swap-container",
     className: activeTheme
   }, React__default.createElement(QueueManager, null, React__default.createElement(ui.SwapContainer, {
     fixedHeight: currentPage !== navigationRoutes.home