Release 5.2.0

Author: angelix

CHANGELOG.md

@@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [5.2.0] - 2026-03-02
+
+#### Added
+- Swap between chain assets
+- Biometrics choice dialog during Jade setup
+
+#### Changed
+- Bump GDK to version 0.76.3
+- Improve watch-only login flow for hardware wallets
+
+#### Fixed
+- Fix ANR caused by a coroutine being blocked in UI main thread
+- Fix genuine pin check in device scan flow
+- Fix error messages in receive amount validation
+- Fix auto-save when using paste/clear buttons in settings
+- Add retry logic for BLE notification setup
+- Show BTC and LBTC by default on home view
+- Enforce PIN setup after manual backup
+
 ## [5.1.4] - 2025-12-10
 
 #### Added

androidApp/build.gradle.kts

@@ -45,8 +45,8 @@ android {
     defaultConfig {
         minSdk = libs.versions.androidMinSdk.get().toInt()
         targetSdk = libs.versions.androidTargetSdk.get().toInt()
-        versionCode = 514
-        versionName = "5.1.4"
+        versionCode = 520
+        versionName = "5.2.0"
 
         base.archivesName = "BlockstreamGreen-v$versionName"
         proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

compose/src/commonMain/composeResources/values/strings.xml

@@ -1979,4 +1979,5 @@
     <string name="id_this_is_not_the_recipient_address">This is not the recipient address.</string>
     <string name="id_you_cannot_disable_while_a_swap">You cannot disable while a swap is in progress.</string>
     <string name="id_unlock_jade_and_scan_this_qr">Unlock Jade and scan this QR to enable swaps on this phone and generate a retrieval key in case of swap failure.</string>
+    <string name="id_invoice_already_paid">Invoice already paid</string>
 </resources>

compose/src/commonMain/kotlin/com/blockstream/compose/components/SwapComponent.kt

@@ -27,7 +27,6 @@ import androidx.compose.material3.TextButton
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -41,11 +40,9 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
@@ -108,7 +105,7 @@ fun SwapComponent(
     onToAccountClick: () -> Unit,
     onToAssetClick: () -> Unit,
     onTogglePairsClick: () -> Unit,
-    onDenominationClick: () -> Unit
+    onDenominationClick: (Boolean) -> Unit
 ) {
     var isFromFocused by remember { mutableStateOf(false) }
     var isToFocused by remember { mutableStateOf(false) }
@@ -164,7 +161,9 @@ fun SwapComponent(
                     },
                     onAccountClick = onFromAccountClick,
                     onAssetClick = onFromAssetClick,
-                    onDenominationClick = onDenominationClick
+                    onDenominationClick = {
+                        onDenominationClick(true)
+                    }
                 )
 
                 SwapCard(
@@ -189,7 +188,9 @@ fun SwapComponent(
                     },
                     onAccountClick = onToAccountClick,
                     onAssetClick = onToAssetClick,
-                    onDenominationClick = onDenominationClick
+                    onDenominationClick = {
+                        onDenominationClick(false)
+                    }
                 )
             }
         }
@@ -241,33 +242,6 @@ private fun SwapCard(
         )
     }
 
