lukechilds
/
BlueWallet
mirror of https://github.com/lukechilds/BlueWallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

REF: qr scan improved

localNotifications
Overtorment 6 years ago
parent
c7515c74dd
commit
0734f68a55
3 changed files with 7 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      screen/lnd/scanLndInvoice.js
  2. 26
      screen/send/scanQrAddress.js
  3. 27
      screen/wallets/scanQrWif.js

25
screen/lnd/scanLndInvoice.js
View File

@ -28,8 +28,6 @@ export default class ScanLndInvoice extends React.Component {
state = {
isLoading: false,
hasCameraPermission: null,
type: BarCodeScanner.Constants.Type.back,
barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
};
constructor(props) {
@ -94,13 +92,7 @@ export default class ScanLndInvoice extends React.Component {
async componentWillMount() {
const { status } = await Permissions.askAsync(Permissions.CAMERA);
this.setState({
hasCameraPermission: status === 'granted',
onCameraReady: function() {
alert('onCameraReady');
},
barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
});
this.setState({ hasCameraPermission: status === 'granted' });
}
async pay() {
@ -204,12 +196,7 @@ export default class ScanLndInvoice extends React.Component {
} else {
return (
<View style={{ flex: 1 }}>
<BarCodeScanner
style={{ flex: 1 }}
barCodeTypes={this.state.barCodeTypes}
type={this.state.type}
onBarCodeScanned={ret => this.onBarCodeScanned(ret)}
>
<BarCodeScanner style={{ flex: 1 }} onBarCodeScanned={ret => this.onBarCodeScanned(ret)}>
<View
style={{
flex: 1,
@ -223,14 +210,6 @@ export default class ScanLndInvoice extends React.Component {
alignSelf: 'flex-end',
alignItems: 'center',
}}
onPress={() => {
this.setState({
type:
this.state.type === BarCodeScanner.Constants.Type.back
? BarCodeScanner.Constants.Type.front
: BarCodeScanner.Constants.Type.back,
});
}}
>
<Button style={{ fontSize: 18, marginBottom: 10 }} title="Go back" onPress={() => this.props.navigation.goBack()} />
</TouchableOpacity>

26
screen/send/scanQrAddress.js
View File

@ -1,4 +1,3 @@
/* global alert */
import React from 'react';
import { Text, ActivityIndicator, Button, View, TouchableOpacity } from 'react-native';
import { Permissions, BarCodeScanner } from 'expo';
@ -13,8 +12,6 @@ export default class CameraExample extends React.Component {
state = {
isLoading: false,
hasCameraPermission: null,
type: BarCodeScanner.Constants.Type.back,
barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
};
async onBarCodeScanned(ret) {
@ -30,13 +27,7 @@ export default class CameraExample extends React.Component {
async componentWillMount() {
const { status } = await Permissions.askAsync(Permissions.CAMERA);
this.setState({
hasCameraPermission: status === 'granted',
onCameraReady: function() {
alert('onCameraReady');
},
barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
});
this.setState({ hasCameraPermission: status === 'granted' });
}
render() {
@ -56,12 +47,7 @@ export default class CameraExample extends React.Component {
} else {
return (
<View style={{ flex: 1 }}>
<BarCodeScanner
style={{ flex: 1 }}
barCodeTypes={this.state.barCodeTypes}
type={this.state.type}
onBarCodeScanned={ret => this.onBarCodeScanned(ret)}
>
<BarCodeScanner style={{ flex: 1 }} onBarCodeScanned={ret => this.onBarCodeScanned(ret)}>
<View
style={{
flex: 1,
@ -75,14 +61,6 @@ export default class CameraExample extends React.Component {
alignSelf: 'flex-end',
alignItems: 'center',
}}
onPress={() => {
this.setState({
type:
this.state.type === BarCodeScanner.Constants.Type.back
? BarCodeScanner.Constants.Type.front
: BarCodeScanner.Constants.Type.back,
});
}}
>
<Button style={{ fontSize: 18, marginBottom: 10 }} title="Go back" onPress={() => this.props.navigation.goBack()} />
</TouchableOpacity>

27
screen/wallets/scanQrWif.js
View File

@ -21,8 +21,6 @@ export default class ScanQrWif extends React.Component {
state = {
isLoading: false,
hasCameraPermission: null,
type: BarCodeScanner.Constants.Type.back,
barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
};
async onBarCodeScanned(ret) {
@ -77,10 +75,10 @@ export default class ScanQrWif extends React.Component {
watchOnly.setLabel(loc.wallets.scanQrWif.imported_watchonly);
BlueApp.wallets.push(watchOnly);
alert(loc.wallets.scanQrWif.imported_watchonly + loc.wallets.scanQrWif.with_address + watchOnly.getAddress());
this.props.navigation.popToTop();
await watchOnly.fetchBalance();
await watchOnly.fetchTransactions();
await BlueApp.saveToDisk();
this.props.navigation.popToTop();
setTimeout(() => EV(EV.enum.WALLETS_COUNT_CHANGED), 500);
return;
}
@ -119,13 +117,7 @@ export default class ScanQrWif extends React.Component {
async componentWillMount() {
const { status } = await Permissions.askAsync(Permissions.CAMERA);
this.setState({
hasCameraPermission: status === 'granted',
onCameraReady: function() {
alert('onCameraReady');
},
barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
});
this.setState({ hasCameraPermission: status === 'granted' });
}
render() {
@ -171,12 +163,7 @@ export default class ScanQrWif extends React.Component {
);
} else {
return (
<BarCodeScanner
style={{ flex: 1 }}
barCodeTypes={this.state.barCodeTypes}
type={this.state.type}
onBarCodeScanned={ret => this.onBarCodeScanned(ret)}
>
<BarCodeScanner style={{ flex: 1 }} onBarCodeScanned={ret => this.onBarCodeScanned(ret)}>
<View
style={{
flex: 1,
@ -190,14 +177,6 @@ export default class ScanQrWif extends React.Component {
alignSelf: 'flex-end',
alignItems: 'center',
}}
onPress={() => {
this.setState({
type:
this.state.type === BarCodeScanner.Constants.Type.back
? BarCodeScanner.Constants.Type.front
: BarCodeScanner.Constants.Type.back,
});
}}
>
<Button
style={{ fontSize: 18, marginBottom: 10 }}

Write Preview
Loading…
Cancel
Save