V20190612_0

src/javascript/app/App/Components/Elements/ContractDrawer/contract-drawer.jsx

@@ -12,6 +12,7 @@ import ContractAudit         from 'App/Components/Elements/PositionsDrawer/resul
 import ContractTypeCell      from 'App/Components/Elements/PositionsDrawer/contract-type-cell.jsx';
 import ProgressSlider        from 'App/Components/Elements/PositionsDrawer/ProgressSlider';
 import { getTimePercentage } from 'App/Components/Elements/PositionsDrawer/helpers';
+import routes                from 'Constants/routes';
 import ProfitLossCardContent from 'Modules/Reports/Components/profit-loss-card-content.jsx';
 import ContractCardBody      from './contract-card-body.jsx';
 import ContractCardFooter    from './contract-card-footer.jsx';
@@ -164,14 +165,23 @@ class ContractDrawer extends Component {
         );
     }
 
+    redirectBackToReports = () => {
+        // history.goBack() will go to the wrong location if user goes to contract by pasting it in the url.
+        if (this.props.history.location.state) {
+            this.props.history.goBack();
+        } else {
+            this.props.history.push(routes.reports);
+        }
+    };
+
     render() {
         if (!this.props.contract_info) return null;
         const body_content = this.getBodyContent();
         return (
             <div className={classNames('contract-drawer', {})}>
                 <div
                     className='contract-drawer__heading'
-                    onClick={() => this.props.history.goBack()}
+                    onClick={this.redirectBackToReports}
                 >
                     <Icon icon='IconBack' />
                     <h2><Localize str={this.props.heading || 'Contract'} /></h2>

src/javascript/app/App/Components/Elements/DataTable/table-row.jsx

@@ -34,7 +34,15 @@ const TableRow = ({
 
     return (
         to ?
-            <NavLink className={row_class_name} to={to}>
+            <NavLink
+                className={row_class_name}
+                to={{
+                    pathname: to,
+                    state   : {
+                        from_table_row: true,
+                    },
+                }}
+            >
                 {cells}
             </NavLink>
             :

src/javascript/app/App/Containers/AccountSwitcher/account-switcher.jsx

@@ -41,6 +41,10 @@ class AccountSwitcher extends React.Component {
         this.props.toggle();
         if (this.props.account_loginid === loginid) return;
         await this.props.switchAccount(loginid);
+
+        if (this.props.has_error) {
+            this.props.clearError();
+        }
     }
 
     render() {
@@ -140,6 +144,8 @@ AccountSwitcher.propTypes = {
     account_list          : PropTypes.array,
     account_loginid       : PropTypes.string,
     cleanUp               : PropTypes.func,
+    clearError            : PropTypes.func,
+    has_error             : PropTypes.bool,
     is_logged_in          : PropTypes.bool,
     is_positions_drawer_on: PropTypes.bool,
     is_upgrade_enabled    : PropTypes.bool,
@@ -153,7 +159,7 @@ AccountSwitcher.propTypes = {
 };
 
 const account_switcher = connect(
-    ({ client, ui }) => ({
+    ({ client, ui, modules }) => ({
         account_list          : client.account_list,
         account_loginid       : client.loginid,
         is_logged_in          : client.is_logged_in,
@@ -162,6 +168,8 @@ const account_switcher = connect(
         upgrade_info          : client.upgrade_info,
         cleanUp               : client.cleanUp,
         virtual_loginid       : client.virtual_account_loginid,
+        clearError            : modules.contract.clearError,
+        has_error             : modules.contract.has_error,
         is_positions_drawer_on: ui.is_positions_drawer_on,
         togglePositionsDrawer : ui.togglePositionsDrawer,
 

src/javascript/app/Modules/Contract/Containers/contract.jsx

@@ -8,42 +8,46 @@ import ErrorComponent    from 'App/Components/Elements/Errors';
 import { connect }       from 'Stores/connect';
 import ContractReplay    from './contract-replay.jsx';
 
-const Contract = ({
-    error_message,
-    has_error,
-    history,
-    match,
-}) => (
-    <React.Fragment>
-        {
-            has_error ?
-                <ErrorComponent
-                    message={error_message}
-                    redirect_label={localize('Go back to trading')}
-                    redirectOnClick={() => history.push(routes.trade)}
-                    should_show_refresh={false}
-                />
-                :
-                <CSSTransition
-                    in={!has_error}
-                    timeout={400}
-                    classNames={{
-                        enter    : 'contract--enter',
-                        enterDone: 'contract--enter-done',
-                        exit     : 'contract--exit',
-                    }}
-                    unmountOnExit
-                >
-                    <ContractReplay
-                        contract_id={match.params.contract_id}
-                        key={match.params.contract_id}
-                    />
-                </CSSTransition>
-        }
-    </React.Fragment>
-);
+class Contract extends React.Component {
+    componentWillUnmount() {
+        if (this.props.has_error) this.props.clearError();
+    }
+
+    render () {
+        return (
+            <React.Fragment>
+                {
+                    this.props.has_error ?
+                        <ErrorComponent
+                            message={this.props.error_message}
+                            redirect_label={localize('Go back to trading')}
+                            redirectOnClick={() => this.props.history.push(routes.trade)}
+                            should_show_refresh={false}
+                        />
+                        :
+                        <CSSTransition
+                            in={!this.props.has_error}
+                            timeout={400}
+                            classNames={{
+                                enter    : 'contract--enter',
+                                enterDone: 'contract--enter-done',
+                                exit     : 'contract--exit',
+                            }}
+                            unmountOnExit
+                        >
+                            <ContractReplay
+                                contract_id={this.props.match.params.contract_id}
+                                key={this.props.match.params.contract_id}
+                            />
+                        </CSSTransition>
+                }
+            </React.Fragment>
+        );
+    }
+}
 
 Contract.propTypes = {
+    clearError   : PropTypes.func,
     error_message: PropTypes.string,
     has_error    : PropTypes.bool,
     history      : PropTypes.object,
@@ -54,6 +58,7 @@ Contract.propTypes = {
 
 export default withRouter(connect(
     ({ modules, ui }) => ({
+        clearError   : modules.contract.clearError,
         error_message: modules.contract.error_message,
         has_error    : modules.contract.has_error,
         is_mobile    : ui.is_mobile,

src/javascript/app/Stores/Modules/Contract/contract-store.js

@@ -56,6 +56,9 @@ export default class ContractStore extends BaseStore {
     replay_prev_indicative   = 0;
     replay_indicative        = 0;
 
+    // Forget old proposal_open_contract stream on account switch from ErrorComponent
+    should_forget_first = false;
+
     // -------------------
     // ----- Actions -----
     // -------------------
@@ -111,6 +114,20 @@ export default class ContractStore extends BaseStore {
         }
     }
 
+    handleSubscribeProposalOpenContract = (contract_id, cb) => {
+        // TODO: remove .toString() when API is ready
+        const proposal_open_contract_request = [contract_id.toString(), cb, false];
+
+        if (this.should_forget_first) {
+            WS.forgetAll('proposal_open_contract').then(() => {
+                this.should_forget_first = false;
+                WS.subscribeProposalOpenContract(...proposal_open_contract_request);
+            });
+        } else {
+            WS.subscribeProposalOpenContract(...proposal_open_contract_request);
+        }
+    }
+
     @action.bound
     onMount(contract_id, is_from_positions) {
         if (contract_id === +this.contract_id) return;
@@ -129,7 +146,7 @@ export default class ContractStore extends BaseStore {
             }
             this.smart_chart.saveAndClearTradeChartLayout('contract');
             this.smart_chart.setContractMode(true);
-            WS.subscribeProposalOpenContract(this.contract_id.toString(), this.updateProposal, false);
+            this.handleSubscribeProposalOpenContract(this.contract_id, this.updateProposal);
         }
     }
 
@@ -140,7 +157,7 @@ export default class ContractStore extends BaseStore {
             this.smart_chart = this.root_store.modules.smart_chart;
             this.smart_chart.setContractMode(true);
             this.replay_contract_id = contract_id;
-            WS.subscribeProposalOpenContract(this.replay_contract_id.toString(), this.populateConfig, false);
+            this.handleSubscribeProposalOpenContract(this.replay_contract_id, this.populateConfig);
         }
     }
 
@@ -193,15 +210,16 @@ export default class ContractStore extends BaseStore {
     @action.bound
     populateConfig(response) {
         if ('error' in response) {
-            this.has_error     = true;
+            this.has_error       = true;
             this.contract_config = {};
             this.smart_chart.setIsChartLoading(false);
             return;
         }
         if (isEmptyObject(response.proposal_open_contract)) {
-            this.has_error       = true;
-            this.error_message   = localize('Sorry, you can\'t view this contract because it doesn\'t belong to this account.');
-            this.contract_config = {};
+            this.has_error           = true;
+            this.error_message       = localize('Sorry, you can\'t view this contract because it doesn\'t belong to this account.');
+            this.should_forget_first = true;
+            this.contract_config     = {};
             this.smart_chart.setContractMode(false);
             this.smart_chart.setIsChartLoading(false);
             return;
@@ -257,10 +275,11 @@ export default class ContractStore extends BaseStore {
             return;
         }
         if (isEmptyObject(response.proposal_open_contract)) {
-            this.has_error     = true;
-            this.error_message = localize('Sorry, you can\'t view this contract because it doesn\'t belong to this account.');
-            this.contract_info = {};
-            this.contract_id   = null;
+            this.has_error           = true;
+            this.error_message       = localize('Sorry, you can\'t view this contract because it doesn\'t belong to this account.');
+            this.should_forget_first = true;
+            this.contract_info       = {};
+            this.contract_id         = null;
             this.smart_chart.setContractMode(false);
             this.smart_chart.setIsChartLoading(false);
             return;
@@ -352,6 +371,12 @@ export default class ContractStore extends BaseStore {
         delete this.error_message;
     }
 
+    @action.bound
+    clearError() {
+        this.error_message = null;
+        this.has_error = false;
+    }
+
     @action.bound
     setIsDigitContract(contract_type) {
         this.contract_info.contract_type = contract_type;