diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-11-03 06:20:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 06:20:29 +0800 |
| commit | 9f70762434deb1c973665a76623838289e655f22 (patch) | |
| tree | 738fccaff1c153c72aea0d0699ddfec0b4c097c7 /ui/app/reducers | |
| parent | dc0b3255cf908320b5b46f02765ea03b5b4db6b7 (diff) | |
| parent | acc973d543ac65f8db980c0007c248c509345411 (diff) | |
| download | tangerine-wallet-browser-9f70762434deb1c973665a76623838289e655f22.tar tangerine-wallet-browser-9f70762434deb1c973665a76623838289e655f22.tar.gz tangerine-wallet-browser-9f70762434deb1c973665a76623838289e655f22.tar.bz2 tangerine-wallet-browser-9f70762434deb1c973665a76623838289e655f22.tar.lz tangerine-wallet-browser-9f70762434deb1c973665a76623838289e655f22.tar.xz tangerine-wallet-browser-9f70762434deb1c973665a76623838289e655f22.tar.zst tangerine-wallet-browser-9f70762434deb1c973665a76623838289e655f22.zip | |
Merge pull request #2530 from MetaMask/uat
Merge uat into NewUI-flat
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 4 | ||||
| -rw-r--r-- | ui/app/reducers/metamask.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 6fb7f8cca..d84f264c9 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -44,7 +44,7 @@ function reduceApp (state, action) { }, previousModalState: { name: null, - } + }, }, sidebarOpen: false, networkDropdownOpen: false, @@ -100,7 +100,7 @@ function reduceApp (state, action) { state.appState.modal, { open: false }, { modalState: { name: null } }, - { previousModalState: appState.modal.modalState}, + { previousModalState: appState.modal.modalState}, ), }) diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 7408f827a..50c9712ff 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -235,7 +235,7 @@ function reduceMetamask (state, action) { errors: { ...metamaskState.send.errors, ...action.value, - } + }, }, }) |