@rango-dev/widget-embedded 0.23.1-next.21 → 0.23.1-next.23

package/src/utils/meta.ts

@@ -31,3 +31,24 @@ export function findToken(t: Asset, tokens: Token[]) {
 export function findBlockchain(name: string, blockchains: BlockchainMeta[]) {
   return blockchains.find((blockchain) => blockchain.name === name) ?? null;
 }
+
+export function isTokenNative(
+  token: Token,
+  blockchain: BlockchainMeta | undefined
+) {
+  if (!blockchain || !token) {
+    return false;
+  }
+
+  for (const feeAsset of blockchain.feeAssets) {
+    if (
+      token?.blockchain === feeAsset?.blockchain &&
+      token?.symbol === feeAsset?.symbol &&
+      token?.address === feeAsset?.address
+    ) {
+      return true;
+    }
+  }
+
+  return false;
+}

package/src/utils/wallets.ts

@@ -381,25 +381,18 @@ export function formatBalance(balance: Balance | null): Balance | null {
   return formattedBalance;
 }
 
-function sortTokensByBalance(
+export function compareTokenBalance(
   token1Balance: Balance | null,
   token2Balance: Balance | null
 ): number {
-  if (token1Balance?.usdValue && token2Balance?.usdValue) {
+  if (token1Balance?.usdValue || token2Balance?.usdValue) {
     return (
-      parseFloat(token2Balance.usdValue) - parseFloat(token1Balance.usdValue)
+      parseFloat(token2Balance?.usdValue || '0') -
+      parseFloat(token1Balance?.usdValue || '0')
     );
   }
 
-  if (!token1Balance?.usdValue && token2Balance?.usdValue) {
-    return 1;
-  }
-
-  if (token1Balance?.usdValue && !token2Balance?.usdValue) {
-    return -1;
-  }
-
-  if (!token1Balance?.usdValue && !token2Balance?.usdValue) {
+  if (token1Balance?.amount || token2Balance?.amount) {
     return (
       parseFloat(token2Balance?.amount || '0') -
       parseFloat(token1Balance?.amount || '0')
@@ -409,41 +402,6 @@ function sortTokensByBalance(
   return 0;
 }
 
-function sortTokensByPinnedToken(
-  token1: Token,
-  token2: Token,
-  isTokenPinned: (token: Token) => boolean
-): number {
-  const isToken1Pinned = isTokenPinned(token1);
-  const isToken2Pinned = isTokenPinned(token2);
-
-  if (isToken1Pinned === isToken2Pinned) {
-    return 0;
-  }
-  if (isToken1Pinned) {
-    return -1;
-  }
-  return 1;
-}
-export function sortTokens(
-  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);
-  });
-
-  return tokens;
-}
-
 export function areTokensEqual(
   tokenA: Pick<Token, 'blockchain' | 'symbol' | 'address'> | null,
   tokenB: Pick<Token, 'blockchain' | 'symbol' | 'address'> | null