From 43de6a52f067fd30ef471b809eeed24a5aae8e6b Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Fri, 1 Aug 2025 13:09:28 -0700
Subject: [PATCH 01/10] fix: improve handling of CTX errors

---
 .../exploredash/network/RemoteDataSource.kt   |  1 +
 .../repository/CTXSpendRepository.kt          | 10 ++--
 .../ui/ctxspend/CTXSpendViewModel.kt          | 50 ++++++++++++++-----
 .../ctxspend/dialogs/GiftCardDetailsDialog.kt | 21 ++++++++
 .../dialogs/GiftCardDetailsViewModel.kt       |  6 ++-
 .../dialogs/PurchaseGiftCardConfirmDialog.kt  | 23 +++++++++
 .../res/layout/dialog_gift_card_details.xml   | 34 +++++++++++++
 .../main/res/values/strings-explore-dash.xml  |  1 +
 .../exploredash/CTXSpendExceptionTest.kt      | 28 +++++++++++
 9 files changed, 155 insertions(+), 19 deletions(-)

diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/network/RemoteDataSource.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/network/RemoteDataSource.kt
index f31a2df776..d7bbe26498 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/network/RemoteDataSource.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/network/RemoteDataSource.kt
@@ -64,6 +64,7 @@ class RemoteDataSource @Inject constructor(private val config: CTXSpendConfig) {
                 authenticator?.let { client.authenticator(it) }
                 //                if (BuildConfig.DEBUG) { TODO
                 val logging = HttpLoggingInterceptor { message -> log.info(message) }
+                logging.redactHeader("Authorization")
                 logging.level = HttpLoggingInterceptor.Level.BODY
                 client.addInterceptor(logging)
                 //                }
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
index 36a60b84f9..683fb2415a 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
@@ -40,20 +40,22 @@ class CTXSpendException(
     message: String,
     val errorCode: Int? = null,
     val errorBody: String? = null,
-    cause: Exception? = null
+    cause: Exception? = null,
 ) : Exception(message, cause) {
     var resourceString: ResourceString? = null
+    var giftCardResponse: GiftCardResponse? = null
     private val errorMap: Map<String, Any>
 
-    constructor(message: ResourceString) : this("") {
+    constructor(message: ResourceString, giftCardResponse: GiftCardResponse? = null) : this("") {
         this.resourceString = message
+        this.giftCardResponse = giftCardResponse
     }
 
     init {
-        val type = object : TypeToken<Map<String, Any>>() {}.type
         errorMap = try {
             if (errorBody != null) {
-                Gson().fromJson(errorBody, type) ?: emptyMap()
+                @Suppress("UNCHECKED_CAST")
+                Gson().fromJson(errorBody, Map::class.java) as? Map<String, Any> ?: emptyMap()
             } else {
                 emptyMap()
             }
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
index 61bc60c38f..57327df9d4 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
@@ -148,11 +148,11 @@ class CTXSpendViewModel @Inject constructor(
     suspend fun purchaseGiftCard(): GiftCardResponse {
         giftCardMerchant?.merchantId?.let {
             val amountValue = giftCardPaymentValue.value
-
+            val fiatAmount = MonetaryFormat.FIAT.noCode().format(amountValue).toString()
             val response = try {
                 repository.purchaseGiftCard(
                     merchantId = it,
-                    fiatAmount = MonetaryFormat.FIAT.noCode().format(amountValue).toString(),
+                    fiatAmount = fiatAmount,
                     fiatCurrency = "USD",
                     cryptoCurrency = Constants.DASH_CURRENCY
                 )
@@ -173,7 +173,7 @@ class CTXSpendViewModel @Inject constructor(
                 is ResponseResource.Failure -> {
                     log.error("purchaseGiftCard error ${response.errorCode}: ${response.errorBody}")
                     throw CTXSpendException(
-                        "purchaseGiftCard error ${response.errorCode}: ${response.errorBody}",
+                        "/gift-cards POST { fiatAmount=$fiatAmount, merchantId = $it}",
                         response.errorCode,
                         response.errorBody
                     )
@@ -329,7 +329,7 @@ class CTXSpendViewModel @Inject constructor(
 
     fun createEmailIntent(
         subject: String,
-        ex: CTXSpendException
+        ex: CTXSpendException?
     ) = Intent(Intent.ACTION_SEND).apply {
         setType("message/rfc822")
         putExtra(Intent.EXTRA_EMAIL, arrayOf(CTXSpendConstants.REPORT_EMAIL))
@@ -342,7 +342,7 @@ class CTXSpendViewModel @Inject constructor(
         return savedStateHandle.get<String>(MERCHANT_ID_KEY)
     }
 
-    private fun createReportEmail(ex: CTXSpendException): String {
+    private fun createReportEmail(ex: CTXSpendException?): String {
         val report = StringBuilder()
         report.append("CTX Issue Report").append("\n")
         giftCardMerchant?.let { merchant ->
@@ -358,15 +358,39 @@ class CTXSpendViewModel @Inject constructor(
         } ?: run {
             report.append("No merchant selected").append("\n")
         }
+
+//        report.append("\n")
+//        report.append("Purchase Details").append("\n")
+//        report.append("amount: ").append(giftCardPaymentValue.value.toFriendlyString()).append("\n")
         report.append("\n")
-        report.append("Purchase Details").append("\n")
-        report.append("amount: ").append(giftCardPaymentValue.value.toFriendlyString()).append("\n")
-        report.append("\n")
-        ex.errorCode?.let {
-            report.append("code: ").append(it).append("\n")
-        }
-        ex.errorBody?.let {
-            report.append("body:\n").append(it).append("\n")
+        ex?.let { exception ->
+            exception.message?.let {
+                report.append(it).append("\n")
+            }
+            exception.errorCode?.let {
+                report.append("code: ").append(it).append("\n")
+            }
+            exception.errorBody?.let {
+                report.append("body:\n").append(it).append("\n")
+            }
+            exception.giftCardResponse?.let { giftCard ->
+                report.append("Gift Card Information: ").append("\n")
+                    .append("id: ").append(giftCard.id).append("\n")
+                    .append("status: ").append(giftCard.status).append("\n")
+                    .append("barcodeUrl: ").append(giftCard.barcodeUrl ?: "N/A").append("\n")
+                    .append("cardNumber: ").append(giftCard.cardNumber ?: "N/A").append("\n")
+                    .append("cardPin: ").append(giftCard.cardPin ?: "N/A").append("\n")
+                    .append("cryptoAmount: ").append(giftCard.cryptoAmount ?: "N/A").append("\n")
+                    .append("cryptoCurrency: ").append(giftCard.cryptoCurrency ?: "N/A").append("\n")
+                    .append("paymentCryptoNetwork: ").append(giftCard.paymentCryptoNetwork).append("\n")
+                    .append("paymentId: ").append(giftCard.paymentId).append("\n")
+                    .append("percentDiscount: ").append(giftCard.percentDiscount).append("\n")
+                    .append("rate: ").append(giftCard.rate).append("\n")
+                    .append("redeemUrl: ").append(giftCard.redeemUrl).append("\n")
+                    .append("fiatAmount: ").append(giftCard.fiatAmount ?: "N/A").append("\n")
+                    .append("fiatCurrency: ").append(giftCard.fiatCurrency ?: "N/A").append("\n")
+                    .append("paymentUrls: ").append(giftCard.paymentUrls?.toString() ?: "N/A").append("\n")
+            }
         }
         return report.toString()
     }
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
index 1db1d8cd63..1955a9d947 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
@@ -22,6 +22,7 @@ import android.os.Bundle
 import android.util.Size
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StyleRes
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
@@ -55,6 +56,7 @@ import org.dash.wallet.features.exploredash.R
 import org.dash.wallet.features.exploredash.data.ctxspend.model.Barcode
 import org.dash.wallet.features.exploredash.databinding.DialogGiftCardDetailsBinding
 import org.dash.wallet.features.exploredash.repository.CTXSpendException
+import org.dash.wallet.features.exploredash.ui.ctxspend.CTXSpendViewModel
 import org.slf4j.LoggerFactory
 import java.text.DecimalFormat
 import java.text.NumberFormat
@@ -79,6 +81,7 @@ class GiftCardDetailsDialog : OffsetDialogFragment(R.layout.dialog_gift_card_det
     override val forceExpand = true
     private val binding by viewBinding(DialogGiftCardDetailsBinding::bind)
     private val viewModel by viewModels<GiftCardDetailsViewModel>()
+    private val ctxSpendViewModel by viewModels<CTXSpendViewModel>()
     private var originalBrightness: Float = -1f
 
     private val bottomSheetCallback = object : BottomSheetBehavior.BottomSheetCallback() {
@@ -92,6 +95,10 @@ class GiftCardDetailsDialog : OffsetDialogFragment(R.layout.dialog_gift_card_det
         }
     }
 
+    private val launcher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        // Optionally handle result here
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -162,8 +169,10 @@ class GiftCardDetailsDialog : OffsetDialogFragment(R.layout.dialog_gift_card_det
 
                 binding.cardError.isVisible = true
                 binding.cardError.text = message ?: getString(R.string.gift_card_details_error)
+                binding.contactSupport.isVisible = true
             } else {
                 binding.cardError.isVisible = false
+                binding.contactSupport.isVisible = true
             }
         }
 
@@ -174,6 +183,18 @@ class GiftCardDetailsDialog : OffsetDialogFragment(R.layout.dialog_gift_card_det
         binding.viewTransactionDetailsCard.setOnClickListener {
             deepLinkNavigate(DeepLinkDestination.Transaction(viewModel.transactionId.toString()))
         }
+        binding.contactSupport.setOnClickListener {
+            val intent = ctxSpendViewModel.createEmailIntent(
+                "CTX Issue with tx: ${viewModel.transactionId.toStringBase58()}",
+                viewModel.uiState.value.error as? CTXSpendException
+            )
+
+            val chooser = Intent.createChooser(
+                intent,
+                getString(R.string.report_issue_dialog_mail_intent_chooser)
+            )
+            launcher.launch(chooser)
+        }
 
         subscribeToBottomSheetCallback()
     }
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsViewModel.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsViewModel.kt
index ebefff048f..23f16d1c47 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsViewModel.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsViewModel.kt
@@ -168,7 +168,8 @@ class GiftCardDetailsViewModel @Inject constructor(
                                             ResourceString(
                                                 R.string.gift_card_redeem_url_not_supported,
                                                 listOf(giftCard.id, giftCard.paymentId, txid)
-                                            )
+                                            ),
+                                            giftCard
                                         )
                                     )
                                 }
@@ -183,7 +184,8 @@ class GiftCardDetailsViewModel @Inject constructor(
                                         ResourceString(
                                             R.string.gift_card_rejected,
                                             listOf(giftCard.id, giftCard.paymentId, txid)
-                                        )
+                                        ),
+                                        giftCard
                                     )
                                 )
                             }
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
index 03f12629f4..c2db71fd67 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
@@ -154,6 +154,29 @@ class PurchaseGiftCardConfirmDialog : OffsetDialogFragment(R.layout.dialog_confi
                             }
                         }
                     }
+                    ex.errorCode == 500 -> {
+                        AdaptiveDialog.create(
+                            R.drawable.ic_error,
+                            getString(R.string.gift_card_purchase_failed),
+                            getString(R.string.gift_card_server_error),
+                            getString(R.string.button_close),
+                            getString(R.string.gift_card_contact_ctx)
+                        ).show(requireActivity()) { result ->
+                            if (result == true) {
+                                // TODO: share
+                                val intent = viewModel.createEmailIntent(
+                                    "CTX Issue: Purchase, Internal Server Error",
+                                    ex
+                                )
+
+                                val chooser = Intent.createChooser(
+                                    intent,
+                                    getString(R.string.report_issue_dialog_mail_intent_chooser)
+                                )
+                                launcher.launch(chooser)
+                            }
+                        }
+                    }
                     else -> {
                         AdaptiveDialog.create(
                             R.drawable.ic_error,
diff --git a/features/exploredash/src/main/res/layout/dialog_gift_card_details.xml b/features/exploredash/src/main/res/layout/dialog_gift_card_details.xml
index 56cf9b528d..03f0680c9d 100644
--- a/features/exploredash/src/main/res/layout/dialog_gift_card_details.xml
+++ b/features/exploredash/src/main/res/layout/dialog_gift_card_details.xml
@@ -321,7 +321,9 @@
                     android:layout_marginVertical="22dp"
                     android:layout_marginHorizontal="22dp"
                     android:layout_marginStart="15dp"
+                    android:text="@string/gift_card_details_error"
                     android:visibility="gone"
+                    tools:visibility="visible"
                     app:layout_constraintTop_toBottomOf="@+id/copy_card_pin"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent" />
@@ -360,6 +362,38 @@
                     app:layout_constraintTop_toTopOf="parent" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/contact_support"
+                style="@style/ViewRaised"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="20dp"
+                android:background="@drawable/rounded_ripple_background"
+                android:clickable="true"
+                android:focusable="true"
+                android:paddingHorizontal="15dp"
+                android:theme="@style/ListViewButtonBackground"
+                app:layout_constraintTop_toBottomOf="@id/purchase_card_info">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/contact_support_label"
+                    style="@style/Caption.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingVertical="17dp"
+                    android:text="@string/gift_card_contact_ctx"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_light_gray_arrow_right"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
             <Button
                 android:id="@+id/how_to_use_button"
                 style="@style/Button.Tertiary.Blue"
diff --git a/features/exploredash/src/main/res/values/strings-explore-dash.xml b/features/exploredash/src/main/res/values/strings-explore-dash.xml
index db448983a8..535c3b6ec1 100644
--- a/features/exploredash/src/main/res/values/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values/strings-explore-dash.xml
@@ -229,6 +229,7 @@
     <string name="gift_card_error">For some reason we were not able to buy a gift card. Please, try again.</string>
     <string name="gift_card_details_error">For some reason we were not able to buy a gift card. Please contact support.</string>
     <string name="gift_card_limit_error">The purchase limits for this merchant have changed.  Please contact CTX Support for more information.</string>
+    <string name="gift_card_server_error">For some reason we were not able to buy a gift card. Please contact CTX support to report the problem.</string>
     <string name="gift_card_unknown_error">For some reason we were not able to buy a gift card. Please contact support with the txid %s.</string>
     <string name="gift_card_rejected">The payment has been rejected.  Please contact CTX with gift card id %s and payment id %s and transaction id %s.</string>
     <string name="gift_card_redeem_url_not_supported">The payment has was made for merchant that supplies a redeem URL, but that is not currently supported.  Please contact CTX with gift card id %s and payment id %s and transaction id %s.</string>
diff --git a/features/exploredash/src/test/java/org/dash/wallet/features/exploredash/CTXSpendExceptionTest.kt b/features/exploredash/src/test/java/org/dash/wallet/features/exploredash/CTXSpendExceptionTest.kt
index 50c6c5c979..3d2a891bae 100644
--- a/features/exploredash/src/test/java/org/dash/wallet/features/exploredash/CTXSpendExceptionTest.kt
+++ b/features/exploredash/src/test/java/org/dash/wallet/features/exploredash/CTXSpendExceptionTest.kt
@@ -16,6 +16,9 @@
 
 package org.dash.wallet.features.exploredash
 
+import org.bitcoinj.core.Sha256Hash
+import org.dash.wallet.common.util.ResourceString
+import org.dash.wallet.features.exploredash.data.ctxspend.model.GiftCardResponse
 import org.dash.wallet.features.exploredash.repository.CTXSpendException
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -40,6 +43,15 @@ class CTXSpendExceptionTest {
         assertTrue(exception.isLimitError)
     }
 
+    @Test
+    fun serverErrorTest() {
+        val errorBody = "code=500, message=Internal Server Error"
+        val exception = CTXSpendException("response error", 500, errorBody)
+        assertEquals(500, exception.errorCode)
+        assertFalse(exception.isLimitError)
+        assertFalse(exception.isNetworkError)
+    }
+
     @Test
     fun unknownErrorTest() {
         val exception = CTXSpendException("other type of error")
@@ -55,4 +67,20 @@ class CTXSpendExceptionTest {
         // Verify that parsing errors don't cause the app to consider this a limit error
         assertFalse(exception.isLimitError)
     }
+
+    @Test
+    fun resourceStringTest() {
+        val exception = CTXSpendException(
+            ResourceString(
+                R.string.gift_card_rejected,
+                listOf("giftcard-1", "00000-0000000-00001", Sha256Hash.ZERO_HASH.toStringBase58())
+            ),
+            GiftCardResponse(
+                "giftcard-1",
+                "rejected",
+            )
+        )
+        assertEquals(null, exception.errorCode)
+        assertFalse(exception.isLimitError)
+    }
 }

From ed9a388a3c4811dbd7dbfc4a03e116e9807732c1 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Fri, 1 Aug 2025 14:10:45 -0700
Subject: [PATCH 02/10] fix: hide Contact Support if there are no errors

---
 .../exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
index 1955a9d947..a1de1c85d5 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
@@ -172,7 +172,7 @@ class GiftCardDetailsDialog : OffsetDialogFragment(R.layout.dialog_gift_card_det
                 binding.contactSupport.isVisible = true
             } else {
                 binding.cardError.isVisible = false
-                binding.contactSupport.isVisible = true
+                binding.contactSupport.isVisible = false
             }
         }
 

From f69b31f2d0bb44bd62e1a79007139b98fcc0f6b7 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 6 Aug 2025 08:52:57 -0700
Subject: [PATCH 03/10] fix: improve error handling for CTX (add contact
 support)

---
 .../repository/CTXSpendRepository.kt          |  2 +-
 .../ui/ctxspend/CTXSpendViewModel.kt          | 11 ++++--
 .../ctxspend/dialogs/GiftCardDetailsDialog.kt |  1 +
 .../dialogs/PurchaseGiftCardConfirmDialog.kt  | 36 ++++++++++++++++---
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
index 683fb2415a..ff8b2edef1 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
@@ -40,7 +40,7 @@ class CTXSpendException(
     message: String,
     val errorCode: Int? = null,
     val errorBody: String? = null,
-    cause: Exception? = null,
+    cause: Throwable? = null,
 ) : Exception(message, cause) {
     var resourceString: ResourceString? = null
     var giftCardResponse: GiftCardResponse? = null
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
index 57327df9d4..0044a7375f 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
@@ -175,13 +175,14 @@ class CTXSpendViewModel @Inject constructor(
                     throw CTXSpendException(
                         "/gift-cards POST { fiatAmount=$fiatAmount, merchantId = $it}",
                         response.errorCode,
-                        response.errorBody
+                        response.errorBody,
+                        response.throwable
                     )
                 }
                 // else -> {}
             }
         }
-        throw CTXSpendException("purchaseGiftCard error")
+        throw CTXSpendException("purchaseGiftCard error: no merchant")
     }
 
     suspend fun createSendingRequestFromDashUri(paymentUri: String): Sha256Hash {
@@ -329,10 +330,11 @@ class CTXSpendViewModel @Inject constructor(
 
     fun createEmailIntent(
         subject: String,
+        sentToCTX: Boolean,
         ex: CTXSpendException?
     ) = Intent(Intent.ACTION_SEND).apply {
         setType("message/rfc822")
-        putExtra(Intent.EXTRA_EMAIL, arrayOf(CTXSpendConstants.REPORT_EMAIL))
+        putExtra(Intent.EXTRA_EMAIL, arrayOf(if (sentToCTX) CTXSpendConstants.REPORT_EMAIL else "support@dash.org"))
         putExtra(Intent.EXTRA_SUBJECT, subject)
         putExtra(Intent.EXTRA_TEXT, createReportEmail(ex))
         addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
@@ -391,6 +393,9 @@ class CTXSpendViewModel @Inject constructor(
                     .append("fiatCurrency: ").append(giftCard.fiatCurrency ?: "N/A").append("\n")
                     .append("paymentUrls: ").append(giftCard.paymentUrls?.toString() ?: "N/A").append("\n")
             }
+            exception.cause?.let {
+                report.append("Stack trace\n").append(exception.stackTraceToString())
+            }
         }
         return report.toString()
     }
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
index a1de1c85d5..83fe4ab8f0 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/GiftCardDetailsDialog.kt
@@ -186,6 +186,7 @@ class GiftCardDetailsDialog : OffsetDialogFragment(R.layout.dialog_gift_card_det
         binding.contactSupport.setOnClickListener {
             val intent = ctxSpendViewModel.createEmailIntent(
                 "CTX Issue with tx: ${viewModel.transactionId.toStringBase58()}",
+                sentToCTX = true,
                 viewModel.uiState.value.error as? CTXSpendException
             )
 
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
index c2db71fd67..9ed32bac16 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
@@ -129,7 +129,21 @@ class PurchaseGiftCardConfirmDialog : OffsetDialogFragment(R.layout.dialog_confi
                             getString(R.string.gift_card_purchase_failed),
                             getString(R.string.gift_card_error),
                             getString(R.string.button_close)
-                        ).show(requireActivity())
+                        ).show(requireActivity()) { result ->
+                            if (result == true) {
+                                val intent = viewModel.createEmailIntent(
+                                    "DashPay DashSpend Issue: Network Error",
+                                    sentToCTX = true,
+                                    ex
+                                )
+
+                                val chooser = Intent.createChooser(
+                                    intent,
+                                    getString(R.string.report_issue_dialog_mail_intent_chooser)
+                                )
+                                launcher.launch(chooser)
+                            }
+                        }
                     }
                     ex.errorCode == 400 && ex.isLimitError -> {
                         AdaptiveDialog.create(
@@ -140,9 +154,9 @@ class PurchaseGiftCardConfirmDialog : OffsetDialogFragment(R.layout.dialog_confi
                             getString(R.string.gift_card_contact_ctx)
                         ).show(requireActivity()) { result ->
                             if (result == true) {
-                                // TODO: share
                                 val intent = viewModel.createEmailIntent(
                                     "CTX Issue: Spending Limit Problem",
+                                    sentToCTX = true,
                                     ex
                                 )
 
@@ -163,9 +177,9 @@ class PurchaseGiftCardConfirmDialog : OffsetDialogFragment(R.layout.dialog_confi
                             getString(R.string.gift_card_contact_ctx)
                         ).show(requireActivity()) { result ->
                             if (result == true) {
-                                // TODO: share
                                 val intent = viewModel.createEmailIntent(
                                     "CTX Issue: Purchase, Internal Server Error",
+                                    sentToCTX = true,
                                     ex
                                 )
 
@@ -183,7 +197,21 @@ class PurchaseGiftCardConfirmDialog : OffsetDialogFragment(R.layout.dialog_confi
                             getString(R.string.gift_card_purchase_failed),
                             ex.message ?: getString(R.string.gift_card_error),
                             getString(R.string.button_close)
-                        ).show(requireActivity())
+                        ).show(requireActivity()) { result ->
+                            if (result == true) {
+                                val intent = viewModel.createEmailIntent(
+                                    subject = "DashPay DashSpend Issue: Purchase Error",
+                                    sentToCTX = false,
+                                    ex
+                                )
+
+                                val chooser = Intent.createChooser(
+                                    intent,
+                                    getString(R.string.report_issue_dialog_mail_intent_chooser)
+                                )
+                                launcher.launch(chooser)
+                            }
+                        }
                     }
                 }
                 return@launch

From 84fc2ffa77c33bffc07d49752d422894a43e81ef Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 6 Aug 2025 10:14:42 -0700
Subject: [PATCH 04/10] fix: increase timeout for the standard HTTP client

---
 .../src/main/java/org/dash/wallet/common/util/Constants.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/org/dash/wallet/common/util/Constants.kt b/common/src/main/java/org/dash/wallet/common/util/Constants.kt
index 6d00115855..d1066700a4 100644
--- a/common/src/main/java/org/dash/wallet/common/util/Constants.kt
+++ b/common/src/main/java/org/dash/wallet/common/util/Constants.kt
@@ -61,9 +61,9 @@ object Constants {
     val HTTP_CLIENT: OkHttpClient = OkHttpClient.Builder()
         .followRedirects(false)
         .followSslRedirects(true)
-        .connectTimeout(15, TimeUnit.SECONDS)
-        .writeTimeout(15, TimeUnit.SECONDS)
-        .readTimeout(15, TimeUnit.SECONDS)
+        .connectTimeout(20, TimeUnit.SECONDS)
+        .writeTimeout(20, TimeUnit.SECONDS)
+        .readTimeout(20, TimeUnit.SECONDS)
         .addInterceptor(
             HttpLoggingInterceptor { log.debug(it) }.setLevel(HttpLoggingInterceptor.Level.BASIC)
         )

From 6eb3af8c1cb0ecff13d3ec814e798421eee1d6c2 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 6 Aug 2025 10:19:49 -0700
Subject: [PATCH 05/10] fix: add a backup for failed BIP70, save metadata, look
 for tx

---
 .../common/services/SendPaymentService.kt     |  2 +-
 .../service/stubs/FakeDashSpendService.kt     |  4 +-
 .../ui/ctxspend/CTXSpendViewModel.kt          |  3 +-
 .../src/de/schildbach/wallet/di/AppModule.kt  |  5 +-
 .../wallet/payments/SendCoinsTaskRunner.kt    | 87 +++++++++++++++----
 5 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/common/src/main/java/org/dash/wallet/common/services/SendPaymentService.kt b/common/src/main/java/org/dash/wallet/common/services/SendPaymentService.kt
index 964ad5cbdd..f2ebf0b425 100644
--- a/common/src/main/java/org/dash/wallet/common/services/SendPaymentService.kt
+++ b/common/src/main/java/org/dash/wallet/common/services/SendPaymentService.kt
@@ -53,5 +53,5 @@ interface SendPaymentService {
         val totalAmount: String
     )
 
-    suspend fun payWithDashUrl(dashUri: String): Transaction
+    suspend fun payWithDashUrl(dashUri: String, serviceName: String?): Transaction
 }
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/network/service/stubs/FakeDashSpendService.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/network/service/stubs/FakeDashSpendService.kt
index e4fc9c7d23..6421f8ad72 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/network/service/stubs/FakeDashSpendService.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/network/service/stubs/FakeDashSpendService.kt
@@ -65,7 +65,7 @@ class FakeDashSpendService @Inject constructor(
         return realService.estimateNetworkFee(address, amount, emptyWallet)
     }
 
-    override suspend fun payWithDashUrl(dashUri: String): Transaction {
+    override suspend fun payWithDashUrl(dashUri: String, serviceName: String?): Transaction {
         return if (dashUri.startsWith(DASH_SPEND_SCHEMA)) {
             val uri = Uri.parse(dashUri)
             val amount = Coin.valueOf(uri.getQueryParameter("amount")?.toLong() ?: 0)
@@ -74,7 +74,7 @@ class FakeDashSpendService @Inject constructor(
                 amount
             )
         } else {
-            realService.payWithDashUrl(dashUri)
+            realService.payWithDashUrl(dashUri, serviceName)
         }
     }
 }
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
index 0044a7375f..f9c6334acf 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
@@ -41,6 +41,7 @@ import org.bitcoinj.utils.MonetaryFormat
 import org.dash.wallet.common.Configuration
 import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.data.ResponseResource
+import org.dash.wallet.common.data.ServiceName
 import org.dash.wallet.common.data.entity.ExchangeRate
 import org.dash.wallet.common.data.entity.GiftCard
 import org.dash.wallet.common.services.*
@@ -186,7 +187,7 @@ class CTXSpendViewModel @Inject constructor(
     }
 
     suspend fun createSendingRequestFromDashUri(paymentUri: String): Sha256Hash {
-        val transaction = sendPaymentService.payWithDashUrl(paymentUri)
+        val transaction = sendPaymentService.payWithDashUrl(paymentUri, giftCardMerchant?.source ?: ServiceName.CTXSpend)
         log.info("ctx spend transaction: ${transaction.txId}")
         transactionMetadata.markGiftCardTransaction(transaction.txId, giftCardMerchant?.logoLocation)
 
diff --git a/wallet/src/de/schildbach/wallet/di/AppModule.kt b/wallet/src/de/schildbach/wallet/di/AppModule.kt
index de695f9d6d..dcefc034d3 100644
--- a/wallet/src/de/schildbach/wallet/di/AppModule.kt
+++ b/wallet/src/de/schildbach/wallet/di/AppModule.kt
@@ -112,9 +112,10 @@ abstract class AppModule {
             identityConfig: BlockchainIdentityConfig,
             coinJoinConfig: CoinJoinConfig,
             coinJoinService: CoinJoinService,
-            platformRepo: PlatformRepo
+            platformRepo: PlatformRepo,
+            transactionMetadataProvider: TransactionMetadataProvider
         ): SendPaymentService {
-            val realService = SendCoinsTaskRunner(walletData, walletApplication, securityFunctions, packageInfoProvider, analyticsService, identityConfig, coinJoinConfig, coinJoinService, platformRepo)
+            val realService = SendCoinsTaskRunner(walletData, walletApplication, securityFunctions, packageInfoProvider, analyticsService, identityConfig, coinJoinConfig, coinJoinService, platformRepo, transactionMetadataProvider)
 
             return if (BuildConfig.FLAVOR.lowercase() == "prod") {
                 realService
diff --git a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
index 99e4528d78..7c3fe4c0fc 100644
--- a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
+++ b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
@@ -56,6 +56,7 @@ import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.services.DirectPayException
 import org.dash.wallet.common.services.LeftoverBalanceException
 import org.dash.wallet.common.services.SendPaymentService
+import org.dash.wallet.common.services.TransactionMetadataProvider
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dash.wallet.common.transactions.ByAddressCoinSelector
@@ -76,7 +77,8 @@ class SendCoinsTaskRunner @Inject constructor(
     private val identityConfig: BlockchainIdentityConfig,
     coinJoinConfig: CoinJoinConfig,
     coinJoinService: CoinJoinService,
-    private val platformRepo: PlatformRepo
+    private val platformRepo: PlatformRepo,
+    private val metadataProvider: TransactionMetadataProvider
 ) : SendPaymentService {
     companion object {
         private const val WALLET_EXCEPTION_MESSAGE = "this method can't be used before creating the wallet"
@@ -171,14 +173,14 @@ class SendCoinsTaskRunner @Inject constructor(
         return SendPaymentService.TransactionDetails(txFee?.toPlainString() ?: "", amountToSend, totalAmount)
     }
 
-    override suspend fun payWithDashUrl(dashUri: String): Transaction {
+    override suspend fun payWithDashUrl(dashUri: String, serviceName: String?): Transaction {
         return withContext(Dispatchers.IO) {
             val paymentIntent = PaymentIntentParser.parse(dashUri, false)
-            createPaymentRequest(paymentIntent)
+            createPaymentRequest(paymentIntent, serviceName)
         }
     }
 
-    private suspend fun createPaymentRequest(basePaymentIntent: PaymentIntent): Transaction {
+    private suspend fun createPaymentRequest(basePaymentIntent: PaymentIntent, serviceName: String?): Transaction {
         val requestUrl = basePaymentIntent.paymentRequestUrl
             ?: throw InvalidPaymentRequestURL("Payment request URL is null")
 
@@ -201,10 +203,10 @@ class SendCoinsTaskRunner @Inject constructor(
         }
 
         val sendRequest = createRequestFromPaymentIntent(paymentIntent)
-        return sendPayment(paymentIntent, sendRequest)
+        return sendPayment(paymentIntent, sendRequest, serviceName)
     }
 
-    fun createRequestFromPaymentIntent(paymentIntent: PaymentIntent): SendRequest {
+    private fun createRequestFromPaymentIntent(paymentIntent: PaymentIntent): SendRequest {
         val wallet = walletData.wallet ?: throw RuntimeException(WALLET_EXCEPTION_MESSAGE)
         Context.propagate(de.schildbach.wallet.Constants.CONTEXT)
         var sendRequest = createSendRequest(
@@ -230,7 +232,8 @@ class SendCoinsTaskRunner @Inject constructor(
 
     private suspend fun sendPayment(
         finalPaymentIntent: PaymentIntent,
-        sendRequest: SendRequest
+        sendRequest: SendRequest,
+        serviceName: String?
     ): Transaction {
         val finalSendRequest = createSendRequest(
             false,
@@ -240,15 +243,19 @@ class SendCoinsTaskRunner @Inject constructor(
         )
         signSendRequest(finalSendRequest)
 
-        return directPay(finalSendRequest, finalPaymentIntent)
+        return directPay(finalSendRequest, finalPaymentIntent, serviceName)
     }
 
     private suspend fun directPay(
         sendRequest: SendRequest,
-        finalPaymentIntent: PaymentIntent
+        finalPaymentIntent: PaymentIntent,
+        serviceName: String?
     ): Transaction {
         val wallet = walletData.wallet ?: throw RuntimeException(WALLET_EXCEPTION_MESSAGE)
         wallet.completeTx(sendRequest)
+        serviceName?.let {
+            metadataProvider.setTransactionService(sendRequest.tx.txId, serviceName)
+        }
         val refundAddress = wallet.freshAddress(KeyChain.KeyPurpose.REFUND)
         val payment = PaymentProtocol.createPaymentMessage(
             listOf(sendRequest.tx),
@@ -262,24 +269,66 @@ class SendCoinsTaskRunner @Inject constructor(
             ?: throw InvalidPaymentRequestURL("Final payment intent URL is null")
         log.info("trying to send tx to {}", requestUrl)
         val request = buildOkHttpDirectPayRequest(requestUrl, payment)
-        val response = Constants.HTTP_CLIENT.call(request)
-        response.ensureSuccessful()
-        log.info("tx sent via http")
+        try {
+            val response = Constants.HTTP_CLIENT.call(request)
+            response.ensureSuccessful()
+            log.info("tx sent via http")
 
-        val byteStream = response.body?.byteStream()
-            ?: throw IOException("Null response for the payment request: $requestUrl")
+            val byteStream = response.body?.byteStream()
+                ?: throw IOException("Null response for the payment request: $requestUrl")
 
-        val paymentAck = byteStream.use { Protos.PaymentACK.parseFrom(byteStream) }
-        val acknowledged = PaymentProtocol.parsePaymentAck(paymentAck).memo != "nack"
-        log.info("received {} via http", if (acknowledged) "ack" else "nack")
+            val paymentAck = byteStream.use { Protos.PaymentACK.parseFrom(byteStream) }
+            val acknowledged = PaymentProtocol.parsePaymentAck(paymentAck).memo != "nack"
+            log.info("received {} via http", if (acknowledged) "ack" else "nack")
 
-        if (!acknowledged) {
-            throw DirectPayException("Payment was not acknowledged by the server")
+            if (!acknowledged) {
+                throw DirectPayException("Payment was not acknowledged by the server")
+            }
+        } catch (e: Exception) {
+            if (e !is DirectPayException) {
+                log.warn("Payment submission failed, but transaction may have been sent: ${sendRequest.tx.txId}", e)
+                val tx = sendRequest.tx
+                val delays = listOf(0L, 1000L, 3000L, 5000L)
+
+                for (delayMs in delays) {
+                    delay(delayMs)
+                    if (isTransactionOnNetwork(tx)) {
+                        log.info("Transaction found on network despite HTTP timeout: ${tx.txId}")
+                        wallet.commitTx(tx)
+                        return tx
+                    }
+                }
+
+                log.warn("Transaction not found on network after timeout, treating as failed: ${tx.txId}")
+                // throw exception below
+            }
+            throw e
         }
 
+
         return sendCoins(sendRequest, txCompleted = true, checkBalanceConditions = true)
     }
 
+    private fun isTransactionOnNetwork(transaction: Transaction): Boolean {
+        return try {
+            val wallet = walletData.wallet ?: return false
+            // Check if we received the transaction from the network (not just locally created)
+            val tx = wallet.getTransaction(transaction.txId)
+            if (tx != null) {
+                // Transaction exists in wallet, check if it was received from network
+                val confidence = tx.confidence
+                return confidence.source == TransactionConfidence.Source.NETWORK ||
+                       confidence.numBroadcastPeers() > 0
+            } else {
+                val confidence = transaction.confidence
+                return confidence?.isTransactionLocked == true
+            }
+        } catch (e: Exception) {
+            log.debug("Error checking transaction network status: ${e.message}")
+            false
+        }
+    }
+
     fun createSendRequest(
         mayEditAmount: Boolean,
         paymentIntent: PaymentIntent,

From 47b4331340d20aaea4eb12e2ef25a62809e20841 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 6 Aug 2025 14:32:06 -0700
Subject: [PATCH 06/10] fix: bug fix after purchase if local currency is not
 usd

---
 .../ui/ctxspend/CTXSpendViewModel.kt          |  6 ++---
 .../ui/ctxspend/PurchaseGiftCardFragment.kt   | 22 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
index f9c6334acf..8a49c7922a 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
@@ -362,9 +362,9 @@ class CTXSpendViewModel @Inject constructor(
             report.append("No merchant selected").append("\n")
         }
 
-//        report.append("\n")
-//        report.append("Purchase Details").append("\n")
-//        report.append("amount: ").append(giftCardPaymentValue.value.toFriendlyString()).append("\n")
+        report.append("\n")
+        report.append("Purchase Details").append("\n")
+        report.append("amount entered: ").append(giftCardPaymentValue.value.toFriendlyString()).append("\n")
         report.append("\n")
         ex?.let { exception ->
             exception.message?.let {
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/PurchaseGiftCardFragment.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/PurchaseGiftCardFragment.kt
index 11e5040af3..160ed08778 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/PurchaseGiftCardFragment.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/PurchaseGiftCardFragment.kt
@@ -353,20 +353,20 @@ class PurchaseGiftCardFragment : Fragment(R.layout.fragment_purchase_ctxspend_gi
     }
 
     private fun exceedsBalance(): Boolean {
-        val rate = viewModel.usdExchangeRate.value
+        val rate = viewModel.usdExchangeRate.value ?: return false
 
-        if (rate == null) {
-            return false
-        }
-
-        val balanceWithDiscount = viewModel.balanceWithDiscount
-
-        if (balanceWithDiscount == null) {
-            return false
-        }
+        val balanceWithDiscount = viewModel.balanceWithDiscount ?: return false
 
+        var paymentValue = viewModel.giftCardPaymentValue.value
         val myRate = ExchangeRate(rate.fiat)
-        val amountDash = myRate.fiatToCoin(viewModel.giftCardPaymentValue.value)
+        // this is called when the after a purchase with the user's selected currency, not USD
+        if (paymentValue.currencyCode != Constants.USD_CURRENCY) {
+            paymentValue = Fiat.valueOf(
+                Constants.USD_CURRENCY,
+                paymentValue.value
+            )
+        }
+        val amountDash = myRate.fiatToCoin(paymentValue)
 
         return amountDash.isGreaterThan(balanceWithDiscount)
     }

From c10f594f4bdd8d1a557fe105d917a390894d6be4 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 6 Aug 2025 15:03:49 -0700
Subject: [PATCH 07/10] fix: fix the 0.00 amount on giftcard details dialog

---
 .../exploredash/data/ctxspend/model/GiftCardResponse.kt   | 4 +++-
 .../features/exploredash/ui/ctxspend/CTXSpendViewModel.kt | 8 ++++----
 .../ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt  | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/data/ctxspend/model/GiftCardResponse.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/data/ctxspend/model/GiftCardResponse.kt
index c68124b3c3..e57d0777ae 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/data/ctxspend/model/GiftCardResponse.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/data/ctxspend/model/GiftCardResponse.kt
@@ -24,7 +24,9 @@ data class GiftCardResponse(
     @SerializedName("barcodeUrl") val barcodeUrl: String? = "",
     @SerializedName("number") val cardNumber: String? = "",
     @SerializedName("pin") val cardPin: String? = "",
-
+    val cardFiatAmount: String? = "",
+    val cardFiatCurrency: String? = "",
+    val merchantName: String? = "",
     @SerializedName("paymentCryptoAmount") val cryptoAmount: String? = "",
     @SerializedName("paymentCryptoCurrency") val cryptoCurrency: String? = "",
     val paymentCryptoNetwork: String = "",
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
index 8a49c7922a..5e0c625391 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
@@ -187,7 +187,7 @@ class CTXSpendViewModel @Inject constructor(
     }
 
     suspend fun createSendingRequestFromDashUri(paymentUri: String): Sha256Hash {
-        val transaction = sendPaymentService.payWithDashUrl(paymentUri, giftCardMerchant?.source ?: ServiceName.CTXSpend)
+        val transaction = sendPaymentService.payWithDashUrl(paymentUri, giftCardMerchant?.source?.lowercase() ?: ServiceName.CTXSpend)
         log.info("ctx spend transaction: ${transaction.txId}")
         transactionMetadata.markGiftCardTransaction(transaction.txId, giftCardMerchant?.logoLocation)
 
@@ -275,13 +275,13 @@ class CTXSpendViewModel @Inject constructor(
 
     suspend fun logout() = repository.logout()
 
-    fun saveGiftCardDummy(txId: Sha256Hash, giftCardId: String) {
+    fun saveGiftCardDummy(txId: Sha256Hash, giftCardResponse: GiftCardResponse) {
         val giftCard = GiftCard(
             txId = txId,
             merchantName = giftCardMerchant?.name ?: "",
-            price = giftCardPaymentValue.value.toBigDecimal().toDouble(),
+            price = giftCardResponse.cardFiatAmount?.toDouble() ?: 0.0,
             merchantUrl = giftCardMerchant?.website,
-            note = giftCardId
+            note = giftCardResponse.id
         )
         viewModelScope.launch {
             giftCardDao.insertGiftCard(giftCard)
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
index 9ed32bac16..2723b27a8e 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/dialogs/PurchaseGiftCardConfirmDialog.kt
@@ -229,7 +229,7 @@ class PurchaseGiftCardConfirmDialog : OffsetDialogFragment(R.layout.dialog_confi
             val transactionId = createSendingRequestFromDashUri(data.paymentUrls?.get("DASH.DASH")!!)
             transactionId?.let {
                 enterAmountViewModel.clearSavedState()
-                viewModel.saveGiftCardDummy(transactionId, data.id)
+                viewModel.saveGiftCardDummy(transactionId, data)
                 showGiftCardDetailsDialog(transactionId, data.id)
             }
         }

From 04b932b8c77cb307ecb9fb713d8228d3d19b24b1 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Fri, 8 Aug 2025 06:35:06 -0700
Subject: [PATCH 08/10] chore: ktlink

---
 .../features/exploredash/repository/CTXSpendRepository.kt   | 3 +--
 .../features/exploredash/ui/ctxspend/CTXSpendViewModel.kt   | 6 ++++--
 .../wallet/features/exploredash/CTXSpendExceptionTest.kt    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
index ff8b2edef1..4fc66367b9 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/repository/CTXSpendRepository.kt
@@ -18,7 +18,6 @@
 package org.dash.wallet.features.exploredash.repository
 
 import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.flow.Flow
 import org.dash.wallet.common.data.ResponseResource
 import org.dash.wallet.common.data.safeApiCall
@@ -40,7 +39,7 @@ class CTXSpendException(
     message: String,
     val errorCode: Int? = null,
     val errorBody: String? = null,
-    cause: Throwable? = null,
+    cause: Throwable? = null
 ) : Exception(message, cause) {
     var resourceString: ResourceString? = null
     var giftCardResponse: GiftCardResponse? = null
diff --git a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
index 5e0c625391..2c291d4d6e 100644
--- a/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
+++ b/features/exploredash/src/main/java/org/dash/wallet/features/exploredash/ui/ctxspend/CTXSpendViewModel.kt
@@ -47,7 +47,6 @@ import org.dash.wallet.common.data.entity.GiftCard
 import org.dash.wallet.common.services.*
 import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dash.wallet.common.util.Constants
-import org.dash.wallet.common.util.toBigDecimal
 import org.dash.wallet.features.exploredash.data.ctxspend.model.DenominationType
 import org.dash.wallet.features.exploredash.data.ctxspend.model.GetMerchantResponse
 import org.dash.wallet.features.exploredash.data.ctxspend.model.GiftCardResponse
@@ -187,7 +186,10 @@ class CTXSpendViewModel @Inject constructor(
     }
 
     suspend fun createSendingRequestFromDashUri(paymentUri: String): Sha256Hash {
-        val transaction = sendPaymentService.payWithDashUrl(paymentUri, giftCardMerchant?.source?.lowercase() ?: ServiceName.CTXSpend)
+        val transaction = sendPaymentService.payWithDashUrl(
+            paymentUri,
+            giftCardMerchant?.source?.lowercase() ?: ServiceName.CTXSpend
+        )
         log.info("ctx spend transaction: ${transaction.txId}")
         transactionMetadata.markGiftCardTransaction(transaction.txId, giftCardMerchant?.logoLocation)
 
diff --git a/features/exploredash/src/test/java/org/dash/wallet/features/exploredash/CTXSpendExceptionTest.kt b/features/exploredash/src/test/java/org/dash/wallet/features/exploredash/CTXSpendExceptionTest.kt
index 3d2a891bae..0d51aec5c2 100644
--- a/features/exploredash/src/test/java/org/dash/wallet/features/exploredash/CTXSpendExceptionTest.kt
+++ b/features/exploredash/src/test/java/org/dash/wallet/features/exploredash/CTXSpendExceptionTest.kt
@@ -77,7 +77,7 @@ class CTXSpendExceptionTest {
             ),
             GiftCardResponse(
                 "giftcard-1",
-                "rejected",
+                "rejected"
             )
         )
         assertEquals(null, exception.errorCode)

From e9eee9733d5492d23c12352a461d5afcd0d88715 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Fri, 8 Aug 2025 06:35:20 -0700
Subject: [PATCH 09/10] fix: improve isTransactionOnNetwork

---
 .../src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
index 7c3fe4c0fc..b6951b8826 100644
--- a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
+++ b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
@@ -315,10 +315,11 @@ class SendCoinsTaskRunner @Inject constructor(
             // Check if we received the transaction from the network (not just locally created)
             val tx = wallet.getTransaction(transaction.txId)
             if (tx != null) {
-                // Transaction exists in wallet, check if it was received from network
+                // Transaction exists in wallet, check if it was received from network and it is building or pending
                 val confidence = tx.confidence
                 return confidence.source == TransactionConfidence.Source.NETWORK ||
-                       confidence.numBroadcastPeers() > 0
+                        confidence.confidenceType == TransactionConfidence.ConfidenceType.BUILDING ||
+                        (confidence.confidenceType == TransactionConfidence.ConfidenceType.PENDING && confidence.numBroadcastPeers() > 0)
             } else {
                 val confidence = transaction.confidence
                 return confidence?.isTransactionLocked == true

From 3859827a7f98708a5cac0d77c5a593d8a703789b Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Fri, 8 Aug 2025 06:39:28 -0700
Subject: [PATCH 10/10] fix: improve isTransactionOnNetwork again

---
 .../wallet/payments/SendCoinsTaskRunner.kt    | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
index b6951b8826..e4e40cac69 100644
--- a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
+++ b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
@@ -312,18 +312,14 @@ class SendCoinsTaskRunner @Inject constructor(
     private fun isTransactionOnNetwork(transaction: Transaction): Boolean {
         return try {
             val wallet = walletData.wallet ?: return false
-            // Check if we received the transaction from the network (not just locally created)
-            val tx = wallet.getTransaction(transaction.txId)
-            if (tx != null) {
-                // Transaction exists in wallet, check if it was received from network and it is building or pending
-                val confidence = tx.confidence
-                return confidence.source == TransactionConfidence.Source.NETWORK ||
-                        confidence.confidenceType == TransactionConfidence.ConfidenceType.BUILDING ||
-                        (confidence.confidenceType == TransactionConfidence.ConfidenceType.PENDING && confidence.numBroadcastPeers() > 0)
-            } else {
-                val confidence = transaction.confidence
-                return confidence?.isTransactionLocked == true
-            }
+            val inWalletTx = wallet.getTransaction(transaction.txId)
+            val confidence = (inWalletTx ?: transaction).confidence ?: return false
+
+            // If we have the wallet’s instance, also accept network source as proof
+            (inWalletTx != null && confidence.source == TransactionConfidence.Source.NETWORK) ||
+                    confidence.isChainLocked ||
+                    confidence.isTransactionLocked ||
+                    confidence.numBroadcastPeers() > 0
         } catch (e: Exception) {
             log.debug("Error checking transaction network status: ${e.message}")
             false