Skip to content

[trello.com/c/SL4zLZnb] Improve "❌" error presenting in TransactionDetailsViewControllerBase #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lainaaa merged 1 commit into from
Aug 19, 2025
Merged

[trello.com/c/SL4zLZnb] Improve "❌" error presenting in TransactionDetailsViewControllerBase #897

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Adamant/Modules/Wallets/TransactionDetailsViewControllerBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
row.value = value
} else if self?.transaction?.transactionStatus == .failed{
row.value = TransactionDetailsViewControllerBase.failedValueString
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
} else {
row.value = TransactionDetailsViewControllerBase.awaitingValueString
}
Expand Down Expand Up @@ -432,6 +433,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
row.value = DoubleDetail(first: recipientName, second: transaction.recipientAddress)
} else if self?.transaction?.transactionStatus == .failed {
row.value = DoubleDetail(first: TransactionDetailsViewControllerBase.failedValueString, second: nil)
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
} else {
row.value = DoubleDetail(first: transaction.recipientAddress, second: nil)
if transaction.recipientAddress.isEmpty {
Expand Down Expand Up @@ -470,6 +472,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
row.value = value
} else if self?.transaction?.transactionStatus == .failed{
row.value = TransactionDetailsViewControllerBase.failedValueString
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
} else {
row.value = TransactionDetailsViewControllerBase.awaitingValueString
}
Expand Down Expand Up @@ -500,6 +503,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
row.value = formatter.string(from: value)
} else if self?.transaction?.transactionStatus == .failed{
row.value = TransactionDetailsViewControllerBase.failedValueString
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
} else {
row.value = TransactionDetailsViewControllerBase.awaitingValueString
}
Expand All @@ -523,6 +527,10 @@ class TransactionDetailsViewControllerBase: FormViewController {
}.cellUpdate { [weak self] (cell, row) in
cell.textLabel?.textColor = UIColor.adamant.textColor
row.value = self?.getFeeValue()

if self?.transaction?.transactionStatus == .failed {
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
}
}

detailsSection.append(feeRow)
Expand Down Expand Up @@ -552,6 +560,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
row.value = value
} else if self?.transaction?.transactionStatus == .failed{
row.value = TransactionDetailsViewControllerBase.failedValueString
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
} else {
row.value = TransactionDetailsViewControllerBase.awaitingValueString
}
Expand Down Expand Up @@ -588,6 +597,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
row.value = value
} else if self?.transaction?.transactionStatus == .failed{
row.value = TransactionDetailsViewControllerBase.failedValueString
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
} else {
row.value = TransactionDetailsViewControllerBase.awaitingValueString
}
Expand Down Expand Up @@ -650,6 +660,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
row.value = value
} else if self?.transaction?.transactionStatus == .failed{
row.value = TransactionDetailsViewControllerBase.failedValueString
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
} else {
row.value = TransactionDetailsViewControllerBase.awaitingValueString
}
Expand All @@ -676,6 +687,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
}.cellUpdate { [weak self] (cell, row) in
cell.textLabel?.textColor = UIColor.adamant.textColor
if self?.transaction?.transactionStatus == .failed{
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
row.value = TransactionDetailsViewControllerBase.failedValueString
}
}
Expand Down Expand Up @@ -724,6 +736,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
row.value = value
} else if self?.transaction?.transactionStatus == .failed{
row.value = TransactionDetailsViewControllerBase.failedValueString
cell.detailTextLabel?.font = cell.detailTextLabel?.font.withSize(14)
} else {
row.value = TransactionDetailsViewControllerBase.awaitingValueString
}
Expand Down Expand Up @@ -976,7 +989,7 @@ class TransactionDetailsViewControllerBase: FormViewController {
}

func getFeeValue() -> String {
if transaction?.transactionStatus == .failed {
guard transaction?.transactionStatus != .failed else {
return TransactionDetailsViewControllerBase.failedValueString
}
guard let value = transaction?.feeValue, value > 0 else {
Expand Down