aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers/metamask.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-07-23 02:15:47 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-07-23 02:15:47 +0800
commit86832e6feb502a3f1de24b81b111addf1f06bea6 (patch)
tree8f3ac5ce8c1772916d93cf79e7fd7336e3b6a7bc /ui/app/reducers/metamask.js
parent22528002e1edef84ade67d5bc30b2580e6542c05 (diff)
parent0bbfedc2bf21d8c3eec17fef35e93a98a946469e (diff)
downloadtangerine-wallet-browser-86832e6feb502a3f1de24b81b111addf1f06bea6.tar
tangerine-wallet-browser-86832e6feb502a3f1de24b81b111addf1f06bea6.tar.gz
tangerine-wallet-browser-86832e6feb502a3f1de24b81b111addf1f06bea6.tar.bz2
tangerine-wallet-browser-86832e6feb502a3f1de24b81b111addf1f06bea6.tar.lz
tangerine-wallet-browser-86832e6feb502a3f1de24b81b111addf1f06bea6.tar.xz
tangerine-wallet-browser-86832e6feb502a3f1de24b81b111addf1f06bea6.tar.zst
tangerine-wallet-browser-86832e6feb502a3f1de24b81b111addf1f06bea6.zip
Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.
Diffstat (limited to 'ui/app/reducers/metamask.js')
-rw-r--r--ui/app/reducers/metamask.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 46397edd4..eba59ab45 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -31,6 +31,11 @@ function reduceMetamask (state, action) {
isConfirmed: true,
})
+ case actions.AGREE_TO_ETH_WARNING:
+ return extend(metamaskState, {
+ isEthConfirmed: true,
+ })
+
case actions.UNLOCK_METAMASK:
return extend(metamaskState, {
isUnlocked: true,