Approve button in recurring account Issue

core/common/src/commonMain/kotlin/com/mifos/core/common/utils/DateHelper.kt

@@ -17,7 +17,10 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.atStartOfDayIn
 import kotlinx.datetime.format
 import kotlinx.datetime.format.FormatStringsInDatetimeFormats
+import kotlinx.datetime.format.MonthNames
+import kotlinx.datetime.format.Padding
 import kotlinx.datetime.format.byUnicodePattern
+import kotlinx.datetime.format.char
 import kotlinx.datetime.number
 import kotlinx.datetime.toLocalDateTime
 import kotlin.time.Clock
@@ -40,6 +43,14 @@ object DateHelper {
 
     const val MONTH_FORMAT = "dd MMMM"
 
+    private val apiDateFormat = LocalDateTime.Format {
+        dayOfMonth(Padding.ZERO)
+        char(' ')
+        monthName(MonthNames.ENGLISH_FULL)
+        char(' ')
+        year()
+    }
+
     private val fullMonthFormat = LocalDateTime.Format {
         byUnicodePattern(FULL_MONTH)
     }
@@ -451,4 +462,12 @@ object DateHelper {
             null
         }
     }
+
+    @OptIn(ExperimentalTime::class)
+    fun getDateAsStringForApproval(timeInMillis: Long): String {
+        val instant = Instant.fromEpochMilliseconds(timeInMillis)
+            .toLocalDateTime(TimeZone.currentSystemDefault())
+
+        return instant.format(apiDateFormat) // Returns "21 January 2026"
+    }
 }

core/data/src/commonMain/kotlin/com/mifos/core/data/repository/RecurringAccountRepository.kt

@@ -11,6 +11,7 @@ package com.mifos.core.data.repository
 
 import com.mifos.core.common.utils.DataState
 import com.mifos.core.model.objects.payloads.RecurringDepositAccountPayload
+import com.mifos.core.model.objects.template.recurring.approval.RecurringDepositApproval
 import com.mifos.core.network.GenericResponse
 import com.mifos.room.entities.templates.recurringDeposit.RecurringDepositAccountTemplate
 import kotlinx.coroutines.flow.Flow
@@ -25,4 +26,9 @@ interface RecurringAccountRepository {
     fun createRecurringDepositAccount(
         recurringDepositAccountPayload: RecurringDepositAccountPayload?,
     ): Flow<DataState<GenericResponse>>
+
+    suspend fun approveRecurringDepositAccount(
+        accountId: String,
+        approval: RecurringDepositApproval,
+    ): GenericResponse
 }

core/data/src/commonMain/kotlin/com/mifos/core/data/repositoryImp/RecurringAccountRepositoryImp.kt

@@ -13,6 +13,7 @@ import com.mifos.core.common.utils.DataState
 import com.mifos.core.common.utils.asDataStateFlow
 import com.mifos.core.data.repository.RecurringAccountRepository
 import com.mifos.core.model.objects.payloads.RecurringDepositAccountPayload
+import com.mifos.core.model.objects.template.recurring.approval.RecurringDepositApproval
 import com.mifos.core.network.GenericResponse
 import com.mifos.core.network.datamanager.DataManagerRecurringAccount
 import com.mifos.room.entities.templates.recurringDeposit.RecurringDepositAccountTemplate
@@ -39,4 +40,14 @@ class RecurringAccountRepositoryImp(
             recurringDepositAccountPayload,
         ).asDataStateFlow()
     }
+
+    override suspend fun approveRecurringDepositAccount(
+        accountId: String,
+        approval: RecurringDepositApproval,
+    ): GenericResponse {
+        return dataManagerRecurringAccount.approveRecurringDepositAccount(
+            accountId,
+            approval,
+        )
+    }
 }

core/domain/src/commonMain/kotlin/com/mifos/core/domain/di/UseCaseModule.kt

