Mobx migration to v6

.circleci/config.yml

@@ -66,6 +66,7 @@ commands:
             - "packages/cashier/node_modules"
             - "packages/components/node_modules"
             - "packages/core/node_modules"
+            - "packages/cfd/node_modules"
             - "packages/indicators/node_modules"
             - "packages/p2p/node_modules"
             - "packages/shared/node_modules"

.github/CODEOWNERS

@@ -107,6 +107,12 @@
 
 /packages/cashier/**/*                                          @bahar-fs @nijil-binary
 
+# ==============================================================
+#  deriv-app/cfd
+# ==============================================================
+
+/packages/cfd/**/*                                             @balakrishna-binary @matin-binary @yashim-deriv 
+
 # ==============================================================
 #  deriv-app/trader
 # ==============================================================

.github/workflows/codecov.yml

@@ -1,5 +1,11 @@
 name: Codecov Workflow
-on: [ "pull_request" ]
+on:
+  pull_request:
+    branches:
+      - '**'
+  push:
+    branches:
+      - master
 jobs:
   build:
     name: Build

.github/workflows/generate_app_id.yml

@@ -11,7 +11,7 @@ jobs:
         steps:
             - name: Capture Vercel preview URL
               id: vercel_preview_url
-              uses: binary-com/vercel-preview-url-action@v0.0.3
+              uses: binary-com/vercel-preview-url-action@v1.0.5
               with:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - name: Generate Deriv App ID for deployment Preview URL

babel.config.json

@@ -4,6 +4,7 @@
         ["@babel/plugin-proposal-decorators", { "legacy": true }],
         ["@babel/plugin-proposal-class-properties", { "loose": true }],
         ["@babel/plugin-proposal-private-methods", { "loose": true }],
