Skip to content

Commit 75ba294

Browse files
committed
fix-loading-bug
1 parent 9ef777a commit 75ba294

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/frontend/src/pages/FinancePage/ReimbursementRequestDetailPage/ReimbursementRequestDetailsView.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,11 @@ const ReimbursementRequestDetailsView: React.FC<ReimbursementRequestDetailsViewP
226226
setOpen={setShowSubmitToSaboModal}
227227
reimbursementRequest={reimbursementRequest}
228228
/>
229+
<AddSABONumberModal
230+
modalShow={addSaboNumberModalShow}
231+
onHide={() => setAddSaboNumberModalShow(false)}
232+
reimbursementRequestId={reimbursementRequest.reimbursementRequestId}
233+
/>
229234
<Grid container spacing={2} mt={2}>
230235
<Grid item lg={6} xs={12}>
231236
<BasicInformationView />
@@ -242,11 +247,6 @@ const ReimbursementRequestDetailsView: React.FC<ReimbursementRequestDetailsViewP
242247
</Grid>
243248
</Grid>
244249
</Grid>
245-
<AddSABONumberModal
246-
modalShow={addSaboNumberModalShow}
247-
onHide={() => setAddSaboNumberModalShow(false)}
248-
reimbursementRequestId={reimbursementRequest.reimbursementRequestId}
249-
/>
250250
</PageLayout>
251251
);
252252
};

src/frontend/src/pages/FinancePage/ReimbursementRequestDetailPage/SubmitToSaboModal.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import NERModal from '../../../components/NERModal';
22
import { Box, Grid, Typography } from '@mui/material';
33
import { useApproveReimbursementRequest } from '../../../hooks/finance.hooks';
44
import { ReimbursementRequest, wbsPipe } from 'shared';
5-
import { useUserSecureSettings } from '../../../hooks/users.hooks';
5+
import { useCurrentUser, useUserSecureSettings } from '../../../hooks/users.hooks';
66
import LoadingIndicator from '../../../components/LoadingIndicator';
77
import ErrorPage from '../../ErrorPage';
88
import { datePipe } from '../../../utils/pipes';
@@ -16,11 +16,13 @@ interface SubmitToSaboModalProps {
1616
}
1717

1818
const SubmitToSaboModal = ({ open, setOpen, reimbursementRequest }: SubmitToSaboModalProps) => {
19+
const user = useCurrentUser();
1920
const { mutateAsync: submitToSabo } = useApproveReimbursementRequest(reimbursementRequest.reimbursementRequestId);
2021
const { recipient, dateOfExpense, totalCost, vendor, expenseType, reimbursementProducts, receiptPictures } =
2122
reimbursementRequest;
2223
const { data: userInfo, isLoading, isError, error } = useUserSecureSettings(recipient.userId);
2324

25+
if (!user.isFinance) return <></>;
2426
if (isLoading || !userInfo) return <LoadingIndicator />;
2527
if (isError) return <ErrorPage error={error} message={error.message} />;
2628

0 commit comments

Comments
 (0)