Reverted

Author: Aditya002500

core/datastore/src/commonMain/kotlin/org/mifos/mobile/core/datastore/di/PreferenceModule.kt

@@ -27,7 +27,7 @@ val PreferencesModule = module {
         )
     }
 
-    factory<UserPreferencesRepository> {
+    single<UserPreferencesRepository> {
         UserPreferencesRepositoryImpl(
             preferenceManager = get(),
 //            ioDispatcher = get(named(MifosDispatchers.IO.name)),

feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt

@@ -235,10 +235,10 @@ internal fun HomeContent(
                         }
                     }
 
-                    Spacer(modifier = Modifier.height(DesignToken.spacing.medium))
+                    Spacer(modifier = Modifier.height(KptTheme.spacing.md))
 
                     ServiceBox(
-                        items = state.items,
+                        visibleItems = state.visibleItems,
                         isEditMode = state.isEditMode,
                         selectedServices = state.selectedServices,
                         onServiceClick = { route ->
@@ -259,22 +259,21 @@ internal fun HomeContent(
 
 @Composable
 internal fun ServiceBox(
-    items: ImmutableList<ServiceItem>,
+    visibleItems: ImmutableList<ServiceItem>,
     isEditMode: Boolean,
     selectedServices: Set<String>,
     onServiceClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val columnCount = 4
     val spacing = DesignToken.spacing.medium
-    val displayItems = if (isEditMode) items else items.filter { selectedServices.contains(it.route) }
-    val rows = displayItems.chunked(columnCount)
+    val rows = visibleItems.chunked(columnCount)
 
     Column(
         modifier = modifier.fillMaxWidth(),
         verticalArrangement = Arrangement.spacedBy(spacing),
     ) {
-        if (displayItems.isEmpty() && !isEditMode) {
+        if (visibleItems.isEmpty() && !isEditMode) {
             Text(
                 text = stringResource(Res.string.feature_home_no_services_hint),
                 style = MifosTypography.bodyMedium,

feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeViewModel.kt

@@ -11,7 +11,9 @@ package org.mifos.mobile.feature.home
 
 import androidx.compose.runtime.Immutable
 import androidx.lifecycle.viewModelScope
+import co.touchlab.kermit.Logger
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -58,6 +60,10 @@ internal class HomeViewModel(
 
     private var isHandlingNetworkChange = false
 
+    companion object {
+        private val logger = Logger.withTag("HomeViewModel")
+    }
+
     init {
         observeNetworkStatus()
         loadSavedServices()
@@ -218,6 +224,21 @@ internal class HomeViewModel(
         mutableStateFlow.update(update)
     }
 
+    /**
+     * Computes the visible items based on the current edit mode and selected services.
+     * In edit mode, all items are shown. Otherwise, only selected services are shown.
+     */
+    private fun computeVisibleItems(
+        isEditMode: Boolean = state.isEditMode,
+        selectedServices: Set<String> = state.selectedServices,
+    ): ImmutableList<ServiceItem> {
+        return if (isEditMode) {
+            state.items
+        } else {
+            state.items.filter { selectedServices.contains(it.route) }.toImmutableList()
+        }
+    }
+
     /**
      * Toggles the visibility of the amount on the screen.
      */
@@ -233,10 +254,11 @@ internal class HomeViewModel(
      */
     private fun loadSavedServices() {
         val allRoutes = serviceCards.map { it.route }.toSet()
-        val savedServices = userPreferencesRepositoryImpl.selectedServices
+        val savedServices = userPreferencesRepositoryImpl.selectedServices ?: allRoutes
         updateState {
             it.copy(
-                selectedServices = savedServices ?: allRoutes,
+                selectedServices = savedServices,
+                visibleItems = computeVisibleItems(selectedServices = savedServices),
             )
         }
     }
@@ -246,32 +268,51 @@ internal class HomeViewModel(
             viewModelScope.launch {
                 try {
                     userPreferencesRepositoryImpl.saveSelectedServices(state.selectedServices)
-                    updateState { it.copy(isEditMode = false) }
+                    updateState {
+                        it.copy(
+                            isEditMode = false,
+                            visibleItems = computeVisibleItems(isEditMode = false),
+                        )
+                    }
                 } catch (e: CancellationException) {
                     throw e
                 } catch (e: Exception) {
+                    logger.e { "Error saving selected services: ${e.message}" }
                     val lastSaved = userPreferencesRepositoryImpl.selectedServices
+                    val rollbackServices = lastSaved ?: serviceCards.map { it.route }.toSet()
                     updateState {
                         it.copy(
                             isEditMode = false,
-                            selectedServices = lastSaved ?: serviceCards.map { it.route }.toSet(),
+                            selectedServices = rollbackServices,
+                            visibleItems = computeVisibleItems(
+                                isEditMode = false,
+                                selectedServices = rollbackServices,
+                            ),
                         )
                     }
                 }
             }
         } else {
-            updateState { it.copy(isEditMode = true) }
+            updateState {
+                it.copy(
+                    isEditMode = true,
+                    visibleItems = computeVisibleItems(isEditMode = true),
+                )
+            }
         }
     }
 
     private fun handleToggleServiceSelection(route: String) {
-        updateState { currentState ->
-            val newSelection = if (currentState.selectedServices.contains(route)) {
-                currentState.selectedServices - route
-            } else {
-                currentState.selectedServices + route
-            }
-            currentState.copy(selectedServices = newSelection)
+        val newSelection = if (state.selectedServices.contains(route)) {
+            state.selectedServices - route
+        } else {
+            state.selectedServices + route
+        }
+        updateState {
+            it.copy(
+                selectedServices = newSelection,
+                visibleItems = computeVisibleItems(selectedServices = newSelection),
+            )
         }
     }
 
@@ -492,6 +533,7 @@ internal data class HomeState(
     val isAmountVisible: Boolean = false,
     val dialogState: DialogState? = null,
     val items: ImmutableList<ServiceItem>,
+    val visibleItems: ImmutableList<ServiceItem> = items,
     val networkStatus: Boolean = true,
     val uiState: HomeScreenState?,
     val selectedServices: Set<String> = emptySet(),

libs/mifos-passcode/src/commonMain/kotlin/org/mifos/library/passcode/di/PasscodePreferenceModule.kt

@@ -17,7 +17,7 @@ import org.mifos.library.passcode.data.PasscodePreferencesDataSource
 import org.mifos.mobile.core.common.MifosDispatchers
 
 val PasscodePreferenceModule = module {
-    single<Settings> { Settings() }
+    factory<Settings> { Settings() }
     factory { PasscodePreferencesDataSource(get(), get(named(MifosDispatchers.IO.name))) }
     factory { PasscodeManager(get(), get(named(MifosDispatchers.Unconfined.name))) }
 }