@@ -17,6 +17,7 @@ import com.mifos.core.domain.useCases.AddClientPinpointLocationUseCase
 import com.mifos.core.domain.useCases.AddDataTableEntryUseCase
 import com.mifos.core.domain.useCases.AddNoteUseCase
 import com.mifos.core.domain.useCases.ApproveCheckerUseCase
+import com.mifos.core.domain.useCases.ApproveRecurringDepositUseCase
 import com.mifos.core.domain.useCases.ApproveSavingsApplicationUseCase
 import com.mifos.core.domain.useCases.CreateChargesUseCase
 import com.mifos.core.domain.useCases.CreateClientIdentifierUseCase
@@ -171,4 +172,5 @@ val UseCaseModule = module {
     factoryOf(::DeleteNoteUseCase)
     factoryOf(::CreateSignatureUseCase)
     factoryOf(::UpdateSignatureUseCase)
+    factoryOf(::ApproveRecurringDepositUseCase)
 }

core/domain/src/commonMain/kotlin/com/mifos/core/domain/useCases/ApproveRecurringDepositUseCase.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2026 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
+package com.mifos.core.domain.useCases
+
+import com.mifos.core.common.utils.DataState
+import com.mifos.core.common.utils.asDataStateFlow
+import com.mifos.core.data.repository.RecurringAccountRepository
+import com.mifos.core.model.objects.template.recurring.approval.RecurringDepositApproval
+import com.mifos.core.network.GenericResponse
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+
+class ApproveRecurringDepositUseCase(
+    private val repository: RecurringAccountRepository,
+) {
+    operator fun invoke(
+        accountId: String,
+        approval: RecurringDepositApproval,
+    ): Flow<DataState<GenericResponse>> {
+        return flow {
+            emit(repository.approveRecurringDepositAccount(accountId, approval))
+        }.asDataStateFlow()
+    }
+}

core/model/src/commonMain/kotlin/com/mifos/core/model/objects/template/recurring/approval/RecurringDepositApproval.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2026 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
+package com.mifos.core.model.objects.template.recurring.approval
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RecurringDepositApproval(
+    var locale: String = "en",
+
+    var dateFormat: String = "dd MMMM yyyy",
+
+    var approvedOnDate: String? = null,
+
+    var note: String? = null,
+)

core/network/src/androidMain/kotlin/com/mifos/core/network/KtorHttpClient.android.kt

@@ -41,6 +41,7 @@ actual val KtorHttpClient: HttpClient
         install(ContentNegotiation) {
             json(
                 Json {
+                    encodeDefaults = true
                     prettyPrint = true
                     isLenient = true
                     ignoreUnknownKeys = true

core/network/src/commonMain/kotlin/com/mifos/core/network/datamanager/DataManagerRecurringAccount.kt

@@ -11,6 +11,7 @@ package com.mifos.core.network.datamanager
 
 import com.mifos.core.common.utils.extractErrorMessage
 import com.mifos.core.model.objects.payloads.RecurringDepositAccountPayload
+import com.mifos.core.model.objects.template.recurring.approval.RecurringDepositApproval
 import com.mifos.core.network.BaseApiManager
 import com.mifos.core.network.GenericResponse
 import com.mifos.room.entities.templates.recurringDeposit.RecurringDepositAccountTemplate
@@ -51,4 +52,21 @@ class DataManagerRecurringAccount(
             productId,
         )
     }
+
+    suspend fun approveRecurringDepositAccount(
+        accountId: String,
+        approval: RecurringDepositApproval,
+    ): GenericResponse {
+        val response = mBaseApiManager.recurringSavingsAccountService.approveRecurringDepositAccount(
+            accountId,
+            approval,
+        )
+        if (!response.status.isSuccess()) {
+            val errorMessage = extractErrorMessage(response)
+            throw IllegalStateException(errorMessage)
+        }
+
+        val json = Json { ignoreUnknownKeys = true }
+        return json.decodeFromString<GenericResponse>(response.bodyAsText())
+    }
 }

core/network/src/commonMain/kotlin/com/mifos/core/network/services/RecurringAccountService.kt

@@ -10,11 +10,13 @@
 package com.mifos.core.network.services
 
 import com.mifos.core.model.objects.payloads.RecurringDepositAccountPayload
+import com.mifos.core.model.objects.template.recurring.approval.RecurringDepositApproval
 import com.mifos.room.basemodel.APIEndPoint
 import com.mifos.room.entities.templates.recurringDeposit.RecurringDepositAccountTemplate
 import de.jensklingenberg.ktorfit.http.Body
 import de.jensklingenberg.ktorfit.http.GET
 import de.jensklingenberg.ktorfit.http.POST
+import de.jensklingenberg.ktorfit.http.Path
 import de.jensklingenberg.ktorfit.http.Query
 import io.ktor.client.statement.HttpResponse
 import kotlinx.coroutines.flow.Flow
@@ -31,4 +33,10 @@ interface RecurringAccountService {
         @Query("clientId") clientId: Int,
         @Query("productId") productId: Int?,
     ): Flow<RecurringDepositAccountTemplate>
+
+    @POST(APIEndPoint.CREATE_RECURRING_DEPOSIT_ACCOUNTS + "/{accountId}?command=approve")
+    suspend fun approveRecurringDepositAccount(
+        @Path("accountId") accountId: String,
+        @Body approval: RecurringDepositApproval,
+    ): HttpResponse
 }

