Merge pull request #545 from meriadec/master

Various fixes

src/components/modals/Send/index.js

@@ -278,13 +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={() => {
-              this.handleReset()
-              onClose()
-            }}
-          >
+          <ModalBody onClose={onClose}>
             <PollCounterValuesOnMount />
             <SyncSkipUnderPriority priority={80} />
             {account && <SyncOneAccountOnMount priority={81} accountId={account.id} />}