Merge branch 'development' into feature/loan-transactions-export-dialog

gurnoorpannu · web-flow · commit 377ec90c679f · 2026-02-16T15:01:34.000+05:30
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/mappers/clients/GetClientsClientIdAccountMapper.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/mappers/clients/GetClientsClientIdAccountMapper.kt
@@ -104,10 +104,13 @@ object GetClientsClientIdAccountMapper :
                         LoanTypeEntity(
                             id = loanType.id?.toInt(),
                             code = loanType.code,
-                            value = loanType.description,
+                            value = loanType.value,
                         )
                     },
                     loanCycle = it.loanCycle,
+                    originalLoan = it.originalLoan,
+                    loanBalance = it.loanBalance,
+                    amountPaid = it.amountPaid,
                 )
             } ?: emptyList(),
 
@@ -191,9 +194,12 @@ object GetClientsClientIdAccountMapper :
                     loanType = GetClientsLoanAccountsType(
                         id = it.loanType?.id?.toLong(),
                         code = it.loanType?.code,
-                        description = it.loanType?.value,
+                        value = it.loanType?.value,
                     ),
                     loanCycle = it.loanCycle,
+                    loanBalance = it.loanBalance,
+                    originalLoan = it.originalLoan,
+                    amountPaid = it.amountPaid,
                 )
             }.toSet(),
         )
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/GetClientsLoanAccounts.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/GetClientsLoanAccounts.kt
@@ -43,4 +43,10 @@ data class GetClientsLoanAccounts(
 
     val status: GetClientsLoanAccountsStatus? = null,
 
+    val originalLoan: Double? = null,
+
+    val loanBalance: Double? = null,
+
+    val amountPaid: Double? = null,
+
 )
diff --git a/core/network/src/commonMain/kotlin/com/mifos/core/network/model/GetClientsLoanAccountsType.kt b/core/network/src/commonMain/kotlin/com/mifos/core/network/model/GetClientsLoanAccountsType.kt
@@ -24,7 +24,7 @@ data class GetClientsLoanAccountsType(
 
     val code: String? = null,
 
-    val description: String? = null,
+    val value: String? = null,
 
     val id: Long? = null,
 )
diff --git a/feature/client/src/commonMain/composeResources/values/strings.xml b/feature/client/src/commonMain/composeResources/values/strings.xml
@@ -454,7 +454,7 @@
     <string name="client_savings_savings_accounts">Savings Accounts</string>
     <string name="client_savings_item">item</string>
     <string name="client_savings_pending_approval">Pending Approval</string>
-    <string name="client_savings_not_avilable">Not Available</string>
+    <string name="client_savings_not_available">Not Available</string>
 
     <string name="client_collateral_title">Client Collateral</string>
     <string name="client_collateral_choose_type">Choose Collateral Type</string>
@@ -520,6 +520,9 @@
     <string name="client_signature_draw">Draw</string>
     <string name="client_signature_more">More</string>
 
+    <!-- Client Loan Accounts-->
+    <string name="client_loan_accounts_not_available">Not Available</string>
+
     <!-- Client Share Account-->
     <string name="client_share_accounts_share_accounts">Share Accounts</string>
     <string name="client_share_accounts_an_error_occurred">An error occurred</string>
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientGeneral/ClientProfileGeneralScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientGeneral/ClientProfileGeneralScreen.kt
@@ -17,7 +17,7 @@ import androidclient.feature.client.generated.resources.client_performance_histo
 import androidclient.feature.client.generated.resources.client_performance_history_total_savings_label
 import androidclient.feature.client.generated.resources.client_profile_general_header_actions
 import androidclient.feature.client.generated.resources.client_profile_general_header_performance_history
