From 338912296e20964b2ca82e11e100cf02f80f20a2 Mon Sep 17 00:00:00 2001
From: alexd-bes <129009580+alexd-bes@users.noreply.github.com>
Date: Fri, 20 Sep 2024 14:39:30 +1200
Subject: [PATCH] PR fixes

---
 .../datatrak-web/src/views/RequestProjectAccessPage.tsx    | 3 +--
 .../tupaia-web/src/views/RequestProjectAccessModal.tsx     | 3 +--
 .../features/RequestProjectAccess/ProjectAccessForm.tsx    | 4 +---
 .../features/RequestProjectAccess/RequestProjectAccess.tsx | 7 +------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/datatrak-web/src/views/RequestProjectAccessPage.tsx b/packages/datatrak-web/src/views/RequestProjectAccessPage.tsx
index 169b77666d..18d0393f99 100644
--- a/packages/datatrak-web/src/views/RequestProjectAccessPage.tsx
+++ b/packages/datatrak-web/src/views/RequestProjectAccessPage.tsx
@@ -37,10 +37,9 @@ export const RequestProjectAccessPage = () => {
         onClose={onReturnToProjects}
         project={project}
         onSubmit={requestProjectAccess}
-        isLoading={isLoadingProject}
+        isLoading={isLoadingProject || !isFetched}
         isSubmitting={isLoading}
         isSuccess={isSuccess}
-        isFetched={isFetched}
         countries={countries}
       />
     </Wrapper>
diff --git a/packages/tupaia-web/src/views/RequestProjectAccessModal.tsx b/packages/tupaia-web/src/views/RequestProjectAccessModal.tsx
index af3821175a..70cd8b9f6d 100644
--- a/packages/tupaia-web/src/views/RequestProjectAccessModal.tsx
+++ b/packages/tupaia-web/src/views/RequestProjectAccessModal.tsx
@@ -147,11 +147,10 @@ export const RequestProjectAccessModal = () => {
         <RequestProjectAccess
           project={requestingProject}
           countries={countries}
-          isLoading={isLoading || isLoadingCountryAccessList}
+          isLoading={isLoading || isLoadingCountryAccessList || !isFetched}
           isSubmitting={isSubmitting}
           onSubmit={requestCountryAccess}
           isSuccess={isSuccess}
-          isFetched={isFetched}
           onClose={onCloseModal}
           closeButtonText={isReturningToProjects ? 'Return to projects' : 'Close'}
           errorMessage={showError ? error.message : undefined}
diff --git a/packages/ui-components/src/features/RequestProjectAccess/ProjectAccessForm.tsx b/packages/ui-components/src/features/RequestProjectAccess/ProjectAccessForm.tsx
index 9944376ae5..788b48d4b1 100644
--- a/packages/ui-components/src/features/RequestProjectAccess/ProjectAccessForm.tsx
+++ b/packages/ui-components/src/features/RequestProjectAccess/ProjectAccessForm.tsx
@@ -119,7 +119,6 @@ interface ProjectAccessFormProps {
   isSubmitting: boolean;
   isSuccess: boolean;
   closeButtonText?: string;
-  isLoading?: boolean;
 }
 
 export const ProjectAccessForm = ({
@@ -130,7 +129,6 @@ export const ProjectAccessForm = ({
   isSubmitting,
   isSuccess,
   closeButtonText = 'Back to projects',
-  isLoading,
 }: ProjectAccessFormProps) => {
   const formContext = useForm({
     mode: 'onChange',
@@ -152,7 +150,7 @@ export const ProjectAccessForm = ({
   const availableCountries = countries?.filter((c: Country) => !c.hasAccess && !c.hasPendingAccess);
 
   // show the no countries message if the country access list has loaded and there are no countries available
-  const showNoCountriesMessage = !isLoading && !availableCountries?.length && !isSuccess;
+  const showNoCountriesMessage = !availableCountries?.length && !isSuccess;
 
   if (showNoCountriesMessage) {
     return (
diff --git a/packages/ui-components/src/features/RequestProjectAccess/RequestProjectAccess.tsx b/packages/ui-components/src/features/RequestProjectAccess/RequestProjectAccess.tsx
index 83f647cf36..e48311ecc5 100644
--- a/packages/ui-components/src/features/RequestProjectAccess/RequestProjectAccess.tsx
+++ b/packages/ui-components/src/features/RequestProjectAccess/RequestProjectAccess.tsx
@@ -63,7 +63,6 @@ interface RequestProjectAccessProps {
   onClose?: () => void;
   project?: WebServerProjectRequest.ResBody;
   isLoading?: boolean;
-  isFetched?: boolean;
   countries: ProjectCountryAccessListRequest.ResBody[number][];
   onSubmit: (data: { entityIds: string[]; message: string; projectCode: string }) => void;
   isSubmitting: boolean;
@@ -76,7 +75,6 @@ export const RequestProjectAccess = ({
   onClose,
   project,
   isLoading,
-  isFetched,
   countries,
   onSubmit,
   isSuccess,
@@ -84,14 +82,12 @@ export const RequestProjectAccess = ({
   closeButtonText,
   errorMessage,
 }: RequestProjectAccessProps) => {
-  const showLoading = isLoading || !isFetched;
-
   return (
     <Wrapper>
       <Title>Request project access</Title>
       <BodyText>Complete the form below to request access to this project</BodyText>
       <Container>
-        {showLoading ? (
+        {isLoading ? (
           <SpinningLoader />
         ) : (
           <>
@@ -112,7 +108,6 @@ export const RequestProjectAccess = ({
               isSuccess={isSuccess}
               countries={countries}
               closeButtonText={closeButtonText}
-              isLoading={isLoading}
             />
           </>
         )}