Increment to version 4.0.35

CHANGELOG.md

@@ -3,11 +3,19 @@ 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.35] - 2024-09-26
+
+### Added
+- Verify address with HWW upon 2FA reactivation
+
+### Changed
+- Bump GDK to version 0.73.1
+
 ## [4.0.34] - 2024-09-04
 
 ### Changed
 - Update dependencies
-- 
+
 - ### Fixed
 - Various bug fixes
 

common/src/commonMain/kotlin/com/blockstream/common/lightning/LightningBridge.kt

@@ -4,6 +4,7 @@ import breez_sdk.BlockingBreezServices
 import breez_sdk.BreezEvent
 import breez_sdk.Config
 import breez_sdk.ConfigureNodeRequest
+import breez_sdk.ConnectException
 import breez_sdk.ConnectRequest
 import breez_sdk.EnvironmentType
 import breez_sdk.EventListener
@@ -46,7 +47,6 @@ import breez_sdk.ReverseSwapFeesRequest
 import breez_sdk.ReverseSwapInfo
 import breez_sdk.ReverseSwapPairInfo
 import breez_sdk.ReverseSwapStatus
-import breez_sdk.SdkException
 import breez_sdk.SendOnchainRequest
 import breez_sdk.SendOnchainResponse
 import breez_sdk.SendPaymentRequest
@@ -190,13 +190,13 @@ class LightningBridge constructor(
             updateLspInformation()
 
             return true
-        } catch (e: SdkException) {
+        } catch (e: ConnectException){
             e.printStackTrace()
 
             // SdkException for not registered node
             // Failed to initialize the SDK: Failed to connect to Greenlight: status: Internal,
             // message: "Unable to register node: not authorized: an invite code or a partner certificate is require to register a new node (see https://bit.ly/glinvites for details"
-            return if(e.message?.lowercase()?.contains("register node") == true) {
+            return if(e.message?.lowercase()?.contains("restore only", ignoreCase = true) == true) {
                 false
             } else {
                 null

compose/src/commonMain/kotlin/com/blockstream/compose/sheets/AssetsBottomSheet.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -73,6 +74,9 @@ fun AssetsBottomSheet(
 ) {
     GreenBottomSheet(
         viewModel = viewModel,
+        sheetState = rememberModalBottomSheetState(
+            skipPartiallyExpanded = true,
+        ),
         onDismissRequest = onDismissRequest
     ) {
 

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ kotlinx-coroutines = "1.9.0-RC.2"
 kotlinx-datetime = "0.6.1"
 kotlinx-serialization = "1.7.2"
 kotlin-ksp = "2.0.20-1.0.24"
-android-gradle-plugin = "8.6.0"
+android-gradle-plugin = "8.6.1"
 androidCompileSdk = "34"
 androidTargetSdk = "34"
 androidMinSdk = "24"
@@ -61,7 +61,7 @@ rxandroidble = "1.18.1"
 rxjava = "3.1.8"
 rxkotlin = "3.0.1"
 slf4j = "2.0.4"
-startup-runtime = "1.1.1"
+startup-runtime = "1.2.0"
 uriKmp = "0.0.16"
 workRuntimeKtx = "2.9.1"
 zendesk = "5.2.0"
@@ -77,7 +77,7 @@ viewpager2 = "1.1.0"
 zxing-android-embedded = "4.3.0"
 kmp-nativecoroutines = "1.0.0-ALPHA-31"
 compose-material3 = "1.3.0"
-compose-tooling-preview = "1.7.1"
+compose-tooling-preview = "1.7.2"
 compose-constraint = "1.0.1"
 jetbrains-compose = "1.7.0-beta02"
 voyager = "1.1.0-beta02"

green/build.gradle.kts

@@ -42,8 +42,8 @@ android {
     defaultConfig {
         minSdk = libs.versions.androidMinSdk.get().toInt()
         targetSdk = libs.versions.androidTargetSdk.get().toInt()
-        versionCode = 434
-        versionName = "4.0.34"
+        versionCode = 435
+        versionName = "4.0.35"
 
         setProperty("archivesBaseName", "BlockstreamGreen-v$versionName")
         proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")