Merge branch 'master' of github.com:binary-com/deriv-app into henry/a…

…ccum-119/add-video-accu-trade-type-info
binary-com · Jun 22, 2023 · 75834b1 · 75834b1
2 parents 75bce44 + 6c0eb46
commit 75834b1
Show file tree

Hide file tree

Showing 86 changed files with 2,060 additions and 1,463 deletions.
diff --git a/packages/account/package.json b/packages/account/package.json
@@ -31,6 +31,7 @@
         "@deriv/api-types": "^1.0.94",
         "@deriv/components": "^1.0.0",
         "@deriv/shared": "^1.0.0",
+        "@deriv/stores":"^1.0.0",
         "@deriv/translations": "^1.0.0",
         "bowser": "^2.9.0",
         "classnames": "^2.2.6",

diff --git a/packages/account/src/App.tsx b/packages/account/src/App.tsx
@@ -1,27 +1,27 @@
 import React from 'react';
 import Routes from './Containers/routes';
 import ResetTradingPassword from './Containers/reset-trading-password';
-import { MobxContentProvider } from './Stores/connect';
-import initStore from './Stores/init-store';
-import TCoreStore from './Stores/index';
+import { setWebsocket } from '@deriv/shared';
+import { StoreProvider } from '@deriv/stores';
+import { TCoreStores } from '@deriv/stores/types';
 
-// TODO: add correct types for stores and WS after implementing them
+// TODO: add correct types for WS after implementing them
 type TAppProps = {
     passthrough: {
-        root_store: TCoreStore;
+        root_store: TCoreStores;
         WS: Record<string, any>;
     };
 };
 
 const App = ({ passthrough }: TAppProps) => {
     const { root_store, WS } = passthrough;
-    initStore(root_store, WS);
+    setWebsocket(WS);
 
     return (
-        <MobxContentProvider store={root_store}>
+        <StoreProvider store={root_store}>
             <Routes />
             <ResetTradingPassword />
-        </MobxContentProvider>
+        </StoreProvider>
     );
 };
 

diff --git a/packages/account/src/Components/Routes/__tests__/binary-link.spec.tsx b/packages/account/src/Components/Routes/__tests__/binary-link.spec.tsx
@@ -6,12 +6,6 @@ import { PlatformContext } from '@deriv/shared';
 import { findRouteByPath } from '../helpers';
 import BinaryLink from '../binary-link';
 
-jest.mock('Stores/connect', () => ({
-    __esModule: true,
-    default: 'mockedDefaultExport',
-    connect: () => Component => Component,
-}));
-
 jest.mock('../helpers', () => ({
     findRouteByPath: jest.fn(() => '/test/path'),
     normalizePath: jest.fn(() => '/test/path'),

diff --git a/packages/account/src/Components/Routes/__tests__/binary-routes.spec.tsx b/packages/account/src/Components/Routes/__tests__/binary-routes.spec.tsx
@@ -5,12 +5,6 @@ import { render, screen } from '@testing-library/react';
 import { PlatformContext } from '@deriv/shared';
 import BinaryRoutes from '../binary-routes';
 
-jest.mock('Stores/connect', () => ({
-    __esModule: true,
-    default: 'mockedDefaultExport',
-    connect: () => Component => Component,
-}));
-
 jest.mock('../route-with-sub-routes', () => jest.fn(() => <div>RouteWithSubRoutes</div>));
 
 jest.mock('Constants/routes-config', () => () => [{}]);