feat: select last successful purchase provider for meld quotes

nomanr · angelix · commit aef01d129608 · 2025-06-14T02:19:15.000+03:00
diff --git a/common/src/commonMain/kotlin/com/blockstream/common/di/CommonModule.kt b/common/src/commonMain/kotlin/com/blockstream/common/di/CommonModule.kt
@@ -12,6 +12,7 @@ import com.blockstream.domain.hardware.VerifyAddressUseCase
 import com.blockstream.domain.meld.CreateCryptoQuoteUseCase
 import com.blockstream.domain.meld.CreateCryptoWidgetUseCase
 import com.blockstream.domain.meld.DefaultValuesUseCase
+import com.blockstream.domain.meld.GetLastSuccessfulPurchaseExchange
 import com.blockstream.domain.meld.MeldUseCase
 import com.blockstream.domain.navigation.NavigateToWallet
 import com.blockstream.green.data.dataModule
@@ -65,4 +66,8 @@ val commonModule = module {
     factory {
         ObserveBitcoinPriceHistory(get())
     }
+
+    factory {
+        GetLastSuccessfulPurchaseExchange(get())
+    }
 }
diff --git a/common/src/commonMain/kotlin/com/blockstream/common/models/exchange/BuyViewModel.kt b/common/src/commonMain/kotlin/com/blockstream/common/models/exchange/BuyViewModel.kt
@@ -26,6 +26,7 @@ import com.blockstream.common.sideeffects.SideEffects
 import com.blockstream.common.utils.StringHolder
 import com.blockstream.common.utils.UserInput
 import com.blockstream.domain.hardware.VerifyAddressUseCase
+import com.blockstream.domain.meld.GetLastSuccessfulPurchaseExchange
 import com.blockstream.domain.meld.MeldUseCase
 import com.blockstream.green.data.meld.data.QuoteResponse
 import com.blockstream.green.data.meld.data.QuotesResponse
