aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-09-09 04:13:43 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-09-09 04:13:43 +0800
commit7d8491de106c798727f5f57b08453f2133d144e7 (patch)
tree9aea8efc59e5223f3bc8e30368db7d36d60f1cf1
parent69580480bc7f73c367a741b3ca69d0ccaffd6b33 (diff)
downloadtangerine-wallet-browser-7d8491de106c798727f5f57b08453f2133d144e7.tar.gz
tangerine-wallet-browser-7d8491de106c798727f5f57b08453f2133d144e7.tar.zst
tangerine-wallet-browser-7d8491de106c798727f5f57b08453f2133d144e7.zip
Add to CHANGELOG.md and Remove unnecessary catch
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/reducers/app.js9
2 files changed, 1 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c20aa11d3..4e44f603d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## Current Master
+- Add network checks for unconfirmed transactions.
- Add fiat conversion values to more views.
- On fresh install, open a new tab with the MetaMask Introduction video.
- Block negative values from transactions.
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 29d5d9378..9243e53e0 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -16,15 +16,6 @@ function reduceApp (state, action) {
}
if (pendingTxs) {
name = 'confTx'
- } else {
- try {
- if (state.appState.currentView.name === 'confTx') {
- name = 'accountDetail'
- }
- } catch (e) {
- null
- }
-
}
var defaultView = {