Merge branch 'master' into shaheer/WALL-1229

Author: shaheer-deriv

README.md

@@ -6,7 +6,7 @@ This repository contains the various platforms of the Deriv application.
 [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
 ![Sonar Tech Debt](https://img.shields.io/sonar/tech_debt/binary-com_deriv-app?server=https%3A%2F%2Fsonarcloud.io)
 ![Sonar Violations (short format)](https://img.shields.io/sonar/violations/binary-com_deriv-app?server=https%3A%2F%2Fsonarcloud.io)
-[![codecov](https://codecov.io/gh/binary-com/deriv-app/branch/dev/graph/badge.svg?token=LClg2rlZ4z)](https://codecov.io/gh/binary-com/deriv-app)
+[![Coverage Status](https://coveralls.io/repos/github/binary-com/deriv-app/badge.svg?branch=master)](https://coveralls.io/github/binary-com/deriv-app?branch=master)
 
 **In this document**:
 

packages/cfd/src/Containers/__tests__/cfd-server-error-dialog.spec.js

@@ -13,9 +13,6 @@ describe('<CFDServerErrorDialog /> ', () => {
     let mockRootStore;
     beforeEach(() => {
         mockRootStore = {
-            client: {
-                is_authorize: false,
-            },
             ui: {
                 disableApp: jest.fn(),
                 enableApp: jest.fn(),
@@ -56,9 +53,6 @@ describe('<CFDServerErrorDialog /> ', () => {
 
     it('should not render the component if has_cfd_error is false', () => {
         const new_mockRootStore = {
-            client: {
-                is_authorize: false,
-            },
             ui: {
                 ...mockRootStore.ui,
             },
@@ -78,9 +72,6 @@ describe('<CFDServerErrorDialog /> ', () => {
 
     it('should not render the component if is_cfd_success_dialog_enabled', () => {
         const new_mockRootStore = {
-            client: {
-                is_authorize: false,
-            },
             ui: {
                 ...mockRootStore.ui,
             },

packages/core/src/Stores/client-store.js

@@ -2123,8 +2123,8 @@ export default class ClientStore extends BaseStore {
 
         if (response?.logout === 1) {
             this.cleanUp();
+
             RudderStack.reset();
-            this.setIsAuthorize(false);
             this.setLogout(true);
         }
 

packages/stores/src/mockStore.ts

@@ -433,11 +433,6 @@ const mock = (): TStores & { is_mock: boolean } => {
             update: jest.fn(),
             unmount: jest.fn(),
         },
-        website_status: {
-            data: undefined,
-            update: jest.fn(),
-            unmount: jest.fn(),
-        },
         feature_flags: {
             data: undefined,
             update: jest.fn(),

packages/stores/src/providers/WebsiteStatusProvider.tsx

@@ -1,2 +1 @@
 export { default as ExchangeRatesProvider } from './ExchangeRatesProvider';
-export { default as WebsiteStatusProvider } from './WebsiteStatusProvider';

packages/stores/src/providers/index.ts

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo } from 'react';
+import { ExchangeRatesProvider } from './providers';
 import StoreContext from './storeContext';
-import { ExchangeRatesStore, FeatureFlagsStore, WebsiteStatusStore } from './stores';
-import { ExchangeRatesProvider, WebsiteStatusProvider } from './providers';
+import { ExchangeRatesStore, FeatureFlagsStore } from './stores';
 import type { TCoreStores, TStores } from '../types';
 
 const StoreProvider = ({ children, store }: React.PropsWithChildren<{ store: TCoreStores }>) => {
@@ -14,7 +14,6 @@ const StoreProvider = ({ children, store }: React.PropsWithChildren<{ store: TCo
             ...store,
             exchange_rates: new ExchangeRatesStore(),
             feature_flags: new FeatureFlagsStore(),
-            website_status: new WebsiteStatusStore(),
         };
     }, [store]);
 
@@ -28,9 +27,7 @@ const StoreProvider = ({ children, store }: React.PropsWithChildren<{ store: TCo
 
     return (
         <StoreContext.Provider value={memoizedValue}>
-            <WebsiteStatusProvider>
-                <ExchangeRatesProvider>{children}</ExchangeRatesProvider>
-            </WebsiteStatusProvider>
+            <ExchangeRatesProvider>{children}</ExchangeRatesProvider>
         </StoreContext.Provider>
     );
 };

packages/stores/src/storeProvider.tsx

@@ -1,3 +1,2 @@
 export { default as ExchangeRatesStore } from './ExchangeRatesStore';
 export { default as FeatureFlagsStore } from './FeatureFlagsStore';
-export { default as WebsiteStatusStore } from './WebsiteStatusStore';

packages/stores/src/stores/WebsiteStatusStore.ts

@@ -14,7 +14,7 @@ import type {
 } from '@deriv/api-types';
 import type { Moment } from 'moment';
 import type { RouteComponentProps } from 'react-router';
-import type { ExchangeRatesStore, FeatureFlagsStore, WebsiteStatusStore } from './src/stores';
+import type { ExchangeRatesStore, FeatureFlagsStore } from './src/stores';
 
 type TPopulateSettingsExtensionsMenuItem = {
     icon: string;
@@ -499,6 +499,5 @@ export type TCoreStores = {
 
 export type TStores = TCoreStores & {
     exchange_rates: ExchangeRatesStore;
-    website_status: WebsiteStatusStore;
     feature_flags: FeatureFlagsStore;
 };