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.

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

[WALL] george/Terms and Conditions & Migration Banners Displaying Side by Side on Login #18042

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions packages/appstore/src/components/modals/modal-manager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { observer } from 'mobx-react-lite';
import { DetailsOfEachMT5Loginid } from '@deriv/api-types';
import CFDResetPasswordModal from '@deriv/cfd/src/Containers/cfd-reset-password-modal';
import { Loading } from '@deriv/components';
import { useWalletMigration } from '@deriv/hooks';
import { useIsTNCNeeded, useWalletMigration } from '@deriv/hooks';
import { makeLazyLoader, moduleLoader } from '@deriv/shared';

import { useStores } from 'Stores';
Expand Down Expand Up @@ -249,6 +249,8 @@ const ModalManager = () => {
selected_server: '',
});

const is_tnc_needed = useIsTNCNeeded();

const togglePasswordManagerModal = (
login?: string,
title?: string,
Expand Down Expand Up @@ -296,7 +298,7 @@ const ModalManager = () => {
is_sent_email_modal_enabled;

const should_show_wallets_non_eu_upgrade_modal =
!is_eu && (is_eligible || is_real_wallets_upgrade_on || is_in_progress);
!is_eu && !is_tnc_needed && (is_eligible || is_real_wallets_upgrade_on || is_in_progress);

const should_show_wallets_eu_upgrade_modal =
is_eu &&
Expand Down
Loading