Merge pull request #1867 from sdtsui/NewUI

Fix integration tests for NewUI

2 files changed, 7 insertions, 2 deletions

diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 6c8cedbac..0e4b802da 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -90,7 +90,13 @@ QUnit.test('render init screen', function (assert) {
     return wait()
   }).then(function (){
 
-    var qrButton = app.find('.fa.fa-qrcode')[0]
+    var qrButton = app.find('.fa.fa-ellipsis-h')[0] // open account settings dropdown
+    qrButton.click()
+
+    return wait(1000)
+  }).then(function (){
+
+    var qrButton = app.find('.dropdown-menu-item')[1] // qr code item
     qrButton.click()
 
     return wait(1000)
diff --git a/ui/app/app.js b/ui/app/app.js
index 620b4617a..4565bdd37 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -198,7 +198,6 @@ App.prototype.renderAppBar = function () {
             isOpen: state.isMainMenuOpen,
             color: 'rgb(247,146,30)',
             onClick: () => {
-              event.stopPropagation()
               this.setState({
                 isMainMenuOpen: !state.isMainMenuOpen,
               })