From 5aa21369743acba969c5d986eb29f80a5c54056f Mon Sep 17 00:00:00 2001 From: nattadex Date: Fri, 19 Jul 2024 15:22:50 +0800 Subject: [PATCH] remove usdt denomination --- .../Loans/VaultDetail/components/ActiveUSDValue.tsx | 6 +++--- .../VaultDetail/components/ActiveUSDValueV2.tsx | 6 +++--- .../screens/Portfolio/PortfolioScreen.tsx | 12 ++++++------ .../components/TokenBreakdownDetails.test.tsx | 2 +- .../Portfolio/components/TokenBreakdownDetails.tsx | 8 ++++---- .../Portfolio/components/TokenBreakdownDetailsV2.tsx | 2 +- .../Portfolio/components/TotalPortfolio.test.tsx | 4 ++-- .../screens/Portfolio/components/TotalPortfolio.tsx | 11 +++++------ .../screens/Portfolio/hooks/PortfolioCurrency.ts | 4 ++-- .../screens/Portfolio/screens/TokenDetailScreen.tsx | 4 ++-- 10 files changed, 29 insertions(+), 30 deletions(-) diff --git a/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/ActiveUSDValue.tsx b/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/ActiveUSDValue.tsx index 6f8dd9e88c..309b2cd90f 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/ActiveUSDValue.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/ActiveUSDValue.tsx @@ -32,13 +32,13 @@ export const ActiveUSDValue = React.memo( displayType="text" prefix={ props.denominationCurrency === undefined || - props.denominationCurrency === PortfolioButtonGroupTabKey.USDT + props.denominationCurrency === PortfolioButtonGroupTabKey.USDC ? "≈ $" : undefined } suffix={ props.denominationCurrency !== undefined && - props.denominationCurrency !== PortfolioButtonGroupTabKey.USDT + props.denominationCurrency !== PortfolioButtonGroupTabKey.USDC ? ` ${props.denominationCurrency}` : undefined } @@ -56,5 +56,5 @@ export const ActiveUSDValue = React.memo( {props.isOraclePrice === true && } ); - } + }, ); diff --git a/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/ActiveUSDValueV2.tsx b/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/ActiveUSDValueV2.tsx index 948e5f73e3..38256d5d9d 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/ActiveUSDValueV2.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Loans/VaultDetail/components/ActiveUSDValueV2.tsx @@ -32,13 +32,13 @@ export const ActiveUSDValueV2 = React.memo( displayType="text" prefix={ props.denominationCurrency === undefined || - props.denominationCurrency === PortfolioButtonGroupTabKey.USDT + props.denominationCurrency === PortfolioButtonGroupTabKey.USDC ? "$" : undefined } suffix={ props.denominationCurrency !== undefined && - props.denominationCurrency !== PortfolioButtonGroupTabKey.USDT + props.denominationCurrency !== PortfolioButtonGroupTabKey.USDC ? ` ${props.denominationCurrency}` : undefined } @@ -56,5 +56,5 @@ export const ActiveUSDValueV2 = React.memo( {props.isOraclePrice === true && } ); - } + }, ); diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx index a4f9ba4024..8132f74f2c 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx @@ -328,12 +328,12 @@ export function PortfolioScreen({ navigation }: Props): JSX.Element { }; const portfolioButtonGroup = [ - { - id: PortfolioButtonGroupTabKey.USDT, - label: translate("screens/PortfolioScreen", "USDT"), - handleOnPress: () => - onPortfolioButtonGroupChange(PortfolioButtonGroupTabKey.USDT), - }, + // { + // id: PortfolioButtonGroupTabKey.USDT, + // label: translate("screens/PortfolioScreen", "USDT"), + // handleOnPress: () => + // onPortfolioButtonGroupChange(PortfolioButtonGroupTabKey.USDT), + // }, { id: PortfolioButtonGroupTabKey.DFI, label: translate("screens/PortfolioScreen", "DFI"), diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetails.test.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetails.test.tsx index 13e4366fec..47a37a0285 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetails.test.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetails.test.tsx @@ -15,7 +15,7 @@ describe("Token Breakdown Details", () => { availableAmount={new BigNumber("99")} availableValue={new BigNumber("999999.12345678")} testID="foo" - denominationCurrency={PortfolioButtonGroupTabKey.USDT} + denominationCurrency={PortfolioButtonGroupTabKey.USDC} /> ); const rendered = render(component); diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetails.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetails.tsx index b6dbeb81e4..ab591c33a2 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetails.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetails.tsx @@ -50,12 +50,12 @@ export function TokenBreakdownDetails( }} containerStyle={tailwind("mb-2")} prefix={ - props.denominationCurrency === PortfolioButtonGroupTabKey.USDT + props.denominationCurrency === PortfolioButtonGroupTabKey.USDC ? "≈ $" : undefined } suffix={ - props.denominationCurrency !== PortfolioButtonGroupTabKey.USDT + props.denominationCurrency !== PortfolioButtonGroupTabKey.USDC ? ` ${props.denominationCurrency}` : undefined } @@ -81,12 +81,12 @@ export function TokenBreakdownDetails( dark: tailwind("text-gray-400"), }} prefix={ - props.denominationCurrency === PortfolioButtonGroupTabKey.USDT + props.denominationCurrency === PortfolioButtonGroupTabKey.USDC ? "≈ $" : undefined } suffix={ - props.denominationCurrency !== PortfolioButtonGroupTabKey.USDT + props.denominationCurrency !== PortfolioButtonGroupTabKey.USDC ? ` ${props.denominationCurrency}` : undefined } diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetailsV2.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetailsV2.tsx index a0e9c681fc..d428f18008 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetailsV2.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenBreakdownDetailsV2.tsx @@ -86,7 +86,7 @@ export function TokenBreakdownDetailsV2( return getTokenPrice(symbol, amount, isLPs); }; const isUSDDenomination = - denominationCurrency === PortfolioButtonGroupTabKey.USDT; + denominationCurrency === PortfolioButtonGroupTabKey.USDC; return ( { totalLoansValue={new BigNumber(100)} portfolioButtonGroup={[ { - id: PortfolioButtonGroupTabKey.USDT, + id: PortfolioButtonGroupTabKey.USDC, label: "USD", handleOnPress: jest.fn(), }, ]} - denominationCurrency={PortfolioButtonGroupTabKey.USDT} + denominationCurrency={PortfolioButtonGroupTabKey.USDC} setDenominationCurrency={jest.fn()} /> diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TotalPortfolio.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TotalPortfolio.tsx index 9b630bef2a..d4c4c65403 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TotalPortfolio.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TotalPortfolio.tsx @@ -19,7 +19,6 @@ import { BalanceText } from "./BalanceText"; import { BalanceTextV2 } from "./BalanceTextV2"; export enum PortfolioButtonGroupTabKey { - USDT = "USDT", DFI = "DFI", BTC = "BTC", DUSD = "DUSD", @@ -98,7 +97,7 @@ export function TotalPortfolio(props: TotalPortfolioProps): JSX.Element { (PortfolioButtonGroupTabKey.USDT); + useState(PortfolioButtonGroupTabKey.USDC); useEffect(() => { PortfolioCurrencyPersistence.get() @@ -22,7 +22,7 @@ export function useDenominationCurrency(): PortfolioCurrency { }, []); const updatePortfolioCurrency = async ( - denomination: PortfolioButtonGroupTabKey + denomination: PortfolioButtonGroupTabKey, ): Promise => { setDenominationCurrency(denomination); await PortfolioCurrencyPersistence.set(denomination); 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 44c5d29489..5fc09742b7 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokenDetailScreen.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokenDetailScreen.tsx @@ -538,12 +538,12 @@ function TokenSummary(props: {