feat(message-system): rename swap to exchange

Author: izmy

packages/suite/src/hooks/suite/useMessageSystemTrading.ts

@@ -10,17 +10,12 @@ import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 import { useSelector } from './useSelector';
 
 export const useMessageSystemTrading = (type: TradingType) => {
-    const featureFlagType: Exclude<TradingType, 'exchange'> | 'swap' =
-        type === 'exchange' ? 'swap' : type;
-
     const language = useSelector(selectLanguage);
 
-    const isDisabled = useSelector(state =>
-        selectIsFeatureDisabled(state, Feature.trading[featureFlagType]),
-    );
+    const isDisabled = useSelector(state => selectIsFeatureDisabled(state, Feature.trading[type]));
 
     const content = useSelector(state =>
-        selectFeatureMessageContent(state, Feature.trading[featureFlagType], language),
+        selectFeatureMessageContent(state, Feature.trading[type], language),
     );
 
     return {

packages/suite/src/views/wallet/trading/exchange/TradingExchangeForm.tsx

@@ -28,7 +28,7 @@ const TradingExchangeFormWrapper = ({ selectedAccount }: UseTradingProps) => {
 
     return (
         <TradingLayout>
-            <ContextMessage context={Context.tradingSwap} />
+            <ContextMessage context={Context.tradingExchange} />
             {isDisabled ? (
                 <TradingDisabled type={type} content={content} />
             ) : (

suite-common/message-system/src/messageSystemTypes.ts

@@ -45,7 +45,7 @@ export const Feature = {
     trading: {
         buy: 'trading.buy',
         sell: 'trading.sell',
-        swap: 'trading.swap',
+        exchange: 'trading.exchange',
     },
 
     // device onboarding (MOBILE ONLY!!!).
@@ -68,7 +68,7 @@ export const Context = {
     solStaking: 'accounts.sol.staking',
     tradingBuy: 'trading.buy',
     tradingSell: 'trading.sell',
-    tradingSwap: 'trading.swap',
+    tradingExchange: 'trading.exchange',
 } as const;
 
 export type ContextDomain = (typeof Context)[keyof typeof Context];

suite-native/app/src/navigation/AppTabNavigator.tsx

@@ -11,8 +11,8 @@ import {
     TradingStackNavigator,
     selectIsTradingBuyEnabled,
     selectIsTradingEnabled,
+    selectIsTradingExchangeEnabled,
     selectIsTradingSellEnabled,
-    selectIsTradingSwapEnabled,
 } from '@suite-native/module-trading';
 import { AppTabsParamList, AppTabsRoutes, TabBar } from '@suite-native/navigation';
 
@@ -22,13 +22,13 @@ const Tab = createBottomTabNavigator<AppTabsParamList>();
 
 const getTradingAnalyticsType = (
     isTradingBuyEnabled: boolean,
-    isTradingSwapEnabled: boolean,
+    isTradingExchangeEnabled: boolean,
     isTradingSellEnabled: boolean,
 ) => {
     if (isTradingBuyEnabled) {
         return 'buy';
     }
-    if (isTradingSwapEnabled) {
+    if (isTradingExchangeEnabled) {
         return 'exchange';
     }
     if (isTradingSellEnabled) {
@@ -43,7 +43,7 @@ export const AppTabNavigator = () => {
 
     const isTradingEnabled = useSelector(selectIsTradingEnabled);
     const isTradingBuyEnabled = useSelector(selectIsTradingBuyEnabled);
-    const isTradingSwapEnabled = useSelector(selectIsTradingSwapEnabled);
+    const isTradingExchangeEnabled = useSelector(selectIsTradingExchangeEnabled);
     const isTradingSellEnabled = useSelector(selectIsTradingSellEnabled);
 
     return (
@@ -67,7 +67,7 @@ export const AppTabNavigator = () => {
                         tabPress: () => {
                             const tradingType = getTradingAnalyticsType(
                                 isTradingBuyEnabled,
-                                isTradingSwapEnabled,
+                                isTradingExchangeEnabled,
                                 isTradingSellEnabled,
                             );
                             if (!tradingType) return;

suite-native/app/src/navigation/__tests__/AppTabNavigator.comp.test.tsx

@@ -32,7 +32,7 @@ describe('AppTabNavigator', () => {
             featureFlags: {
                 ...featureFlagsInitialState,
                 [FeatureFlag.IsTradingBuyEnabled]: false,
-                [FeatureFlag.IsTradingSwapEnabled]: false,
+                [FeatureFlag.IsTradingExchangeEnabled]: false,
                 [FeatureFlag.IsTradingSellEnabled]: false,
             },
             messageSystem: {
@@ -55,7 +55,7 @@ describe('AppTabNavigator', () => {
                                         flag: false,
                                     },
                                     {
-                                        domain: 'trading.swap',
+                                        domain: 'trading.exchange',
                                         flag: false,
                                     },
                                     {

suite-native/feature-flags/src/__tests__/featureFlagsSlice.test.ts

@@ -23,7 +23,7 @@ describe('featureFlagsSlice', () => {
                 isDebugKeysAllowed: false,
                 isWalletConnectEnabled: false,
                 isTradingBuyEnabled: false,
-                isTradingSwapEnabled: false,
+                isTradingExchangeEnabled: false,
                 isTradingSellEnabled: false,
             });
         });
@@ -46,7 +46,7 @@ describe('featureFlagsSlice', () => {
                 isDebugKeysAllowed: false,
                 isWalletConnectEnabled: false,
                 isTradingBuyEnabled: false,
-                isTradingSwapEnabled: false,
+                isTradingExchangeEnabled: false,
                 isTradingSellEnabled: false,
             });
         });

suite-native/feature-flags/src/featureFlagsSlice.ts

@@ -10,7 +10,7 @@ export const FeatureFlag = {
     IsDebugKeysAllowed: 'isDebugKeysAllowed',
     IsWalletConnectEnabled: 'isWalletConnectEnabled',
     IsTradingBuyEnabled: 'isTradingBuyEnabled',
-    IsTradingSwapEnabled: 'isTradingSwapEnabled',
+    IsTradingExchangeEnabled: 'isTradingExchangeEnabled',
     IsTradingSellEnabled: 'isTradingSellEnabled',
 } as const;
 
@@ -35,7 +35,7 @@ export const featureFlagsInitialState: FeatureFlagsState = {
     [FeatureFlag.IsWalletConnectEnabled]:
         process.env.EXPO_PUBLIC_FF_IS_WALLET_CONNECT_ENABLED === 'true',
     [FeatureFlag.IsTradingBuyEnabled]: process.env.EXPO_PUBLIC_FF_IS_TRADING_BUY_ENABLED === 'true',
-    [FeatureFlag.IsTradingSwapEnabled]:
+    [FeatureFlag.IsTradingExchangeEnabled]:
         process.env.EXPO_PUBLIC_FF_IS_TRADING_SWAP_ENABLED === 'true',
     [FeatureFlag.IsTradingSellEnabled]:
         process.env.EXPO_PUBLIC_FF_IS_TRADING_SELL_ENABLED === 'true',
@@ -48,7 +48,7 @@ export const featureFlagsPersistedKeys: Array<keyof FeatureFlagsState> = [
     FeatureFlag.IsConnectPopupEnabled,
     FeatureFlag.IsWalletConnectEnabled,
     FeatureFlag.IsTradingBuyEnabled,
-    FeatureFlag.IsTradingSwapEnabled,
+    FeatureFlag.IsTradingExchangeEnabled,
     FeatureFlag.IsTradingSellEnabled,
 ];
 

suite-native/module-dev-utils/src/components/FeatureFlags.tsx

@@ -14,7 +14,7 @@ const featureFlagsTitleMap = {
     [FeatureFlagEnum.IsDebugKeysAllowed]: 'Device Auth Check Debug Keys',
     [FeatureFlagEnum.IsWalletConnectEnabled]: 'WalletConnect',
     [FeatureFlagEnum.IsTradingBuyEnabled]: '💰 Trading Buy',
-    [FeatureFlagEnum.IsTradingSwapEnabled]: '💰 Trading Swap',
+    [FeatureFlagEnum.IsTradingExchangeEnabled]: '💰 Trading Swap',
     [FeatureFlagEnum.IsTradingSellEnabled]: '💰 Trading Sell',
 } as const satisfies Record<FeatureFlagEnum, string>;
 

suite-native/module-trading/src/selectors/__tests__/commonSelectors.test.ts

@@ -6,8 +6,8 @@ import { initialState } from '../../tradingSlice';
 import {
     selectIsTradingBuyEnabled,
     selectIsTradingEnabled,
+    selectIsTradingExchangeEnabled,
     selectIsTradingSellEnabled,
-    selectIsTradingSwapEnabled,
     selectTradingEnvironment,
 } from '../commonSelectors';
 
@@ -17,11 +17,11 @@ const contentText = 'Content Text';
 const getPreloadedState = ({
     buy,
     sell,
-    swap,
+    exchange,
 }: {
     buy?: boolean;
     sell?: boolean;
-    swap?: boolean;
+    exchange?: boolean;
 }) => {
     const features: Feature[] = [];
     if (buy !== undefined) {
@@ -36,10 +36,10 @@ const getPreloadedState = ({
             flag: sell,
         });
     }
-    if (swap !== undefined) {
+    if (exchange !== undefined) {
         features.push({
-            domain: 'trading.swap',
-            flag: swap,
+            domain: 'trading.exchange',
+            flag: exchange,
         });
     }
 
@@ -119,13 +119,15 @@ describe('commonSelectors', () => {
         });
     });
 
-    describe('selectIsTradingSwapEnabled', () => {
-        it('should correctly select that swap is enabled if remote feature is enabled', () => {
-            expect(selectIsTradingSwapEnabled(getPreloadedState({ swap: true }))).toBe(true);
+    describe('selectIsTradingExchangeEnabled', () => {
+        it('should correctly select that exchange is enabled if remote feature is enabled', () => {
+            expect(selectIsTradingExchangeEnabled(getPreloadedState({ exchange: true }))).toBe(
+                true,
+            );
         });
 
-        it('should correctly select that swap is not enabled if remote feature is not enabled', () => {
-            expect(selectIsTradingSwapEnabled(getPreloadedState({}))).toBe(false);
+        it('should correctly select that exchange is not enabled if remote feature is not enabled', () => {
+            expect(selectIsTradingExchangeEnabled(getPreloadedState({}))).toBe(false);
         });
     });
 

suite-native/module-trading/src/selectors/commonSelectors.ts

@@ -18,17 +18,19 @@ export const selectIsTradingBuyEnabled = (state: MessageSystemRootState & Featur
     selectIsFeatureFlagEnabled(state, FeatureFlag.IsTradingBuyEnabled) ||
     selectIsFeatureEnabled(state, Feature.trading.buy, true);
 
-export const selectIsTradingSwapEnabled = (state: MessageSystemRootState & FeatureFlagsRootState) =>
-    selectIsFeatureFlagEnabled(state, FeatureFlag.IsTradingSwapEnabled) ||
-    selectIsFeatureEnabled(state, Feature.trading.swap, false);
+export const selectIsTradingExchangeEnabled = (
+    state: MessageSystemRootState & FeatureFlagsRootState,
+) =>
+    selectIsFeatureFlagEnabled(state, FeatureFlag.IsTradingExchangeEnabled) ||
+    selectIsFeatureEnabled(state, Feature.trading.exchange, false);
 
 export const selectIsTradingSellEnabled = (state: MessageSystemRootState & FeatureFlagsRootState) =>
     selectIsFeatureFlagEnabled(state, FeatureFlag.IsTradingSellEnabled) ||
     selectIsFeatureEnabled(state, Feature.trading.sell, false);
 
 export const selectIsTradingEnabled = (state: MessageSystemRootState & FeatureFlagsRootState) =>
     selectIsTradingBuyEnabled(state) ||
-    selectIsTradingSwapEnabled(state) ||
+    selectIsTradingExchangeEnabled(state) ||
     selectIsTradingSellEnabled(state);
 
 // trade for opening in detail