Skip to content

Commit a3ec62f

Browse files
authored
Merge pull request #746 from dashpay/PC-support-msg
fix: pc support msg
2 parents 324a790 + bf7398f commit a3ec62f

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

DashWallet/Sources/UI/Explore Dash/Views/DashSpend/DashSpendPayScreen.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@ struct DashSpendPayScreen: View {
228228
positiveButtonAction: {
229229
showCustomErrorDialog = false
230230
},
231-
negativeButtonText: NSLocalizedString("Contact CTX Support", comment: "DashSpend"),
231+
negativeButtonText: viewModel.contactSupportButtonText,
232232
negativeButtonAction: {
233233
showCustomErrorDialog = false
234-
viewModel.contactCTXSupport()
234+
viewModel.contactSupport()
235235
}
236236
)
237237
.frame(maxWidth: .infinity, maxHeight: .infinity)

DashWallet/Sources/UI/Explore Dash/Views/DashSpend/DashSpendPayViewModel.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,12 @@ class DashSpendPayViewModel: NSObject, ObservableObject, NetworkReachabilityHand
278278

279279
return transaction.txHashData
280280
}
281-
282-
func contactCTXSupport() {
281+
282+
var contactSupportButtonText: String {
283+
String(format: NSLocalizedString("Contact %@ Support", comment: "DashSpend"), provider.displayName)
284+
}
285+
286+
func contactSupport() {
283287
let subject = "\(provider.displayName) Issue: Spending Limit Problem"
284288

285289
var body = "Merchant details\n"

DashWallet/Sources/UI/SwiftUI Components/ButtonsGroup.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ struct ButtonsGroup: View {
6868
.overrideBackgroundColor(style == .regular ? .dashBlue : .buttonRed)
6969
.overrideForegroundColor(negativeButtonText == nil ? .dashBlue : .white)
7070
negativeButton
71-
.overrideForegroundColor(positiveButtonText == nil ? .dashBlue : .primaryText)
71+
.overrideForegroundColor(.dashBlue)
7272
}
7373
} else {
7474
HStack(spacing: 6) {
7575
negativeButton
7676
.frame(maxWidth: .infinity)
77-
.overrideForegroundColor(positiveButtonText == nil ? .dashBlue : .primaryText)
77+
.overrideForegroundColor(.dashBlue)
7878
positiveButton
7979
.frame(maxWidth: .infinity)
8080
.overrideBackgroundColor(style == .regular ? .dashBlue : .buttonRed)

0 commit comments

Comments
 (0)