V20190507_0

.travis.yml

@@ -1,5 +1,7 @@
 language: node_js
-node_js: node
+node_js: "10.15.3"
+before_install: npm i -g npm@6.9.0
+install: npm ci
 cache:
     directories: 
         - node_modules

package.json

@@ -76,7 +76,7 @@
     "i18next-scanner": "1.9.4",
     "immutable": "^3.8.2",
     "jest": "^24.7.1",
-    "jquery": "3.2.1",
+    "jquery": "^3.4.0",
     "jquery-ui": "1.12.1",
     "jquery-ui-css": "1.11.4",
     "js-interpreter": "^1.4.6",

src/botPage/bot/TradeEngine/OpenContract.js

@@ -1,6 +1,6 @@
 import { roundBalance } from '../../common/tools';
 import { doUntilDone } from '../tools';
-import { contractStatus, contract as broadcastContract } from '../broadcast';
+import { contractStatus, contractSettled, contract as broadcastContract } from '../broadcast';
 import { sell, openContractReceived } from './state/actions';
 
 const AFTER_FINISH_TIMEOUT = 5;
@@ -27,7 +27,9 @@ export default Engine =>
                     contractStatus({
                         id  : 'contract.sold',
                         data: contract.transaction_ids.sell,
+                        contract,
                     });
