From a9fddffa619e461c20080f7cff9975e11c897930 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Mon, 10 Aug 2026 18:00:19 +0700 Subject: [PATCH 1/3] feat(home): internal transfers render a circulating-arrows amount, not a sign MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An identity top-up read "+2 Đ" — like an external receive — when it only moved the wallet's own funds. Every internal history row now renders the amount signless with a circulating-arrows glyph before it (DashUIKit's new TransactionView.amountAccessorySystemImage): - main-feed rows with an internalTransferRoute (identity top-up / registration / invitation, to-Shielded, Shielded payout, to-Platform, self-sends) - internal shielded-activity rows (already signless; now carry the glyph) - the CoinJoin mixing group row External sends and receives keep their +/- signs. DashUIKit pin: master → feat/amount-accessory-icon (dashpay/DashUIKit#10, which also carries the TextField-prompt fix master needs to compile for iOS). Flip back to master once that PR merges. Co-Authored-By: Claude Fable 5 --- DashWallet.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 18 +++++++++--------- .../Sources/UI/Home/Views/HomeView.swift | 9 +++++++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index 207ae78957..59d7acb50f 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -13303,7 +13303,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/dashpay/DashUIKit"; requirement = { - branch = master; + branch = "feat/amount-accessory-icon"; kind = branch; }; }; diff --git a/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved index c0f6c60fc5..0522c1e728 100644 --- a/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,15 +1,15 @@ { - "originHash" : "c249ed8d75daf51cf5f1467a120fdeaf4cb1d396e8e7721de5bd30aa8b713ba4", - "pins" : [ + "originHash": "cecc72572cc422aa0d68b46e2be53c36997e822a15e2da6434836b8dda9e4934", + "pins": [ { - "identity" : "dashuikit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/dashpay/DashUIKit", - "state" : { - "branch" : "master", - "revision" : "046f087514e12f01087ba20efd5e73c682172ebf" + "identity": "dashuikit", + "kind": "remoteSourceControl", + "location": "https://github.com/dashpay/DashUIKit", + "state": { + "branch": "feat/amount-accessory-icon", + "revision": "499abc26b4e10b7f7f12d67d58c3e3b0486ec26d" } } ], - "version" : 3 + "version": 3 } diff --git a/DashWallet/Sources/UI/Home/Views/HomeView.swift b/DashWallet/Sources/UI/Home/Views/HomeView.swift index 0c2772105c..7824d6970f 100644 --- a/DashWallet/Sources/UI/Home/Views/HomeView.swift +++ b/DashWallet/Sources/UI/Home/Views/HomeView.swift @@ -721,7 +721,8 @@ struct HomeViewContent: 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) @@ -780,7 +781,10 @@ struct HomeViewContent: 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", fiat: txItem.fiatAmount, trailingStatusText: txItem.state == .locked ? NSLocalizedString("Locked", comment: "Transaction state: coinbase reward locked until 100 confirmations") : nil ) { @@ -812,6 +816,7 @@ struct HomeViewContent: 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 ) { From 675f239a179149c7b5938e996967c15e5b2c1167 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Mon, 10 Aug 2026 18:17:52 +0700 Subject: [PATCH 2/3] chore: DashUIKit pin back to master (dashpay/DashUIKit#10 merged) Co-Authored-By: Claude Fable 5 --- DashWallet.xcodeproj/project.pbxproj | 2 +- DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index 59d7acb50f..207ae78957 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -13303,7 +13303,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/dashpay/DashUIKit"; requirement = { - branch = "feat/amount-accessory-icon"; + branch = master; kind = branch; }; }; diff --git a/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0522c1e728..3780d03743 100644 --- a/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind": "remoteSourceControl", "location": "https://github.com/dashpay/DashUIKit", "state": { - "branch": "feat/amount-accessory-icon", - "revision": "499abc26b4e10b7f7f12d67d58c3e3b0486ec26d" + "branch": "master", + "revision": "88bf41f3c3e8c66bf7ac653841643d4a4bed2444" } } ], From dde47133bce2b6978dcdeb764765687d62264618 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Mon, 10 Aug 2026 18:23:25 +0700 Subject: [PATCH 3/3] fix(ui): metadata precedence for the internal-transfer amount treatment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merchant/gift-card metadata already wins over the route icons and title on a history row; give the amount the same precedence — the signless circulating-arrows treatment applies only to metadata-less internal moves. (No regression test: the unit-test target is pre-existing broken; verified by build + simulator smoke.) Co-Authored-By: Claude Fable 5 --- DashWallet/Sources/UI/Home/Views/HomeView.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/DashWallet/Sources/UI/Home/Views/HomeView.swift b/DashWallet/Sources/UI/Home/Views/HomeView.swift index 7824d6970f..54a75be819 100644 --- a/DashWallet/Sources/UI/Home/Views/HomeView.swift +++ b/DashWallet/Sources/UI/Home/Views/HomeView.swift @@ -745,6 +745,9 @@ struct HomeViewContent: 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). @@ -783,8 +786,8 @@ struct HomeViewContent: View { dashAmount: txItem.signedDashAmount, // 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", + 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 ) {