aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/app/conf-tx.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 913563d12..9a323e6c2 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -44,6 +44,7 @@ function mapStateToProps (state) {
computedBalances: state.metamask.computedBalances,
unapprovedMsgCount,
unapprovedPersonalMsgCount,
+ send: state.metamask.send,
}
}
@@ -53,15 +54,18 @@ function ConfirmTxScreen () {
}
ConfirmTxScreen.prototype.componentWillMount = function () {
- const { unapprovedTxs = {} } = this.props
- if (Object.keys(unapprovedTxs).length === 0) {
+ const { unapprovedTxs = {}, send } = this.props
+ const { to } = send
+ if (Object.keys(unapprovedTxs).length === 0 && !to) {
this.props.history.push(DEFAULT_ROUTE)
}
}
ConfirmTxScreen.prototype.componentWillReceiveProps = function (nextProps) {
+ const { send } = this.props
+ const { to } = send
const { unapprovedTxs = {} } = nextProps
- if (Object.keys(unapprovedTxs).length === 0) {
+ if (Object.keys(unapprovedTxs).length === 0 && !to) {
this.props.history.push(DEFAULT_ROUTE)
}
}