feature/client/src/commonMain/kotlin/com/mifos/feature/client/navigation/ClientNavigation.kt

@@ -101,6 +101,8 @@ import com.mifos.feature.note.navigation.noteDestination
 import com.mifos.feature.note.notes.navigateToNoteScreen
 import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.navigateToRecurringAccountRoute
 import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.recurringAccountDestination
+import com.mifos.feature.recurringDeposit.recurringAccountApproval.navigateToRecurringDepositAccountApproval
+import com.mifos.feature.recurringDeposit.recurringAccountApproval.recurringDepositAccountApprovalDestination
 import com.mifos.feature.savings.navigation.navigateToAddSavingsAccount
 import com.mifos.feature.savings.navigation.navigateToSavingsAccountApproval
 import com.mifos.feature.savings.navigation.navigateToSavingsAccountSummaryScreen
@@ -264,9 +266,17 @@ fun NavGraphBuilder.clientNavGraph(
         clientRecurringDepositAccountDestination(
             navController = navController,
             navigateBack = navController::popBackStack,
-            {},
-            {},
+            onApproveAccount = { accountId ->
+                navController.navigateToRecurringDepositAccountApproval(accountId)
+            },
+            onViewAccount = {},
         )
+
+        recurringDepositAccountApprovalDestination(
+            navigateBack = navController::popBackStack,
+            navController = navController,
+        )
+
         clientFixedDepositAccountDestination(
             navController = navController,
             navigateBack = navController::popBackStack,

feature/client/src/commonMain/kotlin/com/mifos/feature/client/recurringDepositAccount/RecurringDepositAccountScreen.kt

@@ -37,12 +37,17 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.mifos.core.common.utils.DateHelper
@@ -59,7 +64,6 @@ import com.mifos.core.ui.util.EventsEffect
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
-
 @Composable
 fun RecurringDepositAccountScreen(
     navController: NavController,
@@ -70,6 +74,21 @@ fun RecurringDepositAccountScreen(
     viewModel: RecurringDepositAccountViewModel = koinViewModel(),
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
+    val lifecycleOwner = LocalLifecycleOwner.current
+    val currentAccounts by rememberUpdatedState(state.recurringDepositAccounts)
+
+    DisposableEffect(lifecycleOwner) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME && currentAccounts.isNotEmpty()) {
+                viewModel.trySendAction(RecurringDepositAccountAction.Refresh)
+            }
+        }
+        lifecycleOwner.lifecycle.addObserver(observer)
+
+        onDispose {
+            lifecycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
 
     EventsEffect(viewModel.eventFlow) { event ->
         when (event) {
@@ -135,18 +154,16 @@ internal fun RecurringDepositAccountContent(
     var expandedIndex by rememberSaveable { mutableStateOf(-1) }
 
     Column(
-        modifier = modifier
-            .fillMaxSize(),
+        modifier = Modifier.fillMaxSize(),
     ) {
         MifosBreadcrumbNavBar(navController)
-
         when (state.isLoading) {
             true -> MifosProgressIndicator()
             false -> {
                 Column(
                     Modifier.fillMaxSize()
                         .padding(
-                            horizontal = DesignToken.padding.large,
+                            horizontal = DesignToken.padding.medium,
                         ),
                 ) {
                     val notAvailableText = stringResource(Res.string.client_savings_not_avilable)
@@ -160,7 +177,7 @@ internal fun RecurringDepositAccountContent(
                         },
                     )
 
-                    // todo implement search bar functionality
+                    // TODO: implement search bar functionality
                     if (state.isSearchBarActive) {
                         MifosSearchBar(
                             query = state.searchText,
@@ -176,7 +193,7 @@ internal fun RecurringDepositAccountContent(
                         )
                     }
 
-                    Spacer(modifier = Modifier.height(DesignToken.padding.largeIncreasedExtra))
+                    Spacer(modifier = Modifier.height(DesignToken.padding.large))
 
                     if (state.recurringDepositAccounts.isEmpty()) {
                         MifosEmptyCard(msg = stringResource(Res.string.client_empty_card_message))
@@ -186,8 +203,7 @@ internal fun RecurringDepositAccountContent(
                                 MifosActionsSavingsListingComponent(
                                     accountNo = recurringDeposit.accountNo ?: notAvailableText,
                                     savingsProduct = stringResource(Res.string.client_product_recurring_deposit_account),
-                                    savingsProductName = recurringDeposit.shortProductName
-                                        ?: notAvailableText,
+                                    savingsProductName = recurringDeposit.shortProductName ?: notAvailableText,
                                     lastActive = if (recurringDeposit.status?.submittedAndPendingApproval == true) {
                                         stringResource(Res.string.client_savings_pending_approval)
                                     } else if (recurringDeposit.lastActiveTransactionDate != null) {
@@ -215,25 +231,30 @@ internal fun RecurringDepositAccountContent(
                                             Actions.ViewAccount(MifosIcons.Calendar),
                                         )
                                     },
-                                ) { actions ->
-                                    when (actions) {
-                                        is Actions.ViewAccount -> {
-                                            onAction(
-                                                RecurringDepositAccountAction.ViewAccount(
-                                                    recurringDeposit.accountNo ?: "",
-                                                ),
-                                            )
-                                        }
+                                    onActionClicked = { actions ->
+                                        recurringDeposit.accountNo?.let { accountNo ->
+                                            when (actions) {
+                                                is Actions.ViewAccount -> {
+                                                    onAction(
+                                                        RecurringDepositAccountAction.ViewAccount(
+                                                            accountNo,
+                                                        ),
+                                                    )
+                                                }
 
-                                        is Actions.ApproveAccount -> {
-                                            RecurringDepositAccountAction.ApproveAccount(
-                                                recurringDeposit.accountNo ?: "",
-                                            )
-                                        }
+                                                is Actions.ApproveAccount -> {
+                                                    onAction(
+                                                        RecurringDepositAccountAction.ApproveAccount(
+                                                            accountNo,
+                                                        ),
+                                                    )
+                                                }
 
-                                        else -> null
-                                    }
-                                }
+                                                else -> Unit
+                                            }
+                                        }
+                                    },
+                                )
 
                                 Spacer(modifier = Modifier.height(DesignToken.spacing.small))
                             }