Increment to version 4.0.37

Blockstream · Nov 5, 2024 · bb37795 · bb37795
1 parent d72024e
commit bb37795
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@ 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.37] - 2024-10-29
+
+### Changed
+- Bump GDK to version 0.73.3
+
+### Fixed
+- Crash fix
+
 ## [4.0.36] - 2024-10-24
 
 ### Changed

diff --git a/common/src/commonMain/kotlin/com/blockstream/common/models/exchange/OnOffRampsViewModel.kt b/common/src/commonMain/kotlin/com/blockstream/common/models/exchange/OnOffRampsViewModel.kt
@@ -15,6 +15,7 @@ import com.blockstream.common.extensions.ifConnected
 import com.blockstream.common.extensions.isNotBlank
 import com.blockstream.common.extensions.isPolicyAsset
 import com.blockstream.common.extensions.launchIn
+import com.blockstream.common.extensions.logException
 import com.blockstream.common.extensions.previewAccountAssetBalance
 import com.blockstream.common.extensions.previewWallet
 import com.blockstream.common.extensions.tryCatch
@@ -164,7 +165,7 @@ class OnOffRampsViewModel(greenWallet: GreenWallet) :
                 if (isLightning) {
                     // Cache SwapInfo
                     if (swapInfo == null) {
-                        swapInfo = tryCatch(context = Dispatchers.Main) {
+                        swapInfo = tryCatch(context = Dispatchers.Default) {
                             session.receiveOnchain()
                         }
                     }

diff --git a/compose/src/androidMain/kotlin/com/blockstream/compose/components/Buttons.android.kt b/compose/src/androidMain/kotlin/com/blockstream/compose/components/Buttons.android.kt
@@ -1,6 +1,8 @@
 package com.blockstream.compose.components
 
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable

diff --git a/...se/src/commonMain/kotlin/com/blockstream/compose/screens/settings/WalletSettingsScreen.kt b/...se/src/commonMain/kotlin/com/blockstream/compose/screens/settings/WalletSettingsScreen.kt
@@ -35,14 +35,12 @@ import blockstream_green.common.generated.resources.id_1d_minutes
 import blockstream_green.common.generated.resources.id_2fa_threshold
 import blockstream_green.common.generated.resources.id_a_screen_lock_must_be_enabled
 import blockstream_green.common.generated.resources.id_add_a_pgp_public_key_to_receive
-import blockstream_green.common.generated.resources.id_another_2fa_method_is_already
 import blockstream_green.common.generated.resources.id_archived_accounts
 import blockstream_green.common.generated.resources.id_auto_logout_timeout
 import blockstream_green.common.generated.resources.id_backup_recovery_phrase
 import blockstream_green.common.generated.resources.id_biometric_login_is_disabled
 import blockstream_green.common.generated.resources.id_biometric_login_is_enabled
 import blockstream_green.common.generated.resources.id_change_pin
-import blockstream_green.common.generated.resources.id_confirm_via_2fa_that_you
 import blockstream_green.common.generated.resources.id_copy_support_id
 import blockstream_green.common.generated.resources.id_denomination__exchange_rate
 import blockstream_green.common.generated.resources.id_display_values_in_s_and
@@ -56,7 +54,6 @@ import blockstream_green.common.generated.resources.id_pgp_key
 import blockstream_green.common.generated.resources.id_recovery_transaction_emails
 import blockstream_green.common.generated.resources.id_recovery_transactions
 import blockstream_green.common.generated.resources.id_request_recovery_transactions
-import blockstream_green.common.generated.resources.id_security_change
 import blockstream_green.common.generated.resources.id_set_an_email_for_recovery
 import blockstream_green.common.generated.resources.id_set_twofactor_threshold
 import blockstream_green.common.generated.resources.id_support
@@ -77,15 +74,13 @@ import com.blockstream.common.data.TwoFactorSetupAction
 import com.blockstream.common.data.WalletSetting
 import com.blockstream.common.events.Events
 import com.blockstream.common.gdk.data.Network
-import com.blockstream.common.gdk.data.TwoFactorConfig
 import com.blockstream.common.models.settings.DenominationExchangeRateViewModel
 import com.blockstream.common.models.settings.WalletSettingsSection
 import com.blockstream.common.models.settings.WalletSettingsViewModel
 import com.blockstream.common.models.settings.WalletSettingsViewModelAbstract
 import com.blockstream.common.navigation.NavigateDestinations
 import com.blockstream.common.sideeffects.SideEffects
 import com.blockstream.common.utils.getBitcoinOrLiquidUnit
-import com.blockstream.compose.components.GreenAmountField
 import com.blockstream.compose.components.GreenButton
 import com.blockstream.compose.components.GreenButtonType
 import com.blockstream.compose.components.GreenColumn
@@ -145,6 +140,7 @@ fun WalletSettingsScreen(
     var showAutologoutTimeoutDialog by remember { mutableStateOf<Int?>(null) }
     var showThresholdDialog by remember { mutableStateOf<String?>(null) }
     var showTwoFactorChangeDialog by remember { mutableStateOf<WalletSettingsViewModel.LocalSideEffects.Disable2FA?>(null) }
+    val onProgress by viewModel.onProgress.collectAsStateWithLifecycle()
 
     val biometricsState = rememberBiometricsState()
 
@@ -421,11 +417,14 @@ fun WalletSettingsScreen(
                             }
                         ),
                         checked = item.enabled,
+                        enabled = !onProgress,
                         onCheckedChange = {
                             viewModel.postEvent(WalletSettingsViewModel.LocalEvents.LoginWithBiometrics)
                         },
                         modifier = Modifier.clickable {
-                            viewModel.postEvent(WalletSettingsViewModel.LocalEvents.LoginWithBiometrics)
+                            if (!onProgress) {
+                                viewModel.postEvent(WalletSettingsViewModel.LocalEvents.LoginWithBiometrics)
+                            }
                         }
                     )
                 }
