From 7aa09894df2fb73d323f5e7ef8356683bda41371 Mon Sep 17 00:00:00 2001
From: Zac Mitton <zacmitton22@gmail.com>
Date: Wed, 15 Jun 2016 14:40:57 -0400
Subject: icon fox eyes changed to navy blue everywhere

---
 app/images/.DS_Store    | Bin 6148 -> 6148 bytes
 app/images/icon-128.png | Bin 6535 -> 5770 bytes
 app/images/icon-16.png  | Bin 778 -> 564 bytes
 app/images/icon-19.png  | Bin 751 -> 662 bytes
 app/images/icon-38.png  | Bin 1668 -> 1450 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'app')

diff --git a/app/images/.DS_Store b/app/images/.DS_Store
index 5008ddfcf..d28ef2089 100644
Binary files a/app/images/.DS_Store and b/app/images/.DS_Store differ
diff --git a/app/images/icon-128.png b/app/images/icon-128.png
index 730a8f688..ae687147d 100644
Binary files a/app/images/icon-128.png and b/app/images/icon-128.png differ
diff --git a/app/images/icon-16.png b/app/images/icon-16.png
index 63bd8e0fc..ba7529073 100644
Binary files a/app/images/icon-16.png and b/app/images/icon-16.png differ
diff --git a/app/images/icon-19.png b/app/images/icon-19.png
index b149ba77a..07ac2f33f 100644
Binary files a/app/images/icon-19.png and b/app/images/icon-19.png differ
diff --git a/app/images/icon-38.png b/app/images/icon-38.png
index 974501640..83c04800d 100644
Binary files a/app/images/icon-38.png and b/app/images/icon-38.png differ
-- 
cgit v1.2.3


From 0f564aa64dbeb70744de6249d88da3ed7ae2e487 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 16 Jun 2016 15:04:50 -0700
Subject: Add confirmation persisting to localStorage

---
 app/scripts/lib/config-manager.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'app')

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index f5e1cf38d..24571748f 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -270,6 +270,17 @@ ConfigManager.prototype._emitUpdates = function(state){
   })
 }
 
+ConfigManager.prototype.setConfirmed = function(confirmed) {
+  var data = this.getData()
+  data.isConfirmed = confirmed
+  this.setData(data)
+}
+
+ConfigManager.prototype.getConfirmed = function() {
+  var data = this.getData()
+  return ('isConfirmed' in data) && data.isConfirmed
+}
+
 
 function loadData() {
 
-- 
cgit v1.2.3


From 5d90167bcc8af12c8cbd9dd64174352f758c8409 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 16 Jun 2016 15:58:11 -0700
Subject: Expose disclaimer consent to dnode API

---
 app/scripts/background.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'app')

diff --git a/app/scripts/background.js b/app/scripts/background.js
index f64209ecc..1098efe87 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -188,6 +188,7 @@ function setupControllerConnection(stream){
     setRpcTarget:       setRpcTarget,
     setProviderType:    setProviderType,
     useEtherscanProvider: useEtherscanProvider,
+    agreeToDisclaimer:  agreeToDisclaimer,
     // forward directly to idStore
     createNewVault:     idStore.createNewVault.bind(idStore),
     recoverFromSeed:    idStore.recoverFromSeed.bind(idStore),
@@ -295,6 +296,15 @@ function addUnconfirmedMsg(msgParams, cb){
 // config
 //
 
+function agreeToDisclaimer(cb) {
+  try {
+    configManager.setConfirmed(true)
+    cb()
+  } catch (e) {
+    cb(e)
+  }
+}
+
 // called from popup
 function setRpcTarget(rpcTarget){
   configManager.setRpcTarget(rpcTarget)
-- 
cgit v1.2.3


From e8ef8f3d2d0f6bf0fd014faa7b62457fb88f90d1 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 16 Jun 2016 16:41:33 -0700
Subject: Add confirmation status to metamask state branch

---
 app/scripts/lib/idStore.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index e9b9e0e06..a0bfa9d3a 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -92,6 +92,7 @@ IdentityStore.prototype.getState = function(){
     isInitialized: !!configManager.getWallet() && !seedWords,
     isUnlocked: this._isUnlocked(),
     seedWords: seedWords,
+    isConfirmed: configManager.getConfirmed(),
     unconfTxs: configManager.unconfirmedTxs(),
     transactions: configManager.getTxList(),
     unconfMsgs: messageManager.unconfirmedMsgs(),
-- 
cgit v1.2.3