+        ["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
         "@babel/plugin-proposal-export-default-from",
         "@babel/plugin-proposal-object-rest-spread",
         "@babel/plugin-proposal-export-namespace-from",

package.json

@@ -13,7 +13,7 @@
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
         "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
         "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/preset-env": "^7.12.11",
         "@babel/preset-react": "^7.12.10",

packages/account/package.json

@@ -1,79 +1,79 @@
 {
-  "name": "@deriv/account",
-  "private": true,
-  "version": "1.0.0",
-  "description": "Deriv account management module",
-  "author": "Deriv.com",
-  "homepage": "https://github.com/binary-com/deriv-app",
-  "license": "Apache-2.0",
-  "main": "dist/account/js/account.js",
-  "bugs": {
-    "url": "https://github.com/binary-com/deriv-app/issues"
-  },
-  "engines": {
-    "node": "^14.17.1"
-  },
-  "scripts": {
-    "start": "npm run test && npm run serve",
-    "serve": "echo \"Serving...\" && webpack --progress --watch --config \"./build/webpack.config.js\"",
-    "build": "f () { webpack --config \"./build/webpack.config.js\" --env base=$1;}; f",
-    "build:travis": "rimraf dist && webpack --config \"./build/webpack.config.js\"  --mode=production",
-    "test": "echo \"No test specified\"",
-    "test:eslint": "eslint \"./src/**/*.?(js|jsx)\"",
-    "deploy": "echo \"No deploy specified\"",
-    "deploy:clean": "echo \"No deploy:clean specified\"",
-    "deploy:folder": "echo \"No deploy:folder specified\"",
-    "deploy:staging": "echo \"No deploy:staging specified\"",
-    "deploy:production": "echo \"No deploy:production specified\""
-  },
-  "dependencies": {
-    "@binary-com/binary-document-uploader": "github:binary-com/binary-document-uploader",
-    "@deriv/components": "^1.0.0",
-    "@deriv/shared": "^1.0.0",
-    "@deriv/translations": "^1.0.0",
-    "bowser": "^2.9.0",
-    "classnames": "^2.2.6",
-    "formik": "^2.1.4",
-    "i18n-iso-countries": "^6.8.0",
-    "js-cookie": "^2.2.1",
-    "mobx": "^5.15.7",
-    "mobx-react": "6.3.1",
-    "onfido-sdk-ui": "6.3.0",
-    "prop-types": "^15.7.2",
-    "qrcode.react": "^1.0.0",
-    "react": "^16.14.0",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0"
-  },
-  "devDependencies": {
-    "@jest/globals": "^26.5.3",
-    "@testing-library/react": "^12.0.0",
-    "babel-eslint": "^10.1.0",
-    "babel-loader": "^8.1.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "css-loader": "^5.0.1",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-binary": "^1.0.2",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-formatter-pretty": "^4.0.0",
-    "eslint-import-resolver-webpack": "^0.13.0",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "history": "^5.0.0",
-    "jest": "^26.4.2",
-    "mini-css-extract-plugin": "^1.3.4",
-    "node-sass": "^4.12.0",
-    "css-minimizer-webpack-plugin": "^3.0.1",
-    "postcss-loader": "^6.1.1",
-    "postcss-preset-env": "^6.7.0",
-    "postcss-scss": "^4.0.0",
-    "resolve-url-loader": "^3.1.2",
-    "rimraf": "^3.0.2",
-    "sass-loader": "^10.1.1",
-    "sass-resources-loader": "^2.1.1",
-    "terser-webpack-plugin": "^5.1.1",
-    "webpack": "^5.46.0"
-  }
-}
+    "name": "@deriv/account",
+    "private": true,
+    "version": "1.0.0",
+    "description": "Deriv account management module",
+    "author": "Deriv.com",
+    "homepage": "https://github.com/binary-com/deriv-app",
+    "license": "Apache-2.0",
+    "main": "dist/account/js/account.js",
+    "bugs": {
+        "url": "https://github.com/binary-com/deriv-app/issues"
+    },
+    "engines": {
+        "node": "^14.17.1"
+    },
+    "scripts": {
+        "start": "npm run test && npm run serve",
+        "serve": "echo \"Serving...\" && webpack --progress --watch --config \"./build/webpack.config.js\"",
+        "build": "f () { webpack --config \"./build/webpack.config.js\" --env base=$1;}; f",
+        "build:travis": "rimraf dist && webpack --config \"./build/webpack.config.js\"  --mode=production",
+        "test": "echo \"No test specified\"",
+        "test:eslint": "eslint \"./src/**/*.?(js|jsx)\"",
+        "deploy": "echo \"No deploy specified\"",
+        "deploy:clean": "echo \"No deploy:clean specified\"",
+        "deploy:folder": "echo \"No deploy:folder specified\"",
+        "deploy:staging": "echo \"No deploy:staging specified\"",
+        "deploy:production": "echo \"No deploy:production specified\""
+    },
+    "dependencies": {
+        "@binary-com/binary-document-uploader": "github:binary-com/binary-document-uploader",
+        "@deriv/components": "^1.0.0",
+        "@deriv/shared": "^1.0.0",
+        "@deriv/translations": "^1.0.0",
+        "bowser": "^2.9.0",
+        "classnames": "^2.2.6",
+        "formik": "^2.1.4",
+        "i18n-iso-countries": "^6.8.0",
+        "js-cookie": "^2.2.1",
+        "mobx": "6.5.0",
+        "mobx-react": "7.3.0",
+        "onfido-sdk-ui": "6.3.0",
+        "prop-types": "^15.7.2",
+        "qrcode.react": "^1.0.0",
+        "react": "^16.14.0",
+        "react-router": "^5.2.0",
+        "react-router-dom": "^5.2.0"
+    },
+    "devDependencies": {
+        "@jest/globals": "^26.5.3",
+        "@testing-library/react": "^12.0.0",
+        "babel-eslint": "^10.1.0",
+        "babel-loader": "^8.1.0",
+        "clean-webpack-plugin": "^3.0.0",
+        "css-loader": "^5.0.1",
+        "eslint-config-airbnb-base": "^14.2.1",
+        "eslint-config-binary": "^1.0.2",
+        "eslint-config-prettier": "^7.2.0",
+        "eslint-formatter-pretty": "^4.0.0",
+        "eslint-import-resolver-webpack": "^0.13.0",
+        "eslint-plugin-import": "^2.23.4",
+        "eslint-plugin-prettier": "^3.3.1",
+        "eslint-plugin-react": "^7.22.0",
+        "eslint-plugin-react-hooks": "^4.2.0",
+        "history": "^5.0.0",
+        "jest": "^26.4.2",
+        "mini-css-extract-plugin": "^1.3.4",
+        "node-sass": "^4.12.0",
+        "css-minimizer-webpack-plugin": "^3.0.1",
+        "postcss-loader": "^6.2.1",
+        "postcss-preset-env": "^7.4.3",
+        "postcss-scss": "^4.0.3",
+        "resolve-url-loader": "^3.1.2",
+        "rimraf": "^3.0.2",
+        "sass-loader": "^10.1.1",
+        "sass-resources-loader": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.1",
+        "webpack": "^5.46.0"
+    }
+}

packages/account/src/Components/Routes/binary-link.jsx

@@ -4,11 +4,12 @@ import { NavLink } from 'react-router-dom';
 import { PlatformContext } from '@deriv/shared';
 import getRoutesConfig from 'Constants/routes-config';
 import { findRouteByPath, normalizePath } from './helpers';
+import { connect } from 'Stores/connect';
 
