Merge pull request #299 from stabilitydao/4-vault

Stability library update + vaults url filters fix
stabilitydao · Nov 5, 2024 · be8ee41 · be8ee41
2 parents ec24459 + bfc5acd
commit be8ee41
Show file tree

Hide file tree

Showing 11 changed files with 711 additions and 76 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stability-ui",
   "type": "module",
-  "version": "0.13.18-alpha",
+  "version": "0.13.19-alpha",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
@@ -18,7 +18,7 @@
     "@astrojs/tailwind": "^5.0.2",
     "@astrojs/vercel": "^5.1.0",
     "@nanostores/react": "^0.7.1",
-    "@stabilitydao/stability": "=0.21.1",
+    "@stabilitydao/stability": "=0.21.2",
     "@tanstack/query-sync-storage-persister": "^5.22.2",
     "@tanstack/react-query": "^5.22.2",
     "@tanstack/react-query-persist-client": "^5.22.2",

diff --git a/src/modules/Vaults/components/NetworksFilter.tsx b/src/modules/Vaults/components/NetworksFilter.tsx
@@ -4,7 +4,7 @@ import type { TChain } from "@types";
 
 interface IProps {
   activeNetworks: TChain[];
-  activeNetworksHandler: (chain: string) => void;
+  activeNetworksHandler: (chains: string[]) => void;
 }
 
 const NetworkFilters: React.FC<IProps> = memo(
@@ -20,7 +20,7 @@ const NetworkFilters: React.FC<IProps> = memo(
             }`}
             key={chain.name + chain.id}
             title={chain.name}
-            onClick={() => activeNetworksHandler(chain.id)}
+            onClick={() => activeNetworksHandler([chain.id])}
             data-testid="network"
           >
             <img

diff --git a/src/modules/Vaults/functions/initFilters.ts b/src/modules/Vaults/functions/initFilters.ts
@@ -23,7 +23,7 @@ export const initFilters = (
   vaults: TVault[],
   tableFilters: TTableFilters[],
   setTableFilters: React.Dispatch<React.SetStateAction<TTableFilters[]>>,
-  networksHandler: (chains: string) => void
+  networksHandler: (chains: string[]) => void
 ): void => {
   const shortNames: string[] = [
     ...new Set(
@@ -49,7 +49,7 @@ export const initFilters = (
   const strategyParam = searchParams.get("strategy");
   const vaultsParam = searchParams.get("vaults");
   const statusParam = searchParams.get("status");
-  const chainParam = searchParams.get("chain");
+  const chainsParam = searchParams.getAll("chain");
 
   if (tagsParam) {
     newFilters = newFilters.map((f) =>
@@ -94,8 +94,8 @@ export const initFilters = (
     });
   }
 
-  if (chainParam) {
-    networksHandler(chainParam);
+  if (chainsParam.length) {
+    networksHandler(chainsParam);
   }
   setTableFilters(newFilters);
 };
diff --git a/src/modules/Vaults/index.tsx b/src/modules/Vaults/index.tsx
@@ -148,14 +148,16 @@ const Vaults = (): JSX.Element => {
     tableFilters.find((filter) => filter.name === "My vaults")?.state &&
     !$connected;
 
-  const activeNetworksHandler = async (chainID: string) => {
+  const activeNetworksHandler = async (chainIDs: string[]) => {
     ///// For vaults URL filters
     const newUrl = new URL(window.location.href);
     const params = new URLSearchParams(newUrl.search);
     /////
 
     let updatedNetworks = activeNetworks.map((network) =>
-      network.id === chainID ? { ...network, active: !network.active } : network
+      chainIDs.includes(network.id)
+        ? { ...network, active: !network.active }
+        : network
     );
 
     const allActive = activeNetworks.every((network) => network.active);
@@ -169,7 +171,7 @@ const Vaults = (): JSX.Element => {
     } else if (allActive) {
       updatedNetworks = activeNetworks.map((network) => ({
         ...network,
-        active: network.id === chainID,
+        active: chainIDs.includes(network.id),
       }));
     }
 

diff --git a/src/modules/Vaults/tests/initFilters.test.ts b/src/modules/Vaults/tests/initFilters.test.ts
@@ -65,7 +65,7 @@ describe("initFilters", () => {
       { name: "Active", type: "single", state: true },
     ]);
 
-    expect(networksHandler).toHaveBeenCalledWith("eth");
+    expect(networksHandler).toHaveBeenCalledWith(["eth"]);
   });
 
   it("should not call networksHandler if chainParam is absent", () => {

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,3 +1,4 @@
+/* FUNCTIONS */
 import { getTokenData } from "./functions/getTokenData";
 import { formatNumber } from "./functions/formatNumber";
 import { formatFromBigInt } from "./functions/formatFromBigInt";

diff --git a/tests/e2e/vault/assets.test.ts b/tests/e2e/vault/assets.test.ts
@@ -16,11 +16,11 @@ const tokenlist = {
   name: "Stability Token List",
   logoURI: "https://stability.farm/logo.svg",
   keywords: [],
-  timestamp: "2024-10-22T00:00:00+00:00",
+  timestamp: "2024-11-03T18:30:00+00:00",
   version: {
     major: 1,
-    minor: 4,
-    patch: 2,
+    minor: 5,
+    patch: 0,
   },
   tags: {
     stablecoin: {
@@ -43,11 +43,60 @@ const tokenlist = {
     },
   },
   tokens: [
+    {
+      chainId: 1,
+      address: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+      symbol: "USDC",
+      name: "USD Coin",
+      decimals: 6,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdc.jpg",
+      tags: ["stablecoin"],
+    },
+    {
+      chainId: 1,
+      address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+      symbol: "USDT",
+      name: "Tether USD",
+      decimals: 6,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdt.jpg",
+      tags: ["stablecoin"],
+    },
+    {
+      chainId: 1,
+      address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+      symbol: "DAI",
+      name: "Dai Stablecoin",
+      decimals: 18,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/dai.jpg",
+      tags: ["stablecoin"],
+    },
+    {
+      chainId: 1,
+      address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+      symbol: "WBTC",
+      name: "Wrapped BTC",
+      decimals: 8,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/btc.jpg",
+    },
+    {
+      chainId: 1,
+      address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+      symbol: "WETH",
+      name: "Wrapped ETH",
+      decimals: 18,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/eth.jpg",
+      tags: ["wNative"],
+    },
     {
       chainId: 137,
       address: "0x2791bca1f2de4661ed88a30c99a7a9449aa84174",
-      symbol: "USDC.e",
-      name: "Bridged USDC",
+      symbol: "USDC",
+      name: "USD Coin (PoS)",
       decimals: 6,
       logoURI:
         "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdc.jpg",
@@ -77,7 +126,7 @@ const tokenlist = {
       chainId: 137,
       address: "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063",
       symbol: "DAI",
-      name: "Dai Stablecoin",
+      name: "(PoS) Dai Stablecoin",
       decimals: 18,
       logoURI:
         "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/dai.jpg",
@@ -86,8 +135,8 @@ const tokenlist = {
     {
       chainId: 137,
       address: "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
-      symbol: "WMATIC",
-      name: "Wrapped Matic",
+      symbol: "WPOL",
+      name: "Wrapped Polygon Ecosystem Token",
       decimals: 18,
       logoURI:
         "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/polygon.jpg",
@@ -133,11 +182,120 @@ const tokenlist = {
       chainId: 137,
       address: "0xc4ce1d6f5d98d65ee25cf85e9f2e9dcfee6cb5d6",
       symbol: "crvUSD",
-      name: "Curve.Fi USD",
+      name: "Curve.Fi USD Stablecoin(PoS)",
       decimals: 18,
       logoURI: "https://polygonscan.com/token/images/crvusd_32.png",
       tags: ["stablecoin", "bridged"],
     },
+    {
+      chainId: 137,
+      address: "0x03b54A6e9a984069379fae1a4fC4dBAE93B3bCCD",
+      symbol: "wstETH",
+      name: "Wrapped liquid staked Ether 2.0 (PoS)",
+      decimals: 18,
+      logoURI: "https://polygonscan.com/token/images/wsteth_32.png",
+      tags: ["bridged"],
+    },
+    {
+      chainId: 42161,
+      address: "0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8",
+      symbol: "USDC",
+      name: "USD Coin (Arb1)",
+      decimals: 6,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdc.jpg",
+      tags: ["stablecoin", "bridged"],
+    },
+    {
+      chainId: 42161,
+      address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+      symbol: "USDC",
+      name: "USD Coin",
+      decimals: 6,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdc.jpg",
+      tags: ["stablecoin"],
+    },
+    {
+      chainId: 42161,
+      address: "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9",
+      symbol: "USDT",
+      name: "Tether USD",
+      decimals: 6,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdt.jpg",
+      tags: ["stablecoin", "bridged"],
+    },
+    {
+      chainId: 42161,
+      address: "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1",
+      symbol: "DAI",
+      name: "Dai Stablecoin",
+      decimals: 18,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/dai.jpg",
+      tags: ["stablecoin", "bridged"],
+    },
+    {
+      chainId: 42161,
+      address: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
+      symbol: "WETH",
+      name: "Wrapped Ether",
+      decimals: 18,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/eth.jpg",
+      tags: ["bridged"],
+    },
+    {
+      chainId: 42161,
+      address: "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f",
+      symbol: "WBTC",
+      name: "Wrapped BTC",
+      decimals: 8,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/btc.jpg",
+      tags: ["bridged"],
+    },
+    {
+      chainId: 42420,
+      address: "0x2B7C1342Cc64add10B2a79C8f9767d2667DE64B2",
+      symbol: "USDC",
+      name: "Bridged USDC (Asset Chain)",
+      decimals: 6,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdc.jpg",
+      tags: ["stablecoin", "bridged"],
+    },
+    {
+      chainId: 42420,
+      address: "0x26E490d30e73c36800788DC6d6315946C4BbEa24",
+      symbol: "USDT",
+      name: "Tether USD (Bridged)",
+      decimals: 18,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdt.jpg",
+      tags: ["stablecoin", "bridged"],
+    },
+    {
+      chainId: 42420,
+      address: "0xDBDc8c7B96286899aB624F6a59dd0250DD4Ce9bC",
+      symbol: "BTC",
+      name: "Bitlayer Bitcoin (Bridged)",
+      decimals: 18,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/btc.jpg",
+      tags: ["bridged"],
+    },
+    {
+      chainId: 42420,
+      address: "0xbe231A8492487aAe6096278A97050FAe6B9d5BEc",
+      symbol: "WETH",
+      name: "Wrapped Ether (Bridged)",
+      decimals: 18,
+      logoURI:
+        "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/eth.jpg",
+      tags: ["bridged"],
+    },
     {
       chainId: 8453,
       address: "0x4200000000000000000000000000000000000006",
@@ -152,7 +310,7 @@ const tokenlist = {
       chainId: 8453,
       address: "0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452",
       symbol: "wstETH",
-      name: "Wrapped Liquid Staked Ether 2.0",
+      name: "Wrapped liquid staked Ether 2.0",
       decimals: 18,
       logoURI:
         "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/wsteth.jpg",
@@ -176,13 +334,13 @@ const tokenlist = {
       decimals: 6,
       logoURI:
         "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdt.jpg",
-      tags: ["stablecoin"],
+      tags: ["stablecoin", "bridged"],
     },
     {
       chainId: 8453,
       address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
       symbol: "USDC",
-      name: "USDC",
+      name: "USD Coin",
       decimals: 6,
       logoURI:
         "https://raw.githubusercontent.com/sushiswap/list/master/logos/token-logos/token/usdc.jpg",
@@ -201,7 +359,7 @@ const tokenlist = {
       chainId: 8453,
       address: "0x417Ac0e078398C154EdFadD9Ef675d30Be60Af93",
       symbol: "crvUSD",
-      name: "Curve.Fi USD",
+      name: "Curve.Fi USD Stablecoin",
       decimals: 18,
       logoURI: "https://polygonscan.com/token/images/crvusd_32.png",
       tags: ["stablecoin", "bridged"],