Skip to content

feat(ui): internal transfers render a circulating-arrows amount, not a sign #952

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
QuantumExplorer merged 3 commits into from
Aug 10, 2026
Merged

feat(ui): internal transfers render a circulating-arrows amount, not a sign #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9fddff
feat(home): internal transfers render a circulating-arrows amount, no…
QuantumExplorer Aug 10, 2026
675f239
chore: DashUIKit pin back to master (dashpay/DashUIKit#10 merged)
QuantumExplorer Aug 10, 2026
dde4713
fix(ui): metadata precedence for the internal-transfer amount treatment
QuantumExplorer Aug 10, 2026
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
18 changes: 9 additions & 9 deletions DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions DashWallet/Sources/UI/Home/Views/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,8 @@ struct HomeViewContent<Content: View>: View {
title: NSLocalizedString("Mixing Transactions", comment: "CoinJoin"),
subtitle: firstTx?.shortTimeString ?? "",
dashAmount: set.amount,
amountSign: .none
amountSign: .none,
amountAccessorySystemImage: "arrow.triangle.2.circlepath"
)
.onTapGesture { self.selectedTxDataItem = txDataItem }
.frame(height: 80)
Expand All @@ -744,6 +745,9 @@ struct HomeViewContent<Content: View>: View {
// Service/merchant metadata wins over the route pair — such rows
// are external payments, not transfers of own funds.
let routeSymbols = metadata == nil ? transferRouteSymbols(txItem: txItem) : nil
// Same precedence for the amount treatment: only a metadata-less
// internal move drops the +/- sign for the circulating-arrows glyph.
let isInternalAmount = metadata == nil && txItem.internalTransferRoute != nil
// A DashPay contact payment shows the counterparty's avatar
// (profile image, or the deterministic initial placeholder the
// contacts screens use).
Expand Down Expand Up @@ -780,7 +784,10 @@ struct HomeViewContent<Content: View>: View {
// counterparty's actual name underneath.
: transferRouteDetails(txItem: txItem) ?? txItem.dashPayPaymentDetailsName),
dashAmount: txItem.signedDashAmount,
amountSign: .always,
// Internal moves carry no direction: no +/- sign, a
// circulating-arrows glyph qualifies the amount instead.
amountSign: isInternalAmount ? .none : .always,
amountAccessorySystemImage: isInternalAmount ? "arrow.triangle.2.circlepath" : nil,
fiat: txItem.fiatAmount,
trailingStatusText: txItem.state == .locked ? NSLocalizedString("Locked", comment: "Transaction state: coinbase reward locked until 100 confirmations") : nil
) {
Expand Down Expand Up @@ -812,6 +819,7 @@ struct HomeViewContent<Content: View>: View {
details: item.detailsText,
dashAmount: item.signedDashAmount,
amountSign: item.showsDirectionSign ? .always : .none,
amountAccessorySystemImage: item.showsDirectionSign ? nil : "arrow.triangle.2.circlepath",
fiat: item.fiatAmount,
trailingStatusText: item.trailingStatusText
) {
Expand Down
Loading