diff --git a/ios/BlueWallet/Info.plist b/ios/BlueWallet/Info.plist
index f710079a6..04a08d47e 100644
--- a/ios/BlueWallet/Info.plist
+++ b/ios/BlueWallet/Info.plist
@@ -34,7 +34,7 @@
CFBundleVersion
- 160
+ 161
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/loc/index.js b/loc/index.js
index a1b2b2311..9a522d0be 100644
--- a/loc/index.js
+++ b/loc/index.js
@@ -92,7 +92,9 @@ strings.formatBalance = (balance, fromUnit, toUnit) => {
.to(BitcoinUnit.SATS)
.format();
} else if (toUnit === BitcoinUnit.LOCAL_CURRENCY) {
- const satoshis = BTCUnits(balance, BitcoinUnit.BTC).to(BitcoinUnit.SATS).value();
+ const satoshis = BTCUnits(balance, BitcoinUnit.BTC)
+ .to(BitcoinUnit.SATS)
+ .value();
return currency.satoshiToLocalCurrency(satoshis);
}
};
@@ -113,9 +115,13 @@ strings.formatBalanceWithoutSuffix = (balance, fromUnit, toUnit) => {
.to(BitcoinUnit.BTC)
.toString();
} else if (toUnit === BitcoinUnit.SATS) {
- return String(BTCUnits(balance, fromUnit)
- .to(BitcoinUnit.SATS)
- .format()).replace(' satoshis','');
+ return String(
+ BTCUnits(balance, fromUnit)
+ .to(BitcoinUnit.SATS)
+ .format(),
+ )
+ .replace(' satoshis', '')
+ .replace(' satoshi', '');
} else if (toUnit === BitcoinUnit.LOCAL_CURRENCY) {
return currency.satoshiToLocalCurrency(BTCUnits(balance, fromUnit).to(BitcoinUnit.SATS));
}
diff --git a/screen/lnd/scanLndInvoice.js b/screen/lnd/scanLndInvoice.js
index 70e725c71..495c86bb8 100644
--- a/screen/lnd/scanLndInvoice.js
+++ b/screen/lnd/scanLndInvoice.js
@@ -163,7 +163,7 @@ export default class ScanLndInvoice extends React.Component {
>
{
- if (text.toLowerCase().startsWith('lnb')) {
+ if (text.toLowerCase().startsWith('lnb') || text.toLowerCase().startsWith('lntb')) {
this.processInvoice(text);
} else {
this.setState({ decoded: undefined, expiresIn: undefined });
diff --git a/screen/wallets/list.js b/screen/wallets/list.js
index fdc599120..71c15f966 100644
--- a/screen/wallets/list.js
+++ b/screen/wallets/list.js
@@ -349,7 +349,9 @@ export default class WalletsList extends Component {
rightTitleStyle={{
fontWeight: '600',
fontSize: 16,
- color: rowData.item.value / 100000000 < 0 ? BlueApp.settings.foregroundColor : '#37c0a1',
+ color: rowData.item.value / 100000000 < 0 || rowData.item.type === 'paid_invoice'
+ ? BlueApp.settings.foregroundColor
+ : '#37c0a1',
}}
/>
);
diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js
index c133c43ce..ca8c4d254 100644
--- a/screen/wallets/transactions.js
+++ b/screen/wallets/transactions.js
@@ -459,7 +459,10 @@ export default class WalletTransactions extends Component {
rightTitleStyle={{
fontWeight: '600',
fontSize: 16,
- color: rowData.item.value / 100000000 < 0 ? BlueApp.settings.foregroundColor : '#37c0a1',
+ color:
+ rowData.item.value / 100000000 < 0 || rowData.item.type === 'paid_invoice'
+ ? BlueApp.settings.foregroundColor
+ : '#37c0a1',
}}
/>
);