diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-17 07:02:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 07:02:24 +0800 |
| commit | ee62a6a3913967a6840d28ca812b94bbfa7a5779 (patch) | |
| tree | cac32de6cc520917db9621ce93f7f4ad9abd787e /ui/app/reducers/metamask.js | |
| parent | e8e06542e47b41668f196b6db54290490003845b (diff) | |
| parent | 88fabdd2de78d0dd4be86b02c94a64d9748667fa (diff) | |
| download | tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.gz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.bz2 tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.lz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.xz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.zst tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.zip | |
Merge pull request #1005 from MetaMask/dev
Merge dev into master!
Diffstat (limited to 'ui/app/reducers/metamask.js')
| -rw-r--r-- | ui/app/reducers/metamask.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 9a1c5814d..8679ab062 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -10,7 +10,6 @@ function reduceMetamask (state, action) { var metamaskState = extend({ isInitialized: false, isUnlocked: false, - isEthConfirmed: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, unconfTxs: {}, @@ -44,12 +43,7 @@ function reduceMetamask (state, action) { case actions.AGREE_TO_DISCLAIMER: return extend(metamaskState, { - isConfirmed: true, - }) - - case actions.AGREE_TO_ETH_WARNING: - return extend(metamaskState, { - isEthConfirmed: !metamaskState.isEthConfirmed, + isDisclaimerConfirmed: true, }) case actions.UNLOCK_METAMASK: @@ -117,7 +111,6 @@ function reduceMetamask (state, action) { isUnlocked: true, isInitialized: true, selectedAccount: action.value, - selectedAddress: action.value, }) delete newState.seedWords return newState |