Skip to content

Commit 06f538c

Browse files
authored
Fix pending transaction action sheet text (#341)
* Fix pending transaction action sheet text fix timer crash when dismissing action sheet * lockfile update
1 parent 1ad59de commit 06f538c

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

mobile-app/lib/features/components/transaction_details_action_sheet.dart

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class TransactionDetailsActionSheet extends ConsumerStatefulWidget {
3232
}
3333

3434
class _TransactionDetailsActionSheetState extends ConsumerState<TransactionDetailsActionSheet> {
35-
late Timer _timer;
35+
Timer? _timer;
3636
late Duration _remainingTime;
3737

3838
Future<String> get _checksumFuture {
@@ -77,6 +77,10 @@ class _TransactionDetailsActionSheetState extends ConsumerState<TransactionDetai
7777
return 'RECEIVING';
7878
}
7979

80+
if (widget.transaction is PendingTransactionEvent) {
81+
return widget.role == TransactionRole.sender ? 'SENDING' : 'RECEIVING';
82+
}
83+
8084
if (widget.role == TransactionRole.sender) {
8185
return 'SENT';
8286
}
@@ -98,8 +102,14 @@ class _TransactionDetailsActionSheetState extends ConsumerState<TransactionDetai
98102
return 'from';
99103
}
100104
if (widget.role == TransactionRole.sender) {
105+
if (widget.transaction is PendingTransactionEvent) {
106+
return 'sending to';
107+
}
101108
return 'was successfully sent to';
102109
}
110+
if (widget.transaction is PendingTransactionEvent) {
111+
return 'receiving from';
112+
}
103113
return 'received from';
104114
}
105115

@@ -158,7 +168,7 @@ class _TransactionDetailsActionSheetState extends ConsumerState<TransactionDetai
158168

159169
@override
160170
void dispose() {
161-
_timer.cancel();
171+
_timer?.cancel();
162172
super.dispose();
163173
}
164174

quantus_sdk/pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ packages:
390390
dependency: "direct main"
391391
description:
392392
path: dart
393-
ref: HEAD
394-
resolved-ref: "1a12c851561b4000350830d55b3bd96a35922b38"
393+
ref: "v1.0.0"
394+
resolved-ref: fa788c17e08ae463f8f3a9690e2ecdc4d0b8565f
395395
url: "https://github.com/Quantus-Network/human-checkphrase.git"
396396
source: git
397397
version: "0.1.0"

0 commit comments

Comments
 (0)