diff --git a/src/components/pages/expense/form/ExpenseRealizationForm.tsx b/src/components/pages/expense/form/ExpenseRealizationForm.tsx index e9720d0b..54f2e759 100644 --- a/src/components/pages/expense/form/ExpenseRealizationForm.tsx +++ b/src/components/pages/expense/form/ExpenseRealizationForm.tsx @@ -66,7 +66,7 @@ const ExpenseRealizationForm = ({ toast.success(createExpenseRes?.message as string); router.push('/expense'); }, - [router] + [router, initialValues?.id] ); const updateExpenseHandler = useCallback( diff --git a/src/components/pages/expense/form/ExpenseRequestForm.tsx b/src/components/pages/expense/form/ExpenseRequestForm.tsx index adc825c2..fcc66847 100644 --- a/src/components/pages/expense/form/ExpenseRequestForm.tsx +++ b/src/components/pages/expense/form/ExpenseRequestForm.tsx @@ -178,12 +178,14 @@ const ExpenseRequestForm = ({ setInputValue: setLocationInputValue, options: locationOptions, isLoadingOptions: isLoadingLocationOptions, + loadMore: loadMoreLocationOptions, } = useSelect(LocationApi.basePath, 'id', 'name'); const { setInputValue: setVendorInputValue, options: supplierOptions, isLoadingOptions: isLoadingVendorOptions, + loadMore: loadMoreVendorOptions, } = useSelect(SupplierApi.basePath, 'id', 'name'); const categoryChangeHandler = (val: OptionType | OptionType[] | null) => { @@ -414,6 +416,7 @@ const ExpenseRequestForm = ({ errorMessage={formik.errors.location_id as string} isClearable className={{ wrapper: 'col-span-12 sm:col-span-4' }} + onMenuScrollToBottom={loadMoreLocationOptions} />