diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-04-17 07:32:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 07:32:56 +0800 |
| commit | 06689765146c3ca88fc206d93387b05e1db3b81c (patch) | |
| tree | c3c3b50de25ba7aafe6c58a426f0ba6212d63b71 /ui/app/reducers | |
| parent | 6e1fcefdf1bec334b9cd7a38e6a2f2bb6a007f6e (diff) | |
| parent | 6a7fd3c774f50954050d651f7e6b8ff325ce2940 (diff) | |
| download | tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.gz tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.bz2 tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.lz tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.xz tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.tar.zst tangerine-wallet-browser-06689765146c3ca88fc206d93387b05e1db3b81c.zip | |
Merge branch 'master' into i3981-contract-rates
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 1 | ||||
| -rw-r--r-- | ui/app/reducers/metamask.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 74a0f9299..2b39eb8db 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -1,6 +1,7 @@ const extend = require('xtend') const actions = require('../actions') const txHelper = require('../../lib/tx-helper') +const log = require('loglevel') module.exports = reduceApp diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 1ed049be2..e65dc2d11 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -350,7 +350,7 @@ function reduceMetamask (state, action) { welcomeScreenSeen: true, }) - case action.SET_CURRENT_LOCALE: + case actions.SET_CURRENT_LOCALE: return extend(metamaskState, { currentLocale: action.value, }) |