diff --git a/BlueComponents.js b/BlueComponents.js index 0c0d3885..3326360b 100644 --- a/BlueComponents.js +++ b/BlueComponents.js @@ -790,14 +790,31 @@ export class BlueUseAllFundsButton extends Component { paddingBottom: 12, }} > - Total: {loc.formatBalanceWithoutSuffix(this.props.wallet.getBalance(), BitcoinUnit.BTC, true).toString()} {BitcoinUnit.BTC} + Total: - {this.props.wallet.allowSendMax() && this.props.wallet.getBalance() > 0 && ( + {this.props.wallet.allowSendMax() ? ( + ) : ( + + {loc.formatBalanceWithoutSuffix(this.props.wallet.getBalance(), BitcoinUnit.BTC, true).toString()} {BitcoinUnit.BTC} + )} diff --git a/screen/send/details.js b/screen/send/details.js index d4130bf7..58b64dd6 100644 --- a/screen/send/details.js +++ b/screen/send/details.js @@ -4,6 +4,7 @@ import { ActivityIndicator, View, TextInput, + Alert, StatusBar, TouchableOpacity, KeyboardAvoidingView, @@ -724,21 +725,48 @@ export default class SendDetails extends Component { ios: ( { - this.setState({ amount: 'MAX' }); + ReactNativeHapticFeedback.trigger('notificationWarning'); + Alert.alert( + 'Use full balance', + `Are you sure you want to use your wallet's full balance for this transaction?`, + [ + { + text: loc._.ok, + onPress: async () => { + this.setState({ amount: 'MAX' }); + }, + style: 'default', + }, + { text: loc.send.details.cancel, onPress: () => {}, style: 'cancel' }, + ], + { cancelable: false }, + ); Keyboard.dismiss(); }} wallet={this.state.fromWallet} - visi /> ), android: this.state.isAmountToolbarVisibleForAndroid && ( { - this.setState({ amount: 'MAX' }); + Alert.alert( + 'Use all funds', + `Are you sure you want to use your all of your wallet's funds for this transaction?`, + [ + { + text: loc._.ok, + onPress: async () => { + this.setState({ amount: 'MAX' }); + }, + style: 'default', + }, + { text: loc.send.details.cancel, onPress: () => {}, style: 'cancel' }, + ], + { cancelable: false }, + ); Keyboard.dismiss(); }} wallet={this.state.fromWallet} - visi /> ), })}