feat: fixed denomination UI

Author: Syn-McJ

DashWallet/Sources/Models/Explore Dash/Model/Entites/ExplorePointOfUse.swift

@@ -59,8 +59,20 @@ extension ExplorePointOfUse {
         let deeplink: String?
         let savingsBasisPoints: Int // in basis points 1 = 0.001%
         let denominationsType: String?
+        let denominations: [Int]
         let redeemType: String?
 
+        init(merchantId: String, paymentMethod: PaymentMethod, type: `Type`, deeplink: String?, savingsBasisPoints: Int, denominationsType: String?, denominations: [Int] = [], redeemType: String?) {
+            self.merchantId = merchantId
+            self.paymentMethod = paymentMethod
+            self.type = type
+            self.deeplink = deeplink
+            self.savingsBasisPoints = savingsBasisPoints
+            self.denominationsType = denominationsType
+            self.denominations = denominations
+            self.redeemType = redeemType
+        }
+        
         func toSavingPercentages() -> Double {
             return Double(savingsBasisPoints) / 100
         }
@@ -234,7 +246,7 @@ extension ExplorePointOfUse: RowDecodable {
             let denominationsType = row[ExplorePointOfUse.denominationsType]
             let redeemType = row[ExplorePointOfUse.redeemType]
             category = .merchant(Merchant(merchantId: merchantId, paymentMethod: Merchant.PaymentMethod(rawValue: paymentMethodRaw)!,
-                                          type: type, deeplink: deeplink, savingsBasisPoints: savingsPercentage, denominationsType: denominationsType, redeemType: redeemType))
+                                          type: type, deeplink: deeplink, savingsBasisPoints: savingsPercentage, denominationsType: denominationsType, denominations: [], redeemType: redeemType))
         } else if let manufacturer = try? row.get(ExplorePointOfUse.manufacturer) {
             let type: Atm.`Type`! = .init(rawValue: row[ExplorePointOfUse.type])
             category = .atm(Atm(manufacturer: manufacturer, type: type))

DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/Details/PointOfUseDetailsViewController.swift

@@ -22,7 +22,7 @@ import SwiftUI
 // MARK: - PointOfUseDetailsViewController
 
 class PointOfUseDetailsViewController: UIViewController {
-    internal let pointOfUse: ExplorePointOfUse
+    internal var pointOfUse: ExplorePointOfUse
     internal let isShowAllHidden: Bool
 
     @objc public var payWithDashHandler: (()->())?
@@ -55,7 +55,7 @@ class PointOfUseDetailsViewController: UIViewController {
         super.viewDidLoad()
         title = pointOfUse.name
         configureHierarchy()
-        tryRefreshCtxToken()
+        refreshTokenAndMerchantInfo()
     }
 }
 
@@ -235,15 +235,27 @@ extension PointOfUseDetailsViewController {
         self.navigationController?.pushViewController(hostingController, animated: true)
     }
 
-    private func tryRefreshCtxToken() {
+    private func refreshTokenAndMerchantInfo() {
         Task {
-            do {
-                try await CTXSpendService.shared.refreshToken()
-            } catch CTXSpendError.tokenRefreshFailed {
-                await showModalDialog(style: .warning, icon: .system("exclamationmark.triangle.fill"), heading: NSLocalizedString("Your session expired", comment: "DashSpend"), textBlock1: NSLocalizedString("It looks like you haven’t used DashSpend in a while. For security reasons, you’ve been logged out.\n\nPlease sign in again to continue exploring where to spend your Dash.", comment: "DashSpend"), positiveButtonText: NSLocalizedString("Dismiss", comment: ""))
+            if try await tryRefreshCtxToken(), let merchantId = pointOfUse.merchant?.merchantId {
+                let merchantInfo = try await CTXSpendService.shared.getMerchant(merchantId: merchantId)
+                pointOfUse = pointOfUse.updatingMerchant(
+                    denominationsType: merchantInfo.denominationsType,
+                    denominations: merchantInfo.denominations.compactMap { Int($0) }
+                )
             }
         }
     }
+    
+    private func tryRefreshCtxToken() async throws -> Bool {
+        do {
+            try await CTXSpendService.shared.refreshToken()
+            return true
+        } catch CTXSpendError.tokenRefreshFailed {
+            await showModalDialog(style: .warning, icon: .system("exclamationmark.triangle.fill"), heading: NSLocalizedString("Your session expired", comment: "DashSpend"), textBlock1: NSLocalizedString("It looks like you haven’t used DashSpend in a while. For security reasons, you’ve been logged out.\n\nPlease sign in again to continue exploring where to spend your Dash.", comment: "DashSpend"), positiveButtonText: NSLocalizedString("Dismiss", comment: ""))
+            return false
+        }
+    }
 }
 
 
@@ -290,3 +302,40 @@ extension UIHostingController: NavigationBarDisplayable {
     var isBackButtonHidden: Bool { true }
     var isNavigationBarHidden: Bool { true }
 }
+
+extension ExplorePointOfUse {
+    func updatingMerchant(denominationsType: String?, denominations: [Int]) -> ExplorePointOfUse {
+        guard case .merchant(let currentMerchant) = category else { return self }
+        
+        let updatedMerchant = ExplorePointOfUse.Merchant(
+            merchantId: currentMerchant.merchantId,
+            paymentMethod: currentMerchant.paymentMethod,
+            type: currentMerchant.type,
+            deeplink: currentMerchant.deeplink,
+            savingsBasisPoints: currentMerchant.savingsBasisPoints,
+            denominationsType: denominationsType,
+            denominations: denominations,
+            redeemType: currentMerchant.redeemType
+        )
+        
+        return ExplorePointOfUse(
+            id: id,
+            name: name,
+            category: .merchant(updatedMerchant),
+            active: active,
+            city: city,
+            territory: territory,
+            address1: address1,
+            address2: address2,
+            address3: address3,
+            address4: address4,
+            latitude: latitude,
+            longitude: longitude,
+            website: website,
+            phone: phone,
+            logoLocation: logoLocation,
+            coverImage: coverImage,
+            source: source
+        )
+    }
+}

DashWallet/Sources/UI/Explore Dash/Merchants & ATMs/List/Filters/MerchantFiltersView.swift

@@ -109,7 +109,7 @@ struct MerchantFiltersView: View {
                             }
 
                             RadioButtonRow(
-                                title: NSLocalizedString("Fixed amounts", comment: "Explore Dash: Filters"),
+                                title: NSLocalizedString("Fixed denominated amounts", comment: "Explore Dash: Filters"),
                                 isSelected: viewModel.denominationFixed,
                                 style: .checkbox
                             ) {

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

@@ -122,27 +122,52 @@ struct DashSpendPayScreen: View {
 
                 Spacer()
 
-                NumericKeyboardView(
-                    value: $viewModel.input,
-                    showDecimalSeparator: true,
-                    actionButtonText: NSLocalizedString("Preview", comment: ""),
-                    actionEnabled: viewModel.error == nil && !viewModel.showLimits && !viewModel.isLoading && viewModel.hasValidLimits,
-                    inProgress: viewModel.isProcessingPayment,
-                    actionHandler: {
-                        if !viewModel.isUserSignedIn {
-                            showSignInError()
-                            return
+                if viewModel.isFixedDenomination {
+                    MerchantDenominations(
+                        denominations: viewModel.denominations,
+                        selectedDenomination: viewModel.selectedDenomination,
+                        actionEnabled: viewModel.selectedDenomination != nil && viewModel.error == nil && !viewModel.isLoading,
+                        onDenominationSelected: { denom in
+                            viewModel.selectedDenomination = denom
+                        },
+                        actionHandler: {
+                            if !viewModel.isUserSignedIn {
+                                showSignInError()
+                                return
+                            }
+                            
+                            showConfirmationDialog = true
                         }
-                        
-                        showConfirmationDialog = true
-                    }
-                )
-                .frame(maxWidth: .infinity)
-                .frame(height: 320)
-                .padding(.horizontal, 20)
-                .padding(.bottom, 30)
-                .background(Color.secondaryBackground)
-                .cornerRadius(20)
+                    )
+                    .frame(maxWidth: .infinity)
+                    .padding(.top, 20)
+                    .padding(.horizontal, 20)
+                    .padding(.bottom, 30)
+                    .background(Color.secondaryBackground)
+                    .cornerRadius(20)
+                } else {
+                    NumericKeyboardView(
+                        value: $viewModel.input,
+                        showDecimalSeparator: true,
+                        actionButtonText: NSLocalizedString("Preview", comment: ""),
+                        actionEnabled: viewModel.error == nil && !viewModel.showLimits && !viewModel.isLoading && viewModel.hasValidLimits,
+                        inProgress: viewModel.isProcessingPayment,
+                        actionHandler: {
+                            if !viewModel.isUserSignedIn {
+                                showSignInError()
+                                return
+                            }
+                            
+                            showConfirmationDialog = true
+                        }
+                    )
+                    .frame(maxWidth: .infinity)
+                    .frame(height: 320)
+                    .padding(.horizontal, 20)
+                    .padding(.bottom, 30)
+                    .background(Color.secondaryBackground)
+                    .cornerRadius(20)
+                }
             }
 
             if justAuthenticated {

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

@@ -49,6 +49,17 @@ class DashSpendPayViewModel: NSObject, ObservableObject {
     @Published var minimumAmount: Decimal = 0
     @Published var maximumAmount: Decimal = 0
     @Published var error: Error? = nil
+    @Published var isFixedDenomination: Bool = false
+    @Published var denominations: [Int] = []
+    @Published var selectedDenomination: Int? = nil {
+        didSet {
+            if let denom = selectedDenomination {
+                input = String(denom)
+            } else {
+                input = "0"
+            }
+        }
+    }
     @Published var input: String = "0" {
         didSet {
             // Replace the initial "0" when entering a new digit
@@ -100,6 +111,11 @@ class DashSpendPayViewModel: NSObject, ObservableObject {
             self.merchantId = merchantId
         }
 
+        if let denomType = merchant.merchant?.denominationsType {
+            self.isFixedDenomination = denomType == DenominationType.Fixed.rawValue
+            self.denominations = merchant.merchant?.denominations.compactMap { Int($0) } ?? []
+        }
+        
         super.init()
 
         // Initialize with current sign-in state
@@ -153,7 +169,6 @@ class DashSpendPayViewModel: NSObject, ObservableObject {
         customIconProvider.updateIcon(txId: transaction.txHashData, iconUrl: merchantIconUrl)
         saveGiftCardDummy(txHashData: transaction.txHashData, giftCardId: response.paymentId)
 
-        
         return transaction.txHashData
     }
 
@@ -166,8 +181,8 @@ class DashSpendPayViewModel: NSObject, ObservableObject {
         body += "min: \(minimumAmount)\n"
         body += "max: \(maximumAmount)\n"
         body += "discount: \(savingsFraction)\n"
-//        body += "denominations type: \(denominationsType)\n" TODO: fixed denoms
-//        body += "denominations: \(denominations)\n"
+        body += "fixed denomination: \(isFixedDenomination)\n"
+        body += "denominations: \(denominations)\n"
         body += "\n"
 
         body += "Purchase Details\n"
@@ -228,8 +243,12 @@ class DashSpendPayViewModel: NSObject, ObservableObject {
             savingsFraction = Decimal(merchantInfo.savingsPercentage) / Decimal(10000)
 
             if merchantInfo.denominationType == .Range {
+                isFixedDenomination = false
                 minimumAmount = Decimal(merchantInfo.minimumCardPurchase)
                 maximumAmount = Decimal(merchantInfo.maximumCardPurchase)
+            } else {
+                isFixedDenomination = true
+                denominations = merchantInfo.denominations.compactMap { Int($0) }
             }
 
             checkAmountForErrors()

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

@@ -20,10 +20,10 @@ import SwiftUI
 struct MerchantDenominations: View {
     let denominations: [Int]
     let currency: String = "USD"
-    @Binding var selectedDenomination: Int?
-    let canContinue: Bool = true
-    let onDenominationSelected: (Int) -> Void = { _ in }
-    let onContinue: () -> Void = { }
+    let selectedDenomination: Int?
+    let actionEnabled: Bool
+    let onDenominationSelected: (Int) -> Void
+    let actionHandler: () -> Void
 
     private var numberFormatter: NumberFormatter {
         let formatter = NumberFormatter()
@@ -40,11 +40,11 @@ struct MerchantDenominations: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
-            Text(NSLocalizedString("Select amount", comment: "DashSpend denomination selection"))
+            Text(NSLocalizedString("Select amount", comment: "DashSpend"))
                 .font(.h5Bold)
                 .foregroundColor(.primaryText)
 
-            Text(NSLocalizedString("Select fixed amount", comment: "DashSpend denomination selection subtitle"))
+            Text(NSLocalizedString("This merchant sells gift cards at fixed prices", comment: "DashSpend"))
                 .font(.body2)
                 .foregroundColor(.secondaryText)
                 .padding(.top, 4)
@@ -68,8 +68,8 @@ struct MerchantDenominations: View {
                 style: .filled,
                 size: .large,
                 stretch: true,
-                isEnabled: selectedDenomination != nil && selectedDenomination != 0 && canContinue,
-                action: onContinue
+                isEnabled: selectedDenomination != nil && selectedDenomination != 0 && actionEnabled,
+                action: actionHandler
             )
             .padding(.top, 20)
         }
@@ -97,7 +97,7 @@ private struct DenominationChip: View {
                 .overlay(
                     RoundedRectangle(cornerRadius: 14)
                         .stroke(
-                            isSelected ? Color.dashBlue : Color.gray400,
+                            isSelected ? Color.dashBlue : Color.primaryText.opacity(0.08),
                             lineWidth: 1.5
                         )
                 )

DashWallet/ar.lproj/Localizable.strings

@@ -971,7 +971,7 @@
 "First minimum deposit" = "First minimum deposit";
 
 /* Explore Dash: Filters */
-"Fixed amounts" = "Fixed amounts";
+"Fixed denominated amounts" = "Fixed denominated amounts";
 
 /* Explore Dash: Filters */
 "Flexible amounts" = "Flexible amounts";
@@ -2208,9 +2208,6 @@
    Block explorer selection title */
 "Select block explorer" = "Select block explorer";
 
-/* DashSpend denomination selection subtitle */
-"Select fixed amount" = "Select fixed amount";
-
 /* No comment provided by engineer. */
 "Select from Gallery" = "Select from Gallery";
 
@@ -2539,6 +2536,9 @@
 /* DashSpend */
 "This merchant is currently unavailable. Please try again later or choose a different merchant." = "This merchant is currently unavailable. Please try again later or choose a different merchant.";
 
+/* DashSpend */
+"This merchant sells gift cards at fixed prices" = "This merchant sells gift cards at fixed prices";
+
 /* No comment provided by engineer. */
 "This PIN will be required to unlock your app every time when you use it." = "سيكون الرقم  السري هذا مطلوبًا لإلغاء قفل تطبيقك في كل مرة تستخدمه.";
 

DashWallet/bg.lproj/Localizable.strings

@@ -971,7 +971,7 @@
 "First minimum deposit" = "First minimum deposit";
 
 /* Explore Dash: Filters */
-"Fixed amounts" = "Fixed amounts";
+"Fixed denominated amounts" = "Fixed denominated amounts";
 
 /* Explore Dash: Filters */
 "Flexible amounts" = "Flexible amounts";
@@ -2208,9 +2208,6 @@
    Block explorer selection title */
 "Select block explorer" = "Select block explorer";
 
-/* DashSpend denomination selection subtitle */
-"Select fixed amount" = "Select fixed amount";
-
 /* No comment provided by engineer. */
 "Select from Gallery" = "Select from Gallery";
 
@@ -2539,6 +2536,9 @@
 /* DashSpend */
 "This merchant is currently unavailable. Please try again later or choose a different merchant." = "This merchant is currently unavailable. Please try again later or choose a different merchant.";
 
+/* DashSpend */
+"This merchant sells gift cards at fixed prices" = "This merchant sells gift cards at fixed prices";
+
 /* No comment provided by engineer. */
 "This PIN will be required to unlock your app every time when you use it." = "Този ПИН ще бъде необходим за отключване на приложението ви всеки път, когато го използвате.";