From 1d76626c6549f1a86b2ce7da23df5f87320d2684 Mon Sep 17 00:00:00 2001 From: OskarAhl Date: Fri, 31 May 2019 13:00:05 +0800 Subject: [PATCH 1/3] Remove idx incrementer, fix id comparison --- .../app/Stores/Modules/Portfolio/portfolio-store.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/javascript/app/Stores/Modules/Portfolio/portfolio-store.js b/src/javascript/app/Stores/Modules/Portfolio/portfolio-store.js index 57f9227220c5..1e2bcd63d00c 100644 --- a/src/javascript/app/Stores/Modules/Portfolio/portfolio-store.js +++ b/src/javascript/app/Stores/Modules/Portfolio/portfolio-store.js @@ -194,13 +194,13 @@ export default class PortfolioStore extends BaseStore { @action.bound removePositionById(contract_id) { - const is_contract_mode = this.root_store.modules.smart_chart.is_contract_mode; - let i = this.getPositionIndexById(contract_id); - // check if position to be removed is out of range from the maximum amount rendered in drawer - if (this.positions.length > 4) i += 1; + const { is_contract_mode } = this.root_store.modules.smart_chart; + const i = this.getPositionIndexById(contract_id); + this.positions.splice(i, 1); + // check if contract is in view in contract_mode before removing contract details from chart - if (is_contract_mode && (this.root_store.modules.contract.contract_id === contract_id)) { + if (is_contract_mode && (+this.root_store.modules.contract.contract_id === +contract_id)) { this.root_store.modules.contract.onCloseContract(); this.root_store.modules.trade.requestProposal(); } From 968eb0a1408f789558b38c3ec26dca77868e451b Mon Sep 17 00:00:00 2001 From: OskarAhl Date: Tue, 4 Jun 2019 10:56:32 +0800 Subject: [PATCH 2/3] remove forgetProposalOpenContract, forget_id from contract-store --- .../app/Stores/Modules/Contract/contract-store.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/javascript/app/Stores/Modules/Contract/contract-store.js b/src/javascript/app/Stores/Modules/Contract/contract-store.js index 8d5d35e6611c..ed1ab4b5efae 100644 --- a/src/javascript/app/Stores/Modules/Contract/contract-store.js +++ b/src/javascript/app/Stores/Modules/Contract/contract-store.js @@ -48,7 +48,6 @@ export default class ContractStore extends BaseStore { @observable is_replay_static_chart = false; // ---- Normal properties --- - forget_id; chart_type = 'mountain'; is_from_positions = false; is_ongoing_contract = false; @@ -62,7 +61,6 @@ export default class ContractStore extends BaseStore { // ------------------- @action.bound drawChart(SmartChartStore, contract_info) { - this.forget_id = contract_info.id; const { date_start } = contract_info; const end_time = getEndTime(contract_info); @@ -148,7 +146,6 @@ export default class ContractStore extends BaseStore { @action.bound onUnmountReplay() { - this.forget_id = null; this.replay_contract_id = null; this.digits_info = {}; this.is_ongoing_contract = false; @@ -176,7 +173,6 @@ export default class ContractStore extends BaseStore { this.contract_info = {}; this.digits_info = {}; this.error_message = ''; - this.forget_id = null; this.has_error = false; this.is_sell_requested = false; this.is_from_positions = false; @@ -212,7 +208,6 @@ export default class ContractStore extends BaseStore { } if (+response.proposal_open_contract.contract_id !== +this.replay_contract_id) return; - this.forget_id = response.proposal_open_contract.id; this.replay_info = response.proposal_open_contract; // Add indicative status for contract @@ -335,10 +330,6 @@ export default class ContractStore extends BaseStore { SmartChartStore.updateGranularity(granularity); } - forgetProposalOpenContract() { - WS.forget('proposal_open_contract', this.updateProposal, { id: this.forget_id }); - } - waitForChartListener = (SmartChartStore) => { // TODO: Refactor, timeout interval is required for completed contracts. // There is an issue when we receive the proposal_open_contract response From 5053f203d9db23ac2f4c5139fba5bf1c775880ee Mon Sep 17 00:00:00 2001 From: OskarAhl Date: Tue, 4 Jun 2019 11:10:35 +0800 Subject: [PATCH 3/3] update naming --- .../app/Stores/Modules/Portfolio/portfolio-store.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/javascript/app/Stores/Modules/Portfolio/portfolio-store.js b/src/javascript/app/Stores/Modules/Portfolio/portfolio-store.js index ea7a31491714..b2f3a11a8f77 100644 --- a/src/javascript/app/Stores/Modules/Portfolio/portfolio-store.js +++ b/src/javascript/app/Stores/Modules/Portfolio/portfolio-store.js @@ -193,9 +193,9 @@ export default class PortfolioStore extends BaseStore { @action.bound removePositionById(contract_id) { const { is_contract_mode } = this.root_store.modules.smart_chart; - const i = this.getPositionIndexById(contract_id); + const contract_idx = this.getPositionIndexById(contract_id); - this.positions.splice(i, 1); + this.positions.splice(contract_idx, 1); // check if contract is in view in contract_mode before removing contract details from chart if (is_contract_mode && (+this.root_store.modules.contract.contract_id === +contract_id)) {