-import androidclient.feature.client.generated.resources.client_savings_not_avilable
+import androidclient.feature.client.generated.resources.client_savings_not_available
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -241,14 +241,14 @@ fun PerformanceHistoryCard(state: ClientProfileGeneralState) {
             PerformanceHistoryRows(
                 stringResource(Res.string.client_performance_history_loan_cycle_count_label),
                 performanceHistory.loanCyclesCount?.toString()
-                    ?: stringResource(Res.string.client_savings_not_avilable),
+                    ?: stringResource(Res.string.client_savings_not_available),
 
             )
 
             PerformanceHistoryRows(
                 stringResource(Res.string.client_performance_history_active_loans_count_label),
                 performanceHistory.activeLoans?.toString()
-                    ?: stringResource(Res.string.client_savings_not_avilable),
+                    ?: stringResource(Res.string.client_savings_not_available),
             )
 
             PerformanceHistoryRows(
@@ -257,21 +257,21 @@ fun PerformanceHistoryCard(state: ClientProfileGeneralState) {
                 performanceHistory.lastLoanAmount?.let {
                     state.currency + " " + it.toString()
                 }
-                    ?: stringResource(Res.string.client_savings_not_avilable),
+                    ?: stringResource(Res.string.client_savings_not_available),
             )
 
             PerformanceHistoryRows(
                 stringResource(Res.string.client_performance_history_active_savings_label),
                 performanceHistory.activeSavingsCount?.toString()
-                    ?: stringResource(Res.string.client_savings_not_avilable),
+                    ?: stringResource(Res.string.client_savings_not_available),
             )
 
             PerformanceHistoryRows(
                 stringResource(Res.string.client_performance_history_total_savings_label),
                 performanceHistory.totalSaving?.let {
                     state.currency + " " + it.toString()
                 }
-                    ?: stringResource(Res.string.client_savings_not_avilable),
+                    ?: stringResource(Res.string.client_savings_not_available),
             )
         }
     }
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientLoanAccounts/ClientLoanAccountsScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/clientLoanAccounts/ClientLoanAccountsScreen.kt
@@ -11,6 +11,7 @@ package com.mifos.feature.client.clientLoanAccounts
 
 import androidclient.feature.client.generated.resources.Res
 import androidclient.feature.client.generated.resources.cash_bundel
+import androidclient.feature.client.generated.resources.client_loan_accounts_not_available
 import androidclient.feature.client.generated.resources.client_savings_item
 import androidclient.feature.client.generated.resources.feature_client_account_status
 import androidclient.feature.client.generated.resources.feature_client_dialog_action_ok
