Skip to content

Enhance Terms and setting screen of recurring account #2550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
therajanmaurya merged 1 commit into from
Dec 6, 2025
Merged

Enhance Terms and setting screen of recurring account #2550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions core/ui/src/commonMain/kotlin/com/mifos/core/ui/util/TextFieldsValidator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,11 @@ object TextFieldsValidator {
else -> null
}
}

fun dropDownEmptyValidator(input: Boolean): StringResource? {
return when {
input -> Res.string.error_field_empty
else -> null
}
}
}
1 change: 1 addition & 0 deletions feature/client/src/commonMain/composeResources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@
<string name="charges_view_charges">View Charges</string>
<string name="charges_client_update_not_support_error_msg">Updating client charges is not supported. Please delete the existing charge and create a new one.</string>

<!--Fixed Deposit Account -->
<string name="feature_fixed_deposit_deposit_amount">Deposit Amount</string>
<string name="feature_fixed_deposit_deposit_period_type">Deposit Period Type</string>
<string name="feature_fixed_interest_compounding">Interest Compounding</string>
Expand Down
19 changes: 10 additions & 9 deletions ...lin/com/mifos/feature/client/newFixedDepositAccount/CreateFixedDepositAccountViewmodel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,29 +90,29 @@ class CreateFixedDepositAccountViewmodel(
}

DataState.Loading -> {
setLoadingState()
mutableStateFlow.update {
it.copy(
isOverlayLoading = true,
)
}
}
}
}
}

private fun setLoadingState() {
private fun setSuccessState() {
mutableStateFlow.update {
it.copy(
screenState = NewFixedDepositAccountState.ScreenState.Loading,
screenState = NewFixedDepositAccountState.ScreenState.Success,
isOverlayLoading = false,
)
}
}

private fun setSuccessState() {
mutableStateFlow.update {
it.copy(screenState = NewFixedDepositAccountState.ScreenState.Success)
}
}
private fun setErrorState(message: String) {
mutableStateFlow.update {
it.copy(
screenState = NewFixedDepositAccountState.ScreenState.Error(message),
isOverlayLoading = false,
)
}
}
Expand Down Expand Up @@ -274,6 +274,7 @@ data class NewFixedDepositAccountState(
val fixedDepositAccountDetail: FixedDepositAccountDetailsState = FixedDepositAccountDetailsState(),
val fixedDepositAccountTerms: FixedDepositAccountTermsState = FixedDepositAccountTermsState(),
val template: FixedDepositTemplate = FixedDepositTemplate(),
val isOverlayLoading: Boolean = false,
) {
sealed interface ScreenState {
data class Error(val message: String) : ScreenState
Expand Down
7 changes: 4 additions & 3 deletions ...n/com/mifos/feature/recurringDeposit/newRecurringDepositAccount/RecurringAccountScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package com.mifos.feature.recurringDeposit.newRecurringDepositAccount

import androidclient.feature.recurringdeposit.generated.resources.Res
import androidclient.feature.recurringdeposit.generated.resources.feature_recurring_deposit_create_recurring_deposit_account
import androidclient.feature.recurringdeposit.generated.resources.feature_recurring_deposit_step_charges
import androidclient.feature.recurringdeposit.generated.resources.feature_recurring_deposit_step_details
import androidclient.feature.recurringdeposit.generated.resources.feature_recurring_deposit_step_interest
Expand All @@ -28,6 +27,7 @@ import com.mifos.core.designsystem.component.MifosScaffold
import com.mifos.core.ui.components.MifosBreadcrumbNavBar
import com.mifos.core.ui.components.MifosErrorComponent
import com.mifos.core.ui.components.MifosProgressIndicator
import com.mifos.core.ui.components.MifosProgressIndicatorOverlay
import com.mifos.core.ui.components.MifosStepper
import com.mifos.core.ui.components.Step
import com.mifos.core.ui.util.EventsEffect
Expand Down Expand Up @@ -104,8 +104,6 @@ private fun RecurringAccountScaffold(
)

MifosScaffold(
title = stringResource(Res.string.feature_recurring_deposit_create_recurring_deposit_account),
onBackPressed = { onAction(RecurringAccountAction.NavigateBack) },
modifier = modifier,
) { paddingValues ->
Column(
Expand Down Expand Up @@ -141,5 +139,8 @@ private fun RecurringAccountScaffold(
}
}
}
if (state.isOverlayLoading) {
MifosProgressIndicatorOverlay()
}
}
}
Loading