mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2024-11-20 02:09:10 +01:00
Merge remote-tracking branch 'origin/master' into filepicker
This commit is contained in:
commit
61ac905f5a
@ -138,7 +138,10 @@ export default class SendDetails extends Component {
|
|||||||
} else {
|
} else {
|
||||||
let recipients = this.state.addresses;
|
let recipients = this.state.addresses;
|
||||||
const dataWithoutSchema = data.replace('bitcoin:', '');
|
const dataWithoutSchema = data.replace('bitcoin:', '');
|
||||||
if (btcAddressRx.test(dataWithoutSchema) || (dataWithoutSchema.indexOf('bc1') === 0 && dataWithoutSchema.indexOf('?') === -1)) {
|
if (
|
||||||
|
btcAddressRx.test(dataWithoutSchema) ||
|
||||||
|
((dataWithoutSchema.indexOf('bc1') === 0 || dataWithoutSchema.indexOf('BC1') === 0) && dataWithoutSchema.indexOf('?') === -1)
|
||||||
|
) {
|
||||||
recipients[[this.state.recipientsScrollIndex]].address = dataWithoutSchema;
|
recipients[[this.state.recipientsScrollIndex]].address = dataWithoutSchema;
|
||||||
this.setState({
|
this.setState({
|
||||||
address: recipients,
|
address: recipients,
|
||||||
@ -164,7 +167,7 @@ export default class SendDetails extends Component {
|
|||||||
this.setState({ isLoading: false });
|
this.setState({ isLoading: false });
|
||||||
}
|
}
|
||||||
console.log(options);
|
console.log(options);
|
||||||
if (btcAddressRx.test(address) || address.indexOf('bc1') === 0) {
|
if (btcAddressRx.test(address) || address.indexOf('bc1') === 0 || address.indexOf('BC1') === 0) {
|
||||||
recipients[[this.state.recipientsScrollIndex]].address = address;
|
recipients[[this.state.recipientsScrollIndex]].address = address;
|
||||||
recipients[[this.state.recipientsScrollIndex]].amount = options.amount;
|
recipients[[this.state.recipientsScrollIndex]].amount = options.amount;
|
||||||
this.setState({
|
this.setState({
|
||||||
|
Loading…
Reference in New Issue
Block a user