@@ -57,6 +58,7 @@ abstract class BuyViewModelAbstract(
     internal val meldUseCase: MeldUseCase by inject()
     internal val verifyAddressUseCase: VerifyAddressUseCase by inject()
     private val localeManager: LocaleManager by inject()
+    internal val getLastSuccessfulPurchaseExchange: GetLastSuccessfulPurchaseExchange by inject()
 
     abstract val showRecoveryConfirmation: StateFlow<Boolean>
     abstract val showAccountSelector: StateFlow<Boolean>
@@ -177,6 +179,11 @@ class BuyViewModel(greenWallet: GreenWallet) :
         // Default to Fiat denomination
         _denomination.value = Denomination.defaultOrFiat(session, isFiat = true)
 
+
+        viewModelScope.launch {
+            getLastSuccessfulPurchaseExchange(GetLastSuccessfulPurchaseExchange.Params(greenWallet.xPubHashId))
+        }
+
         session.ifConnected {
             val accounts = session.accounts.value.filter { it.isBitcoin }
 
@@ -201,17 +208,22 @@ class BuyViewModel(greenWallet: GreenWallet) :
         }
 
 
-        quotes.onEach { list ->
+        combine(quotes, getLastSuccessfulPurchaseExchange.observe()) { quotesList: List<QuoteResponse>, lastProvider: String? ->
             _quote.value = quote.value?.takeIf { userPickedQuote.value }?.let { quote ->
-                // keep the same provider
-                list.find {
+                // keep the same provider if user picked it
+                quotesList.find {
                     it.serviceProvider == quote.serviceProvider
                 }
-            } ?: list.firstOrNull()?.also {
+            } ?: lastProvider?.let { provider ->
+                // otherwise, try to find the last successful provider
+                quotesList.find { it.serviceProvider == provider }
+            } ?: quotesList.firstOrNull()?.also {
+                // fallback to first available quote
                 userPickedQuote.value = false
             }
         }.launchIn(this)
 
+
         session.ifConnected {
             combine(amount, country) { amount, _ ->
                 updateQuotes(amount)
diff --git a/common/src/commonMain/kotlin/com/blockstream/domain/meld/CreateCryptoWidgetUseCase.kt b/common/src/commonMain/kotlin/com/blockstream/domain/meld/CreateCryptoWidgetUseCase.kt
@@ -6,7 +6,7 @@ import com.blockstream.green.data.meld.data.CryptoWidget
 import com.blockstream.green.data.meld.data.QuoteResponse
 import com.blockstream.green.network.NetworkResponse
 
-class CreateCryptoWidgetUseCase constructor(
+class CreateCryptoWidgetUseCase(
     private val meldRepository: MeldRepository
 ) {
     suspend operator fun invoke(
diff --git a/common/src/commonMain/kotlin/com/blockstream/domain/meld/GetLastSuccessfulPurchaseExchange.kt b/common/src/commonMain/kotlin/com/blockstream/domain/meld/GetLastSuccessfulPurchaseExchange.kt
@@ -0,0 +1,28 @@
+package com.blockstream.domain.meld
+
+import com.blockstream.green.data.meld.MeldRepository
+import com.blockstream.green.data.meld.data.MeldTransactionStatus
+import com.blockstream.green.domain.base.NetworkBoundInMemoryUseCase
+import com.blockstream.green.network.NetworkResponse
+import kotlinx.coroutines.flow.Flow
+
+class GetLastSuccessfulPurchaseExchange(
+    private val meldRepository: MeldRepository
+) : NetworkBoundInMemoryUseCase<GetLastSuccessfulPurchaseExchange.Params, String?>() {
+    override suspend fun doWork(params: Params) {
+        val response = meldRepository.getTransactions(params.externalCustomerId, listOf(MeldTransactionStatus.SETTLED))
+
+        if (response is NetworkResponse.Success && response.data.transactions.isNotEmpty()) {
+            set(response.data.transactions.first().serviceProvider)
+        }
+    }
+
+    override fun createObservable(params: Params): Flow<String?> {
+        return get()
+    }
+
+    data class Params(
+        val externalCustomerId: String
+    )
+
+}
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/DataModule.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/DataModule.kt
@@ -7,7 +7,7 @@ import org.koin.dsl.module
 //expect val platformDataModule: Module
 
 val dataModule = module {
-    single { GreenWebooksHttpClient(get()) }
+    single { GreenWebhooksHttpClient(get()) }
 
     includes(meldModule)
     includes(notificationsDataModule)
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/GreenWebhooksHttpClient.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/GreenWebhooksHttpClient.kt
@@ -4,7 +4,7 @@ import com.blockstream.green.data.config.AppInfo
 import com.blockstream.green.network.AppHttpClient
 import io.ktor.client.plugins.defaultRequest
 
-class GreenWebooksHttpClient(appInfo: AppInfo) : AppHttpClient(appInfo.isDevelopmentOrDebug, {
+class GreenWebhooksHttpClient(appInfo: AppInfo) : AppHttpClient(appInfo.isDevelopmentOrDebug, {
     defaultRequest {
         url(if (appInfo.isProduction) BASE_URL else DEV_BASE_URL)
     }
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/meld/MeldRepository.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/meld/MeldRepository.kt
@@ -5,10 +5,12 @@ import com.blockstream.green.data.meld.data.CryptoQuoteRequest
 import com.blockstream.green.data.meld.data.CryptoWidget
 import com.blockstream.green.data.meld.data.CryptoWidgetRequest
 import com.blockstream.green.data.meld.data.LimitsResponse
+import com.blockstream.green.data.meld.data.MeldTransactionStatus
 import com.blockstream.green.data.meld.data.QuotesResponse
 import com.blockstream.green.data.meld.datasource.MeldLocalDataSource
 import com.blockstream.green.data.meld.datasource.MeldRemoteDataSource
 import com.blockstream.green.data.meld.models.Country
+import com.blockstream.green.data.meld.models.MeldTransactionResponse
 import com.blockstream.green.network.NetworkResponse
 
 class MeldRepository(
@@ -26,8 +28,10 @@ class MeldRepository(
         return remoteDataSource.getCryptoLimits(fiatCurrency)
     }
 
-    suspend fun getTransactions(externalCustomerId: String): NetworkResponse<LimitsResponse> {
-        return remoteDataSource.getTransactions(externalCustomerId)
+    suspend fun getTransactions(
+        externalCustomerId: String, statuses: List<MeldTransactionStatus> = emptyList()
+    ): NetworkResponse<MeldTransactionResponse> {
+        return remoteDataSource.getTransactions(externalCustomerId, statuses)
     }
 
     suspend fun getCountries(): NetworkResponse<List<Country>> {
@@ -44,6 +48,7 @@ class MeldRepository(
                 localDataSource.saveCountries(countriesWithEmojis)
                 NetworkResponse.Success(countriesWithEmojis)
             }
+
             is NetworkResponse.Error -> response
         }
     }
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/meld/data/MeldTransactionStatus.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/meld/data/MeldTransactionStatus.kt
@@ -0,0 +1,19 @@
+package com.blockstream.green.data.meld.data
+
+enum class MeldTransactionStatus {
+    PENDING_CREATED,
+    PENDING,
+    PROCESSING,
+    AUTHORIZED,
+    AUTHORIZATION_EXPIRED,
+    SETTLING,
+    SETTLED,
+    REFUNDED,
+    DECLINED,
+    CANCELLED,
+    FAILED,
+    ERROR,
+    VOIDED,
+    TWO_FA_REQUIRED,
+    TWO_FA_PROVIDED
+}
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/meld/data/Resources.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/meld/data/Resources.kt
@@ -8,7 +8,7 @@ object Resources {
     class Payments() {
 
         @Resource("transactions")
-        class Transactions(val parent: Payments = Payments(), val externalCustomerIds: String)
+        class Transactions(val parent: Payments = Payments(), val externalCustomerIds: String, val statuses: String)
 
         @Resource("crypto")
         class Crypto(val parent: Payments = Payments()) {
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/meld/datasource/MeldRemoteDataSource.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/meld/datasource/MeldRemoteDataSource.kt
@@ -5,9 +5,11 @@ import com.blockstream.green.data.meld.data.CryptoQuoteRequest
 import com.blockstream.green.data.meld.data.CryptoWidget
 import com.blockstream.green.data.meld.data.CryptoWidgetRequest
 import com.blockstream.green.data.meld.data.LimitsResponse
+import com.blockstream.green.data.meld.data.MeldTransactionStatus
 import com.blockstream.green.data.meld.data.QuotesResponse
 import com.blockstream.green.data.meld.data.Resources
 import com.blockstream.green.data.meld.models.Country
+import com.blockstream.green.data.meld.models.MeldTransactionResponse
 import com.blockstream.green.network.NetworkResponse
 
 class MeldRemoteDataSource(
@@ -25,8 +27,11 @@ class MeldRemoteDataSource(
         return client.get(Resources.Payments.Crypto.Limits(fiatCurrency = fiatCurrency))
     }
 
-    suspend fun getTransactions(externalCustomerId: String): NetworkResponse<LimitsResponse> {
-        return client.get(Resources.Payments.Transactions(externalCustomerIds = externalCustomerId))
+    suspend fun getTransactions(
+        externalCustomerId: String,
+        statuses: List<MeldTransactionStatus> = emptyList()
+    ): NetworkResponse<MeldTransactionResponse> {
+        return client.get(Resources.Payments.Transactions(externalCustomerIds = externalCustomerId, statuses = statuses.joinToString(",")))
     }
 
     suspend fun getCountries(): NetworkResponse<List<Country>> {
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/meld/models/CountriesResponse.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/meld/models/CountriesResponse.kt
@@ -6,12 +6,12 @@ import kotlinx.serialization.Serializable
 data class Country(
     val countryCode: String,
     val name: String,
-    val flagImageUrl: String,
     val regions: List<Region>? = emptyList(),
     val flagEmoji: String = ""
 )
 
 @Serializable
 data class Region(
-    val regionCode: String, val name: String
+    val regionCode: String,
+    val name: String
 )
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/meld/models/Transaction.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/meld/models/Transaction.kt
@@ -0,0 +1,35 @@
+package com.blockstream.green.data.meld.models
+
+import kotlinx.serialization.Serializable
+
+// These models are lean, the API returns a lot more data: https://docs.meld.io/reference/payments-transactions-search-1
+@Serializable
+data class MeldTransaction(
+    val key: String,
+    val id: String,
+    val transactionType: String,
+    val status: String,
+    val sourceAmount: Double,
+    val sourceCurrencyCode: String,
+    val destinationAmount: Double,
+    val destinationCurrencyCode: String,
+    val paymentMethodType: String,
+    val serviceProvider: String,
+    val serviceTransactionId: String,
+    val createdAt: String,
+    val updatedAt: String,
+    val countryCode: String,
+    val fiatAmountInUsd: Double,
+    val cryptoDetails: MeldCryptoDetails? = null
+)
+
+@Serializable
+data class MeldCryptoDetails(
+    val walletAddress: String? = null,
+    val networkFee: Double? = null,
+    val transactionFee: Double? = null,
+    val partnerFee: Double? = null,
+    val totalFee: Double? = null,
+    val blockchainTransactionId: String? = null,
+    val chainId: String? = null
+)
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/meld/models/TransactionResponse.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/meld/models/TransactionResponse.kt
@@ -0,0 +1,11 @@
+package com.blockstream.green.data.meld.models
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MeldTransactionResponse(
+    val transactions: List<MeldTransaction>,
+    val count: Long,
+    val remaining: Long,
+    val totalCount: Long
+)
diff --git a/data/src/commonMain/kotlin/com/blockstream/green/data/notifications/datasource/NotificationsRemoteDataSource.kt b/data/src/commonMain/kotlin/com/blockstream/green/data/notifications/datasource/NotificationsRemoteDataSource.kt
@@ -1,11 +1,11 @@
 package com.blockstream.green.data.notifications.datasource
 
-import com.blockstream.green.data.GreenWebooksHttpClient
+import com.blockstream.green.data.GreenWebhooksHttpClient
 import com.blockstream.green.data.notifications.models.RegisterDeviceRequest
 import com.blockstream.green.network.NetworkResponse
 
 class NotificationsRemoteDataSource(
-    private val client: GreenWebooksHttpClient
+    private val client: GreenWebhooksHttpClient
 ) {
     suspend fun registerDevice(request: RegisterDeviceRequest): NetworkResponse<Unit> {
         return client.post("/register-device", request)
diff --git a/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/CachedObservableUseCase.kt b/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/CachedObservableUseCase.kt
@@ -0,0 +1,89 @@
+package com.blockstream.green.domain.base
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * A use case that performs network operations and caches results in memory.
+ * Extends ObservableUseCase to inherit parameter-based reactivity with caching.
+ * 
+ * Example usage:
+ * ```kotlin
+ * class GetUserProfileUseCase(
+ *     private val userRepository: UserRepository
+ * ) : CachedObservableUseCase<GetUserProfileUseCase.Params, UserProfile>() {
+ *     
+ *     override suspend fun doWork(params: Params) {
+ *         val response = userRepository.getUserProfile(params.userId)
+ *         if (response is NetworkResponse.Success) {
+ *             set(response.data)
+ *         }
+ *     }
+ *     
+ *     override fun createObservable(params: Params): Flow<UserProfile> {
+ *         return get().filterNotNull()
+ *     }
+ *     
+ *     data class Params(val userId: String)
+ * }
+ * 
+ * // In ViewModel:
+ * private val getUserProfile = GetUserProfileUseCase(userRepository)
+ * 
+ * init {
+ *     // Observe cached data that updates when params change
+ *     getUserProfile.observe().onEach { profile ->
+ *         _uiState.value = UiState.Success(profile)
+ *     }.launchIn(viewModelScope)
+ *     
+ *     // Trigger initial load
+ *     getUserProfile(GetUserProfileUseCase.Params("user123"))
+ * }
+ * 
+ * fun refreshProfile() {
+ *     // Manually invalidate cache and reload
+ *     getUserProfile.invalidate()
+ *     getUserProfile(GetUserProfileUseCase.Params("user123"))
+ * }
+ * ```
+ * 
+ * Key features:
+ * - Caches results in memory across parameter changes
+ * - Automatically triggers new network calls when parameters change
+ * - Provides synchronous access to cached data via getCurrent()
+ * - Supports manual cache invalidation
+ */
+abstract class CachedObservableUseCase<in P, R> : ObservableUseCase<P, R>() {
+    
+    private val dataState = MutableStateFlow<R?>(null)
+
+    protected fun set(data: R) {
+        dataState.value = data
+    }
+
+    fun get(): Flow<R?> {
+        return dataState
+    }
+    
+    /**
+     * Get current cached value synchronously
+     */
+    fun getCurrent(): R? = dataState.value
+    
+    /**
+     * Check if data is currently cached
+     */
+    fun hasCachedData(): Boolean = dataState.value != null
+    
+    /**
+     * Invalidate the cache
+     */
+    fun invalidate() {
+        dataState.value = null
+    }
+}
+
+/**
+ * Legacy alias for backward compatibility
+ */
+typealias NetworkBoundInMemoryUseCase<P, R> = CachedObservableUseCase<P, R>
diff --git a/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/NetworkBoundInMemoryUseCase.kt b/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/NetworkBoundInMemoryUseCase.kt
diff --git a/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/NetworkBoundUseCase.kt b/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/NetworkBoundUseCase.kt
diff --git a/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/NetworkResultUseCase.kt b/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/NetworkResultUseCase.kt
diff --git a/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/ObservableUseCase.kt b/domain/src/commonMain/kotlin/com/blockstream/green/domain/base/ObservableUseCase.kt

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import com.blockstream.green.data.config.AppInfo`
`4`	`4`	`import com.blockstream.green.network.AppHttpClient`
`5`	`5`	`import io.ktor.client.plugins.defaultRequest`
`6`	`6`
`7`		`-class GreenWebooksHttpClient(appInfo: AppInfo) : AppHttpClient(appInfo.isDevelopmentOrDebug, {`
	`7`	`+class GreenWebhooksHttpClient(appInfo: AppInfo) : AppHttpClient(appInfo.isDevelopmentOrDebug, {`
`8`	`8`	`defaultRequest {`
`9`	`9`	`url(if (appInfo.isProduction) BASE_URL else DEV_BASE_URL)`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,12 @@ import com.blockstream.green.data.meld.data.CryptoQuoteRequest`
`5`	`5`	`import com.blockstream.green.data.meld.data.CryptoWidget`
`6`	`6`	`import com.blockstream.green.data.meld.data.CryptoWidgetRequest`
`7`	`7`	`import com.blockstream.green.data.meld.data.LimitsResponse`
	`8`	`+import com.blockstream.green.data.meld.data.MeldTransactionStatus`
`8`	`9`	`import com.blockstream.green.data.meld.data.QuotesResponse`
`9`	`10`	`import com.blockstream.green.data.meld.datasource.MeldLocalDataSource`
`10`	`11`	`import com.blockstream.green.data.meld.datasource.MeldRemoteDataSource`
`11`	`12`	`import com.blockstream.green.data.meld.models.Country`
	`13`	`+import com.blockstream.green.data.meld.models.MeldTransactionResponse`
`12`	`14`	`import com.blockstream.green.network.NetworkResponse`
`13`	`15`
`14`	`16`	`class MeldRepository(`
`@@ -26,8 +28,10 @@ class MeldRepository(`
`26`	`28`	`return remoteDataSource.getCryptoLimits(fiatCurrency)`
`27`	`29`	`}`
`28`	`30`
`29`		`- suspend fun getTransactions(externalCustomerId: String): NetworkResponse<LimitsResponse> {`
`30`		`- return remoteDataSource.getTransactions(externalCustomerId)`
	`31`	`+ suspend fun getTransactions(`
	`32`	`+ externalCustomerId: String, statuses: List<MeldTransactionStatus> = emptyList()`
	`33`	`+ ): NetworkResponse<MeldTransactionResponse> {`
	`34`	`+ return remoteDataSource.getTransactions(externalCustomerId, statuses)`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`suspend fun getCountries(): NetworkResponse<List<Country>> {`
`@@ -44,6 +48,7 @@ class MeldRepository(`
`44`	`48`	`localDataSource.saveCountries(countriesWithEmojis)`
`45`	`49`	`NetworkResponse.Success(countriesWithEmojis)`
`46`	`50`	`}`
	`51`	`+`
`47`	`52`	`is NetworkResponse.Error -> response`
`48`	`53`	`}`
`49`	`54`	`}`