Increment to version 4.0.28

Blockstream · May 14, 2024 · a14807e · a14807e
1 parent 4a8b4f3
commit a14807e
Show file tree

Hide file tree

Showing 9 changed files with 488 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ local.properties
 .project
 .settings/
 .idea/
+.sync/
 bin/
 gen/
 *.swp

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +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.28] - 2024-05-13
+
+### Added
+- Revamp Sweep UI
+
+### Changed
+- Bump GDK to version 0.71.0
+- Bump Breez to version 0.4.1-rc2
+
+### Fixed
+- Fix v2 password login
+- Fix wrong conversion when generating an address with amount
+
 ## [4.0.27] - 2024-03-28
 
 ### Added

diff --git a/common/src/commonMain/kotlin/com/blockstream/common/lightning/Extensions.kt b/common/src/commonMain/kotlin/com/blockstream/common/lightning/Extensions.kt
@@ -214,7 +214,7 @@ fun Transaction.Companion.fromSwapInfo(account: Account, swapInfo: SwapInfo, isR
         memo = "",
         spvVerified = "",
         txHash = swapInfo.refundTxIds.firstOrNull() ?: "",
-        type = Transaction.Type.OUT.gdkType,
+        type = Transaction.Type.IN.gdkType,
         satoshi = mapOf(BTC_POLICY_ASSET to swapInfo.confirmedSats.toLong() + (if(isRefundableSwap) 0 else swapInfo.unconfirmedSats.toLong())),
         isLightningSwap = true,
         isInProgressSwap = swapInfo.confirmedSats.toLong() > 0 && !isRefundableSwap,

diff --git a/...n/src/commonMain/kotlin/com/blockstream/common/models/settings/WalletSettingsViewModel.kt b/...n/src/commonMain/kotlin/com/blockstream/common/models/settings/WalletSettingsViewModel.kt
@@ -174,48 +174,59 @@ class WalletSettingsViewModel(
                         WalletSetting.Text("id_security"),
                         WalletSetting.AutologoutTimeout(settings.altimeout)
                     )
-                } else if (!session.isLightningShortcut) {
-
-                    val hasMultisig =
-                        session.activeBitcoinMultisig != null || session.activeLiquidMultisig != null
+                } else {
 
-                    list += listOfNotNull(
+                    list += listOf(
                         WalletSetting.Text("id_general"),
                         WalletSetting.DenominationExchangeRate(
                             unit = settings.networkUnit(session),
                             currency = settings.pricing.currency,
                             exchange = settings.pricing.exchange
                         ),
-                        WalletSetting.ArchivedAccounts(session.allAccounts.value.count { it.hidden }),
-                        WalletSetting.WatchOnly,
-                        WalletSetting.Text("id_security"),
                     )
 
-                    if (!greenWallet.isEphemeral && !greenWallet.isHardware) {
-                        list += listOf(
-                            WalletSetting.ChangePin,
-                            WalletSetting.LoginWithBiometrics(
-                                enabled = _hasBiometrics.value,
-                                canEnable = greenKeystore.canUseBiometrics()
-                            )
+                    if (!session.isLightningShortcut) {
+                        val hasMultisig =
+                            session.activeBitcoinMultisig != null || session.activeLiquidMultisig != null
+
+                        list += listOfNotNull(
+                            WalletSetting.Text("id_general"),
+                            WalletSetting.DenominationExchangeRate(
+                                unit = settings.networkUnit(session),
+                                currency = settings.pricing.currency,
+                                exchange = settings.pricing.exchange
+                            ),
+                            WalletSetting.ArchivedAccounts(session.allAccounts.value.count { it.hidden }),
+                            WalletSetting.WatchOnly,
+                            WalletSetting.Text("id_security"),
                         )
-                    }
-
-                    if (hasMultisig) {
-                        list += listOf(WalletSetting.TwoFactorAuthentication)
-
-                        session.activeMultisig.firstOrNull()?.also {
-                            list += listOf(WalletSetting.PgpKey(enabled = session.getSettings(it)?.pgp.isNotBlank()))
+
+                        if (!greenWallet.isEphemeral && !greenWallet.isHardware) {
+                            list += listOf(
+                                WalletSetting.ChangePin,
+                                WalletSetting.LoginWithBiometrics(
+                                    enabled = _hasBiometrics.value,
+                                    canEnable = greenKeystore.canUseBiometrics()
+                                )
+                            )
+                        }
+
+                        if (hasMultisig) {
+                            list += listOf(WalletSetting.TwoFactorAuthentication)
+
+                            session.activeMultisig.firstOrNull()?.also {
+                                list += listOf(WalletSetting.PgpKey(enabled = session.getSettings(it)?.pgp.isNotBlank()))
+                            }
+                        }
+
+                        list += listOf(WalletSetting.AutologoutTimeout(settings.altimeout))
+
+                        if (!session.isHardwareWallet) {
+                            list += listOf(
+                                WalletSetting.Text("id_recovery"),
+                                WalletSetting.RecoveryPhrase
+                            )
                         }
-                    }
-
-                    list += listOf(WalletSetting.AutologoutTimeout(settings.altimeout))
-
-                    if (!session.isHardwareWallet) {
-                        list += listOf(
-                            WalletSetting.Text("id_recovery"),
-                            WalletSetting.RecoveryPhrase
-                        )
                     }
 
                 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,24 +1,24 @@
 [versions]
 kotlin = "1.9.23"
 kotlin-logging = "3.0.5"
-kotlinx-coroutines = "1.8.0"
+kotlinx-coroutines = "1.8.1"
 kotlinx-datetime = "0.5.0"
 kotlinx-serialization = "1.6.3"
 kotlin-ksp = "1.9.23-1.0.19"
-android-gradle-plugin = "8.3.2"
+android-gradle-plugin = "8.4.0"
 androidCompileSdk = "34"
 androidTargetSdk = "34"
 androidMinSdk = "24"
 buildTools = "34.0.0"
 breez = "0.4.1-rc2"
-activity-ktx = "1.8.2"
+activity-ktx = "1.9.0"
 androidx-junit = "1.1.5"
 annotation = "1.7.1"
 biometric = "1.2.0-alpha05"
 browser = "1.8.0"
 constraintlayout = "2.1.4"
 appcompat = "1.6.1"
-core-ktx = "1.12.0"
+core-ktx = "1.13.1"
 core-testing = "2.2.0"
 countly-sdk-android = "4626cb98b65ef9769296956022474d7658b3b116"
 espresso-core = "3.5.1"
@@ -30,17 +30,17 @@ junit = "4.13.2"
 kase64 = "1.0.6"
 kermit = "2.0.2"
 kmm-viewmodel = "1.0.0-ALPHA-20"
-koin = "3.5.3"
-koin-annotations = "1.3.0"
-koin-ksp-compiler = "1.3.0"
+koin = "3.5.6"
+koin-annotations = "1.3.1"
+koin-ksp-compiler = "1.3.1"
 ksoupEntites = "0.1.2"
 lifecycle = "2.7.0"
 multiplatformSettings = "1.1.1"
 okio = "3.7.0"
 sqldelight = "2.0.1"
 material = "1.11.0"
-mockito-kotlin = "5.0.0"
-mockk = "1.13.7"
+mockito-kotlin = "5.3.1"
+mockk = "1.13.10"
 navigation = "2.7.7"
 preference-ktx = "1.2.1"
 room = "2.5.2"
@@ -49,10 +49,10 @@ protobuf-java = "3.4.0"
 recyclerview = "1.3.2"
 replaying-share = "3.0.0"
 review-ktx = "2.0.1"
-rive-android = "9.2.2"
-rxandroid = "3.0.0"
-rxandroidble = "1.17.2"
-rxjava = "3.1.5"
+rive-android = "9.3.1"
+rxandroid = "3.0.2"
+rxandroidble = "1.18.1"
+rxjava = "3.1.8"
 rxkotlin = "3.0.1"
 slf4j = "2.0.4"
 slidetoact = "0.10.0"
@@ -68,20 +68,20 @@ turbine = "1.0.0"
 usb-serial = "6.0.6"
 uuid = "0.8.4"
 desugar = "2.0.4"
-viewpager2 = "1.1.0-beta02"
+viewpager2 = "1.1.0-rc01"
 composeQrCode = "1.0.1"
 zxing-android-embedded = "4.3.0"
 kmp-nativecoroutines = "1.0.0-ALPHA-26"
-compose-bom = "2024.04.00"
+compose-bom = "2024.05.00"
 compose-material3 = "1.2.1"
-compose-tooling-preview = "1.6.5"
+compose-tooling-preview = "1.6.7"
 compose-compiler = "1.5.11"
 compose-constraint = "1.0.1"
-compose-multiplatform = "1.6.1"
-activity-compose = "1.8.2"
-voyager = "1.1.0-alpha03"
+compose-multiplatform = "1.6.2"
+activity-compose = "1.9.0"
+voyager = "1.1.0-alpha04"
 google-services = "4.4.1"
-firebase-bom = "32.8.0"
+firebase-bom = "33.0.0"
 
 [libraries]
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }