Merge pull request #5 from reza-fs/mt-dashboard

Mt dashboard
mamali-fs · Sep 26, 2019 · af18ce0 · af18ce0
2 parents 3674532 + 3b77a4f
commit af18ce0
Show file tree

Hide file tree

Showing 13 changed files with 294 additions and 195 deletions.
diff --git a/packages/trader/src/App/Containers/Modals/modals.jsx b/packages/trader/src/App/Containers/Modals/modals.jsx
@@ -1,13 +1,14 @@
-import React       from 'react';
-import { connect } from 'Stores/connect';
-import { urlFor }  from '_common/url';
-import 'Sass/app/modules/modals.scss';
+import React                    from 'react';
+import { connect }              from 'Stores/connect';
+import { urlFor }               from '_common/url';
 import UnsupportedContractModal from 'App/Components/Elements/Modals/UnsupportedContractModal';
 import MarketUnavailableModal   from 'App/Components/Elements/Modals/MarketUnavailableModal';
 import DenialOfServiceModal     from 'App/Components/Elements/Modals/DenialOfServiceModal';
 import ServicesErrorModal       from 'App/Components/Elements/Modals/ServicesErrorModal';
+import { MT5ServerErrorDialog } from 'App/Containers/Mt5';
+import 'Sass/app/modules/modals.scss';
 
-const AccountSignupModal       = React.lazy(() => import(/* webpackChunkName: "AccountSignupModal" */'../AccountSignupModal'));
+const AccountSignupModal = React.lazy(() => import(/* webpackChunkName: "AccountSignupModal" */'../AccountSignupModal'));
 
 const Modals = ({
     clearPurchaseInfo,
@@ -81,8 +82,8 @@ const Modals = ({
                 services_error={services_error}
                 is_visible={is_services_error_visible}
             />
-            {/* TODO: Enable AccountSignupModal once its UI component is ready */}
             <AccountSignupModal />
+            <MT5ServerErrorDialog />
         </React.Fragment>
     );
 };

diff --git a/packages/trader/src/App/Containers/Modals/success-dialog.jsx b/packages/trader/src/App/Containers/Modals/success-dialog.jsx
@@ -6,6 +6,7 @@ import Localize   from 'App/Components/Elements/localize.jsx';
 import Icon       from 'Assets/icon.jsx';
 
 const SuccessDialog = ({
+    has_cancel,
     icon,
     message,
     onCancel,
@@ -41,6 +42,7 @@ const SuccessDialog = ({
                 <p>{message}</p>
             </div>
             <div className='success-change__btn-area'>
+                {has_cancel &&
                 <Button
                     onClick={onCancel}
                     className='btn--outline'
@@ -49,17 +51,20 @@ const SuccessDialog = ({
                         i18n_default_text='Maybe later'
                     />
                 </Button>
+                }
                 <Button onClick={onSubmit}>{text_submit}</Button>
             </div>
         </div>
     );
 };
 
 SuccessDialog.defaultProps = {
-    icon_size: 'large',
+    icon_size : 'large',
+    has_cancel: false,
 };
 
 SuccessDialog.propTypes = {
+    has_cancel : PropTypes.bool,
     icon       : PropTypes.object,
     icon_size  : PropTypes.string,
     icon_type  : PropTypes.string,

diff --git a/packages/trader/src/App/Containers/Mt5/index.js b/packages/trader/src/App/Containers/Mt5/index.js
@@ -1 +1,2 @@
-export default from './password';
+export default              from './password.jsx';
+export MT5ServerErrorDialog from './mt5-server-error-dialog.jsx';
diff --git a/packages/trader/src/App/Containers/Mt5/mt5-server-error-dialog.jsx b/packages/trader/src/App/Containers/Mt5/mt5-server-error-dialog.jsx
@@ -0,0 +1,43 @@
+import { Dialog }           from 'deriv-components';
+import PropTypes            from 'prop-types';
+import React, { Component } from 'react';
+import { localize }         from 'App/i18n';
+import { connect }          from 'Stores/connect';
+
+class MT5ServerErrorDialog extends Component {
+    render() {
+        const should_show_error = this.props.has_mt5_error && !this.props.is_mt5_success_dialog_enabled;
+        return (
+            <Dialog
+                title={localize('Whoops!')}
+                confirm_button_text={localize('Ok')}
+                onConfirm={this.props.clearMt5Error}
+                disableApp={this.props.disableApp}
+                enableApp={this.props.enableApp}
+                is_loading={false}
+                is_closed_on_cancel
+                is_visible={should_show_error}
+            >
+                {localize(this.props.error_message)}
+            </Dialog>
+        );
+    }
+}
+
+MT5ServerErrorDialog.propTypes = {
+    clearMt5Error                : PropTypes.func,
+    disableApp                   : PropTypes.func,
+    enableApp                    : PropTypes.func,
+    error_message                : PropTypes.string,
+    has_mt5_error                : PropTypes.bool,
+    is_mt5_success_dialog_enabled: PropTypes.bool,
+};
+
+export default connect(({ ui, modules }) => ({
+    clearMt5Error                : modules.mt5.clearMt5Error,
+    disableApp                   : ui.disableApp,
+    enableApp                    : ui.enableApp,
+    error_message                : modules.mt5.error_message,
+    has_mt5_error                : modules.mt5.has_mt5_error,
+    is_mt5_success_dialog_enabled: modules.mt5.is_mt5_success_dialog_enabled,
+}))(MT5ServerErrorDialog);