Merge branch 'master' of github.com:binary-com/deriv-app into iphone-…

…bug-2
jim-deriv · Jun 11, 2024 · e3713e3 · e3713e3
2 parents 6f1079d + b282e32
commit e3713e3
Show file tree

Hide file tree

Showing 56 changed files with 1,774 additions and 707 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/appstore/src/assets/svgs/currency/index.tsx b/packages/appstore/src/assets/svgs/currency/index.tsx
@@ -28,6 +28,7 @@ const Currencies = [
     'USDC',
     'USDK',
     'UST',
+    'XRP',
     'VIRTUAL',
 ] as const;
 

diff --git a/packages/bot-web-ui/package.json b/packages/bot-web-ui/package.json
@@ -76,7 +76,7 @@
         "@deriv/api-types": "1.0.172",
         "@deriv/bot-skeleton": "^1.0.0",
         "@deriv/components": "^1.0.0",
-        "@deriv/deriv-charts": "^2.1.19",
+        "@deriv/deriv-charts": "^2.1.20",
         "@deriv/shared": "^1.0.0",
         "@deriv/stores": "^1.0.0",
         "@deriv/translations": "^1.0.0",

diff --git a/packages/components/src/components/icon/currency/ic-currency-xrp.svg b/packages/components/src/components/icon/currency/ic-currency-xrp.svg
diff --git a/packages/components/src/components/icon/icons.js b/packages/components/src/components/icon/icons.js
@@ -507,6 +507,7 @@ import './common/ic-notification-clear.svg';
 import './common/ic-notification.svg';
 import './common/ic-online-naira.svg';
 import './common/ic-open-positions.svg';
+import './common/ic-open.svg';
 import './common/ic-other-payment-method.svg';
 import './common/ic-pa.svg';
 import './common/ic-passcode.svg';
@@ -705,6 +706,7 @@ import './currency/ic-currency-usdc.svg';
 import './currency/ic-currency-usdk.svg';
 import './currency/ic-currency-ust.svg';
 import './currency/ic-currency-virtual.svg';
+import './currency/ic-currency-xrp.svg';
 import './dxtrade/ic-dxtrade-deriv-x.svg';
 import './dxtrade/ic-dxtrade-derived.svg';
 import './dxtrade/ic-dxtrade-derivx-platform.svg';

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -109,7 +109,7 @@
         "@deriv/cfd": "^1.0.0",
         "@deriv/components": "^1.0.0",
         "@deriv/deriv-api": "^1.0.15",
-        "@deriv/deriv-charts": "^2.1.19",
+        "@deriv/deriv-charts": "^2.1.20",
         "@deriv/hooks": "^1.0.0",
         "@deriv/p2p": "^0.7.3",
         "@deriv/p2p-v2": "^1.0.0",

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';