diff --git a/BlueComponents.js b/BlueComponents.js index 8e7f972f0..066ff0fa6 100644 --- a/BlueComponents.js +++ b/BlueComponents.js @@ -1134,6 +1134,7 @@ export class BlueBitcoinAmount extends Component { {...this.props} keyboardType="numeric" onChangeText={text => { + text = text.replace(',', '.'); text = this.props.unit === BitcoinUnit.BTC ? text.replace(/[^0-9.]/g, '') : text.replace(/[^0-9]/g, ''); this.props.onChangeText(text); }} diff --git a/ios/BlueWallet/Info.plist b/ios/BlueWallet/Info.plist index 9b1c352ec..0edbf2ade 100644 --- a/ios/BlueWallet/Info.plist +++ b/ios/BlueWallet/Info.plist @@ -33,7 +33,7 @@ CFBundleVersion - 218 + 219 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/loc/index.js b/loc/index.js index fb16ecdad..44f68186a 100644 --- a/loc/index.js +++ b/loc/index.js @@ -108,7 +108,7 @@ strings.formatBalance = (balance, toUnit, withFormatting = false) => { return balance + ' ' + BitcoinUnit.BTC; } else if (toUnit === BitcoinUnit.SATS) { const value = new BigNumber(balance).multipliedBy(100000000); - return withFormatting ? new Intl.NumberFormat().format(value.toString()) : balance + ' ' + BitcoinUnit.SATS; + return withFormatting ? new Intl.NumberFormat().format(value.toString()) : value + ' ' + BitcoinUnit.SATS; } else if (toUnit === BitcoinUnit.LOCAL_CURRENCY) { return currency.BTCToLocalCurrency(balance); } diff --git a/screen/lnd/scanLndInvoice.js b/screen/lnd/scanLndInvoice.js index e8b8b0ea6..f3b01f4b8 100644 --- a/screen/lnd/scanLndInvoice.js +++ b/screen/lnd/scanLndInvoice.js @@ -147,7 +147,7 @@ export default class ScanLndInvoice extends React.Component { let start = +new Date(); let end; try { - await fromWallet.payInvoice(this.state.invoice, this.state.invoice.num_satoshis); + await fromWallet.payInvoice(this.state.invoice, this.state.decoded.num_satoshis); end = +new Date(); } catch (Err) { console.log(Err.message);