Skip to content

Commit 00fb645

Browse files
authored
Merge pull request #3539 from Northeastern-Electric-Racing/#3538-rr-views-not-working
#3538 rr side bar fix
2 parents ce32aa4 + 32da68e commit 00fb645

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/frontend/src/pages/FinancePage/FinanceComponents/ReimbursementRequestInfo.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,6 @@ const ReimbursementRequestInfo = ({
284284
<TableCell align="center">{undefinedPipe(row.saboId)}</TableCell>
285285
<TableCell align="center">{datePipe(row.dateSubmitted)}</TableCell>
286286
<TableCell align="center">{dateUndefinedPipe(row.dateSubmittedToSabo)}</TableCell>
287-
<SidePage
288-
showPage={showSidePage}
289-
handleClose={closeSidePage}
290-
title={''}
291-
component={<ReimbursementRequestDetails onCloseEditPage={closeSidePage} />}
292-
/>
293287
<TableCell align="center">
294288
{
295289
<Button
@@ -321,6 +315,12 @@ const ReimbursementRequestInfo = ({
321315
</TableBody>
322316
</Table>
323317
</TableContainer>
318+
<SidePage
319+
showPage={showSidePage}
320+
handleClose={closeSidePage}
321+
title={''}
322+
component={<ReimbursementRequestDetails onCloseEditPage={closeSidePage} />}
323+
/>
324324
<Box
325325
sx={{
326326
backgroundColor: '#121313',

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ const ReimbursementRequestDetailsView: React.FC<ReimbursementRequestDetailsViewP
330330
{reimbursementRequest.receiptPictures.map((receipt) => {
331331
return (
332332
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
333-
<Link href={imageFileUrl(receipt.googleFileId)} target="_blank" underline="hover" sx={{ mr: 1, fontSize: 30 }}>
334-
{receipt.name}
333+
<Link href={imageFileUrl(receipt.googleFileId)} target="_blank" underline="hover" sx={{ mr: 1, fontSize: 20 }}>
334+
{receipt.name.length > 20 ? receipt.name.slice(0, 30) + '...' : receipt.name}
335335
</Link>
336336
<IconButton href={imageDownloadUrl(receipt.googleFileId)}>
337337
<DownloadIcon sx={{ fontSize: 30 }} />
@@ -573,7 +573,7 @@ const ReimbursementRequestDetailsView: React.FC<ReimbursementRequestDetailsViewP
573573
}}
574574
/>
575575
<Box sx={{ display: 'flex', alignItems: 'flex-start' }}>
576-
<Box sx={{ width: '900px', mt: -3, maxWidth: 400 }}>
576+
<Box sx={{ mt: -3 }}>
577577
<ReimbursementRequestTimeline
578578
reimbursementRequestId={reimbursementRequest.reimbursementRequestId}
579579
reimbursementRequestComments={reimbursementRequest.comments}

0 commit comments

Comments
 (0)