diff --git a/src/components/ErrorBoundary.js b/src/components/ErrorBoundary.js index 6f521611f..6a1bd3bc7 100644 --- a/src/components/ErrorBoundary.js +++ b/src/components/ErrorBoundary.js @@ -43,7 +43,7 @@ class ErrorBoundary extends React.Component { // boundaries can customize their error states return ( - + { t( "Something-went-wrong" ) } { t( "If-youre-seeing-this-error" ) } diff --git a/src/components/ObsDetails/ObsDetails.js b/src/components/ObsDetails/ObsDetails.js index b2411f104..7d9081fc7 100644 --- a/src/components/ObsDetails/ObsDetails.js +++ b/src/components/ObsDetails/ObsDetails.js @@ -225,7 +225,7 @@ const ObsDetails = ( { )} - {showActivityTab && ( + {showActivityTab && currentUser && ( { || ( !observation?.user && !observation?.id ) ); - const invalidateRemoteObservation = useCallback( ( ) => { - queryClient.invalidateQueries( { queryKey: [fetchRemoteObservationKey, observation.uuid] } ); - }, [queryClient, observation.uuid] ); + const invalidateRemoteObservationFetch = useCallback( ( ) => { + if ( observation?.uuid ) { + queryClient.invalidateQueries( { + queryKey: [fetchRemoteObservationKey, observation.uuid] + } ); + } + }, [queryClient, observation?.uuid] ); useFocusEffect( // this ensures activity items load after a user taps suggest id // and adds a remote id on the Suggestions screen useCallback( ( ) => { - invalidateRemoteObservation( ); - }, [invalidateRemoteObservation] ) + invalidateRemoteObservationFetch( ); + }, [invalidateRemoteObservationFetch] ) ); useEffect( ( ) => { @@ -346,7 +350,7 @@ const ObsDetailsContainer = ( ): Node => { const showActivityTab = currentTabId === ACTIVITY_TAB_ID; const invalidateQueryAndRefetch = ( ) => { - invalidateRemoteObservation( ); + invalidateRemoteObservationFetch( ); refetchRemoteObservation( ); refetchObservationUpdates( ); }; diff --git a/src/components/TaxonDetails/Taxonomy.js b/src/components/TaxonDetails/Taxonomy.js index ab8f5b84c..de91bf1f9 100644 --- a/src/components/TaxonDetails/Taxonomy.js +++ b/src/components/TaxonDetails/Taxonomy.js @@ -168,8 +168,20 @@ const Taxonomy = ( { taxon: currentTaxon, hideNavButtons }: Props ): Node => { { scientificNameFirst - ? [sciNameComponent, " ", comNameComponent] - : [comNameComponent, " ", sciNameComponent] + ? ( + <> + { sciNameComponent } + { " " } + { comNameComponent } + + ) + : ( + <> + { comNameComponent } + { " " } + { sciNameComponent } + + ) }