refactor(trading): move currencies to the common & invity-api update

Author: sherpaPSX

packages/suite/package.json

@@ -150,7 +150,7 @@
         "@testing-library/user-event": "^14.6.1",
         "@trezor/eslint": "workspace:*",
         "@types/file-saver": "^2.0.6",
-        "@types/invity-api": "^1.1.14",
+        "@types/invity-api": "^1.1.15",
         "@types/pako": "^2.0.4",
         "@types/pdfmake": "^0.3.1",
         "@types/react": "19.1.6",

packages/suite/src/hooks/wallet/trading/form/common/useTradingFormActions.ts

@@ -15,6 +15,7 @@ import {
     type TradingExchangeFormProps,
     type TradingSellFormProps,
     isCountrySubdivisionEmpty,
+    mapFiatCurrencyCodeToBaseCurrencyCode,
     tradingExchangeActions,
 } from '@suite-common/trading';
 import {
@@ -90,7 +91,7 @@ export const useTradingFormActions = <T extends TradingSellExchangeFormProps>({
     const tradingFiatValues = useTradingFiatValues({
         cryptoId: sendCryptoSelect?.id,
         amount: sendCryptoAccount?.balance,
-        fiatCurrency: getValues().outputs?.[0]?.currency?.value as FiatCurrencyCode,
+        fiatCurrency: getValues().outputs?.[0]?.currency?.value || undefined,
     });
 
     const { getAssetDecimals } = useTradingAssetDecimals();
@@ -123,7 +124,10 @@ export const useTradingFormActions = <T extends TradingSellExchangeFormProps>({
 
         if (!tradingFiatValues) return;
 
-        const rate = await tradingFiatValues.fiatRatesUpdater(value);
+        const mappedBaseCurrencyCode = mapFiatCurrencyCodeToBaseCurrencyCode(value);
+        if (!mappedBaseCurrencyCode) return;
+
+        const rate = await tradingFiatValues.fiatRatesUpdater(mappedBaseCurrencyCode);
         const amount = getValues(TRADING_FORM_OUTPUT_AMOUNT);
         const formattedAmount = new BigNumber(
             shouldSendInSats ? convertAmountSubunitsToUnits(amount, networkDecimals) : amount,
@@ -191,10 +195,16 @@ export const useTradingFormActions = <T extends TradingSellExchangeFormProps>({
         setAccountOnChange(account);
         changeFeeLevel('normal'); // reset fee level
 
-        await tradingFiatValues?.fiatRatesUpdater(
-            getValues(TRADING_FORM_OUTPUT_CURRENCY)?.value as FiatCurrencyCode,
-            selected.contractAddress as TokenAddress,
+        const mappedBaseCurrencyCode = mapFiatCurrencyCodeToBaseCurrencyCode(
+            getValues(TRADING_FORM_OUTPUT_CURRENCY)?.value,
         );
+
+        if (mappedBaseCurrencyCode) {
+            await tradingFiatValues?.fiatRatesUpdater(
+                mappedBaseCurrencyCode,
+                selected.contractAddress as TokenAddress,
+            );
+        }
     };
 
     const setRatioAmount = (divisor: number) => {

packages/suite/src/hooks/wallet/trading/form/useTradingBuyForm.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 
-import type { BuyTrade, BuyTradeResponse, FiatCurrencyCode } from 'invity-api';
+import type { BuyTrade, BuyTradeResponse } from 'invity-api';
 import useDebounce from 'react-use/lib/useDebounce';
 
 import { events } from '@suite/analytics';
@@ -17,6 +17,7 @@ import {
     buyThunks,
     getTradingQuotesByPaymentMethod,
     isCountrySubdivisionEmpty,
+    mapFiatCurrencyCodeToBaseCurrencyCode,
     selectTradingBuy,
     selectTradingPaymentMethods,
     selectTradingVerifiedAddress,
@@ -90,12 +91,12 @@ export const useTradingBuyForm = ({
         ? {
               cryptoId: selectedQuote.receiveCurrency,
               amount: selectedQuote.receiveAmount?.toString(),
-              fiatCurrency: selectedQuote.fiatCurrency as FiatCurrencyCode | undefined,
+              fiatCurrency: mapFiatCurrencyCodeToBaseCurrencyCode(selectedQuote.fiatCurrency),
           }
         : {
               cryptoId: quotesRequest?.receiveCurrency,
               amount: quotesRequest?.cryptoStringAmount,
-              fiatCurrency: quotesRequest?.fiatCurrency as FiatCurrencyCode | undefined,
+              fiatCurrency: mapFiatCurrencyCodeToBaseCurrencyCode(quotesRequest?.fiatCurrency),
           };
     useTradingFiatValues(fiatTradingValuesParams);
 

packages/suite/src/hooks/wallet/trading/form/useTradingBuyFormDefaultValues.ts

@@ -1,25 +1,24 @@
 import { useMemo } from 'react';
 
-import { CryptoId, FiatCurrencyCode } from 'invity-api';
+import { CryptoId } from 'invity-api';
 
 import {
     TRADING_DEFAULT_PAYMENT_METHOD,
     type TradingBuyInfoSelector,
     TradingCountryCode,
     type TradingPaymentMethodListProps,
-    enabledTradingCurrencies,
+    buildTradingFiatOption,
     getDefaultCountry,
     getDefaultCountrySubdivision,
+    getSupportedFiatCurrencyWithFallback,
     regional,
     useTradingAssets,
 } from '@suite-common/trading';
 import { selectBaseCurrency } from '@suite-common/wallet-core';
-import { isArrayMember, typedObjectValues } from '@trezor/utils';
 
 import { useSelector } from 'src/hooks/suite';
 import { selectTorState } from 'src/selectors/suite/suiteSelectors';
 import { TradingBuyFormDefaultValuesProps } from 'src/types/trading/tradingForm';
-import { buildTradingFiatOption } from 'src/utils/wallet/trading/tradingUtils';
 
 export const useTradingBuyFormDefaultValues = (
     cryptoId: CryptoId | undefined,
@@ -51,16 +50,10 @@ export const useTradingBuyFormDefaultValues = (
     );
 
     const baseCurrencyCode = useSelector(selectBaseCurrency);
-    const isEnabledTradingCurrency = isArrayMember(
-        baseCurrencyCode,
-        typedObjectValues(enabledTradingCurrencies),
-    );
-    const suggestedFiatCurrency = (
-        isEnabledTradingCurrency ? baseCurrencyCode : 'usd'
-    ) as FiatCurrencyCode;
+    const suggestedFiatCurrency = getSupportedFiatCurrencyWithFallback(baseCurrencyCode);
     const defaultCurrency = useMemo(
-        () => buildTradingFiatOption(isEnabledTradingCurrency ? baseCurrencyCode : 'usd'),
-        [isEnabledTradingCurrency, baseCurrencyCode],
+        () => buildTradingFiatOption(suggestedFiatCurrency),
+        [suggestedFiatCurrency],
     );
     const defaultValues = useMemo(
         () => ({

packages/suite/src/hooks/wallet/trading/form/useTradingBuyFormRedirectValues.ts

@@ -1,15 +1,15 @@
-import { BuyTradeQuoteRequest, FiatCurrencyCode } from 'invity-api';
+import { BuyTradeQuoteRequest } from 'invity-api';
 
 import {
     TradingBuyFormProps,
     TradingCountryCode,
+    buildTradingFiatOption,
     getDefaultCountry,
     getDefaultCountrySubdivision,
+    getSupportedFiatCurrencyWithFallback,
     useTradingAssets,
 } from '@suite-common/trading';
 
-import { buildTradingFiatOption } from 'src/utils/wallet/trading/tradingUtils';
-
 export const useTradingBuyFormRedirectValues = (
     isFromRedirect: boolean,
     quotesRequest: BuyTradeQuoteRequest | undefined,
@@ -21,7 +21,9 @@ export const useTradingBuyFormRedirectValues = (
     return {
         amountInCrypto: quotesRequest.wantCrypto,
         cryptoSelect: createAssetOptionFromCryptoId(quotesRequest.receiveCurrency),
-        currencySelect: buildTradingFiatOption(quotesRequest.fiatCurrency as FiatCurrencyCode),
+        currencySelect: buildTradingFiatOption(
+            getSupportedFiatCurrencyWithFallback(quotesRequest.fiatCurrency),
+        ),
         countrySelect: getDefaultCountry(quotesRequest.country as TradingCountryCode),
         countrySubdivisionSelect: getDefaultCountrySubdivision(quotesRequest.subdivision),
 

packages/suite/src/hooks/wallet/trading/form/useTradingExchangeForm.ts

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 import { useDebounce } from 'react-use';
 
-import type { DexApprovalType, ExchangeTrade, FiatCurrencyCode } from 'invity-api';
+import type { DexApprovalType, ExchangeTrade } from 'invity-api';
 
 import { events } from '@suite/analytics';
 import { TranslationKey, useTranslation } from '@suite/intl';
@@ -192,7 +192,7 @@ export const useTradingExchangeForm = ({
     useTradingFiatValues({
         cryptoId: receiveCryptoSelect?.id,
         amount: selectedQuote?.receiveStringAmount,
-        fiatCurrency: output?.currency?.value as FiatCurrencyCode | undefined,
+        fiatCurrency: output?.currency?.value || undefined,
     });
 
     const formIsValid = Object.keys(formState.errors).length === 0;

packages/suite/src/hooks/wallet/trading/form/useTradingExchangeFormDefaultValues.ts

@@ -15,18 +15,16 @@ import {
     TradingExchangeKycFilter,
     TradingExchangeRateFilter,
     TradingExchangeRateType,
-    enabledTradingCurrencies,
+    buildTradingBaseCurrencyOptionFromFiat,
+    buildTradingFiatOption,
+    getSupportedFiatCurrencyWithFallback,
 } from '@suite-common/trading';
 import { DEFAULT_PAYMENT, DEFAULT_VALUES } from '@suite-common/wallet-constants';
 import { selectBaseCurrency } from '@suite-common/wallet-core';
 import { AccountKey, FormState, Output } from '@suite-common/wallet-types';
-import { isArrayMember, typedObjectValues } from '@trezor/utils';
 
 import { useSelector } from 'src/hooks/suite';
-import {
-    buildTradingFiatOption,
-    resolveAddressAndToken,
-} from 'src/utils/wallet/trading/tradingUtils';
+import { resolveAddressAndToken } from 'src/utils/wallet/trading/tradingUtils';
 
 import { useTradingDefaultSellAsset } from './common/useTradingDefaultSellAsset';
 
@@ -37,11 +35,7 @@ export const useTradingExchangeFormDefaultValues = (accountKey: AccountKey, cryp
         () =>
             // Here, we are using BaseCurrency as a way how to determine the users preferred Sell/Buy currency,
             // however, they may not be available (or it is 'btc'). In that case, we fall back to 'usd'
-            buildTradingFiatOption(
-                isArrayMember(baseCurrencyCode, typedObjectValues(enabledTradingCurrencies))
-                    ? baseCurrencyCode
-                    : 'usd',
-            ),
+            buildTradingFiatOption(getSupportedFiatCurrencyWithFallback(baseCurrencyCode)),
         [baseCurrencyCode],
     );
     const { account, defaultAsset } = useTradingDefaultSellAsset({ accountKey, cryptoId });
@@ -50,7 +44,7 @@ export const useTradingExchangeFormDefaultValues = (accountKey: AccountKey, cryp
     const defaultPayment: Output = useMemo(
         () => ({
             ...DEFAULT_PAYMENT,
-            currency: defaultCurrency,
+            currency: buildTradingBaseCurrencyOptionFromFiat(defaultCurrency.value),
             address,
             token,
         }),

packages/suite/src/hooks/wallet/trading/form/useTradingSellFormDefaultValues.ts

@@ -6,23 +6,21 @@ import {
     TRADING_DEFAULT_PAYMENT_METHOD,
     TradingCountryCode,
     type TradingPaymentMethodListProps,
-    enabledTradingCurrencies,
+    buildTradingBaseCurrencyOptionFromFiat,
+    buildTradingFiatOption,
     getDefaultCountry,
     getDefaultCountrySubdivision,
+    getSupportedFiatCurrencyWithFallback,
     regional,
 } from '@suite-common/trading';
 import { DEFAULT_PAYMENT, DEFAULT_VALUES } from '@suite-common/wallet-constants';
 import { selectBaseCurrency } from '@suite-common/wallet-core';
 import { AccountKey, FormState, Output } from '@suite-common/wallet-types';
-import { isArrayMember, typedObjectValues } from '@trezor/utils';
 
 import { useSelector } from 'src/hooks/suite';
 import { selectTorState } from 'src/selectors/suite/suiteSelectors';
 import { TradingSellFormDefaultValuesProps } from 'src/types/trading/tradingForm';
-import {
-    buildTradingFiatOption,
-    resolveAddressAndToken,
-} from 'src/utils/wallet/trading/tradingUtils';
+import { resolveAddressAndToken } from 'src/utils/wallet/trading/tradingUtils';
 
 import { useTradingDefaultSellAsset } from './common/useTradingDefaultSellAsset';
 
@@ -58,18 +56,13 @@ export const useTradingSellFormDefaultValues = (
     );
     const baseCurrencyCode = useSelector(selectBaseCurrency);
     const defaultCurrency = useMemo(
-        () =>
-            buildTradingFiatOption(
-                isArrayMember(baseCurrencyCode, typedObjectValues(enabledTradingCurrencies))
-                    ? baseCurrencyCode
-                    : 'usd',
-            ),
+        () => buildTradingFiatOption(getSupportedFiatCurrencyWithFallback(baseCurrencyCode)),
         [baseCurrencyCode],
     );
     const defaultPayment: Output = useMemo(
         () => ({
             ...DEFAULT_PAYMENT,
-            currency: defaultCurrency,
+            currency: buildTradingBaseCurrencyOptionFromFiat(defaultCurrency.value),
             address,
             token,
         }),

packages/suite/src/hooks/wallet/trading/form/useTradingSellFormRedirectValues.ts

@@ -1,12 +1,13 @@
 import { useCallback, useMemo } from 'react';
 
-import { FiatCurrencyCode, SellFiatTradeQuoteRequest } from 'invity-api';
+import { SellFiatTradeQuoteRequest } from 'invity-api';
 
 import {
     TradingAssetOption,
     TradingAssetSellOption,
     TradingCountryCode,
     type TradingSellFormProps,
+    buildTradingBaseCurrencyOptionFromFiat,
     getDefaultCountry,
     getDefaultCountrySubdivision,
     selectTradingComposedTransactionInfo,
@@ -18,10 +19,7 @@ import { getContractAddressForNetworkSymbol } from '@suite-common/wallet-utils';
 import { useCurrentRef } from '@trezor/react-utils';
 
 import { useSelector } from 'src/hooks/suite';
-import {
-    buildTradingFiatOption,
-    resolveAddressAndToken,
-} from 'src/utils/wallet/trading/tradingUtils';
+import { resolveAddressAndToken } from 'src/utils/wallet/trading/tradingUtils';
 
 export const useTradingSellFormRedirectValues = (
     isFromRedirect: boolean,
@@ -95,9 +93,7 @@ export const useTradingSellFormRedirectValues = (
                   {
                       ...DEFAULT_PAYMENT,
                       fiat: quotesRequest.fiatStringAmount as string,
-                      currency: buildTradingFiatOption(
-                          quotesRequest.fiatCurrency as FiatCurrencyCode,
-                      ),
+                      currency: buildTradingBaseCurrencyOptionFromFiat(quotesRequest.fiatCurrency),
                       amount: quotesRequest.cryptoStringAmount as string,
                       address,
                       token,

packages/suite/src/utils/wallet/trading/__tests__/tradingUtils.test.ts

@@ -1,6 +1,7 @@
+import { buildTradingFiatOption } from '@suite-common/trading';
+
 import { FIXTURE_ACCOUNT_OPTIONS } from 'src/utils/wallet/trading/__fixtures__/tradingUtils';
 import {
-    buildTradingFiatOption,
     getCountryLabelParts,
     getTradeTypeByRoute,
     resolveAddressAndToken,