- make domain value available for both node and xclients

bisq-network · Feb 6, 2025 · d4af3e1 · d4af3e1
1 parent 4f1fa89
commit d4af3e1
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 14 deletions.
diff --git a/androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/mapping/Mappings.kt b/androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/mapping/Mappings.kt
@@ -1130,7 +1130,7 @@ class Mappings {
                 settingsService.maxTradePriceDeviation.get(),
                 settingsService.useAnimations.get(),
                 MarketMapping.fromBisq2Model(settingsService.selectedMarket.get()),
-                SettingsService.DEFAULT_NUM_DAYS_AFTER_REDACTING_TRADE_DATA
+                settingsService.numDaysAfterRedactingTradeData.get()
             )
         }
     }

diff --git a/...ain/kotlin/network/bisq/mobile/android/node/service/settings/NodeSettingsServiceFacade.kt b/...ain/kotlin/network/bisq/mobile/android/node/service/settings/NodeSettingsServiceFacade.kt
@@ -81,6 +81,12 @@ class NodeSettingsServiceFacade(applicationService: AndroidApplicationService.Pr
         settingsService.difficultyAdjustmentFactor.set(value)
     }
 
+    private val _numDaysAfterRedactingTradeData = MutableStateFlow(90)
+    override val numDaysAfterRedactingTradeData: StateFlow<Int> = _numDaysAfterRedactingTradeData
+    override suspend fun setNumDaysAfterRedactingTradeData(days: Int) {
+        settingsService.setNumDaysAfterRedactingTradeData(days)
+    }
+
     private val _ignoreDiffAdjustmentFromSecManager: MutableStateFlow<Boolean> = MutableStateFlow(false)
     override val ignoreDiffAdjustmentFromSecManager: StateFlow<Boolean> get() = _ignoreDiffAdjustmentFromSecManager
     override suspend fun setIgnoreDiffAdjustmentFromSecManager(value: Boolean) {
@@ -113,6 +119,9 @@ class NodeSettingsServiceFacade(applicationService: AndroidApplicationService.Pr
         settingsService.difficultyAdjustmentFactor.addObserver { value ->
             _difficultyAdjustmentFactor.value = value
         }
+        settingsService.numDaysAfterRedactingTradeData.addObserver { value ->
+            _numDaysAfterRedactingTradeData.value = value
+        }
         settingsService.ignoreDiffAdjustmentFromSecManager.addObserver { value ->
             _ignoreDiffAdjustmentFromSecManager.value = value
         }

diff --git a/...monMain/kotlin/network/bisq/mobile/client/service/settings/ClientSettingsServiceFacade.kt b/...monMain/kotlin/network/bisq/mobile/client/service/settings/ClientSettingsServiceFacade.kt
@@ -87,6 +87,12 @@ class ClientSettingsServiceFacade(val apiGateway: SettingsApiGateway) : Settings
         // Not applicable for xClients
     }
 
+    private val _numDaysAfterRedactingTradeData: MutableStateFlow<Int> = MutableStateFlow(90)
+    override val numDaysAfterRedactingTradeData: StateFlow<Int> get() = _numDaysAfterRedactingTradeData
+    override suspend fun setNumDaysAfterRedactingTradeData(days: Int) {
+        // Not applicable for xClients
+    }
+
     private val _ignoreDiffAdjustmentFromSecManager: MutableStateFlow<Boolean> = MutableStateFlow(false)
     override val ignoreDiffAdjustmentFromSecManager: StateFlow<Boolean> get() = _ignoreDiffAdjustmentFromSecManager
     override suspend fun setIgnoreDiffAdjustmentFromSecManager(value: Boolean) {
@@ -97,13 +103,16 @@ class ClientSettingsServiceFacade(val apiGateway: SettingsApiGateway) : Settings
     override suspend fun getSettings(): Result<SettingsVO> {
         val result = apiGateway.getSettings()
         if (result.isSuccess) {
-            _isTacAccepted.value = result.getOrThrow().isTacAccepted
-            _tradeRulesConfirmed.value = result.getOrThrow().tradeRulesConfirmed
-            _languageCode.value = result.getOrThrow().languageCode
-            _supportedLanguageCodes.value = result.getOrThrow().supportedLanguageCodes
-            _closeMyOfferWhenTaken.value = result.getOrThrow().closeMyOfferWhenTaken
-            _maxTradePriceDeviation.value = result.getOrThrow().maxTradePriceDeviation
-            _useAnimations.value = result.getOrThrow().useAnimations
+            result.getOrThrow().let {
+                _isTacAccepted.value = it.isTacAccepted
+                _tradeRulesConfirmed.value = it.tradeRulesConfirmed
+                _languageCode.value = it.languageCode
+                _supportedLanguageCodes.value = it.supportedLanguageCodes
+                _closeMyOfferWhenTaken.value = it.closeMyOfferWhenTaken
+                _maxTradePriceDeviation.value = it.maxTradePriceDeviation
+                _useAnimations.value = it.useAnimations
+                _numDaysAfterRedactingTradeData.value = it.numDaysAfterRedactingTradeData
+            }
         }
         return result
     }

diff --git a/...rc/commonMain/kotlin/network/bisq/mobile/domain/service/settings/SettingsServiceFacade.kt b/...rc/commonMain/kotlin/network/bisq/mobile/domain/service/settings/SettingsServiceFacade.kt
@@ -39,4 +39,7 @@ interface SettingsServiceFacade : LifeCycleAware {
     val ignoreDiffAdjustmentFromSecManager: StateFlow<Boolean>
     suspend fun setIgnoreDiffAdjustmentFromSecManager(value: Boolean)
 
+    val numDaysAfterRedactingTradeData: StateFlow<Int>
+    suspend fun setNumDaysAfterRedactingTradeData(days: Int)
+
 }
diff --git a/...n/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/GeneralSettingsPresenter.kt b/...n/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/GeneralSettingsPresenter.kt
@@ -1,12 +1,7 @@
 package network.bisq.mobile.presentation.ui.uicases.settings
 
-import androidx.collection.MutableScatterMap
-import androidx.compose.runtime.collectAsState
 import kotlinx.coroutines.flow.MutableStateFlow
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import network.bisq.mobile.domain.data.replicated.settings.SettingsVO
@@ -17,7 +12,6 @@ import network.bisq.mobile.i18n.I18nSupport
 import network.bisq.mobile.i18n.i18n
 import network.bisq.mobile.presentation.BasePresenter
 import network.bisq.mobile.presentation.MainPresenter
-import network.bisq.mobile.presentation.ui.composeModels.PaymentAccount
 
 open class GeneralSettingsPresenter(
     private val settingsRepository: SettingsRepository,
@@ -30,6 +24,9 @@ open class GeneralSettingsPresenter(
     override val allLanguagePairs: StateFlow<List<Pair<String, String>>> = languageServiceFacade.allPairs
     private val _languageCode: MutableStateFlow<String> = MutableStateFlow("en")
     override val languageCode: MutableStateFlow<String> = _languageCode
+
+    private val _numDaysAfterRedactingTradeData = MutableStateFlow(90)
+    override val numDaysAfterRedactingTradeData: StateFlow<Int> = _numDaysAfterRedactingTradeData
     override fun setLanguageCode(langCode: String) {
         backgroundScope.launch {
             settingsServiceFacade.setLanguageCode(langCode)
@@ -135,6 +132,7 @@ open class GeneralSettingsPresenter(
                 _tradePriceTolerance.value = settings.maxTradePriceDeviation
                 _useAnimations.value = settings.useAnimations
 
+                _numDaysAfterRedactingTradeData.value = settings.numDaysAfterRedactingTradeData
                 _powFactor.value = settingsServiceFacade.difficultyAdjustmentFactor.value
                 _ignorePow.value = settingsServiceFacade.ignoreDiffAdjustmentFromSecManager.value
             } catch (e: Exception) {

diff --git a/...Main/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/GeneralSettingsScreen.kt b/...Main/kotlin/network/bisq/mobile/presentation/ui/uicases/settings/GeneralSettingsScreen.kt
@@ -38,6 +38,8 @@ interface IGeneralSettingsPresenter : ViewPresenter {
     val useAnimations: StateFlow<Boolean>
     fun setUseAnimations(value: Boolean)
 
+    val numDaysAfterRedactingTradeData: StateFlow<Int>
+
     val powFactor: StateFlow<Double>
     fun setPowFactor(value: Double)