Qr fix, scanning display (#2641)

* Qr fix, scanning display

* Don't display or
This commit is contained in:
Jaco Greeff 2020-04-27 20:57:17 +02:00 committed by GitHub
parent ad0cf6b305
commit 1d80feaae5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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);