Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support

1 files changed, 4 insertions, 2 deletions

diff --git a/ui/app/components/send_/send-footer/send-footer.component.js b/ui/app/components/send_/send-footer/send-footer.component.js
index 6471ae1a3..ff42e58de 100644
--- a/ui/app/components/send_/send-footer/send-footer.component.js
+++ b/ui/app/components/send_/send-footer/send-footer.component.js
@@ -48,6 +48,7 @@ export default class SendFooter extends Component {
       // updateTx,
       update,
       toAccounts,
+      history,
     } = this.props
 
     // Should not be needed because submit should be disabled if there are errors.
@@ -60,7 +61,7 @@ export default class SendFooter extends Component {
     // TODO: add nickname functionality
     addToAddressBookIfNew(to, toAccounts)
 
-    editingTransactionId
+    const promise = editingTransactionId
       ? update({
         amount,
         editingTransactionId,
@@ -73,7 +74,8 @@ export default class SendFooter extends Component {
       })
       : sign({ selectedToken, to, amount, from, gas, gasPrice })
 
-    this.props.history.push(CONFIRM_TRANSACTION_ROUTE)
+    Promise.resolve(promise)
+      .then(() => history.push(CONFIRM_TRANSACTION_ROUTE))
   }
 
   formShouldBeDisabled () {