fix(dashspend): fix getting discount info and displaying addresses

dashpay · Jun 26, 2024 · 696a985 · 696a985
1 parent 22eddf6
commit 696a985
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...main/java/org/dash/wallet/features/exploredash/data/ctxspend/model/GetMerchantResponse.kt b/...main/java/org/dash/wallet/features/exploredash/data/ctxspend/model/GetMerchantResponse.kt
@@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName
 data class GetMerchantResponse(
     val id: String,
     val denominations: List<String>,
-    val denominationType: String,
+    val denominationsType: String,
     val savingsPercentage: Int = 0,
     val redeemType: String = ""
 ) {
@@ -38,7 +38,7 @@ data class GetMerchantResponse(
         }
     val maximumCardPurchase: Double
         get() {
-            return when (denominationType) {
+            return when (denominationsType) {
                 "min-max" -> {
                     require(denominations.size == 2)
                     denominations[1].toDouble()

diff --git a/...ash/src/main/java/org/dash/wallet/features/exploredash/data/explore/model/SearchResult.kt b/...ash/src/main/java/org/dash/wallet/features/exploredash/data/explore/model/SearchResult.kt
@@ -20,6 +20,7 @@ package org.dash.wallet.features.exploredash.data.explore.model
 import androidx.room.ColumnInfo
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
+import org.dash.wallet.common.data.ServiceName
 import org.dash.wallet.features.exploredash.ui.extensions.Const
 
 open class SearchResult(
@@ -60,6 +61,15 @@ open class SearchResult(
             addressBuilder.append("${separator}$address4")
         }
 
+        // CTX records do not use address2, address3, address4
+        if (source?.lowercase() == ServiceName.CTXSpend.lowercase()) {
+            addressBuilder.append("${separator}$city")
+            territory?.let {
+                addressBuilder.append(", ")
+                addressBuilder.append(territory)
+            }
+        }
+
         return addressBuilder.toString()
     }