-    // Holds the latest internal TextFieldValue state. We need to keep it to have the correct value
-    // of the composition.
-    var textFieldValueState by remember {
-        mutableStateOf(
-            TextFieldValue(
-                text = value, selection = TextRange(value.length)
-            )
-        )
-    }
-
-    // Holds the latest TextFieldValue that BasicTextField was recomposed with. We couldn't simply
-    // pass `TextFieldValue(text = value)` to the CoreTextField because we need to preserve the
-    // composition.
-    val textFieldValue = textFieldValueState.copy(
-        text = value,
-        selection = if (textFieldValueState.text.length != value.length) TextRange(value.length) else textFieldValueState.selection
-    )
-
-    SideEffect {
-        if (textFieldValue.selection != textFieldValueState.selection ||
-            textFieldValue.text != textFieldValueState.text ||
-            textFieldValue.composition != textFieldValueState.composition
-        ) {
-            textFieldValueState = textFieldValue
-        }
-    }
-
     GreenCard(padding = 0) {
         Column(
             modifier = modifier
@@ -346,11 +320,9 @@ private fun SwapCard(
                     ) {
 
                         BasicTextField(
-                            value = textFieldValueState,
+                            value = value,
                             onValueChange = {
-                                textFieldValueState = formatter.cleanup(it).also {
-                                    onValueChange(it.text)
-                                }
+                                onValueChange(formatter.cleanup(it))
                             },
                             textStyle = textStyle,
                             singleLine = true,

compose/src/commonMain/kotlin/com/blockstream/compose/models/assetaccounts/AssetAccountDetailsViewModel.kt

@@ -24,6 +24,7 @@ import com.blockstream.data.data.EnrichedAsset
 import com.blockstream.data.data.GreenWallet
 import com.blockstream.data.extensions.hasUnconfirmedTransactions
 import com.blockstream.data.extensions.ifConnected
+import com.blockstream.data.extensions.isPolicyAsset
 import com.blockstream.data.extensions.launchSafe
 import com.blockstream.data.gdk.data.Account
 import com.blockstream.data.gdk.data.AccountAsset
@@ -88,7 +89,13 @@ abstract class AssetAccountDetailsViewModelAbstract(
     }
 
     fun onReceive() {
-        postEvent(NavigateDestinations.ReceiveChooseAsset(greenWallet = greenWallet, accountAsset = accountAsset.value))
+        accountAsset.value?.takeIf {
+            !it.network.isLiquid || !it.assetId.isPolicyAsset(session)
+        }?.also {
+            postEvent(NavigateDestinations.Receive(greenWallet = greenWallet, accountAsset = it))
+        } ?: run {
+            postEvent(NavigateDestinations.ReceiveChooseAsset(greenWallet = greenWallet, accountAsset = accountAsset.value))
+        }
     }
 
     fun onSwap() {

compose/src/commonMain/kotlin/com/blockstream/compose/models/receive/ReceiveChooseAssetViewModel.kt

@@ -68,11 +68,19 @@ class ReceiveChooseAssetViewModel(
                 throw Exception("id_insufficient_funds")
             }
 
-            if (accounts.size == 1) {
+            val account = accountAsset.value?.account?.let { account ->
+                accounts.find {
+                    it.account == account
+                }
+            } ?: accounts.firstOrNull()?.takeIf {
+                accounts.size == 1
+            }
+
+            if (account != null) {
                 SideEffects.NavigateTo(
                     NavigateDestinations.Receive(
                         greenWallet = greenWallet,
-                        accountAsset = accounts.first()
+                        accountAsset = account
                     )
                 )
             } else {

compose/src/commonMain/kotlin/com/blockstream/compose/models/send/BumpViewModel.kt

@@ -3,6 +3,11 @@ package com.blockstream.compose.models.send
 import androidx.lifecycle.viewModelScope
 import blockstream_green.common.generated.resources.Res
 import blockstream_green.common.generated.resources.id_increase_fee
+import com.blockstream.compose.events.Event
+import com.blockstream.compose.extensions.launchIn
+import com.blockstream.compose.extensions.previewAccountAsset
+import com.blockstream.compose.extensions.previewWallet
+import com.blockstream.compose.navigation.NavData
 import com.blockstream.data.TransactionSegmentation
 import com.blockstream.data.TransactionType
 import com.blockstream.data.data.Denomination
@@ -17,13 +22,9 @@ import com.blockstream.data.gdk.data.Transaction
 import com.blockstream.data.gdk.params.CreateTransactionParams
 import com.blockstream.data.utils.feeRateWithUnit
 import com.blockstream.data.utils.toAmountLook
-import com.blockstream.compose.events.Event
-import com.blockstream.compose.extensions.launchIn
-import com.blockstream.compose.extensions.previewAccountAsset
-import com.blockstream.compose.extensions.previewWallet
-import com.blockstream.compose.navigation.NavData
 import com.blockstream.utils.Loggable
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -124,16 +125,20 @@ class BumpViewModel(
                 ),
                 broadcast = event.broadcastTransaction
             )
-        } else if (event is LocalEvents.BroadcastTransaction) {
-            signAndSendTransaction(
-                params = createTransactionParams.value,
-                originalTransaction = createTransaction.value,
-                segmentation = TransactionSegmentation(
-                    transactionType = TransactionType.BUMP
-                ),
-                psbt = event.psbt,
-                broadcast = event.broadcastTransaction
-            )
+        } else if (event is LocalEvents.BroadcastPsbtTransaction) {
+            // Hack to solve a screen/jade being stuck in screen transition
+            viewModelScope.launch {
+                delay(500L)
+                signAndSendTransaction(
+                    params = createTransactionParams.value,
+                    originalTransaction = createTransaction.value,
+                    segmentation = TransactionSegmentation(
+                        transactionType = TransactionType.BUMP
+                    ),
+                    psbt = event.psbt,
+                    broadcast = event.broadcastTransaction
+                )
+            }
         }
     }
 

compose/src/commonMain/kotlin/com/blockstream/compose/models/send/CreateTransactionViewModel.kt

@@ -148,7 +148,7 @@ abstract class CreateTransactionViewModelAbstract(
         data class SetCustomFeeRate(val amount: String) : Event
         data class SetAddressInputType(val inputType: AddressInputType) : Event
         data class SignTransaction(val broadcastTransaction: Boolean = true, val createPsbt: Boolean = false) : Event
-        data class BroadcastTransaction(val broadcastTransaction: Boolean = true, val psbt: String) : Event
+        data class BroadcastPsbtTransaction(val psbt: String, val broadcastTransaction: Boolean = true) : Event
     }
 
     class LocalSideEffects {

compose/src/commonMain/kotlin/com/blockstream/compose/models/send/SendConfirmViewModel.kt

@@ -27,6 +27,7 @@ import com.blockstream.data.gdk.data.AccountAsset
 import com.blockstream.data.gdk.data.UtxoView
 import com.blockstream.data.transaction.TransactionConfirmation
 import com.blockstream.utils.Loggable
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -148,15 +149,19 @@ class SendConfirmViewModel constructor(
                 }
             }
 
-            is CreateTransactionViewModelAbstract.LocalEvents.BroadcastTransaction -> {
-                session.pendingTransaction?.also {
-                    signAndSendTransaction(
-                        params = it.params,
-                        originalTransaction = it.transaction,
-                        segmentation = it.segmentation,
-                        psbt = event.psbt,
-                        broadcast = event.broadcastTransaction,
-                    )
+            is CreateTransactionViewModelAbstract.LocalEvents.BroadcastPsbtTransaction -> {
+                // Hack to solve a screen/jade being stuck in screen transition
+                viewModelScope.launch {
+                    delay(500L)
+                    session.pendingTransaction?.also {
+                        signAndSendTransaction(
+                            params = it.params,
+                            originalTransaction = it.transaction,
+                            segmentation = it.segmentation,
+                            psbt = event.psbt,
+                            broadcast = event.broadcastTransaction,
+                        )
+                    }
                 }
             }
 
@@ -313,6 +318,14 @@ class SendConfirmViewModelPreview(
         fun previewLBTCSwap() = SendConfirmViewModelPreview(
             previewWallet(), transactionConfirmation = TransactionConfirmation(
                 from = previewAccountAsset(),
+                utxos = listOf(
+                    UtxoView(
+                        address = "bc1qaqtq80759n35gk6ftc57vh7du83nwvt5lgkznu",
+                        assetId = BTC_POLICY_ASSET,
+                        amount = "2.123 BTC",
+                        amountExchange = "45.123 USD"
+                    )
+                ),
                 amount = "2.123 BTC",
                 amountFiat = "43.312 USD",
                 fee = "0.0123 BTC",

compose/src/commonMain/kotlin/com/blockstream/compose/models/swap/SwapViewModel.kt

@@ -17,6 +17,7 @@ import com.blockstream.data.TransactionSegmentation
 import com.blockstream.data.TransactionType
 import com.blockstream.data.banner.Banner
 import com.blockstream.data.data.DenominatedValue
+import com.blockstream.data.data.FeePriority
 import com.blockstream.data.data.GreenWallet
 import com.blockstream.data.extensions.ifConnected
 import com.blockstream.data.extensions.isNotBlank
@@ -34,6 +35,7 @@ import com.blockstream.data.utils.feeRateWithUnit
 import com.blockstream.data.utils.ifNotNull
 import com.blockstream.data.utils.toAmountLook
 import com.blockstream.domain.swap.SwapUseCase
+import com.blockstream.jade.Loggable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -86,6 +88,8 @@ abstract class SwapViewModelAbstract(
 
     abstract fun onAmountChanged(amount: String, isSendQuoteMode: Boolean)
 
+    abstract fun onQuoteModeChanged(isSendQuoteMode: Boolean)
+
     abstract fun onAccountClick(isFrom: Boolean)
     abstract fun setAccount(accountAssetBalance: AccountAssetBalance)
 }
@@ -259,11 +263,23 @@ class SwapViewModel(
 
         _network.onEach {
             _showFeeSelector.value = sendUseCase.showFeeSelectorUseCase(session = session, network = it)
+            // Reset fee priority, this is important as can be changed by the user and persisted in liquid
+            _feePriority.value = FeePriority.Low()
         }.launchIn(this)
 
         bootstrap()
     }
 
+    override fun onQuoteModeChanged(isSendQuoteMode: Boolean) {
+        uiState.update {
+            if (isSendQuoteMode) {
+                it.copy(quoteMode = QuoteMode.SEND)
+            } else {
+                it.copy(quoteMode = QuoteMode.RECEIVE)
+            }
+        }
+    }
+
     override fun onAmountChanged(amount: String, isSendQuoteMode: Boolean) {
         uiState.update {
             if (isSendQuoteMode) {
@@ -403,9 +419,15 @@ class SwapViewModel(
     override fun setDenominatedValue(denominatedValue: DenominatedValue) {
         _denomination.value = denominatedValue.denomination
         uiState.update { uiState ->
-            uiState.copy(
-                amountFrom = denominatedValue.asInput ?: ""
-            )
+            if (uiState.quoteMode.isSend) {
+                uiState.copy(
+                    amountFrom = denominatedValue.asInput ?: ""
+                )
+            } else {
+                uiState.copy(
+                    amountTo = denominatedValue.asInput ?: ""
+                )
+            }
         }
     }
 
@@ -421,6 +443,8 @@ class SwapViewModel(
             }
         }
     }
+
+    companion object : Loggable()
 }
 
 class SwapViewModelPreview(greenWallet: GreenWallet) :
@@ -431,6 +455,7 @@ class SwapViewModelPreview(greenWallet: GreenWallet) :
 
     override fun createSwap() {}
     override fun onAmountChanged(amount: String, isFromInput: Boolean) {}
+    override fun onQuoteModeChanged(isSendQuoteMode: Boolean) {}
 
     override fun onAccountClick(isFrom: Boolean) {}