Ensure correct status label

aaimio · aaimio · commit 4d5d148bbf4e · 2020-06-18T10:47:17.000+08:00
diff --git a/src/botPage/view/TradeInfoPanel/ClearButton.js b/src/botPage/view/TradeInfoPanel/ClearButton.js
@@ -11,7 +11,6 @@ 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
@@ -27,6 +27,9 @@ const activateStage = index => {
 };
 
 class AnimateTrade extends Component {
+    componentDidUpdate(prevProps, prevState) {
+        console.log({ prevState, state: this.state });
+    }
     constructor() {
         super();
         this.indicatorMessages = {
@@ -42,6 +45,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,40 +59,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,
-            });
+            this.setState({ indicatorMessage: this.indicatorMessages.starting });
             globalObserver.emit('summary.disable_clear');
-            globalObserver.register('contract.status', contractStatus => {
-                this.animateStage(contractStatus);
-            });
+            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');
@@ -92,7 +92,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);

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ 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 }));`
`15`	`14`	`}`
`16`	`15`	`// eslint-disable-next-line class-methods-use-this`
`17`	`16`	`confirmClearLog() {`