Kate / Apply suggestions from last code review

packages/core/src/Stores/portfolio-store.js

@@ -18,6 +18,7 @@ import {
     getDurationUnitText,
     getEndTime,
     removeBarrier,
+    TURBOS,
 } from '@deriv/shared';
 import { Money } from '@deriv/components';
 import { ChartBarrierStore } from './chart-barrier-store';
@@ -590,6 +591,6 @@ export default class PortfolioStore extends BaseStore {
     }
 
     get is_turbos() {
-        return this.contract_type === 'turboslong' || this.contract_type === 'turbosshort';
+        return this.contract_type === TURBOS.LONG || this.contract_type === TURBOS.SHORT;
     }
 }

packages/shared/src/utils/constants/contract.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { localize, Localize } from '@deriv/translations';
-import { shouldShowCancellation, shouldShowExpiration } from '../contract';
+import { shouldShowCancellation, shouldShowExpiration, TURBOS } from '../contract';
 
 export const getLocalizedBasis = () => ({
     accumulator: localize('Accumulator'),
@@ -166,7 +166,7 @@ export const getContractTypesConfig: TGetContractTypesConfig = symbol => ({
 
 // Config for rendering trade options
 export const getContractCategoriesConfig = () => ({
-    Turbos: { name: localize('Turbos'), categories: ['turboslong', 'turbosshort'] },
+    Turbos: { name: localize('Turbos'), categories: [TURBOS.LONG, TURBOS.SHORT] },
     Multipliers: { name: localize('Multipliers'), categories: ['multiplier'] },
     'Ups & Downs': {
         name: localize('Ups & Downs'),

packages/shared/src/utils/contract/contract.ts

@@ -43,6 +43,11 @@ export const isVanillaContract = (contract_type: string) => /VANILLA/i.test(cont
 
 export const isCryptoContract = (underlying: string) => /^cry/.test(underlying);
 
+export const TURBOS = {
+    LONG: 'turboslong',
+    SHORT: 'turbosshort',
+} as const;
+
 export const getCurrentTick = (contract_info: TContractInfo) => {
     const tick_stream = unique(contract_info.tick_stream || [], 'epoch');
     const current_tick = isDigitContract(contract_info.contract_type) ? tick_stream.length : tick_stream.length - 1;

packages/trader/src/App/Components/Elements/PositionsDrawer/positions-drawer.jsx

@@ -4,7 +4,7 @@ import React from 'react';
 import { NavLink } from 'react-router-dom';
 import { CSSTransition } from 'react-transition-group';
 import { Icon, DataList, Text, PositionsDrawerCard } from '@deriv/components';
-import { routes, useNewRowTransition } from '@deriv/shared';
+import { routes, useNewRowTransition, TURBOS } from '@deriv/shared';
 import { localize } from '@deriv/translations';
 import EmptyPortfolioMessage from '../EmptyPortfolioMessage';
 import { filterByContractType } from './helpers';
@@ -101,8 +101,8 @@ const PositionsDrawer = observer(({ ...props }) => {
             p.contract_info &&
             symbol === p.contract_info.underlying &&
             (trade_contract_type.includes('turbos')
-                ? filterByContractType(p.contract_info, 'turbosshort') ||
-                  filterByContractType(p.contract_info, 'turboslong')
+                ? filterByContractType(p.contract_info, TURBOS.SHORT) ||
+                  filterByContractType(p.contract_info, TURBOS.LONG)
                 : filterByContractType(p.contract_info, trade_contract_type))
     );
     const body_content = (

packages/trader/src/App/Containers/populate-header.jsx

@@ -3,6 +3,7 @@ import TogglePositionsMobile from 'App/Components/Elements/TogglePositions/toggl
 import { filterByContractType } from 'App/Components/Elements/PositionsDrawer/helpers';
 import { useTraderStore } from 'Stores/useTraderStores';
 import { observer, useStore } from '@deriv/stores';
+import { TURBOS } from '@deriv/shared';
 
 const PopulateHeader = observer(() => {
     const { portfolio, ui, client } = useStore();
@@ -23,8 +24,8 @@ const PopulateHeader = observer(() => {
             p.contract_info &&
             symbol === p.contract_info.underlying &&
             (trade_contract_type.includes('turbos')
-                ? filterByContractType(p.contract_info, 'turbosshort') ||
-                  filterByContractType(p.contract_info, 'turboslong')
+                ? filterByContractType(p.contract_info, TURBOS.SHORT) ||
+                  filterByContractType(p.contract_info, TURBOS.LONG)
                 : filterByContractType(p.contract_info, trade_contract_type))
     );
 

packages/trader/src/Modules/Trading/Components/Form/TradeParams/trade-type-tabs.tsx

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import React from 'react';
 import { ButtonToggle } from '@deriv/components';
-import { isTurbosContract, isVanillaContract } from '@deriv/shared';
+import { isTurbosContract, isVanillaContract, TURBOS } from '@deriv/shared';
 import { localize } from '@deriv/translations';
 import { observer, useStore } from '@deriv/stores';
 
@@ -17,8 +17,8 @@ const TradeTypeTabs = observer(({ className }: TTradeTypeTabs) => {
     const is_turbos = isTurbosContract(contract_type);
     const is_vanilla = isVanillaContract(contract_type);
     const tab_list = [
-        { text: localize('Long'), value: 'turboslong', is_displayed: is_turbos },
-        { text: localize('Short'), value: 'turbosshort', is_displayed: is_turbos },
+        { text: localize('Long'), value: TURBOS.LONG, is_displayed: is_turbos },
+        { text: localize('Short'), value: TURBOS.SHORT, is_displayed: is_turbos },
         { text: localize('Call'), value: 'VANILLALONGCALL', is_displayed: is_vanilla },
         { text: localize('Put'), value: 'VANILLALONGPUT', is_displayed: is_vanilla },
     ];

packages/trader/src/Stores/Modules/SmartChart/Helpers/barriers.js

@@ -1,6 +1,5 @@
 import { toJS } from 'mobx';
-import { isEmptyObject } from '@deriv/shared';
-import { CONTRACT_SHADES } from '../Constants/barriers';
+import { isEmptyObject, CONTRACT_SHADES } from '@deriv/shared';
 
 export const isBarrierSupported = contract_type => contract_type in CONTRACT_SHADES;
 

packages/trader/src/Stores/Modules/SmartChart/chart-barrier-store.js

@@ -1,5 +1,5 @@
 import { action, computed, observable, makeObservable } from 'mobx';
-import { BARRIER_COLORS, BARRIER_LINE_STYLES, CONTRACT_SHADES, DEFAULT_SHADES } from './Constants/barriers';
+import { BARRIER_COLORS, BARRIER_LINE_STYLES, CONTRACT_SHADES, DEFAULT_SHADES } from '@deriv/shared';
 import { barriersToString } from './Helpers/barriers';
 
 export class ChartBarrierStore {

packages/trader/src/Stores/Modules/Trading/Helpers/barrier-utils.ts

@@ -1,4 +1,4 @@
-import { BARRIER_COLORS } from '../../SmartChart/Constants/barriers';
+import { BARRIER_COLORS } from '@deriv/shared';
 
 export const getHoveredColor = (type: string): string => {
     switch (type) {

packages/trader/src/Stores/Modules/Trading/Helpers/limit-orders.js

@@ -1,5 +1,4 @@
-import { isMultiplierContract } from '@deriv/shared';
-import { BARRIER_COLORS, BARRIER_LINE_STYLES } from '../../SmartChart/Constants/barriers';
+import { isMultiplierContract, BARRIER_COLORS, BARRIER_LINE_STYLES } from '@deriv/shared';
 import { ChartBarrierStore } from '../../SmartChart/chart-barrier-store';
 import { removeBarrier } from '../../SmartChart/Helpers/barriers';
 

packages/trader/src/Stores/Modules/Trading/trade-store.js

@@ -27,6 +27,8 @@ import {
     formatMoney,
     getCurrencyDisplayCode,
     unsupported_contract_types_list,
+    BARRIER_COLORS,
+    BARRIER_LINE_STYLES,
 } from '@deriv/shared';
 import { localize } from '@deriv/translations';
 import { getValidationRules, getMultiplierValidationRules } from 'Stores/Modules/Trading/Constants/validation-rules';
@@ -40,7 +42,6 @@ import { processTradeParams } from './Helpers/process';
 import { action, computed, makeObservable, observable, override, reaction, runInAction, toJS, when } from 'mobx';
 import { createProposalRequests, getProposalErrorField, getProposalInfo } from './Helpers/proposal';
 import { getHoveredColor } from './Helpers/barrier-utils';
-import { BARRIER_COLORS, BARRIER_LINE_STYLES } from '../SmartChart/Constants/barriers';
 import BaseStore from '../../base-store';
 import { ChartBarrierStore } from '../SmartChart/chart-barrier-store';
 import debounce from 'lodash.debounce';