From 9edfc97c4f671e4d13d636e42ec815f2253d2b73 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Mon, 3 Dec 2018 17:37:34 +0800
Subject: [PATCH 01/22] Change default login popup to our own panel variant

---
 src/botPage/view/View.js | 17 +++++++++++------
 templates/bot.mustache   |  3 +++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index 60ab200186..e23c6db128 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -226,10 +226,10 @@ const applyToolboxPermissions = () => {
     }
 };
 
-const showReloadPopup = () =>
+const showPopup = selector =>
     new Promise((resolve, reject) => {
         setBeforeUnload(true);
-        $('#reloadPanel').dialog({
+        $(selector).dialog({
             height: 'auto',
             width : 600,
             modal : true,
@@ -258,7 +258,7 @@ const showReloadPopup = () =>
                 },
             ],
         });
-        $('#reloadPanel').dialog('open');
+        $(selector).dialog('open');
     });
 
 export default class View {
@@ -373,7 +373,7 @@ export default class View {
             });
         };
         const logout = () => {
-            showReloadPopup()
+            showPopup('#reloadPanel')
                 .then(() => {
                     removeTokens();
                 })
@@ -539,7 +539,7 @@ export default class View {
         });
 
         $('.login-id-list').on('click', 'a', e => {
-            showReloadPopup()
+            showPopup('#reloadPanel')
                 .then(() => {
                     const activeToken = $(e.currentTarget).attr('value');
                     const tokenList = getTokenList();
@@ -554,7 +554,12 @@ export default class View {
 
         $('#login')
             .bind('click.login', () => {
-                document.location = getOAuthURL();
+                const test = showPopup('#loginPanel');
+                test
+                    .then(() => {
+                        document.location = getOAuthURL();
+                    })
+                    .catch(() => {});
             })
             .text('Log in');
 
diff --git a/templates/bot.mustache b/templates/bot.mustache
index 048877836d..b95f2f54fe 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -25,6 +25,9 @@
         <br />
         <p style="margin:0.7em" data-i18n-text="Note: Please see the Binary.com statement page for details of all confirmed transactions."></p>
     </span>
+    <div id="loginPanel" class="draggable-dialog" title="">
+      <p style="margin:0.7em" data-i18n-text="If you leave this page your current work will be lost, are you sure you want to leave this page?"></p>
+    </div>
 
 
     <div>

From a4d439e3e85aef823a53fedf512866d5ac1964c5 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Mon, 3 Dec 2018 17:46:14 +0800
Subject: [PATCH 02/22] Update 'Reset'-button location and behaviour

---
 src/botPage/view/View.js | 8 ++++++--
 templates/bot.mustache   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index e23c6db128..1a7072a660 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -534,8 +534,12 @@ export default class View {
             .hide();
 
         $('#resetButton').click(() => {
-            this.blockly.resetWorkspace();
-            setTimeout(() => this.blockly.cleanUp(), 0);
+            showPopup('#reloadPanel')
+                .then(() => {
+                    this.blockly.resetWorkspace();
+                    setTimeout(() => this.blockly.cleanUp(), 0);
+                })
+                .catch(() => {});
         });
 
         $('.login-id-list').on('click', 'a', e => {
diff --git a/templates/bot.mustache b/templates/bot.mustache
index b95f2f54fe..b333fd04b9 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -129,12 +129,12 @@
       <button title="Zoom Out (Ctrl + -)" id="zoomOut" class="toolbox-button icon-zoom-out"></button>
       <button title="Rearrange Vertically" id="rearrange" class="toolbox-button icon-sort"></button>
       <button title="Show/hide the summary pop-up" id="showSummary" class="toolbox-button icon-summary"></button>
-      <button title="Reset the blocks to their initial state" id="resetButton" class="toolbox-button icon-reset"></button>
       <button title="Run the bot" id="runButton" class="toolbox-button icon-run"></button>
       <button title="Stop the bot" id="stopButton" class="toolbox-button icon-stop"></button>
       <button title="Show log" id="logButton" class="toolbox-button icon-info"></button>
       <button title="Show chart" id="chartButton" class="toolbox-button icon-chart-line"></button>
       <button title="Show Trading View" id="tradingViewButton" class="toolbox-button icon-trading-view"></button>
+      <button title="Reset the blocks to their initial state" id="resetButton" class="toolbox-button icon-reset"></button>
     </div>
     <div id="footer"></div>
     <audio id="announcement" src="sound/announcement.ogg" autostart="false" ></audio>

From 9cade9af1ec24745586f13ed9d292304ebcbdf5a Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Mon, 3 Dec 2018 18:18:39 +0800
Subject: [PATCH 03/22] Suppress tour popup for 24 hours after user hides it

---
 src/botPage/view/tour/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/botPage/view/tour/index.js b/src/botPage/view/tour/index.js
index 81aa7eeabf..b46de31ea6 100644
--- a/src/botPage/view/tour/index.js
+++ b/src/botPage/view/tour/index.js
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import Joyride from 'react-joyride';
-import { setDone, isDone } from '../../../common/utils/storageManager';
+import { set, get, setDone, isDone } from '../../../common/utils/storageManager';
 import { translate } from '../../../common/i18n';
 import welcome from './welcome';
 
@@ -24,6 +24,7 @@ class Tour extends PureComponent {
                 next: () => this.joyride.next(),
                 stop: () => {
                     setDoneCheck();
+                    set('closedTourPopup', Date.now());
                     this.joyride.stop();
                 },
             };
@@ -35,8 +36,12 @@ class Tour extends PureComponent {
                 setDoneCheck();
             }
         };
+        const shouldShowTourPopup = () => {
+            const timeDifference = Date.now() - (parseInt(get('closedTourPopup')) || 0);
+            return !isDone('welcomeFinished') && timeDifference > 24 * 60 * 60 * 1000;
+        };
         return (
-            !isDone('welcomeFinished') && (
+            shouldShowTourPopup() && (
                 <div className="tour-first-pop-up">
                     <Joyride
                         autoStart

From 4f54807d60c2384640ea9861aceaee6aae02e2c6 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Mon, 3 Dec 2018 19:49:47 +0800
Subject: [PATCH 04/22] Remove test variable

---
 src/botPage/view/View.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index 1a7072a660..c5146f111a 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -558,8 +558,7 @@ export default class View {
 
         $('#login')
             .bind('click.login', () => {
-                const test = showPopup('#loginPanel');
-                test
+                showPopup('#loginPanel')
                     .then(() => {
                         document.location = getOAuthURL();
                     })

From 187dc4996f22012c30ad004589c055afdc2064a0 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 4 Dec 2018 13:52:21 +0800
Subject: [PATCH 05/22] Update confirmation message when attempting login

---
 src/botPage/view/View.js | 2 +-
 templates/bot.mustache   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index c5146f111a..4facccbcb1 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -543,7 +543,7 @@ export default class View {
         });
 
         $('.login-id-list').on('click', 'a', e => {
-            showPopup('#reloadPanel')
+            showPopup('#unsavedPanel')
                 .then(() => {
                     const activeToken = $(e.currentTarget).attr('value');
                     const tokenList = getTokenList();
diff --git a/templates/bot.mustache b/templates/bot.mustache
index b333fd04b9..80f67149cc 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -25,11 +25,13 @@
         <br />
         <p style="margin:0.7em" data-i18n-text="Note: Please see the Binary.com statement page for details of all confirmed transactions."></p>
     </span>
+    <div id="unsavedPanel" class="draggable-dialog" title="">
+      <p style="margin:0.7em" data-i18n-text="Are you sure you want to leave this page? All unsaved changes will be lost."></p>
+    </div>
     <div id="loginPanel" class="draggable-dialog" title="">
-      <p style="margin:0.7em" data-i18n-text="If you leave this page your current work will be lost, are you sure you want to leave this page?"></p>
+      <p style="margin:0.7em" data-i18n-text="Are you sure you want to leave this page to login? All unsaved changes will be lost."></p>
     </div>
 
-
     <div>
       <div class="blocker"></div>
       <div class="reality-check" style="display: none">

From 147992742d00fe06f2fcb9f353bed934e19a31af Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 4 Dec 2018 14:20:25 +0800
Subject: [PATCH 06/22] Restore original panel

---
 src/botPage/view/View.js | 2 +-
 templates/bot.mustache   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index 4facccbcb1..c5146f111a 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -543,7 +543,7 @@ export default class View {
         });
 
         $('.login-id-list').on('click', 'a', e => {
-            showPopup('#unsavedPanel')
+            showPopup('#reloadPanel')
                 .then(() => {
                     const activeToken = $(e.currentTarget).attr('value');
                     const tokenList = getTokenList();
diff --git a/templates/bot.mustache b/templates/bot.mustache
index 80f67149cc..731be79396 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -25,9 +25,6 @@
         <br />
         <p style="margin:0.7em" data-i18n-text="Note: Please see the Binary.com statement page for details of all confirmed transactions."></p>
     </span>
-    <div id="unsavedPanel" class="draggable-dialog" title="">
-      <p style="margin:0.7em" data-i18n-text="Are you sure you want to leave this page? All unsaved changes will be lost."></p>
-    </div>
     <div id="loginPanel" class="draggable-dialog" title="">
       <p style="margin:0.7em" data-i18n-text="Are you sure you want to leave this page to login? All unsaved changes will be lost."></p>
     </div>

From 745f131239ae61252d2d2afbd79e820c7ab121af Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 4 Dec 2018 15:01:32 +0800
Subject: [PATCH 07/22] Move checkbox to below buttons

---
 src/botPage/view/tour/welcome.js | 10 ++++++----
 static/css/_tour.scss            |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/botPage/view/tour/welcome.js b/src/botPage/view/tour/welcome.js
index 0686d897fd..6d0d38bb93 100644
--- a/src/botPage/view/tour/welcome.js
+++ b/src/botPage/view/tour/welcome.js
@@ -6,10 +6,6 @@ const steps = [
         text : `
           <p>
             ${translate('Ready to learn how to use Binary Bot?')}
-            <input type="checkbox" id="do-not-ask-me-again"></input>
-            <label for="do-not-ask-me-again">
-              ${translate('Do not ask me again.')}
-            </label>
           </p>
           <div class="tour-custom-buttons">
             <a class="button-secondary" onclick="tour.stop()">
@@ -19,6 +15,12 @@ const steps = [
                 <span>${translate('Yes')}</span>
             </a>
           </div>
+          <div class="tour-custom-buttons">
+            <input type="checkbox" id="do-not-ask-me-again"></input>
+            <label for="do-not-ask-me-again">
+                ${translate('Do not ask me again.')}
+            </label>
+          </div>
           `,
         selector: '#tour',
         position: 'top',
diff --git a/static/css/_tour.scss b/static/css/_tour.scss
index 9d3f6acc87..30c69493ef 100644
--- a/static/css/_tour.scss
+++ b/static/css/_tour.scss
@@ -20,8 +20,9 @@ $joyride-tooltip-width: (15em, 20em, 20em);
     }
 }
 
-.tour-custom-buttons {
-    float: right;
+.tour-custom-buttons, #do-not-ask-me-again {
+    text-align: right;
+    margin-top: 1em;
     button: {
         margin-left: 0.1em;
     }

From 2100fe6f25392bb3a112a7396c605d962ffd7beb Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 4 Dec 2018 15:08:00 +0800
Subject: [PATCH 08/22] Remove 'Make your own strategies' URL

---
 src/botPage/view/tour/welcome.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/botPage/view/tour/welcome.js b/src/botPage/view/tour/welcome.js
index 6d0d38bb93..8f2afaad92 100644
--- a/src/botPage/view/tour/welcome.js
+++ b/src/botPage/view/tour/welcome.js
@@ -40,10 +40,7 @@ const steps = [
       <a target="blank" href="https://shop.binary.com/collections/strategies">
         ${translate('Download sample strategies')}
       </a>
-      ${translate('or')}
-        <a target="blank" href="https://github.com/binary-com/binary-bot#sample-blocks">
-          ${translate('Make your own strategies')}
-        </a>
+      ${translate('or')} ${translate('make your own strategies.')}
     </p>`,
         selector: '#center',
         position: 'bottom',

From 53fd335b2611899c26d1a929aa10d429f5cb6be1 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 4 Dec 2018 15:13:02 +0800
Subject: [PATCH 09/22] Only calculate time difference when required

---
 src/botPage/view/tour/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/botPage/view/tour/index.js b/src/botPage/view/tour/index.js
index b46de31ea6..62c109fe6c 100644
--- a/src/botPage/view/tour/index.js
+++ b/src/botPage/view/tour/index.js
@@ -37,8 +37,11 @@ class Tour extends PureComponent {
             }
         };
         const shouldShowTourPopup = () => {
-            const timeDifference = Date.now() - (parseInt(get('closedTourPopup')) || 0);
-            return !isDone('welcomeFinished') && timeDifference > 24 * 60 * 60 * 1000;
+            const dayHasPassed = () => {
+                const timeDifference = Date.now() - (parseInt(get('closedTourPopup')) || 0);
+                return timeDifference > 24 * 60 * 60 * 1000;
+            };
+            return !isDone('welcomeFinished') && dayHasPassed();
         };
         return (
             shouldShowTourPopup() && (

From a1ff59fbbd2668435cbc3c8d6cae7c20d3829998 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 4 Dec 2018 15:15:02 +0800
Subject: [PATCH 10/22] Remove unused selector

---
 static/css/_tour.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/css/_tour.scss b/static/css/_tour.scss
index 30c69493ef..4b2ad2356c 100644
--- a/static/css/_tour.scss
+++ b/static/css/_tour.scss
@@ -20,7 +20,7 @@ $joyride-tooltip-width: (15em, 20em, 20em);
     }
 }
 
-.tour-custom-buttons, #do-not-ask-me-again {
+.tour-custom-buttons {
     text-align: right;
     margin-top: 1em;
     button: {

From 611e632cdf1d338ef61c7f4be932b5a4738ce388 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 4 Dec 2018 16:16:09 +0800
Subject: [PATCH 11/22] Update tour buttons to meet style guidelines

---
 static/css/_tour.scss | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/static/css/_tour.scss b/static/css/_tour.scss
index 4b2ad2356c..e0f79c5ea9 100644
--- a/static/css/_tour.scss
+++ b/static/css/_tour.scss
@@ -2,7 +2,7 @@
 
 $joyride-color: $brand-orange;
 $joyride-button-bg-color: $brand-btn;
-$joyride-button-color: $white !important;
+$joyride-button-color: $brand-gray !important;
 $joyride-tooltip-width: (15em, 20em, 20em);
 
 @import '../../node_modules/react-joyride/lib/react-joyride';
@@ -27,3 +27,18 @@ $joyride-tooltip-width: (15em, 20em, 20em);
         margin-left: 0.1em;
     }
 }
+
+.joyride-tooltip__button {
+    padding: 10px 25px;
+    &--primary {
+        color: $white;
+        background-color: $brand-btn;
+    }
+    &--secondary {
+        color: $black;
+        background-color: $brand-gray;
+    }
+    &--secondary:hover {
+        background-color: #dedede;
+    }
+}
\ No newline at end of file

From e9d9796e4e294c7a54d39e5d90c04a290f48a231 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 4 Dec 2018 16:20:49 +0800
Subject: [PATCH 12/22] Fix colours

---
 static/css/_tour.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/static/css/_tour.scss b/static/css/_tour.scss
index e0f79c5ea9..52c7f9a5e7 100644
--- a/static/css/_tour.scss
+++ b/static/css/_tour.scss
@@ -2,7 +2,6 @@
 
 $joyride-color: $brand-orange;
 $joyride-button-bg-color: $brand-btn;
-$joyride-button-color: $brand-gray !important;
 $joyride-tooltip-width: (15em, 20em, 20em);
 
 @import '../../node_modules/react-joyride/lib/react-joyride';
@@ -34,6 +33,10 @@ $joyride-tooltip-width: (15em, 20em, 20em);
         color: $white;
         background-color: $brand-btn;
     }
+    &--primary:hover {
+        color: $white;
+        background-color: $brand-btn-active;
+    }
     &--secondary {
         color: $black;
         background-color: $brand-gray;

From d94eec600ccdc4dd81bf79f7f183b5e51c508e63 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Wed, 5 Dec 2018 17:27:12 +0800
Subject: [PATCH 13/22] Change set, get to setStorage, getStorage respectively

---
 src/botPage/view/tour/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/botPage/view/tour/index.js b/src/botPage/view/tour/index.js
index 62c109fe6c..cdcc76758e 100644
--- a/src/botPage/view/tour/index.js
+++ b/src/botPage/view/tour/index.js
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import Joyride from 'react-joyride';
-import { set, get, setDone, isDone } from '../../../common/utils/storageManager';
+import { setStorage, getStorage, setDone, isDone } from '../../../common/utils/storageManager';
 import { translate } from '../../../common/i18n';
 import welcome from './welcome';
 
@@ -24,7 +24,7 @@ class Tour extends PureComponent {
                 next: () => this.joyride.next(),
                 stop: () => {
                     setDoneCheck();
-                    set('closedTourPopup', Date.now());
+                    setStorage('closedTourPopup', Date.now());
                     this.joyride.stop();
                 },
             };
@@ -38,7 +38,7 @@ class Tour extends PureComponent {
         };
         const shouldShowTourPopup = () => {
             const dayHasPassed = () => {
-                const timeDifference = Date.now() - (parseInt(get('closedTourPopup')) || 0);
+                const timeDifference = Date.now() - (parseInt(getStorage('closedTourPopup')) || 0);
                 return timeDifference > 24 * 60 * 60 * 1000;
             };
             return !isDone('welcomeFinished') && dayHasPassed();

From 6dcaec0860188364dc08ed0211adedf3771350a3 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Thu, 6 Dec 2018 09:16:24 +0800
Subject: [PATCH 14/22] Update login warning text

---
 templates/bot.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/bot.mustache b/templates/bot.mustache
index 731be79396..9ceaa62736 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -26,7 +26,7 @@
         <p style="margin:0.7em" data-i18n-text="Note: Please see the Binary.com statement page for details of all confirmed transactions."></p>
     </span>
     <div id="loginPanel" class="draggable-dialog" title="">
-      <p style="margin:0.7em" data-i18n-text="Are you sure you want to leave this page to login? All unsaved changes will be lost."></p>
+      <p style="margin:0.7em" data-i18n-text="Are you sure you want to log in? All unsaved changes will be lost."></p>
     </div>
 
     <div>

From d211e5852b9f0be25376f97a1a452fb5b30a811c Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Thu, 6 Dec 2018 09:33:21 +0800
Subject: [PATCH 15/22] Fix aliases

---
 src/botPage/view/tour/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/botPage/view/tour/index.js b/src/botPage/view/tour/index.js
index cdcc76758e..aa5df9bd13 100644
--- a/src/botPage/view/tour/index.js
+++ b/src/botPage/view/tour/index.js
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import Joyride from 'react-joyride';
-import { setStorage, getStorage, setDone, isDone } from '../../../common/utils/storageManager';
+import { set as setStorage, get as getStorage, setDone, isDone } from '../../../common/utils/storageManager';
 import { translate } from '../../../common/i18n';
 import welcome from './welcome';
 

From 812267b2be22295bf62694765ccc582282ec878d Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Thu, 6 Dec 2018 13:46:39 +0800
Subject: [PATCH 16/22] Update spacing for first tooltip

---
 static/css/_tour.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/css/_tour.scss b/static/css/_tour.scss
index 52c7f9a5e7..6a012ffa84 100644
--- a/static/css/_tour.scss
+++ b/static/css/_tour.scss
@@ -16,6 +16,9 @@ $joyride-tooltip-width: (15em, 20em, 20em);
 .tour-first-pop-up {
     .joyride-tooltip {
         position: fixed !important;
+        &__main {
+            padding-bottom: 0;
+        }
     }
 }
 

From 34ba89ee10111a697336cb337277fe2eb07a36c9 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Thu, 6 Dec 2018 13:55:55 +0800
Subject: [PATCH 17/22] Refactor dayHasPassed()

---
 src/botPage/view/tour/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/botPage/view/tour/index.js b/src/botPage/view/tour/index.js
index aa5df9bd13..1d5e832432 100644
--- a/src/botPage/view/tour/index.js
+++ b/src/botPage/view/tour/index.js
@@ -37,10 +37,8 @@ class Tour extends PureComponent {
             }
         };
         const shouldShowTourPopup = () => {
-            const dayHasPassed = () => {
-                const timeDifference = Date.now() - (parseInt(getStorage('closedTourPopup')) || 0);
-                return timeDifference > 24 * 60 * 60 * 1000;
-            };
+            const dayHasPassed = () =>
+                Date.now() > (parseInt(getStorage('closedTourPopup')) || 0) + 24 * 60 * 60 * 1000;
             return !isDone('welcomeFinished') && dayHasPassed();
         };
         return (

From 2967bb891c67f617105f72ad3d2b15bdc20ae129 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Mon, 17 Dec 2018 09:58:27 +0800
Subject: [PATCH 18/22] Remove pop-up before user tries to login

---
 src/botPage/view/View.js | 9 +++------
 templates/bot.mustache   | 4 ----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index c5146f111a..d6f1c7f5a2 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -558,13 +558,10 @@ export default class View {
 
         $('#login')
             .bind('click.login', () => {
-                showPopup('#loginPanel')
-                    .then(() => {
-                        document.location = getOAuthURL();
-                    })
-                    .catch(() => {});
+                setBeforeUnload(true);
+                document.location = getOAuthURL();
             })
-            .text('Log in');
+            .text(translate('Log in'));
 
         $('#statement-reality-check').click(() => {
             document.location = `https://www.binary.com/${getLanguage()}/user/statementws.html#no-reality-check`;
diff --git a/templates/bot.mustache b/templates/bot.mustache
index 9ceaa62736..1974a953d8 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -25,10 +25,6 @@
         <br />
         <p style="margin:0.7em" data-i18n-text="Note: Please see the Binary.com statement page for details of all confirmed transactions."></p>
     </span>
-    <div id="loginPanel" class="draggable-dialog" title="">
-      <p style="margin:0.7em" data-i18n-text="Are you sure you want to log in? All unsaved changes will be lost."></p>
-    </div>
-
     <div>
       <div class="blocker"></div>
       <div class="reality-check" style="display: none">

From 129fecb00777f03f6a34002599927b114420a5fd Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Mon, 17 Dec 2018 10:10:25 +0800
Subject: [PATCH 19/22] Stop trading when user changes accounts, refreshes, or
 logs out

---
 src/botPage/view/View.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index d6f1c7f5a2..22701a2f80 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -375,6 +375,7 @@ export default class View {
         const logout = () => {
             showPopup('#reloadPanel')
                 .then(() => {
+                    this.stop();
                     removeTokens();
                 })
                 .catch(() => {});
@@ -536,6 +537,7 @@ export default class View {
         $('#resetButton').click(() => {
             showPopup('#reloadPanel')
                 .then(() => {
+                    this.stop();
                     this.blockly.resetWorkspace();
                     setTimeout(() => this.blockly.cleanUp(), 0);
                 })
@@ -545,6 +547,7 @@ export default class View {
         $('.login-id-list').on('click', 'a', e => {
             showPopup('#reloadPanel')
                 .then(() => {
+                    this.stop();
                     const activeToken = $(e.currentTarget).attr('value');
                     const tokenList = getTokenList();
                     setStorage('tokenList', '');

From 723ccaf9c0f07eb7fdba3fcae9e2967cc164694c Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Tue, 18 Dec 2018 15:00:44 +0800
Subject: [PATCH 20/22] Remove non-existant space that would render an ugly
 line

---
 src/botPage/view/tour/welcome.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/botPage/view/tour/welcome.js b/src/botPage/view/tour/welcome.js
index 8f2afaad92..abcdb48053 100644
--- a/src/botPage/view/tour/welcome.js
+++ b/src/botPage/view/tour/welcome.js
@@ -8,12 +8,8 @@ const steps = [
             ${translate('Ready to learn how to use Binary Bot?')}
           </p>
           <div class="tour-custom-buttons">
-            <a class="button-secondary" onclick="tour.stop()">
-                <span>${translate('No Thanks')}</span>
-            </a>
-            <a class="button" onclick="tour.next()">
-                <span>${translate('Yes')}</span>
-            </a>
+            <a class="button-secondary" onclick="tour.stop()"><span>${translate('No Thanks')}</span></a>
+            <a class="button" onclick="tour.next()"><span>${translate('Yes')}</span></a>
           </div>
           <div class="tour-custom-buttons">
             <input type="checkbox" id="do-not-ask-me-again"></input>

From 854e248c94a41a72937120f47a8ed7e9d9d2800a Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Thu, 20 Dec 2018 16:40:48 +0800
Subject: [PATCH 21/22] Show correct panels for each action

---
 src/botPage/bot/Interpreter.js    |  3 +++
 src/botPage/view/View.js          | 11 ++++++++---
 src/botPage/view/blockly/index.js |  4 ++++
 templates/bot.mustache            | 12 +++++++++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/botPage/bot/Interpreter.js b/src/botPage/bot/Interpreter.js
index 7c852b8617..d6fbb51939 100644
--- a/src/botPage/bot/Interpreter.js
+++ b/src/botPage/bot/Interpreter.js
@@ -156,4 +156,7 @@ export default class Interpreter {
                 .catch(e => this.$scope.observer.emit('Error', e));
         });
     }
+    hasStarted() {
+        return !this.stopped;
+    }
 }
diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index 22701a2f80..7968f0445c 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -373,7 +373,7 @@ export default class View {
             });
         };
         const logout = () => {
-            showPopup('#reloadPanel')
+            showPopup(getAccountSwitchPanelName())
                 .then(() => {
                     this.stop();
                     removeTokens();
@@ -385,6 +385,10 @@ export default class View {
             setStorage(AppConstants.STORAGE_ACTIVE_TOKEN, '');
         };
 
+        const getReloadPanelName = () => (this.blockly.hasStarted() ? '#reloadPanelTrading' : '#reloadPanel');
+        const getAccountSwitchPanelName = () =>
+            this.blockly.hasStarted() ? '#switchAccountPanelTrading' : '#reloadPanel';
+
         $('.panelExitButton').click(function onClick() {
             $(this)
                 .parent()
@@ -469,6 +473,7 @@ export default class View {
         });
 
         $('#logout').click(() => {
+            setBeforeUnload(true);
             logout();
             hideRealityCheck();
         });
@@ -535,7 +540,7 @@ export default class View {
             .hide();
 
         $('#resetButton').click(() => {
-            showPopup('#reloadPanel')
+            showPopup(getReloadPanelName())
                 .then(() => {
                     this.stop();
                     this.blockly.resetWorkspace();
@@ -545,7 +550,7 @@ export default class View {
         });
 
         $('.login-id-list').on('click', 'a', e => {
-            showPopup('#reloadPanel')
+            showPopup(getAccountSwitchPanelName())
                 .then(() => {
                     this.stop();
                     const activeToken = $(e.currentTarget).attr('value');
diff --git a/src/botPage/view/blockly/index.js b/src/botPage/view/blockly/index.js
index 7bdf4d43ff..354001268f 100644
--- a/src/botPage/view/blockly/index.js
+++ b/src/botPage/view/blockly/index.js
@@ -367,5 +367,9 @@ while(true) {
     redo() {
         Blockly.mainWorkspace.undo(true);
     }
+    /* eslint-disable class-methods-use-this */
+    hasStarted() {
+        return this.interpreter && this.interpreter.hasStarted();
+    }
     /* eslint-enable */
 }
diff --git a/templates/bot.mustache b/templates/bot.mustache
index 1974a953d8..5714a4ec53 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -20,9 +20,15 @@
     </span>
     <span id="summaryPanel" class="draggable-dialog" title="Summary">
     </span>
-    <span id="reloadPanel" class="draggable-dialog" title="Page reload warning!">
-        <p style="margin:0.7em" data-i18n-text="Are you sure you wish to proceed with your current action? Binary Bot will stop placing further trades. Ongoing trades (if available) will be completed by our system. All unsaved changes to your strategy will be lost."></p>
-        <br />
+    <span id="reloadPanel" class="draggable-dialog" title="Are you sure?">
+      <p style="margin:0.7em" data-i18n-text="Any unsaved changes will be lost. "></p>
+    </span>
+    <span id="reloadPanelTrading" class="draggable-dialog" title="Are you sure?">
+        <p style="margin:0.7em" data-i18n-text="Binary Bot will not place any new trades. Any trades already placed (but not expired) will be completed by our system. Any unsaved changes will be lost."></p>
+        <p style="margin:0.7em" data-i18n-text="Note: Please see the Binary.com statement page for details of all confirmed transactions."></p>
+    </span>
+    <span id="switchAccountPanelTrading" class="draggable-dialog" title="Are you sure?">
+        <p style="margin:0.7em" data-i18n-text="Binary Bot will not place any new trades. Current unexpired trades will be completed by our system. All unsaved changes will be lost."></p>
         <p style="margin:0.7em" data-i18n-text="Note: Please see the Binary.com statement page for details of all confirmed transactions."></p>
     </span>
     <div>

From 14ea100a990130d619ebfc86b057a294d2a9b388 Mon Sep 17 00:00:00 2001
From: Aaron Imming <aaron@binary.com>
Date: Fri, 21 Dec 2018 09:47:40 +0800
Subject: [PATCH 22/22] Update logic since bot stops in more cases now

---
 src/botPage/view/blockly/index.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/botPage/view/blockly/index.js b/src/botPage/view/blockly/index.js
index 354001268f..957546826f 100644
--- a/src/botPage/view/blockly/index.js
+++ b/src/botPage/view/blockly/index.js
@@ -349,8 +349,12 @@ while(true) {
     }
     stop(stopBeforeStart) {
         if (!stopBeforeStart) {
-            $('#runButton').show();
-            $('#stopButton').hide();
+            const $runButton = $('#runButton');
+            const $stopButton = $('#stopButton');
+            if ($runButton.is(':visible') || $stopButton.is(':visible')) {
+                $runButton.show();
+                $stopButton.hide();
+            }
         }
         if (this.interpreter) {
             this.interpreter.stop();