diff --git a/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DashWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved index c0f6c60fc..3780d0374 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": "master", + "revision": "88bf41f3c3e8c66bf7ac653841643d4a4bed2444" } } ], - "version" : 3 + "version": 3 } diff --git a/DashWallet/Sources/UI/Home/Views/HomeView.swift b/DashWallet/Sources/UI/Home/Views/HomeView.swift index 0c2772105..54a75be81 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) @@ -744,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). @@ -780,7 +784,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: 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 ) { @@ -812,6 +819,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 ) {