From 1d80feaae5e0acaab0e5e42385684d16685fdd63 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Mon, 27 Apr 2020 20:57:17 +0200
Subject: [PATCH] Qr fix, scanning display (#2641)

* Qr fix, scanning display

* Don't display or
---
 packages/react-signer/src/Modal.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/react-signer/src/Modal.tsx b/packages/react-signer/src/Modal.tsx
index 3f67a40253..d2734e595b 100644
--- a/packages/react-signer/src/Modal.tsx
+++ b/packages/react-signer/src/Modal.tsx
@@ -215,7 +215,7 @@ class Signer extends React.PureComponent<Props, State> {
               ? this.onCancelSign
               : this.onCancel
         }
-        withOr={!signedTx}
+        withOr={!signedTx && !isQrVisible}
       >
         {!isRenderError && (!isQrVisible || !isQrScanning) && !signedTx && (
           <>
@@ -753,8 +753,6 @@ class Signer extends React.PureComponent<Props, State> {
       txStartCb();
     }
 
-    queueSetTxStatus(id, 'sending');
-
     try {
       const unsubscribe = await extrinsicCall.apply(extrinsic, [
         ...params,
@@ -790,6 +788,8 @@ class Signer extends React.PureComponent<Props, State> {
           }
         }
       ]);
+
+      queueSetTxStatus(id, 'sending');
     } catch (error) {
       console.error('makeExtrinsicCall: error:', error);
       queueSetTxStatus(id, 'error', {}, error);