Increment to version 4.0.24

Blockstream · Feb 6, 2024 · 1ca3fe1 · 1ca3fe1
1 parent e6d56f5
commit 1ca3fe1
Show file tree

Hide file tree

Showing 21 changed files with 110 additions and 81 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,26 @@ 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/).
 
+## [4.0.24] - 2024-01-31
+
+### Changed
+- Export Greenlight logs
+- Add "Receive any Liquid/AMP asset" to the assets list on Receive and Create New Account screens
+
+### Changed
+- 2FA SMS activation comply with US requirements
+- Allow setting custom fees when recovering funds from Lightning
+- Refactor ViewModels to support Kotlin Multiplatform
+- Rewrite some UI screens into Jetpack Compose
+- Update Jade Oracle whitelisted urls
+- Bump Breez to version 0.2.15
+- Bump GDK to version 0.70.0
+
+### Fixed
+- Fix F-Droid build
+- Fix message signing UI
+- Various bug fixes
+
 ## [4.0.23] - 2024-01-08
 
 ### Changed

diff --git a/common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt b/common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt
@@ -982,6 +982,10 @@ class GdkSession constructor(
                 changeSettings(network, Settings.normalizeFromProminent(networkSettings = getSettings(network) ?: it, prominentSettings = it, pgpFromProminent = true))
             }
 
+            if (network.isMultisig) {
+                getTwoFactorConfig(network = network, useCache = false)
+                updateWatchOnlyUsername(network = network)
+            }
 
             // hard refresh accounts for the new network
             val networkAccounts = getAccounts(network, refresh = true)

diff --git a/common/src/commonMain/kotlin/com/blockstream/common/models/addresses/SignMessageViewModel.kt b/common/src/commonMain/kotlin/com/blockstream/common/models/addresses/SignMessageViewModel.kt
@@ -51,10 +51,7 @@ class SignMessageViewModel(greenWallet: GreenWallet, account: Account, val addre
                     address = address,
                     message = message.value
                 ),
-                hardwareWalletResolver = DeviceResolver.createIfNeeded(
-                    session.gdkHwWallet,
-                    this
-                )
+                hardwareWalletResolver = DeviceResolver.createIfNeeded(session.gdkHwWallet)
             ).signature
         }, onSuccess = {
             _signature.value = it

diff --git a/...ommonMain/kotlin/com/blockstream/common/models/onboarding/EnterRecoveryPhraseViewModel.kt b/...ommonMain/kotlin/com/blockstream/common/models/onboarding/EnterRecoveryPhraseViewModel.kt
@@ -1,5 +1,7 @@
 package com.blockstream.common.models.onboarding
 
+import com.arkivanov.essenty.statekeeper.StateKeeper
+import com.arkivanov.essenty.statekeeper.StateKeeperDispatcher
 import com.blockstream.common.data.Redact
 import com.blockstream.common.data.SetupArgs
 import com.blockstream.common.events.Event
@@ -11,13 +13,15 @@ import com.blockstream.common.models.GreenViewModel
 import com.blockstream.common.navigation.NavigateDestinations
 import com.blockstream.common.sideeffects.SideEffect
 import com.blockstream.common.sideeffects.SideEffects
+import com.blockstream.common.utils.Loggable
 import com.rickclephas.kmm.viewmodel.MutableStateFlow
 import com.rickclephas.kmm.viewmodel.coroutineScope
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.serialization.Serializable
 import org.koin.core.component.inject
 import kotlin.math.ceil
 import kotlin.math.max
@@ -68,7 +72,7 @@ abstract class EnterRecoveryPhraseViewModelAbstract(val setupArgs: SetupArgs) :
     abstract val bip39WordList: List<String>
 }
 
