MIFOSAC-552 Implement Settings Step for New Recurring Deposits Account Flow

cmp-navigation/build.gradle.kts

@@ -46,6 +46,7 @@ kotlin {
             implementation(projects.feature.pathTracking)
             implementation(projects.feature.report)
             implementation(projects.feature.savings)
+            implementation(projects.feature.recurringDeposit)
             implementation(projects.feature.settings)
             implementation(projects.feature.search)
 

cmp-navigation/src/commonMain/kotlin/cmp/navigation/di/KoinModules.kt

@@ -31,6 +31,7 @@ import com.mifos.feature.loan.di.LoanModule
 import com.mifos.feature.note.di.NoteModule
 import com.mifos.feature.offline.di.OfflineModule
 import com.mifos.feature.path.tracking.di.PathTrackingModule
+import com.mifos.feature.recurringDeposit.di.RecurringDepositModule
 import com.mifos.feature.report.di.ReportModule
 import com.mifos.feature.savings.di.SavingsModule
 import com.mifos.feature.search.di.SearchModule
@@ -83,6 +84,7 @@ object KoinModules {
             OfflineModule,
             PathTrackingModule,
             ReportModule,
+            RecurringDepositModule,
             SavingsModule,
             SearchModule,
             SettingsModule,

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

@@ -17,9 +17,9 @@ import kotlinx.coroutines.flow.Flow
 
 interface RecurringAccountRepository {
 
-    fun getRecuttingAccountRepository(): Flow<DataState<RecurringDepositAccountTemplate>>
+    fun getRecurringAccountTemplate(): Flow<DataState<RecurringDepositAccountTemplate>>
 
-    fun getRecuttingAccountRepositoryBtProduct(
+    fun getRecurringAccountTemplateByProduct(
         clientId: Int,
         productId: Int,
     ): Flow<DataState<RecurringDepositAccountTemplate>>

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

@@ -21,12 +21,12 @@ import kotlinx.coroutines.flow.Flow
 class RecurringAccountRepositoryImp(
     val dataManagerRecurringAccount: DataManagerRecurringAccount,
 ) : RecurringAccountRepository {
-    override fun getRecuttingAccountRepository(): Flow<DataState<RecurringDepositAccountTemplate>> {
+    override fun getRecurringAccountTemplate(): Flow<DataState<RecurringDepositAccountTemplate>> {
         return dataManagerRecurringAccount.getRecurringDepositAccountTemplate
             .asDataStateFlow()
     }
 
-    override fun getRecuttingAccountRepositoryBtProduct(
+    override fun getRecurringAccountTemplateByProduct(
         clientId: Int,
         productId: Int,
     ): Flow<DataState<RecurringDepositAccountTemplate>> {

core/model/src/commonMain/kotlin/com/mifos/core/model/objects/payloads/RecurringDepositAccountPayload.kt

@@ -13,9 +13,9 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class RecurringDepositAccountPayload(
+    //    val charges: List<Any>? = null,
     val adjustAdvanceTowardsFuturePayments: Boolean? = null,
     val allowWithdrawal: Boolean? = null,
-//    val charges: List<Any>? = null,
     val clientId: Int? = null,
     val dateFormat: String? = null,
     val depositPeriod: Int? = null,

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

@@ -9,7 +9,6 @@
  */
 package com.mifos.core.network.datamanager
 
-import com.mifos.core.datastore.UserPreferencesRepository
 import com.mifos.core.model.objects.payloads.RecurringDepositAccountPayload
 import com.mifos.core.network.BaseApiManager
 import com.mifos.room.entities.accounts.recurring.RecurringDeposit
@@ -18,7 +17,6 @@ import kotlinx.coroutines.flow.Flow
 
 class DataManagerRecurringAccount(
     val mBaseApiManager: BaseApiManager,
-    private val prefManager: UserPreferencesRepository,
 ) {
 
     fun createRecurringDepositAccount(

core/network/src/commonMain/kotlin/com/mifos/core/network/di/DataMangerModule.kt

@@ -24,6 +24,7 @@ import com.mifos.core.network.datamanager.DataManagerIdentifiers
 import com.mifos.core.network.datamanager.DataManagerLoan
 import com.mifos.core.network.datamanager.DataManagerNote
 import com.mifos.core.network.datamanager.DataManagerOffices
+import com.mifos.core.network.datamanager.DataManagerRecurringAccount
 import com.mifos.core.network.datamanager.DataManagerRunReport
 import com.mifos.core.network.datamanager.DataManagerSavings
 import com.mifos.core.network.datamanager.DataManagerSearch
@@ -51,4 +52,5 @@ val DataManagerModule = module {
     single { DataManagerStaff(get(), get(), get()) }
     single { DataManagerSurveys(get(), get(), get()) }
     single { DataManagerIdentifiers(get()) }
+    single { DataManagerRecurringAccount(get()) }
 }

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationRoute.kt

@@ -25,7 +25,7 @@ fun NavGraphBuilder.clientApplyNewApplicationRoute(
     onNavigateApplyLoanAccount: (Int) -> Unit,
     onNavigateApplySavingsAccount: (Int) -> Unit,
     onNavigateApplyShareAccount: () -> Unit,
-    onNavigateApplyRecurringAccount: () -> Unit,
+    onNavigateApplyRecurringAccount: (Int) -> Unit,
     onNavigateApplyFixedAccount: () -> Unit,
     navController: NavController,
 ) {

feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientApplyNewApplications/ClientApplyNewApplicationsScreen.kt

@@ -62,7 +62,7 @@ internal fun ClientApplyNewApplicationsScreen(
     onNavigateApplyLoanAccount: (Int) -> Unit,
     onNavigateApplySavingsAccount: (Int) -> Unit,
     onNavigateApplyShareAccount: () -> Unit,
-    onNavigateApplyRecurringAccount: () -> Unit,
+    onNavigateApplyRecurringAccount: (Int) -> Unit,
     onNavigateApplyFixedAccount: () -> Unit,
     navController: NavController,
     viewModel: ClientApplyNewApplicationsViewModel = koinViewModel(),
@@ -75,15 +75,9 @@ internal fun ClientApplyNewApplicationsScreen(
             is ClientApplyNewApplicationsEvent.OnActionClick -> {
                 when (event.action) {
                     ClientApplyNewApplicationsItem.NewFixedAccount -> onNavigateApplyFixedAccount()
-                    ClientApplyNewApplicationsItem.NewLoanAccount -> onNavigateApplyLoanAccount(
-                        state.clientId,
-                    )
-
-                    ClientApplyNewApplicationsItem.NewRecurringAccount -> onNavigateApplyRecurringAccount()
-                    ClientApplyNewApplicationsItem.NewSavingsAccount -> onNavigateApplySavingsAccount(
-                        state.clientId,
-                    )
-
+                    ClientApplyNewApplicationsItem.NewLoanAccount -> onNavigateApplyLoanAccount(state.clientId)
+                    ClientApplyNewApplicationsItem.NewRecurringAccount -> onNavigateApplyRecurringAccount(state.clientId)
+                    ClientApplyNewApplicationsItem.NewSavingsAccount -> onNavigateApplySavingsAccount(state.clientId)
                     ClientApplyNewApplicationsItem.NewShareAccount -> onNavigateApplyShareAccount()
                 }
             }

feature/recurringDeposit/src/commonMain/composeResources/values/string.xml

@@ -15,4 +15,25 @@
     <string name="step_interest">Interest</string>
     <string name="step_charges">Charges</string>
     <string name="create_recurring_deposit_account">Create Recurring Deposit Account</string>
+    <string name="is_mandatory_deposit">Is Mandatory Deposit?</string>
+    <string name="adjust_advance_payments">Adjust advance payments toward future installments?</string>
+    <string name="allow_withdrawals">Allow Withdrawals?</string>
+    <string name="lock_in_period">Lock-in Period</string>
+    <string name="frequency">Frequency</string>
+    <string name="type">Type</string>
+    <string name="recurring_deposit_details">Recurring Deposit Details</string>
+    <string name="recurring_deposit_amount">Recurring Deposit Amount</string>
+    <string name="deposit_period">Deposit Period</string>
+    <string name="deposit_frequency_same_as_meeting">Deposit Frequency Same as Group/Center meeting</string>
+    <string name="minimum_deposit_term">Minimum Deposit Term</string>
+    <string name="in_multiples_of">And thereafter, in Multiples of</string>
+    <string name="maximum_deposit_term">Maximum Deposit Term</string>
+    <string name="for_pre_mature_closure">For Pre-mature closure</string>
+    <string name="apply_penal_interest">Apply Penal Interest (less)</string>
+    <string name="penal_interest_percentage">Penal Interest (%)</string>
+    <string name="period">Period</string>
+    <string name="minimum_balance_for_interest">Minimum Balance For Interest Calculation</string>
+    <string name="back">Back</string>
+    <string name="next">Next</string>
+    <string name="no_internet_connection">No Internet Connection</string>
 </resources>

feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/di/RecurringDepositModule.kt

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 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.feature.recurringDeposit.di
+
+import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.RecurringAccountViewModel
+import org.koin.core.module.dsl.viewModelOf
+import org.koin.dsl.module
+
+val RecurringDepositModule = module {
+    viewModelOf(::RecurringAccountViewModel)
+}

feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountRoute.kt

@@ -15,7 +15,9 @@ import androidx.navigation.compose.composable
 import kotlinx.serialization.Serializable
 
 @Serializable
-data object RecurringAccountRoute
+data class RecurringAccountRoute(
+    val clientId: Int = -1,
+)
 
 fun NavGraphBuilder.recurringAccountDestination() {
     composable<RecurringAccountRoute> {
@@ -26,8 +28,10 @@ fun NavGraphBuilder.recurringAccountDestination() {
     }
 }
 
-fun NavController.navigateToRecurringAccountRoute() {
+fun NavController.navigateToRecurringAccountRoute(
+    clientId: Int,
+) {
     this.navigate(
-        RecurringAccountRoute,
+        RecurringAccountRoute(clientId = clientId),
     )
 }

feature/recurringDeposit/src/commonMain/kotlin/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountScreen.kt

@@ -22,8 +22,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.mifos.core.designsystem.component.MifosScaffold
+import com.mifos.core.ui.components.MifosErrorComponent
+import com.mifos.core.ui.components.MifosProgressIndicator
 import com.mifos.core.ui.components.MifosStepper
 import com.mifos.core.ui.components.Step
 import com.mifos.core.ui.util.EventsEffect
@@ -33,13 +34,14 @@ import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.pages.Inter
 import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.pages.SettingPage
 import com.mifos.feature.recurringDeposit.newRecurringDepositAccount.pages.TermsPage
 import org.jetbrains.compose.resources.stringResource
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 internal fun RecurringAccountScreen(
     onNavigateBack: () -> Unit,
     onFinish: () -> Unit,
     modifier: Modifier = Modifier,
-    viewModel: RecurringAccountViewModel = viewModel(),
+    viewModel: RecurringAccountViewModel = koinViewModel(),
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
 
@@ -50,6 +52,8 @@ internal fun RecurringAccountScreen(
         }
     }
 
+    RecurringDepositAccountDialogBox(state = state)
+
     RecurringAccountScaffold(
         modifier = modifier,
         state = state,
@@ -76,7 +80,8 @@ private fun RecurringAccountScaffold(
         },
         Step(name = stringResource(Res.string.step_settings)) {
             SettingPage(
-                onNext = { onAction(RecurringAccountAction.NextStep) },
+                state = state,
+                onAction = onAction,
             )
         },
         Step(name = stringResource(Res.string.step_interest)) {
@@ -96,7 +101,7 @@ private fun RecurringAccountScaffold(
         onBackPressed = { onAction(RecurringAccountAction.NavigateBack) },
         modifier = modifier,
     ) { paddingValues ->
-        if (state.dialogState == null) {
+        if (state.screenState == null) {
             MifosStepper(
                 steps = steps,
                 currentIndex = state.currentStep,
@@ -110,3 +115,24 @@ private fun RecurringAccountScaffold(
         }
     }
 }
+
+@Composable
+fun RecurringDepositAccountDialogBox(
+    state: RecurringAccountState,
+) {
+    when (state.screenState) {
+        is RecurringAccountState.ScreenState.Error -> {
+            MifosErrorComponent(
+                message = state.screenState.message,
+                isRetryEnabled = true,
+                onRetry = {
+                    // Retry action can be handled here
+                },
+            )
+        }
+        RecurringAccountState.ScreenState.Loading -> {
+            MifosProgressIndicator()
+        }
+        null -> {}
+    }
+}