fix confirmations

Serhii committed Feb 10, 2023 at 00:01 UTC 25228eb633485acac3179f66463c87c899009f9b
1 file changed +4 -5
lib/view_model/dashboard/transaction_list_item.dart
+4 -5
@@ -1,5 +1,6 @@
1 import 'package:cake_wallet/entities/balance_display_mode.dart';
2 import 'package:cake_wallet/entities/fiat_currency.dart';
3 +import 'package:cake_wallet/generated/i18n.dart';
4 import 'package:cw_core/transaction_direction.dart';
5 import 'package:cw_core/transaction_info.dart';
6 import 'package:cake_wallet/store/settings_store.dart';
@@ -12,7 +13,6 @@ import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
13 import 'package:cw_core/keyable.dart';
14 import 'package:cw_core/wallet_type.dart';
15
15 -import '../../generated/i18n.dart';
16
17 class TransactionListItem extends ActionListItem with Keyable {
18 TransactionListItem(
@@ -47,10 +47,10 @@ class TransactionListItem extends ActionListItem with Keyable {
47 }
48
49 String get formattedPendingStatus {
50 - if (transaction.confirmations == 0) {
50 + if (transaction.confirmations == 0 || transaction.isPending) {
51 return S.current.pending;
52 }
53 - if (transaction.confirmations > 0 && transaction.height < 10) {
53 + if (transaction.confirmations > 0 && transaction.confirmations < 10) {
54 return ' (${transaction.confirmations}/10)';
55 }
56 return '';
@@ -60,9 +60,8 @@ class TransactionListItem extends ActionListItem with Keyable {
60 if (transaction.direction == TransactionDirection.incoming) {
61 if (balanceViewModel.wallet.type == WalletType.monero ||
62 balanceViewModel.wallet.type == WalletType.haven) {
63 - return transaction.isPending ? formattedPendingStatus : '';
63 + return formattedPendingStatus;
64 }
65 - return transaction.isPending ? S.current.pending : '';
65 }
66 return transaction.isPending ? S.current.pending : '';
67 }