@@ -566,6 +565,7 @@ fun Setting(
     painter: Painter? = null,
     checked: Boolean? = null,
     isRadio: Boolean = false,
+    enabled: Boolean = true,
     onCheckedChange: ((Boolean) -> Unit) = {},
 ) {
     Card(modifier = Modifier.then(modifier)) {
@@ -607,6 +607,7 @@ fun Setting(
                 if (isRadio) {
                     RadioButton(
                         selected = checked,
+                        enabled = enabled,
                         onClick = {
                             onCheckedChange.invoke(true)
                         },
@@ -618,6 +619,7 @@ fun Setting(
                     Switch(
                         checked = checked,
                         onCheckedChange = onCheckedChange,
+                        enabled = enabled,
                         modifier = Modifier
                             .align(Alignment.CenterVertically)
                             .padding(end = 16.dp)

diff --git a/compose/src/commonMain/kotlin/com/blockstream/compose/sideeffects/Dialog.kt b/compose/src/commonMain/kotlin/com/blockstream/compose/sideeffects/Dialog.kt
@@ -85,7 +85,7 @@ class DialogState {
         openDialog(
             OpenDialogData(
                 title = StringHolder.create(Res.string.id_error),
-                message = StringHolder.create(throwable.message),
+                message = StringHolder.create(throwable.message ?: throwable.cause?.message),
                 onDismiss = onClose,
                 onPrimary = onClose,
                 secondaryText = getString(Res.string.id_contact_support)

diff --git a/compose/src/commonMain/kotlin/com/blockstream/compose/utils/SideEffects.kt b/compose/src/commonMain/kotlin/com/blockstream/compose/utils/SideEffects.kt
@@ -323,8 +323,8 @@ fun HandleSideEffect(
                 is SideEffects.ErrorDialog -> {
                     appCoroutine.launch {
                         dialog.openErrorDialog(
-                            it.error,
-                            it.errorReport,
+                            throwable = it.error,
+                            errorReport = it.errorReport,
                             onErrorReport = { errorReport ->
                                 appCoroutine.launch {
                                     dialog.openErrorReportDialog(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ constraintlayout = "2.1.4"
 appcompat = "1.7.0"
 core-ktx = "1.13.1"
 core-testing = "2.2.0"
-countly-sdk-android = "cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5"
+countly-sdk-android = "9c9811144bcf70da8d8fcb8eab8389c09405b188"
 espresso-core = "3.6.1"
 fastadapter = "5.7.0"
 installreferrer = "2.2"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -7948,6 +7948,11 @@
             <sha256 value="65c5e3c180c4cba21b0a9a722982a3f49a33fea746e756dec5263b8d492b1c9b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.angelix" name="countly-sdk-android" version="7ae8ec5a8a82e849a1eb1fd7916381f54bfe0849">
+         <artifact name="countly-sdk-android-7ae8ec5a8a82e849a1eb1fd7916381f54bfe0849.jar">
+            <sha256 value="71e02f75fc4d803fb2bafa938e266f6d2912ed32ea7fde7c4b0cba391845586f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.angelix" name="countly-sdk-android" version="8af847f00d">
          <artifact name="countly-sdk-android-8af847f00d.jar">
             <sha256 value="6d09b1a4bee4dea070db40f0641a19de983a64bb727970c3e674821e672cb7e3" origin="Generated by Gradle"/>
@@ -7956,6 +7961,11 @@
             <sha256 value="f99b67f656a7123eed9a9e323aef68c2275c3ac3e3033b77f9549309963674e5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.angelix" name="countly-sdk-android" version="9c9811144bcf70da8d8fcb8eab8389c09405b188">
+         <artifact name="countly-sdk-android-9c9811144bcf70da8d8fcb8eab8389c09405b188.jar">
+            <sha256 value="a6e967373ac242af466a3b9c20a3d3f5063bde5b872ce0df52adb193760432bc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.angelix" name="countly-sdk-android" version="cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5">
          <artifact name="countly-sdk-android-cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5.jar">
             <sha256 value="28df7cbd1aa1a1cb2f863a54b539223ed4c470a5e34fe0035ccd55a492dd8c36" origin="Generated by Gradle"/>
@@ -7969,6 +7979,11 @@
             <sha256 value="10d1bba6572b7230caa1a63ce9397091e0be2b4d60b5e3f9cc553b444db022fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.angelix.countly-sdk-android" name="sdk" version="7ae8ec5a8a82e849a1eb1fd7916381f54bfe0849">
+         <artifact name="sdk-7ae8ec5a8a82e849a1eb1fd7916381f54bfe0849.aar">
+            <sha256 value="9e863f830b443bb9d86c4462844341e65468481dcad8681ef3e93b60c500c13a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.angelix.countly-sdk-android" name="sdk" version="8af847f00d">
          <artifact name="sdk-8af847f00d.aar">
             <sha256 value="bc2e510dd10269bf77e6a0ca23adb0aae176c8d6745fb49241f4e8cc17888844" origin="Generated by Gradle"/>
@@ -7977,6 +7992,11 @@
             <sha256 value="949214067316af2519a4d2f37109cc1f6795acfa74adfe757ce68e06a1847735" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.angelix.countly-sdk-android" name="sdk" version="9c9811144bcf70da8d8fcb8eab8389c09405b188">
+         <artifact name="sdk-9c9811144bcf70da8d8fcb8eab8389c09405b188.aar">
+            <sha256 value="d3c9a3a2d8fdb22c98b44e324599d7f38e87d5da96ec9c549cf165277b6d4bfb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.angelix.countly-sdk-android" name="sdk" version="cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5">
          <artifact name="sdk-cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5.aar">
             <sha256 value="e057cdae8fa3b93ef6309bb99fb7a07d804f5847d033d163109daa06fb509a45" origin="Generated by Gradle"/>
@@ -7990,6 +8010,11 @@
             <sha256 value="db55adad8029b6d4223ab4eff5e26cdc0a95074d34b8fb6429cad1cb7fb1d452" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.angelix.countly-sdk-android" name="sdk-native" version="7ae8ec5a8a82e849a1eb1fd7916381f54bfe0849">
+         <artifact name="sdk-native-7ae8ec5a8a82e849a1eb1fd7916381f54bfe0849.aar">
+            <sha256 value="1d0834f7986d3df53d5bc54cc43ddd0c30a1fefd7c5570e64e260c4cbbe8d039" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.angelix.countly-sdk-android" name="sdk-native" version="8af847f00d">
          <artifact name="sdk-native-8af847f00d.aar">
             <sha256 value="a935991995532deba2a4728ca32ee5e38feaa48f060fe1e2388e4feb13f7ab01" origin="Generated by Gradle"/>
@@ -7998,6 +8023,11 @@
             <sha256 value="d3b3b5cd94e1e1fac408bbda031f168ca320f144b206b088fe18c766920d47f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.angelix.countly-sdk-android" name="sdk-native" version="9c9811144bcf70da8d8fcb8eab8389c09405b188">
+         <artifact name="sdk-native-9c9811144bcf70da8d8fcb8eab8389c09405b188.aar">
+            <sha256 value="1d0834f7986d3df53d5bc54cc43ddd0c30a1fefd7c5570e64e260c4cbbe8d039" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.angelix.countly-sdk-android" name="sdk-native" version="cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5">
          <artifact name="sdk-native-cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5.aar">
             <sha256 value="1d0834f7986d3df53d5bc54cc43ddd0c30a1fefd7c5570e64e260c4cbbe8d039" origin="Generated by Gradle"/>
@@ -8011,6 +8041,11 @@
             <sha256 value="ed4a5104a67761c45dc0068190ce4d62fc570ed64fe2c61502edfa01b4e1ea13" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.angelix.countly-sdk-android" name="sdk-plugin" version="7ae8ec5a8a82e849a1eb1fd7916381f54bfe0849">
+         <artifact name="sdk-plugin-7ae8ec5a8a82e849a1eb1fd7916381f54bfe0849.jar">
+            <sha256 value="2b3b36dda3240ede5c04c1391ed381fcf7b0a38e750faa16aea9536626f2d28b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.angelix.countly-sdk-android" name="sdk-plugin" version="8af847f00d">
          <artifact name="sdk-plugin-8af847f00d.jar">
             <sha256 value="d6256864f592a793a33717d467ffb78ad378cc05691baf115d648242596cc23e" origin="Generated by Gradle"/>
@@ -8019,6 +8054,11 @@
             <sha256 value="248e2c836ed7c5f04f3636de0294f35a0a2a7ab27d0cf64d733638e7f70d3572" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.angelix.countly-sdk-android" name="sdk-plugin" version="9c9811144bcf70da8d8fcb8eab8389c09405b188">
+         <artifact name="sdk-plugin-9c9811144bcf70da8d8fcb8eab8389c09405b188.jar">
+            <sha256 value="b84a21f258cf82ed7cd4e10b79994f0a2abbae860b68a53a82cbe54c6952c0f6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.angelix.countly-sdk-android" name="sdk-plugin" version="cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5">
          <artifact name="sdk-plugin-cfa75ab5bfba362ecb53c9d6e2b513cdabd8e1a5.jar">
             <sha256 value="85b595cc56ef9e7a724ce05f0c5a2ddfc463969fc6c6918d80289463fed6e9a9" origin="Generated by Gradle"/>

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