@@ -168,21 +169,40 @@ private fun ClientLoanAccountsScreen(
                             items(state.loanAccounts) { loan ->
                                 val symbol = loan.currency?.displaySymbol ?: ""
                                 MifosActionsLoanListingComponent(
-                                    accountNo = (loan.accountNo ?: "Not Available"),
-                                    loanProduct = loan.productName ?: "Not Available",
+                                    accountNo = (
+                                        loan.accountNo ?: stringResource(
+                                            Res.string.client_loan_accounts_not_available,
+                                        )
+                                        ),
+                                    loanProduct = loan.productName ?: stringResource(Res.string.client_loan_accounts_not_available),
                                     originalLoan = symbol + (
-                                        (loan.originalLoan ?: "Not Available").toString()
+                                        (loan.originalLoan ?: stringResource(Res.string.client_loan_accounts_not_available)).toString()
                                         ),
                                     amountPaid = symbol + (
                                         (
-                                            loan.amountPaid
-                                                ?: "Not Available"
-                                            ).toString()
+                                            if (loan.status?.pendingApproval == true) {
+                                                stringResource(Res.string.client_loan_accounts_not_available)
+                                            } else {
+                                                (
+                                                    loan.amountPaid
+                                                        ?: 0.0
+                                                    ).toString()
+                                            }
+                                            )
                                         ),
                                     loanBalance = symbol + (
-                                        (loan.amountPaid ?: "Not Available").toString()
+                                        (
+                                            if (loan.status?.pendingApproval == true) {
+                                                stringResource(Res.string.client_loan_accounts_not_available)
+                                            } else {
+                                                (
+                                                    loan.loanBalance
+                                                        ?: 0.0
+                                                    ).toString()
+                                            }
+                                            )
                                         ),
-                                    type = loan.loanType?.value ?: "Not Available",
+                                    type = loan.loanType?.value ?: stringResource(Res.string.client_loan_accounts_not_available),
                                     // TODO check if we need to add other options as well, such as disburse and all
                                     // currently didn't add it cuz its not in the UI design
                                     menuList = when {
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/fixedDepositAccount/FixedDepositAccountScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/fixedDepositAccount/FixedDepositAccountScreen.kt
@@ -14,7 +14,7 @@ import androidclient.feature.client.generated.resources.client_empty_card_messag
 import androidclient.feature.client.generated.resources.client_product_fixed_deposit_account
 import androidclient.feature.client.generated.resources.client_profile_fixed_deposit_account_title
 import androidclient.feature.client.generated.resources.client_savings_item
-import androidclient.feature.client.generated.resources.client_savings_not_avilable
+import androidclient.feature.client.generated.resources.client_savings_not_available
 import androidclient.feature.client.generated.resources.client_savings_pending_approval
 import androidclient.feature.client.generated.resources.feature_client_dialog_action_ok
 import androidclient.feature.client.generated.resources.filter
@@ -149,7 +149,7 @@ fun FixedDepositAccountContent(
                             horizontal = DesignToken.padding.large,
                         ),
                 ) {
-                    val notAvailableText = stringResource(Res.string.client_savings_not_avilable)
+                    val notAvailableText = stringResource(Res.string.client_savings_not_available)
 
                     FixedDepositAccountHeader(
                         state.fixedDepositAccount.size.toString(),
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/recurringDepositAccount/RecurringDepositAccountScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/recurringDepositAccount/RecurringDepositAccountScreen.kt
@@ -14,7 +14,7 @@ import androidclient.feature.client.generated.resources.client_empty_card_messag
 import androidclient.feature.client.generated.resources.client_product_recurring_deposit_account
 import androidclient.feature.client.generated.resources.client_profile_recurring_deposit_account_title
 import androidclient.feature.client.generated.resources.client_savings_item
-import androidclient.feature.client.generated.resources.client_savings_not_avilable
+import androidclient.feature.client.generated.resources.client_savings_not_available
 import androidclient.feature.client.generated.resources.client_savings_pending_approval
 import androidclient.feature.client.generated.resources.feature_client_dialog_action_ok
 import androidclient.feature.client.generated.resources.filter
@@ -149,7 +149,7 @@ internal fun RecurringDepositAccountContent(
                             horizontal = DesignToken.padding.large,
                         ),
                 ) {
-                    val notAvailableText = stringResource(Res.string.client_savings_not_avilable)
+                    val notAvailableText = stringResource(Res.string.client_savings_not_available)
                     RecurringDepositAccountHeader(
                         state.recurringDepositAccounts.size.toString(),
                         onToggleSearch = {
diff --git a/feature/client/src/commonMain/kotlin/com/mifos/feature/client/savingsAccounts/SavingsAccountsScreen.kt b/feature/client/src/commonMain/kotlin/com/mifos/feature/client/savingsAccounts/SavingsAccountsScreen.kt
@@ -12,7 +12,7 @@ package com.mifos.feature.client.savingsAccounts
 import androidclient.feature.client.generated.resources.Res
 import androidclient.feature.client.generated.resources.client_product_saving_account
 import androidclient.feature.client.generated.resources.client_savings_item
-import androidclient.feature.client.generated.resources.client_savings_not_avilable
+import androidclient.feature.client.generated.resources.client_savings_not_available
 import androidclient.feature.client.generated.resources.client_savings_pending_approval
 import androidclient.feature.client.generated.resources.client_savings_savings_accounts
 import androidclient.feature.client.generated.resources.feature_client_dialog_action_ok
@@ -153,7 +153,7 @@ fun SavingsAccountsContent(
                                     balance = if (savings.accountBalance != null) {
                                         "${savings.currency?.displaySymbol ?: ""} ${savings.accountBalance}"
                                     } else {
-                                        stringResource(Res.string.client_savings_not_avilable)
+                                        stringResource(Res.string.client_savings_not_available)
                                     },
                                     menuList = if (savings.status?.submittedAndPendingApproval == true) {
                                         listOf(
@@ -189,7 +189,7 @@ fun SavingsAccountsContent(
                                     } else if (savings.status?.submittedAndPendingApproval == true) {
                                         stringResource(Res.string.client_savings_pending_approval)
                                     } else {
-                                        stringResource(Res.string.client_savings_not_avilable)
+                                        stringResource(Res.string.client_savings_not_available)
                                     },
                                     isExpanded = expandedIndex == index,
                                     onExpandToggle = {

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,10 @@ data class GetClientsLoanAccounts(`
`43`	`43`
`44`	`44`	`val status: GetClientsLoanAccountsStatus? = null,`
`45`	`45`
	`46`	`+ val originalLoan: Double? = null,`
	`47`	`+`
	`48`	`+ val loanBalance: Double? = null,`
	`49`	`+`
	`50`	`+ val amountPaid: Double? = null,`
	`51`	`+`
`46`	`52`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ data class GetClientsLoanAccountsType(`
`24`	`24`
`25`	`25`	`val code: String? = null,`
`26`	`26`
`27`		`- val description: String? = null,`
	`27`	`+ val value: String? = null,`
`28`	`28`
`29`	`29`	`val id: Long? = null,`
`30`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import androidclient.feature.client.generated.resources.client_performance_histo`
`17`	`17`	`import androidclient.feature.client.generated.resources.client_performance_history_total_savings_label`
`18`	`18`	`import androidclient.feature.client.generated.resources.client_profile_general_header_actions`
`19`	`19`	`import androidclient.feature.client.generated.resources.client_profile_general_header_performance_history`
`20`		`-import androidclient.feature.client.generated.resources.client_savings_not_avilable`
	`20`	`+import androidclient.feature.client.generated.resources.client_savings_not_available`
`21`	`21`	`import androidx.compose.foundation.background`
`22`	`22`	`import androidx.compose.foundation.clickable`
`23`	`23`	`import androidx.compose.foundation.layout.Arrangement`
`@@ -241,14 +241,14 @@ fun PerformanceHistoryCard(state: ClientProfileGeneralState) {`
`241`	`241`	`PerformanceHistoryRows(`
`242`	`242`	`stringResource(Res.string.client_performance_history_loan_cycle_count_label),`
`243`	`243`	`performanceHistory.loanCyclesCount?.toString()`
`244`		`- ?: stringResource(Res.string.client_savings_not_avilable),`
	`244`	`+ ?: stringResource(Res.string.client_savings_not_available),`
`245`	`245`
`246`	`246`	`)`
`247`	`247`
`248`	`248`	`PerformanceHistoryRows(`
`249`	`249`	`stringResource(Res.string.client_performance_history_active_loans_count_label),`
`250`	`250`	`performanceHistory.activeLoans?.toString()`
`251`		`- ?: stringResource(Res.string.client_savings_not_avilable),`
	`251`	`+ ?: stringResource(Res.string.client_savings_not_available),`
`252`	`252`	`)`
`253`	`253`
`254`	`254`	`PerformanceHistoryRows(`
`@@ -257,21 +257,21 @@ fun PerformanceHistoryCard(state: ClientProfileGeneralState) {`
`257`	`257`	`performanceHistory.lastLoanAmount?.let {`
`258`	`258`	`state.currency + " " + it.toString()`
`259`	`259`	`}`
`260`		`- ?: stringResource(Res.string.client_savings_not_avilable),`
	`260`	`+ ?: stringResource(Res.string.client_savings_not_available),`
`261`	`261`	`)`
`262`	`262`
`263`	`263`	`PerformanceHistoryRows(`
`264`	`264`	`stringResource(Res.string.client_performance_history_active_savings_label),`
`265`	`265`	`performanceHistory.activeSavingsCount?.toString()`
`266`		`- ?: stringResource(Res.string.client_savings_not_avilable),`
	`266`	`+ ?: stringResource(Res.string.client_savings_not_available),`
`267`	`267`	`)`
`268`	`268`
`269`	`269`	`PerformanceHistoryRows(`
`270`	`270`	`stringResource(Res.string.client_performance_history_total_savings_label),`
`271`	`271`	`performanceHistory.totalSaving?.let {`
`272`	`272`	`state.currency + " " + it.toString()`
`273`	`273`	`}`
`274`		`- ?: stringResource(Res.string.client_savings_not_avilable),`
	`274`	`+ ?: stringResource(Res.string.client_savings_not_available),`
`275`	`275`	`)`
`276`	`276`	`}`
`277`	`277`	`}`