Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Amina/fix: dmt5 paswrd #178

Merged
merged 1 commit into from
Jan 27, 2023
Merged

Amina/fix: dmt5 paswrd #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions packages/appstore/src/components/modals/modal-manager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@ type TCurrentList = DetailsOfEachMT5Loginid & {
const ModalManager = () => {
const store = useStores();
const { common, client, modules, traders_hub, ui } = store;
const { is_logged_in, is_eu, is_eu_country, has_active_real_account, real_account_creation_unlock_date } = client;
const {
is_logged_in,
is_eu,
is_eu_country,
is_populating_mt5_account_list,
has_active_real_account,
real_account_creation_unlock_date,
verification_code,
} = client;
const { platform } = common;
const {
current_list,
Expand All @@ -43,12 +51,16 @@ const ModalManager = () => {
topUpVirtual,
} = modules.cfd;
const {
enableApp,
disableApp,
is_top_up_virtual_open,
is_top_up_virtual_in_progress,
is_top_up_virtual_success,
closeTopUpModal,
closeSuccessTopUpModal,
setShouldShowCooldownModal,
is_reset_trading_password_modal_visible,
setResetTradingPasswordModalOpen,
} = ui;
const { is_demo, is_account_transfer_modal_open, toggleAccountTransferModal } = traders_hub;

Expand Down Expand Up @@ -106,6 +118,8 @@ const ModalManager = () => {
: undefined;
return acc;
};
const trading_platform_dxtrade_password_reset = verification_code?.trading_platform_dxtrade_password_reset;
const trading_platform_mt5_password_reset = verification_code?.trading_platform_mt5_password_reset;

getRealSyntheticAccountsExistingData(existing_accounts_data('synthetic'));
getRealFinancialAccountsExistingData(existing_accounts_data('financial'));
Expand Down Expand Up @@ -150,7 +164,16 @@ const ModalManager = () => {
platform={platform}
toggleModal={togglePasswordManagerModal}
/>
<ResetTradingPasswordModal context={store} />
<ResetTradingPasswordModal
context={store}
platform={trading_platform_dxtrade_password_reset ? 'dxtrade' : 'mt5'}
enableApp={enableApp}
disableApp={disableApp}
toggleResetTradingPasswordModal={setResetTradingPasswordModalOpen}
is_visible={is_reset_trading_password_modal_visible}
is_loading={is_populating_mt5_account_list}
verification_code={trading_platform_dxtrade_password_reset || trading_platform_mt5_password_reset}
/>
<MT5AccountTypeModal />
<RegulatorsCompareModal />
<CompareAccountsModal
Expand Down