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

thisyahlen/fix: account switcher for mf #7723

Merged
merged 7 commits into from
Feb 24, 2023
Merged

thisyahlen/fix: account switcher for mf #7723

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2851e4f
fix: account switcher for mf
thisyahlen-deriv Feb 24, 2023
6df9035
fix: undefined loginid
thisyahlen-deriv Feb 24, 2023
3098724
fix: add real account modal height
thisyahlen-deriv Feb 24, 2023
0150994
Merge branch 'master' into thisyahlen/89397/account_switcher_wrong_modal
thisyahlen-deriv Feb 24, 2023
d26ca96
chore: removed unused props
thisyahlen-deriv Feb 24, 2023
80d4eed
Merge branch 'thisyahlen/89397/account_switcher_wrong_modal' of githu…
thisyahlen-deriv Feb 24, 2023
c43a936
chore: remove unused v2
thisyahlen-deriv Feb 24, 2023
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
7 changes: 6 additions & 1 deletion packages/core/src/App/Containers/RealAccountSignup/add-or-manage-accounts.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const AddOrManageAccounts = props => {
show_eu_related_content,
is_low_risk,
is_pre_appstore,
loginid,
} = props;

const initial_active_index =
Expand Down Expand Up @@ -138,9 +139,11 @@ const AddOrManageAccounts = props => {
);
}

const is_mf_active = loginid.startsWith('MF');

return (
<ThemedScrollbars is_bypassed={isMobile()} autohide={false}>
{show_eu_related_content && !(is_low_risk && is_pre_appstore) && has_fiat ? (
{(show_eu_related_content && !(is_low_risk && is_pre_appstore) && has_fiat) || is_mf_active ? (
fiat_section
) : (
<Tabs
Expand Down Expand Up @@ -220,6 +223,7 @@ AddOrManageAccounts.propTypes = {
show_eu_related_content: PropTypes.bool,
is_low_risk: PropTypes.bool,
is_pre_appstore: PropTypes.bool,
loginid: PropTypes.string,
};

export default connect(({ client, modules, ui, traders_hub }) => ({
Expand All @@ -237,4 +241,5 @@ export default connect(({ client, modules, ui, traders_hub }) => ({
show_eu_related_content: traders_hub.show_eu_related_content,
is_low_risk: client.is_low_risk,
is_pre_appstore: client.is_pre_appstore,
loginid: client.loginid,
}))(AddOrManageAccounts);
11 changes: 8 additions & 3 deletions packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ const RealAccountSignup = ({
state_index,
state_value,
is_low_risk,
loginid,
}) => {
const [current_action, setCurrentAction] = React.useState(null);
const [is_loading, setIsLoading] = React.useState(false);
Expand Down Expand Up @@ -257,14 +258,17 @@ const RealAccountSignup = ({

const [assessment_decline, setAssessmentDecline] = React.useState(false);

const is_mf_active = loginid.startsWith('MF');

const getModalHeight = () => {
if (getActiveModalIndex() === modal_pages_indices.status_dialog) return 'auto';
if (!currency) return '688px'; // Set currency modal
if (has_real_account && currency) {
if (
show_eu_related_content &&
!(is_pre_appstore && is_low_risk) &&
getActiveModalIndex() === modal_pages_indices.add_or_manage_account
(show_eu_related_content &&
!(is_pre_appstore && is_low_risk) &&
getActiveModalIndex() === modal_pages_indices.add_or_manage_account) ||
is_mf_active
) {
// Manage account
return '420px'; // Since crypto is disabled for EU clients, lower the height of modal
Expand Down Expand Up @@ -662,4 +666,5 @@ export default connect(({ ui, client, common, traders_hub, modules }) => ({
state_value: ui.real_account_signup,
show_eu_related_content: traders_hub.show_eu_related_content,
is_low_risk: client.is_low_risk,
loginid: client.loginid,
thisyahlen-deriv marked this conversation as resolved.
Show resolved Hide resolved
}))(withRouter(RealAccountSignup));
4 changes: 1 addition & 3 deletions packages/core/src/Stores/client-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,7 @@ export default class ClientStore extends BaseStore {
['set_currency', 'manage'].includes(this.root_store.ui.real_account_signup_target) &&
this.current_landing_company
) {
return this.is_pre_appstore
? getDefaultAllowedCurrencies()
: this.current_landing_company.legal_allowed_currencies;
return this.current_landing_company.legal_allowed_currencies;
}
const target = this.root_store.ui.real_account_signup_target === 'maltainvest' ? 'financial' : 'gaming';

Expand Down