Merge pull request #8 from binary-com/master

Mahboobeh-binary · web-flow · commit 273b385dcc24 · 2020-06-29T11:26:18.000+08:00
Master
diff --git a/src/botPage/bot/Interpreter.js b/src/botPage/bot/Interpreter.js
@@ -153,7 +153,6 @@ export default class Interpreter {
     }
     loop() {
         if (this.stopped || !this.interpreter.run()) {
-            this.isErrorTriggered = false;
             this.onFinish(this.interpreter.pseudoToNative(this.interpreter.value));
         }
     }
@@ -173,6 +172,7 @@ export default class Interpreter {
             this.$scope.api.disconnect();
         }
         this.stopped = true;
+        this.isErrorTriggered = false;
 
         globalObserver.emit('bot.stop');
         globalObserver.setState({ isRunning: false });
diff --git a/src/botPage/view/TradeInfoPanel/ClearButton.js b/src/botPage/view/TradeInfoPanel/ClearButton.js
@@ -11,6 +11,7 @@ export default class ClearButton extends React.PureComponent {
     componentDidMount() {
         globalObserver.register('summary.enable_clear', () => this.setState({ isButtonDisabled: false }));
         globalObserver.register('summary.disable_clear', () => this.setState({ isButtonDisabled: true }));
+        globalObserver.register('bot.running', () => this.setState({ isButtonDisabled: true }));
     }
     // eslint-disable-next-line class-methods-use-this
     confirmClearLog() {
diff --git a/src/botPage/view/TradeInfoPanel/index.js b/src/botPage/view/TradeInfoPanel/index.js
@@ -42,6 +42,12 @@ class AnimateTrade extends Component {
         };
     }
     componentWillMount() {
+        const resetSummary = () => {
+            resetAnimation();
+            this.setState({ indicatorMessage: this.indicatorMessages.notRunning });
+        };
+        globalObserver.register('reset_animation', resetSummary);
+        globalObserver.register('summary.clear', resetSummary);
         globalObserver.register('bot.running', () => {
             $('.stage-tooltip.top:eq(0)').addClass('running');
             this.setState({ indicatorMessage: this.indicatorMessages.running });
@@ -50,39 +56,31 @@ class AnimateTrade extends Component {
             $('.stage-tooltip.top:eq(0)').removeClass('running');
             this.setState({ indicatorMessage: this.indicatorMessages.stopped });
         });
-        globalObserver.register('reset_animation', () => {
-            resetAnimation();
-            this.setState({ indicatorMessage: this.indicatorMessages.stopped });
-        });
-
         $('#stopButton').click(() => {
             $('.stage-tooltip.top:eq(0)').removeClass('running');
-            this.setState({ indicatorMessage: this.state.stopMessage });
+            this.setState({
+                indicatorMessage: globalObserver.getState('isRunning')
+                    ? this.indicatorMessages.stopping
+                    : this.indicatorMessages.stopped,
+            });
         });
-
         $('#runButton').click(() => {
             resetAnimation();
             $('.stage-tooltip.top:eq(0)').addClass('running');
-            this.setState({
-                indicatorMessage: this.indicatorMessages.starting,
-                stopMessage     : this.indicatorMessages.stopped,
-            });
-            globalObserver.register('contract.status', contractStatus => {
-                this.animateStage(contractStatus);
-            });
+            this.setState({ indicatorMessage: this.indicatorMessages.starting });
+            globalObserver.emit('summary.disable_clear');
+            globalObserver.register('contract.status', contractStatus => this.animateStage(contractStatus));
         });
     }
     animateStage(contractStatus) {
         if (contractStatus.id === 'contract.purchase_sent') {
             resetAnimation();
             activateStage(0);
-
             this.setState({
                 buy_price: roundBalance({
                     balance : contractStatus.proposal.ask_price,
                     currency: contractStatus.currency,
                 }),
-                stopMessage: this.indicatorMessages.stopping,
             });
         } else if (contractStatus.id === 'contract.purchase_recieved') {
             $('.line').addClass('active');
@@ -91,7 +89,7 @@ class AnimateTrade extends Component {
         } else if (contractStatus.id === 'contract.sold') {
             $('.line').addClass('complete');
             activateStage(2);
-            this.setState({ sell_id: contractStatus.data, stopMessage: this.indicatorMessages.stopped });
+            this.setState({ sell_id: contractStatus.data });
         }
 
         activateStage(contractStatus.id);
diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
@@ -534,7 +534,6 @@ export default class View {
                 elStopButton.style.display = 'inline-block';
             });
 
-            globalObserver.emit('summary.disable_clear');
             showSummary();
             this.blockly.run(limitations);
         };
diff --git a/templates/partials/dbot-banner.mustache b/templates/partials/dbot-banner.mustache
@@ -1,16 +1,15 @@
 <div class="dbot-banner eu-hide invisible">
     <div class="dbot-banner__separator"></div>
         <div class="dbot-banner__icon">
-            <a href="https://deriv.com/interim/deriv/?utm_source=binary-bot&utm_medium=referral&utm_campaign=deriv-launch" target="_blank">
+            <a href="https://deriv.com/interim/dbot/?utm_source=binary-bot&utm_medium=referral&utm_campaign=deriv-launch" target="_blank">
                 <img src="./image/d-bot.svg">
-            </a>
+            </a>    
         </div>
-    </a>
     <div class="dbot-banner__ad">
-        <a href="https://deriv.com/interim/deriv/?utm_source=binary-bot&utm_medium=referral&utm_campaign=deriv-launch" target="_blank">
+        <a href="https://deriv.com/interim/dbot/?utm_source=binary-bot&utm_medium=referral&utm_campaign=deriv-launch" target="_blank">
             <div class="dbot-banner__ad-text" data-i18n-text="Binary Bot is"></div>
             <div class="dbot-banner__ad-text" data-i18n-text="becoming DBot"></div>
         </a>
     </div>
-    <a class="dbot-banner__button" href="https://deriv.com/interim/deriv/?utm_source=binary-bot&utm_medium=referral&utm_campaign=deriv-launch" target="_blank" data-i18n-text="Learn more"></a>
+    <a class="dbot-banner__button" href="https://deriv.com/interim/dbot/?utm_source=binary-bot&utm_medium=referral&utm_campaign=deriv-launch" target="_blank" data-i18n-text="Learn more"></a>
 </div>

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ export default class Interpreter {`
`153`	`153`	`}`
`154`	`154`	`loop() {`
`155`	`155`	`if (this.stopped \|\| !this.interpreter.run()) {`
`156`		`- this.isErrorTriggered = false;`
`157`	`156`	`this.onFinish(this.interpreter.pseudoToNative(this.interpreter.value));`
`158`	`157`	`}`
`159`	`158`	`}`
`@@ -173,6 +172,7 @@ export default class Interpreter {`
`173`	`172`	`this.$scope.api.disconnect();`
`174`	`173`	`}`
`175`	`174`	`this.stopped = true;`
	`175`	`+ this.isErrorTriggered = false;`
`176`	`176`
`177`	`177`	`globalObserver.emit('bot.stop');`
`178`	`178`	`globalObserver.setState({ isRunning: false });`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ export default class ClearButton extends React.PureComponent {`
`11`	`11`	`componentDidMount() {`
`12`	`12`	`globalObserver.register('summary.enable_clear', () => this.setState({ isButtonDisabled: false }));`
`13`	`13`	`globalObserver.register('summary.disable_clear', () => this.setState({ isButtonDisabled: true }));`
	`14`	`+ globalObserver.register('bot.running', () => this.setState({ isButtonDisabled: true }));`
`14`	`15`	`}`
`15`	`16`	`// eslint-disable-next-line class-methods-use-this`
`16`	`17`	`confirmClearLog() {`