From 31a4a42a58884d44ea4aece703be0822eea665d9 Mon Sep 17 00:00:00 2001 From: ashkan Date: Mon, 20 May 2019 11:36:55 +0200 Subject: [PATCH 1/2] 0.4.27 --- package-lock.json | 8 ++++---- package.json | 2 +- .../app/Stores/Modules/Contract/contract-store.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 68d3becd737b..9d09baae751f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8500,7 +8500,7 @@ "cson": "~4.0.0", "glob": "~7.1.3", "jit-grunt": "~0.10.0", - "js-yaml": "~3.13.1", + "js-yaml": "~3.12.0", "load-grunt-tasks": "~3.5.2", "lodash": "~4.17.11" }, @@ -12440,9 +12440,9 @@ } }, "smartcharts-beta": { - "version": "0.4.26", - "resolved": "https://registry.npmjs.org/smartcharts-beta/-/smartcharts-beta-0.4.26.tgz", - "integrity": "sha512-3EQGm3uStEMzZOeAMfbLV9qM33KX8FUw6LOqC4egI4FdudsoYbLCqSLsppzG5y3u0fUVoxFu2Dpj1Eq5YKbkHA==", + "version": "0.4.27", + "resolved": "https://registry.npmjs.org/smartcharts-beta/-/smartcharts-beta-0.4.27.tgz", + "integrity": "sha512-1SEwqz1NgUi7Mi8V66JbZRHXno3spET6JJnFcm/s5HqmK3g++QIJeHaleyDdfItbNU+mXCc1MtQwI11MV7DemQ==", "requires": { "event-emitter-es6": "^1.1.5", "lodash.debounce": "^4.0.8", diff --git a/package.json b/package.json index e3b14f7646f9..af5545fb2e10 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "react-router-dom": "5.0.0", "react-transition-group": "2.4.0", "sinon": "7.2.2", - "smartcharts-beta": "0.4.26", + "smartcharts-beta": "0.4.27", "tt-react-custom-scrollbars": "4.2.1-tt2", "url-polyfill": "1.0.9", "web-push-notifications": "3.2.15" diff --git a/src/javascript/app/Stores/Modules/Contract/contract-store.js b/src/javascript/app/Stores/Modules/Contract/contract-store.js index a7ef665048c5..e973839faad5 100644 --- a/src/javascript/app/Stores/Modules/Contract/contract-store.js +++ b/src/javascript/app/Stores/Modules/Contract/contract-store.js @@ -85,9 +85,9 @@ export default class ContractStore extends BaseStore { } else if (!this.is_left_epoch_set) { // For tick contracts, it is necessary to set the chartType and granularity after saving and clearing trade layout // TODO: Fix issue with setting start_epoch and loading ongoing contract from positions - // if (this.is_from_positions) { - // SmartChartStore.setContractStart(date_start); - // } + if (this.is_from_positions) { + SmartChartStore.setContractStart(date_start); + } if (contract_info.tick_count) { SmartChartStore.updateGranularity(0); From 244abd142710206de320aada63dea8be9b9c6144 Mon Sep 17 00:00:00 2001 From: ashkan Date: Mon, 20 May 2019 11:39:44 +0200 Subject: [PATCH 2/2] remove the comments --- src/javascript/app/Stores/Modules/Contract/contract-store.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/javascript/app/Stores/Modules/Contract/contract-store.js b/src/javascript/app/Stores/Modules/Contract/contract-store.js index e973839faad5..ca4a8f1ec89c 100644 --- a/src/javascript/app/Stores/Modules/Contract/contract-store.js +++ b/src/javascript/app/Stores/Modules/Contract/contract-store.js @@ -83,8 +83,6 @@ export default class ContractStore extends BaseStore { // setters for ongoing contracts, will only init once onMount after left_epoch is set } else if (!this.is_left_epoch_set) { - // For tick contracts, it is necessary to set the chartType and granularity after saving and clearing trade layout - // TODO: Fix issue with setting start_epoch and loading ongoing contract from positions if (this.is_from_positions) { SmartChartStore.setContractStart(date_start); }