Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion DashWallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13303,7 +13303,7 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/dashpay/DashUIKit";
requirement = {
branch = master;
branch = "feat/amount-accessory-icon";
kind = branch;
};
};
Expand Down
18 changes: 9 additions & 9 deletions DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved

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

9 changes: 7 additions & 2 deletions DashWallet/Sources/UI/Home/Views/HomeView.swift
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 Down Expand Up @@ -780,7 +781,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: txItem.internalTransferRoute == nil ? .always : .none,
amountAccessorySystemImage: txItem.internalTransferRoute == nil ? nil : "arrow.triangle.2.circlepath",
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
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 +816,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