Profile photo not refreshing after upload in Client Profile

cmp-android/build.gradle.kts

@@ -7,6 +7,7 @@
  *
  * See https://github.com/openMF/android-client/blob/master/LICENSE.md
  */
+
 import org.mifos.MifosBuildType
 import org.mifos.dynamicVersion
 
@@ -154,4 +155,4 @@ dependencyGuard {
         modules = true
         tree = true
     }
-}
+}

cmp-android/src/main/kotlin/cmp/android/app/ComponentActivityExtensions.kt

@@ -39,9 +39,7 @@ private val SCRIM_COLOR: Int = Color.TRANSPARENT
  * [here](https://github.com/android/nowinandroid/blob/689ef92e41427ab70f82e2c9fe59755441deae92/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt#L94).
  */
 @Suppress("MaxLineLength")
-fun ComponentActivity.setupEdgeToEdge(
-    appThemeFlow: Flow<DarkThemeConfig>,
-) {
+fun ComponentActivity.setupEdgeToEdge(appThemeFlow: Flow<DarkThemeConfig>) {
     lifecycleScope.launch {
         lifecycle.repeatOnLifecycle(state = Lifecycle.State.STARTED) {
             combine(
@@ -55,12 +53,13 @@ fun ComponentActivity.setupEdgeToEdge(
                     // This handles all the settings to go edge-to-edge. We are using a transparent
                     // scrim for system bars and switching between "light" and "dark" based on the
                     // system and internal app theme settings.
-                    val style = SystemBarStyle.auto(
-                        darkScrim = SCRIM_COLOR,
-                        lightScrim = SCRIM_COLOR,
-                        // Disabling Dark Mode for this app
-                        detectDarkMode = { false },
-                    )
+                    val style =
+                        SystemBarStyle.auto(
+                            darkScrim = SCRIM_COLOR,
+                            lightScrim = SCRIM_COLOR,
+                            // Disabling Dark Mode for this app
+                            detectDarkMode = { false },
+                        )
                     enableEdgeToEdge(statusBarStyle = style, navigationBarStyle = style)
                 }
         }
@@ -75,9 +74,10 @@ fun ComponentActivity.setupEdgeToEdge(
 private fun ComponentActivity.isSystemInDarkModeFlow(): Flow<Boolean> =
     callbackFlow {
         channel.trySend(element = resources.configuration.isSystemInDarkMode)
-        val listener = Consumer<Configuration> {
-            channel.trySend(element = it.isSystemInDarkMode)
-        }
+        val listener =
+            Consumer<Configuration> {
+                channel.trySend(element = it.isSystemInDarkMode)
+            }
         addOnConfigurationChangedListener(listener = listener)
         awaitClose { removeOnConfigurationChangedListener(listener = listener) }
     }

core/ui/src/commonMain/kotlin/com/mifos/core/ui/components/MifosBreadCrumb.kt

@@ -81,6 +81,9 @@ fun MifosBreadcrumbNavBar(
                             isActive = index == routes.lastIndex,
                             onClick = {
                                 if (index != routes.lastIndex && route != "...") {
+                                    navController.previousBackStackEntry
+                                        ?.savedStateHandle
+                                        ?.set("shouldRefresh", true)
                                     navController.popBackStack(route, inclusive = false)
                                 }
                             },
@@ -93,10 +96,13 @@ fun MifosBreadcrumbNavBar(
             }
         }
 
-        IconButton(
-            onClick = { navController.popBackStack() },
-            modifier = Modifier.size(DesignToken.sizes.iconMedium),
-        ) {
+
+        IconButton(onClick = {
+            navController.previousBackStackEntry
+                ?.savedStateHandle
+                ?.set("shouldRefresh", true)
+            navController.popBackStack()
+        }) {
             Icon(
                 painter = painterResource(Res.drawable.bread_crumb_back_icon),
                 contentDescription = "Back",

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientDetailsProfile/ClientProfileDetailsScreen.kt

@@ -44,7 +44,9 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -88,6 +90,20 @@ internal fun ClientProfileDetailsScreen(
     viewModel: ClientProfileDetailsViewModel = koinViewModel(),
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
+    val currentBackStackEntry = navController.currentBackStackEntry
+    val savedStateHandle = currentBackStackEntry?.savedStateHandle
+
+    val profileUpdated by savedStateHandle
+        ?.getStateFlow("shouldRefresh", false)
+        ?.collectAsStateWithLifecycle(initialValue = false)
+        ?: remember { mutableStateOf(false) }
+
+    LaunchedEffect(profileUpdated) {
+        if (profileUpdated) {
+            viewModel.trySendAction(ClientProfileDetailsAction.OnRetry)
+            savedStateHandle?.set("shouldRefresh", false) // reset after refresh
+        }
+    }
 
     EventsEffect(viewModel.eventFlow) { event ->
         when (event) {

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientEditProfile/ClientProfileEditScreen.kt

@@ -76,14 +76,14 @@ internal fun ClientProfileEditScreen(
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
 
-    EventsEffect(viewModel.eventFlow) { event ->
+    /*EventsEffect(viewModel.eventFlow) { event ->
         when (event) {
             ClientProfileEditEvent.NavigateBack -> onNavigateBack()
             ClientProfileEditEvent.OnSaveSuccess -> {
                 onNavigateBack()
             }
         }
-    }
+    }*/
 
     ClientProfileEditScaffold(
         modifier = modifier,
@@ -206,6 +206,16 @@ private fun ClientProfileEditDialogs(
             )
         }
 
+        is ClientProfileEditState.DialogState.Success -> {
+            MifosBasicDialog(
+                title = "Success",
+                content = { Text("Your profile image has been updated successfully!") },
+                confirmText = "Done",
+                onConfirm = { onAction(ClientProfileEditAction.DismissModalBottomSheet) },
+                onDismissRequest = { onAction(ClientProfileEditAction.DismissModalBottomSheet) },
+            )
+        }
+
         ClientProfileEditState.DialogState.ShowDeleteDialog -> {
             MifosBasicDialog(
                 visibilityState = BasicDialogState.Shown(

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientEditProfile/ClientProfileEditViewModel.kt

@@ -21,6 +21,7 @@ import com.mifos.core.ui.util.BaseViewModel
 import com.mifos.core.ui.util.imageToByteArray
 import com.mifos.core.ui.util.multipartRequestBody
 import com.mifos.feature.client.utils.toPlatformFile
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
@@ -123,6 +124,7 @@ internal class ClientProfileEditViewModel(
                     }
                 }
 
+
                 is DataState.Loading -> {
                     mutableStateFlow.update {
                         it.copy(
@@ -132,13 +134,22 @@ internal class ClientProfileEditViewModel(
                 }
 
                 is DataState.Success -> {
-                    mutableStateFlow.update {
-                        it.copy(
-                            dialogState = ClientProfileEditState.DialogState.Loading,
-                            openImagePicker = false,
-                        )
+                    viewModelScope.launch {
+                        clientDetailsRepo.getImage(route.id).collect { result ->
+                            when (result) {
+                                is DataState.Success -> mutableStateFlow.update {
+                                    it.copy(
+                                        profileImage = imageToByteArray(result.data),
+                                        dialogState = ClientProfileEditState.DialogState.Success,
+                                    )
+                                }
+                                is DataState.Loading -> mutableStateFlow.update {
+                                    it.copy(dialogState = ClientProfileEditState.DialogState.Loading)
+                                }
+                                else -> Unit
+                            }
+                        }
                     }
-                    loadImage(route.id)
                 }
             }
         }
@@ -179,14 +190,18 @@ data class ClientProfileEditState(
     sealed interface DialogState {
         data class Error(val message: String) : DialogState
         data object Loading : DialogState
+        data object Success : DialogState
         data object ShowDeleteDialog : DialogState
         data object ShowUploadOptions : DialogState
+
     }
 }
 
 sealed interface ClientProfileEditEvent {
     data object NavigateBack : ClientProfileEditEvent
     data object OnSaveSuccess : ClientProfileEditEvent
+    data class OnError(val message: String) : ClientProfileEditEvent
+
 }
 
 sealed interface ClientProfileEditAction {

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientProfile/ClientProfileScreen.kt

@@ -27,7 +27,9 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -61,6 +63,20 @@ internal fun ClientProfileScreen(
     viewModel: ClientProfileViewModel = koinViewModel(),
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
+    val currentBackStackEntry = navController.currentBackStackEntry
+    val savedStateHandle = currentBackStackEntry?.savedStateHandle
+
+    val profileUpdated by savedStateHandle
+        ?.getStateFlow("shouldRefresh", false)
+        ?.collectAsStateWithLifecycle(initialValue = false)
+        ?: remember { mutableStateOf(false) }
+
+    LaunchedEffect(profileUpdated) {
+        if (profileUpdated) {
+            viewModel.trySendAction(ClientProfileAction.OnRetry)
+            savedStateHandle?.set("shouldRefresh", false) // reset after refresh
+        }
+    }
 
     EventsEffect(viewModel.eventFlow) { event ->
         when (event) {