mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2024-11-19 18:00:17 +01:00
FIX: Pause capture on import QR
This commit is contained in:
parent
e61cdb540a
commit
4740742f9a
@ -21,18 +21,10 @@ export default class ScanQrWif extends React.Component {
|
||||
header: null,
|
||||
};
|
||||
|
||||
state = {
|
||||
isLoading: false,
|
||||
};
|
||||
state = { isLoading: false };
|
||||
|
||||
onBarCodeScanned = async ret => {
|
||||
if (+new Date() - this.lastTimeIveBeenHere < 6000) {
|
||||
this.lastTimeIveBeenHere = +new Date();
|
||||
return;
|
||||
}
|
||||
this.lastTimeIveBeenHere = +new Date();
|
||||
this.setState({ isLoading: true });
|
||||
|
||||
if (RNCamera.Constants.CameraStatus === RNCamera.Constants.CameraStatus.READY) this.cameraRef.pausePreview();
|
||||
if (ret.data[0] === '6') {
|
||||
// password-encrypted, need to ask for password and decrypt
|
||||
console.log('trying to decrypt...');
|
||||
@ -55,6 +47,7 @@ export default class ScanQrWif extends React.Component {
|
||||
ret.data = wif.encode(0x80, decryptedKey.privateKey, decryptedKey.compressed);
|
||||
} catch (e) {
|
||||
console.log(e.message);
|
||||
if (RNCamera.Constants.CameraStatus === RNCamera.Constants.CameraStatus.READY) this.cameraRef.resumePreview();
|
||||
this.setState({ message: false, isLoading: false });
|
||||
return alert(loc.wallets.scanQrWif.bad_password);
|
||||
}
|
||||
@ -66,6 +59,7 @@ export default class ScanQrWif extends React.Component {
|
||||
if (w.getSecret() === ret.data) {
|
||||
// lookig for duplicates
|
||||
this.setState({ isLoading: false });
|
||||
if (RNCamera.Constants.CameraStatus === RNCamera.Constants.CameraStatus.READY) this.cameraRef.resumePreview();
|
||||
return alert(loc.wallets.scanQrWif.wallet_already_exists); // duplicate, not adding
|
||||
}
|
||||
}
|
||||
@ -78,6 +72,7 @@ export default class ScanQrWif extends React.Component {
|
||||
if (w.getSecret() === hd.getSecret()) {
|
||||
// lookig for duplicates
|
||||
this.setState({ isLoading: false });
|
||||
if (RNCamera.Constants.CameraStatus === RNCamera.Constants.CameraStatus.READY) this.cameraRef.resumePreview();
|
||||
return alert(loc.wallets.scanQrWif.wallet_already_exists); // duplicate, not adding
|
||||
}
|
||||
}
|
||||
@ -105,6 +100,7 @@ export default class ScanQrWif extends React.Component {
|
||||
if (w.getSecret() === hd.getSecret()) {
|
||||
// lookig for duplicates
|
||||
this.setState({ isLoading: false });
|
||||
if (RNCamera.Constants.CameraStatus === RNCamera.Constants.CameraStatus.READY) this.cameraRef.resumePreview();
|
||||
return alert(loc.wallets.scanQrWif.wallet_already_exists); // duplicate, not adding
|
||||
}
|
||||
}
|
||||
@ -131,6 +127,7 @@ export default class ScanQrWif extends React.Component {
|
||||
if (w.getSecret() === hd.getSecret()) {
|
||||
// lookig for duplicates
|
||||
this.setState({ isLoading: false });
|
||||
if (RNCamera.Constants.CameraStatus === RNCamera.Constants.CameraStatus.READY) this.cameraRef.resumePreview();
|
||||
return alert(loc.wallets.scanQrWif.wallet_already_exists); // duplicate, not adding
|
||||
}
|
||||
}
|
||||
@ -169,6 +166,7 @@ export default class ScanQrWif extends React.Component {
|
||||
} catch (Err) {
|
||||
console.log(Err);
|
||||
this.setState({ isLoading: false });
|
||||
if (RNCamera.Constants.CameraStatus === RNCamera.Constants.CameraStatus.READY) this.cameraRef.resumePreview();
|
||||
alert(Err.message);
|
||||
return;
|
||||
}
|
||||
@ -218,6 +216,7 @@ export default class ScanQrWif extends React.Component {
|
||||
|
||||
if (newWallet.getAddress() === false && newLegacyWallet.getAddress() === false) {
|
||||
alert(loc.wallets.scanQrWif.bad_wif);
|
||||
if (RNCamera.Constants.CameraStatus === RNCamera.Constants.CameraStatus.READY) this.cameraRef.resumePreview();
|
||||
this.setState({ isLoading: false });
|
||||
return;
|
||||
}
|
||||
@ -303,6 +302,7 @@ export default class ScanQrWif extends React.Component {
|
||||
}}
|
||||
style={{ flex: 1, justifyContent: 'space-between' }}
|
||||
onBarCodeRead={this.onBarCodeScanned}
|
||||
ref={ref => (this.cameraRef = ref)}
|
||||
barCodeTypes={[RNCamera.Constants.BarCodeType.qr]}
|
||||
/>
|
||||
<TouchableOpacity
|
||||
|
Loading…
Reference in New Issue
Block a user