Clear send state on cancelling and signing.

1 files changed, 8 insertions, 2 deletions

diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js
index 5e64daceb..a9473541c 100644
--- a/ui/app/send-v2.js
+++ b/ui/app/send-v2.js
@@ -382,11 +382,14 @@ SendTransactionScreen.prototype.renderForm = function () {
 }
 
 SendTransactionScreen.prototype.renderFooter = function () {
-  const { goHome } = this.props
+  const { goHome, clearSend } = this.props
 
   return h('div.send-v2__footer', [
     h('button.send-v2__cancel-btn', {
-      onClick: goHome,
+      onClick: () => {
+        clearSend()
+        goHome()
+      },
     }, 'Cancel'),
     h('button.send-v2__next-btn', {
       onClick: event => this.onSubmit(event),
@@ -429,6 +432,7 @@ SendTransactionScreen.prototype.onSubmit = function (event) {
     signTx,
     selectedToken,
     toAccounts,
+    clearSend,
   } = this.props
 
   this.addToAddressBookIfNew(to)
@@ -445,6 +449,8 @@ SendTransactionScreen.prototype.onSubmit = function (event) {
     txParams.to = to
   }
 
+  clearSend()
+
   selectedToken
     ? signTokenTx(selectedToken.address, to, amount, txParams)
     : signTx(txParams)