[DTRA] Maryia/DTRA-1276/fix: update limit order barriers language wit…

…hout reload + hide them for closed contracts (binary-com#15436) * fix: limit order barriers translation on language change * chore: keep setLimitOrderBarriers & ChartBarrierStore in trader consistent with those in core * fix: types * fix: hide limit order barriers for ended contract * refactor: place barriers.ts, chart-barrier-store, limit-orders in shared as they are reused * test: ChartBarrierStore + address sonarcloud * fix: update/show/hide relevant limit order barriers without page reload * test: fix failing test
mitra-deriv · Jun 11, 2024 · f0ec370 · f0ec370
1 parent 15cb9b0
commit f0ec370
Show file tree

Hide file tree

Showing 18 changed files with 281 additions and 328 deletions.
diff --git a/packages/core/src/Stores/Helpers/limit-orders.js b/packages/core/src/Stores/Helpers/limit-orders.js
diff --git a/packages/core/src/Stores/chart-barrier-store.js b/packages/core/src/Stores/chart-barrier-store.js
diff --git a/packages/core/src/Stores/contract-store.js b/packages/core/src/Stores/contract-store.js
@@ -1,5 +1,6 @@
 import { action, extendObservable, observable, makeObservable, runInAction } from 'mobx';
 import {
+    ChartBarrierStore,
     isAccumulatorContract,
     isDigitContract,
     isEnded,
@@ -10,6 +11,7 @@ import {
     isTurbosContract,
     getDigitInfo,
     getDisplayStatus,
+    getLimitOrder,
     WS,
     getContractUpdateConfig,
     getContractValidationRules,
@@ -21,10 +23,9 @@ import {
     getEndTime,
     BARRIER_COLORS,
     getContractStatus,
+    setLimitOrderBarriers,
 } from '@deriv/shared';
 import { getChartConfig } from './Helpers/logic';
-import { setLimitOrderBarriers, getLimitOrder } from './Helpers/limit-orders';
-import { ChartBarrierStore } from './chart-barrier-store';
 import { createChartMarkers, calculateMarker, getAccumulatorMarkers } from './Helpers/chart-markers';
 import BaseStore from './base-store';
 
@@ -292,7 +293,7 @@ export default class ContractStore extends BaseStore {
                     barriers: this.barriers_array,
                     contract_info,
                     contract_type,
-                    is_over: true,
+                    is_over: !contract_info.sell_time,
                 });
             }
         }

diff --git a/packages/core/src/Stores/index.js b/packages/core/src/Stores/index.js
@@ -1,3 +1,4 @@
+import { ChartBarrierStore } from '@deriv/shared';
 import ClientStore from './client-store';
 import CommonStore from './common-store';
 import GTMStore from './gtm-store';
@@ -8,7 +9,6 @@ import ActiveSymbolsStore from './active-symbols-store';
 import PortfolioStore from './portfolio-store';
 import ContractReplayStore from './contract-replay-store';
 import ContractTradeStore from './contract-trade-store';
-import { ChartBarrierStore } from './chart-barrier-store';
 import TradersHubStore from './traders-hub-store';
 
 export default class RootStore {

diff --git a/packages/core/src/Stores/portfolio-store.js b/packages/core/src/Stores/portfolio-store.js
@@ -2,6 +2,7 @@ import throttle from 'lodash.throttle';
 import { action, computed, observable, reaction, makeObservable, override } from 'mobx';
 import { computedFn } from 'mobx-utils';
 import {
+    ChartBarrierStore,
     isAccumulatorContract,
     isEmptyObject,
     isEnded,
@@ -21,11 +22,10 @@ import {
     TRADE_TYPES,
     removeBarrier,
     routes,
+    setLimitOrderBarriers,
 } from '@deriv/shared';
 import { Money } from '@deriv/components';
 import { Analytics } from '@deriv-com/analytics';
-import { ChartBarrierStore } from './chart-barrier-store';
-import { setLimitOrderBarriers } from './Helpers/limit-orders';
 
 import BaseStore from './base-store';
 

diff --git a/packages/shared/src/utils/helpers/__tests__/barriers.ts b/packages/shared/src/utils/helpers/__tests__/barriers.ts
@@ -24,4 +24,37 @@ describe('Barriers', () => {
             expect(Barriers.barriersToString(true, +11, +15)).toEqual(['+11', '+15']);
         });
     });
+
+    describe('removeBarrier', () => {
+        let barriers: Barriers.TBarrier[];
+        const BARRIERS_KEYS = {
+            PURCHASE_SPOT_BARRIER: 'PURCHASE_SPOT_BARRIER',
+            TAKE_PROFIT: 'take_profit',
+            STOP_LOSS: 'stop_loss',
+            STOP_OUT: 'stop_out',
+        };
+        beforeEach(() => {
+            barriers = [
+                { key: BARRIERS_KEYS.PURCHASE_SPOT_BARRIER, high: '1111.11' },
+                { key: BARRIERS_KEYS.TAKE_PROFIT, high: '2222.22' },
+                { key: BARRIERS_KEYS.STOP_OUT, high: '3333.33' },
+            ] as Barriers.TBarrier[];
+        });
+        it('should remove the barrier with a specified key from initial barriers array', () => {
+            const keyToRemove = BARRIERS_KEYS.TAKE_PROFIT;
+            Barriers.removeBarrier(barriers, keyToRemove);
+            expect(barriers.find(barrier => barrier.key === keyToRemove)).toBeUndefined();
+            expect(barriers).toHaveLength(2);
+        });
+        it('should not remove any barriers if the key is not found', () => {
+            Barriers.removeBarrier(barriers, BARRIERS_KEYS.STOP_LOSS);
+            expect(barriers).toHaveLength(3);
+        });
+        it('should not modify the barriers array if it is empty', () => {
+            const keyToRemove = BARRIERS_KEYS.STOP_OUT;
+            const emptyBarriers = [] as Barriers.TBarrier[];
+            Barriers.removeBarrier(emptyBarriers, keyToRemove);
+            expect(emptyBarriers).toHaveLength(0);
+        });
+    });
 });