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 { ? this.onCancelSign : this.onCancel } - withOr={!signedTx} + withOr={!signedTx && !isQrVisible} > {!isRenderError && (!isQrVisible || !isQrScanning) && !signedTx && ( <> @@ -753,8 +753,6 @@ class Signer extends React.PureComponent { txStartCb(); } - queueSetTxStatus(id, 'sending'); - try { const unsubscribe = await extrinsicCall.apply(extrinsic, [ ...params, @@ -790,6 +788,8 @@ class Signer extends React.PureComponent { } } ]); + + queueSetTxStatus(id, 'sending'); } catch (error) { console.error('makeExtrinsicCall: error:', error); queueSetTxStatus(id, 'error', {}, error);