From d539a1ebf3ffbdf31aa6b5cafebd5b73c2e07c1a Mon Sep 17 00:00:00 2001 From: Sui Sin <103026762+suisin-deriv@users.noreply.github.com> Date: Mon, 13 May 2024 16:39:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Add=20a=20Deriv=20Account=20pop=20up=20i?= =?UTF-8?q?s=20broken=20if=20user=20select=20same=20duplica=E2=80=A6=20(#1?= =?UTF-8?q?1216)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Add a Deriv Account pop up is broken if user select same duplicated currency * chore: add operation check for local props * chore: fix flickering issue --------- Co-authored-by: amina-deriv --- .../RealAccountSignup/real-account-signup.jsx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx b/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx index 2510c575dc2a..7a0462ec7626 100644 --- a/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx +++ b/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx @@ -195,7 +195,18 @@ const RealAccountSignup = observer(({ history, state_index, is_trading_experienc onConfirm={() => onErrorConfirm(local_props.state_value.error_code)} /> ), - title: () => localize('Add a real account'), + title: local_props => { + if (local_props?.real_account_signup_target === 'add_crypto') { + return localize('Create a cryptocurrency account'); + } else if (local_props?.real_account_signup_target === 'add_fiat') { + return localize('Add a Deriv real account'); + } else if (local_props?.real_account_signup_target === 'add_currency') { + return localize('Create a new account'); + } else if (local_props?.has_fiat && local_props?.available_crypto_currencies?.length === 0) { + return localize('Manage account'); + } + return localize('Add or manage account'); + }, }, { body: () => , @@ -435,9 +446,11 @@ const RealAccountSignup = observer(({ history, state_index, is_trading_experienc }; const onErrorConfirm = err_code => { + const addOrManageAccountErrorType = ['CurrencyTypeNotAllowed', 'DuplicateCurrency']; + setLoading(true); setParams({ active_modal_index: - current_action === 'multi' || err_code === 'CurrencyTypeNotAllowed' + current_action === 'multi' || addOrManageAccountErrorType.includes(err_code) ? modal_pages_indices.add_or_manage_account : modal_pages_indices.account_wizard, });