Merge pull request #70 from ashkanx/dev

SmartCharts 0.4.27
binary-com · May 20, 2019 · d3c6d29 · d3c6d29
2 parents c03ed6e + 244abd1
commit d3c6d29
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -83,11 +83,9 @@ 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);
-            // }
+            if (this.is_from_positions) {
+                SmartChartStore.setContractStart(date_start);
+            }
 
             if (contract_info.tick_count) {
                 SmartChartStore.updateGranularity(0);