@rango-dev/widget-embedded 0.18.0 → 0.19.0

package/src/utils/wallets.ts

@@ -1,8 +1,8 @@
+import type { TokenWithBalance } from '../components/TokenList';
 import type { ConnectedWallet, TokenBalance } from '../store/wallets';
-import type { Balance, TokenHash, TokensBalance, Wallet } from '../types';
+import type { Wallet } from '../types';
 import type { WalletInfo as ModalWalletInfo } from '@rango-dev/ui';
 import type {
-  Asset,
   Network,
   WalletInfo,
   WalletState,
@@ -29,12 +29,6 @@ import BigNumber from 'bignumber.js';
 import { isCosmosBlockchain } from 'rango-types';
 
 import { ZERO } from '../constants/numbers';
-import {
-  BALANCE_MAX_DECIMALS,
-  BALANCE_MIN_DECIMALS,
-  USD_VALUE_MAX_DECIMALS,
-  USD_VALUE_MIN_DECIMALS,
-} from '../constants/routing';
 import { EXCLUDED_WALLETS } from '../constants/wallets';
 
 import { numberToString } from './numbers';
@@ -61,11 +55,8 @@ export function mapWalletTypesToWalletInfo(
   return list
     .filter((wallet) => !EXCLUDED_WALLETS.includes(wallet as WalletTypes))
     .filter((wallet) => {
-      const { supportedChains, isContractWallet } = getWalletInfo(wallet);
-      const { installed, network } = getState(wallet);
-      const filterContractWallets =
-        isContractWallet && (!installed || (!!chain && network !== chain));
-      if (filterContractWallets) {
+      const { supportedChains, hideWhenNotInstalled } = getWalletInfo(wallet);
+      if (hideWhenNotInstalled && !getState(wallet).installed) {
         return false;
       }
       if (chain) {
@@ -106,8 +97,7 @@ export function prepareAccountsForWalletStore(
   wallet: WalletType,
   accounts: string[],
   evmBasedChains: string[],
-  supportedChainNames: Network[] | null,
-  isContractWallet: boolean
+  supportedChainNames: Network[] | null
 ): Wallet[] {
   const result: Wallet[] = [];
 
@@ -161,29 +151,21 @@ export function prepareAccountsForWalletStore(
 
     // If it's an evm network, we will add the address to all the evm chains.
     if (isEvmBasedChain || isUnknownAndEvmBased) {
-      if (isContractWallet) {
+      /*
+       * all evm chains are not supported in wallets, so we are adding
+       * only to those that are supported by wallet.
+       */
+      const evmChainsSupportedByWallet = supportedBlockchains.filter((chain) =>
+        evmBasedChains.includes(chain)
+      );
+
+      evmChainsSupportedByWallet.forEach((network) => {
         /*
-         * for contract wallets like Safe wallet, we should add only account for the
-         * current connected blockchain not all of the supported blockchains
+         * EVM addresses are not case sensitive.
+         * Some wallets like Binance-chain return some letters in uppercase which produces bugs in our wallet state.
          */
         addAccount(network, address.toLowerCase());
-      } else {
-        /*
-         * all evm chains are not supported in wallets, so we are adding
-         * only to those that are supported by wallet.
-         */
-        const evmChainsSupportedByWallet = supportedBlockchains.filter(
-          (chain) => evmBasedChains.includes(chain)
-        );
-
-        evmChainsSupportedByWallet.forEach((network) => {
-          /*
-           * EVM addresses are not case sensitive.
-           * Some wallets like Binance-chain return some letters in uppercase which produces bugs in our wallet state.
-           */
-          addAccount(network, address.toLowerCase());
-        });
-      }
+      });
     } else {
       addAccount(network, address);
     }
@@ -192,10 +174,10 @@ export function prepareAccountsForWalletStore(
   return result;
 }
 
-export function getRequiredChains(quote: BestRouteResponse | null) {
+export function getRequiredChains(route: BestRouteResponse | null) {
   const wallets: string[] = [];
 
-  quote?.result?.swaps.forEach((swap) => {
+  route?.result?.swaps.forEach((swap) => {
     const currentStepFromBlockchain = swap.from.blockchain;
     const currentStepToBlockchain = swap.to.blockchain;
     if (!wallets.includes(currentStepFromBlockchain)) {
@@ -224,6 +206,43 @@ export function getRequiredChains(quote: BestRouteResponse | null) {
 
 type Blockchain = { name: string; accounts: ConnectedWallet[] };
 
+export function getBalanceFromWallet(
+  connectedWallets: ConnectedWallet[],
+  chain: string,
+  symbol: string,
+  address: string | null
+): TokenBalance | null {
+  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
+  );
+}
+
 export function isAccountAndWalletMatched(
   account: Wallet,
   connectedWallet: ConnectedWallet
@@ -317,6 +336,30 @@ function numberWithThousandSeparator(number: string | number): string {
   return parts.join('.');
 }
 
+export const sortTokens = (tokens: TokenWithBalance[]): TokenWithBalance[] => {
+  const 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)
+    );
+};
+
 export const getUsdPrice = (
   blockchain: string,
   symbol: string,
@@ -360,87 +403,98 @@ export const getKeplrCompatibleConnectedWallets = (
   );
 };
 
-export function formatBalance(balance: Balance | null): Balance | null {
-  const formattedBalance: Balance | null = balance
-    ? {
-        ...balance,
-        amount: numberToString(
-          balance.amount,
-          BALANCE_MIN_DECIMALS,
-          BALANCE_MAX_DECIMALS
-        ),
-        usdValue: numberToString(
-          balance.usdValue,
-          USD_VALUE_MIN_DECIMALS,
-          USD_VALUE_MAX_DECIMALS
-        ),
-      }
-    : null;
-
-  return formattedBalance;
-}
-
-function sortTokensByBalance(
-  token1Balance: Balance | null,
-  token2Balance: Balance | null
-): number {
-  if (token1Balance?.usdValue && token2Balance?.usdValue) {
-    return (
-      parseFloat(token2Balance.usdValue) - parseFloat(token1Balance.usdValue)
+export function getTokensWithBalance(
+  tokens: TokenWithBalance[],
+  connectedWallets: ConnectedWallet[]
+): TokenWithBalance[] {
+  return tokens.map(({ balance, ...otherProps }) => {
+    const tokenAmount = numberToString(
+      new BigNumber(
+        getBalanceFromWallet(
+          connectedWallets,
+          otherProps.blockchain,
+          otherProps.symbol,
+          otherProps.address
+        )?.amount || ZERO
+      )
     );
-  }
 
-  if (!token1Balance?.usdValue && token2Balance?.usdValue) {
-    return 1;
-  }
+    let tokenUsdValue = '';
+    if (otherProps.usdPrice) {
+      tokenUsdValue = numberToString(
+        new BigNumber(
+          getBalanceFromWallet(
+            connectedWallets,
+            otherProps.blockchain,
+            otherProps.symbol,
+            otherProps.address
+          )?.amount || ZERO
+        ).multipliedBy(otherProps.usdPrice)
+      );
+    }
 
-  if (token1Balance?.usdValue && !token2Balance?.usdValue) {
-    return -1;
-  }
+    return {
+      ...otherProps,
+      ...(tokenAmount !== '0' && {
+        balance: { amount: tokenAmount, usdValue: tokenUsdValue },
+      }),
+    };
+  });
+}
 
-  if (!token1Balance?.usdValue && !token2Balance?.usdValue) {
-    return (
-      parseFloat(token2Balance?.amount || '0') -
-      parseFloat(token1Balance?.amount || '0')
-    );
-  }
+export function getTokensBalanceFromWalletAndSort(
+  tokens: TokenWithBalance[],
+  connectedWallets: ConnectedWallet[]
+) {
+  const list =
+    connectedWallets.length > 0
+      ? getTokensWithBalance(tokens, connectedWallets)
+      : tokens;
+  list.sort((tokenA, tokenB) => {
+    if (tokenA.balance?.usdValue && tokenB.balance?.usdValue) {
+      return (
+        parseFloat(tokenB.balance.usdValue) -
+        parseFloat(tokenA.balance.usdValue)
+      );
+    }
 
-  return 0;
-}
+    if (!tokenA.balance?.usdValue && tokenB.balance?.usdValue) {
+      return 1;
+    }
 
-function sortTokensByPinnedToken(
-  token1: Token,
-  token2: Token,
-  isTokenPinned: (token: Token) => boolean
-): number {
-  const isToken1Pinned = isTokenPinned(token1);
-  const isToken2Pinned = isTokenPinned(token2);
+    if (tokenA.balance?.usdValue && !tokenB.balance?.usdValue) {
+      return -1;
+    }
+
+    if (!tokenA.balance?.usdValue && !tokenB.balance?.usdValue) {
+      return (
+        parseFloat(tokenB.balance?.amount || '0') -
+        parseFloat(tokenA.balance?.amount || '0')
+      );
+    }
 
-  if (isToken1Pinned === isToken2Pinned) {
     return 0;
-  }
-  if (isToken1Pinned) {
-    return -1;
-  }
-  return 1;
+  });
+
+  return list;
 }
-export function sortTokens(
+
+export function getSortedTokens(
+  chain: BlockchainMeta | null,
   tokens: Token[],
-  getBalanceFor: (token: Token) => Balance | null,
-  isTokenPinned: (token: Token) => boolean
-) {
-  tokens.sort((token1, token2) => {
-    const token1Balance = getBalanceFor(token1);
-    const token2Balance = getBalanceFor(token2);
-    // Check pinned tokens
-    const isTokenPin = sortTokensByPinnedToken(token1, token2, isTokenPinned);
-
-    return isTokenPin !== 0
-      ? isTokenPin
-      : sortTokensByBalance(token1Balance, token2Balance);
-  });
+  connectedWallets: ConnectedWallet[],
+  otherChainTokens: TokenWithBalance[]
+): TokenWithBalance[] {
+  const fromChainEqualsToToBlockchain =
+    chain?.name === otherChainTokens[0]?.name;
+  if (fromChainEqualsToToBlockchain) {
+    return otherChainTokens;
+  }
 
-  return tokens;
+  const filteredTokens = tokens.filter(
+    (token) => token.blockchain === chain?.name
+  );
+  return sortTokens(getTokensWithBalance(filteredTokens, connectedWallets));
 }
 
 export function tokensAreEqual(
@@ -502,52 +556,3 @@ export function getAddress({
       connectedWallet.chain === chain
   )?.address;
 }
-
-export function createTokenHash(token: Asset): TokenHash {
-  return `${token.blockchain}-${token.symbol}-${token.address ?? ''}`;
-}
-
-export function makeTokensBalance(connectedWallets: ConnectedWallet[]) {
-  return connectedWallets
-    .flatMap((wallet) => wallet.balances)
-    .reduce((balances: TokensBalance, balance) => {
-      const currentBalance = {
-        amount: balance?.amount ?? '',
-        decimals: balance?.decimal ?? 0,
-        usdValue: balance?.usdPrice
-          ? new BigNumber(balance?.usdPrice ?? ZERO)
-              .multipliedBy(balance?.amount)
-              .toString()
-          : '',
-      };
-
-      const tokenHash = balance
-        ? createTokenHash({
-            symbol: balance.symbol,
-            blockchain: balance.chain,
-            address: balance.address,
-          })
-        : null;
-
-      const prevBalance = tokenHash ? balances[tokenHash] : null;
-
-      const shouldUpdateBalance =
-        tokenHash &&
-        (!prevBalance ||
-          (prevBalance && prevBalance.amount < currentBalance.amount));
-
-      if (shouldUpdateBalance) {
-        balances[tokenHash] = currentBalance;
-      }
-
-      return balances;
-    }, {});
-}
-
-export const isFetchingBalance = (
-  connectedWallets: ConnectedWallet[],
-  blockchain: string
-) =>
-  !!connectedWallets.find(
-    (wallet) => wallet.chain === blockchain && wallet.loading
-  );

package/dist/components/NoResult/NoResult.d.ts

@@ -1,4 +0,0 @@
-import type { PropTypes } from './NoResult.types';
-import React from 'react';
-export declare function NoResult(props: PropTypes): React.JSX.Element;
-//# sourceMappingURL=NoResult.d.ts.map

package/dist/components/NoResult/NoResult.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NoResult.d.ts","sourceRoot":"","sources":["../../../src/components/NoResult/NoResult.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAUlD,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,wBAAgB,QAAQ,CAAC,KAAK,EAAE,SAAS,qBAyDxC"}

package/dist/components/NoResult/NoResult.helpers.d.ts

@@ -1,4 +0,0 @@
-import type { Info } from './NoResult.types';
-import { type NoResultError, type QuoteRequestFailed } from '../../types';
-export declare function makeInfo(error: NoResultError | QuoteRequestFailed | null, disabledLiquiditySources: string[], toggleAllLiquiditySources: (shouldReset: boolean) => void, refetchQuote: () => void): Info;
-//# sourceMappingURL=NoResult.helpers.d.ts.map

package/dist/components/NoResult/NoResult.helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NoResult.helpers.d.ts","sourceRoot":"","sources":["../../../src/components/NoResult/NoResult.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AAErB,wBAAgB,QAAQ,CACtB,KAAK,EAAE,aAAa,GAAG,kBAAkB,GAAG,IAAI,EAChD,wBAAwB,EAAE,MAAM,EAAE,EAClC,yBAAyB,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK,IAAI,EACzD,YAAY,EAAE,MAAM,IAAI,GACvB,IAAI,CA0CN"}

package/dist/components/NoResult/NoResult.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NoResult.types.d.ts","sourceRoot":"","sources":["../../../src/components/NoResult/NoResult.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAErE,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,KAAK,EAAE,aAAa,GAAG,kBAAkB,GAAG,IAAI,CAAC;CAClD;AAED,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,IAAI;IACnB,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB"}

package/dist/components/NoResult/index.d.ts

@@ -1,2 +0,0 @@
-export { NoResult } from './NoResult';
-//# sourceMappingURL=index.d.ts.map

package/dist/components/NoResult/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/NoResult/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}

package/dist/components/Quote/Quote.d.ts

@@ -1,4 +0,0 @@
-import type { QuoteProps } from './Quote.types';
-import React from 'react';
-export declare function Quote(props: QuoteProps): React.JSX.Element;
-//# sourceMappingURL=Quote.d.ts.map

package/dist/components/Quote/Quote.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Quote.d.ts","sourceRoot":"","sources":["../../../src/components/Quote/Quote.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAkBhD,OAAO,KAA4C,MAAM,OAAO,CAAC;AAgDjE,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,qBA2VtC"}