diff options
author | Akihiro <an0326ja@gmail.com> | 2018-07-21 09:47:14 +0800 |
---|---|---|
committer | Akihiro <an0326ja@gmail.com> | 2018-07-21 09:47:14 +0800 |
commit | 8c77e998e0491dfb48c91d2938644c9f855a2532 (patch) | |
tree | f3e54e635c92d54111ac2ddfc3e780ccdcdaf968 /ui/app/reducers | |
parent | 9dd637569d5c820d07ff15a8039f5ce5590f41dd (diff) | |
parent | e094d4ad1fb84a9bc663c328d0650bd9d8bf8716 (diff) | |
download | tangerine-wallet-browser-8c77e998e0491dfb48c91d2938644c9f855a2532.tar.gz tangerine-wallet-browser-8c77e998e0491dfb48c91d2938644c9f855a2532.tar.zst tangerine-wallet-browser-8c77e998e0491dfb48c91d2938644c9f855a2532.zip |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'ui/app/reducers')
-rw-r--r-- | ui/app/reducers/app.js | 15 | ||||
-rw-r--r-- | ui/app/reducers/metamask.js | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index f453812b9..50d8bcba7 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -49,6 +49,8 @@ function reduceApp (state, action) { }, }, sidebarOpen: false, + alertOpen: false, + alertMessage: null, networkDropdownOpen: false, currentView: seedWords ? seedConfView : defaultView, accountDetail: { @@ -88,6 +90,19 @@ function reduceApp (state, action) { sidebarOpen: false, }) + // sidebar methods + case actions.ALERT_OPEN: + return extend(appState, { + alertOpen: true, + alertMessage: action.value, + }) + + case actions.ALERT_CLOSE: + return extend(appState, { + alertOpen: false, + alertMessage: null, + }) + // modal methods: case actions.MODAL_OPEN: const { name, ...modalProps } = action.payload diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 6c8ac9ed7..3f1d3394f 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -222,6 +222,14 @@ function reduceMetamask (state, action) { }, }) + case actions.UPDATE_SEND_HEX_DATA: + return extend(metamaskState, { + send: { + ...metamaskState.send, + data: action.value, + }, + }) + case actions.UPDATE_SEND_FROM: return extend(metamaskState, { send: { |