-class EnterRecoveryPhraseViewModel(setupArgs: SetupArgs) :
+class EnterRecoveryPhraseViewModel(setupArgs: SetupArgs, stateKeeper: StateKeeper = StateKeeperDispatcher()) :
     EnterRecoveryPhraseViewModelAbstract(setupArgs) {
     val wally: Wally by inject()
 
@@ -111,6 +115,14 @@ class EnterRecoveryPhraseViewModel(setupArgs: SetupArgs) :
     init {
         bootstrap()
 
+        stateKeeper.register(STATE, State.serializer()) {
+            State(mnemonic = toMnemonic())
+        }
+
+        stateKeeper.consume(STATE, State.serializer())?.mnemonic.takeIf { it.isNotBlank() }?.also {
+            setRecoveryPhrase(it)
+        }
+
         combine(recoveryPhrase,recoveryPhraseSize, activeWord) { _, _, _ ->
             checkRecoveryPhrase()
         }.launchIn(viewModelScope.coroutineScope)
@@ -127,17 +139,8 @@ class EnterRecoveryPhraseViewModel(setupArgs: SetupArgs) :
             }
         } else if (event is LocalEvents.MnemonicEncryptionPassword) {
             proceed(setupArgs.copy(mnemonic = toMnemonic(), password = event.password))
-
         } else if (event is LocalEvents.SetRecoveryPhrase) {
-            println("RECOVERY: -> '${event.recoveryPhrase}'")
-            // Basic check to prevent huge inputs
-            recoveryPhrase.value = event.recoveryPhrase
-                .trim()
-                .replace("\n", " ")
-                .replace("\\s+", "")
-                .takeIf { it.isNotBlank() }
-                ?.split(" ")?.takeIf { it.size <= 32 }?.toMutableList() ?: mutableListOf()
-            activeWord.value = -1
+            setRecoveryPhrase(event.recoveryPhrase)
         } else if (event is LocalEvents.KeyAction) {
             keyAction(event.key)
         } else if (event is LocalEvents.SetActiveWord) {
@@ -147,6 +150,17 @@ class EnterRecoveryPhraseViewModel(setupArgs: SetupArgs) :
         }
     }
 
