Merge branch 'master' into mainnet

dpad85 · dpad85 · commit 33756f0fcc1a · 2025-08-14T11:15:49.000+02:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-lightningkmp = "1.10.4"
+lightningkmp = "1.10.6"
 secp256k1 = "0.18.0" # keep in check with lightning-kmp secp version
 
 kotlin = "2.1.10"
diff --git a/phoenix-android/build.gradle.kts b/phoenix-android/build.gradle.kts
@@ -26,8 +26,8 @@ android {
         applicationId = "fr.acinq.phoenix.mainnet"
         minSdk = 26
         targetSdk = 35
-        versionCode = 106
-        versionName = "2.6.2"
+        versionCode = 107
+        versionName = gitCommitHash()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/inputs/ConverterInput.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/inputs/ConverterInput.kt
@@ -66,6 +66,7 @@ fun ConverterInput(
     trailingContent: @Composable (() -> Unit)? = null,
     internalPaddingHorizontal: Dp = 10.dp,
     internalPaddingVertical: Dp = 10.dp,
+    limitDecimal: Boolean = false,
     enabled: Boolean = true,
     readonly: Boolean = false,
     value: String?,
@@ -86,7 +87,12 @@ fun ConverterInput(
             onValueChange = {
                 if (it.length > 12) return@BasicTextField
                 errorMessage = ""
-                if (it.isNotBlank() && it.toDoubleOrNull() == null) {
+                val saneInput = it.replace(",", ".")
+                // if the input already has 2 decimals, ignore change
+                if (limitDecimal && saneInput.contains(".") && saneInput.split(".").last().length > 2) {
+                    return@BasicTextField
+                }
+                if (it.isNotBlank() && saneInput.toDoubleOrNull() == null) {
                     errorMessage = context.getString(R.string.validation_invalid_number)
                 }
                 internalStringValue = it
@@ -156,7 +162,6 @@ fun ConverterInput(
     }
 }
 
-
 @Composable
 fun RowScope.InlineNumberInput(
     modifier: Modifier = Modifier,
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/inputs/CurrencyConverter.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/inputs/CurrencyConverter.kt
@@ -243,6 +243,7 @@ private fun FiatConverterInput(
                         null -> onAmountUpdate(null)
                     }
                 },
+                limitDecimal = true,
                 modifier = Modifier.weight(1f),
                 backgroundColor = MaterialTheme.colors.surface,
                 placeholder = { Text(text = stringResource(R.string.converter_placeholder_label, fiat.displayCode), style = MaterialTheme.typography.caption) },
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/spliceout/SpliceOutView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/spliceout/SpliceOutView.kt
@@ -293,7 +293,6 @@ fun SpliceOutCapacityDisclaimer(showCapacityDisclaimer: Boolean, onShowCapacityD
         text = stringResource(id = R.string.spliceout_capacity_disclaimer_checkbox),
         checked = !showCapacityDisclaimer,
         onCheckedChange = onShowCapacityDisclaimerChange,
-        modifier = Modifier.alpha(.3f),
         padding = PaddingValues(vertical = 8.dp)
     )
 }
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/FinalWalletRefundView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/FinalWalletRefundView.kt
@@ -80,7 +80,7 @@ fun FinalWalletRefundView(
     val available = finalWallet?.confirmed?.filter { it.blockHeight > 0 }?.balance
 
     DefaultScreenLayout {
-        DefaultScreenHeader(onBackClick = onBackClick, title = stringResource(id = R.string.swapinrefund_title))
+        DefaultScreenHeader(onBackClick = onBackClick, title = stringResource(id = R.string.finalwallet_refund_title))
         when (available) {
             null -> {
                 ProgressView(text = stringResource(id = R.string.utils_loading_data))
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/SwapInAddresses.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/SwapInAddresses.kt
@@ -16,24 +16,30 @@
 
 package fr.acinq.phoenix.android.settings.walletinfo
 
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import fr.acinq.lightning.blockchain.electrum.WalletState
 import fr.acinq.phoenix.android.R
@@ -47,7 +53,10 @@ import fr.acinq.phoenix.android.components.DefaultScreenLayout
 import fr.acinq.phoenix.android.components.ItemCard
 import fr.acinq.phoenix.android.components.ProgressView
 import fr.acinq.phoenix.android.components.openLink
+import fr.acinq.phoenix.android.utils.borderColor
 import fr.acinq.phoenix.android.utils.copyToClipboard
+import fr.acinq.phoenix.android.utils.darken
+import fr.acinq.phoenix.android.utils.monoTypo
 import fr.acinq.phoenix.utils.BlockchainExplorer
 
 
@@ -63,33 +72,36 @@ fun SwapInAddresses(
             title = stringResource(id = R.string.swapinaddresses_title),
         )
 
-        val addresses = vm.taprootAddresses
         LazyColumn(modifier = Modifier.fillMaxWidth()) {
             item {
                 CardHeader(text = stringResource(id = R.string.swapinaddresses_taproot))
                 Spacer(modifier = Modifier.height(8.dp))
             }
-            if (addresses.isEmpty()) {
+
+            val taprootAddresses = vm.taprootAddresses
+            if (taprootAddresses.isEmpty()) {
                 item {
                     Card(modifier = Modifier.fillMaxWidth()) {
                         ProgressView(text = stringResource(id = R.string.swapinaddresses_sync), padding = PaddingValues(horizontal = 16.dp, vertical = 12.dp))
                     }
                 }
             } else {
-                itemsIndexed(addresses) { index, (address, state) ->
-                    ItemCard(index = index, maxItemsCount = addresses.size) {
-                        AddressStateView(address = address, state = state)
+                itemsIndexed(taprootAddresses) { index, (address, state, isCurrent) ->
+                    ItemCard(index = index, maxItemsCount = taprootAddresses.size) {
+                        AddressStateView(address = address, state = state, isCurrent = isCurrent)
                     }
                 }
             }
-            vm.legacyAddress.value?.let { (address, state) ->
+
+            val legacyAddress = vm.legacyAddress.value
+            legacyAddress?.let { (address, state) ->
                 item {
                     Spacer(modifier = Modifier.height(16.dp))
                     CardHeader(text = stringResource(id = R.string.swapinaddresses_legacy))
                 }
                 item {
                     Card {
-                        AddressStateView(address = address, state = state)
+                        AddressStateView(address = address, state = state, isCurrent = false)
                     }
                 }
             }
@@ -102,31 +114,39 @@ fun SwapInAddresses(
 private fun AddressStateView(
     address: String,
     state: WalletState.AddressState,
+    isCurrent: Boolean,
 ) {
     val context = LocalContext.current
     val link = business.blockchainExplorer.addressUrl(addr = address, website = BlockchainExplorer.Website.MempoolSpace)
     Clickable(onClick = { openLink(context, link) }) {
         Row(
-            modifier = Modifier,
+            modifier = Modifier.height(IntrinsicSize.Min),
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            Spacer(modifier = Modifier.width(16.dp))
             val meta = state.meta
+            if (isCurrent || state.alreadyUsed) {
+                Surface(shape = RectangleShape, color = if (isCurrent) MaterialTheme.colors.primary else borderColor.darken(.98f), modifier = Modifier.width(3.dp).fillMaxHeight(0.9f)) { }
+                Spacer(Modifier.width(13.dp))
+            } else {
+                Spacer(modifier = Modifier.width(16.dp))
+            }
+
             if (meta is WalletState.AddressMeta.Derived) {
                 Text(
                     text = meta.index.toString(),
-                    style = MaterialTheme.typography.caption,
+                    style = monoTypo.copy(color = if (isCurrent) MaterialTheme.typography.body1.color else MaterialTheme.typography.caption.color, fontSize = 14.sp),
                     textAlign = TextAlign.End,
                 )
                 Spacer(modifier = Modifier.width(8.dp))
             }
-            Text(text = address, modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.MiddleEllipsis)
+            Text(text = address, modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.MiddleEllipsis,
+                style = monoTypo.copy(fontWeight = if (isCurrent) FontWeight.Bold else FontWeight.Normal, fontSize = 14.sp))
             Button(
                 icon = R.drawable.ic_copy,
                 onClick = { copyToClipboard(context, address, "Copy address") },
+                modifier = Modifier.fillMaxHeight(),
                 padding = PaddingValues(horizontal = 16.dp, vertical = 12.dp),
             )
         }
     }
-
 }
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/SwapInAddressesViewModel.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/SwapInAddressesViewModel.kt
@@ -24,18 +24,18 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.CreationExtras
 import fr.acinq.lightning.blockchain.electrum.WalletState
-import fr.acinq.phoenix.android.PhoenixApplication
 import fr.acinq.phoenix.managers.PeerManager
 import fr.acinq.phoenix.managers.phoenixSwapInWallet
 import kotlinx.coroutines.launch
 import org.slf4j.LoggerFactory
 
 
+
 class SwapInAddressesViewModel(private val peerManager: PeerManager) : ViewModel() {
 
-    val log = LoggerFactory.getLogger(this::class.java)
+    private val log = LoggerFactory.getLogger(this::class.java)
 
-    val taprootAddresses = mutableStateListOf<Pair<String, WalletState.AddressState>>()
+    val taprootAddresses = mutableStateListOf<TaprootAddress>()
     val legacyAddress = mutableStateOf<Pair<String, WalletState.AddressState>?>(null)
 
     init {
@@ -46,16 +46,14 @@ class SwapInAddressesViewModel(private val peerManager: PeerManager) : ViewModel
     private fun monitorSwapAddresses() {
         viewModelScope.launch {
             peerManager.getPeer().phoenixSwapInWallet.wallet.walletStateFlow.collect { walletState ->
-                val newAddresses = walletState.addresses.toList().sortedByDescending {
-                    val meta = it.second.meta
-                    if (meta is WalletState.AddressMeta.Derived) {
-                        meta.index
-                    } else {
-                        -1 // legacy address goes to the bottom
+                val currentTaprootAddress = walletState.firstUnusedDerivedAddress
+                val addresses = walletState.addresses.toList()
+                val legacy = addresses.firstOrNull { it.second.meta is WalletState.AddressMeta.Single }
+                val taprootList = addresses.filter { it.second.meta is WalletState.AddressMeta.Derived }
+                    .sortedByDescending { it.second.meta.indexOrNull }
+                    .map {
+                        TaprootAddress(address = it.first, state = it.second, isCurrent = it.first == currentTaprootAddress?.first)
                     }
-                }
-                if (newAddresses.isEmpty()) return@collect
-                val (legacy, taprootList) = newAddresses.last() to newAddresses.dropLast(1)
                 log.info("swap-in taproot addresses update: ${taprootAddresses.size} -> ${taprootList.size}")
                 taprootAddresses.clear()
                 taprootAddresses.addAll(taprootList)
@@ -64,6 +62,8 @@ class SwapInAddressesViewModel(private val peerManager: PeerManager) : ViewModel
         }
     }
 
+    data class TaprootAddress(val address: String, val state: WalletState.AddressState, val isCurrent: Boolean)
+
     class Factory(
         private val peerManager: PeerManager,
     ) : ViewModelProvider.Factory {
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/WalletInfoView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/walletinfo/WalletInfoView.kt
@@ -143,7 +143,7 @@ private fun SwapInWalletView(
         }
         MenuButton(
             text = stringResource(id = R.string.walletinfo_swapin_addresses),
-            icon = R.drawable.ic_list,
+            textStyle = MaterialTheme.typography.body2,
             onClick = onSwapInWalletInfoClick
         )
     }
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/utils/Theme.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/utils/Theme.kt
@@ -259,6 +259,8 @@ val mutedBgColor @Composable get() = if (isDarkTheme) gray950 else gray30
 
 val borderColor @Composable get() = if (isDarkTheme) gray800 else gray50
 
+fun Color.darken(factor: Float = 0.8f): Color = Color(red = red * factor, green = green * factor, blue = blue * factor, alpha = alpha)
+
 /** top gradient is darker/lighter than the background, but not quite black/white */
 private val topGradientColor @Composable get() = if (isDarkTheme) gray1000 else gray10
 private val bottomGradientColor @Composable get() = MaterialTheme.colors.background
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/utils/converters/AmountConverter.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/utils/converters/AmountConverter.kt
@@ -62,8 +62,12 @@ object AmountConverter {
             return null
         }
 
-        val amount = input.toDoubleOrNull()
-        if (amount == null || amount <= 0.0) {
+        val amount = try {
+            // note: DecimalFormat.parse works somewhat, but can be confused when the input contains a mix of "." and "," and returns 0
+            // instead we used String.toDouble, which expects "." as decimal separator
+            input.replace(",", ".").toDouble()
+        } catch (e: Exception) {
+            log.debug("could not parse input=$input: ", e.localizedMessage)
             return AmountConversionResult.Error.InvalidInput
         }
 
diff --git a/phoenix-android/src/main/res/values/important_strings.xml b/phoenix-android/src/main/res/values/important_strings.xml
@@ -468,7 +468,7 @@
 
     <string name="spliceout_capacity_disclaimer_title">Channel size impacted</string>
     <string name="spliceout_capacity_disclaimer_body1">Funds sent on-chain are taken from your side of the channel, reducing the channel size by the same amount. Your inbound liquidity remains unchanged.</string>
-    <string name="spliceout_capacity_disclaimer_checkbox">Don\'t show that message again.</string>
+    <string name="spliceout_capacity_disclaimer_checkbox">Don\'t show this message again.</string>
 
     <!-- Spend swap-in refund -->
 
diff --git a/phoenix-ios/phoenix-ios.xcodeproj/project.pbxproj b/phoenix-ios/phoenix-ios.xcodeproj/project.pbxproj
@@ -2519,7 +2519,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Green";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-ios/Phoenix.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 92;
+				CURRENT_PROJECT_VERSION = 93;
 				DEVELOPMENT_ASSET_PATHS = "\"phoenix-ios/Preview Content\"";
 				DEVELOPMENT_TEAM = XD77LN4376;
 				ENABLE_PREVIEWS = YES;
@@ -2543,7 +2543,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Green";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-ios/Phoenix.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 92;
+				CURRENT_PROJECT_VERSION = 93;
 				DEVELOPMENT_ASSET_PATHS = "\"phoenix-ios/Preview Content\"";
 				DEVELOPMENT_TEAM = XD77LN4376;
 				ENABLE_PREVIEWS = YES;
@@ -2641,7 +2641,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-notifySrvExt/phoenix-notifySrvExt.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 92;
+				CURRENT_PROJECT_VERSION = 93;
 				DEVELOPMENT_TEAM = XD77LN4376;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "phoenix-notifySrvExt/Info.plist";
@@ -2668,7 +2668,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = "phoenix-notifySrvExt/phoenix-notifySrvExt.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 92;
+				CURRENT_PROJECT_VERSION = 93;
 				DEVELOPMENT_TEAM = XD77LN4376;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "phoenix-notifySrvExt/Info.plist";
diff --git a/phoenix-ios/phoenix-ios/kotlin/KotlinPublishers+Lightning.swift b/phoenix-ios/phoenix-ios/kotlin/KotlinPublishers+Lightning.swift
@@ -53,7 +53,28 @@ extension Lightning_kmpElectrumClient {
 	}
 }
 
-// MARK: -
+extension Lightning_kmpElectrumMiniWallet {
+	
+	fileprivate struct _Key {
+		static var walletStatePublisher = 0
+	}
+	
+	func walletStatePublisher() -> AnyPublisher<Lightning_kmpWalletState, Never> {
+		
+		self.getSetAssociatedObject(storageKey: &_Key.walletStatePublisher) {
+			
+			/// Transforming from Kotlin:
+			/// `walletStateFlow: StateFlow<WalletState>`
+			///
+			KotlinCurrentValueSubject<Lightning_kmpWalletState>(
+				self.walletStateFlow
+			)
+			.compactMap { $0 }
+			.eraseToAnyPublisher()
+		}
+	}
+}
+
 extension Lightning_kmpElectrumWatcher {
 	
 	fileprivate struct _Key {
@@ -76,7 +97,6 @@ extension Lightning_kmpElectrumWatcher {
 	}
 }
 
-// MARK: -
 extension Lightning_kmpNodeParams {
 	
 	fileprivate struct _Key {
diff --git a/phoenix-ios/phoenix-ios/kotlin/KotlinTypes.swift b/phoenix-ios/phoenix-ios/kotlin/KotlinTypes.swift
@@ -23,6 +23,7 @@ typealias Lightning_kmpConnection = Lightning_kmp_coreConnection
 typealias Lightning_kmpClosing = Lightning_kmp_coreClosing
 typealias Lightning_kmpDatabases = Lightning_kmp_coreDatabases
 typealias Lightning_kmpElectrumClient = Lightning_kmp_coreElectrumClient
+typealias Lightning_kmpElectrumMiniWallet = Lightning_kmp_coreElectrumMiniWallet
 typealias Lightning_kmpElectrumSubscriptionResponse = Lightning_kmp_coreElectrumSubscriptionResponse
 typealias Lightning_kmpElectrumWatcher = Lightning_kmp_coreElectrumWatcher
 typealias Lightning_kmpFinalFailure = Lightning_kmp_coreFinalFailure
diff --git a/phoenix-ios/phoenix-ios/views/configuration/advanced/wallet/SwapInAddresses.swift b/phoenix-ios/phoenix-ios/views/configuration/advanced/wallet/SwapInAddresses.swift

Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ private fun FiatConverterInput(`
`243`	`243`	`null -> onAmountUpdate(null)`
`244`	`244`	`}`
`245`	`245`	`},`
	`246`	`+ limitDecimal = true,`
`246`	`247`	`modifier = Modifier.weight(1f),`
`247`	`248`	`backgroundColor = MaterialTheme.colors.surface,`
`248`	`249`	`placeholder = { Text(text = stringResource(R.string.converter_placeholder_label, fiat.displayCode), style = MaterialTheme.typography.caption) },`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,6 @@ fun SpliceOutCapacityDisclaimer(showCapacityDisclaimer: Boolean, onShowCapacityD`
`293`	`293`	`text = stringResource(id = R.string.spliceout_capacity_disclaimer_checkbox),`
`294`	`294`	`checked = !showCapacityDisclaimer,`
`295`	`295`	`onCheckedChange = onShowCapacityDisclaimerChange,`
`296`		`- modifier = Modifier.alpha(.3f),`
`297`	`296`	`padding = PaddingValues(vertical = 8.dp)`
`298`	`297`	`)`
`299`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private fun SwapInWalletView(`
`143`	`143`	`}`
`144`	`144`	`MenuButton(`
`145`	`145`	`text = stringResource(id = R.string.walletinfo_swapin_addresses),`
`146`		`- icon = R.drawable.ic_list,`
	`146`	`+ textStyle = MaterialTheme.typography.body2,`
`147`	`147`	`onClick = onSwapInWalletInfoClick`
`148`	`148`	`)`
`149`	`149`	`}`