Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-18 16:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

show n/x confirms while unconfirmed

Browse source
This commit is contained in:
julian 2024-07-15 15:19:00 -06:00 committed by julian-CStack
parent 4acfbde791
commit 816eb37477
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/models/isar/models/blockchain_data/v2/transaction_v2.dart
View file

@ -192,6 +192,9 @@ class TransactionV2 {
required int currentChainHeight,
required int minConfirms,
}) {
String prettyConfirms() =>
"(${getConfirmations(currentChainHeight)}/$minConfirms)";
if (subType == TransactionSubType.cashFusion ||
subType == TransactionSubType.mint ||
(subType == TransactionSubType.sparkMint &&
@ -199,7 +202,7 @@ class TransactionV2 {
if (isConfirmed(currentChainHeight, minConfirms)) {
return "Anonymized";
} else {
return "Anonymizing";
return "Anonymizing ${prettyConfirms()}";
}
}
@ -219,7 +222,7 @@ class TransactionV2 {
} else if ((numberOfMessages ?? 0) > 1) {
return "Receiving (waiting for confirmations)"; // TODO test if the sender still has to open again after the receiver has 2 messages present, ie. sender->receiver->sender->node (yes) vs. sender->receiver->node (no)
} else {
return "Receiving";
return "Receiving ${prettyConfirms()}";
}
}
} else if (type == TransactionType.outgoing) {
@ -231,7 +234,7 @@ class TransactionV2 {
} else if ((numberOfMessages ?? 0) > 1) {
return "Sending (waiting for confirmations)";
} else {
return "Sending";
return "Sending ${prettyConfirms()}";
}
}
}
@ -244,16 +247,20 @@ class TransactionV2 {
if (isConfirmed(currentChainHeight, minConfirms)) {
return "Received";
} else {
return "Receiving";
return "Receiving ${prettyConfirms()}";
}
} else if (type == TransactionType.outgoing) {
if (isConfirmed(currentChainHeight, minConfirms)) {
return "Sent";
} else {
return "Sending";
return "Sending ${prettyConfirms()}";
}
} else if (type == TransactionType.sentToSelf) {
return "Sent to self";
if (isConfirmed(currentChainHeight, minConfirms)) {
return "Sent to self";
} else {
return "Sent to self ${prettyConfirms()}";
}
} else {
return type.name;
}

18
lib/pages/wallet_view/transaction_views/transaction_details_view.dart
View file

@ -134,13 +134,15 @@ class _TransactionDetailsViewState
}
String whatIsIt(Transaction tx, int height) {
String prettyConfirms() => "(${tx.getConfirmations(height)}/$minConfirms)";
final type = tx.type;
if (coin is Firo) {
if (tx.subType == TransactionSubType.mint) {
if (tx.isConfirmed(height, minConfirms)) {
return "Minted";
} else {
return "Minting";
return "Minting ${prettyConfirms()}";
}
}
}
@ -157,7 +159,7 @@ class _TransactionDetailsViewState
} else if ((_transaction.numberOfMessages ?? 0) > 1) {
return "Receiving (waiting for confirmations)"; // TODO test if the sender still has to open again after the receiver has 2 messages present, ie. sender->receiver->sender->node (yes) vs. sender->receiver->node (no)
} else {
return "Receiving";
return "Receiving ${prettyConfirms()}";
}
}
} else if (type == TransactionType.outgoing) {
@ -169,7 +171,7 @@ class _TransactionDetailsViewState
} else if ((_transaction.numberOfMessages ?? 0) > 1) {
return "Sending (waiting for confirmations)";
} else {
return "Sending";
return "Sending ${prettyConfirms()}";
}
}
}
@ -182,16 +184,20 @@ class _TransactionDetailsViewState
if (tx.isConfirmed(height, minConfirms)) {
return "Received";
} else {
return "Receiving";
return "Receiving ${prettyConfirms()}";
}
} else if (type == TransactionType.outgoing) {
if (tx.isConfirmed(height, minConfirms)) {
return "Sent";
} else {
return "Sending";
return "Sending ${prettyConfirms()}";
}
} else if (type == TransactionType.sentToSelf) {
return "Sent to self";
if (tx.isConfirmed(height, minConfirms)) {
return "Sent to self";
} else {
return "Sent to self ${prettyConfirms()}";
}
} else {
return type.name;
}