fix: persist wallet balance fiat setting

Author: angelix

common/src/commonMain/kotlin/com/blockstream/common/data/WalletExtras.kt

@@ -1,14 +1,11 @@
 package com.blockstream.common.data
 
 import com.blockstream.common.gdk.GreenJson
-import com.blockstream.common.gdk.data.Settings
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class WalletExtras(
-    @SerialName("settings")
-    val settings: Settings? = null,
+    val totalBalanceInFiat: Boolean = false
 ) : GreenJson<WalletExtras>() {
     override fun kSerializer() = serializer()
 

common/src/commonMain/kotlin/com/blockstream/common/gdk/GdkSession.kt

@@ -291,7 +291,7 @@ class GdkSession constructor(
     val activeAccount get() = _activeAccountStateFlow.asStateFlow()
 
     val walletTotalBalance get() = _walletTotalBalanceSharedFlow.asStateFlow()
-    val walletTotalBalanceDenominationSharedFlow = MutableStateFlow<Denomination>(Denomination.BTC)
+    val walletTotalBalanceDenominationStateFlow = MutableStateFlow<Denomination>(Denomination.BTC)
 
     val walletAssets: StateFlow<DataState<Assets>> get() = _walletAssetsFlow.asStateFlow()
 
@@ -622,7 +622,7 @@ class GdkSession constructor(
         // Prefer Multisig for initial sync as those networks are synced across devices
         // In case of Lightning Shorcut get settings from parent wallet
         val syncNetwork = activeBitcoinMultisig ?: activeLiquidMultisig ?: defaultNetwork
-        val prominentSettings = ephemeralWallet?.extras?.settings?.takeIf { isLightningShortcut } ?: getSettings(network = syncNetwork)
+        val prominentSettings = getSettings(network = syncNetwork)
         prominentSettings?.also {
             try {
                 changeGlobalSettings(it)
@@ -811,7 +811,7 @@ class GdkSession constructor(
 
         // Clear total balance
         _walletTotalBalanceSharedFlow.value = -1L
-        walletTotalBalanceDenominationSharedFlow.value = Denomination.BTC
+        walletTotalBalanceDenominationStateFlow.value = Denomination.BTC
 
         // Clear Assets
         _walletAssetsFlow.value = DataState.Loading
@@ -1633,6 +1633,7 @@ class GdkSession constructor(
                     _failedNetworksStateFlow.value += failedNetworkLogins
                     onLoginSuccess(
                         loginData = it,
+                        wallet = wallet,
                         initAccount = initAccount,
                         initNetwork = initNetwork,
                         initializeSession = initializeSession
@@ -1733,6 +1734,7 @@ class GdkSession constructor(
 
     private suspend fun onLoginSuccess(
         loginData: LoginData,
+        wallet: GreenWallet?,
         initNetwork: String?,
         initAccount: Long?,
         initializeSession: Boolean
@@ -1742,14 +1744,14 @@ class GdkSession constructor(
 
         if (initializeSession) {
             countly.activeWalletStart()
-            initializeSessionData(initNetwork, initAccount)
+            initializeSessionData(wallet, initNetwork, initAccount)
         }
 
         // Allow initialization calls to have priority over notifications initiated updates (getWalletTransactions & updateAccountAndBalances)
         _disableNotificationHandling = false
     }
 
-    private suspend fun initializeSessionData(initNetwork: String?, initAccount: Long?) {
+    private suspend fun initializeSessionData(wallet: GreenWallet?, initNetwork: String?, initAccount: Long?) {
         // Check if active account index was archived from 1) a different client (multisig) or 2) from cached Singlesig hww session
         // Expect refresh = true to be already called
         updateAccounts()
@@ -1764,6 +1766,10 @@ class GdkSession constructor(
         // Update the enriched assets
         updateEnrichedAssets()
 
+        // Change wallet balance denomination
+        walletTotalBalanceDenominationStateFlow.value =
+            if (wallet?.extras?.totalBalanceInFiat == true) Denomination.defaultOrFiat(session = this, isFiat = true) else Denomination.BTC
+
         if (!isWatchOnlyValue && !isLightningShortcut) {
             // Sync settings from prominent network to the rest
             syncSettings()

common/src/commonMain/kotlin/com/blockstream/common/models/overview/WalletBalanceViewModel.kt

@@ -2,6 +2,7 @@ package com.blockstream.common.models.overview
 
 import com.blockstream.common.data.Denomination
 import com.blockstream.common.data.GreenWallet
+import com.blockstream.common.data.WalletExtras
 import com.blockstream.common.extensions.launchIn
 import com.blockstream.common.models.GreenViewModel
 import com.blockstream.common.utils.toAmountLook
@@ -50,7 +51,7 @@ open class WalletBalanceViewModel(greenWallet: GreenWallet) :
 
         combine(
             session.walletTotalBalance,
-            session.walletTotalBalanceDenominationSharedFlow,
+            session.walletTotalBalanceDenominationStateFlow,
             hideAmounts,
             session.settings()
         ) { _, _, _, _ ->
@@ -61,7 +62,7 @@ open class WalletBalanceViewModel(greenWallet: GreenWallet) :
         }.onEach {
             updateBalance(
                 session.walletTotalBalance.value,
-                session.walletTotalBalanceDenominationSharedFlow.value.isFiat
+                session.walletTotalBalanceDenominationStateFlow.value.isFiat
             )
         }.launchIn(this)
     }
@@ -71,10 +72,7 @@ open class WalletBalanceViewModel(greenWallet: GreenWallet) :
 
         when (event) {
             is LocalEvents.ToggleBalance -> {
-                session.walletTotalBalanceDenominationSharedFlow.value =
-                    session.walletTotalBalanceDenominationSharedFlow.value.let {
-                        Denomination.defaultOrFiat(session = session, isFiat = !it.isFiat)
-                    }
+                toggleBalance()
             }
 
             is LocalEvents.ToggleHideAmounts -> {
@@ -90,6 +88,24 @@ open class WalletBalanceViewModel(greenWallet: GreenWallet) :
         }
     }
 
+    fun toggleBalance() {
+        doAsync({
+            session.walletTotalBalanceDenominationStateFlow.value =
+                session.walletTotalBalanceDenominationStateFlow.value.let {
+                    Denomination.defaultOrFiat(session = session, isFiat = !it.isFiat)
+                }
+
+            if (!greenWallet.isEphemeral) {
+                greenWallet.also {
+                    session.walletTotalBalanceDenominationStateFlow.value.isFiat.also { isFiat ->
+                        it.extras = it.extras?.copy(totalBalanceInFiat = isFiat) ?: WalletExtras(totalBalanceInFiat = isFiat)
+                    }
+                    database.updateWallet(it)
+                }
+            }
+        })
+    }
+
     private suspend fun updateBalance(value: Long, isFiat: Boolean) {
         // Loading
         if (value == -1L) {

common/src/commonMain/kotlin/com/blockstream/common/models/settings/DenominationExchangeRateViewModel.kt

@@ -6,7 +6,6 @@ import com.blockstream.common.BTC_UNIT
 import com.blockstream.common.BitcoinUnits
 import com.blockstream.common.TestnetUnits
 import com.blockstream.common.data.GreenWallet
-import com.blockstream.common.data.WalletExtras
 import com.blockstream.common.extensions.ifConnected
 import com.blockstream.common.extensions.launchIn
 import com.blockstream.common.extensions.previewWallet
@@ -116,20 +115,6 @@ class DenominationExchangeRateViewModel(greenWallet: GreenWallet) :
             }
 
             session.changeGlobalSettings(newSettings)
-
-            if (!greenWallet.isEphemeral) {
-                greenWallet.also {
-                    // Pass settings to Lightning Shortcut
-                    sessionManager.getWalletSessionOrNull(it.lightningShortcutWallet())
-                        ?.also { lightningSession ->
-                            lightningSession.changeGlobalSettings(newSettings)
-                        }
-
-                    it.extras = WalletExtras(settings = newSettings.forWalletExtras())
-
-                    database.updateWallet(it)
-                }
-            }
         }, onSuccess = {
             postSideEffect(SideEffects.Dismiss)
         })

common/src/commonMain/kotlin/com/blockstream/common/models/settings/WalletSettingsViewModel.kt

@@ -751,19 +751,6 @@ class WalletSettingsViewModel(
     private fun saveGlobalSettings(newSettings: Settings) {
         doAsync({
             session.changeGlobalSettings(newSettings)
-            if (!greenWallet.isEphemeral) {
-                greenWallet.also {
-                    // Pass settings to Lightning Shortcut
-                    sessionManager.getWalletSessionOrNull(it.lightningShortcutWallet())
-                        ?.also { lightningSession ->
-                            lightningSession.changeGlobalSettings(newSettings)
-                        }
-
-                    it.extras = WalletExtras(settings = newSettings.forWalletExtras())
-
-                    database.updateWallet(it)
-                }
-            }
         }, onSuccess = {
             postSideEffect(SideEffects.Success())
         })