fix: loan account Filter logic and states (#2896)

Author: revanthkumarJ

feature/loan-account/src/commonMain/composeResources/values/strings.xml

@@ -24,6 +24,7 @@
     <string name="feature_loan_account_filter_bronze">Bronze</string>
 
     <string name="feature_account_empty_loan_accounts">There is no LoanAccount associated with you</string>
+    <string name="feature_account_empty_filtered_loan_accounts">There is no LoanAccount associated with Filters you Selected</string>
 
     <string name="feature_loan_account_dashboard">Total Borrowings</string>
     <string name="feature_loan_account">Loan Account</string>

feature/loan-account/src/commonMain/kotlin/org/mifos/mobile/feature/loanaccount/loanAccount/LoanAccountScreen.kt

@@ -34,6 +34,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import mifos_mobile.feature.loan_account.generated.resources.Res
+import mifos_mobile.feature.loan_account.generated.resources.feature_account_empty_filtered_loan_accounts
 import mifos_mobile.feature.loan_account.generated.resources.feature_account_empty_loan_accounts
 import mifos_mobile.feature.loan_account.generated.resources.feature_loan_account
 import mifos_mobile.feature.loan_account.generated.resources.feature_loan_account_dashboard
@@ -255,6 +256,12 @@ internal fun LoanAccountContent(
                 error = Res.string.feature_account_empty_loan_accounts,
             )
         }
+        if (state.isFilteredEmpty && !state.isEmpty) {
+            EmptyDataView(
+                icon = MifosIcons.Info,
+                error = Res.string.feature_account_empty_filtered_loan_accounts,
+            )
+        }
     }
 }
 

feature/loan-account/src/commonMain/kotlin/org/mifos/mobile/feature/loanaccount/loanAccount/LoanAccountViewModel.kt

@@ -126,6 +126,7 @@ class LoanAccountsViewmodel(
                     loanAccounts = filtered,
                     selectedFilters = selectedFilters,
                     dialogState = null,
+                    isFilteredEmpty = filtered.isEmpty(),
                 )
             }
             sendEvent(LoanAccountsEvent.LoadingCompleted)
@@ -187,7 +188,8 @@ class LoanAccountsViewmodel(
                 mutableStateFlow.update {
                     it.copy(
                         items = filtered.size,
-                        isEmpty = filtered.isEmpty(),
+                        isEmpty = loanAccounts.isEmpty(),
+                        isFilteredEmpty = filtered.isEmpty(),
                         loanAccounts = filtered,
                         originalAccounts = loanAccounts,
                         currency = loanAccounts.firstOrNull()?.currency?.displaySymbol,
@@ -250,6 +252,7 @@ data class LoanAccountsState(
     val loanAccounts: List<LoanAccount>?,
     val originalAccounts: List<LoanAccount>? = null,
     val isEmpty: Boolean = false,
+    val isFilteredEmpty: Boolean = false,
 
     /** Number of filtered accounts */
     val items: Int? = 0,

feature/loan-account/src/commonMain/kotlin/org/mifos/mobile/feature/loanaccount/utils/FilterUtil.kt

@@ -12,6 +12,7 @@ package org.mifos.mobile.feature.loanaccount.utils
 import mifos_mobile.feature.loan_account.generated.resources.Res
 import mifos_mobile.feature.loan_account.generated.resources.feature_loan_account_filter_active
 import mifos_mobile.feature.loan_account.generated.resources.feature_loan_account_filter_approval_pending
+import mifos_mobile.feature.loan_account.generated.resources.feature_loan_account_filter_bronze
 import mifos_mobile.feature.loan_account.generated.resources.feature_loan_account_filter_closed
 import mifos_mobile.feature.loan_account.generated.resources.feature_loan_account_filter_disburse
 import mifos_mobile.feature.loan_account.generated.resources.feature_loan_account_filter_in_arrears
@@ -85,7 +86,7 @@ enum class FilterUtil(
      */
     IN_ARREARS(
         label = Res.string.feature_loan_account_filter_in_arrears,
-        matchCondition = { it.status?.overpaid == true },
+        matchCondition = { it.inArrears == true },
     ),
 
     /**
@@ -103,7 +104,7 @@ enum class FilterUtil(
     ),
 
     BRONZE(
-        label = Res.string.feature_loan_account_filter_personal,
+        label = Res.string.feature_loan_account_filter_bronze,
         matchCondition = { it.productName?.contains("bronze", ignoreCase = true) == true },
     ),
     ;