From 7eaa2b0494bf3e86b69abbde757b8d9497595784 Mon Sep 17 00:00:00 2001 From: "Ali(Ako) Hosseini" Date: Mon, 18 Oct 2021 15:53:47 +0330 Subject: [PATCH 1/5] sign up modal title added to ui store --- packages/core/src/Stores/ui-store.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core/src/Stores/ui-store.js b/packages/core/src/Stores/ui-store.js index 76bfa5204444..9d92d9d29485 100644 --- a/packages/core/src/Stores/ui-store.js +++ b/packages/core/src/Stores/ui-store.js @@ -37,6 +37,7 @@ export default class UIStore extends BaseStore { @observable is_dark_mode_on = window?.matchMedia?.('(prefers-color-scheme: dark)').matches && isMobile(); @observable is_settings_modal_on = false; @observable is_accounts_switcher_on = false; + @observable signup_modal_real_account_title = ''; @observable account_switcher_disabled_message = ''; @observable has_only_forward_starting_contracts = false; @@ -411,10 +412,11 @@ export default class UIStore extends BaseStore { } @action.bound - openRealAccountSignup(target = this.root_store.client.upgradeable_landing_companies?.[0]) { + openRealAccountSignup(target = this.root_store.client.upgradeable_landing_companies?.[0], callSite) { this.is_real_acc_signup_on = true; this.real_account_signup_target = target; this.is_accounts_switcher_on = false; + this.signup_modal_real_account_title = callSite; } @action.bound From 1181fad1e16eb828e43b39573e9d5ca6275b2cb2 Mon Sep 17 00:00:00 2001 From: "Ali(Ako) Hosseini" Date: Mon, 18 Oct 2021 15:55:33 +0330 Subject: [PATCH 2/5] customize sign up modal title based on call site --- .../AccountSwitcher/account-switcher.jsx | 49 ++++++++++--------- .../RealAccountSignup/real-account-signup.jsx | 14 +++++- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx index d91b16056757..2de520845f91 100644 --- a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx +++ b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx @@ -616,29 +616,32 @@ const AccountSwitcher = props => { ); })} - {getRemainingRealAccounts().map((account, index) => ( -
- - - {getAccountTitle( - account, - { account_residence: props.client_residence }, - props.country_standpoint - )} - - -
- ))} + {getRemainingRealAccounts().map((account, index) => { + const account_title = getAccountTitle( + account, + { account_residence: props.client_residence }, + props.country_standpoint + ); + return ( +
+ + + {account_title} + + +
+ ); + })} {!canUpgrade() && canOpenMulti() && (!props.is_eu || (props.is_eu && props.can_change_fiat_currency)) && ( 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 75ef81caef94..1cea5baafb81 100644 --- a/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx +++ b/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx @@ -30,7 +30,13 @@ const modal_pages_indices = { finished_add_currency: 8, }; -const WizardHeading = ({ real_account_signup_target, currency, is_isle_of_man_residence, country_standpoint }) => { +const WizardHeading = ({ + real_account_signup_target, + currency, + is_isle_of_man_residence, + country_standpoint, + signup_modal_real_account_title, +}) => { const maltainvest_signup = real_account_signup_target === 'maltainvest'; const iom_signup = real_account_signup_target === 'iom'; const deposit_cash_signup = real_account_signup_target === 'deposit_cash'; @@ -69,7 +75,7 @@ const WizardHeading = ({ real_account_signup_target, currency, is_isle_of_man_re country_standpoint.is_other_eu || country_standpoint.is_rest_of_eu ) { - return ; + return ; } return ; case 'samoa': @@ -103,6 +109,7 @@ const RealAccountSignup = ({ state_index, state_value, deposit_real_account_signup_target, + signup_modal_real_account_title, }) => { const [current_action, setCurrentAction] = React.useState(null); const [is_loading, setIsLoading] = React.useState(false); @@ -427,6 +434,7 @@ const RealAccountSignup = ({ available_crypto_currencies={available_crypto_currencies} should_show_all_available_currencies={should_show_all_available_currencies} country_standpoint={country_standpoint} + signup_modal_real_account_title={signup_modal_real_account_title} /> ); } @@ -466,6 +474,7 @@ const RealAccountSignup = ({ is_belgium_residence={is_belgium_residence} should_show_all_available_currencies={should_show_all_available_currencies} country_standpoint={country_standpoint} + signup_modal_real_account_title={signup_modal_real_account_title} /> ); } @@ -510,4 +519,5 @@ export default connect(({ ui, client, common, modules }) => ({ state_value: ui.real_account_signup, routing_history: common.app_routing_history, deposit_real_account_signup_target: ui.deposit_real_account_signup_target, + signup_modal_real_account_title: ui.signup_modal_real_account_title, }))(withRouter(RealAccountSignup)); From f8e550e66825c83dbafd3597a5aa27f2cd9adec7 Mon Sep 17 00:00:00 2001 From: "Ali(Ako) Hosseini" Date: Tue, 19 Oct 2021 11:09:47 +0330 Subject: [PATCH 3/5] chore/ add condition to prevent useless assigns --- packages/core/src/Stores/ui-store.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/Stores/ui-store.js b/packages/core/src/Stores/ui-store.js index 9d92d9d29485..c1cab8786544 100644 --- a/packages/core/src/Stores/ui-store.js +++ b/packages/core/src/Stores/ui-store.js @@ -416,7 +416,7 @@ export default class UIStore extends BaseStore { this.is_real_acc_signup_on = true; this.real_account_signup_target = target; this.is_accounts_switcher_on = false; - this.signup_modal_real_account_title = callSite; + if (callSite) this.signup_modal_real_account_title = callSite; } @action.bound From e0c976175e0e0d0babb2883564bfa40023bae062 Mon Sep 17 00:00:00 2001 From: "Ali(Ako) Hosseini" Date: Tue, 19 Oct 2021 12:14:39 +0330 Subject: [PATCH 4/5] chore/ sign up modal title condition improvements --- packages/core/src/Stores/ui-store.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/Stores/ui-store.js b/packages/core/src/Stores/ui-store.js index c1cab8786544..7a303f832178 100644 --- a/packages/core/src/Stores/ui-store.js +++ b/packages/core/src/Stores/ui-store.js @@ -412,11 +412,11 @@ export default class UIStore extends BaseStore { } @action.bound - openRealAccountSignup(target = this.root_store.client.upgradeable_landing_companies?.[0], callSite) { + openRealAccountSignup(target = this.root_store.client.upgradeable_landing_companies?.[0], call_site) { this.is_real_acc_signup_on = true; this.real_account_signup_target = target; this.is_accounts_switcher_on = false; - if (callSite) this.signup_modal_real_account_title = callSite; + this.signup_modal_real_account_title = call_site || this.signup_modal_real_account_title; } @action.bound From 71b5b143446dbc9c474cb892d4eac053df869c1b Mon Sep 17 00:00:00 2001 From: "Ali(Ako) Hosseini" Date: Tue, 19 Oct 2021 12:21:00 +0330 Subject: [PATCH 5/5] feat: sign up modal title improvements --- .../src/App/Containers/AccountSwitcher/account-switcher.jsx | 2 +- .../App/Containers/RealAccountSignup/real-account-signup.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx index 2de520845f91..5202c8914347 100644 --- a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx +++ b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx @@ -631,7 +631,7 @@ const AccountSwitcher = props => {