mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-22 23:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Writing numbers standards #194

Browse source
This commit is contained in:
Marcos Rodriguez Vélez 2019-01-09 11:23:32 -05:00
parent aee5f407ee
commit 3035747af3
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ios/BlueWallet/Info.plist
View file

@ -33,7 +33,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>228</string> <string>229</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>

4
loc/index.js
View file

@ -110,7 +110,7 @@ strings.formatBalance = (balance, toUnit, withFormatting = false) => {
return balance + ' ' + BitcoinUnit.BTC; return balance + ' ' + BitcoinUnit.BTC;
} else if (toUnit === BitcoinUnit.SATS) { } else if (toUnit === BitcoinUnit.SATS) {
const value = new BigNumber(balance).multipliedBy(100000000); const value = new BigNumber(balance).multipliedBy(100000000);
return (withFormatting ? new Intl.NumberFormat().format(value.toString()).replace(',', ' ') : value) + ' ' + BitcoinUnit.SATS; return (withFormatting ? new Intl.NumberFormat().format(value.toString()).replace(/[^0-9]/g, ' ') : value) + ' ' + BitcoinUnit.SATS;
} else if (toUnit === BitcoinUnit.LOCAL_CURRENCY) { } else if (toUnit === BitcoinUnit.LOCAL_CURRENCY) {
return currency.BTCToLocalCurrency(balance); return currency.BTCToLocalCurrency(balance);
} }
@ -131,7 +131,7 @@ strings.formatBalanceWithoutSuffix = (balance, toUnit, withFormatting = false) =
const value = new BigNumber(balance).dividedBy(100000000).toFixed(8); const value = new BigNumber(balance).dividedBy(100000000).toFixed(8);
return removeTrailingZeros(value); return removeTrailingZeros(value);
} else if (toUnit === BitcoinUnit.SATS) { } else if (toUnit === BitcoinUnit.SATS) {
return withFormatting ? new Intl.NumberFormat().format(balance).replace(',', ' ') : balance; return withFormatting ? new Intl.NumberFormat().format(balance).replace(/[^0-9]/g, ' ') : balance;
} else if (toUnit === BitcoinUnit.LOCAL_CURRENCY) { } else if (toUnit === BitcoinUnit.LOCAL_CURRENCY) {
return currency.satoshiToLocalCurrency(balance); return currency.satoshiToLocalCurrency(balance);
} }

8
screen/wallets/import.js
View file

@ -68,14 +68,6 @@ export default class WalletsImport extends Component {
try { try {
// is it lightning custodian? // is it lightning custodian?
if (text.indexOf('blitzhub://') !== -1 || text.indexOf('lndhub://') !== -1) { if (text.indexOf('blitzhub://') !== -1 || text.indexOf('lndhub://') !== -1) {
// yep its lnd
for (let t of BlueApp.getWallets()) {
if (t.type === LightningCustodianWallet.type) {
// already exist
return alert('Only 1 Ligthning wallet allowed for now');
}
}
let lnd = new LightningCustodianWallet(); let lnd = new LightningCustodianWallet();
lnd.setSecret(text); lnd.setSecret(text);
await lnd.authorize(); await lnd.authorize();