Merge branch 'develop' into multitenancy

Author: walker-sean

src/frontend/src/components/Tabs.tsx

@@ -1,4 +1,4 @@
-import { AppBar, Tab, Tabs as MUITabs, Box } from '@mui/material';
+import { AppBar, Tab, Tabs as MUITabs, Box, useTheme } from '@mui/material';
 import React from 'react';
 
 export interface TabData {
@@ -21,6 +21,8 @@ const Tabs = ({
     setTabValue(newValue);
   };
 
+  const theme = useTheme();
+
   return (
     <>
       <AppBar
@@ -47,7 +49,8 @@ const Tabs = ({
               sx={{
                 fontWeight: 700,
                 pointerEvents: tabs.length === 1 ? 'none' : 'auto',
-                borderRadius: greyscale ? '8px 8px 0 0' : 0
+                borderRadius: greyscale ? '8px 8px 0 0' : 0,
+                color: greyscale ? theme.palette.text.primary : undefined
               }}
             />
           ))}

src/frontend/src/hooks/auth.hooks.ts

@@ -29,10 +29,16 @@ export const useProvideAuth = () => {
   };
 
   const devSignin = async (userId: string) => {
-    const user = await mutateAsyncDev(userId);
-    setUser(user);
-    localStorage.setItem('devUserId', userId.toString());
-    return user;
+    try {
+      const user = await mutateAsyncDev(userId);
+      setUser(user);
+      localStorage.setItem('devUserId', userId.toString());
+      return user;
+    } catch (error) {
+      console.log(error);
+      localStorage.removeItem('devUserId');
+      return;
+    }
   };
 
   const signin = async (id_token: string) => {

src/frontend/src/hooks/finance.hooks.ts

@@ -47,6 +47,7 @@ import {
   ReimbursementStatusType
 } from 'shared';
 import { fullNamePipe } from '../utils/pipes';
+import { getCurrentReimbursementStatus } from '../utils/reimbursement-request.utils';
 
 export interface CreateReimbursementRequestPayload {
   vendorId: string;
@@ -405,7 +406,7 @@ export const useDownloadCSVFileOfReimbursementRequests = () => {
         .map(
           (rr) =>
             `${rr.saboId},${rr.identifier},${fullNamePipe(rr.recipient)},${rr.totalCost},${
-              rr.reimbursementStatuses[rr.reimbursementStatuses.length - 1].type
+              getCurrentReimbursementStatus(rr.reimbursementStatuses).type
             },${rr.account},${rr.accountCode.code},${rr.dateCreated},${rr.dateDelivered ?? ''},${
               rr.reimbursementStatuses.find((rs) => rs.type === ReimbursementStatusType.SABO_SUBMITTED)?.dateCreated ?? ''
             },${rr.vendor.name}`

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

@@ -46,7 +46,8 @@ import {
   isReimbursementRequestSaboSubmitted,
   isReimbursementRequestDenied,
   isReimbursementRequestLeadershipApproved,
-  isReimbursementRequestPendingFinance
+  isReimbursementRequestPendingFinance,
+  getCurrentReimbursementStatus
 } from '../../../utils/reimbursement-request.utils';
 import { routes } from '../../../utils/routes';
 import AddSABONumberModal from './AddSABONumberModal';
@@ -469,15 +470,16 @@ const ReimbursementRequestDetailsView: React.FC<ReimbursementRequestDetailsViewP
     }
   ];
 
-  const sortedStatus = reimbursementRequest.reimbursementStatuses.sort((a) => a.dateCreated.getDate());
-  const statusTypes = sortedStatus.map((status) => status.type);
-  const recentStatus = statusTypes[statusTypes.length - 1];
   return (
     <PageLayout
       title={`Reimbursement Request #${reimbursementRequest.identifier} (${fullNamePipe(reimbursementRequest.recipient)})`}
       chips={
         <Box id="status" display="flex">
-          {statusTypes.length > 0 && <ReimbursementRequestStatusPill status={recentStatus} />}
+          {reimbursementRequest.reimbursementStatuses.length > 0 && (
+            <ReimbursementRequestStatusPill
+              status={getCurrentReimbursementStatus(reimbursementRequest.reimbursementStatuses).type}
+            />
+          )}
         </Box>
       }
       previousPages={[