From 548e0292e8ec6631c1fdc4e3a91ce41d8d824a38 Mon Sep 17 00:00:00 2001
From: Mohan Shiwakoti <mohan.shiwakoti@swifttech.com.np>
Date: Wed, 24 May 2023 20:59:31 +0545
Subject: [PATCH] minor issue fixes in recent transaction

---
 .../myTransfers/view/MyTransfersFragment.kt   | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
index 4bd70178..c672563e 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
+++ b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
@@ -47,6 +47,7 @@ import com.tsongkha.spinnerdatepicker.DatePicker
 import com.tsongkha.spinnerdatepicker.DateRangePickerDialog.OnRangeDateSetListener
 import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder
 import java.util.*
+import kotlin.collections.ArrayList
 
 class MyTransfersFragment : BaseFragment(),
     RecipientListingV3PresenterInterface.RecipientListingV3ContractInterface,
@@ -66,7 +67,7 @@ class MyTransfersFragment : BaseFragment(),
     var noTransactionFoundTextView: EditText? = null
     private var searchTextChangeListener: SearchEdittextTextChangeListener? = null
     private val type: TransactionHistoryViewType? = null
-    private var data: MutableList<RecentTransaction>? = null
+    private var data: MutableList<RecentTransaction>? = ArrayList()
     private var presenterTransaction: TransactionHistoryV2Presenter? = null
     private var genericEditTextPromptDialog: GenericEditTextPromptDialog? = null
     private var homeViewModel: HomeViewModel? = null
@@ -219,7 +220,7 @@ class MyTransfersFragment : BaseFragment(),
             isRecentEmpty = false
         }
         currentPage = 1
-        presenter!!.getAllRecipientListV5(null, countryId, "", "", "")
+        presenter!!.getAllRecipientListV5(null, countryId, startDate, endDate, "")
     }
 
 
@@ -243,19 +244,16 @@ class MyTransfersFragment : BaseFragment(),
             binding.swiperefresh.isRefreshing = false
         }
         adapter?.setData(recipientInfoModelList)
-        if (data == null) {
+        if (binding.swiperefresh.isRefreshing) {
+            binding.swiperefresh.isRefreshing = false
+        }
+        if (!recentTransactionList.isNullOrEmpty()) {
+            data?.addAll(recentTransactionList)
+            currentPage++
+        } else {
             if (currentPage > 1) {
                 isRecentEmpty = true
             }
-            data = recentTransactionList
-        } else {
-            if (recentTransactionList != null && recentTransactionList.isEmpty()) {
-                isFirstCall = false
-                if (currentPage > 1) {
-                    isRecentEmpty = true
-                }
-            }
-            data?.addAll(recentTransactionList!!)
         }
         recentAdapter?.setData(data)
         recentAdapter?.setTransactionClickListener(object :
@@ -631,13 +629,7 @@ class MyTransfersFragment : BaseFragment(),
                     )
                     this@MyTransfersFragment.startDate = startDate
                     this@MyTransfersFragment.endDate = endDate
-                    presenter!!.getAllRecipientListV5(
-                        null,
-                        "",
-                        startDate,
-                        endDate,
-                        "1"
-                    )
+                    performDefaultAction("", true)
                 }
             })
             .build()