From 7115bb87ea0fb03757d36d7b9e3449304c5e60b1 Mon Sep 17 00:00:00 2001
From: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
Date: Wed, 15 Feb 2023 18:06:26 +0400
Subject: [PATCH 1/2] Amina /88161 account switcher label change (#7595)
* fix: labels for account switcher
* fix: accout switcher
---
.../AccountSwitcher/account-switcher.jsx | 17 +++++++++++++++--
.../RealAccountSignup/helpers/constants.js | 12 ++----------
packages/core/src/Stores/client-store.js | 6 +++++-
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
index 73982c78c920..5b0d398cc392 100644
--- a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
+++ b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
@@ -589,6 +589,11 @@ const AccountSwitcher = props => {
canOpenMulti() &&
(!props.show_eu_related_content || (props.show_eu_related_content && props.can_change_fiat_currency));
+ const have_more_accounts = type =>
+ getSortedAccountList(props.account_list, props.accounts).filter(
+ account => !account.is_virtual && account.loginid.startsWith(type)
+ ).length > 1;
+
const default_demo_accounts = (
{vrtc_loginid && (
@@ -1049,7 +1054,11 @@ const AccountSwitcher = props => {
{
toggleVisibility('real_deriv');
@@ -1118,7 +1127,11 @@ const AccountSwitcher = props => {
) : null}
{!props.is_high_risk || props.is_eu ? (
{
toggleVisibility('real_deriv');
diff --git a/packages/core/src/App/Containers/RealAccountSignup/helpers/constants.js b/packages/core/src/App/Containers/RealAccountSignup/helpers/constants.js
index 857e284ecd76..2698426b6650 100644
--- a/packages/core/src/App/Containers/RealAccountSignup/helpers/constants.js
+++ b/packages/core/src/App/Containers/RealAccountSignup/helpers/constants.js
@@ -35,7 +35,7 @@ export const getAccountTitle = (landing_company_shortcode, { account_residence =
switch (landing_company_shortcode) {
case 'svg':
- return localize('Deriv account');
+ return localize('Options & Multipliers');
case 'iom':
if (country_standpoint.is_united_kingdom) {
return localize('Deriv Gaming');
@@ -51,15 +51,7 @@ export const getAccountTitle = (landing_company_shortcode, { account_residence =
}
return localize('Derived');
case 'maltainvest':
- if (
- country_standpoint.is_united_kingdom ||
- country_standpoint.is_france ||
- country_standpoint.is_other_eu ||
- country_standpoint.is_rest_of_eu
- ) {
- return localize('Multipliers');
- }
- return localize('Deriv Financial');
+ return localize('Multipliers');
default:
return localize('Deriv');
}
diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
index f36a61f9cf1a..682397c7e075 100644
--- a/packages/core/src/Stores/client-store.js
+++ b/packages/core/src/Stores/client-store.js
@@ -2509,7 +2509,11 @@ export default class ClientStore extends BaseStore {
const { gaming_company, financial_company } = this.landing_companies;
const low_risk_landing_company =
financial_company?.shortcode === 'maltainvest' && gaming_company?.shortcode === 'svg';
- return low_risk_landing_company || this.upgradeable_landing_companies?.includes('svg', 'maltainvest');
+ return (
+ low_risk_landing_company ||
+ (this.upgradeable_landing_companies?.includes('svg') &&
+ this.upgradeable_landing_companies?.includes('maltainvest'))
+ );
}
get has_residence() {
From 59a20ac0c7a4898c54ecd8ca5d455b63583f1b5b Mon Sep 17 00:00:00 2001
From: Sergei Baranovski <120570511+sergei-deriv@users.noreply.github.com>
Date: Wed, 15 Feb 2023 09:13:05 -0500
Subject: [PATCH 2/2] Sergei / 87636 / Deposit popup still remain opened after
exiting cashier (#7515)
* fix: close transfer modal after click deposit button
* fix: transfer popup appeared when enter to traders hub
* feat: empty
* fix: close modal right
* refactor: prettier refactor
* refactor: delete some types
* fix: close transfer modal after click deposit button
* fix: transfer popup appeared when enter to traders hub
* feat: empty
* fix: close modal right
* fix: close transfer modal in cleanup function
* chore: empty
* fix: transfer_to_cashier_error (#7547)
* fix: close modal when try to deposit
* feat: destructure props
---------
Co-authored-by: Carol Sachdeva
Co-authored-by: Bahar
---
.../src/components/no-balance/no-balance.tsx | 20 +++++++++++++------
.../account-transfer/account-transfer.tsx | 2 +-
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/packages/cashier/src/components/no-balance/no-balance.tsx b/packages/cashier/src/components/no-balance/no-balance.tsx
index 8fb768864606..f93d9da7f00f 100644
--- a/packages/cashier/src/components/no-balance/no-balance.tsx
+++ b/packages/cashier/src/components/no-balance/no-balance.tsx
@@ -7,17 +7,25 @@ import { localize, Localize } from '@deriv/translations';
import { useStore, observer } from '@deriv/stores';
import { useCashierStore } from '../../stores/useCashierStores';
-const NoBalance = observer(({ history }: RouteComponentProps) => {
+type TNoBalanceProps = RouteComponentProps & {
+ onClickDeposit?: () => void;
+};
+
+const NoBalance = observer(({ history, onClickDeposit }: TNoBalanceProps) => {
const { client } = useStore();
const { currency } = client;
const { general_store } = useCashierStore();
const { setCashierTabIndex: setTabIndex } = general_store;
const is_deposit_locked = useDepositLocked();
- const onClickDeposit = () => {
- // index of deposit tab in the cashier modal is 0
- setTabIndex(0);
- history.push(routes.cashier_deposit);
+ const onClickDepositHandler = () => {
+ if (onClickDeposit) {
+ onClickDeposit();
+ } else {
+ // index of deposit tab in the cashier modal is 0
+ setTabIndex(0);
+ history.push(routes.cashier_deposit);
+ }
};
return (
@@ -39,7 +47,7 @@ const NoBalance = observer(({ history }: RouteComponentProps) => {
className='cashier__no-balance-button'
has_effect
text={localize('Deposit now')}
- onClick={onClickDeposit}
+ onClick={onClickDepositHandler}
primary
large
/>
diff --git a/packages/cashier/src/pages/account-transfer/account-transfer.tsx b/packages/cashier/src/pages/account-transfer/account-transfer.tsx
index bb3a83476203..23128ca573b6 100644
--- a/packages/cashier/src/pages/account-transfer/account-transfer.tsx
+++ b/packages/cashier/src/pages/account-transfer/account-transfer.tsx
@@ -99,7 +99,7 @@ const AccountTransfer = observer(
return ;
}
if (has_no_accounts_balance) {
- return ;
+ return ;
}
if (is_transfer_confirm) {
return ;