From 98a48be58b34cb6f5d150d88fa5ede1310ae92f7 Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Wed, 13 Jun 2018 19:36:46 +0200
Subject: [PATCH 1/2] Fix Send modal forbid close while signing transaction

---
 src/components/modals/Send/index.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/modals/Send/index.js b/src/components/modals/Send/index.js
index a764bc92..fb33b45e 100644
--- a/src/components/modals/Send/index.js
+++ b/src/components/modals/Send/index.js
@@ -280,10 +280,14 @@ class SendModal extends Component<Props, State<*>> {
         preventBackdropClick={!canClose}
         render={({ onClose }) => (
           <ModalBody
-            onClose={() => {
-              this.handleReset()
-              onClose()
-            }}
+            onClose={
+              canClose
+                ? () => {
+                    this.handleReset()
+                    onClose()
+                  }
+                : undefined
+            }
           >
             <PollCounterValuesOnMount />
             <SyncSkipUnderPriority priority={80} />

From be9205caed5f2f20789d21beaf600026ed98fb0b Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Wed, 13 Jun 2018 19:42:53 +0200
Subject: [PATCH 2/2] Correct onClose handling on Send modal

---
 src/components/modals/Send/index.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/components/modals/Send/index.js b/src/components/modals/Send/index.js
index fb33b45e..1540bb90 100644
--- a/src/components/modals/Send/index.js
+++ b/src/components/modals/Send/index.js
@@ -278,17 +278,9 @@ class SendModal extends Component<Props, State<*>> {
         name={MODAL_SEND}
         onBeforeOpen={this.handleBeforeOpenModal}
         preventBackdropClick={!canClose}
+        onClose={canClose ? this.handleReset : undefined}
         render={({ onClose }) => (
-          <ModalBody
-            onClose={
-              canClose
-                ? () => {
-                    this.handleReset()
-                    onClose()
-                  }
-                : undefined
-            }
-          >
+          <ModalBody onClose={onClose}>
             <PollCounterValuesOnMount />
             <SyncSkipUnderPriority priority={80} />
             {account && <SyncOneAccountOnMount priority={81} accountId={account.id} />}