Merged main into ltc.

This commit is contained in:
M
2021-05-07 10:39:08 +03:00
8 changed files with 38 additions and 26 deletions
@@ -32,7 +32,7 @@ class BitcoinTransactionPriority extends TransactionPriority {
switch (this) {
case BitcoinTransactionPriority.slow:
label = S.current.transaction_priority_slow;
label = '${S.current.transaction_priority_slow} ~24hrs';
break;
case BitcoinTransactionPriority.medium:
label = S.current.transaction_priority_medium;
+2 -3
View File
@@ -308,7 +308,7 @@ class ElectrumClient {
try {
final topDoubleString = await estimatefee(p: 1);
final middleDoubleString = await estimatefee(p: 20);
final bottomDoubleString = await estimatefee(p: 150);
final bottomDoubleString = await estimatefee(p: 100);
final top =
(stringDoubleToBitcoinAmount(topDoubleString.toString()) / 1000)
.round();
@@ -319,8 +319,7 @@ class ElectrumClient {
(stringDoubleToBitcoinAmount(bottomDoubleString.toString()) / 1000)
.round();
final res = [bottom, middle, top];
return res;
return [bottom, middle, top];
} catch (_) {
return [];
}
-2
View File
@@ -102,10 +102,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
Future<void> init() async {
accountList.update();
accountList.accounts.observe((_) async => await save());
account = accountList.accounts.first;
subaddressList.update(accountIndex: account.id ?? 0);
subaddressList.subaddresses.observe((_) async => await save());
subaddress = subaddressList.getAll().first;
balance = MoneroBalance(
fullBalance: monero_wallet.getFullBalance(accountIndex: account.id),