+
{jurisdiction_cards_array.map(
card =>
cardsToBeShown(card) && (
diff --git a/packages/core/src/App/Containers/app-notification-messages.jsx b/packages/core/src/App/Containers/app-notification-messages.jsx
index 7a2eac069332..81d370a3e3a7 100644
--- a/packages/core/src/App/Containers/app-notification-messages.jsx
+++ b/packages/core/src/App/Containers/app-notification-messages.jsx
@@ -135,6 +135,7 @@ const AppNotificationMessages = ({
'poa_address_mismatch_failure',
'svg_needs_poi_poa',
'svg_needs_poa',
+ 'has_changed_two_fa',
'svg_needs_poi',
'svg_poi_expired',
'switched_to_real',
diff --git a/packages/core/src/Stores/Helpers/client-notifications.js b/packages/core/src/Stores/Helpers/client-notifications.js
index 5fa45f9c591b..870a7d3b25d6 100644
--- a/packages/core/src/Stores/Helpers/client-notifications.js
+++ b/packages/core/src/Stores/Helpers/client-notifications.js
@@ -62,7 +62,7 @@ export const getCashierValidations = cashier_arr => {
};
export const excluded_notifications = isMobile()
- ? ['contract_sold', 'switched_to_real']
+ ? ['contract_sold', 'switched_to_real', 'has_changed_two_fa']
: [
'you_are_offline',
'password_changed',
@@ -76,6 +76,7 @@ export const excluded_notifications = isMobile()
'svg_needs_poi',
'svg_poi_expired',
'switched_to_real',
+ 'has_changed_two_fa',
];
export const priority_toast_messages = ['svg', 'need_fa', 'p2p_daily_limit_increase'];
diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
index ef6bf7c41fef..178284dad34c 100644
--- a/packages/core/src/Stores/client-store.js
+++ b/packages/core/src/Stores/client-store.js
@@ -77,6 +77,7 @@ export default class ClientStore extends BaseStore {
is_landing_company_loaded = false;
is_account_setting_loaded = false;
has_enabled_two_fa = false;
+ has_changed_two_fa = false;
// this will store the landing_company API response, including
// financial_company: {}
// gaming_company: {}
@@ -186,6 +187,7 @@ export default class ClientStore extends BaseStore {
is_landing_company_loaded: observable,
is_account_setting_loaded: observable,
has_enabled_two_fa: observable,
+ has_changed_two_fa: observable,
landing_companies: observable,
standpoint: observable,
upgradeable_landing_companies: observable,
@@ -383,6 +385,7 @@ export default class ClientStore extends BaseStore {
fetchFinancialAssessment: action.bound,
setFinancialAndTradingAssessment: action.bound,
setTwoFAStatus: action.bound,
+ setTwoFAChangedStatus: action.bound,
is_eu_or_multipliers_only: computed,
getTwoFAStatus: action.bound,
updateMT5Status: action.bound,
@@ -2612,6 +2615,10 @@ export default class ClientStore extends BaseStore {
});
}
+ setTwoFAChangedStatus(status) {
+ this.has_changed_two_fa = status;
+ }
+
async updateMT5Status() {
this.updateAccountStatus();
await WS.authorized.mt5LoginList().then(this.root_store.client.responseMt5LoginList);
diff --git a/packages/core/src/Stores/notification-store.js b/packages/core/src/Stores/notification-store.js
index bf2c81c9dac8..375ed4dba7d0 100644
--- a/packages/core/src/Stores/notification-store.js
+++ b/packages/core/src/Stores/notification-store.js
@@ -100,6 +100,7 @@ export default class NotificationStore extends BaseStore {
root_store.common?.selected_contract_type,
root_store.client.is_eu,
root_store.client.has_enabled_two_fa,
+ root_store.client.has_changed_two_fa,
this.p2p_order_props.order_id,
root_store.client.p2p_advertiser_info,
],
@@ -289,6 +290,7 @@ export default class NotificationStore extends BaseStore {
obj_total_balance,
website_status,
has_enabled_two_fa,
+ has_changed_two_fa,
is_poi_dob_mismatch,
is_financial_information_incomplete,
has_restricted_mt5_account,
@@ -374,6 +376,10 @@ export default class NotificationStore extends BaseStore {
this.addNotificationMessage(this.client_notifications.acuity_mt5_download);
}
+ if (has_changed_two_fa) {
+ this.addNotificationMessage(this.client_notifications.has_changed_two_fa);
+ }
+
const client = accounts[loginid];
if (client && !client.is_virtual) {
if (isEmptyObject(account_status)) return;
@@ -708,6 +714,8 @@ export default class NotificationStore extends BaseStore {
setClientNotifications(client_data = {}) {
const { ui } = this.root_store;
+ const { has_enabled_two_fa, setTwoFAChangedStatus } = this.root_store.client;
+ const two_fa_status = has_enabled_two_fa ? localize('enabled') : localize('disabled');
const mx_mlt_custom_header = this.custom_notifications.mx_mlt_notification.header();
const mx_mlt_custom_content = this.custom_notifications.mx_mlt_notification.main();
@@ -1288,6 +1296,22 @@ export default class NotificationStore extends BaseStore {
),
type: 'warning',
},
+ has_changed_two_fa: {
+ key: 'has_changed_two_fa',
+ header: localize('Logging out on other devices'),
+ message: (
+
+ ),
+ type: 'info',
+ delay: 4000,
+ is_auto_close: true,
+ closeOnClick: () => {
+ setTwoFAChangedStatus(false);
+ },
+ },
two_f_a: {
key: 'two_f_a',
header: localize('Stronger security for your Deriv account'),
diff --git a/packages/stores/src/mockStore.ts b/packages/stores/src/mockStore.ts
index 772848070c61..e2aa6981e1e6 100644
--- a/packages/stores/src/mockStore.ts
+++ b/packages/stores/src/mockStore.ts
@@ -190,6 +190,10 @@ const mock = (): TStores => {
switch_broadcast: false,
switchEndSignal: jest.fn(),
is_crypto: false,
+ has_enabled_two_fa: false,
+ setTwoFAStatus: jest.fn(),
+ has_changed_two_fa: false,
+ setTwoFAChangedStatus: jest.fn(),
},
common: {
error: {
diff --git a/packages/stores/types.ts b/packages/stores/types.ts
index a760e6d0859b..04b8cd820714 100644
--- a/packages/stores/types.ts
+++ b/packages/stores/types.ts
@@ -180,6 +180,10 @@ type TClientStore = {
logout: () => Promise;
should_allow_authentication: boolean;
is_crypto: boolean;
+ has_enabled_two_fa: boolean;
+ setTwoFAStatus: (status: boolean) => void;
+ has_changed_two_fa: boolean;
+ setTwoFAChangedStatus: (status: boolean) => void;
};
type TCommonStoreError = {