From b805fb4ae1debf5856ccf5fc937ff0795394acd8 Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Tue, 25 Nov 2025 10:48:27 +0700 Subject: [PATCH] chore(FE-196): use useApprovalSteps hook --- .../pages/expense/ExpenseRequestContent.tsx | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/components/pages/expense/ExpenseRequestContent.tsx b/src/components/pages/expense/ExpenseRequestContent.tsx index fa3f7d6d..0cdbc22c 100644 --- a/src/components/pages/expense/ExpenseRequestContent.tsx +++ b/src/components/pages/expense/ExpenseRequestContent.tsx @@ -14,6 +14,7 @@ import ExpenseStatusBadge from '@/components/pages/expense/ExpenseStatusBadge'; import DropFileInput from '@/components/input/DropFileInput'; import ApprovalSteps, { formatGroupedApprovalsToApprovalSteps, + useApprovalSteps, } from '@/components/pages/ApprovalSteps'; import { useModal } from '@/components/Modal'; import ConfirmationModal from '@/components/modal/ConfirmationModal'; @@ -40,10 +41,17 @@ const ExpenseRequestContent = ({ }: ExpenseRequestContentProps) => { const router = useRouter(); - const { data: approvalHistory, isLoading: isLoadingApprovalHistory } = useSWR( - initialValues ? [String(initialValues.id)] : null, - ([id]: string[]) => ExpenseApi.getApprovalHistory(Number(id)) - ); + const { approvals: approvalHistory, isLoading: isLoadingApprovalHistory } = + useApprovalSteps({ + latestApproval: initialValues?.latest_approval, + approvalLines: EXPENSE_REQUEST_APPROVAL_LINE, + moduleName: 'EXPENSES', + moduleId: initialValues?.id.toString() ?? '', + params: { + page: 1, + limit: 100, + }, + }); const isLatestApprovalRejected = initialValues?.latest_approval.action === 'REJECTED'; @@ -236,19 +244,11 @@ const ExpenseRequestContent = ({ return ( <>
- {initialValues && - !isLoadingApprovalHistory && - isResponseSuccess(approvalHistory) && ( -
- -
- )} + {initialValues && !isLoadingApprovalHistory && approvalHistory && ( +
+ +
+ )}
{/* TODO: apply RBAC */}