mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-01-19 05:45:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into issue-573

Browse Source
This commit is contained in:
Marcos Rodriguez Vélez 2019-09-17 11:46:00 -04:00 committed by GitHub
commit c86bd12eb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 705 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
App.js
View File

@ -51,11 +51,7 @@ export default class App extends React.Component {
const isAddressFromStoredWallet = BlueApp.getWallets().some(wallet =>
wallet.chain === Chain.ONCHAIN ? wallet.weOwnAddress(clipboard) : wallet.isInvoiceGeneratedByWallet(clipboard),
);
if (
this.state.clipboardContent !== clipboard &&
!isAddressFromStoredWallet &&
(this.isBitcoinAddress(clipboard) || this.isLightningInvoice(clipboard))
) {
if (this.state.clipboardContent !== clipboard && (this.isBitcoinAddress(clipboard) || this.isLightningInvoice(clipboard) || this.isLnUrl(clipboard))) {
this.setState({ isClipboardContentModalVisible: true });
}
this.setState({ clipboardContent: clipboard });
@ -96,13 +92,20 @@ export default class App extends React.Component {
isLightningInvoice(invoice) {
let isValidLightningInvoice = false;
if (invoice.indexOf('lightning:lnb') === 0 || invoice.indexOf('LIGHTNING:lnb') === 0 || invoice.toLowerCase().startsWith('lnb')) {
if (invoice.toLowerCase().startsWith('lightning:lnb') || invoice.toLowerCase().startsWith('lnb')) {
this.setState({ clipboardContentModalAddressType: lightningModalString });
isValidLightningInvoice = true;
}
return isValidLightningInvoice;
}
isLnUrl(text) {
if (text.toLowerCase().startsWith('lightning:lnurl') || text.toLowerCase().startsWith('lnurl')) {
return true;
}
return false;
}
isSafelloRedirect(event) {
let urlObject = url.parse(event.url, true) // eslint-disable-line
@ -136,6 +139,16 @@ export default class App extends React.Component {
},
}),
);
} else if (this.isLnUrl(event.url)) {
this.navigator &&
this.navigator.dispatch(
NavigationActions.navigate({
routeName: 'LNDCreateInvoice',
params: {
uri: event.url,
},
}),
);
} else if (this.isSafelloRedirect(event)) {
let urlObject = url.parse(event.url, true) // eslint-disable-line

36
BlueComponents.js
View File

@ -382,6 +382,36 @@ export const BlueNavigationStyle = (navigation, withNavigationCloseButton = fals
headerBackTitle: null,
});
export const BlueCreateTxNavigationStyle = (navigation, withAdvancedOptionsMenuButton = false, advancedOptionsMenuButtonAction) => ({
headerStyle: {
backgroundColor: BlueApp.settings.brandingColor,
borderBottomWidth: 0,
elevation: 0,
},
headerTitleStyle: {
fontWeight: '600',
color: BlueApp.settings.foregroundColor,
},
headerTintColor: BlueApp.settings.foregroundColor,
headerLeft: (
<TouchableOpacity
style={{ minWwidth: 40, height: 40, padding: 14 }}
onPress={() => {
Keyboard.dismiss();
navigation.goBack(null);
}}
>
<Image style={{ alignSelf: 'center' }} source={require('./img/close.png')} />
</TouchableOpacity>
),
headerRight: withAdvancedOptionsMenuButton ? (
<TouchableOpacity style={{ minWidth: 40, height: 40, padding: 14 }} onPress={advancedOptionsMenuButtonAction}>
<Icon size={22} name="kebab-horizontal" type="octicon" color={BlueApp.settings.foregroundColor} />
</TouchableOpacity>
) : null,
headerBackTitle: null,
});
export const BluePrivateBalance = () => {
return Platform.select({
ios: (
@ -815,7 +845,7 @@ export class BlueUseAllFundsButton extends Component {
<BlueButtonLink
style={{ paddingRight: 8, paddingLeft: 0, paddingTop: 12, paddingBottom: 12 }}
title="Done"
onPress={Keyboard.dismiss}
onPress={() => Keyboard.dismiss()}
/>
</View>
</View>
@ -1942,7 +1972,7 @@ export class BlueAddressInput extends Component {
value={this.props.address}
style={{ flex: 1, marginHorizontal: 8, minHeight: 33 }}
editable={!this.props.isLoading}
onSubmitEditing={Keyboard.dismiss}
onSubmitEditing={() => Keyboard.dismiss()}
{...this.props}
/>
<TouchableOpacity
@ -2008,7 +2038,7 @@ export class BlueReplaceFeeSuggestions extends Component {
async componentDidMount() {
const networkFees = await NetworkTransactionFees.recommendedFees();
this.setState({ networkFees });
this.setState({ networkFees }, () => this.onFeeSelected(NetworkTransactionFeeType.FAST));
}
onFeeSelected = selectedFeeType => {

1
android/app/src/main/AndroidManifest.xml
View File

@ -11,6 +11,7 @@
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:usesCleartextTraffic="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"

2
currency.js
View File

@ -111,7 +111,7 @@ function BTCToLocalCurrency(bitcoin) {
function satoshiToBTC(satoshi) {
let b = new BigNumber(satoshi);
b = b.dividedBy(100000000);
return b.toString(10) + ' BTC';
return b.toString(10);
}
module.exports.updateExchangeRate = updateExchangeRate;

2
ios/BlueWallet/Info.plist
View File

@ -43,6 +43,8 @@
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>

2
ios/Podfile
View File

@ -72,7 +72,7 @@ target 'BlueWalletWatch Extension' do
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
# use_frameworks!
platform :watchos, '5.1'
pod 'EFQRCode', '~> 5.0.0'
pod 'EFQRCode', '5.0.0'
# Pods for BlueWalletWatch Extension
end

4
ios/Podfile.lock
View File

@ -162,7 +162,7 @@ DEPENDENCIES:
- appcenter-crashes (from `../node_modules/appcenter-crashes`)
- BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- EFQRCode (~> 5.0.0)
- EFQRCode (= 5.0.0)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- RCTSystemSetting (from `../node_modules/react-native-system-setting`)
@ -362,6 +362,6 @@ SPEC CHECKSUMS:
ToolTipMenu: c158702a26154d892bc9e6eaa7d7382f0f1ee16e
yoga: 312528f5bbbba37b4dcea5ef00e8b4033fdd9411
PODFILE CHECKSUM: 0367389d52d7644ba1974734bda6b2a9b29d2311
PODFILE CHECKSUM: 1a39cb1ff2ae237255b84fcbe9415cb089e659c7
COCOAPODS: 1.7.5

6
models/bitcoinTransactionInfo.js Normal file
View File

@ -0,0 +1,6 @@
export class BitcoinTransaction {
constructor(address = '', amount) {
this.address = address;
this.amount = amount;
}
}

1
models/signer.js
View File

@ -31,7 +31,6 @@ exports.createHDTransaction = function(utxos, toAddress, amount, fixedFee, chang
}
outputNum++;
}
if (unspentAmountSatoshi < amountToOutputSatoshi + feeInSatoshis) {
throw new Error('Not enough balance. Please, try sending a smaller amount.');
}

27
screen/lnd/lndCreateInvoice.js
View File

@ -12,6 +12,7 @@ import {
Text,
} from 'react-native';
import { BlueNavigationStyle, BlueButton, BlueBitcoinAmount, BlueDismissKeyboardInputAccessory } from '../../BlueComponents';
import { LightningCustodianWallet } from '../../class/lightning-custodian-wallet';
import PropTypes from 'prop-types';
import bech32 from 'bech32';
import { BitcoinUnit } from '../../models/bitcoinUnits';
@ -30,9 +31,19 @@ export default class LNDCreateInvoice extends Component {
constructor(props) {
super(props);
// fallback to first wallet if it exists
const fromWallet = props.navigation.getParam('fromWallet');
let fromWallet;
if (props.navigation.state.params.fromWallet) fromWallet = props.navigation.getParam('fromWallet');
// fallback to first wallet if it exists
if (!fromWallet) {
const lightningWallets = BlueApp.getWallets().filter(item => item.type === LightningCustodianWallet.type);
if (lightningWallets.length > 0) {
fromWallet = lightningWallets[0];
console.warn('warning: using ln wallet index 0');
}
}
this.state = {
fromWallet,
amount: '',
@ -43,6 +54,12 @@ export default class LNDCreateInvoice extends Component {
};
}
componentDidMount () {
if (this.props.navigation.state.params.uri) {
this.processLnurl(this.props.navigation.getParam('uri'));
}
}
async createInvoice() {
this.setState({ isLoading: true }, async () => {
try {
@ -245,5 +262,11 @@ LNDCreateInvoice.propTypes = {
goBack: PropTypes.func,
navigate: PropTypes.func,
getParam: PropTypes.func,
state: PropTypes.shape({
params: PropTypes.shape({
uri: PropTypes.string,
fromWallet: PropTypes.string,
}),
}),
}),
};

181
screen/send/confirm.js
View File

@ -1,8 +1,8 @@
/* global alert */
import React, { Component } from 'react';
import { ActivityIndicator, TouchableOpacity, StyleSheet, View } from 'react-native';
import { ActivityIndicator, FlatList, TouchableOpacity, StyleSheet, View } from 'react-native';
import { Text } from 'react-native-elements';
import { BlueButton, SafeBlueArea, BlueCard, BlueSpacing40, BlueNavigationStyle } from '../../BlueComponents';
import { BlueButton, BlueText, SafeBlueArea, BlueCard, BlueSpacing40, BlueNavigationStyle } from '../../BlueComponents';
import { BitcoinUnit } from '../../models/bitcoinUnits';
import PropTypes from 'prop-types';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
@ -11,6 +11,8 @@ let EV = require('../../events');
let currency = require('../../currency');
let BlueElectrum = require('../../BlueElectrum');
let Bignumber = require('bignumber.js');
/** @type {AppStorage} */
const BlueApp = require('../../BlueApp');
export default class Confirm extends Component {
static navigationOptions = () => ({
@ -23,11 +25,10 @@ export default class Confirm extends Component {
this.state = {
isLoading: false,
amount: props.navigation.getParam('amount'),
fee: props.navigation.getParam('fee'),
feeSatoshi: new Bignumber(props.navigation.getParam('fee')).multipliedBy(100000000).toNumber(),
address: props.navigation.getParam('address'),
memo: props.navigation.getParam('memo'),
recipients: props.navigation.getParam('recipients'),
size: Math.round(props.navigation.getParam('tx').length / 2),
tx: props.navigation.getParam('tx'),
satoshiPerByte: props.navigation.getParam('satoshiPerByte'),
@ -37,7 +38,7 @@ export default class Confirm extends Component {
async componentDidMount() {
console.log('send/confirm - componentDidMount');
console.log('address = ', this.state.address);
console.log('address = ', this.state.recipients);
}
broadcast() {
@ -54,12 +55,23 @@ export default class Confirm extends Component {
} else {
console.log('broadcast result = ', result);
EV(EV.enum.REMOTE_TRANSACTIONS_COUNT_CHANGED); // someone should fetch txs
let amount = 0;
const recipients = this.state.recipients;
if (recipients[0].amount === BitcoinUnit.MAX) {
amount = this.state.fromWallet.getBalance() - this.state.feeSatoshi;
} else {
for (const recipient of recipients) {
amount += recipient.value;
}
}
amount = loc.formatBalanceWithoutSuffix(amount, BitcoinUnit.BTC, false);
this.props.navigation.navigate('Success', {
fee: Number(this.state.fee),
amount: this.state.amount,
address: this.state.address,
amount,
dismissModal: () => this.props.navigation.dismiss(),
});
this.setState({ isLoading: false });
}
} catch (error) {
ReactNativeHapticFeedback.trigger('notificationError', { ignoreAndroidSystemSettings: false });
@ -69,70 +81,107 @@ export default class Confirm extends Component {
});
}
_renderItem = ({ index, item }) => {
return (
<>
<View style={{ flexDirection: 'row', justifyContent: 'center' }}>
<Text
style={{
color: '#0f5cc0',
fontSize: 36,
fontWeight: '600',
}}
>
{item.amount === BitcoinUnit.MAX
? currency.satoshiToBTC(this.state.fromWallet.getBalance() - this.state.feeSatoshi)
: currency.satoshiToBTC(item.value)}
</Text>
<Text
style={{
color: '#0f5cc0',
fontSize: 16,
marginHorizontal: 4,
paddingBottom: 6,
fontWeight: '600',
alignSelf: 'flex-end',
}}
>
{' ' + BitcoinUnit.BTC}
</Text>
</View>
<BlueCard>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.to}</Text>
<Text style={styles.transactionDetailsSubtitle}>{item.address}</Text>
</BlueCard>
{this.state.recipients.length > 1 && (
<BlueText style={{ alignSelf: 'flex-end', marginRight: 18, marginVertical: 8 }}>
{index + 1} of {this.state.recipients.length}
</BlueText>
)}
</>
);
};
renderSeparator = () => {
return <View style={{ backgroundColor: BlueApp.settings.inputBorderColor, height: 0.5, margin: 16 }} />;
};
render() {
return (
<SafeBlueArea style={{ flex: 1, paddingTop: 19 }}>
<BlueCard style={{ alignItems: 'center', flex: 1 }}>
<View style={{ marginTop: 16, alignItems: 'center', justifyContent: 'space-between' }}>
<FlatList
scrollEnabled={this.state.recipients.length > 1}
extraData={this.state.recipients}
data={this.state.recipients}
renderItem={this._renderItem}
keyExtractor={(_item, index) => `${index}`}
ItemSeparatorComponent={this.renderSeparator}
style={{ maxHeight: '55%' }}
/>
<View style={{ flexDirection: 'row', justifyContent: 'center', paddingTop: 16, paddingBottom: 16 }}>
<Text
style={{
color: '#0f5cc0',
fontSize: 36,
fontWeight: '600',
}}
>
{this.state.amount}
</Text>
<Text
style={{
color: '#0f5cc0',
fontSize: 16,
marginHorizontal: 4,
paddingBottom: 6,
fontWeight: '600',
alignSelf: 'flex-end',
}}
>
{' ' + BitcoinUnit.BTC}
</Text>
<BlueCard>
<Text
style={{
color: '#37c0a1',
fontSize: 14,
marginHorizontal: 4,
paddingBottom: 6,
fontWeight: '500',
alignSelf: 'center',
}}
>
{loc.send.create.fee}: {loc.formatBalance(this.state.feeSatoshi, BitcoinUnit.BTC)} (
{currency.satoshiToLocalCurrency(this.state.feeSatoshi)})
</Text>
<BlueSpacing40 />
{this.state.isLoading ? (
<ActivityIndicator />
) : (
<BlueButton onPress={() => this.broadcast()} title={loc.send.confirm.sendNow} />
)}
<TouchableOpacity
style={{ marginVertical: 24 }}
onPress={() =>
this.props.navigation.navigate('CreateTransaction', {
fee: this.state.fee,
recipients: this.state.recipients,
memo: this.state.memo,
tx: this.state.tx,
satoshiPerByte: this.state.satoshiPerByte,
wallet: this.state.fromWallet,
feeSatoshi: this.state.feeSatoshi,
})
}
>
<Text style={{ color: '#0c2550', fontSize: 15, fontWeight: '500', alignSelf: 'center' }}>
{loc.transactions.details.transaction_details}
</Text>
</TouchableOpacity>
</BlueCard>
</View>
<Text
style={{
color: '#37c0a1',
fontSize: 14,
marginHorizontal: 4,
paddingBottom: 6,
fontWeight: '500',
alignSelf: 'center',
}}
>
{loc.send.create.fee}: {loc.formatBalance(this.state.feeSatoshi, BitcoinUnit.BTC)} (
{currency.satoshiToLocalCurrency(this.state.feeSatoshi)})
</Text>
</BlueCard>
<BlueCard>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.to}</Text>
<Text style={styles.transactionDetailsSubtitle}>{this.state.address}</Text>
<BlueSpacing40 />
{this.state.isLoading ? <ActivityIndicator /> : <BlueButton onPress={() => this.broadcast()} title={loc.send.confirm.sendNow} />}
<TouchableOpacity
style={{ marginVertical: 24 }}
onPress={() =>
this.props.navigation.navigate('CreateTransaction', {
amount: this.state.amount,
fee: this.state.fee,
address: this.state.address,
memo: this.state.memo,
tx: this.state.tx,
satoshiPerByte: this.state.satoshiPerByte,
})
}
>
<Text style={{ color: '#0c2550', fontSize: 15, fontWeight: '500', alignSelf: 'center' }}>
{loc.transactions.details.transaction_details}
</Text>
</TouchableOpacity>
</BlueCard>
</View>
</SafeBlueArea>
);
}

84
screen/send/create.js
View File

@ -1,11 +1,25 @@
import React, { Component } from 'react';
import { TextInput, ScrollView, Linking, TouchableOpacity, Clipboard, StyleSheet, TouchableWithoutFeedback, Keyboard } from 'react-native';
import { Text } from 'react-native-elements';
import {
TextInput,
FlatList,
ScrollView,
Linking,
TouchableOpacity,
Clipboard,
StyleSheet,
TouchableWithoutFeedback,
Keyboard,
Text,
View,
} from 'react-native';
import { BlueNavigationStyle, SafeBlueArea, BlueCard, BlueText } from '../../BlueComponents';
import PropTypes from 'prop-types';
import Privacy from '../../Privacy';
let loc = require('../../loc');
import { BitcoinUnit } from '../../models/bitcoinUnits';
/** @type {AppStorage} */
const BlueApp = require('../../BlueApp');
const loc = require('../../loc');
const currency = require('../../currency');
export default class SendCreate extends Component {
static navigationOptions = () => ({
@ -19,26 +33,53 @@ export default class SendCreate extends Component {
this.state = {
isLoading: false,
amount: props.navigation.getParam('amount'),
fee: props.navigation.getParam('fee'),
address: props.navigation.getParam('address'),
memo: props.navigation.getParam('memo'),
recipients: props.navigation.getParam('recipients'),
memo: props.navigation.getParam('memo') || '',
size: Math.round(props.navigation.getParam('tx').length / 2),
tx: props.navigation.getParam('tx'),
satoshiPerByte: props.navigation.getParam('satoshiPerByte'),
wallet: props.navigation.getParam('wallet'),
feeSatoshi: props.navigation.getParam('feeSatoshi'),
};
}
async componentDidMount() {
Privacy.enableBlur();
console.log('send/create - componentDidMount');
console.log('address = ', this.state.address);
}
componentWillUnmount() {
Privacy.disableBlur();
}
_renderItem = ({ index, item }) => {
return (
<>
<View>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.to}</Text>
<Text style={styles.transactionDetailsSubtitle}>{item.address}</Text>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.amount}</Text>
<Text style={styles.transactionDetailsSubtitle}>
{item.amount === BitcoinUnit.MAX
? currency.satoshiToBTC(this.state.wallet.getBalance()) - this.state.fee
: currency.satoshiToBTC(item.value)}{' '}
{BitcoinUnit.BTC}
</Text>
{this.state.recipients.length > 1 && (
<BlueText style={{ alignSelf: 'flex-end' }}>
{index + 1} of {this.state.recipients.length}
</BlueText>
)}
</View>
</>
);
};
renderSeparator = () => {
return <View style={{ backgroundColor: BlueApp.settings.inputBorderColor, height: 0.5, marginVertical: 16 }} />;
};
render() {
return (
<SafeBlueArea style={{ flex: 1, paddingTop: 19 }}>
@ -73,23 +114,30 @@ export default class SendCreate extends Component {
</TouchableOpacity>
</BlueCard>
<BlueCard>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.to}</Text>
<Text style={styles.transactionDetailsSubtitle}>{this.state.address}</Text>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.amount}</Text>
<Text style={styles.transactionDetailsSubtitle}>{this.state.amount} BTC</Text>
<FlatList
scrollEnabled={this.state.recipients.length > 1}
extraData={this.state.recipients}
data={this.state.recipients}
renderItem={this._renderItem}
keyExtractor={(_item, index) => `${index}`}
ItemSeparatorComponent={this.renderSeparator}
/>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.fee}</Text>
<Text style={styles.transactionDetailsSubtitle}>{this.state.fee} BTC</Text>
<Text style={styles.transactionDetailsSubtitle}>
{this.state.fee} {BitcoinUnit.BTC}
</Text>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.tx_size}</Text>
<Text style={styles.transactionDetailsSubtitle}>{this.state.size} bytes</Text>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.satoshi_per_byte}</Text>
<Text style={styles.transactionDetailsSubtitle}>{this.state.satoshiPerByte} Sat/B</Text>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.memo}</Text>
<Text style={styles.transactionDetailsSubtitle}>{this.state.memo}</Text>
{this.state.memo.length > 0 && (
<>
<Text style={styles.transactionDetailsTitle}>{loc.send.create.memo}</Text>
<Text style={styles.transactionDetailsSubtitle}>{this.state.memo}</Text>
</>
)}
</BlueCard>
</ScrollView>
</TouchableWithoutFeedback>

636
screen/send/details.js
View File

@ -11,19 +11,23 @@ import {
Keyboard,
TouchableWithoutFeedback,
StyleSheet,
Dimensions,
Platform,
ScrollView,
Text,
} from 'react-native';
import { Icon } from 'react-native-elements';
import AsyncStorage from '@react-native-community/async-storage';
import {
BlueNavigationStyle,
BlueCreateTxNavigationStyle,
BlueButton,
BlueBitcoinAmount,
BlueAddressInput,
BlueDismissKeyboardInputAccessory,
BlueLoading,
BlueUseAllFundsButton,
BlueListItem,
BlueText,
} from '../../BlueComponents';
import Slider from '@react-native-community/slider';
import PropTypes from 'prop-types';
@ -33,8 +37,10 @@ import BitcoinBIP70TransactionDecode from '../../bip70/bip70';
import { BitcoinUnit, Chain } from '../../models/bitcoinUnits';
import { HDLegacyP2PKHWallet, HDSegwitBech32Wallet, HDSegwitP2SHWallet, LightningCustodianWallet } from '../../class';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
import { BitcoinTransaction } from '../../models/bitcoinTransactionInfo';
const bip21 = require('bip21');
let BigNumber = require('bignumber.js');
const { width } = Dimensions.get('window');
/** @type {AppStorage} */
let BlueApp = require('../../BlueApp');
let loc = require('../../loc');
@ -44,16 +50,17 @@ const btcAddressRx = /^[a-zA-Z0-9]{26,35}$/;
export default class SendDetails extends Component {
static navigationOptions = ({ navigation }) => ({
...BlueNavigationStyle(navigation, true),
...BlueCreateTxNavigationStyle(
navigation,
navigation.state.params.withAdvancedOptionsMenuButton,
navigation.state.params.advancedOptionsMenuButtonAction,
),
title: loc.send.header,
});
constructor(props) {
super(props);
let address;
let memo;
if (props.navigation.state.params) address = props.navigation.state.params.address;
if (props.navigation.state.params) memo = props.navigation.state.params.memo;
let fromAddress;
if (props.navigation.state.params) fromAddress = props.navigation.state.params.fromAddress;
let fromSecret;
@ -76,13 +83,15 @@ export default class SendDetails extends Component {
isLoading: false,
showSendMax: false,
isFeeSelectionModalVisible: false,
isAdvancedTransactionOptionsVisible: false,
recipientsScrollIndex: 0,
fromAddress,
fromWallet,
fromSecret,
address,
memo,
fee: 1,
addresses: [],
memo: '',
networkTransactionFees: new NetworkTransactionFee(1, 1, 1),
fee: 1,
feeSliderValue: 1,
bip70TransactionExpiration: null,
renderWalletSelectionButtonHidden: false,
@ -90,105 +99,151 @@ export default class SendDetails extends Component {
}
}
renderNavigationHeader() {
this.props.navigation.setParams({
withAdvancedOptionsMenuButton: this.state.fromWallet.allowBatchSend(),
advancedOptionsMenuButtonAction: () => {
Keyboard.dismiss();
this.setState({ isAdvancedTransactionOptionsVisible: true });
},
});
}
/**
* TODO: refactor this mess, get rid of regexp, use https://github.com/bitcoinjs/bitcoinjs-lib/issues/890 etc etc
*
* @param data {String} Can be address or `bitcoin:xxxxxxx` uri scheme, or invalid garbage
*/
processAddressData = data => {
this.setState(
{ isLoading: true },
() => {
if (BitcoinBIP70TransactionDecode.matchesPaymentURL(data)) {
this.processBIP70Invoice(data);
this.setState({ isLoading: true }, async () => {
if (BitcoinBIP70TransactionDecode.matchesPaymentURL(data)) {
const bip70 = await this.processBIP70Invoice(data);
this.setState({
addresses: [bip70.recipient],
memo: bip70.memo,
feeSliderValue: bip70.feeSliderValue,
fee: bip70.fee,
bip70TransactionExpiration: bip70.bip70TransactionExpiration,
});
} else {
let recipients = this.state.addresses;
const dataWithoutSchema = data.replace('bitcoin:', '');
if (btcAddressRx.test(dataWithoutSchema) || (dataWithoutSchema.indexOf('bc1') === 0 && dataWithoutSchema.indexOf('?') === -1)) {
recipients[[this.state.recipientsScrollIndex]].address = dataWithoutSchema;
this.setState({
address: recipients,
bip70TransactionExpiration: null,
isLoading: false,
});
} else {
const dataWithoutSchema = data.replace('bitcoin:', '');
if (btcAddressRx.test(dataWithoutSchema) || (dataWithoutSchema.indexOf('bc1') === 0 && dataWithoutSchema.indexOf('?') === -1)) {
let address = '';
let options;
try {
if (!data.toLowerCase().startsWith('bitcoin:')) {
data = `bitcoin:${data}`;
}
const decoded = bip21.decode(data);
address = decoded.address;
options = decoded.options;
} catch (error) {
data = data.replace(/(amount)=([^&]+)/g, '').replace(/(amount)=([^&]+)&/g, '');
const decoded = bip21.decode(data);
decoded.options.amount = 0;
address = decoded.address;
options = decoded.options;
this.setState({ isLoading: false });
}
console.log(options);
if (btcAddressRx.test(address) || address.indexOf('bc1') === 0) {
recipients[[this.state.recipientsScrollIndex]].address = address;
recipients[[this.state.recipientsScrollIndex]].amount = options.amount;
this.setState({
address: dataWithoutSchema,
addresses: recipients,
memo: options.label || options.message,
bip70TransactionExpiration: null,
isLoading: false,
});
} else {
let address = '';
let options;
try {
if (!data.toLowerCase().startsWith('bitcoin:')) {
data = `bitcoin:${data}`;
}
const decoded = bip21.decode(data);
address = decoded.address;
options = decoded.options;
} catch (error) {
data = data.replace(/(amount)=([^&]+)/g, '').replace(/(amount)=([^&]+)&/g, '');
const decoded = bip21.decode(data);
decoded.options.amount = 0;
address = decoded.address;
options = decoded.options;
this.setState({ isLoading: false });
}
console.log(options);
if (btcAddressRx.test(address) || address.indexOf('bc1') === 0) {
this.setState({
address,
amount: options.amount,
memo: options.label || options.message,
bip70TransactionExpiration: null,
isLoading: false,
});
}
}
}
},
true,
);
}
});
};
async componentDidMount() {
this.renderNavigationHeader();
console.log('send/details - componentDidMount');
StatusBar.setBarStyle('dark-content');
this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', this._keyboardDidShow);
this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', this._keyboardDidHide);
let addresses = [];
let initialMemo = '';
if (this.props.navigation.state.params.uri) {
const uri = this.props.navigation.state.params.uri;
if (BitcoinBIP70TransactionDecode.matchesPaymentURL(uri)) {
const { recipient, memo, fee, feeSliderValue } = await this.processBIP70Invoice(uri);
addresses.push(recipient);
initialMemo = memo;
this.setState({ addresses, memo: initialMemo, fee, feeSliderValue, isLoading: false });
} else {
try {
const { address, amount, memo } = this.decodeBitcoinUri(uri);
addresses.push(new BitcoinTransaction(address, amount));
initialMemo = memo;
this.setState({ addresses, memo: initialMemo, isLoading: false });
} catch (error) {
console.log(error);
alert('Error: Unable to decode Bitcoin address');
}
}
} else if (this.props.navigation.state.params.address) {
addresses.push(new BitcoinTransaction(this.props.navigation.state.params.address));
if (this.props.navigation.state.params.memo) initialMemo = this.props.navigation.state.params.memo;
this.setState({ addresses, memo: initialMemo, isLoading: false });
} else {
this.setState({ addresses: [new BitcoinTransaction()], isLoading: false });
}
try {
const cachedNetworkTransactionFees = JSON.parse(await AsyncStorage.getItem(NetworkTransactionFee.StorageKey));
if (cachedNetworkTransactionFees && cachedNetworkTransactionFees.hasOwnProperty('halfHourFee')) {
this.setState({
fee: cachedNetworkTransactionFees.halfHourFee,
fee: cachedNetworkTransactionFees.fastestFee,
networkTransactionFees: cachedNetworkTransactionFees,
feeSliderValue: cachedNetworkTransactionFees.halfHourFee,
feeSliderValue: cachedNetworkTransactionFees.fastestFee,
});
}
} catch (_) {}
let recommendedFees = await NetworkTransactionFees.recommendedFees();
if (recommendedFees && recommendedFees.hasOwnProperty('halfHourFee')) {
await AsyncStorage.setItem(NetworkTransactionFee.StorageKey, JSON.stringify(recommendedFees));
this.setState({
fee: recommendedFees.halfHourFee,
networkTransactionFees: recommendedFees,
feeSliderValue: recommendedFees.halfHourFee,
});
try {
let recommendedFees = await NetworkTransactionFees.recommendedFees();
if (recommendedFees && recommendedFees.hasOwnProperty('fastestFee')) {
await AsyncStorage.setItem(NetworkTransactionFee.StorageKey, JSON.stringify(recommendedFees));
this.setState({
fee: recommendedFees.fastestFee,
networkTransactionFees: recommendedFees,
feeSliderValue: recommendedFees.fastestFee,
});
if (this.props.navigation.state.params.uri) {
if (BitcoinBIP70TransactionDecode.matchesPaymentURL(this.props.navigation.state.params.uri)) {
this.processBIP70Invoice(this.props.navigation.state.params.uri);
} else {
try {
const { address, amount, memo } = this.decodeBitcoinUri(this.props.navigation.getParam('uri'));
this.setState({ address, amount, memo, isLoading: false });
} catch (error) {
console.log(error);
this.setState({ isLoading: false });
alert('Error: Unable to decode Bitcoin address');
if (this.props.navigation.state.params.uri) {
if (BitcoinBIP70TransactionDecode.matchesPaymentURL(this.props.navigation.state.params.uri)) {
this.processBIP70Invoice(this.props.navigation.state.params.uri);
} else {
try {
const { address, amount, memo } = this.decodeBitcoinUri(this.props.navigation.getParam('uri'));
this.setState({ address, amount, memo, isLoading: false });
} catch (error) {
console.log(error);
this.setState({ isLoading: false });
alert('Error: Unable to decode Bitcoin address');
}
}
}
} else {
this.setState({ isLoading: false });
}
} else {
this.setState({ isLoading: false });
}
} catch (_e) {}
}
componentWillUnmount() {
@ -268,46 +323,33 @@ export default class SendDetails extends Component {
return new BigNumber(totalInput - totalOutput).dividedBy(100000000).toNumber();
}
processBIP70Invoice(text) {
async processBIP70Invoice(text) {
try {
if (BitcoinBIP70TransactionDecode.matchesPaymentURL(text)) {
this.setState(
{
isLoading: true,
},
() => {
Keyboard.dismiss();
BitcoinBIP70TransactionDecode.decode(text)
.then(response => {
let networkTransactionFees = this.state.networkTransactionFees;
if (response.fee > networkTransactionFees.fastestFee) {
networkTransactionFees.fastestFee = response.fee;
} else {
networkTransactionFees.halfHourFee = response.fee;
}
this.setState({
address: response.address,
amount: loc.formatBalanceWithoutSuffix(response.amount, BitcoinUnit.BTC, false),
memo: response.memo,
networkTransactionFees,
fee: networkTransactionFees.fastestFee,
feeSliderValue: networkTransactionFees.fastestFee,
bip70TransactionExpiration: response.expires,
isLoading: false,
});
})
.catch(error => {
alert(error.errorMessage);
this.setState({ isLoading: false, bip70TransactionExpiration: null });
});
},
);
Keyboard.dismiss();
return BitcoinBIP70TransactionDecode.decode(text)
.then(response => {
const recipient = new BitcoinTransaction(
response.address,
loc.formatBalanceWithoutSuffix(response.amount, BitcoinUnit.BTC, false),
);
return {
recipient,
memo: response.memo,
fee: response.fee,
feeSliderValue: response.fee,
bip70TransactionExpiration: response.expires,
};
})
.catch(error => {
alert(error.errorMessage);
throw error;
});
}
return true;
} catch (error) {
this.setState({ address: text.replace(' ', ''), isLoading: false, bip70TransactionExpiration: null, amount: 0 });
return false;
}
throw new Error('BIP70: Unable to process.');
}
async createTransaction() {
@ -315,46 +357,58 @@ export default class SendDetails extends Component {
this.setState({ isLoading: true });
let error = false;
let requestedSatPerByte = this.state.fee.toString().replace(/\D/g, '');
if (!this.state.amount || this.state.amount === '0' || parseFloat(this.state.amount) === 0) {
error = loc.send.details.amount_field_is_not_valid;
console.log('validation error');
} else if (!this.state.fee || !requestedSatPerByte || parseFloat(requestedSatPerByte) < 1) {
error = loc.send.details.fee_field_is_not_valid;
console.log('validation error');
} else if (!this.state.address) {
error = loc.send.details.address_field_is_not_valid;
console.log('validation error');
} else if (this.recalculateAvailableBalance(this.state.fromWallet.getBalance(), this.state.amount, 0) < 0) {
// first sanity check is that sending amount is not bigger than available balance
error = loc.send.details.total_exceeds_balance;
console.log('validation error');
} else if (BitcoinBIP70TransactionDecode.isExpired(this.state.bip70TransactionExpiration)) {
error = 'Transaction has expired.';
console.log('validation error');
} else if (this.state.address) {
const address = this.state.address.trim().toLowerCase();
if (address.startsWith('lnb') || address.startsWith('lightning:lnb')) {
error =
'This address appears to be for a Lightning invoice. Please, go to your Lightning wallet in order to make a payment for this invoice.';
for (const [index, transaction] of this.state.addresses.entries()) {
if (!transaction.amount || transaction.amount < 0 || parseFloat(transaction.amount) === 0) {
error = loc.send.details.amount_field_is_not_valid;
console.log('validation error');
}
}
if (!error) {
try {
bitcoin.address.toOutputScript(this.state.address);
} catch (err) {
} else if (!this.state.fee || !requestedSatPerByte || parseFloat(requestedSatPerByte) < 1) {
error = loc.send.details.fee_field_is_not_valid;
console.log('validation error');
console.log(err);
} else if (!transaction.address) {
error = loc.send.details.address_field_is_not_valid;
console.log('validation error');
} else if (this.recalculateAvailableBalance(this.state.fromWallet.getBalance(), transaction.amount, 0) < 0) {
// first sanity check is that sending amount is not bigger than available balance
error = loc.send.details.total_exceeds_balance;
console.log('validation error');
} else if (BitcoinBIP70TransactionDecode.isExpired(this.state.bip70TransactionExpiration)) {
error = 'Transaction has expired.';
console.log('validation error');
} else if (transaction.address) {
const address = transaction.address.trim().toLowerCase();
if (address.startsWith('lnb') || address.startsWith('lightning:lnb')) {
error =
'This address appears to be for a Lightning invoice. Please, go to your Lightning wallet in order to make a payment for this invoice.';
console.log('validation error');
}
}
if (!error) {
try {
bitcoin.address.toOutputScript(transaction.address);
} catch (err) {
console.log('validation error');
console.log(err);
error = loc.send.details.address_field_is_not_valid;
}
}
if (error) {
if (index === 0) {
this.scrollView.scrollTo();
} else if (index === this.state.addresses.length - 1) {
this.scrollView.scrollToEnd();
} else {
const page = Math.round(width * (this.state.addresses.length - 2));
this.scrollView.scrollTo({ x: page, y: 0, animated: true });
}
this.setState({ isLoading: false, recipientsScrollIndex: index });
alert(error);
ReactNativeHapticFeedback.trigger('notificationError', { ignoreAndroidSystemSettings: false });
break;
}
}
if (error) {
this.setState({ isLoading: false });
alert(error);
ReactNativeHapticFeedback.trigger('notificationError', { ignoreAndroidSystemSettings: false });
return;
}
@ -378,7 +432,7 @@ export default class SendDetails extends Component {
let tx, txid;
let tries = 1;
let fee = 0.000001; // initial fee guess
const firstTransaction = this.state.addresses[0];
try {
await this.state.fromWallet.fetchUtxo();
if (this.state.fromWallet.getChangeAddressAsync) {
@ -392,13 +446,13 @@ export default class SendDetails extends Component {
do {
console.log('try #', tries, 'fee=', fee);
if (this.recalculateAvailableBalance(this.state.fromWallet.getBalance(), this.state.amount, fee) < 0) {
if (this.recalculateAvailableBalance(this.state.fromWallet.getBalance(), firstTransaction.amount, fee) < 0) {
// we could not add any fee. user is trying to send all he's got. that wont work
throw new Error(loc.send.details.total_exceeds_balance);
}
let startTime = Date.now();
tx = this.state.fromWallet.createTx(utxo, this.state.amount, fee, this.state.address, this.state.memo);
tx = this.state.fromWallet.createTx(utxo, firstTransaction.amount, fee, firstTransaction.address, this.state.memo);
let endTime = Date.now();
console.log('create tx ', (endTime - startTime) / 1000, 'sec');
@ -440,14 +494,13 @@ export default class SendDetails extends Component {
this.setState({ isLoading: false }, () =>
this.props.navigation.navigate('Confirm', {
amount: this.state.amount,
recipients: [firstTransaction],
// HD wallet's utxo is in sats, classic segwit wallet utxos are in btc
fee: this.calculateFee(
utxo,
tx,
this.state.fromWallet.type === HDSegwitP2SHWallet.type || this.state.fromWallet.type === HDLegacyP2PKHWallet.type,
),
address: this.state.address,
memo: this.state.memo,
fromWallet: this.state.fromWallet,
tx: tx,
@ -461,15 +514,23 @@ export default class SendDetails extends Component {
/** @type {HDSegwitBech32Wallet} */
const wallet = this.state.fromWallet;
await wallet.fetchUtxo();
const firstTransaction = this.state.addresses[0];
const changeAddress = await wallet.getChangeAddressAsync();
let satoshis = new BigNumber(this.state.amount).multipliedBy(100000000).toNumber();
let satoshis = new BigNumber(firstTransaction.amount).multipliedBy(100000000).toNumber();
const requestedSatPerByte = +this.state.fee.toString().replace(/\D/g, '');
console.log({ satoshis, requestedSatPerByte, utxo: wallet.getUtxo() });
let targets = [];
targets.push({ address: this.state.address, value: satoshis });
if (this.state.amount === BitcoinUnit.MAX) {
targets = [{ address: this.state.address }];
for (const transaction of this.state.addresses) {
const amount =
transaction.amount === BitcoinUnit.MAX ? BitcoinUnit.MAX : new BigNumber(transaction.amount).multipliedBy(100000000).toNumber();
if (amount > 0.0 || amount === BitcoinUnit.MAX) {
targets.push({ address: transaction.address, value: amount });
}
}
if (firstTransaction.amount === BitcoinUnit.MAX) {
targets = [{ address: firstTransaction.address, amount: BitcoinUnit.MAX }];
}
let { tx, fee } = wallet.createTransaction(wallet.getUtxo(), targets, requestedSatPerByte, changeAddress);
@ -480,24 +541,72 @@ export default class SendDetails extends Component {
memo: this.state.memo,
};
await BlueApp.saveToDisk();
this.setState({ isLoading: false }, () =>
this.props.navigation.navigate('Confirm', {
amount: this.state.amount,
fee: new BigNumber(fee).dividedBy(100000000).toNumber(),
address: this.state.address,
memo: this.state.memo,
fromWallet: wallet,
tx: tx.toHex(),
recipients: targets,
satoshiPerByte: requestedSatPerByte,
}),
);
}
onWalletSelect = wallet => {
this.setState({ fromAddress: wallet.getAddress(), fromSecret: wallet.getSecret(), fromWallet: wallet }, () => {
this.props.navigation.pop();
});
const changeWallet = () => {
this.setState({ fromAddress: wallet.getAddress(), fromSecret: wallet.getSecret(), fromWallet: wallet }, () => {
this.renderNavigationHeader();
this.props.navigation.pop();
});
};
if (this.state.addresses.length > 1 && !wallet.allowBatchSend()) {
ReactNativeHapticFeedback.trigger('notificationWarning');
Alert.alert(
'Wallet Selection',
`The selected wallet does not support sending Bitcoin to multiple recipients. Are you sure to want to select this wallet?`,
[
{
text: loc._.ok,
onPress: async () => {
const firstTransaction =
this.state.addresses.find(element => {
const feeSatoshi = new BigNumber(element.amount).multipliedBy(100000000);
return element.address.length > 0 && feeSatoshi > 0;
}) || this.state.addresses[0];
this.setState({ addresses: [firstTransaction], recipientsScrollIndex: 0 }, () => changeWallet());
},
style: 'default',
},
{ text: loc.send.details.cancel, onPress: () => {}, style: 'cancel' },
],
{ cancelable: false },
);
} else if (this.state.addresses.some(element => element.amount === BitcoinUnit.MAX) && !wallet.allowSendMax()) {
ReactNativeHapticFeedback.trigger('notificationWarning');
Alert.alert(
'Wallet Selection',
`The selected wallet does not support automatic maximum balance calculation. Are you sure to want to select this wallet?`,
[
{
text: loc._.ok,
onPress: async () => {
const firstTransaction =
this.state.addresses.find(element => {
return element.amount === BitcoinUnit.MAX;
}) || this.state.addresses[0];
firstTransaction.amount = 0;
this.setState({ addresses: [firstTransaction], recipientsScrollIndex: 0 }, () => changeWallet());
},
style: 'default',
},
{ text: loc.send.details.cancel, onPress: () => {}, style: 'cancel' },
],
{ cancelable: false },
);
} else {
changeWallet();
}
};
renderFeeSelectionModal = () => {
@ -575,14 +684,71 @@ export default class SendDetails extends Component {
);
};
renderAdvancedTransactionOptionsModal = () => {
return (
<Modal
isVisible={this.state.isAdvancedTransactionOptionsVisible}
style={styles.bottomModal}
onBackdropPress={() => {
Keyboard.dismiss();
this.setState({ isAdvancedTransactionOptionsVisible: false });
}}
>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={styles.advancedTransactionOptionsModalContent}>
<TouchableOpacity
disabled={this.state.addresses.some(element => element.amount === BitcoinUnit.MAX)}
onPress={() => {
const addresses = this.state.addresses;
addresses.push(new BitcoinTransaction());
this.setState(
{
addresses,
isAdvancedTransactionOptionsVisible: false,
},
() => {
this.scrollView.scrollToEnd();
if (this.state.addresses.length > 1) this.scrollView.flashScrollIndicators();
},
);
}}
>
<BlueListItem
disabled={this.state.addresses.some(element => element.amount === BitcoinUnit.MAX)}
title="Add Recipient"
hideChevron
/>
</TouchableOpacity>
<TouchableOpacity
disabled={this.state.addresses.length < 2}
onPress={() => {
const addresses = this.state.addresses;
addresses.splice(this.state.recipientsScrollIndex, 1);
this.setState(
{
addresses,
isAdvancedTransactionOptionsVisible: false,
},
() => {
if (this.state.addresses.length > 1) this.scrollView.flashScrollIndicators();
this.setState({ recipientsScrollIndex: this.scrollViewCurrentIndex });
},
);
}}
>
<BlueListItem disabled={this.state.addresses.length < 2} title="Remove Recipient" hideChevron />
</TouchableOpacity>
</View>
</KeyboardAvoidingView>
</Modal>
);
};
renderCreateButton = () => {
return (
<View style={{ marginHorizontal: 56, marginVertical: 16, alignContent: 'center', backgroundColor: '#FFFFFF', minHeight: 44 }}>
{this.state.isLoading ? (
<ActivityIndicator />
) : (
<BlueButton onPress={() => this.createTransaction()} title={loc.send.details.create} />
)}
{this.state.isLoading ? <ActivityIndicator /> : <BlueButton onPress={() => this.createTransaction()} title={'Next'} />}
</View>
);
};
@ -610,18 +776,89 @@ export default class SendDetails extends Component {
}
>
<Text style={{ color: '#0c2550', fontSize: 14 }}>{this.state.fromWallet.getLabel()}</Text>
<Text style={{ color: '#0c2550', fontSize: 14, fontWeight: '600', marginLeft: 8, marginRight: 4 }}>
{loc.formatBalanceWithoutSuffix(this.state.fromWallet.getBalance(), BitcoinUnit.BTC, false)}
</Text>
<Text style={{ color: '#0c2550', fontSize: 11, fontWeight: '600', textAlignVertical: 'bottom', marginTop: 2 }}>
{BitcoinUnit.BTC}
</Text>
</TouchableOpacity>
</View>
</View>
);
};
handlePageChange = e => {
Keyboard.dismiss();
var offset = e.nativeEvent.contentOffset;
if (offset) {
const page = Math.round(offset.x / width);
if (this.state.recipientsScrollIndex !== page) {
this.setState({ recipientsScrollIndex: page });
}
}
};
scrollViewCurrentIndex = () => {
Keyboard.dismiss();
var offset = this.scrollView.contentOffset;
if (offset) {
const page = Math.round(offset.x / width);
return page;
}
return 0;
};
renderBitcoinTransactionInfoFields = () => {
let rows = [];
for (let [index, item] of this.state.addresses.entries()) {
rows.push(
<View style={{ minWidth: width, maxWidth: width, width: width }}>
<BlueBitcoinAmount
isLoading={this.state.isLoading}
amount={item.amount ? item.amount.toString() : null}
onChangeText={text => {
item.amount = text;
const transactions = this.state.addresses;
transactions[index] = item;
this.setState({ addresses: transactions });
}}
inputAccessoryViewID={this.state.fromWallet.allowSendMax() ? BlueUseAllFundsButton.InputAccessoryViewID : null}
onFocus={() => this.setState({ isAmountToolbarVisibleForAndroid: true })}
onBlur={() => this.setState({ isAmountToolbarVisibleForAndroid: false })}
/>
<BlueAddressInput
onChangeText={async text => {
text = text.trim();
let transactions = this.state.addresses;
try {
const { recipient, memo, fee, feeSliderValue } = await this.processBIP70Invoice(text);
transactions[index].address = recipient.address;
transactions[index].amount = recipient.amount;
this.setState({ addresses: transactions, memo: memo, fee, feeSliderValue, isLoading: false });
} catch (_e) {
const { address, amount, memo } = this.decodeBitcoinUri(text);
item.address = address || text;
item.amount = amount || item.amount;
transactions[index] = item;
this.setState({
addresses: transactions,
memo: memo || this.state.memo,
isLoading: false,
bip70TransactionExpiration: null,
});
}
}}
onBarScanned={this.processAddressData}
address={item.address}
isLoading={this.state.isLoading}
inputAccessoryViewID={BlueDismissKeyboardInputAccessory.InputAccessoryViewID}
/>
{this.state.addresses.length > 1 && (
<BlueText style={{ alignSelf: 'flex-end', marginRight: 18, marginVertical: 8 }}>
{index + 1} of {this.state.addresses.length}
</BlueText>
)}
</View>,
);
}
return rows;
};
render() {
if (this.state.isLoading || typeof this.state.fromWallet === 'undefined') {
return (
@ -633,44 +870,21 @@ export default class SendDetails extends Component {
return (
<TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
<View style={{ flex: 1, justifyContent: 'space-between' }}>
<View style={{ flex: 1, backgroundColor: '#FFFFFF' }}>
<View>
<KeyboardAvoidingView behavior="position">
<BlueBitcoinAmount
isLoading={this.state.isLoading}
amount={this.state.amount ? this.state.amount.toString() : null}
onChangeText={text => this.setState({ amount: text })}
inputAccessoryViewID={this.state.fromWallet.allowSendMax() ? BlueUseAllFundsButton.InputAccessoryViewID : null}
onFocus={() => this.setState({ isAmountToolbarVisibleForAndroid: true })}
onBlur={() => this.setState({ isAmountToolbarVisibleForAndroid: false })}
/>
<BlueAddressInput
onChangeText={text => {
if (!this.processBIP70Invoice(text)) {
this.setState({
address: text.trim().replace('bitcoin:', ''),
isLoading: false,
bip70TransactionExpiration: null,
});
} else {
try {
const { address, amount, memo } = this.decodeBitcoinUri(text);
this.setState({
address: address || this.state.address,
amount: amount || this.state.amount,
memo: memo || this.state.memo,
isLoading: false,
bip70TransactionExpiration: null,
});
} catch (_) {
this.setState({ address: text.trim(), isLoading: false, bip70TransactionExpiration: null });
}
}
}}
onBarScanned={this.processAddressData}
address={this.state.address}
isLoading={this.state.isLoading}
inputAccessoryViewID={BlueDismissKeyboardInputAccessory.InputAccessoryViewID}
/>
<ScrollView
pagingEnabled
horizontal
contentContainerStyle={{ flexWrap: 'wrap', flexDirection: 'row' }}
ref={ref => (this.scrollView = ref)}
onContentSizeChange={() => this.scrollView.scrollToEnd()}
onLayout={() => this.scrollView.scrollToEnd()}
onMomentumScrollEnd={this.handlePageChange}
scrollEnabled={this.state.addresses.length > 1}
scrollIndicatorInsets={{ top: 0, left: 8, bottom: 0, right: 8 }}
>
{this.renderBitcoinTransactionInfoFields()}
</ScrollView>
<View
hide={!this.state.showMemoRow}
style={{
@ -723,6 +937,7 @@ export default class SendDetails extends Component {
</TouchableOpacity>
{this.renderCreateButton()}
{this.renderFeeSelectionModal()}
{this.renderAdvancedTransactionOptionsModal()}
</KeyboardAvoidingView>
</View>
<BlueDismissKeyboardInputAccessory />
@ -733,13 +948,17 @@ export default class SendDetails extends Component {
ReactNativeHapticFeedback.trigger('notificationWarning');
Alert.alert(
'Use full balance',
`Are you sure you want to use your wallet's full balance for this transaction?`,
`Are you sure you want to use your wallet's full balance for this transaction? ${
this.state.addresses.length > 1 ? 'Your other recipients will be removed from this transaction.' : ''
}`,
[
{
text: loc._.ok,
onPress: async () => {
Keyboard.dismiss();
this.setState({ amount: BitcoinUnit.MAX });
const recipient = this.state.addresses[this.state.recipientsScrollIndex];
recipient.amount = BitcoinUnit.MAX;
this.setState({ addresses: [recipient], recipientsScrollIndex: 0 });
},
style: 'default',
},
@ -795,6 +1014,14 @@ const styles = StyleSheet.create({
minHeight: 200,
height: 200,
},
advancedTransactionOptionsModalContent: {
backgroundColor: '#FFFFFF',
padding: 22,
borderTopLeftRadius: 16,
borderTopRightRadius: 16,
borderColor: 'rgba(0, 0, 0, 0.1)',
minHeight: 130,
},
bottomModal: {
justifyContent: 'flex-end',
margin: 0,
@ -816,6 +1043,7 @@ SendDetails.propTypes = {
goBack: PropTypes.func,
navigate: PropTypes.func,
getParam: PropTypes.func,
setParams: PropTypes.func,
state: PropTypes.shape({
params: PropTypes.shape({
amount: PropTypes.number,

3
screen/send/success.js
View File

@ -10,6 +10,7 @@ let loc = require('../../loc');
export default class Success extends Component {
static navigationOptions = {
header: null,
gesturesEnabled: false,
};
constructor(props) {
@ -67,7 +68,7 @@ export default class Success extends Component {
alignSelf: 'center',
}}
>
{loc.send.create.fee}: {loc.formatBalance(this.state.fee, BitcoinUnit.SATS)}
{loc.send.create.fee}: {this.state.fee} {BitcoinUnit.BTC}
</Text>
)}
{this.state.fee <= 0 && (