-const BinaryLink = ({ active_class, to, children, ...props }) => {
+const BinaryLink = ({ active_class, to, children, is_social_signup, ...props }) => {
     const { is_appstore } = React.useContext(PlatformContext);
     const path = normalizePath(to);
-    const route = findRouteByPath(path, getRoutesConfig({ is_appstore }));
+    const route = findRouteByPath(path, getRoutesConfig({ is_appstore }, is_social_signup));
 
     if (!route) {
         throw new Error(`Route not found: ${to}`);
@@ -29,4 +30,6 @@ BinaryLink.propTypes = {
     to: PropTypes.string,
 };
 
-export default BinaryLink;
+export default connect(({ client }) => ({
+    is_social_signup: client.is_social_signup,
+}))(BinaryLink);

packages/account/src/Components/Routes/binary-routes.jsx

@@ -3,10 +3,11 @@ import { Switch } from 'react-router-dom';
 import { Localize, PlatformContext } from '@deriv/shared';
 import getRoutesConfig from 'Constants/routes-config';
 import RouteWithSubRoutes from './route-with-sub-routes.jsx';
+import { connect } from 'Stores/connect';
 
 const BinaryRoutes = props => {
     const { is_appstore } = React.useContext(PlatformContext);
-
+    const { is_social_signup } = props;
     return (
         <React.Suspense
             fallback={() => {
@@ -18,12 +19,14 @@ const BinaryRoutes = props => {
             }}
         >
             <Switch>
-                {getRoutesConfig({ is_appstore }).map((route, idx) => (
+                {getRoutesConfig({ is_appstore }, is_social_signup).map((route, idx) => (
                     <RouteWithSubRoutes key={idx} {...route} {...props} />
                 ))}
             </Switch>
         </React.Suspense>
     );
 };
 
-export default BinaryRoutes;
+export default connect(({ client }) => ({
+    is_social_signup: client.is_social_signup,
+}))(BinaryRoutes);

packages/account/src/Components/account-limits/account-limits-article.jsx

@@ -1,22 +1,32 @@
+import PropTypes from 'prop-types';
 import * as React from 'react';
 import { StaticUrl } from '@deriv/components';
 import { Localize, localize } from '@deriv/translations';
 import AccountArticle from 'Components/article/article.jsx';
 
-const AccountLimitsArticle = () => {
-    return (
-        <AccountArticle
-            title={localize('Account limits')}
-            descriptions={[
-                <Localize key={0} i18n_default_text='These are default limits that we apply to your accounts.' />,
+const AccountLimitsArticle = ({ is_from_derivgo }) => {
+    const getDescription = () => {
+        const description = [
+            <Localize key={0} i18n_default_text='These are default limits that we apply to your accounts.' />,
+        ];
+
+        if (!is_from_derivgo) {
+            description.push(
                 <Localize
                     key={1}
                     i18n_default_text='To learn more about trading limits and how they apply, please go to the <0>Help Centre.</0>'
                     components={[<StaticUrl key={0} className='link' href='/help-centre/trading/#trading-limits' />]}
-                />,
-            ]}
-        />
-    );
+                />
+            );
+        }
+        return description;
+    };
+
+    return <AccountArticle title={localize('Account limits')} descriptions={getDescription()} />;
+};
+
+AccountLimitsArticle.propTypes = {
+    is_from_derivgo: PropTypes.bool,
 };
 
 export default AccountLimitsArticle;

packages/account/src/Components/account-limits/account-limits.jsx

@@ -25,6 +25,7 @@ const AccountLimits = ({
     is_switching,
     is_virtual,
     overlay_ref,
+    is_from_derivgo,
     setIsOverlayShown: setIsPopupOverlayShown,
     should_bypass_scrollbars,
     should_show_article,
@@ -116,7 +117,7 @@ const AccountLimits = ({
                         'da-account-limits--app-settings': is_app_settings,
                     })}
                 >
-                    {should_show_article && isMobile() && <AccountLimitsArticle />}
+                    {should_show_article && isMobile() && <AccountLimitsArticle is_from_derivgo={is_from_derivgo} />}
                     <div className='da-account-limits__table-wrapper'>
                         <ThemedScrollbars is_bypassed={should_bypass_scrollbars || isMobile()}>
                             <table className='da-account-limits__table'>
@@ -343,6 +344,7 @@ AccountLimits.propTypes = {
     is_app_settings: PropTypes.bool,
     getLimits: PropTypes.func.isRequired,
     is_fully_authenticated: PropTypes.bool.isRequired,
+    is_from_derivgo: PropTypes.bool,
     is_switching: PropTypes.bool.isRequired,
     is_virtual: PropTypes.bool.isRequired,
     overlay_ref: PropTypes.shape({ current: PropTypes.any }),