+                    contractSettled(contract);
                     this.contractId = '';
                     this.updateTotals(contract);
                     if (this.afterPromise) {
@@ -67,7 +69,9 @@ export default Engine =>
             this.unsubscribeOpenContract();
 
             doUntilDone(() => this.api.subscribeToOpenContract(contractId)).then(r => {
-                ({ proposal_open_contract: { id: this.openContractId } } = r);
+                ({
+                    proposal_open_contract: { id: this.openContractId },
+                } = r);
             });
         }
         resetSubscriptionTimeout(timeout = this.getContractDuration() + AFTER_FINISH_TIMEOUT) {

src/botPage/bot/broadcast.js

@@ -4,6 +4,8 @@ export const contract = c => globalObserver.emit('bot.contract', c);
 
 export const contractStatus = c => globalObserver.emit('contract.status', c);
 
+export const contractSettled = c => globalObserver.emit('contract.settled', c);
+
 export const info = i => globalObserver.emit('bot.info', i);
 
 export const notify = (className, message) => globalObserver.emit('Notify', { className, message, position: 'right' });

src/botPage/view/Dialogs/Limits.js

@@ -1,59 +1,122 @@
+import { LiveApi } from 'binary-live-api';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { translate } from '../../../common/i18n';
-import * as style from '../style';
 import Dialog from './Dialog';
 import { restrictInputCharacter } from '../shared';
+import * as style from '../style';
+import { getToken } from '../../../common/utils/storageManager';
+import { showSpinnerInButton, removeSpinnerInButton, createUrl, translate } from '../../../common/utils/tools';
 
 class LimitsContent extends PureComponent {
     constructor() {
         super();
         this.state = {
             error    : '',
-            maxLoss  : '',
-            maxTrades: '',
+            maxTrades: 0,
+            maxLosses: null,
         };
     }
+
     submit() {
-        const maxLoss = parseFloat(this.state.maxLoss || 0);
-        const maxTrades = parseInt(this.state.maxTrades || 0);
         this.setState({ error: '' });
-        if (maxTrades <= 0 || maxTrades > 100) {
-            this.setState({ error: 'Maximum number of trades should be between 1 and 100.' });
+
+        const onSave = () => {
+            this.props.onSave({
+                maxTrades: this.state.maxTrades,
+                maxLoss  : this.state.maxLosses,
+            });
+        };
+
+        if (!this.state.maxLosses) {
+            this.updateMaxLosses()
+                .then(() => {
+                    onSave();
+                })
+                .catch(() => {
+                    this.setState({
+                        error: translate(
+                            'Please set your daily loss limit in the Self-Exclusion Facilities page to allow trading.'
+                        ),
+                    });
+                });
             return;
         }
-        if (!maxLoss) {
-            this.setState({ error: 'Please enter a Maximum Loss amount greater than zero.' });
+
+        if (this.state.maxTrades <= 0 || this.state.maxTrades > 100) {
+            this.setState({ error: translate('Maximum consecutive trades should be between 1 and 100') });
             return;
         }
-        this.props.onSave({
-            maxLoss,
-            maxTrades,
+
+        onSave();
+    }
+
+    updateMaxLosses() {
+        return new Promise((resolve, reject) => {
+            const { api } = this.props;
+            const $startButton = $('#submit-trade-limits');
+            const initialText = $startButton.text();
+
+            showSpinnerInButton($startButton);
+
+            api.getSelfExclusion()
+                .then(response => {
+                    const { max_losses: maxLosses } = response.get_self_exclusion;
+                    let callback;
+
+                    if (maxLosses) {
+                        this.setState({ maxLosses });
+                        callback = resolve;
+                    } else {
+                        callback = reject;
+                    }
+
+                    removeSpinnerInButton($startButton, initialText);
+                    callback();
+                })
+                .catch(() => {
+                    removeSpinnerInButton($startButton, initialText);
+                    reject();
+                });
         });
     }
+
     componentDidMount() {
         const cleanupLayout = () => {
             this.setState({
-                maxTrades: '',
-                maxLoss  : '',
+                maxTrades: 0,
                 error    : '',
             });
         };
+
+        const onDialogOpen = () => {
+            this.updateMaxLosses().catch(() => {});
+        };
+
         $('#limits-dialog-component').dialog({
+            open    : onDialogOpen,
             close   : cleanupLayout,
             autoOpen: false,
         });
     }
+
     onMaxTradeChange(e) {
         if (restrictInputCharacter({ input: e.target.value, whitelistRegEx: '^[\\d]*$' })) {
             this.setState({ maxTrades: e.target.value });
         }
     }
-    onMaxLossChange(e) {
-        if (restrictInputCharacter({ input: e.target.value, whitelistRegEx: '^\\d*\\.?\\d*$' })) {
-            this.setState({ maxLoss: e.target.value });
+
+    getDailyLossesLimit() {
+        if (this.state.maxLosses) {
+            const token = $('.account-id')
+                .first()
+                .attr('value');
+            const tokenObj = getToken(token);
+            const currency = tokenObj && tokenObj.loginInfo.currency;
+            return currency ? `${this.state.maxLosses} ${currency}` : `${this.state.maxLosses}`;
         }
+        return translate('Not set');
     }
+
     render() {
         return (
             <form
@@ -62,65 +125,78 @@ class LimitsContent extends PureComponent {
                 className="dialog-content"
                 style={style.content}
             >
-                <div>
-                    <div style={style.inputRow}>
-                        <label style={style.field} htmlFor="limitation-max-trades">
-                            <input
-                                style={style.input}
-                                ref={el => {
-                                    this.maxTradesDiv = el;
-                                }}
-                                type="text"
-                                id="limitation-max-trades"
-                                step="1"
-                                maxLength="3"
-                                value={this.state.maxTrades}
-                                onChange={(...args) => this.onMaxTradeChange(...args)}
-                            />
-                            {translate('Maximum number of trades')}
-                        </label>
-                    </div>
-                    <div style={style.inputRow}>
-                        <label style={style.field} htmlFor="limitation-max-loss">
-                            <input
-                                style={style.input}
-                                ref={el => {
-                                    this.maxLossDiv = el;
-                                }}
-                                value={this.state.maxLoss}
-                                type="text"
-                                id="limitation-max-loss"
-                                step="any"
-                                onChange={(...args) => this.onMaxLossChange(...args)}
-                            />
-                            {translate('Maximum loss amount')}
-                        </label>
-                    </div>
-                    {this.state.error ? <p style={style.error}>{this.state.error}</p> : null}
-                </div>
                 <p>
                     {translate(
-                        'Trade limitations are required by our regulators. Your bot will conclude trading when one or both of the conditions are met.'
+                        'We require you to set trade limitations in compliance with business regulations. Please note that your bot will only stop trading if any or both of the conditions below are met.'
                     )}
                 </p>
-                <div style={style.submitButton}>
-                    <button type="submit">{translate('Start')}</button>
+                <div className="input-row">
+                    <label>
+                        {translate('Daily limit on losses:')} <strong>{this.getDailyLossesLimit()}</strong>
+                    </label>
+                    <div className="description">
+                        {translate([
+                            'This is the threshold that limits your potential losses for the day in all Binary.com platforms. Once your total loss reaches or exceeds this amount, your bot will stop trading. Please set a value in the [_1]Self-Exclusion Facilities page[_2].',
+                            `<a href="${createUrl({
+                                addLanguage     : true,
+                                path            : 'user/security/self_exclusionws',
+                                addHtmlExtension: true,
+                                isNonBotPage    : true,
+                            })}" target="_blank">`,
+                            '</a>',
+                        ])}
+                    </div>
+                </div>
+                <div className="input-row">
+                    <label htmlFor="limitation-max-trades">{translate('Maximum consecutive trades')}</label>
+                    <div className="description">
+                        {translate(
+                            'This is the maximum number of trades that you allow your bot to execute for this run.'
+                        )}
+                    </div>
+                </div>
+                <div className="input-row">
+                    <input
+                        ref={el => {
+                            this.maxTradesDiv = el;
+                        }}
+                        type="text"
+                        id="limitation-max-trades"
+                        step="1"
+                        maxLength="3"
+                        value={this.state.maxTrades}
+                        onChange={(...args) => this.onMaxTradeChange(...args)}
+                        data-lpignore={true}
+                    />
+                </div>
+                {this.state.error && <p style={style.error}>{this.state.error}</p>}
+                <div className="input-row last" style={style.submitButton}>
+                    <button id="submit-trade-limits" type="submit">
+                        {translate('Start')}
+                    </button>
                 </div>
             </form>
         );
     }
     static props = {
         onSave: PropTypes.func,
+        api   : PropTypes.instanceOf(LiveApi),
     };
 }
 
 export default class Limits extends Dialog {
-    constructor() {
+    constructor(api) {
         const onSave = limits => {
             this.limitsPromise(limits);
             this.close();
         };
-        super('limits-dialog', translate('Trade Limitations'), <LimitsContent onSave={onSave} />, style.dialogLayout);
+        super(
+            'limits-dialog',
+            translate('Trade Limitations'),
+            <LimitsContent onSave={onSave} api={api} />,
+            style.dialogLayout
+        );
+        this.registerCloseOnOtherDialog();
     }
     getLimits() {
         this.open();