Merge pull request #374 from EnMarche/minor-fixes

Minor fixes
parti-renaissance · May 6, 2021 · c7b63d3 · c7b63d3
2 parents 42d4970 + 5b78e50
commit c7b63d3
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 36 deletions.
diff --git a/src/components/AuthorAndSupports/AuthorAndSupports.tsx b/src/components/AuthorAndSupports/AuthorAndSupports.tsx
@@ -15,26 +15,26 @@ const AuthorAndSupports: FunctionComponent<AuthorAndSupportsProps> = ({ cause, s
   const isUserLoggedIn = Boolean(useSelector(isUserLogged));
   const intl = useIntl();
 
-  if (cause.author === undefined || cause.author === null) {
-    return null;
-  }
-
   return (
     <Container>
       {showAuthor === true ? (
         <AuthorContainer>
           <IconAndLabel
             iconSrc="/images/user.svg"
-            label={intl.formatMessage(
-              { id: 'cause.author' },
-              {
-                firstName: cause.author.first_name,
-                lastName:
-                  isUserLoggedIn && cause.author.last_name !== undefined
-                    ? cause.author.last_name
-                    : cause.author.last_name_initial,
-              },
-            )}
+            label={
+              cause.author === undefined || cause.author === null
+                ? intl.formatMessage({ id: 'cause.anonymous-author' })
+                : intl.formatMessage(
+                    { id: 'cause.author' },
+                    {
+                      firstName: cause.author.first_name,
+                      lastName:
+                        isUserLoggedIn && cause.author.last_name !== undefined
+                          ? cause.author.last_name
+                          : cause.author.last_name_initial,
+                    },
+                  )
+            }
           />
         </AuthorContainer>
       ) : null}

diff --git a/src/components/Cause/Cause.tsx b/src/components/Cause/Cause.tsx
@@ -59,8 +59,8 @@ const Cause: FunctionComponent<CauseProps> = ({ cause }: CauseProps) => {
         <StyledContent>
           <CoalitionsDisplay cause={cause} small />
           <CauseName>{cause.name}</CauseName>
-          {cause.author !== undefined && cause.author !== null ? (
-            <Author>
+          <Author>
+            {cause.author !== undefined && cause.author !== null ? (
               <FormattedMessage
                 id="cause.author"
                 values={{
@@ -71,8 +71,10 @@ const Cause: FunctionComponent<CauseProps> = ({ cause }: CauseProps) => {
                       : cause.author.last_name_initial,
                 }}
               />
-            </Author>
-          ) : null}
+            ) : (
+              <FormattedMessage id="cause.anonymous-author" />
+            )}
+          </Author>
           <AuthorAndSupports cause={cause} />
           <ButtonContainer>
             {Boolean(cause.supported) || (

diff --git a/src/components/CoalitionCards/CoalitionCards.tsx b/src/components/CoalitionCards/CoalitionCards.tsx
@@ -20,10 +20,7 @@ const CoalitionCards: FunctionComponent<CoalitionCardsProps> = ({
   const { fetchCoalitions, isFetchingCoalitions } = useFetchCoalitions();
 
   useEffect(() => {
-    if (coalitions.length === 0) {
-      fetchCoalitions();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    fetchCoalitions();
   }, [fetchCoalitions]);
 
   const renderCoalitionCard = (coalition: Coalition) => {

diff --git a/src/redux/Coalition/hooks/useFetchCoalitions.ts b/src/redux/Coalition/hooks/useFetchCoalitions.ts
@@ -6,9 +6,12 @@ import { updateCoalitions, markCoalitionsAsFollowed } from '../slice';
 import { Coalition } from '../types';
 import HandleErrorService from 'services/HandleErrorService';
 import { useFetchFollowedCoalitions } from './useFetchFollowedCoalitions';
+import useSelector from 'redux/useSelector';
+import { isUserLogged } from 'redux/Login/selectors';
 
 export const useFetchCoalitions = () => {
   const dispatch = useDispatch();
+  const isUserLoggedIn = Boolean(useSelector(isUserLogged));
 
   const { loading: loadingFollowed, doFetchFollowedCoalitions } = useFetchFollowedCoalitions();
 
@@ -30,11 +33,11 @@ export const useFetchCoalitions = () => {
       return;
     }
 
-    const followedCoalitions = await doFetchFollowedCoalitions();
+    const followedCoalitions = await doFetchFollowedCoalitions(isUserLoggedIn);
 
     dispatch(updateCoalitions(coalitions));
     dispatch(markCoalitionsAsFollowed(followedCoalitions));
-  }, [dispatch, doFetchCoalitions, doFetchFollowedCoalitions]);
+  }, [dispatch, doFetchCoalitions, doFetchFollowedCoalitions, isUserLoggedIn]);
 
   return { fetchCoalitions, isFetchingCoalitions: isFetchingCoalitions || loadingFollowed };
 };
diff --git a/src/redux/Coalition/hooks/useFetchFollowedCoalitions.ts b/src/redux/Coalition/hooks/useFetchFollowedCoalitions.ts
@@ -1,18 +1,17 @@
 import { useTypedAsyncFn } from 'redux/useTypedAsyncFn';
 import { authenticatedApiClient } from 'services/networking/client';
-import { isUserLogged } from 'redux/Login';
-import useSelector from 'redux/useSelector';
 
 export const useFetchFollowedCoalitions = () => {
-  const isUserLoggedIn = Boolean(useSelector(isUserLogged));
-
-  const [{ loading, error }, doFetchFollowedCoalitions] = useTypedAsyncFn(async () => {
-    if (!isUserLoggedIn) return [];
-    try {
-      return await authenticatedApiClient.get('v3/coalitions/followed');
-    } catch (error) {
-      return [];
-    }
-  }, []);
+  const [{ loading, error }, doFetchFollowedCoalitions] = useTypedAsyncFn(
+    async (isUserLoggedIn: boolean) => {
+      if (!isUserLoggedIn) return [];
+      try {
+        return await authenticatedApiClient.get('v3/coalitions/followed');
+      } catch (error) {
+        return [];
+      }
+    },
+    [],
+  );
   return { loading, error, doFetchFollowedCoalitions };
 };
diff --git a/src/translations/fr.json b/src/translations/fr.json
@@ -100,6 +100,7 @@
   },
   "cause": {
     "author": "Par {firstName} {lastName}",
+    "anonymous-author": "Auteur Anonyme",
     "support": "{supportsNumber} soutien",
     "supports": "{supportsNumber} soutiens",
     "support-button": "Soutenir",