Sync 3.0.0 (PMVP-M1) with 2.1.0 (MVP2-M3)

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ permissions:
   contents: read
 
 jobs:
-  certify:
+  lint:
     name: Lint Changes
     runs-on: ubuntu-latest
     steps:

.github/workflows/test.yml

@@ -17,7 +17,7 @@ permissions:
   contents: read
 
 jobs:
-  certify:
+  test:
     name: Test Changes
     runs-on: ubuntu-latest
     steps:
@@ -43,3 +43,6 @@ jobs:
 
       - name: Run Jest
         run: npm run test:ci
+
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/[email protected]

package.json

@@ -40,7 +40,7 @@
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "TZ=UTC react-scripts test",
-    "test:ci": "TZ=UTC CI=true react-scripts test --passWithNoTests",
+    "test:ci": "TZ=UTC CI=true react-scripts test --passWithNoTests --coverage",
     "eject": "react-scripts eject",
     "lint": "eslint . --ignore-path .gitignore",
     "lint:fix": "eslint --fix . --ignore-path .gitignore",

src/components/Contexts/AuthContext.test.tsx

@@ -179,7 +179,8 @@ describe("AuthContext > AuthProvider Tests", () => {
 
     await waitFor(() => expect(screen.getByTestId("isLoggedIn").textContent).toEqual("false"));
 
-    expect(screen.getByTestId("isLoggedIn").textContent).toEqual("false");
-    expect(localStorage.getItem("userDetails")).toBeNull();
+    await waitFor(() => {
+      expect(localStorage.getItem("userDetails")).toBeNull();
+    }, { timeout: 1000 });
   });
 });

src/content/dataSubmissions/DataSubmission.tsx

@@ -6,7 +6,6 @@ import {
   Button,
   Card,
   CardActions,
-  CardActionsProps,
   CardContent,
   Container,
   IconButton,
@@ -117,13 +116,10 @@ const StyledMainContentArea = styled("div")(() => ({
   padding: "21px 40px 0",
 }));
 
-const StyledCardActions = styled(CardActions, {
-  shouldForwardProp: (prop) => prop !== "isVisible"
-})<CardActionsProps & { isVisible: boolean; }>(({ isVisible }) => ({
+const StyledCardActions = styled(CardActions)(() => ({
   "&.MuiCardActions-root": {
-    visibility: isVisible ? "visible" : "hidden",
     paddingTop: 0,
-  }
+  },
 }));
 
 const StyledTabs = styled(Tabs)(() => ({
@@ -337,7 +333,7 @@ type Props = {
   tab: string;
 };
 
-const DataSubmission: FC<Props> = ({ submissionId, tab }) => {
+const DataSubmission: FC<Props> = ({ submissionId, tab = URLTabs.DATA_ACTIVITY }) => {
   usePageTitle(`Data Submission ${submissionId || ""}`);
 
   const { user } = useAuthContext();
@@ -597,7 +593,7 @@ const DataSubmission: FC<Props> = ({ submissionId, tab }) => {
               <BackButton navigateTo="/data-submissions" text="Back to Data Submissions" />
             </StyledMainContentArea>
           </StyledCardContent>
-          <StyledCardActions isVisible={tab === URLTabs.DATA_ACTIVITY}>
+          <StyledCardActions>
             <DataSubmissionActions
               submission={data?.getSubmission}
               onAction={updateSubmissionAction}