diff --git a/mobile-app/app/__mocks__/@waveshq/walletkit-ui.ts b/mobile-app/app/__mocks__/@waveshq/walletkit-ui.ts index 7ee69c176a..a8978ab8a5 100644 --- 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: "csUSDT", + displaySymbol: "depUSDT", }, bestPath: [ { @@ -72,7 +72,7 @@ export const useWhaleApiClient = () => ({ tokenA: { id: "3", symbol: "USDT", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", }, tokenB: { id: "0", diff --git a/mobile-app/app/api/token/dusdt_converter.ts b/mobile-app/app/api/token/dusdt_converter.ts index 72d0afda21..b2d11464bb 100644 --- a/mobile-app/app/api/token/dusdt_converter.ts +++ b/mobile-app/app/api/token/dusdt_converter.ts @@ -1,75 +1,90 @@ +const updated_dusdt_name = "depUSDT"; + export function dusdt_converter_token(token: any) { if (token.displayTextSymbol) { - return { ...token, displaySymbol: "csUSDT", displayTextSymbol: "csUSDT" }; + return { + ...token, + displaySymbol: updated_dusdt_name, + displayTextSymbol: updated_dusdt_name, + }; } - return { ...token, displaySymbol: "csUSDT" }; + return { + ...token, + displaySymbol: updated_dusdt_name, + name: "Playground depUSDT", + }; } export function dusdt_converter_pool_pair(availablePairs: any) { if (availablePairs.length > 1) { return availablePairs.map((pair: any) => { - const updatedPair = { + return { ...pair, data: { ...pair.data, - symbol: pair.data.symbol.replace(/dUSDT/g, "csUSDT"), - displaySymbol: pair.data.displaySymbol.replace(/dUSDT/g, "csUSDT"), + symbol: pair.data.symbol.replace(/dUSDT/g, updated_dusdt_name), + displaySymbol: pair.data.displaySymbol.replace( + /dUSDT/g, + updated_dusdt_name, + ), tokenA: { ...pair.data.tokenA, symbol: pair.data.tokenA.symbol === "dUSDT" - ? "csUSDT" + ? updated_dusdt_name : pair.data.tokenA.symbol, displaySymbol: pair.data.tokenA.displaySymbol === "dUSDT" - ? "csUSDT" + ? updated_dusdt_name : pair.data.tokenA.displaySymbol, }, tokenB: { ...pair.data.tokenB, symbol: pair.data.tokenB.symbol === "dUSDT" - ? "csUSDT" + ? updated_dusdt_name : pair.data.tokenB.symbol, displaySymbol: pair.data.tokenB.displaySymbol === "dUSDT" - ? "csUSDT" + ? updated_dusdt_name : pair.data.tokenB.displaySymbol, }, }, }; - return updatedPair; }); } else { return { ...availablePairs, data: { ...availablePairs.data, - symbol: availablePairs.data.symbol.replace(/dUSDT/g, "csUSDT"), + symbol: availablePairs.data.symbol.replace( + /dUSDT/g, + updated_dusdt_name, + ), displaySymbol: availablePairs.data.displaySymbol.replace( /dUSDT/g, - "csUSDT", + updated_dusdt_name, ), tokenA: { ...availablePairs.data.tokenA, symbol: availablePairs.data.tokenA.symbol === "dUSDT" - ? "csUSDT" + ? updated_dusdt_name : availablePairs.data.tokenA.symbol, displaySymbol: availablePairs.data.tokenA.displaySymbol === "dUSDT" - ? "csUSDT" + ? updated_dusdt_name : availablePairs.data.tokenA.displaySymbol, }, tokenB: { ...availablePairs.data.tokenB, symbol: availablePairs.data.tokenB.symbol === "dUSDT" - ? "csUSDT" + ? updated_dusdt_name : availablePairs.data.tokenB.symbol, displaySymbol: availablePairs.data.tokenB.displaySymbol === "dUSDT" - ? "csUSDT" + ? updated_dusdt_name : availablePairs.data.tokenB.displaySymbol, }, }, diff --git a/mobile-app/app/components/TokenDropdownButton.tsx b/mobile-app/app/components/TokenDropdownButton.tsx index 77a5aa23a6..8aa37100e9 100644 --- a/mobile-app/app/components/TokenDropdownButton.tsx +++ b/mobile-app/app/components/TokenDropdownButton.tsx @@ -25,7 +25,7 @@ export function TokenDropdownButton(props: { status: TokenDropdownButtonStatus; isEvmToken?: boolean; }): JSX.Element { - if (props.tokenId === "3") { + if (props.symbol === "USDT") { props = dusdt_converter_token(props); } const Icon = diff --git a/mobile-app/app/components/icons/assets/csUSDT.tsx b/mobile-app/app/components/icons/assets/depUSDT.tsx similarity index 92% rename from mobile-app/app/components/icons/assets/csUSDT.tsx rename to mobile-app/app/components/icons/assets/depUSDT.tsx index 4a1d94da12..169b0a27b0 100644 --- a/mobile-app/app/components/icons/assets/csUSDT.tsx +++ b/mobile-app/app/components/icons/assets/depUSDT.tsx @@ -1,6 +1,6 @@ import Svg, { Circle, Path, SvgProps } from "react-native-svg"; -export function csUSDT(props: SvgProps): JSX.Element { +export function depUSDT(props: SvgProps): JSX.Element { return ( diff --git a/mobile-app/app/components/icons/assets/index.test.tsx b/mobile-app/app/components/icons/assets/index.test.tsx index c9d90c14a9..b1e0d0a566 100644 --- 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", - "csUSDT", + "depUSDT", "dUSDC", "FAKE", "dDUSD", @@ -41,7 +41,7 @@ const icons = [ "dMSFT", "dETH-DFI", "dBTC-DFI", - "csUSDT-DFI", + "depUSDT-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 index d8ed0da877..c7ca9afa8d 100644 --- 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 { csUSDT } from "./csUSDT"; +import { depUSDT } from "./depUSDT"; import { dUSD } from "./dUSD"; import { DFIlogo } from "./plainDFI"; import { dEUROC } from "./dEUROC"; @@ -39,7 +39,7 @@ const mapping: Record JSX.Element> = { dDOGE: dDOGE, dETH: dETH, dLTC: dLTC, - csUSDT: csUSDT, + depUSDT: depUSDT, 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 index 5324c7501d..16b714cc8e 100644 --- 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.id === "3" - ? "csUSDT" + ? "depUSDT" : poolpair.tokenA.displaySymbol, }, tokenB: { ...poolpair.tokenB, displaySymbol: poolpair.tokenB.id === "3" - ? "csUSDT" + ? "depUSDT" : 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 index a7d3ae1126..a169bc265d 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Dex/DexScreen.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Dex/DexScreen.tsx @@ -24,6 +24,7 @@ import { debounce } from "lodash"; import { HeaderSearchInput } from "@components/HeaderSearchInput"; import { ScrollView } from "react-native"; import { ScreenName } from "@screens/enum"; +import { useFavouritePoolpairContext } from "@contexts/FavouritePoolpairContext"; import { EmptyActivePoolpair } from "./components/EmptyActivePoolPair"; import { ButtonGroupTabKey, @@ -32,7 +33,6 @@ import { import { ButtonGroup } from "./components/ButtonGroup"; import { DexParamList } from "./DexNavigator"; import { AssetsFilterItem } from "../Portfolio/components/AssetsFilterRow"; -import { useFavouritePoolpairContext } from "../../../../contexts/FavouritePoolpairContext"; enum TabKey { YourPoolPair = "YOUR_POOL_PAIRS", @@ -313,14 +313,14 @@ export function DexScreen(): JSX.Element { ...item.data.tokenA, displaySymbol: item.data.tokenA.id === "3" - ? "csUSDT" + ? "depUSDT" : item.data.tokenA.displaySymbol, }, tokenB: { ...item.data.tokenB, displaySymbol: item.data.tokenB.id === "3" - ? "csUSDT" + ? "depUSDT" : 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 index 7d37e40400..c1c462c244 100644 --- 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 csUSDTDUSDPair = pairs.find( - (p) => p.data.displaySymbol === "csUSDT-DUSD", + const depUSDTDUSDPair = pairs.find( + (p) => p.data.displaySymbol === "depUSDT-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 ( - csUSDTDUSDPair !== undefined && + depUSDTDUSDPair !== undefined && tokenADisplaySymbol === "DUSD" && - tokenBDisplaySymbol === "csUSDT" + tokenBDisplaySymbol === "depUSDT" ) { - fee = csUSDTDUSDPair.data.tokenB.fee?.pct; + fee = depUSDTDUSDPair.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 === "csUSDT" + pair.tokenBDisplaySymbol === "depUSDT" ) { - highFeesUrl = "https://defiscan.live/dex/csUSDT-DUSD"; + highFeesUrl = "https://defiscan.live/dex/depUSDT-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 === "csUSDT") || + tokenB.displaySymbol === "depUSDT") || (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: "csUSDT" }, + { tokenADisplaySymbol: "DUSD", tokenBDisplaySymbol: "depUSDT" }, { tokenADisplaySymbol: "DUSD", tokenBDisplaySymbol: "dUSDC" }, { tokenADisplaySymbol: "DUSD", tokenBDisplaySymbol: "dEUROC" }, ], diff --git a/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/VaultDetailCollateralsRow.tsx b/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/VaultDetailCollateralsRow.tsx index ffe2cc22ec..ff8915388d 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/VaultDetailCollateralsRow.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/VaultDetailCollateralsRow.tsx @@ -142,7 +142,7 @@ export function VaultDetailCollateralsRow({ collateralItem={collateralItem} totalCollateralValue={new BigNumber(vault.collateralValue)} displaySymbol={ - collateral.id === "3" ? "csUSDT" : collateral.displaySymbol + collateral.id === "3" ? "depUSDT" : collateral.displaySymbol } amount={new BigNumber(collateral.amount)} onAddCollateralPress={() => onAddPress(collateralItem)} diff --git a/mobile-app/app/screens/AppNavigator/screens/Loans/components/VaultCard.tsx b/mobile-app/app/screens/AppNavigator/screens/Loans/components/VaultCard.tsx index 0e9c209bfd..0e09462cf4 100644 --- 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" - ? "csUSDT" + ? "depUSDT" : 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 index 75107275cf..6b8b80fbf0 100644 --- 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.id === "3" ? "csUSDT" : c.token.displaySymbol, + c.token.id === "3" ? "depUSDT" : 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 index c87ff01556..7d09b55725 100644 --- 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: "csUSDT", + displaySymbol: "depUSDT", 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 index 241872d74b..320617e865 100644 --- 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: "csUSDT", + displaySymbol: "depUSDT", 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 index b82ccab8f4..9b1349ca85 100644 --- 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.id === "3" ? "csUSDT" : t.displaySymbol, + displaySymbol: t.id === "3" ? "depUSDT" : 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 index 9c879c4180..44c5d29489 100644 --- 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.id === "3") { - const csUSDTtoken = dusdt_converter_token(token); - setToken(csUSDTtoken); + const depUSDTtoken = dusdt_converter_token(token); + setToken(depUSDTtoken); } 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 index f7e60fd406..f4c74a7831 100644 --- 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, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)", ), 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 index f3784044e1..5df6438405 100644 --- a/mobile-app/cypress/e2e/functional/wallet/portfolio/portfolio.spec.ts +++ b/mobile-app/cypress/e2e/functional/wallet/portfolio/portfolio.spec.ts @@ -73,8 +73,8 @@ const getDexPrice = (price: { denomination: { id: "3", symbol: "USDT", - displaySymbol: "csUSDT", - name: "Playground USDT", + displaySymbol: "depUSDT", + name: "Playground csUSDT", }, dexPrices: { DUSD: { 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 index f717941813..edfefdbe74 100644 --- 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: "csUSDT-DFI", + displaySymbol: "depUSDT-DFI", name: "Decentralized USD-Default Defi token", status: true, tokenA: { symbol: "USDT", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", id: "14", reserve: pair2ReserveA, blockCommission: "0", @@ -152,8 +152,8 @@ const getDexPrice = (price: { denomination: { id: "3", symbol: "USDT", - displaySymbol: "csUSDT", - name: "Playground USDT", + displaySymbol: "depUSDT", + name: "Playground csUSDT", }, dexPrices: { DUSD: { @@ -230,12 +230,12 @@ const addLPTokens = [ }, { amount: "25.00000000", - displaySymbol: "csUSDT-DFI", + displaySymbol: "depUSDT-DFI", id: "19", isDAT: true, isLPS: true, isLoanToken: false, - name: "Playground USDT-Default Defi token", + name: "Playground csUSDT-Default Defi token", symbol: "USDT-DFI", symbolKey: "USDT-DFI", }, @@ -434,12 +434,12 @@ context( interceptTokensForSorting(addLPTokens); togglePortfolioDenomination("DFI"); cy.getByTestID("portfolio_button_group_LP_TOKENS").click(); - checkAssetsSortingOrder("Highest value (DFI)", "dBTC-DFI", "csUSDT-DFI"); + checkAssetsSortingOrder("Highest value (DFI)", "dBTC-DFI", "depUSDT-DFI"); }); it("should sort assets based on Lowest value (DFI)", () => { interceptTokensForSorting(addLPTokens); - checkAssetsSortingOrder("Lowest value (DFI)", "csUSDT-DFI", "dBTC-DFI"); + checkAssetsSortingOrder("Lowest value (DFI)", "depUSDT-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 index 07378f02b5..427dd61163 100644 --- 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,8 +8,8 @@ const getDexPrice = (price: { denomination: { id: "3", symbol: "USDT", - displaySymbol: "csUSDT", - name: "Playground USDT", + displaySymbol: "depUSDT", + name: "Playground csUSDT", }, dexPrices: { DUSD: { @@ -157,12 +157,12 @@ const getChangingPoolPairReserve = ({ { id: "21", symbol: "USDT-DFI", - displaySymbol: "csUSDT-DFI", + displaySymbol: "depUSDT-DFI", name: "Decentralized USD-Default Defi token", status: true, tokenA: { symbol: "USDT", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", id: "14", reserve: pair2ReserveA, blockCommission: "0", @@ -257,16 +257,16 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => { usdAmount: "$100.00", }); cy.checkBalanceRow("3", { - name: "Playground USDT", + name: "Playground csUSDT", amount: "10.00000000", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", symbol: "USDT", usdAmount: "$10.00", }); cy.checkBalanceRow("21", { - name: "Playground USDT-DeFiChain", + name: "Playground csUSDT-DeFiChain", amount: "10.00000000", - displaySymbol: "csUSDT-DFI", + displaySymbol: "depUSDT-DFI", symbol: "USDT-DFI", usdAmount: "$66.52", }); @@ -323,17 +323,17 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => { usdAmount: "$50.00", }); cy.checkBalanceRow("3", { - name: "Playground USDT", + name: "Playground csUSDT", amount: "10.00000000", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", symbol: "USDT", usdAmount: "$10.00", }); cy.checkBalanceRow("21", { - name: "Playground USDT-DeFiChain", + name: "Playground csUSDT-DeFiChain", amount: "10.00000000", - displaySymbol: "csUSDT-DFI", + displaySymbol: "depUSDT-DFI", symbol: "USDT-DFI", usdAmount: "$49.92", }); @@ -392,18 +392,18 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => { usdAmount: "$100.00", }); cy.checkBalanceRow("3", { - name: "Playground USDT", + name: "Playground csUSDT", amount: "10.00000000", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", symbol: "USDT", usdAmount: "$10.00", }); // LP USD cy.checkBalanceRow("21", { - name: "Playground USDT-DeFiChain", + name: "Playground csUSDT-DeFiChain", amount: "10.00000000", - displaySymbol: "csUSDT-DFI", + displaySymbol: "depUSDT-DFI", symbol: "USDT-DFI", usdAmount: "$66.52", }); @@ -448,18 +448,18 @@ context("Wallet - Portfolio - USD Value", { testIsolation: false }, () => { usdAmount: "$100.00", }); cy.checkBalanceRow("3", { - name: "Playground USDT", + name: "Playground csUSDT", amount: "20.00000000", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", symbol: "USDT", usdAmount: "$20.00", }); // LP USD cy.checkBalanceRow("21", { - name: "Playground USDT-DeFiChain", + name: "Playground csUSDT-DeFiChain", amount: "20.00000000", - displaySymbol: "csUSDT-DFI", + displaySymbol: "depUSDT-DFI", symbol: "USDT-DFI", usdAmount: "$133.04", }); diff --git a/mobile-app/cypress/support/utils.ts b/mobile-app/cypress/support/utils.ts index 1290e4c49b..c08f582bb8 100644 --- a/mobile-app/cypress/support/utils.ts +++ b/mobile-app/cypress/support/utils.ts @@ -235,14 +235,14 @@ export const samplePoolPair = [ { id: "21", symbol: "USDT-DFI", - displaySymbol: "csUSDT-DFI", - name: "Playground USDT-Default Defi token", + displaySymbol: "depUSDT-DFI", + name: "Playground csUSDT-Default Defi token", status: true, tokenA: { symbol: "USDT", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", id: "3", - name: "Playground USDT", + name: "Playground csUSDT", reserve: "10000000", blockCommission: "0", }, diff --git a/shared/store/loans.test.ts b/shared/store/loans.test.ts index b8ca0f4b2d..6cbb93e4c7 100644 --- a/shared/store/loans.test.ts +++ b/shared/store/loans.test.ts @@ -296,7 +296,7 @@ describe("loans reducer", () => { id: "3", symbol: "USDT", symbolKey: "USDT", - name: "Playground USDT", + name: "Playground csUSDT", decimal: 8, limit: "0", mintable: true, @@ -314,7 +314,7 @@ describe("loans reducer", () => { height: -1, }, collateralAddress: "mswsMVsyGMj1FzDMbbxw2QW3KvQAv2FKiy", - displaySymbol: "csUSDT", + displaySymbol: "depUSDT", isLoanToken: false, }, factor: "1", diff --git a/shared/translations/languages/de.json b/shared/translations/languages/de.json index 2d37666711..606fe2a168 100644 --- a/shared/translations/languages/de.json +++ b/shared/translations/languages/de.json @@ -488,7 +488,7 @@ "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "DFI in Token-Form werden für verschiedene DeFiChain-Funktionen wie Liquiditätspools, Darlehen, Auktionen und DEX-Tauschgeschäfte verwendet.", "What are the use cases for Tokens?": "Was sind die Anwendungsbereiche für Token?", "Use cases for Tokens include (but not limited) to the following:": "Token können u.a. für folgende Zwecke eingesetzt werden:", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Tausch von DFI gegen andere Token (z. B. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Tausch von DFI gegen andere Token (z. B. dBTC, dETH, depUSDT)", "Liquidity pools": "Liquiditätspools", "Collateral for Vaults": "Sicherheiten für Vaults", "Auction bidding": "Bieten bei Auktionen", @@ -620,7 +620,7 @@ "Transaction fees": "Transaktionsgebühren", "DFI in token form": "DFI in Token-Form", "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "DFI in Token-Form werden für verschiedene DeFiChain-Funktionen wie Liquiditätspools, Darlehen, Auktionen und DEX-Tauschgeschäfte verwendet.", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Tausch von DFI gegen andere Token (z. B. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Tausch von DFI gegen andere Token (z. B. dBTC, dETH, depUSDT)", "Liquidity pools": "Liquiditätspools", "Auctions and Loans": "Auktionen und Darlehen" }, diff --git a/shared/translations/languages/es.json b/shared/translations/languages/es.json index ed7ca3a25e..e0151b7db6 100644 --- a/shared/translations/languages/es.json +++ b/shared/translations/languages/es.json @@ -502,7 +502,7 @@ "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "Los DFIs en forma de token se usan para distintas funciones en DeFiChain incluyendo: Pools de liquidez, Prestamos, Subastas e intercambios del DEX.", "What are the use cases for Tokens?": "Cuales son los casos de uso de los Tokens?", "Use cases for Tokens include (but not limited) to the following:": "Los casos de uso de los Tokens son (pero no estan limitados a) los siguientes:", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Intercambiar DFI por otros tokens (e.g dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Intercambiar DFI por otros tokens (e.g dBTC, dETH, depUSDT)", "Liquidity pools": "Pools de liquidez", "Collateral for Vaults": "Garantías para los Vaults", "Auction bidding": "Pujar en subastas", @@ -636,7 +636,7 @@ "Transaction fees": "Tasas de transacción", "DFI in token form": "DFI en forma de token.", "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "DFI en forma de token se utilizan para pools de liquidez, préstamos, subastas e intercambios.", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Intercambiar DFI con otros tokens (ex. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Intercambiar DFI con otros tokens (ex. dBTC, dETH, depUSDT)", "Liquidity pools": "Pools de liquidez", "Auctions and Loans": "Subastas y préstamos" }, diff --git a/shared/translations/languages/fr.json b/shared/translations/languages/fr.json index e603125353..01044fbc34 100644 --- a/shared/translations/languages/fr.json +++ b/shared/translations/languages/fr.json @@ -498,7 +498,7 @@ "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "Les DFI sous forme de tokens sont utilisés pour diverses fonctions de DeFiChain telles que pour les pools de liquidité, les prêts, les enchères et les échanges via le DEX.", "What are the use cases for Tokens?": "Quels sont les cas d'usage des tokens?", "Use cases for Tokens include (but not limited) to the following:": "Les cas d'usage d'UTXO comprennent (mais ne sont pas limités) à ce qui suit:", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Échange de DFI avec d'autres tokens (ex. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Échange de DFI avec d'autres tokens (ex. dBTC, dETH, depUSDT)", "Liquidity pools": "Pools de liquidité", "Collateral for Vaults": "Garanties pour les vaults", "Auction bidding": "Offres d'enchères", @@ -630,7 +630,7 @@ "Transaction fees": "Frais de transaction", "DFI in token form": "DFI sous forme de tokens.", "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "Les DFI sous forme de tokens sont utilisés pour diverses fonctions de la DeFiChain telles que pour les pools de liquidité, les prêts, les enchères et les échanges via le DEX.", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Échange de DFI avec d'autres tokens (ex. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Échange de DFI avec d'autres tokens (ex. dBTC, dETH, depUSDT)", "Liquidity pools": "Pools de liquidité", "Auctions and Loans": "Ventes aux enchères et prêts" }, diff --git a/shared/translations/languages/it.json b/shared/translations/languages/it.json index d1ab4ea47a..ecf9f7af1e 100644 --- a/shared/translations/languages/it.json +++ b/shared/translations/languages/it.json @@ -503,7 +503,7 @@ "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.", "What are the use cases for Tokens?": "What are the use cases for Tokens?", "Use cases for Tokens include (but not limited) to the following:": "Use cases for Tokens include (but not limited) to the following:", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)", "Liquidity pools": "Liquidity pools", "Collateral for Vaults": "Collateral for Vaults", "Auction bidding": "Auction bidding", @@ -635,7 +635,7 @@ "Transaction fees": "Commissioni di transazione", "DFI in token form": "DFI sotto forma di token.", "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "I DFI sotto forma di token sono utilizzati per varie funzioni della DeFiChain come i liquidity pool, i prestiti, le aste e gli scambi tramite il DEX.", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Scambio di DFI con altri token (es. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Scambio di DFI con altri token (es. dBTC, dETH, depUSDT)", "Liquidity pools": "Liquidity pool", "Auctions and Loans": "Aste e prestiti" }, diff --git a/shared/translations/languages/zh-Hans.json b/shared/translations/languages/zh-Hans.json index 47d2c1f46e..5d2278820c 100644 --- a/shared/translations/languages/zh-Hans.json +++ b/shared/translations/languages/zh-Hans.json @@ -489,7 +489,7 @@ "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.", "What are the use cases for Tokens?": "What are the use cases for Tokens?", "Use cases for Tokens include (but not limited) to the following:": "Use cases for Tokens include (but not limited) to the following:", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)", "Liquidity pools": "Liquidity pools", "Collateral for Vaults": "Collateral for Vaults", "Auction bidding": "Auction bidding", @@ -621,7 +621,7 @@ "Transaction fees": "交易费用", "DFI in token form": "DFI代币", "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "代币形式的DFI用于递飞链的各种DeFi功能，如流动性池、贷款、拍卖和DEX兑换。", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "兑换DFI成其他代币(如，dBTC, dETH, csUSDT, dUSDC)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "兑换DFI成其他代币(如，dBTC, dETH, depUSDT, dUSDC)", "Liquidity pools": "流动性池", "Auctions and Loans": "拍卖和贷款" }, diff --git a/shared/translations/languages/zh-Hant.json b/shared/translations/languages/zh-Hant.json index 99a5a70840..2d6e9c07db 100644 --- a/shared/translations/languages/zh-Hant.json +++ b/shared/translations/languages/zh-Hant.json @@ -489,7 +489,7 @@ "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.", "What are the use cases for Tokens?": "What are the use cases for Tokens?", "Use cases for Tokens include (but not limited) to the following:": "Use cases for Tokens include (but not limited) to the following:", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)", "Liquidity pools": "Liquidity pools", "Collateral for Vaults": "Collateral for Vaults", "Auction bidding": "Auction bidding", @@ -621,7 +621,7 @@ "Transaction fees": "交易費用", "DFI in token form": "DFI代幣", "DFIs in token form are used for various DeFiChain functions such as Liquidity Pools, Loans, Auctions and DEX swaps.": "代幣形式的DFI用於遞飛鏈的各種DeFi功能，如流動性池、貸款、拍賣和DEX兌換。", - "Swapping DFI with other tokens (e.g. dBTC, dETH, csUSDT)": "兌換DFI成其他代幣(如，dBTC, dETH, csUSDT, dUSDC)", + "Swapping DFI with other tokens (e.g. dBTC, dETH, depUSDT)": "兌換DFI成其他代幣(如，dBTC, dETH, depUSDT, dUSDC)", "Liquidity pools": "流動性池", "Auctions and Loans": "拍賣和貸款" },