diff --git a/packages/chicken/lib/presentation/pages/buy_in_province_waiting/logic.dart b/packages/chicken/lib/presentation/pages/buy_in_province_waiting/logic.dart index 9be6f7b..2de5ede 100644 --- a/packages/chicken/lib/presentation/pages/buy_in_province_waiting/logic.dart +++ b/packages/chicken/lib/presentation/pages/buy_in_province_waiting/logic.dart @@ -10,8 +10,8 @@ import 'package:rasadyar_core/core.dart'; class BuyInProvinceWaitingLogic extends GetxController { RxList isExpandedList = [].obs; - Rx fromDateFilter = Jalali.now().obs; - Rx toDateFilter = Jalali.now().obs; + Rxn fromDateFilter = Rxn(); + Rxn toDateFilter = Rxn(); RxnString searchedValue = RxnString(); RxMap isLoadingConfirmMap = RxMap(); Rx bgConfirmAllColor = AppColor.blueNormal.obs; @@ -56,7 +56,7 @@ class BuyInProvinceWaitingLogic extends GetxController { if (searchedValue.value != null && searchedValue.value!.trim().isNotEmpty && currentPage.value > 1) { - currentPage.value = 1; // Reset to first page if search value is set + currentPage.value = 1; } safeCall( @@ -69,8 +69,8 @@ class BuyInProvinceWaitingLogic extends GetxController { search: 'filter', role: 'Steward', value: searchedValue.value, - fromDate: fromDateFilter.value.toDateTime(), - toDate: toDateFilter.value.toDateTime(), + fromDate: fromDateFilter.value?.toDateTime(), + toDate: toDateFilter.value?.toDateTime(), ), ), onSuccess: (res) async {