From 2c68cb3ffa61f956ac23c8a4daacec7d2684d89e Mon Sep 17 00:00:00 2001 From: Hubert Koster Date: Tue, 6 Jul 2021 14:29:21 +0200 Subject: [PATCH 1/4] awaiting variable change, so that double refresh is not needed. --- src/javascript/app/pages/user/metatrader/metatrader.ui.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/javascript/app/pages/user/metatrader/metatrader.ui.js b/src/javascript/app/pages/user/metatrader/metatrader.ui.js index a7d1911827f4f..e4ddfc275a961 100644 --- a/src/javascript/app/pages/user/metatrader/metatrader.ui.js +++ b/src/javascript/app/pages/user/metatrader/metatrader.ui.js @@ -338,8 +338,8 @@ const MetaTraderUI = (() => { $container.find('#account_desc').html($el_to_clone.clone()); }; - const setCurrentAccount = (acc_type) => { - if (Client.get('mt5_account') && Client.get('mt5_account') !== acc_type) return; + const setCurrentAccount = async (acc_type) => { + if (await Client.get('mt5_account') && Client.get('mt5_account') !== acc_type) return; if (current_action_ui !== 'new_account') { displayAccountDescription(acc_type); From 8d89b19ca1302ee841750c29bb13edb85cb54d97 Mon Sep 17 00:00:00 2001 From: Hubert Koster Date: Fri, 9 Jul 2021 11:07:59 +0200 Subject: [PATCH 2/4] account defaults to different one when server is unavailable --- .../app/pages/user/metatrader/metatrader.ui.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/javascript/app/pages/user/metatrader/metatrader.ui.js b/src/javascript/app/pages/user/metatrader/metatrader.ui.js index e4ddfc275a961..6ba116702424c 100644 --- a/src/javascript/app/pages/user/metatrader/metatrader.ui.js +++ b/src/javascript/app/pages/user/metatrader/metatrader.ui.js @@ -338,9 +338,16 @@ const MetaTraderUI = (() => { $container.find('#account_desc').html($el_to_clone.clone()); }; - const setCurrentAccount = async (acc_type) => { + const setCurrentAccount = async (account_type) => { + let acc_type = account_type; if (await Client.get('mt5_account') && Client.get('mt5_account') !== acc_type) return; + if (Client.get('mt5_account') === 'real_unknown') { + const default_to_other = Object.keys(accounts_info).find(account => getAccountsInfo(account).info); + acc_type = default_to_other; + $detail.find('.acc-info').setVisibility(1); + } + if (current_action_ui !== 'new_account') { displayAccountDescription(acc_type); } @@ -362,7 +369,7 @@ const MetaTraderUI = (() => { broker : () => 'Deriv Limited', display_login: () => (`${info} (${is_demo ? localize('Demo Account') : localize('Real-Money Account')})`), leverage : () => `1:${info}`, - server : () => `${server_info && server_info.environment}`, + server : () => `${server_info === undefined ? 'Unavailable' : server_info && server_info.environment}`, ...( is_synthetic && server_info.geolocation.region && From 07362e871fea5bb1cacf02eb9b0984914018cd88 Mon Sep 17 00:00:00 2001 From: Hubert Koster Date: Fri, 9 Jul 2021 11:23:02 +0200 Subject: [PATCH 3/4] refactoring code --- src/javascript/app/pages/user/metatrader/metatrader.ui.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/javascript/app/pages/user/metatrader/metatrader.ui.js b/src/javascript/app/pages/user/metatrader/metatrader.ui.js index 6ba116702424c..3f7a4e0a15b34 100644 --- a/src/javascript/app/pages/user/metatrader/metatrader.ui.js +++ b/src/javascript/app/pages/user/metatrader/metatrader.ui.js @@ -340,9 +340,11 @@ const MetaTraderUI = (() => { const setCurrentAccount = async (account_type) => { let acc_type = account_type; - if (await Client.get('mt5_account') && Client.get('mt5_account') !== acc_type) return; + const current_account = Client.get('mt5_account'); - if (Client.get('mt5_account') === 'real_unknown') { + if (await current_account && current_account !== acc_type) return; + + if (current_account === 'real_unknown') { const default_to_other = Object.keys(accounts_info).find(account => getAccountsInfo(account).info); acc_type = default_to_other; $detail.find('.acc-info').setVisibility(1); From b4c0ed45efe0c59cde400c63f9a7802009b94184 Mon Sep 17 00:00:00 2001 From: Hubert Koster Date: Mon, 12 Jul 2021 14:33:46 +0200 Subject: [PATCH 4/4] changing position of await --- src/javascript/app/pages/user/metatrader/metatrader.ui.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/javascript/app/pages/user/metatrader/metatrader.ui.js b/src/javascript/app/pages/user/metatrader/metatrader.ui.js index 3f7a4e0a15b34..1ab535f568abb 100644 --- a/src/javascript/app/pages/user/metatrader/metatrader.ui.js +++ b/src/javascript/app/pages/user/metatrader/metatrader.ui.js @@ -339,10 +339,10 @@ const MetaTraderUI = (() => { }; const setCurrentAccount = async (account_type) => { - let acc_type = account_type; - const current_account = Client.get('mt5_account'); + let acc_type = await account_type; + const current_account = await Client.get('mt5_account'); - if (await current_account && current_account !== acc_type) return; + if (current_account && current_account !== acc_type) return; if (current_account === 'real_unknown') { const default_to_other = Object.keys(accounts_info).find(account => getAccountsInfo(account).info);