renamed to ex_USDT

BirthdayResearch · Jul 22, 2024 · 5deed89 · 5deed89
1 parent 06493ca
commit 5deed89
Show file tree

Hide file tree

Showing 27 changed files with 63 additions and 63 deletions.
diff --git a/mobile-app/app/__mocks__/@waveshq/walletkit-ui.ts b/mobile-app/app/__mocks__/@waveshq/walletkit-ui.ts
@@ -45,7 +45,7 @@ export const useWhaleApiClient = () => ({
       toToken: {
         id: "3",
         symbol: "USDT",
-        displaySymbol: "depUSDT",
+        displaySymbol: "ex_USDT",
       },
       bestPath: [
         {
@@ -72,7 +72,7 @@ export const useWhaleApiClient = () => ({
           tokenA: {
             id: "3",
             symbol: "USDT",
-            displaySymbol: "depUSDT",
+            displaySymbol: "ex_USDT",
           },
           tokenB: {
             id: "0",

diff --git a/mobile-app/app/api/token/dusdt_converter.ts b/mobile-app/app/api/token/dusdt_converter.ts
@@ -1,4 +1,4 @@
-const updated_dusdt_name = "depUSDT";
+const updated_dusdt_name = "ex_USDT";
 
 export function dusdt_converter_token(token: any) {
   return {

diff --git a/...p/app/components/icons/assets/depUSDT.tsx → ...p/app/components/icons/assets/ex_USDT.tsx b/...p/app/components/icons/assets/depUSDT.tsx → ...p/app/components/icons/assets/ex_USDT.tsx
@@ -1,6 +1,6 @@
 import Svg, { Circle, Path, SvgProps } from "react-native-svg";
 
-export function depUSDT(props: SvgProps): JSX.Element {
+export function ex_USDT(props: SvgProps): JSX.Element {
   return (
     <Svg height={32} width={32} viewBox="0 0 32 32" {...props}>
       <Circle cx={16} cy={16} fill="#D4ECE5" r={16} />

diff --git a/mobile-app/app/components/icons/assets/index.test.tsx b/mobile-app/app/components/icons/assets/index.test.tsx
@@ -20,7 +20,7 @@ const icons = [
   "dDOGE",
   "dETH",
   "dLTC",
-  "depUSDT",
+  "ex_USDT",
   "dUSDC",
   "FAKE",
   "dDUSD",
@@ -41,7 +41,7 @@ const icons = [
   "dMSFT",
   "dETH-DFI",
   "dBTC-DFI",
-  "depUSDT-DFI",
+  "ex_USDT-DFI",
   "dDOGE-DFI",
   "dLTC-DFI",
   "dBCH-DFI",

diff --git a/mobile-app/app/components/icons/assets/index.ts b/mobile-app/app/components/icons/assets/index.ts
@@ -8,7 +8,7 @@ import { dETH } from "./dETH";
 import { DFI } from "./DFI";
 import { dLTC } from "./dLTC";
 import { dUSDC } from "./dUSDC";
-import { depUSDT } from "./depUSDT";
+import { ex_USDT } from "./ex_USDT";
 import { dUSD } from "./dUSD";
 import { DFIlogo } from "./plainDFI";
 import { dEUROC } from "./dEUROC";
@@ -39,7 +39,7 @@ const mapping: Record<string, (props: SvgProps) => JSX.Element> = {
   dDOGE: dDOGE,
   dETH: dETH,
   dLTC: dLTC,
-  depUSDT: depUSDT,
+  ex_USDT: ex_USDT,
   dUSDC: dUSDC,
   dDUSD: dUSD,
   DUSD: dUSD,

diff --git a/mobile-app/app/screens/AppNavigator/screens/Dex/DexAddLiquidity.tsx b/mobile-app/app/screens/AppNavigator/screens/Dex/DexAddLiquidity.tsx
@@ -447,14 +447,14 @@ export function AddLiquidityScreen(props: Props): JSX.Element {
           ...poolpair.tokenA,
           displaySymbol:
             poolpair.tokenA.symbol === "USDT"
-              ? "depUSDT"
+              ? "ex_USDT"
               : poolpair.tokenA.displaySymbol,
         },
         tokenB: {
           ...poolpair.tokenB,
           displaySymbol:
             poolpair.tokenB.symbol === "USDT"
-              ? "depUSDT"
+              ? "ex_USDT"
               : poolpair.tokenB.displaySymbol,
         },
         aSymbol,

diff --git a/mobile-app/app/screens/AppNavigator/screens/Dex/DexScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Dex/DexScreen.tsx
@@ -313,14 +313,14 @@ export function DexScreen(): JSX.Element {
             ...item.data.tokenA,
             displaySymbol:
               item.data.tokenA.symbol === "USDT"
-                ? "depUSDT"
+                ? "ex_USDT"
                 : item.data.tokenA.displaySymbol,
           },
           tokenB: {
             ...item.data.tokenB,
             displaySymbol:
               item.data.tokenB.symbol === "USDT"
-                ? "depUSDT"
+                ? "ex_USDT"
                 : item.data.tokenB.displaySymbol,
           },
         },

diff --git a/mobile-app/app/screens/AppNavigator/screens/Dex/hook/DexStabilization.ts b/mobile-app/app/screens/AppNavigator/screens/Dex/hook/DexStabilization.ts
@@ -84,8 +84,8 @@ export function useDexStabilization(
     const dUSDCDUSDPair = pairs.find(
       (p) => p.data.displaySymbol === "dUSDC-DUSD",
     );
-    const depUSDTDUSDPair = pairs.find(
-      (p) => p.data.displaySymbol === "depUSDT-DUSD",
+    const ex_USDTDUSDPair = pairs.find(
+      (p) => p.data.displaySymbol === "ex_USDT-DUSD",
     );
     const dEUROCDUSDPair = pairs.find(
       (p) => p.data.displaySymbol === "dEUROC-DUSD",
@@ -104,11 +104,11 @@ export function useDexStabilization(
     ) {
       fee = dUSDCDUSDPair.data.tokenB.fee?.pct;
     } else if (
-      depUSDTDUSDPair !== undefined &&
+      ex_USDTDUSDPair !== undefined &&
       tokenADisplaySymbol === "DUSD" &&
-      tokenBDisplaySymbol === "depUSDT"
+      tokenBDisplaySymbol === "ex_USDT"
     ) {
-      fee = depUSDTDUSDPair.data.tokenB.fee?.pct;
+      fee = ex_USDTDUSDPair.data.tokenB.fee?.pct;
     } else if (
       dEUROCDUSDPair !== undefined &&
       tokenADisplaySymbol === "DUSD" &&
@@ -135,9 +135,9 @@ export function useDexStabilization(
       highFeesUrl = "https://defiscan.live/dex/DUSD";
     } else if (
       pair.tokenADisplaySymbol === "DUSD" &&
-      pair.tokenBDisplaySymbol === "depUSDT"
+      pair.tokenBDisplaySymbol === "ex_USDT"
     ) {
-      highFeesUrl = "https://defiscan.live/dex/depUSDT-DUSD";
+      highFeesUrl = "https://defiscan.live/dex/ex_USDT-DUSD";
     } else if (
       pair.tokenADisplaySymbol === "DUSD" &&
       pair.tokenBDisplaySymbol === "dUSDC"
@@ -349,7 +349,7 @@ export function useDexStabilization(
       bestPath.length === 1 &&
       ((tokenA.displaySymbol === "DUSD" && tokenB.displaySymbol === "DFI") ||
         (tokenA.displaySymbol === "DUSD" &&
-          tokenB.displaySymbol === "depUSDT") ||
+          tokenB.displaySymbol === "ex_USDT") ||
         (tokenA.displaySymbol === "DUSD" && tokenB.displaySymbol === "dUSDC") ||
         (tokenA.displaySymbol === "DUSD" && tokenB.displaySymbol === "dEUROC"))
     ) {
@@ -376,7 +376,7 @@ export function useDexStabilization(
       bestPath,
       [
         { tokenADisplaySymbol: "DUSD", tokenBDisplaySymbol: "DFI" },
-        { tokenADisplaySymbol: "DUSD", tokenBDisplaySymbol: "depUSDT" },
+        { tokenADisplaySymbol: "DUSD", tokenBDisplaySymbol: "ex_USDT" },
         { tokenADisplaySymbol: "DUSD", tokenBDisplaySymbol: "dUSDC" },
         { tokenADisplaySymbol: "DUSD", tokenBDisplaySymbol: "dEUROC" },
       ],

diff --git a/...p/screens/AppNavigator/screens/Loans/VaultDetail/components/VaultDetailCollateralsRow.tsx b/...p/screens/AppNavigator/screens/Loans/VaultDetail/components/VaultDetailCollateralsRow.tsx
@@ -143,7 +143,7 @@ export function VaultDetailCollateralsRow({
                 totalCollateralValue={new BigNumber(vault.collateralValue)}
                 displaySymbol={
                   collateral.symbol === "USDT"
-                    ? "depUSDT"
+                    ? "ex_USDT"
                     : collateral.displaySymbol
                 }
                 amount={new BigNumber(collateral.amount)}

diff --git a/mobile-app/app/screens/AppNavigator/screens/Loans/components/VaultCard.tsx b/mobile-app/app/screens/AppNavigator/screens/Loans/components/VaultCard.tsx
@@ -210,7 +210,7 @@ export function VaultCard(props: VaultCardProps): JSX.Element {
                   testID={`${props.testID}_collateral_token_group`}
                   symbols={vault.collateralAmounts?.map((collateral) =>
                     collateral.displaySymbol === "dUSDT"
-                      ? "depUSDT"
+                      ? "ex_USDT"
                       : collateral.displaySymbol,
                   )}
                   maxIconToDisplay={6}

diff --git a/mobile-app/app/screens/AppNavigator/screens/Loans/hooks/CollateralTokenList.ts b/mobile-app/app/screens/AppNavigator/screens/Loans/hooks/CollateralTokenList.ts
@@ -33,7 +33,7 @@ export function useCollateralTokenList() {
             token: {
               ...c.token,
               displaySymbol:
-                c.token.symbol === "USDT" ? "depUSDT" : c.token.displaySymbol,
+                c.token.symbol === "USDT" ? "ex_USDT" : c.token.displaySymbol,
             },
             available: getTokenAmount(c.token.id),
           };

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/hooks/TokenBestPath.test.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/hooks/TokenBestPath.test.tsx
@@ -80,7 +80,7 @@ describe("Token Best Path - Get Best Path (DEX)", () => {
         status: true,
         tokenA: {
           symbol: "USDT",
-          displaySymbol: "depUSDT",
+          displaySymbol: "ex_USDT",
           id: "14",
           reserve: pair2ReserveA,
           blockCommission: "0",

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/hooks/TokenPrice.test.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/hooks/TokenPrice.test.tsx
@@ -80,7 +80,7 @@ describe("Token Price - Get Token Price (DEX)", () => {
         status: true,
         tokenA: {
           symbol: "USDT",
-          displaySymbol: "depUSDT",
+          displaySymbol: "ex_USDT",
           id: "14",
           reserve: pair2ReserveA,
           blockCommission: "0",

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/SendScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/SendScreen.tsx
@@ -250,7 +250,7 @@ export function SendScreen({ route, navigation }: Props): JSX.Element {
                 0,
               ).toFixed(8)
             : t.amount,
-        displaySymbol: t.symbol === "USDT" ? "depUSDT" : t.displaySymbol,
+        displaySymbol: t.symbol === "USDT" ? "ex_USDT" : t.displaySymbol,
       });
     }
   }, [JSON.stringify(tokens)]);

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokenDetailScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokenDetailScreen.tsx
@@ -79,8 +79,8 @@ const usePoolPairToken = (
 
     if (t !== undefined) {
       if (t.symbol === "USDT") {
-        const depUSDTtoken = dusdt_converter_token(token);
-        setToken(depUSDTtoken);
+        const ex_USDTtoken = dusdt_converter_token(token);
+        setToken(ex_USDTtoken);
       } else {
         setToken(t);
       }

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokensVsUtxoFaq.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokensVsUtxoFaq.tsx
@@ -81,7 +81,7 @@ export function TokensVsUtxoFaq(): JSX.Element {
         {
           text: translate(
             "components/UtxoVsTokenFaq",
-            "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)",
+            "Swapping DFI with other tokens (e.g. dBTC, dETH, ex_USDT)",
           ),
           type: "bullet",
         },

diff --git a/mobile-app/cypress/e2e/functional/wallet/portfolio/portfolio.spec.ts b/mobile-app/cypress/e2e/functional/wallet/portfolio/portfolio.spec.ts
@@ -73,7 +73,7 @@ const getDexPrice = (price: {
     denomination: {
       id: "3",
       symbol: "USDT",
-      displaySymbol: "depUSDT",
+      displaySymbol: "ex_USDT",
       name: "Playground csUSDT",
     },
     dexPrices: {

diff --git a/mobile-app/cypress/e2e/functional/wallet/portfolio/portfolio_all_tokans.spec.ts b/mobile-app/cypress/e2e/functional/wallet/portfolio/portfolio_all_tokans.spec.ts
@@ -105,12 +105,12 @@ const getChangingPoolPairReserve = ({
   {
     id: "17",
     symbol: "USDT-DFI",
-    displaySymbol: "depUSDT-DFI",
+    displaySymbol: "ex_USDT-DFI",
     name: "Decentralized USD-Default Defi token",
     status: true,
     tokenA: {
       symbol: "USDT",
-      displaySymbol: "depUSDT",
+      displaySymbol: "ex_USDT",
       id: "14",
       reserve: pair2ReserveA,
       blockCommission: "0",
@@ -152,7 +152,7 @@ const getDexPrice = (price: {
     denomination: {
       id: "3",
       symbol: "USDT",
-      displaySymbol: "depUSDT",
+      displaySymbol: "ex_USDT",
       name: "Playground csUSDT",
     },
     dexPrices: {
@@ -230,7 +230,7 @@ const addLPTokens = [
   },
   {
     amount: "25.00000000",
-    displaySymbol: "depUSDT-DFI",
+    displaySymbol: "ex_USDT-DFI",
     id: "19",
     isDAT: true,
     isLPS: true,
@@ -434,12 +434,12 @@ context(
       interceptTokensForSorting(addLPTokens);
       togglePortfolioDenomination("DFI");
       cy.getByTestID("portfolio_button_group_LP_TOKENS").click();
-      checkAssetsSortingOrder("Highest value (DFI)", "dBTC-DFI", "depUSDT-DFI");
+      checkAssetsSortingOrder("Highest value (DFI)", "dBTC-DFI", "ex_USDT-DFI");
     });
 
     it("should sort assets based on Lowest value (DFI)", () => {
       interceptTokensForSorting(addLPTokens);
-      checkAssetsSortingOrder("Lowest value (DFI)", "depUSDT-DFI", "dBTC-DFI");
+      checkAssetsSortingOrder("Lowest value (DFI)", "ex_USDT-DFI", "dBTC-DFI");
     });
   },
 );

diff --git a/mobile-app/cypress/e2e/functional/wallet/portfolio/portfolio_usd_price.spec.ts b/mobile-app/cypress/e2e/functional/wallet/portfolio/portfolio_usd_price.spec.ts
@@ -8,7 +8,7 @@ const getDexPrice = (price: {
     denomination: {
       id: "3",
       symbol: "USDT",
-      displaySymbol: "depUSDT",
+      displaySymbol: "ex_USDT",
       name: "Playground csUSDT",
     },
     dexPrices: {
@@ -157,12 +157,12 @@ const getChangingPoolPairReserve = ({
   {
     id: "21",
     symbol: "USDT-DFI",
-    displaySymbol: "depUSDT-DFI",
+    displaySymbol: "ex_USDT-DFI",
     name: "Decentralized USD-Default Defi token",
     status: true,
     tokenA: {
       symbol: "USDT",
-      displaySymbol: "depUSDT",
+      displaySymbol: "ex_USDT",
       id: "14",
       reserve: pair2ReserveA,
       blockCommission: "0",
@@ -259,14 +259,14 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => {
       cy.checkBalanceRow("3", {
         name: "Playground csUSDT",
         amount: "10.00000000",
-        displaySymbol: "depUSDT",
+        displaySymbol: "ex_USDT",
         symbol: "USDT",
         usdAmount: "$10.00",
       });
       cy.checkBalanceRow("21", {
         name: "Playground csUSDT-DeFiChain",
         amount: "10.00000000",
-        displaySymbol: "depUSDT-DFI",
+        displaySymbol: "ex_USDT-DFI",
         symbol: "USDT-DFI",
         usdAmount: "$66.52",
       });
@@ -325,15 +325,15 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => {
       cy.checkBalanceRow("3", {
         name: "Playground csUSDT",
         amount: "10.00000000",
-        displaySymbol: "depUSDT",
+        displaySymbol: "ex_USDT",
         symbol: "USDT",
         usdAmount: "$10.00",
       });
 
       cy.checkBalanceRow("21", {
         name: "Playground csUSDT-DeFiChain",
         amount: "10.00000000",
-        displaySymbol: "depUSDT-DFI",
+        displaySymbol: "ex_USDT-DFI",
         symbol: "USDT-DFI",
         usdAmount: "$49.92",
       });
@@ -394,7 +394,7 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => {
       cy.checkBalanceRow("3", {
         name: "Playground csUSDT",
         amount: "10.00000000",
-        displaySymbol: "depUSDT",
+        displaySymbol: "ex_USDT",
         symbol: "USDT",
         usdAmount: "$10.00",
       });
@@ -403,7 +403,7 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => {
       cy.checkBalanceRow("21", {
         name: "Playground csUSDT-DeFiChain",
         amount: "10.00000000",
-        displaySymbol: "depUSDT-DFI",
+        displaySymbol: "ex_USDT-DFI",
         symbol: "USDT-DFI",
         usdAmount: "$66.52",
       });
@@ -450,7 +450,7 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => {
       cy.checkBalanceRow("3", {
         name: "Playground csUSDT",
         amount: "20.00000000",
-        displaySymbol: "depUSDT",
+        displaySymbol: "ex_USDT",
         symbol: "USDT",
         usdAmount: "$20.00",
       });
@@ -459,7 +459,7 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => {
       cy.checkBalanceRow("21", {
         name: "Playground csUSDT-DeFiChain",
         amount: "20.00000000",
-        displaySymbol: "depUSDT-DFI",
+        displaySymbol: "ex_USDT-DFI",
         symbol: "USDT-DFI",
         usdAmount: "$133.04",
       });

diff --git a/mobile-app/cypress/support/utils.ts b/mobile-app/cypress/support/utils.ts
@@ -235,12 +235,12 @@ export const samplePoolPair = [
   {
     id: "21",
     symbol: "USDT-DFI",
-    displaySymbol: "depUSDT-DFI",
+    displaySymbol: "ex_USDT-DFI",
     name: "Playground csUSDT-Default Defi token",
     status: true,
     tokenA: {
       symbol: "USDT",
-      displaySymbol: "depUSDT",
+      displaySymbol: "ex_USDT",
       id: "3",
       name: "Playground csUSDT",
       reserve: "10000000",