fix: gift code flow amount display and confirmation

Author: piotr-iohk

app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt

@@ -445,7 +445,7 @@ class BlocktankRepo @Inject constructor(
 
                 if (maxInboundCapacity >= amount) {
                     Logger.debug("Sufficient liquidity available, claiming with existing channel", context = TAG)
-                    Result.success(claimGiftCodeWithLiquidity(code))
+                    Result.success(claimGiftCodeWithLiquidity(code, amount))
                 } else {
                     Logger.debug("Insufficient liquidity, opening new channel", context = TAG)
                     Result.success(claimGiftCodeWithoutLiquidity(code, amount))
@@ -456,7 +456,7 @@ class BlocktankRepo @Inject constructor(
         }
     }
 
-    private suspend fun claimGiftCodeWithLiquidity(code: String): GiftClaimResult {
+    private suspend fun claimGiftCodeWithLiquidity(code: String, amount: ULong): GiftClaimResult {
         val invoice = lightningRepo.createInvoice(
             amountSats = null,
             description = "blocktank-gift-code:$code",
@@ -465,13 +465,18 @@ class BlocktankRepo @Inject constructor(
 
         Logger.debug("Created invoice for gift code, requesting payment from LSP", context = TAG)
 
-        val result = ServiceQueue.CORE.background {
+        val giftResponse = ServiceQueue.CORE.background {
             giftPay(invoice = invoice)
         }
 
-        Logger.debug("Gift payment request completed: $result", context = TAG)
+        Logger.debug("Gift payment request completed: id=${giftResponse.id}", context = TAG)
 
-        return GiftClaimResult.SuccessWithLiquidity
+        return GiftClaimResult.SuccessWithLiquidity(
+            paymentHashOrTxId = giftResponse.bolt11PaymentId ?: giftResponse.id,
+            sats = amount.toLong(),
+            invoice = invoice,
+            code = code,
+        )
     }
 
     private suspend fun claimGiftCodeWithoutLiquidity(code: String, amount: ULong): GiftClaimResult {
@@ -520,11 +525,22 @@ data class BlocktankState(
 )
 
 sealed class GiftClaimResult {
-    object SuccessWithLiquidity : GiftClaimResult()
+    abstract val paymentHashOrTxId: String
+    abstract val sats: Long
+    abstract val invoice: String
+    abstract val code: String
+
+    data class SuccessWithLiquidity(
+        override val paymentHashOrTxId: String,
+        override val sats: Long,
+        override val invoice: String,
+        override val code: String,
+    ) : GiftClaimResult()
+
     data class SuccessWithoutLiquidity(
-        val paymentHashOrTxId: String,
-        val sats: Long,
-        val invoice: String,
-        val code: String,
+        override val paymentHashOrTxId: String,
+        override val sats: Long,
+        override val invoice: String,
+        override val code: String,
     ) : GiftClaimResult()
 }

app/src/main/java/to/bitkit/ui/sheets/GiftLoading.kt

@@ -34,12 +34,8 @@ import to.bitkit.ui.shared.util.gradientBackground
 import to.bitkit.ui.theme.Colors
 
 @Composable
-fun GiftLoading(
-    viewModel: GiftViewModel,
-) {
-    Content(
-        amount = viewModel.amount,
-    )
+fun GiftLoading(amount: ULong) {
+    Content(amount = amount)
 }
 
 @Composable

app/src/main/java/to/bitkit/ui/sheets/GiftSheet.kt

@@ -65,9 +65,7 @@ fun GiftSheet(
             startDestination = GiftRoute.Loading,
         ) {
             composableWithDefaultTransitions<GiftRoute.Loading> {
-                GiftLoading(
-                    viewModel = viewModel,
-                )
+                GiftLoading(amount = sheet.amount)
             }
             composableWithDefaultTransitions<GiftRoute.Used> {
                 GiftErrorSheet(

app/src/main/java/to/bitkit/ui/sheets/GiftViewModel.kt

@@ -20,7 +20,6 @@ import to.bitkit.models.NewTransactionSheetDirection
 import to.bitkit.models.NewTransactionSheetType
 import to.bitkit.repositories.ActivityRepo
 import to.bitkit.repositories.BlocktankRepo
-import to.bitkit.repositories.GiftClaimResult
 import to.bitkit.utils.Logger
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
@@ -72,46 +71,42 @@ class GiftViewModel @Inject constructor(
                 amount = amount,
                 waitTimeout = NODE_STARTUP_TIMEOUT_MS.milliseconds,
             ).fold(
-                onSuccess = { result ->
-                    Logger.debug("Gift claim successful: $result", context = TAG)
-                    when (result) {
-                        is GiftClaimResult.SuccessWithLiquidity -> {
-                            _navigationEvent.emit(GiftRoute.Success)
-                        }
-                        is GiftClaimResult.SuccessWithoutLiquidity -> {
-                            insertGiftActivity(result)
-                            _successEvent.emit(
-                                NewTransactionSheetDetails(
-                                    type = NewTransactionSheetType.LIGHTNING,
-                                    direction = NewTransactionSheetDirection.RECEIVED,
-                                    paymentHashOrTxId = result.paymentHashOrTxId,
-                                    sats = result.sats,
-                                )
-                            )
-                            _navigationEvent.emit(GiftRoute.Success)
-                        }
-                    }
+                onSuccess = {
+                    Logger.debug("Gift claim successful: $it", context = TAG)
+                    insertGiftActivity(it.paymentHashOrTxId, it.sats, it.invoice, it.code)
+                    _successEvent.emit(
+                        NewTransactionSheetDetails(
+                            type = NewTransactionSheetType.LIGHTNING,
+                            direction = NewTransactionSheetDirection.RECEIVED,
+                            paymentHashOrTxId = it.paymentHashOrTxId,
+                            sats = it.sats,
+                        )
+                    )
+                    _navigationEvent.emit(GiftRoute.Success)
                 },
-                onFailure = { error ->
-                    handleGiftClaimError(error)
-                }
+                onFailure = { handleGiftClaimError(it) },
             )
         } finally {
             isClaiming = false
         }
     }
 
-    private suspend fun insertGiftActivity(result: GiftClaimResult.SuccessWithoutLiquidity) {
+    private suspend fun insertGiftActivity(
+        paymentHashOrTxId: String,
+        sats: Long,
+        invoice: String,
+        code: String,
+    ) {
         val nowTimestamp = nowTimestamp().epochSecond.toULong()
 
         val lightningActivity = LightningActivity.create(
-            id = result.paymentHashOrTxId,
+            id = paymentHashOrTxId,
             txType = PaymentType.RECEIVED,
             status = PaymentState.SUCCEEDED,
-            value = result.sats.toULong(),
-            invoice = result.invoice,
+            value = sats.toULong(),
+            invoice = invoice,
             timestamp = nowTimestamp,
-            message = result.code,
+            message = code,
         )
 
         activityRepo.insertActivity(Activity.Lightning(lightningActivity)).getOrThrow()