feat: improved error handling

Author: Syn-McJ

DashWallet/Sources/Models/Explore Dash/Infrastructure/DAO Impl/MerchantDAO.swift

@@ -72,6 +72,10 @@ class MerchantDAO: PointOfUseDAO {
                 queryFilter = queryFilter && methods.map { $0.rawValue }.contains(paymentMethodColumn)
             }
 
+            // Filter out URL-based redemption merchants (not supported)
+            // Using literal expression to handle cases where redeemType column might not exist
+            queryFilter = queryFilter && Expression<Bool>(literal: "(redeemType IS NULL OR redeemType != 'url')")
+            
             // Add denomination type filter (only applies to gift card merchants)
             if let denominationType = denominationType {
                 switch denominationType {

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

@@ -59,6 +59,7 @@ extension ExplorePointOfUse {
         let deeplink: String?
         let savingsBasisPoints: Int // in basis points 1 = 0.001%
         let denominationsType: String?
+        let redeemType: String?
 
         func toSavingPercentages() -> Double {
             return Double(savingsBasisPoints) / 100
@@ -193,6 +194,7 @@ extension ExplorePointOfUse: RowDecodable {
     static let manufacturer = Expression<String?>("manufacturer")
     static let savingPercentage = Expression<Int>("savingsPercentage")
     static let denominationsType = Expression<String?>("denominationsType")
+    static let redeemType = Expression<String?>("redeemType")
 
     init(row: Row) {
         let name = row[ExplorePointOfUse.name]
@@ -230,8 +232,9 @@ extension ExplorePointOfUse: RowDecodable {
             let deeplink = row[ExplorePointOfUse.deeplink]
             let savingsPercentage = row[ExplorePointOfUse.savingPercentage]
             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))
+                                          type: type, deeplink: deeplink, savingsBasisPoints: savingsPercentage, denominationsType: denominationsType, 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/Models/Explore Dash/Services/CTXSpendAPI.swift

@@ -27,6 +27,11 @@ enum CTXSpendError: Error, LocalizedError {
     case insufficientFunds
     case invalidMerchant
     case invalidAmount
+    case merchantUnavailable
+    case transactionRejected
+    case purchaseLimitExceeded
+    case purchaseLimitBelowMinimum
+    case serverError
     case customError(String)
     case unknown
     case paymentProcessingError(String)
@@ -44,11 +49,21 @@ enum CTXSpendError: Error, LocalizedError {
         case .tokenRefreshFailed:
             return NSLocalizedString("Your session expired", comment: "DashSpend")
         case .insufficientFunds:
-            return NSLocalizedString("Insufficient funds to complete this purchase.", comment: "DashSpend")
+            return NSLocalizedString("Insufficient funds to complete this purchase. Please add more Dash to your wallet or reduce the amount.", comment: "DashSpend")
         case .invalidMerchant:
             return NSLocalizedString("This merchant is currently unavailable.", comment: "DashSpend")
         case .invalidAmount:
             return NSLocalizedString("Invalid amount. Please check merchant limits.", comment: "DashSpend")
+        case .merchantUnavailable:
+            return NSLocalizedString("This merchant is currently unavailable. Please try again later or choose a different merchant.", comment: "DashSpend")
+        case .transactionRejected:
+            return NSLocalizedString("Your transaction was rejected. Please try again or contact support if the problem persists.", comment: "DashSpend")
+        case .purchaseLimitExceeded:
+            return NSLocalizedString("Purchase amount exceeds the maximum limit for this merchant. Please reduce the amount and try again.", comment: "DashSpend")
+        case .purchaseLimitBelowMinimum:
+            return NSLocalizedString("Purchase amount is below the minimum limit for this merchant. Please increase the amount and try again.", comment: "DashSpend")
+        case .serverError:
+            return NSLocalizedString("Server error occurred. Please try again later.", comment: "DashSpend")
         case .customError(let message):
             return message
         case .unknown:
@@ -88,7 +103,13 @@ final class CTXSpendAPI: HTTPClient<CTXSpendEndpoint> {
             if target.path.contains("/api/verify") {
                 throw CTXSpendError.invalidCode
             }
-            throw CTXSpendError.unknown
+            throw CTXSpendError.invalidAmount
+        } catch HTTPClientError.statusCode(let r) where r.statusCode == 409 {
+            throw CTXSpendError.transactionRejected
+        } catch HTTPClientError.statusCode(let r) where r.statusCode == 422 {
+            throw CTXSpendError.invalidAmount
+        } catch HTTPClientError.statusCode(let r) where r.statusCode >= 500 {
+            throw CTXSpendError.serverError
         } catch HTTPClientError.decoder {
             throw CTXSpendError.parsingError
         }

DashWallet/Sources/Models/Explore Dash/Services/CTXSpendService.swift

@@ -135,35 +135,48 @@ class CTXSpendService: CTXSpendAPIAccessTokenProvider, CTXSpendTokenProvider, Ob
                 switch response.statusCode {
                 case 400:
                     if let errorData = try? JSONDecoder().decode(CTXSpendAPIError.self, from: response.data) {
-                        // Check for limit error first
+                        // Check for limit errors first
                         if let fiatAmountErrors = errorData.fields?.fiatAmount,
-                           let firstFiatError = fiatAmountErrors.first,
-                           (firstFiatError == "above threshold" || firstFiatError == "below threshold") {
-                            throw CTXSpendError.customError(NSLocalizedString("The purchase limits for this merchant have changed. Please contact CTX Support for more information.", comment: "DashSpend"))
+                           let firstFiatError = fiatAmountErrors.first {
+                            if firstFiatError == "above threshold" {
+                                throw CTXSpendError.purchaseLimitExceeded
+                            } else if firstFiatError == "below threshold" {
+                                throw CTXSpendError.purchaseLimitBelowMinimum
+                            }
                         }
 
                         if let firstError = errorData.errors.first {
                             // Look for specific error messages
                             let errorMessage = firstError.message.lowercased()
 
-                            if errorMessage.contains("insufficient") || errorMessage.contains("funds") {
+                            if errorMessage.contains("insufficient") || errorMessage.contains("funds") || errorMessage.contains("balance") {
                                 throw CTXSpendError.insufficientFunds
+                            } else if errorMessage.contains("merchant") && (errorMessage.contains("unavailable") || errorMessage.contains("disabled") || errorMessage.contains("suspended")) {
+                                throw CTXSpendError.merchantUnavailable
                             } else if errorMessage.contains("merchant") {
                                 throw CTXSpendError.invalidMerchant
-                            } else if errorMessage.contains("amount") || errorMessage.contains("value") {
+                            } else if errorMessage.contains("rejected") || errorMessage.contains("declined") {
+                                throw CTXSpendError.transactionRejected
+                            } else if errorMessage.contains("amount") || errorMessage.contains("value") || errorMessage.contains("limit") {
                                 throw CTXSpendError.invalidAmount
                             }
 
                             // Custom error with the actual message from API
-                            throw NSError(domain: "CTXSpend", code: 400, userInfo: [NSLocalizedDescriptionKey: firstError.message])
+                            throw CTXSpendError.customError(firstError.message)
                         }
                     }
                 case 401, 403:
                     throw CTXSpendError.unauthorized
                 case 404:
                     throw CTXSpendError.invalidMerchant
+                case 409:
+                    // Conflict - usually means duplicate transaction or similar
+                    throw CTXSpendError.transactionRejected
+                case 422:
+                    // Unprocessable Entity - validation errors
+                    throw CTXSpendError.invalidAmount
                 case 500...599:
-                    throw CTXSpendError.networkError
+                    throw CTXSpendError.serverError
                 default:
                     break
                 }

DashWallet/Sources/UI/Payments/Amount/Model/Send/SendAmountModel.swift

@@ -27,7 +27,7 @@ enum SendAmountError: Error, ColorizedText, LocalizedError {
     var errorDescription: String? {
         switch self {
         case .insufficientMixedFunds: return NSLocalizedString("Insufficient mixed funds. Wait for CoinJoin mixing to finish or disable this feature in the settings to complete this transaction.", comment: "Send screen")
-        case .insufficientFunds: return NSLocalizedString("Insufficient funds", comment: "Send screen")
+        case .insufficientFunds: return NSLocalizedString("Insufficient funds. Please add more Dash to your wallet or reduce the amount.", comment: "Send screen")
         case .syncingChain: return NSLocalizedString("Wait until wallet is synced to complete the transaction",
                                                      comment: "Send screen")
         }

DashWallet/ar.lproj/Localizable.strings

@@ -1228,8 +1228,11 @@
 /* No comment provided by engineer. */
 "Insufficient funds" = "رصيد غير كاف";
 
-/* CTXSpend error */
-"Insufficient funds to complete this purchase." = "Insufficient funds to complete this purchase.";
+/* DashSpend */
+"Insufficient funds to complete this purchase. Please add more Dash to your wallet or reduce the amount." = "Insufficient funds to complete this purchase. Please add more Dash to your wallet or reduce the amount.";
+
+/* Send screen */
+"Insufficient funds. Please add more Dash to your wallet or reduce the amount." = "Insufficient funds. Please add more Dash to your wallet or reduce the amount.";
 
 /* Send screen */
 "Insufficient mixed funds. Wait for CoinJoin mixing to finish or disable this feature in the settings to complete this transaction." = "Insufficient mixed funds. Wait for CoinJoin mixing to finish or disable this feature in the settings to complete this transaction.";
@@ -1970,6 +1973,12 @@
 /* Coinbase/Buy Dash */
 "Purchase" = "شراء";
 
+/* DashSpend */
+"Purchase amount exceeds the maximum limit for this merchant. Please reduce the amount and try again." = "Purchase amount exceeds the maximum limit for this merchant. Please reduce the amount and try again.";
+
+/* DashSpend */
+"Purchase amount is below the minimum limit for this merchant. Please increase the amount and try again." = "Purchase amount is below the minimum limit for this merchant. Please increase the amount and try again.";
+
 /* Alert title */
 "Purchase Failed" = "Purchase Failed";
 
@@ -2192,10 +2201,16 @@
 /* Buy Sell Dash */
 "Select a service" = "Select a service";
 
+/* DashSpend denomination selection */
+"Select amount" = "Select amount";
+
 /* Block explorer picker
    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";
 
@@ -2287,6 +2302,9 @@
 /* No comment provided by engineer. */
 "Sent to" = "أرسلت الى";
 
+/* DashSpend */
+"Server error occurred. Please try again later." = "Server error occurred. Please try again later.";
+
 /* No comment provided by engineer. */
 "Set a trusted node" = "Set a trusted node";
 
@@ -2479,9 +2497,6 @@
 /* Coinbase */
 "The minimum amount you can send is %@" = "The minimum amount you can send is %@";
 
-/* DashSpend */
-"The purchase limits for this merchant have changed. Please contact CTX Support for more information." = "The purchase limits for this merchant have changed. Please contact CTX Support for more information.";
-
 /* Usernames */
 "The username '%@' was blocked by the Dash Network. Please try again by requesting another username." = "The username '%@' was blocked by the Dash Network. Please try again by requesting another username.";
 
@@ -2521,6 +2536,9 @@
 /* CTXSpend error */
 "This merchant is currently unavailable." = "This merchant is currently unavailable.";
 
+/* 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.";
+
 /* No comment provided by engineer. */
 "This PIN will be required to unlock your app every time when you use it." = "سيكون الرقم  السري هذا مطلوبًا لإلغاء قفل تطبيقك في كل مرة تستخدمه.";
 
@@ -3148,6 +3166,9 @@
 /* DashSpend */
 "Your session expired" = "Your session expired";
 
+/* DashSpend */
+"Your transaction was rejected. Please try again or contact support if the problem persists." = "Your transaction was rejected. Please try again or contact support if the problem persists.";
+
 /* No comment provided by engineer. */
 "Your transaction was sent and the amount should appear in your wallet in a few minutes." = "Your transaction was sent and the amount should appear in your wallet in a few minutes.";
 

DashWallet/bg.lproj/Localizable.strings

@@ -1228,8 +1228,11 @@
 /* No comment provided by engineer. */
 "Insufficient funds" = "Недостатъчно средства";
 
-/* CTXSpend error */
-"Insufficient funds to complete this purchase." = "Insufficient funds to complete this purchase.";
+/* DashSpend */
+"Insufficient funds to complete this purchase. Please add more Dash to your wallet or reduce the amount." = "Insufficient funds to complete this purchase. Please add more Dash to your wallet or reduce the amount.";
+
+/* Send screen */
+"Insufficient funds. Please add more Dash to your wallet or reduce the amount." = "Insufficient funds. Please add more Dash to your wallet or reduce the amount.";
 
 /* Send screen */
 "Insufficient mixed funds. Wait for CoinJoin mixing to finish or disable this feature in the settings to complete this transaction." = "Insufficient mixed funds. Wait for CoinJoin mixing to finish or disable this feature in the settings to complete this transaction.";
@@ -1970,6 +1973,12 @@
 /* Coinbase/Buy Dash */
 "Purchase" = "Purchase";
 
+/* DashSpend */
+"Purchase amount exceeds the maximum limit for this merchant. Please reduce the amount and try again." = "Purchase amount exceeds the maximum limit for this merchant. Please reduce the amount and try again.";
+
+/* DashSpend */
+"Purchase amount is below the minimum limit for this merchant. Please increase the amount and try again." = "Purchase amount is below the minimum limit for this merchant. Please increase the amount and try again.";
+
 /* Alert title */
 "Purchase Failed" = "Purchase Failed";
 
@@ -2192,10 +2201,16 @@
 /* Buy Sell Dash */
 "Select a service" = "Select a service";
 
+/* DashSpend denomination selection */
+"Select amount" = "Select amount";
+
 /* Block explorer picker
    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";
 
@@ -2287,6 +2302,9 @@
 /* No comment provided by engineer. */
 "Sent to" = "Изпратени на";
 
+/* DashSpend */
+"Server error occurred. Please try again later." = "Server error occurred. Please try again later.";
+
 /* No comment provided by engineer. */
 "Set a trusted node" = "Задаване на доверен нод";
 
@@ -2479,9 +2497,6 @@
 /* Coinbase */
 "The minimum amount you can send is %@" = "The minimum amount you can send is %@";
 
-/* DashSpend */
-"The purchase limits for this merchant have changed. Please contact CTX Support for more information." = "The purchase limits for this merchant have changed. Please contact CTX Support for more information.";
-
 /* Usernames */
 "The username '%@' was blocked by the Dash Network. Please try again by requesting another username." = "The username '%@' was blocked by the Dash Network. Please try again by requesting another username.";
 
@@ -2521,6 +2536,9 @@
 /* CTXSpend error */
 "This merchant is currently unavailable." = "This merchant is currently unavailable.";
 
+/* 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.";
+
 /* No comment provided by engineer. */
 "This PIN will be required to unlock your app every time when you use it." = "Този ПИН ще бъде необходим за отключване на приложението ви всеки път, когато го използвате.";
 
@@ -3148,6 +3166,9 @@
 /* DashSpend */
 "Your session expired" = "Your session expired";
 
+/* DashSpend */
+"Your transaction was rejected. Please try again or contact support if the problem persists." = "Your transaction was rejected. Please try again or contact support if the problem persists.";
+
 /* No comment provided by engineer. */
 "Your transaction was sent and the amount should appear in your wallet in a few minutes." = "Вашата транзакция беше изпратена и сумата би трябвало да се появи във вашият портфейл до няколко минути.";