chore(trading): rename package from invity to trading

packages/suite-desktop-core/e2e/support/pageActions/marketActions.ts

@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
 
-import { regional } from '@suite-common/invity';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
+import { regional } from '@suite-common/trading';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import {

packages/suite/package.json

@@ -37,7 +37,6 @@
         "@suite-common/formatters": "workspace:*",
         "@suite-common/icons": "workspace:*",
         "@suite-common/intl-types": "workspace:*",
-        "@suite-common/invity": "workspace:*",
         "@suite-common/logger": "workspace:*",
         "@suite-common/message-system": "workspace:*",
         "@suite-common/metadata-types": "workspace:*",
@@ -50,6 +49,7 @@
         "@suite-common/test-utils": "workspace:*",
         "@suite-common/toast-notifications": "workspace:*",
         "@suite-common/token-definitions": "workspace:*",
+        "@suite-common/trading": "workspace:*",
         "@suite-common/validators": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-constants": "workspace:*",

packages/suite/src/actions/wallet/__tests__/tradingBuyActions.test.ts

@@ -1,6 +1,6 @@
 import { BuyTrade, BuyTradeQuoteRequest, CryptoId } from 'invity-api';
 
-import { invityAPI } from '@suite-common/invity';
+import { invityAPI } from '@suite-common/trading';
 
 import { tradingReducer } from 'src/reducers/wallet/tradingReducer';
 import { configureStore } from 'src/support/tests/configureStore';

packages/suite/src/actions/wallet/__tests__/tradingExchangeActions.test.ts

@@ -1,6 +1,6 @@
 import { CryptoId, ExchangeTrade, ExchangeTradeQuoteRequest } from 'invity-api';
 
-import { invityAPI } from '@suite-common/invity';
+import { invityAPI } from '@suite-common/trading';
 
 import { tradingReducer } from 'src/reducers/wallet/tradingReducer';
 import { configureStore } from 'src/support/tests/configureStore';

packages/suite/src/actions/wallet/trading/tradingCommonActions.ts

@@ -1,7 +1,7 @@
 import { CryptoId } from 'invity-api';
 
-import type { TradingType } from '@suite-common/invity';
 import { notificationsActions } from '@suite-common/toast-notifications';
+import { type TradingType, getUnusedAddressFromAccount } from '@suite-common/trading';
 import {
     confirmAddressOnDeviceThunk,
     selectSelectedDevice,
@@ -26,7 +26,6 @@ import { ComposedTransactionInfo } from 'src/reducers/wallet/tradingReducer';
 import { Dispatch, GetState } from 'src/types/suite';
 import { Account } from 'src/types/wallet';
 import { submitRequestForm as envSubmitRequestForm } from 'src/utils/suite/env';
-import { getUnusedAddressFromAccount } from 'src/utils/wallet/trading/tradingUtils';
 
 export type TradingCommonAction =
     | {

packages/suite/src/actions/wallet/tradingBuyActions.ts

@@ -7,7 +7,7 @@ import {
     FiatCurrencyCode,
 } from 'invity-api';
 
-import { invityAPI, regional } from '@suite-common/invity';
+import { invityAPI, regional } from '@suite-common/trading';
 
 import * as modalActions from 'src/actions/suite/modalActions';
 import { verifyAddress as verifyBuyAddress } from 'src/actions/wallet/trading/tradingCommonActions';

packages/suite/src/actions/wallet/tradingExchangeActions.ts

@@ -6,7 +6,7 @@ import {
     ExchangeTradeQuoteRequest,
 } from 'invity-api';
 
-import { invityAPI } from '@suite-common/invity';
+import { invityAPI } from '@suite-common/trading';
 
 import * as modalActions from 'src/actions/suite/modalActions';
 import { verifyAddress as verifyExchangeAddress } from 'src/actions/wallet/trading/tradingCommonActions';

packages/suite/src/actions/wallet/tradingSellActions.ts

@@ -6,7 +6,7 @@ import {
     SellProviderInfo,
 } from 'invity-api';
 
-import { invityAPI } from '@suite-common/invity';
+import { invityAPI } from '@suite-common/trading';
 
 import * as modalActions from 'src/actions/suite/modalActions';
 import { Dispatch } from 'src/types/suite';

packages/suite/src/components/suite/modals/ReduxModal/ConfirmAddressModal.tsx

@@ -1,5 +1,6 @@
 import { useCallback } from 'react';
 
+import { cryptoIdToSymbol } from '@suite-common/trading';
 import {
     getDisplaySymbol,
     getNetwork,
@@ -17,7 +18,6 @@ import {
 import { useSelector } from 'src/hooks/suite';
 import { useTradingInfo } from 'src/hooks/wallet/trading/useTradingInfo';
 import { selectAccountIncludingChosenInTrading } from 'src/reducers/wallet/selectedAccountReducer';
-import { cryptoIdToSymbol } from 'src/utils/wallet/trading/tradingUtils';
 
 import { ConfirmActionModal } from './DeviceContextModal/ConfirmActionModal';
 

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

@@ -1,11 +1,12 @@
 import { useState } from 'react';
 
+import { mapTestnetSymbol } from '@suite-common/trading';
 import { selectAccounts, selectSelectedDevice } from '@suite-common/wallet-core';
 import { Account, SelectedAccountLoaded } from '@suite-common/wallet-types';
 import { isTestnet } from '@suite-common/wallet-utils';
 
 import { useSelector } from 'src/hooks/suite';
-import { mapTestnetSymbol, tradingGetSortedAccounts } from 'src/utils/wallet/trading/tradingUtils';
+import { tradingGetSortedAccounts } from 'src/utils/wallet/trading/tradingUtils';
 
 interface TradingUseAccountProps {
     tradingAccount: Account | undefined;

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

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 
-import type { TradingType } from '@suite-common/invity';
+import type { TradingType } from '@suite-common/trading';
 import { selectAccounts, selectSelectedDevice } from '@suite-common/wallet-core';
 
 import { useDefaultAccountLabel, useSelector } from 'src/hooks/suite';

packages/suite/src/hooks/wallet/trading/form/common/useTradingFiatValues.tsx

@@ -2,6 +2,7 @@ import { useCallback, useEffect } from 'react';
 
 import { FiatCurrencyCode } from 'invity-api';
 
+import { cryptoIdToSymbol, mapTestnetSymbol } from '@suite-common/trading';
 import { NetworkSymbol, networks } from '@suite-common/wallet-config';
 import { selectFiatRatesByFiatRateKey, updateFiatRatesThunk } from '@suite-common/wallet-core';
 import { FiatRatesResult, Rate, Timestamp, TokenAddress } from '@suite-common/wallet-types';
@@ -11,11 +12,7 @@ import { useDispatch, useSelector } from 'src/hooks/suite';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 import { TradingAccountOptionsGroupOptionProps } from 'src/types/trading/trading';
-import {
-    cryptoIdToSymbol,
-    getTradingNetworkDecimals,
-    mapTestnetSymbol,
-} from 'src/utils/wallet/trading/tradingUtils';
+import { getTradingNetworkDecimals } from 'src/utils/wallet/trading/tradingUtils';
 
 interface TradingBalanceProps {
     sendCryptoSelect?: TradingAccountOptionsGroupOptionProps;

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

@@ -5,6 +5,7 @@ import { useDebounce } from 'react-use';
 import { FiatCurrencyCode } from 'invity-api';
 
 import { isChanged } from '@suite-common/suite-utils';
+import { cryptoIdToSymbol } from '@suite-common/trading';
 import { selectAccounts, selectSelectedDevice } from '@suite-common/wallet-core';
 import {
     amountToSmallestUnit,
@@ -38,7 +39,6 @@ import {
 } from 'src/types/trading/tradingForm';
 import { tradingGetExchangeReceiveCryptoId } from 'src/utils/wallet/trading/exchangeUtils';
 import {
-    cryptoIdToSymbol,
     getAddressAndTokenFromAccountOptionsGroupProps,
     getTradingNetworkDecimals,
     tradingGetSortedAccounts,

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

@@ -1,4 +1,4 @@
-import type { TradingType } from '@suite-common/invity';
+import type { TradingType } from '@suite-common/trading';
 
 import { useSelector } from 'src/hooks/suite';
 import { selectRouter } from 'src/reducers/suite/routerReducer';

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

@@ -4,9 +4,16 @@ import { useForm, useWatch } from 'react-hook-form';
 import type { BuyTrade, BuyTradeQuoteRequest, CryptoId } from 'invity-api';
 import useDebounce from 'react-use/lib/useDebounce';
 
-import { type TradingBuyType, invityAPI } from '@suite-common/invity';
 import { isChanged } from '@suite-common/suite-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
+import {
+    type TradingBuyType,
+    addIdsToQuotes,
+    cryptoIdToNetwork,
+    filterQuotesAccordingTags,
+    invityAPI,
+    tradingGetSuccessQuotes,
+} from '@suite-common/trading';
 import { networks } from '@suite-common/wallet-config';
 import { formatAmount } from '@suite-common/wallet-utils';
 import { isDesktop } from '@trezor/env-utils';
@@ -37,13 +44,7 @@ import { UseTradingFormProps } from 'src/types/trading/trading';
 import { TradingBuyFormContextProps, TradingBuyFormProps } from 'src/types/trading/tradingForm';
 import type { AmountLimitProps } from 'src/utils/suite/validation';
 import { createQuoteLink, createTxLink, getAmountLimits } from 'src/utils/wallet/trading/buyUtils';
-import {
-    addIdsToQuotes,
-    cryptoIdToNetwork,
-    filterQuotesAccordingTags,
-    getTradingNetworkDecimals,
-    tradingGetSuccessQuotes,
-} from 'src/utils/wallet/trading/tradingUtils';
+import { getTradingNetworkDecimals } from 'src/utils/wallet/trading/tradingUtils';
 
 import { useTradingInitializer } from './common/useTradingInitializer';
 

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

@@ -2,6 +2,7 @@ import { useMemo } from 'react';
 
 import { CryptoId, FiatCurrencyCode } from 'invity-api';
 
+import { getDefaultCountry } from '@suite-common/trading';
 import { networks } from '@suite-common/wallet-config';
 
 import { BuyInfo } from 'src/actions/wallet/tradingBuyActions';
@@ -14,7 +15,7 @@ import { useTradingInfo } from 'src/hooks/wallet/trading/useTradingInfo';
 import { TradingPaymentMethodListProps } from 'src/types/trading/trading';
 import { TradingBuyFormDefaultValuesProps } from 'src/types/trading/tradingForm';
 import { Account } from 'src/types/wallet';
-import { buildFiatOption, getDefaultCountry } from 'src/utils/wallet/trading/tradingUtils';
+import { buildFiatOption } from 'src/utils/wallet/trading/tradingUtils';
 
 export const useTradingBuyFormDefaultValues = (
     accountSymbol: Account['symbol'],

packages/suite/src/hooks/wallet/trading/form/useTradingCommonForm.tsx

@@ -1,6 +1,6 @@
 import { createContext, useContext } from 'react';
 
-import type { TradingType } from '@suite-common/invity';
+import type { TradingType } from '@suite-common/trading';
 
 import { TradingFormContextValues } from 'src/types/trading/tradingForm';
 

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

@@ -9,9 +9,15 @@ import type {
 } from 'invity-api';
 import useDebounce from 'react-use/lib/useDebounce';
 
-import { type TradingExchangeType, invityAPI } from '@suite-common/invity';
 import { isChanged } from '@suite-common/suite-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
+import {
+    type TradingExchangeType,
+    addIdsToQuotes,
+    getUnusedAddressFromAccount,
+    invityAPI,
+    tradingGetSuccessQuotes,
+} from '@suite-common/trading';
 import { networks } from '@suite-common/wallet-config';
 import { Account } from '@suite-common/wallet-types';
 import { amountToSmallestUnit, formatAmount, toFiatCurrency } from '@suite-common/wallet-utils';
@@ -52,12 +58,7 @@ import {
     getSuccessQuotesOrdered,
     tradingGetExchangeReceiveCryptoId,
 } from 'src/utils/wallet/trading/exchangeUtils';
-import {
-    addIdsToQuotes,
-    getTradingNetworkDecimals,
-    getUnusedAddressFromAccount,
-    tradingGetSuccessQuotes,
-} from 'src/utils/wallet/trading/tradingUtils';
+import { getTradingNetworkDecimals } from 'src/utils/wallet/trading/tradingUtils';
 
 import { useTradingInitializer } from './common/useTradingInitializer';
 

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

@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
 
+import { cryptoIdToSymbol } from '@suite-common/trading';
 import { DEFAULT_PAYMENT, DEFAULT_VALUES } from '@suite-common/wallet-constants';
 import { FormState, Output } from '@suite-common/wallet-types';
 
@@ -28,7 +29,6 @@ import { Account } from 'src/types/wallet';
 import { tradingGetExchangeReceiveCryptoId } from 'src/utils/wallet/trading/exchangeUtils';
 import {
     buildFiatOption,
-    cryptoIdToSymbol,
     getAddressAndTokenFromAccountOptionsGroupProps,
 } from 'src/utils/wallet/trading/tradingUtils';
 

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

@@ -3,7 +3,7 @@ import { useTimeoutFn, useUnmount } from 'react-use';
 
 import { ExchangeTrade } from 'invity-api';
 
-import { type TradingExchangeType, invityAPI } from '@suite-common/invity';
+import { type TradingExchangeType, invityAPI } from '@suite-common/trading';
 
 import { saveSelectedQuote } from 'src/actions/wallet/tradingExchangeActions';
 import { useDispatch } from 'src/hooks/suite';

packages/suite/src/hooks/wallet/trading/form/useTradingPaymentMethod.tsx

@@ -1,11 +1,12 @@
 import { useCallback } from 'react';
 
+import type { TradingTradeMapProps } from '@suite-common/trading';
+
 import { useSelector } from 'src/hooks/suite';
 import {
     TradingPaymentMethodListProps,
     TradingPaymentMethodProps,
     TradingTradeBuySellType,
-    TradingTradeDetailMapProps,
 } from 'src/types/trading/trading';
 import { TradingPaymentMethodHookProps } from 'src/types/trading/tradingForm';
 
@@ -14,7 +15,7 @@ const useTradingPaymentMethod = <
 >(): TradingPaymentMethodHookProps<T> => {
     const paymentMethods = useSelector(state => state.wallet.trading.info.paymentMethods);
 
-    const getPaymentMethods = (quotes: TradingTradeDetailMapProps[T][]) => {
+    const getPaymentMethods = (quotes: TradingTradeMapProps[T][]) => {
         const newPaymentMethods: TradingPaymentMethodListProps[] = [];
 
         quotes.forEach(quote => {
@@ -33,7 +34,7 @@ const useTradingPaymentMethod = <
 
     const getQuotesByPaymentMethod = useCallback(
         (
-            quotes: TradingTradeDetailMapProps[T][] | undefined,
+            quotes: TradingTradeMapProps[T][] | undefined,
             currentPaymentMethod: TradingPaymentMethodProps,
         ) => {
             if (!quotes) return;

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

@@ -4,9 +4,16 @@ import { useForm, useWatch } from 'react-hook-form';
 import type { BankAccount, CryptoId, SellFiatTrade, SellFiatTradeQuoteRequest } from 'invity-api';
 import useDebounce from 'react-use/lib/useDebounce';
 
-import { type TradingSellType, invityAPI } from '@suite-common/invity';
 import { isChanged } from '@suite-common/suite-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
+import {
+    type TradingSellType,
+    addIdsToQuotes,
+    filterQuotesAccordingTags,
+    getUnusedAddressFromAccount,
+    invityAPI,
+    tradingGetSuccessQuotes,
+} from '@suite-common/trading';
 import { networks } from '@suite-common/wallet-config';
 import { amountToSmallestUnit, formatAmount } from '@suite-common/wallet-utils';
 import { EventType, analytics } from '@trezor/suite-analytics';
@@ -49,13 +56,7 @@ import {
 import { TradeSell } from 'src/types/wallet/tradingCommonTypes';
 import type { AmountLimitProps } from 'src/utils/suite/validation';
 import { createQuoteLink, getAmountLimits } from 'src/utils/wallet/trading/sellUtils';
-import {
-    addIdsToQuotes,
-    filterQuotesAccordingTags,
-    getTradingNetworkDecimals,
-    getUnusedAddressFromAccount,
-    tradingGetSuccessQuotes,
-} from 'src/utils/wallet/trading/tradingUtils';
+import { getTradingNetworkDecimals } from 'src/utils/wallet/trading/tradingUtils';
 
 import { useTradingInitializer } from './common/useTradingInitializer';
 

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

@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
 
+import { cryptoIdToSymbol, getDefaultCountry } from '@suite-common/trading';
 import { DEFAULT_PAYMENT, DEFAULT_VALUES } from '@suite-common/wallet-constants';
 import { FormState, Output } from '@suite-common/wallet-types';
 
@@ -15,9 +16,7 @@ import { TradingSellFormDefaultValuesProps } from 'src/types/trading/tradingForm
 import { Account } from 'src/types/wallet';
 import {
     buildFiatOption,
-    cryptoIdToSymbol,
     getAddressAndTokenFromAccountOptionsGroupProps,
-    getDefaultCountry,
 } from 'src/utils/wallet/trading/tradingUtils';
 
 export const useTradingSellFormDefaultValues = (

packages/suite/src/hooks/wallet/trading/form/useTradingVerifyAccount.tsx

@@ -2,6 +2,11 @@ import { useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 
 import { TrezorDevice } from '@suite-common/suite-types';
+import {
+    cryptoIdToSymbol,
+    getUnusedAddressFromAccount,
+    parseCryptoId,
+} from '@suite-common/trading';
 import { selectSelectedDevice } from '@suite-common/wallet-core';
 import { Account } from '@suite-common/wallet-types';
 import { filterReceiveAccounts } from '@suite-common/wallet-utils';
@@ -19,11 +24,6 @@ import {
     TradingVerifyFormAccountOptionProps,
     TradingVerifyFormProps,
 } from 'src/types/trading/tradingVerify';
-import {
-    cryptoIdToSymbol,
-    getUnusedAddressFromAccount,
-    parseCryptoId,
-} from 'src/utils/wallet/trading/tradingUtils';
 
 const getSelectAccountOptions = (
     suiteReceiveAccounts: Account[] | undefined,

packages/suite/src/hooks/wallet/trading/useServerEnviroment.ts

@@ -1,4 +1,4 @@
-import { invityAPI } from '@suite-common/invity';
+import { invityAPI } from '@suite-common/trading';
 
 import { useSelector } from 'src/hooks/suite';
 

packages/suite/src/hooks/wallet/trading/useTradingDetail.ts

@@ -1,6 +1,6 @@
 import { createContext, useContext } from 'react';
 
-import type { TradingType } from '@suite-common/invity';
+import type { TradingType } from '@suite-common/trading';
 
 import { useSelector } from 'src/hooks/suite';
 import { useServerEnvironment } from 'src/hooks/wallet/trading/useServerEnviroment';