Merge branch 'master' into mainnet

Author: dpad85

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-lightningkmp = "1.10.2"
-secp256k1 = "0.17.3" # keep in check with lightning-kmp secp version
+lightningkmp = "1.10.4"
+secp256k1 = "0.18.0" # keep in check with lightning-kmp secp version
 
 kotlin = "2.1.10"
 ktor = "3.1.0"

phoenix-android/build.gradle.kts

@@ -26,8 +26,8 @@ android {
         applicationId = "fr.acinq.phoenix.mainnet"
         minSdk = 26
         targetSdk = 35
-        versionCode = 105
-        versionName = "2.6.1"
+        versionCode = 106
+        versionName = gitCommitHash()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

…/fr/acinq/phoenix/utils/ConverterTest.kt …inq/phoenix/utils/AmountFormatterTest.ktphoenix-android/src/androidTest/kotlin/fr/acinq/phoenix/utils/ConverterTest.kt renamed to phoenix-android/src/androidTest/kotlin/fr/acinq/phoenix/utils/AmountFormatterTest.kt phoenix-android/src/androidTest/kotlin/fr/acinq/phoenix/utils/ConverterTest.kt renamed to phoenix-android/src/androidTest/kotlin/fr/acinq/phoenix/utils/AmountFormatterTest.kt

@@ -17,12 +17,12 @@
 package fr.acinq.phoenix.utils
 
 import fr.acinq.lightning.utils.msat
-import fr.acinq.phoenix.android.utils.Converter.toMilliSatoshi
+import fr.acinq.phoenix.android.utils.converters.AmountFormatter.toMilliSatoshi
 import fr.acinq.phoenix.data.BitcoinUnit
 import junit.framework.Assert.assertEquals
 import org.junit.Test
 
-class ConverterTest {
+class AmountFormatterTest {
     @Test
     fun test_double_to_msat_rounding() {
         // 1 msat

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/Ambients.kt

@@ -25,9 +25,11 @@ import androidx.navigation.NavController
 import fr.acinq.phoenix.PhoenixBusiness
 import fr.acinq.phoenix.android.utils.UserTheme
 import fr.acinq.phoenix.android.utils.datastore.InternalDataRepository
+import fr.acinq.phoenix.android.utils.datastore.PreferredBitcoinUnits
 import fr.acinq.phoenix.android.utils.datastore.UserPrefsRepository
 import fr.acinq.phoenix.controllers.ControllerFactory
 import fr.acinq.phoenix.data.*
+import fr.acinq.phoenix.managers.AppConfigurationManager
 
 
 typealias CF = ControllerFactory
@@ -36,9 +38,9 @@ val LocalTheme = staticCompositionLocalOf { UserTheme.SYSTEM }
 val LocalBusiness = staticCompositionLocalOf<PhoenixBusiness?> { null }
 val LocalControllerFactory = staticCompositionLocalOf<ControllerFactory?> { null }
 val LocalNavController = staticCompositionLocalOf<NavController?> { null }
-val LocalBitcoinUnit = compositionLocalOf { BitcoinUnit.Sat }
-val LocalFiatCurrency = compositionLocalOf { FiatCurrency.USD }
-val LocalExchangeRates = compositionLocalOf<List<ExchangeRate>> { listOf() }
+val LocalBitcoinUnits = compositionLocalOf { PreferredBitcoinUnits(primary = BitcoinUnit.Sat) }
+val LocalFiatCurrencies = compositionLocalOf { AppConfigurationManager.PreferredFiatCurrencies(primary = FiatCurrency.USD, others = emptyList()) }
+val LocalExchangeRatesMap = compositionLocalOf<Map<FiatCurrency, ExchangeRate.BitcoinPriceRate>> { emptyMap() }
 val LocalShowInFiat = compositionLocalOf { false }
 val isDarkTheme: Boolean
     @Composable
@@ -50,27 +52,11 @@ val navController: NavController
 
 val preferredAmountUnit: CurrencyUnit
     @Composable
-    get() = if (LocalShowInFiat.current) LocalFiatCurrency.current else LocalBitcoinUnit.current
+    get() = if (LocalShowInFiat.current) LocalFiatCurrencies.current.primary else LocalBitcoinUnits.current.primary
 
-val fiatRate: ExchangeRate.BitcoinPriceRate?
+val primaryFiatRate: ExchangeRate.BitcoinPriceRate?
     @Composable
-    get() = LocalFiatCurrency.current.let { prefFiat ->
-        return when (val rate = LocalExchangeRates.current.find { it.fiatCurrency == prefFiat }) {
-            is ExchangeRate.BitcoinPriceRate -> rate
-            is ExchangeRate.UsdPriceRate -> {
-                (LocalExchangeRates.current.find { it.fiatCurrency == FiatCurrency.USD } as? ExchangeRate.BitcoinPriceRate)?.let { usdRate ->
-                    // create a BTC/Fiat price rate using the USD/BTC rate and the Fiat/USD rate.
-                    ExchangeRate.BitcoinPriceRate(
-                        fiatCurrency = rate.fiatCurrency,
-                        price = rate.price * usdRate.price,
-                        source = rate.source,
-                        timestampMillis = rate.timestampMillis
-                    )
-                }
-            }
-            else -> null
-        }
-    }
+    get() = LocalFiatCurrencies.current.primary.let { prefFiat -> LocalExchangeRatesMap.current[prefFiat] }
 
 val internalData: InternalDataRepository
     @Composable

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/AppView.kt

@@ -45,6 +45,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -114,10 +115,13 @@ import fr.acinq.phoenix.android.settings.walletinfo.SwapInWallet
 import fr.acinq.phoenix.android.settings.walletinfo.WalletInfoView
 import fr.acinq.phoenix.android.startup.StartupView
 import fr.acinq.phoenix.android.utils.appBackground
+import fr.acinq.phoenix.android.utils.datastore.PreferredBitcoinUnits
 import fr.acinq.phoenix.android.utils.extensions.findActivitySafe
 import fr.acinq.phoenix.android.utils.logger
 import fr.acinq.phoenix.data.BitcoinUnit
+import fr.acinq.phoenix.data.ExchangeRate
 import fr.acinq.phoenix.data.FiatCurrency
+import fr.acinq.phoenix.managers.AppConfigurationManager
 import io.ktor.http.encodeURLParameter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
@@ -145,17 +149,35 @@ fun AppView(
 
     val context = LocalContext.current
     val isAmountInFiat = userPrefs.getIsAmountInFiat.collectAsState(false)
-    val fiatCurrency = userPrefs.getFiatCurrency.collectAsState(initial = FiatCurrency.USD)
-    val bitcoinUnit = userPrefs.getBitcoinUnit.collectAsState(initial = BitcoinUnit.Sat)
+    val bitcoinUnits = userPrefs.getBitcoinUnits.collectAsState(initial = PreferredBitcoinUnits(primary = BitcoinUnit.Sat))
+    val fiatCurrencies = userPrefs.getFiatCurrencies.collectAsState(initial = AppConfigurationManager.PreferredFiatCurrencies(primary = FiatCurrency.USD, others = emptyList()))
     val fiatRates by business.currencyManager.ratesFlow.collectAsState(emptyList())
+    val fiatRatesMap by produceState(initialValue = emptyMap<FiatCurrency, ExchangeRate.BitcoinPriceRate>(), key1 = fiatRates) {
+        val usdPriceRate = fiatRates.filterIsInstance<ExchangeRate.BitcoinPriceRate>().firstOrNull { it.fiatCurrency == FiatCurrency.USD }
+        value = if (usdPriceRate != null) {
+            fiatRates.associate { rate ->
+                rate.fiatCurrency to when (rate) {
+                    is ExchangeRate.BitcoinPriceRate -> rate
+                    is ExchangeRate.UsdPriceRate -> ExchangeRate.BitcoinPriceRate(
+                        fiatCurrency = rate.fiatCurrency,
+                        price = rate.price * usdPriceRate.price,
+                        source = rate.source,
+                        timestampMillis = rate.timestampMillis
+                    )
+                }
+            }
+        } else {
+            emptyMap()
+        }
+    }
 
     CompositionLocalProvider(
         LocalBusiness provides business,
         LocalControllerFactory provides business.controllers,
         LocalNavController provides navController,
-        LocalExchangeRates provides fiatRates,
-        LocalBitcoinUnit provides bitcoinUnit.value,
-        LocalFiatCurrency provides fiatCurrency.value,
+        LocalExchangeRatesMap provides fiatRatesMap,
+        LocalBitcoinUnits provides bitcoinUnits.value,
+        LocalFiatCurrencies provides fiatCurrencies.value,
         LocalShowInFiat provides isAmountInFiat.value,
     ) {
         // we keep a view model storing payments so that we don't have to fetch them every time
@@ -456,7 +478,6 @@ fun AppView(
                         LiquidityPolicyView(
                             onBackClick = { navController.popBackStack() },
                             onAdvancedClick = { navController.navigate(Screen.AdvancedLiquidityPolicy.route) },
-                            onRequestLiquidityClick = { navController.navigate(Screen.LiquidityRequest.route) },
                         )
                     }
                     composable(Screen.LiquidityRequest.route, deepLinks = listOf(navDeepLink { uriPattern ="phoenix:requestliquidity" })) {