Merge branch 'dev' into notice-management

5 files changed, 23 insertions, 21 deletions

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index e2752831a..d1d706165 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -82,7 +82,6 @@ class KeyringController extends EventEmitter {
       keyrings: memState.keyrings,
       // configManager
       seedWords: this.configManager.getSeedWords(),
-      isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
     }
     return result
   }
diff --git a/app/scripts/lib/message-manager.js b/app/scripts/lib/message-manager.js
index 4a0017342..18bf54ae1 100644
--- a/app/scripts/lib/message-manager.js
+++ b/app/scripts/lib/message-manager.js
@@ -103,6 +103,7 @@ module.exports = class MessageManager extends EventEmitter{
   }
 
   _saveMsgList (msgList) {
+    this.emit('updateBadge')
     this.memStore.updateState({ messages: msgList })
   }
 
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fb5234c24..a56203a88 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -189,6 +189,7 @@ module.exports = class MetamaskController extends EventEmitter {
         currentFiat: this.configManager.getCurrentFiat(),
         conversionRate: this.configManager.getConversionRate(),
         conversionDate: this.configManager.getConversionDate(),
+        isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
       }
     )
   }
diff --git a/mock-dev.js b/mock-dev.js
index b20c3be3a..6563964c3 100644
--- a/mock-dev.js
+++ b/mock-dev.js
@@ -62,6 +62,7 @@ const controller = new MetamaskController({
   // initial state
   initState: firstTimeState,
 })
+global.metamaskController = controller
 
 //
 // User Interface
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 777fcbb7e..6e75eb6d7 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -8,49 +8,49 @@ QUnit.test('agree to terms', function (assert) {
 
   wait().then(function() {
     app = $('iframe').contents().find('#app-content .mock-app-root')
-    app.find('.markdown').prop('scrollTop', 100000000)
+
+    // Scroll through terms
+    var termsHeader = app.find('h3.terms-header')[0]
+    assert.equal(termsHeader.textContent, 'MetaMask Terms & Conditions', 'Showing TOS')
+    let termsPage = app.find('.markdown')[0]
+    assert.ok(termsPage, 'on terms page')
+    termsPage.scrollTop = termsPage.scrollHeight
+
     return wait()
+  }).then(function() {
+
+    // Agree to terms
+    var button = app.find('button')[0]
+    button.click()    
 
+    return wait()
   }).then(function() {
 
     var title = app.find('h1').text()
     assert.equal(title, 'MetaMask', 'title screen')
 
+    // enter password
     var pwBox = app.find('#password-box')[0]
     var confBox = app.find('#password-box-confirm')[0]
-
     pwBox.value = PASSWORD
     confBox.value = PASSWORD
+    
     return wait()
-
   }).then(function() {
 
+    // create vault
     var createButton = app.find('button.primary')[0]
     createButton.click()
 
     return wait(1500)
   }).then(function() {
 
-    var terms = app.find('h3.terms-header')[0]
-    assert.equal(terms.textContent, 'MetaMask Terms & Conditions', 'Showing TOS')
-
-    // Scroll through terms
-    var scrollable = app.find('.markdown')[0]
-    scrollable.scrollTop = scrollable.scrollHeight
-
-    return wait(10)
-  }).then(function() {
-
-    var button = app.find('button')[0] // Agree button
-    button.click()
-
-    return wait(1000)
-  }).then(function() {
-
     var created = app.find('h3')[0]
     assert.equal(created.textContent, 'Vault Created', 'Vault created screen')
 
-    var button = app.find('button')[0] // Agree button
+    // Agree button
+    var button = app.find('button')[0]
+    assert.ok(button, 'button present')
     button.click()
 
     return wait(1000)