Ameerul /Task 86076 Use disabled from website_status instead of calling p2p_advertiser_info on load of deriv-app.

packages/cashier/src/stores/__tests__/general-store.spec.ts

@@ -119,36 +119,29 @@ describe('GeneralStore', () => {
     //     expect(general_store.is_p2p_enabled).toBeTruthy();
     // });
 
-    it('should not show p2p in cashier onboarding if p2p_advertiser_error is equal to "RestrictedCountry"', () => {
-        general_store.setP2pAdvertiserError('RestrictedCountry');
-        general_store.showP2pInCashierOnboarding();
-
-        expect(general_store.show_p2p_in_cashier_onboarding).toBeFalsy();
-    });
-
-    it('should not show p2p in cashier onboarding if the user has accounts with fiat currency, but has not account with USD currency', () => {
+    it('should not show p2p in cashier onboarding if the user has accounts with fiat currency, but has not account with USD currency', async () => {
         general_store.root_store.client.account_list = [{ title: 'EUR' }];
-        general_store.showP2pInCashierOnboarding();
+        await general_store.showP2pInCashierOnboarding();
 
         expect(general_store.show_p2p_in_cashier_onboarding).toBeFalsy();
     });
 
-    it('should not show p2p in cashier onboarding if the user has accounts with fiat currency, but has not account with USD currency', () => {
+    it('should not show p2p in cashier onboarding if the user has accounts with fiat currency, but has not account with USD currency', async () => {
         general_store.root_store.client.account_list = [{ title: 'EUR' }];
-        general_store.showP2pInCashierOnboarding();
+        await general_store.showP2pInCashierOnboarding();
 
         expect(general_store.show_p2p_in_cashier_onboarding).toBeFalsy();
     });
 
-    it('should show p2p in cashier onboarding if the user account is not virtual, there is no p2p_advertiser_error and he has USD account', () => {
-        general_store.showP2pInCashierOnboarding();
+    it('should show p2p in cashier onboarding if the user account is not virtual, there is no p2p_advertiser_error and he has USD account', async () => {
+        await general_store.showP2pInCashierOnboarding();
 
         expect(general_store.show_p2p_in_cashier_onboarding).toBeTruthy();
     });
 
-    it('should show p2p in cashier onboarding if the user account is not virtual, there is no p2p_advertiser_error and he has not fiat currency accounts', () => {
+    it('should show p2p in cashier onboarding if the user account is not virtual, there is no p2p_advertiser_error and he has not fiat currency accounts', async () => {
         general_store.root_store.client.account_list = [{ title: 'BTC' }];
-        general_store.showP2pInCashierOnboarding();
+        await general_store.showP2pInCashierOnboarding();
 
         expect(general_store.show_p2p_in_cashier_onboarding).toBeTruthy();
     });
@@ -262,47 +255,20 @@ describe('GeneralStore', () => {
     });
 
     it('should perform proper init invocation when is_logged_in is equal to true', async () => {
-        const spyGetAdvertizerError = jest.spyOn(general_store, 'getAdvertizerError');
         const spyCheckP2pStatus = jest.spyOn(general_store, 'checkP2pStatus');
         general_store.root_store.client.is_logged_in = true;
         general_store.init();
 
         await waitFor(() => {
-            expect(spyGetAdvertizerError).toHaveBeenCalledTimes(1);
+            expect(spyCheckP2pStatus).toHaveBeenCalledTimes(1);
         });
-        expect(spyCheckP2pStatus).toHaveBeenCalledTimes(1);
+
+        // Don't remove eslint here as WS.wait is expected to be called 2 times from init and checkP2pStatus
         // eslint-disable-next-line testing-library/await-async-utils
-        expect(general_store.WS.wait).toHaveBeenCalledTimes(1);
+        expect(general_store.WS.wait).toHaveBeenCalledTimes(2);
         expect(general_store.root_store.modules.cashier.withdraw.check10kLimit).toHaveBeenCalledTimes(1);
     });
 
-    it('should set advertiser error', async () => {
-        const spySetP2pAdvertiserError = jest.spyOn(general_store, 'setP2pAdvertiserError');
-        await general_store.getAdvertizerError();
-
-        expect(spySetP2pAdvertiserError).toHaveBeenCalledWith('advertiser_error');
-    });
-
-    it('should set p2p advertiser error', () => {
-        general_store.setP2pAdvertiserError('p2p_advertiser_error');
-
-        expect(general_store.p2p_advertiser_error).toBe('p2p_advertiser_error');
-    });
-
-    it('should set is_p2p_visible equal to false, if there is a "RestrictedCountry" p2p advertiser error', () => {
-        general_store.setP2pAdvertiserError('RestrictedCountry');
-        general_store.checkP2pStatus();
-
-        expect(general_store.is_p2p_visible).toBeFalsy();
-    });
-
-    it('should set is_p2p_visible equal to false, if there is a "RestrictedCurrency" p2p advertiser error', () => {
-        general_store.setP2pAdvertiserError('RestrictedCurrency');
-        general_store.checkP2pStatus();
-
-        expect(general_store.is_p2p_visible).toBeFalsy();
-    });
-
     it('should set is_p2p_visible equal to false, if there is a virtual account', () => {
         general_store.root_store.client.is_virtual = true;
         general_store.checkP2pStatus();
@@ -417,6 +383,7 @@ describe('GeneralStore', () => {
         jest.spyOn(window, 'window', 'get').mockImplementation(() => ({
             location: {
                 pathname: routes.cashier_p2p,
+                hostname: 'localhost.binary.sx',
             },
         }));
         general_store.setIsP2pVisible(false);

packages/cashier/src/stores/general-store.ts

@@ -1,9 +1,10 @@
 import { action, computed, observable, reaction, when, makeObservable } from 'mobx';
-import { isCryptocurrency, isEmptyObject, getPropertyValue, routes, ContentFlag } from '@deriv/shared';
+import { isCryptocurrency, isEmptyObject, routes, ContentFlag, CookieStorage } from '@deriv/shared';
 import Constants from 'Constants/constants';
 import BaseStore from './base-store';
 import PaymentAgentStore from './payment-agent-store';
 import type { TRootStore, TWebSocket } from 'Types';
+import { AccountStatusResponse } from '@deriv/api-types';
 
 export default class GeneralStore extends BaseStore {
     constructor(public WS: TWebSocket, public root_store: TRootStore) {
@@ -16,7 +17,6 @@ export default class GeneralStore extends BaseStore {
             checkP2pStatus: action.bound,
             continueRoute: action.bound,
             deposit_target: observable,
-            getAdvertizerError: action.bound,
             has_set_currency: observable,
             init: action.bound,
             is_cashier_locked: computed,
@@ -30,7 +30,6 @@ export default class GeneralStore extends BaseStore {
             onMountCashierOnboarding: action.bound,
             onMountCommon: action.bound,
             onRemount: observable,
-            p2p_advertiser_error: observable,
             p2p_notification_count: observable,
             p2p_unseen_notifications: computed,
             percentage: observable,
@@ -47,7 +46,6 @@ export default class GeneralStore extends BaseStore {
             setLoading: action.bound,
             setNotificationCount: action.bound,
             setOnRemount: action.bound,
-            setP2pAdvertiserError: action.bound,
             setShouldShowAllAvailableCurrencies: action.bound,
             should_percentage_reset: observable,
             should_set_currency_modal_title_change: observable,
@@ -89,7 +87,6 @@ export default class GeneralStore extends BaseStore {
     is_p2p_visible = false;
     is_populating_values = false;
     onRemount: VoidFunction = () => this;
-    p2p_advertiser_error?: string = undefined;
     p2p_notification_count = 0;
     percentage = 0;
     payment_agent: PaymentAgentStore | null = null;
@@ -135,16 +132,18 @@ export default class GeneralStore extends BaseStore {
         return unseen_notifications.length;
     }
 
-    showP2pInCashierOnboarding(): void {
+    async showP2pInCashierOnboarding(): Promise<void> {
         const { account_list, is_virtual } = this.root_store.client;
 
-        const is_p2p_restricted = this.p2p_advertiser_error === 'RestrictedCountry';
+        const get_account_status = this.WS.wait('get_account_status');
+
+        const is_p2p_disabled = (await get_account_status)?.get_account_status?.p2p_status === 'none';
         const has_usd_currency = account_list.some(account => account.title === 'USD');
         const has_user_fiat_currency = account_list.some(
-            account => !isCryptocurrency(account.title) && account.title !== 'Real'
+            account => account?.title && account.title !== 'Real' && !isCryptocurrency(account?.title)
         );
 
-        if (is_p2p_restricted || is_virtual || (has_user_fiat_currency && !has_usd_currency)) {
+        if (is_p2p_disabled || is_virtual || (has_user_fiat_currency && !has_usd_currency)) {
             this.show_p2p_in_cashier_onboarding = false;
         } else {
             this.show_p2p_in_cashier_onboarding = true;
@@ -243,7 +242,6 @@ export default class GeneralStore extends BaseStore {
             await this.WS.wait('get_settings');
 
             if (is_logged_in) {
-                await this.getAdvertizerError();
                 if (!switched) {
                     this.checkP2pStatus();
                     payment_agent.setPaymentAgentList().then(payment_agent.filterPaymentAgentList);
@@ -258,19 +256,11 @@ export default class GeneralStore extends BaseStore {
         }
     }
 
-    async getAdvertizerError() {
-        const advertiser_info = await this.WS.authorized.p2pAdvertiserInfo?.();
-        this.setP2pAdvertiserError(getPropertyValue(advertiser_info, ['error', 'code']));
-    }
+    async checkP2pStatus(): Promise<void> {
+        const get_account_status = this.WS.wait('get_account_status');
 
-    setP2pAdvertiserError(value: string): void {
-        this.p2p_advertiser_error = value;
-    }
-
-    checkP2pStatus(): void {
-        const advertiser_error = this.p2p_advertiser_error;
-        const is_p2p_restricted = advertiser_error === 'RestrictedCountry' || advertiser_error === 'RestrictedCurrency';
-        this.setIsP2pVisible(!(is_p2p_restricted || this.root_store.client.is_virtual));
+        const is_p2p_disabled = (await get_account_status)?.get_account_status?.p2p_status === 'none';
+        this.setIsP2pVisible(!(is_p2p_disabled || this.root_store.client.is_virtual));
     }
 
     async onMountCommon(should_remount?: boolean) {
@@ -341,6 +331,9 @@ export default class GeneralStore extends BaseStore {
                 this.root_store.modules.cashier.account_prompt_dialog.last_location ?? routes.cashier_deposit
             );
         }
+
+        const p2p_cookie = new (CookieStorage as any)('is_p2p_disabled');
+        p2p_cookie.set('is_p2p_disabled', !is_p2p_visible);
     }
 
     get is_cashier_locked(): boolean {

packages/cashier/src/types/websocket.types.ts

@@ -8,6 +8,7 @@ import {
     P2PAdvertInfo,
     TransferBetweenAccountsResponse,
 } from '@deriv/api-types';
+import { TSocketEndpointNames, TSocketResponse } from '@deriv/api/types';
 import type { TTransactionItem } from 'Types';
 
 export type TCashierPayments = {
@@ -87,5 +88,5 @@ export type TWebSocket = {
     tradingPlatformAccountsList: (platform: string) => {
         trading_platform_accounts: (DetailsOfEachMT5Loginid & { account_id: string })[];
     };
-    wait: (value: string) => Promise<unknown>;
+    wait: <T extends TSocketEndpointNames>(value: T) => Promise<TSocketResponse<T>>;
 };

packages/core/src/Services/socket-general.js

@@ -22,7 +22,8 @@ const BinarySocketGeneral = (() => {
                 client_store.logout();
                 return;
             }
-            WS.subscribeWebsiteStatus(ResponseHandlers.websiteStatus);
+            // Waiting for authorize call to be completed so BE can use residence instead of IP
+            WS.wait('authorize').then(() => WS.subscribeWebsiteStatus(ResponseHandlers.websiteStatus));
             ServerTime.init(() => common_store.setServerTime(ServerTime.get()));
             common_store.setIsSocketOpened(true);
         }
@@ -187,7 +188,6 @@ const BinarySocketGeneral = (() => {
                         'trading_platform_password_reset',
                         'trading_platform_investor_password_reset',
                         'new_account_virtual',
-                        'p2p_advertiser_info',
                         'portfolio',
                         'proposal_open_contract',
                         'change_email',

packages/core/src/_common/base/socket_base.js

@@ -342,8 +342,6 @@ const BinarySocketBase = (() => {
 
     const cancelContract = contract_id => deriv_api.send({ cancel: contract_id });
 
-    const p2pAdvertiserInfo = () => deriv_api.send({ p2p_advertiser_info: 1 });
-
     const fetchLoginHistory = limit =>
         deriv_api.send({
             login_history: 1,
@@ -444,7 +442,6 @@ const BinarySocketBase = (() => {
         newAccountVirtual,
         newAccountReal,
         newAccountRealMaltaInvest,
-        p2pAdvertiserInfo,
         p2pSubscribe,
         profitTable,
         statement,