fix: filter transaction not working properly

openMF · Mar 25, 2024 · 77c8119 · 77c8119
1 parent 319dd87
commit 77c8119
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/SavingAccountsTransactionFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/SavingAccountsTransactionFragment.kt
@@ -387,7 +387,7 @@ class SavingAccountsTransactionFragment : BaseFragment() {
             .setTitle(R.string.select_you_want)
             .setView(dialogView)
             .setPositiveButton(getString(R.string.filter)) { _, _ ->
-                if (checkBoxPeriod?.isChecked == true) {
+                if (checkBoxPeriod?.isChecked == true || isCheckBoxPeriod) {
                     if (!isReady) {
                         Toaster.show(binding.root, getString(R.string.select_date))
                         return@setPositiveButton
@@ -425,9 +425,11 @@ class SavingAccountsTransactionFragment : BaseFragment() {
      * @param endDate   Ending date
      */
     private fun filter(startDate: Long?, endDate: Long?, statusModelList: List<CheckboxStatus?>?) {
-        val dummyTransactionList = filterSavingsAccountTransactionsByType(statusModelList)
+        val hasOtherFilters = statusModelList?.any { it!!.isChecked }
+        val transactionListToFilter = if (hasOtherFilters == true) filterSavingsAccountTransactionsByType(statusModelList) else transactionsList
+
         viewModel.filterTransactionList(
-            dummyTransactionList,
+            transactionListToFilter,
             startDate,
             endDate,
         )