combine checks (canada-ca#2851)

Author: EveningStarlight

frontend/src/admin/AdminDomianCard.js

@@ -31,7 +31,7 @@ export function AdminDomianCard({ url, lastRan, ...rest }) {
             <ExternalLinkIcon mx="2px" aria-hidden="true" />
           </Link>
         </Stack>
-        {lastRan && (
+        {lastRan ? (
           <Stack isInline>
             <Text fontWeight="bold">
               <Trans>Last scanned:</Trans>
@@ -41,8 +41,7 @@ export function AdminDomianCard({ url, lastRan, ...rest }) {
               <LinkIcon mx="2px" aria-hidden="true" />
             </Link>
           </Stack>
-        )}
-        {!lastRan && (
+        ) : (
           <Box>
             <Text fontWeight="bold">
               <Trans>Not scanned yet.</Trans>

frontend/src/app/App.js

@@ -96,21 +96,17 @@ export function App() {
           </Link>
 
           {isLoggedIn() && isEmailValidated() && (
-            <Link to="/organizations">
-              <Trans>Organizations</Trans>
-            </Link>
-          )}
-
-          {isLoggedIn() && isEmailValidated() && (
-            <Link to="/domains">
-              <Trans>Domains</Trans>
-            </Link>
-          )}
-
-          {isLoggedIn() && isEmailValidated() && (
-            <Link to="/dmarc-summaries">
-              <Trans>DMARC Summaries</Trans>
-            </Link>
+            <>
+              <Link to="/organizations">
+                <Trans>Organizations</Trans>
+              </Link>
+              <Link to="/domains">
+                <Trans>Domains</Trans>
+              </Link>
+              <Link to="/dmarc-summaries">
+                <Trans>DMARC Summaries</Trans>
+              </Link>
+            </>
           )}
 
           {isLoggedIn() && (

frontend/src/app/FloatingMenu.js

@@ -193,14 +193,13 @@ export const FloatingMenu = () => {
                       onClick={signOut}
                     />
                   ) : (
-                    <FloatingMenuLink to="/sign-in" text={t`Sign In`} />
-                  )}
-
-                  {!isLoggedIn() && (
-                    <FloatingMenuLink
-                      to="/create-user"
-                      text={t`Create Account`}
-                    />
+                    <>
+                      <FloatingMenuLink to="/sign-in" text={t`Sign In`} />
+                      <FloatingMenuLink
+                        to="/create-user"
+                        text={t`Create Account`}
+                      />
+                    </>
                   )}
 
                   <Divider

frontend/src/app/TopBanner.js

@@ -70,29 +70,28 @@ export const TopBanner = (props) => {
             <Trans>Sign Out</Trans>
           </Button>
         ) : (
-          <Button
-            variant="primaryWhite"
-            as={RouteLink}
-            to="/sign-in"
-            mr={2}
-            px={3}
-            display={{ base: 'none', md: 'inline' }}
-          >
-            <Trans>Sign In</Trans>
-          </Button>
-        )}
-
-        {!isLoggedIn() && (
-          <Button
-            variant="primaryHover"
-            as={RouteLink}
-            to="/create-user"
-            mr={2}
-            px={3}
-            display={{ base: 'none', md: 'inline' }}
-          >
-            <Trans>Create Account</Trans>
-          </Button>
+          <>
+            <Button
+              variant="primaryWhite"
+              as={RouteLink}
+              to="/sign-in"
+              mr={2}
+              px={3}
+              display={{ base: 'none', md: 'inline' }}
+            >
+              <Trans>Sign In</Trans>
+            </Button>
+            <Button
+              variant="primaryHover"
+              as={RouteLink}
+              to="/create-user"
+              mr={2}
+              px={3}
+              display={{ base: 'none', md: 'inline' }}
+            >
+              <Trans>Create Account</Trans>
+            </Button>
+          </>
         )}
 
         <Box py={4}>