@rango-dev/widget-embedded 0.1.15 → 0.1.16-next.1

package/dist/widget-embedded.esm.js

@@ -394,27 +394,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,
@@ -427,7 +427,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,
@@ -441,16 +441,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 => {
@@ -496,15 +496,15 @@ const getKeplrCompatibleConnectedWallets = selectableWallets => {
   const connectedWalletTypes = new Set(selectableWallets.map(a => a.walletType.toString()));
   return 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(getBalanceFromWallet(balances, otherProps.blockchain, otherProps.symbol, otherProps.address)?.amount || ZERO));
+    const tokenAmount = numberToString(new BigNumber(getBalanceFromWallet(connectedWallets, otherProps.blockchain, otherProps.symbol, otherProps.address)?.amount || ZERO));
     let tokenUsdValue = '';
-    if (otherProps.usdPrice) tokenUsdValue = numberToString(new BigNumber(getBalanceFromWallet(balances, otherProps.blockchain, otherProps.symbol, otherProps.address)?.amount || ZERO).multipliedBy(otherProps.usdPrice));
+    if (otherProps.usdPrice) tokenUsdValue = numberToString(new BigNumber(getBalanceFromWallet(connectedWallets, otherProps.blockchain, otherProps.symbol, otherProps.address)?.amount || ZERO).multipliedBy(otherProps.usdPrice));
     return {
       ...otherProps,
       ...(tokenAmount !== '0' && {
@@ -516,11 +516,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;
@@ -601,12 +601,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
   };
@@ -818,14 +818,12 @@ function shouldRetrySwap(pendingSwap) {
 }
 
 const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /*#__PURE__*/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,
@@ -839,14 +837,13 @@ const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /*#
   },
   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);
@@ -871,14 +868,13 @@ const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /*#
     })
   })),
   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
@@ -893,28 +889,28 @@ const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /*#
       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)
@@ -923,7 +919,7 @@ useWalletsStore.subscribe(state => state.balances, balances => {
 }, {
   equalityFn: 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(amount || ZERO).multipliedBy(token?.usdPrice || 0);
 const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /*#__PURE__*/subscribeWithSelector(set => ({
@@ -967,8 +963,8 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /
     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,
@@ -992,8 +988,8 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /
     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,
@@ -1025,7 +1021,7 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /
       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];
@@ -1042,8 +1038,8 @@ const useBestRouteStore = /*#__PURE__*/createSelectors( /*#__PURE__*/create()( /
       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,
@@ -1550,7 +1546,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();
@@ -1589,7 +1585,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
@@ -1833,7 +1829,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();
@@ -1866,7 +1862,7 @@ function ConfirmSwapPage() {
   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));
@@ -2111,14 +2107,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 = useNavigate();
   const {
     t
   } = 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.createElement("div", {
     style: {
       display: 'flex',
@@ -2393,7 +2389,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;
@@ -2407,7 +2403,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);
   useEffect(() => {
@@ -2966,14 +2962,13 @@ function Layout(_ref) {
   } = _ref;
   const navigate = useNavigate();
   const {
-    balances,
-    accounts,
+    connectedWallets,
     selectedWallets
   } = useWalletsStore();
   const {
     getWalletInfo
   } = 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
@@ -2984,7 +2979,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);
@@ -3030,7 +3025,7 @@ function Layout(_ref) {
     className: "balance"
   }, React.createElement(Typography, {
     variant: "body2"
-  }, !accounts?.length ? t('Connect Wallet') : `$${totalBalance || 0}`), fetchingBalance && React.createElement(Spinner, null)))), React.createElement(AppRoutes, {
+  }, !connectedWallets?.length ? t('Connect Wallet') : `$${totalBalance || 0}`), fetchingBalance && React.createElement(Spinner, null)))), React.createElement(AppRoutes, {
     config: config
   }));
 }
@@ -3266,13 +3261,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
     }))
@@ -3298,8 +3292,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);
     }