+    private fun setRecoveryPhrase(phrase: String){
+        // Basic check to prevent huge inputs
+        recoveryPhrase.value = phrase
+            .trim()
+            .replace("\n", " ")
+            .replace("\\s+", "")
+            .takeIf { it.isNotBlank() }
+            ?.split(" ")?.takeIf { it.size <= 32 }?.toMutableList() ?: mutableListOf()
+        activeWord.value = -1
+    }
+
     private fun proceed(setupArgs: SetupArgs) {
         setupArgs.let { args ->
             if (args.isAddAccount()) {
@@ -295,6 +309,15 @@ class EnterRecoveryPhraseViewModel(setupArgs: SetupArgs) :
     private fun toMnemonic(): String {
         return recoveryPhrase.value.joinToString(" ")
     }
+
+    @Serializable
+    private class State(
+        val mnemonic: String
+    )
+
+    companion object: Loggable() {
+        const val STATE = "STATE"
+    }
 }
 
 class EnterRecoveryPhraseViewModelPreview(setupArgs: SetupArgs) :

diff --git a/...on/src/commonMain/kotlin/com/blockstream/common/models/recovery/RecoveryIntroViewModel.kt b/...on/src/commonMain/kotlin/com/blockstream/common/models/recovery/RecoveryIntroViewModel.kt
@@ -1,10 +1,7 @@
 package com.blockstream.common.models.recovery
 
-import com.arkivanov.essenty.parcelable.Parcelable
-import com.arkivanov.essenty.parcelable.Parcelize
 import com.arkivanov.essenty.statekeeper.StateKeeper
 import com.arkivanov.essenty.statekeeper.StateKeeperDispatcher
-import com.arkivanov.essenty.statekeeper.consume
 import com.blockstream.common.data.SetupArgs
 import com.blockstream.common.events.Event
 import com.blockstream.common.events.Events
@@ -20,6 +17,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.serialization.Serializable
 import org.koin.core.component.inject
 
 abstract class RecoveryIntroViewModelAbstract(val setupArgs: SetupArgs) :
@@ -37,7 +35,7 @@ class RecoveryIntroViewModel constructor(setupArgs: SetupArgs, stateKeeper: Stat
     RecoveryIntroViewModelAbstract(setupArgs = setupArgs) {
     private val gdk: Gdk by inject()
 
-    private val state: State = stateKeeper.consume(STATE) ?: State(
+    private val state: State = stateKeeper.consume(STATE, State.serializer()) ?: State(
         mnemonic = gdk.generateMnemonic12(), mnemonicSize = 12
     )
 
@@ -54,7 +52,7 @@ class RecoveryIntroViewModel constructor(setupArgs: SetupArgs, stateKeeper: Stat
     }
 
     init {
-        stateKeeper.register(STATE) {
+        stateKeeper.register(STATE, State.serializer()) {
             State(mnemonic = mnemonic.value, mnemonicSize = mnemonicSize.value)
         }
 
@@ -112,10 +110,10 @@ class RecoveryIntroViewModel constructor(setupArgs: SetupArgs, stateKeeper: Stat
         }
     }
 
-    @Parcelize
+    @Serializable
     private class State(
         val mnemonic: String, val mnemonicSize: Int
-    ) : Parcelable
+    )
 
     companion object {
         const val STATE = "STATE"

diff --git a/compose/src/main/java/com/blockstream/compose/screens/about/AboutScreen.kt b/compose/src/main/java/com/blockstream/compose/screens/about/AboutScreen.kt
@@ -208,20 +208,20 @@ fun AboutScreen(
 
         GreenColumn(padding = 0) {
 
-//            GreenCard(
-//                modifier = Modifier
-//                    .align(Alignment.CenterHorizontally)
-//                    .clickable {
-//                        viewModel.postEvent(AboutViewModel.LocalEvents.ClickFeedback)
-//                    },
-//            ) {
-//                Text(
-//                    stringResource(id = R.string.id_give_us_your_feedback),
-//                    modifier = Modifier.align(Alignment.Center),
-//                    color = MaterialTheme.colorScheme.primary,
-//                    style = labelLarge,
-//                )
-//            }
+            GreenCard(
+                modifier = Modifier
+                    .align(Alignment.CenterHorizontally)
+                    .clickable {
+                        viewModel.postEvent(AboutViewModel.LocalEvents.ClickFeedback)
+                    },
+            ) {
+                Text(
+                    stringResource(id = R.string.id_give_us_your_feedback),
+                    modifier = Modifier.align(Alignment.Center),
+                    color = MaterialTheme.colorScheme.primary,
+                    style = labelLarge,
+                )
+            }
 
             GreenCard(
                 modifier = Modifier

diff --git a/...ose/src/main/java/com/blockstream/compose/screens/onboarding/EnterRecoveryPhraseScreen.kt b/...ose/src/main/java/com/blockstream/compose/screens/onboarding/EnterRecoveryPhraseScreen.kt
@@ -49,6 +49,7 @@ import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.koin.getScreenModel
 import com.arkivanov.essenty.parcelable.Parcelable
 import com.arkivanov.essenty.parcelable.Parcelize
+import com.arkivanov.essenty.statekeeper.StateKeeperDispatcher
 import com.blockstream.common.data.SetupArgs
 import com.blockstream.common.events.Events
 import com.blockstream.common.extensions.isNotBlank
@@ -89,7 +90,8 @@ data class EnterRecoveryPhraseScreen(val setupArgs: SetupArgs) : Screen, Parcela
     @Composable
     override fun Content() {
         val viewModel = getScreenModel<EnterRecoveryPhraseViewModel>() {
-            parametersOf(setupArgs)
+            // TODO FIX STATE RESTORATION
+            parametersOf(setupArgs, StateKeeperDispatcher())
         }
 
         AppBar {
@@ -112,9 +114,6 @@ data class EnterRecoveryPhraseScreen(val setupArgs: SetupArgs) : Screen, Parcela
 fun EnterRecoveryPhraseScreen(
     viewModel: EnterRecoveryPhraseViewModelAbstract
 ) {
-    val context = LocalContext.current
-
-
     HandleSideEffect(viewModel = viewModel)
 
     GreenColumn(

diff --git a/compose/src/main/java/com/blockstream/compose/screens/recovery/RecoveryIntroScreen.kt b/compose/src/main/java/com/blockstream/compose/screens/recovery/RecoveryIntroScreen.kt
@@ -70,6 +70,7 @@ data class RecoveryIntroScreen(val setupArgs: SetupArgs) : Screen, Parcelable {
     @Composable
     override fun Content() {
         val viewModel = getScreenModel<RecoveryIntroViewModel>() {
+            // TODO FIX STATE RESTORATION
             parametersOf(setupArgs, StateKeeperDispatcher())
         }
 

diff --git a/compose/src/main/java/com/blockstream/compose/sheets/WalletRenameBottomSheet.kt b/compose/src/main/java/com/blockstream/compose/sheets/WalletRenameBottomSheet.kt
@@ -92,21 +92,21 @@ fun WalletRenameBottomSheet(
         // 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 = name)
+        val textFieldValue = textFieldValueState.copy(text = name)
 
-//        SideEffect {
-//            if (textFieldValue.selection != textFieldValueState.selection ||
-//                textFieldValue.composition != textFieldValueState.composition
-//            ) {
-//                textFieldValueState = textFieldValue
-//            }
-//        }
+        SideEffect {
+            if (textFieldValue.selection != textFieldValueState.selection ||
+                textFieldValue.composition != textFieldValueState.composition
+            ) {
+                textFieldValueState = textFieldValue
+            }
+        }
 
         TextField(
             value = textFieldValueState,
             onValueChange = viewModel.name.onTextFieldValueChange {
                 textFieldValueState = it
-             },
+            },
             modifier = Modifier
                 .fillMaxWidth()
                 .focusRequester(focusRequester),

diff --git a/compose/src/main/res/values/strings.xml b/compose/src/main/res/values/strings.xml
@@ -1433,8 +1433,7 @@
   <string name="id_some_accounts_can_not_be_logged_in_due_to_network">Some accounts can not be logged in due to network issues. Please try again later.</string>
   <string name="id_the_lightning_service_is_currently_unavailable_for">The Lightning service is currently unavailable for maintenance, but it will be back soon.</string>
   <string name="id_the_lightning_service_is_currently_unavailable_we">The Lightning service is currently unavailable. We apologize for the disruption, we are working to bring the service back online.</string>
-  <string name="id_by_continuing_you_agree_to_blockstream_s">By continuing you agree to Blockstream\'s ToS and Privacy Policy</string>
-  <string name="id_tos">ToS</string>
+  <string name="id_by_continuing_you_agree_to_blockstream_s">By continuing you agree to Blockstream\'s Terms Of Service and Privacy Policy</string>
   <string name="id_message_frequency_varies_according_to_the_number">Message frequency varies according to the number of 2FA SMS requests you make.</string>
   <string name="id_for_help_visit_help_blockstream_com">For help visit help.blockstream.com\nTo unsubscribe turn off SMS 2FA from the app.\nStandard messages and data rates may apply.</string>
   <string name="id_help_blockstream_com">help.blockstream.com</string>

diff --git a/green/build.gradle.kts b/green/build.gradle.kts
@@ -40,8 +40,8 @@ android {
     defaultConfig {
         minSdk = libs.versions.androidMinSdk.get().toInt()
         targetSdk = libs.versions.androidTargetSdk.get().toInt()
-        versionCode = 423
-        versionName = "4.0.23"
+        versionCode = 424
+        versionName = "4.0.24"
 
         setProperty("archivesBaseName", "BlockstreamGreen-v$versionName")
         proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

diff --git a/green/src/main/java/com/blockstream/green/ui/dialogs/UrlWarningDialogFragment.kt b/green/src/main/java/com/blockstream/green/ui/dialogs/UrlWarningDialogFragment.kt
@@ -31,7 +31,7 @@ class UrlWarningDialogFragment : AbstractDialogFragment<UrlWarningDialogBinding>
 
         isCancelable = false
 
-        binding.connectionAttemptHost = getString(R.string.id_connection_attempt_to_s, urls.firstOrNull()?.hostname())
+        binding.connectionAttemptHost = getString(R.string.id_connection_attempt_to_s, urls.map { it.hostname() }.joinToString(", "))
 
         binding.buttonClose.setOnClickListener {
             handle(false)

diff --git a/green/src/main/java/com/blockstream/green/ui/onboarding/EnterRecoveryPhraseFragment.kt b/green/src/main/java/com/blockstream/green/ui/onboarding/EnterRecoveryPhraseFragment.kt
@@ -10,6 +10,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.arkivanov.essenty.statekeeper.stateKeeper
 import com.blockstream.common.data.ScanResult
 import com.blockstream.common.events.Events
 import com.blockstream.common.gdk.getBip39WordList
@@ -59,7 +60,7 @@ class EnterRecoveryPhraseFragment : AppFragment<EnterRecoveryPhraseFragmentBindi
         get() = args.setupArgs.network?.getNetworkIcon()
 
     val viewModel: EnterRecoveryPhraseViewModel by viewModel {
-        parametersOf(args.setupArgs)
+        parametersOf(args.setupArgs, stateKeeper())
     }
 
     override fun getGreenViewModel(): GreenViewModel = viewModel

diff --git a/green/src/main/java/com/blockstream/green/ui/settings/TwoFactorSetupFragment.kt b/green/src/main/java/com/blockstream/green/ui/settings/TwoFactorSetupFragment.kt
@@ -134,7 +134,7 @@ class TwoFactorSetupFragment : AbstractWalletFragment<TwofactorSetupFragmentBind
             text = R.string.id_by_continuing_you_agree_to_blockstream_s,
             color = R.color.color_on_surface_emphasis_medium,
             links = listOf(
-                R.string.id_tos to object : ClickableSpan() {
+                R.string.id_terms_of_service to object : ClickableSpan() {
                     override fun onClick(widget: View) {
                         viewModel.postEvent(TwoFactorSetupViewModel.LocalEvents.ClickTermsOfService())
                     }

diff --git a/green/src/main/java/com/blockstream/green/ui/settings/WalletSettingsViewModel.kt b/green/src/main/java/com/blockstream/green/ui/settings/WalletSettingsViewModel.kt
@@ -256,7 +256,7 @@ open class WalletSettingsViewModel constructor(
             database.deleteLoginCredentials(wallet.id, CredentialType.PASSWORD_PINDATA)
         }, onSuccess = {
             postSideEffect(SideEffects.Snackbar("id_you_have_successfully_changed"))
-            postSideEffect(SideEffects.Success())
+            postSideEffect(SideEffects.NavigateBack())
         })
     }
 

diff --git a/green/src/main/java/com/blockstream/green/utils/AppReviewHelper.kt b/green/src/main/java/com/blockstream/green/utils/AppReviewHelper.kt
@@ -52,6 +52,7 @@ object AppReviewHelper {
         MaterialAlertDialogBuilder(fragment.requireContext())
             .setTitle(R.string.id_give_us_your_feedback)
             .setView(dialogBinding.root)
+            .setCancelable(false)
             .setPositiveButton(R.string.id_send) { _, _ ->
                 if (dialogBinding.toggleRate.checkedButtonId > 0 || !dialogBinding.feedbackText.text.isNullOrBlank()) {
                     fragment.countly.recordFeedback(

diff --git a/green/src/main/res/layout/list_item_asset_accounts.xml b/green/src/main/res/layout/list_item_asset_accounts.xml
@@ -86,7 +86,7 @@
 
             <include
                 android:id="@+id/createNewAccount"
-                isVisible="@{isSelected}"
+                isVisible="@{isSelected &amp;&amp; !isWatchOnly}"
                 layout="@layout/select_account_layout" />
 
         </LinearLayout>