From abd9ab4944cf2977640431462d13faa617a82b53 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Fri, 31 Mar 2023 14:12:23 -0300
Subject: [PATCH 01/14] move domain tags and hiding/archiving to A stream

---
 frontend/src/admin/AdminDomainCard.js         |  84 ++--
 frontend/src/admin/AdminDomainModal.js        | 156 ++++---
 frontend/src/domains/DomainCard.js            |  86 ++--
 .../OrganizationDomains.js                    | 384 +++++++++---------
 4 files changed, 341 insertions(+), 369 deletions(-)

diff --git a/frontend/src/admin/AdminDomainCard.js b/frontend/src/admin/AdminDomainCard.js
index 7fbd63533c..fb4aa47e58 100644
--- a/frontend/src/admin/AdminDomainCard.js
+++ b/frontend/src/admin/AdminDomainCard.js
@@ -14,8 +14,6 @@ import {
 import { ExternalLinkIcon } from '@chakra-ui/icons'
 
 import { sanitizeUrl } from '../utilities/sanitizeUrl'
-import { ABTestingWrapper } from '../app/ABTestWrapper'
-import { ABTestVariant } from '../app/ABTestVariant'
 
 export function AdminDomainCard({ url, tags, isHidden, isArchived, ...rest }) {
   return (
@@ -41,49 +39,45 @@ export function AdminDomainCard({ url, tags, isHidden, isArchived, ...rest }) {
             <ExternalLinkIcon mx="2px" aria-hidden="true" />
           </Link>
         </Stack>
-        <ABTestingWrapper insiderVariantName="B">
-          <ABTestVariant name="B">
-            <Flex>
-              {tags?.map((tag, idx) => {
-                return (
-                  <Tag
-                    key={idx}
-                    m="1"
-                    borderRadius="full"
-                    borderWidth="1px"
-                    borderColor="gray.900"
-                  >
-                    <TagLabel mx="auto">{tag}</TagLabel>
-                  </Tag>
-                )
-              })}
-              {isHidden && (
-                <Tag
-                  m="1"
-                  borderRadius="full"
-                  borderWidth="1px"
-                  borderColor="gray.900"
-                >
-                  <TagLabel mx="auto">
-                    <Trans>Hidden</Trans>
-                  </TagLabel>
-                </Tag>
-              )}
-              {isArchived && (
-                <Tag
-                  m="1"
-                  borderRadius="full"
-                  borderWidth="1px"
-                  borderColor="gray.900"
-                >
-                  <TagLabel mx="auto">
-                    <Trans>Archived</Trans>
-                  </TagLabel>
-                </Tag>
-              )}
-            </Flex>
-          </ABTestVariant>
-        </ABTestingWrapper>
+        <Flex>
+          {tags?.map((tag, idx) => {
+            return (
+              <Tag
+                key={idx}
+                m="1"
+                borderRadius="full"
+                borderWidth="1px"
+                borderColor="gray.900"
+              >
+                <TagLabel mx="auto">{tag}</TagLabel>
+              </Tag>
+            )
+          })}
+          {isHidden && (
+            <Tag
+              m="1"
+              borderRadius="full"
+              borderWidth="1px"
+              borderColor="gray.900"
+            >
+              <TagLabel mx="auto">
+                <Trans>Hidden</Trans>
+              </TagLabel>
+            </Tag>
+          )}
+          {isArchived && (
+            <Tag
+              m="1"
+              borderRadius="full"
+              borderWidth="1px"
+              borderColor="gray.900"
+            >
+              <TagLabel mx="auto">
+                <Trans>Archived</Trans>
+              </TagLabel>
+            </Tag>
+          )}
+        </Flex>
       </Grid>
     </ListItem>
   )
diff --git a/frontend/src/admin/AdminDomainModal.js b/frontend/src/admin/AdminDomainModal.js
index 47ed65deb0..058e5962e1 100644
--- a/frontend/src/admin/AdminDomainModal.js
+++ b/frontend/src/admin/AdminDomainModal.js
@@ -42,8 +42,6 @@ import { useMutation } from '@apollo/client'
 
 import { DomainField } from '../components/fields/DomainField'
 import { CREATE_DOMAIN, UPDATE_DOMAIN } from '../graphql/mutations'
-import { ABTestingWrapper } from '../app/ABTestWrapper'
-import { ABTestVariant } from '../app/ABTestVariant'
 
 export function AdminDomainModal({
   isOpen,
@@ -348,104 +346,100 @@ export function AdminDomainModal({
                       </Box>
                     )}
                   />
-                  <ABTestingWrapper insiderVariantName="B">
-                    <ABTestVariant name="B">
-                      <FieldArray
-                        name="tags"
-                        render={(arrayHelpers) => (
-                          <Box>
-                            <Text fontWeight="bold">Tags:</Text>
-                            <SimpleGrid columns={3} spacing={2}>
-                              {values.tags?.map((label, idx) => {
-                                return (
-                                  <Tag key={idx} borderRadius="full">
-                                    <TagLabel>{label[i18n.locale]}</TagLabel>
-                                    <TagCloseButton
-                                      ml="auto"
-                                      onClick={() => arrayHelpers.remove(idx)}
-                                      aria-label={`remove-tag-${
-                                        label[i18n.locale]
-                                      }`}
-                                    />
-                                  </Tag>
-                                )
-                              })}
-                            </SimpleGrid>
-                            <Divider borderBottomColor="gray.900" />
-                            <SimpleGrid columns={3} spacing={2}>
-                              {addableTags(values.tags, arrayHelpers)}
-                            </SimpleGrid>
-                          </Box>
-                        )}
+                  <FieldArray
+                    name="tags"
+                    render={(arrayHelpers) => (
+                      <Box>
+                        <Text fontWeight="bold">Tags:</Text>
+                        <SimpleGrid columns={3} spacing={2}>
+                          {values.tags?.map((label, idx) => {
+                            return (
+                              <Tag key={idx} borderRadius="full">
+                                <TagLabel>{label[i18n.locale]}</TagLabel>
+                                <TagCloseButton
+                                  ml="auto"
+                                  onClick={() => arrayHelpers.remove(idx)}
+                                  aria-label={`remove-tag-${
+                                    label[i18n.locale]
+                                  }`}
+                                />
+                              </Tag>
+                            )
+                          })}
+                        </SimpleGrid>
+                        <Divider borderBottomColor="gray.900" />
+                        <SimpleGrid columns={3} spacing={2}>
+                          {addableTags(values.tags, arrayHelpers)}
+                        </SimpleGrid>
+                      </Box>
+                    )}
+                  />
+
+                  <Flex align="center">
+                    <Tooltip
+                      label={t`Prevent this domain from being counted in your organization's summaries.`}
+                    >
+                      <QuestionOutlineIcon tabIndex={0} />
+                    </Tooltip>
+                    <label>
+                      <Switch
+                        isFocusable={true}
+                        name="hideDomain"
+                        mx="2"
+                        defaultChecked={values.hideDomain}
+                        onChange={handleChange}
                       />
+                    </label>
+                    <Badge variant="outline" color="gray.900" p="1.5">
+                      <Trans>Hide domain</Trans>
+                    </Badge>
+                  </Flex>
 
+                  {permission === 'SUPER_ADMIN' && (
+                    <Box>
                       <Flex align="center">
                         <Tooltip
-                          label={t`Prevent this domain from being counted in your organization's summaries.`}
+                          label={t`Prevent this domain from being visible, scanned, and being counted in any summaries.`}
                         >
                           <QuestionOutlineIcon tabIndex={0} />
                         </Tooltip>
                         <label>
                           <Switch
+                            colorScheme="red"
                             isFocusable={true}
-                            name="hideDomain"
+                            name="archiveDomain"
                             mx="2"
-                            defaultChecked={values.hideDomain}
+                            defaultChecked={values.archiveDomain}
                             onChange={handleChange}
                           />
                         </label>
                         <Badge variant="outline" color="gray.900" p="1.5">
-                          <Trans>Hide domain</Trans>
+                          <Trans>Archive domain</Trans>
                         </Badge>
                       </Flex>
 
-                      {permission === 'SUPER_ADMIN' && (
-                        <Box>
-                          <Flex align="center">
-                            <Tooltip
-                              label={t`Prevent this domain from being visible, scanned, and being counted in any summaries.`}
-                            >
-                              <QuestionOutlineIcon tabIndex={0} />
-                            </Tooltip>
-                            <label>
-                              <Switch
-                                colorScheme="red"
-                                isFocusable={true}
-                                name="archiveDomain"
-                                mx="2"
-                                defaultChecked={values.archiveDomain}
-                                onChange={handleChange}
-                              />
-                            </label>
-                            <Badge variant="outline" color="gray.900" p="1.5">
-                              <Trans>Archive domain</Trans>
-                            </Badge>
-                          </Flex>
-
-                          <Text fontSize="sm">
-                            {orgCount > 0 ? (
-                              <Trans>
-                                Note: This will affect results for {orgCount}{' '}
-                                organizations
-                              </Trans>
-                            ) : (
-                              <Trans>
-                                Note: This could affect results for multiple
-                                organizations
-                              </Trans>
-                            )}
-                          </Text>
-                        </Box>
-                      )}
-
-                      <Text>
-                        <Trans>
-                          Please allow up to 24 hours for summaries to reflect
-                          any changes.
-                        </Trans>
+                      <Text fontSize="sm">
+                        {orgCount > 0 ? (
+                          <Trans>
+                            Note: This will affect results for {orgCount}{' '}
+                            organizations
+                          </Trans>
+                        ) : (
+                          <Trans>
+                            Note: This could affect results for multiple
+                            organizations
+                          </Trans>
+                        )}
                       </Text>
-                    </ABTestVariant>
-                  </ABTestingWrapper>
+                    </Box>
+                  )}
+
+                  <Text>
+                    <Trans>
+                      Please allow up to 24 hours for summaries to reflect any
+                      changes.
+                    </Trans>
+                  </Text>
                 </Stack>
               </ModalBody>
 
diff --git a/frontend/src/domains/DomainCard.js b/frontend/src/domains/DomainCard.js
index 0b4fd69300..33c946ff7b 100644
--- a/frontend/src/domains/DomainCard.js
+++ b/frontend/src/domains/DomainCard.js
@@ -127,51 +127,47 @@ export function DomainCard({
             <Trans>Domain:</Trans>
           </Text>
           <Text isTruncated>{url}</Text>
-          <ABTestingWrapper insiderVariantName="B">
-            <ABTestVariant name="B">
-              <Flex flexWrap="wrap">
-                {tags?.map((tag, idx) => {
-                  return (
-                    <Tag
-                      key={idx}
-                      m="0.5"
-                      bg="gray.50"
-                      borderWidth="1px"
-                      borderColor="gray.900"
-                    >
-                      <TagLabel textColor="primary" fontWeight="bold" mx="auto">
-                        {tag}
-                      </TagLabel>
-                    </Tag>
-                  )
-                })}
-                {isHidden && (
-                  <Tag
-                    m="0.5"
-                    bg="gray.50"
-                    borderWidth="1px"
-                    borderColor="gray.900"
-                  >
-                    <TagLabel textColor="primary" fontWeight="bold" mx="auto">
-                      <Trans>HIDDEN</Trans>
-                    </TagLabel>
-                  </Tag>
-                )}
-                {isArchived && (
-                  <Tag
-                    m="0.5"
-                    bg="gray.50"
-                    borderWidth="1px"
-                    borderColor="gray.900"
-                  >
-                    <TagLabel textColor="primary" fontWeight="bold" mx="auto">
-                      <Trans>ARCHIVED</Trans>
-                    </TagLabel>
-                  </Tag>
-                )}
-              </Flex>
-            </ABTestVariant>
-          </ABTestingWrapper>
+          <Flex flexWrap="wrap">
+            {tags?.map((tag, idx) => {
+              return (
+                <Tag
+                  key={idx}
+                  m="0.5"
+                  bg="gray.50"
+                  borderWidth="1px"
+                  borderColor="gray.900"
+                >
+                  <TagLabel textColor="primary" fontWeight="bold" mx="auto">
+                    {tag}
+                  </TagLabel>
+                </Tag>
+              )
+            })}
+            {isHidden && (
+              <Tag
+                m="0.5"
+                bg="gray.50"
+                borderWidth="1px"
+                borderColor="gray.900"
+              >
+                <TagLabel textColor="primary" fontWeight="bold" mx="auto">
+                  <Trans>HIDDEN</Trans>
+                </TagLabel>
+              </Tag>
+            )}
+            {isArchived && (
+              <Tag
+                m="0.5"
+                bg="gray.50"
+                borderWidth="1px"
+                borderColor="gray.900"
+              >
+                <TagLabel textColor="primary" fontWeight="bold" mx="auto">
+                  <Trans>ARCHIVED</Trans>
+                </TagLabel>
+              </Tag>
+            )}
+          </Flex>
         </Box>
         <Divider variant="card" display={{ md: 'none' }} />
         <Flex {...statusGroupingProps} px="1">
diff --git a/frontend/src/organizationDetails/OrganizationDomains.js b/frontend/src/organizationDetails/OrganizationDomains.js
index 2fdb14910f..9792134a0e 100644
--- a/frontend/src/organizationDetails/OrganizationDomains.js
+++ b/frontend/src/organizationDetails/OrganizationDomains.js
@@ -35,8 +35,6 @@ import {
   schemaToValidation,
 } from '../utilities/fieldRequirements'
 import { CheckCircleIcon, InfoIcon, WarningIcon } from '@chakra-ui/icons'
-import { ABTestingWrapper } from '../app/ABTestWrapper'
-import { ABTestVariant } from '../app/ABTestVariant'
 
 export function OrganizationDomains({ orgSlug }) {
   const [orderDirection, setOrderDirection] = useState('ASC')
@@ -125,141 +123,137 @@ export function OrganizationDomains({ orgSlug }) {
     </LoadingMessage>
   ) : (
     <Box>
-      <ABTestingWrapper insiderVariantName="B">
-        <ABTestVariant name="B">
-          <Box px="2" py="2">
-            <Formik
-              validationSchema={validationSchema}
-              initialValues={{
-                filterCategory: '',
-                comparison: '',
-                filterValue: '',
-              }}
-              onSubmit={(values, { resetForm }) => {
-                setFilters([
-                  ...new Map(
-                    [...filters, values].map((item) => {
-                      if (item['filterCategory'] !== 'TAGS')
-                        return [item['filterCategory'], item]
-                      else return [item['filterValue'], item]
-                    }),
-                  ).values(),
-                ])
-                resetForm()
-              }}
-            >
-              {({ handleChange, handleSubmit, values, errors }) => {
-                return (
-                  <form
-                    onSubmit={handleSubmit}
-                    role="form"
-                    aria-label="form"
-                    name="form"
-                  >
-                    <Flex align="center">
-                      <Text fontWeight="bold" mr="2">
-                        <Trans>Filters:</Trans>
-                      </Text>
-                      <Box maxW="25%" mx="1">
-                        <Select
-                          name="filterCategory"
-                          borderColor="black"
-                          onChange={(e) => {
-                            if (
-                              (values.filterCategory === 'TAGS' &&
-                                e.target.value !== 'TAGS') ||
-                              (values.filterCategory !== 'TAGS' &&
-                                e.target.value === 'TAGS')
-                            ) {
-                              values.filterValue = ''
-                            }
-                            handleChange(e)
-                          }}
-                        >
-                          <option hidden value="">
-                            <Trans>Value</Trans>
-                          </option>
-                          {orderByOptions.map(({ value, text }, idx) => {
-                            return (
-                              <option key={idx} value={value}>
-                                {text}
-                              </option>
-                            )
-                          })}
-                          <option value="TAGS">
-                            <Trans>Tag</Trans>
-                          </option>
-                        </Select>
-                        <Text color="red.500" mt={0}>
-                          {errors.filterCategory}
-                        </Text>
-                      </Box>
-                      <Box maxW="25%" mx="1">
-                        <Select
-                          name="comparison"
-                          borderColor="black"
-                          onChange={handleChange}
-                        >
-                          <option hidden value="">
-                            <Trans>Comparison</Trans>
+      <Box px="2" py="2">
+        <Formik
+          validationSchema={validationSchema}
+          initialValues={{
+            filterCategory: '',
+            comparison: '',
+            filterValue: '',
+          }}
+          onSubmit={(values, { resetForm }) => {
+            setFilters([
+              ...new Map(
+                [...filters, values].map((item) => {
+                  if (item['filterCategory'] !== 'TAGS')
+                    return [item['filterCategory'], item]
+                  else return [item['filterValue'], item]
+                }),
+              ).values(),
+            ])
+            resetForm()
+          }}
+        >
+          {({ handleChange, handleSubmit, values, errors }) => {
+            return (
+              <form
+                onSubmit={handleSubmit}
+                role="form"
+                aria-label="form"
+                name="form"
+              >
+                <Flex align="center">
+                  <Text fontWeight="bold" mr="2">
+                    <Trans>Filters:</Trans>
+                  </Text>
+                  <Box maxW="25%" mx="1">
+                    <Select
+                      name="filterCategory"
+                      borderColor="black"
+                      onChange={(e) => {
+                        if (
+                          (values.filterCategory === 'TAGS' &&
+                            e.target.value !== 'TAGS') ||
+                          (values.filterCategory !== 'TAGS' &&
+                            e.target.value === 'TAGS')
+                        ) {
+                          values.filterValue = ''
+                        }
+                        handleChange(e)
+                      }}
+                    >
+                      <option hidden value="">
+                        <Trans>Value</Trans>
+                      </option>
+                      {orderByOptions.map(({ value, text }, idx) => {
+                        return (
+                          <option key={idx} value={value}>
+                            {text}
                           </option>
-                          <option value="EQUAL">
-                            <Trans>EQUALS</Trans>
+                        )
+                      })}
+                      <option value="TAGS">
+                        <Trans>Tag</Trans>
+                      </option>
+                    </Select>
+                    <Text color="red.500" mt={0}>
+                      {errors.filterCategory}
+                    </Text>
+                  </Box>
+                  <Box maxW="25%" mx="1">
+                    <Select
+                      name="comparison"
+                      borderColor="black"
+                      onChange={handleChange}
+                    >
+                      <option hidden value="">
+                        <Trans>Comparison</Trans>
+                      </option>
+                      <option value="EQUAL">
+                        <Trans>EQUALS</Trans>
+                      </option>
+                      <option value="NOT_EQUAL">
+                        <Trans>DOES NOT EQUAL</Trans>
+                      </option>
+                    </Select>
+                    <Text color="red.500" mt={0}>
+                      {errors.comparison}
+                    </Text>
+                  </Box>
+                  <Box maxW="25%" mx="1">
+                    <Select
+                      name="filterValue"
+                      borderColor="black"
+                      onChange={handleChange}
+                    >
+                      <option hidden value="">
+                        <Trans>Status or tag</Trans>
+                      </option>
+                      {values.filterCategory === 'TAGS' ? (
+                        filterTagOptions.map(({ value, text }, idx) => {
+                          return (
+                            <option key={idx} value={value}>
+                              {text}
+                            </option>
+                          )
+                        })
+                      ) : (
+                        <>
+                          <option value="PASS">
+                            <Trans>Pass</Trans>
                           </option>
-                          <option value="NOT_EQUAL">
-                            <Trans>DOES NOT EQUAL</Trans>
+                          <option value="INFO">
+                            <Trans>Info</Trans>
                           </option>
-                        </Select>
-                        <Text color="red.500" mt={0}>
-                          {errors.comparison}
-                        </Text>
-                      </Box>
-                      <Box maxW="25%" mx="1">
-                        <Select
-                          name="filterValue"
-                          borderColor="black"
-                          onChange={handleChange}
-                        >
-                          <option hidden value="">
-                            <Trans>Status or tag</Trans>
+                          <option value="FAIL">
+                            <Trans>Fail</Trans>
                           </option>
-                          {values.filterCategory === 'TAGS' ? (
-                            filterTagOptions.map(({ value, text }, idx) => {
-                              return (
-                                <option key={idx} value={value}>
-                                  {text}
-                                </option>
-                              )
-                            })
-                          ) : (
-                            <>
-                              <option value="PASS">
-                                <Trans>Pass</Trans>
-                              </option>
-                              <option value="INFO">
-                                <Trans>Info</Trans>
-                              </option>
-                              <option value="FAIL">
-                                <Trans>Fail</Trans>
-                              </option>
-                            </>
-                          )}
-                        </Select>
-                        <Text color="red.500" mt={0}>
-                          {errors.filterValue}
-                        </Text>
-                      </Box>
-                      <Button ml="auto" variant="primary" type="submit">
-                        <Trans>Apply</Trans>
-                      </Button>
-                    </Flex>
-                  </form>
-                )
-              }}
-            </Formik>
-          </Box>
-        </ABTestVariant>
-      </ABTestingWrapper>
+                        </>
+                      )}
+                    </Select>
+                    <Text color="red.500" mt={0}>
+                      {errors.filterValue}
+                    </Text>
+                  </Box>
+                  <Button ml="auto" variant="primary" type="submit">
+                    <Trans>Apply</Trans>
+                  </Button>
+                </Flex>
+              </form>
+            )
+          }}
+        </Formik>
+      </Box>
       <ListOf
         elements={nodes}
         ifEmpty={() => (
@@ -353,74 +347,68 @@ export function OrganizationDomains({ orgSlug }) {
 
       <SubdomainWarning mb="4" />
 
-      <ABTestingWrapper insiderVariantName="B">
-        <ABTestVariant name="B">
-          <Flex align="center" mb="2">
-            {filters.map(({ filterCategory, comparison, filterValue }, idx) => {
-              const statuses = {
-                HTTPS_STATUS: `HTTPS`,
-                HSTS_STATUS: `HSTS`,
-                CIPHERS_STATUS: `Ciphers`,
-                CURVES_STATUS: t`Curves`,
-                PROTOCOLS_STATUS: t`Protocols`,
-                SPF_STATUS: `SPF`,
-                DKIM_STATUS: `DKIM`,
-                DMARC_STATUS: `DMARC`,
+      <Flex align="center" mb="2">
+        {filters.map(({ filterCategory, comparison, filterValue }, idx) => {
+          const statuses = {
+            HTTPS_STATUS: `HTTPS`,
+            HSTS_STATUS: `HSTS`,
+            CIPHERS_STATUS: `Ciphers`,
+            CURVES_STATUS: t`Curves`,
+            PROTOCOLS_STATUS: t`Protocols`,
+            SPF_STATUS: `SPF`,
+            DKIM_STATUS: `DKIM`,
+            DMARC_STATUS: `DMARC`,
+          }
+          return (
+            <Tag
+              fontSize="lg"
+              borderWidth="1px"
+              borderColor="gray.300"
+              key={idx}
+              mx="1"
+              my="1"
+              bg={
+                filterValue === 'PASS'
+                  ? 'strongMuted'
+                  : filterValue === 'FAIL'
+                  ? 'weakMuted'
+                  : filterValue === 'INFO'
+                  ? 'infoMuted'
+                  : 'gray.100'
               }
-              return (
-                <Tag
-                  fontSize="lg"
-                  borderWidth="1px"
-                  borderColor="gray.300"
-                  key={idx}
-                  mx="1"
-                  my="1"
-                  bg={
-                    filterValue === 'PASS'
-                      ? 'strongMuted'
-                      : filterValue === 'FAIL'
-                      ? 'weakMuted'
-                      : filterValue === 'INFO'
-                      ? 'infoMuted'
-                      : 'gray.100'
-                  }
-                >
-                  {comparison === 'NOT_EQUAL' && <Text mr="1">!</Text>}
-                  {filterCategory === 'TAGS' ? (
-                    <TagLabel>{filterValue}</TagLabel>
-                  ) : (
-                    <>
-                      <TagLabel>{statuses[filterCategory]}</TagLabel>
-                      <TagRightIcon
-                        color={
-                          filterValue === 'PASS'
-                            ? 'strong'
-                            : filterValue === 'FAIL'
-                            ? 'weak'
-                            : 'info'
-                        }
-                        as={
-                          filterValue === 'PASS'
-                            ? CheckCircleIcon
-                            : filterValue === 'FAIL'
-                            ? WarningIcon
-                            : InfoIcon
-                        }
-                      />
-                    </>
-                  )}
-
-                  <TagCloseButton
-                    onClick={() =>
-                      setFilters(filters.filter((_, i) => i !== idx))
+            >
+              {comparison === 'NOT_EQUAL' && <Text mr="1">!</Text>}
+              {filterCategory === 'TAGS' ? (
+                <TagLabel>{filterValue}</TagLabel>
+              ) : (
+                <>
+                  <TagLabel>{statuses[filterCategory]}</TagLabel>
+                  <TagRightIcon
+                    color={
+                      filterValue === 'PASS'
+                        ? 'strong'
+                        : filterValue === 'FAIL'
+                        ? 'weak'
+                        : 'info'
+                    }
+                    as={
+                      filterValue === 'PASS'
+                        ? CheckCircleIcon
+                        : filterValue === 'FAIL'
+                        ? WarningIcon
+                        : InfoIcon
                     }
                   />
-                </Tag>
-              )
-            })}
-          </Flex>
-        </ABTestVariant>
-      </ABTestingWrapper>
+                </>
+              )}
+
+              <TagCloseButton
+                onClick={() => setFilters(filters.filter((_, i) => i !== idx))}
+              />
+            </Tag>
+          )
+        })}
+      </Flex>
 
       {domainList}
 

From 9aa07a11fe9524a9bab68258e8d444901bee96a5 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Fri, 31 Mar 2023 14:17:38 -0300
Subject: [PATCH 02/14] allow hidden domains to be counted in summaries

---
 services/summaries/summaries.py | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/services/summaries/summaries.py b/services/summaries/summaries.py
index ca88a4e1c8..9682d0d67f 100644
--- a/services/summaries/summaries.py
+++ b/services/summaries/summaries.py
@@ -25,22 +25,6 @@
 
 logging.basicConfig(stream=sys.stdout, level=logging.INFO)
 
-def is_domain_hidden(domain, db):
-    """Check if a domain is hidden
-
-    :param domain: domain to check
-    :param db: active arangodb connection
-    :return: True if domain is hidden, False otherwise
-    """
-
-    claims = db.collection("claims").find({"_to": domain["_id"]})
-    for claim in claims:
-        hidden = claim.get("hidden")
-        if hidden != None and hidden == True:
-            return True
-    return False
-
-
 def update_scan_summaries(host=DB_HOST, name=DB_NAME, user=DB_USER,
                           password=DB_PASS, port=DB_PORT):
     logging.info(f"Updating scan summaries...")
@@ -56,8 +40,7 @@ def update_scan_summaries(host=DB_HOST, name=DB_NAME, user=DB_USER,
         scan_total = 0
         for domain in db.collection("domains"):
             archived = domain.get("archived")
-            hidden = is_domain_hidden(domain, db)
-            if archived != True and hidden != True:
+            if archived != True:
                 # We don't want to count domains not passing or failing
                 # (i.e unreachable or unscanned) towards the total.
                 if domain.get("status", {}).get(scan_type) == "fail":
@@ -116,8 +99,7 @@ def update_dmarc_phase_chart_summaries(db):
 
     for domain in db.collection("domains"):
         archived = domain.get("archived")
-        hidden = is_domain_hidden(domain, db)
-        if archived != True and hidden != True:
+        if archived != True:
             phase = domain.get("phase")
 
             if phase is None:
@@ -186,8 +168,7 @@ def update_chart_summaries(host=DB_HOST, name=DB_NAME, user=DB_USER,
         domain_total = 0
         for domain in db.collection("domains"):
             archived = domain.get("archived")
-            hidden = is_domain_hidden(domain, db)
-            if archived != True and hidden != True:
+            if archived != True:
                 category_status = []
                 for scan_type in scan_types:
                     category_status.append(domain.get("status", {}).get(scan_type))

From 1238020ac613417af40ede421cba2c1789ca45c1 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Fri, 31 Mar 2023 14:18:00 -0300
Subject: [PATCH 03/14] allow org admins to see hidden domains

---
 .../loaders/load-domain-connections-by-organizations-id.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/domain/loaders/load-domain-connections-by-organizations-id.js b/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
index 78bd474cda..aa10ca0705 100644
--- a/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
+++ b/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
@@ -428,7 +428,7 @@ export const loadDomainConnectionsByOrgId =
       showArchivedDomains = aql``
     }
     let showHiddenDomains = aql`FILTER e.hidden != true`
-    if (permission === 'super_admin') {
+    if (['admin', 'super_admin'].includes(permission)) {
       showHiddenDomains = aql``
     }
 

From 3de48ef9b6f8c1fadc1c6b86df6362b80689e084 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Fri, 31 Mar 2023 15:18:51 -0300
Subject: [PATCH 04/14] don't show domain filters on myTracker page

---
 .../OrganizationDomains.js                    | 378 +++++++++---------
 1 file changed, 192 insertions(+), 186 deletions(-)

diff --git a/frontend/src/organizationDetails/OrganizationDomains.js b/frontend/src/organizationDetails/OrganizationDomains.js
index 9792134a0e..950a30d59d 100644
--- a/frontend/src/organizationDetails/OrganizationDomains.js
+++ b/frontend/src/organizationDetails/OrganizationDomains.js
@@ -123,137 +123,139 @@ export function OrganizationDomains({ orgSlug }) {
     </LoadingMessage>
   ) : (
     <Box>
-      <Box px="2" py="2">
-        <Formik
-          validationSchema={validationSchema}
-          initialValues={{
-            filterCategory: '',
-            comparison: '',
-            filterValue: '',
-          }}
-          onSubmit={(values, { resetForm }) => {
-            setFilters([
-              ...new Map(
-                [...filters, values].map((item) => {
-                  if (item['filterCategory'] !== 'TAGS')
-                    return [item['filterCategory'], item]
-                  else return [item['filterValue'], item]
-                }),
-              ).values(),
-            ])
-            resetForm()
-          }}
-        >
-          {({ handleChange, handleSubmit, values, errors }) => {
-            return (
-              <form
-                onSubmit={handleSubmit}
-                role="form"
-                aria-label="form"
-                name="form"
-              >
-                <Flex align="center">
-                  <Text fontWeight="bold" mr="2">
-                    <Trans>Filters:</Trans>
-                  </Text>
-                  <Box maxW="25%" mx="1">
-                    <Select
-                      name="filterCategory"
-                      borderColor="black"
-                      onChange={(e) => {
-                        if (
-                          (values.filterCategory === 'TAGS' &&
-                            e.target.value !== 'TAGS') ||
-                          (values.filterCategory !== 'TAGS' &&
-                            e.target.value === 'TAGS')
-                        ) {
-                          values.filterValue = ''
-                        }
-                        handleChange(e)
-                      }}
-                    >
-                      <option hidden value="">
-                        <Trans>Value</Trans>
-                      </option>
-                      {orderByOptions.map(({ value, text }, idx) => {
-                        return (
-                          <option key={idx} value={value}>
-                            {text}
-                          </option>
-                        )
-                      })}
-                      <option value="TAGS">
-                        <Trans>Tag</Trans>
-                      </option>
-                    </Select>
-                    <Text color="red.500" mt={0}>
-                      {errors.filterCategory}
-                    </Text>
-                  </Box>
-                  <Box maxW="25%" mx="1">
-                    <Select
-                      name="comparison"
-                      borderColor="black"
-                      onChange={handleChange}
-                    >
-                      <option hidden value="">
-                        <Trans>Comparison</Trans>
-                      </option>
-                      <option value="EQUAL">
-                        <Trans>EQUALS</Trans>
-                      </option>
-                      <option value="NOT_EQUAL">
-                        <Trans>DOES NOT EQUAL</Trans>
-                      </option>
-                    </Select>
-                    <Text color="red.500" mt={0}>
-                      {errors.comparison}
+      {orgSlug !== 'my-tracker' && (
+        <Box px="2" py="2">
+          <Formik
+            validationSchema={validationSchema}
+            initialValues={{
+              filterCategory: '',
+              comparison: '',
+              filterValue: '',
+            }}
+            onSubmit={(values, { resetForm }) => {
+              setFilters([
+                ...new Map(
+                  [...filters, values].map((item) => {
+                    if (item['filterCategory'] !== 'TAGS')
+                      return [item['filterCategory'], item]
+                    else return [item['filterValue'], item]
+                  }),
+                ).values(),
+              ])
+              resetForm()
+            }}
+          >
+            {({ handleChange, handleSubmit, values, errors }) => {
+              return (
+                <form
+                  onSubmit={handleSubmit}
+                  role="form"
+                  aria-label="form"
+                  name="form"
+                >
+                  <Flex align="center">
+                    <Text fontWeight="bold" mr="2">
+                      <Trans>Filters:</Trans>
                     </Text>
-                  </Box>
-                  <Box maxW="25%" mx="1">
-                    <Select
-                      name="filterValue"
-                      borderColor="black"
-                      onChange={handleChange}
-                    >
-                      <option hidden value="">
-                        <Trans>Status or tag</Trans>
-                      </option>
-                      {values.filterCategory === 'TAGS' ? (
-                        filterTagOptions.map(({ value, text }, idx) => {
+                    <Box maxW="25%" mx="1">
+                      <Select
+                        name="filterCategory"
+                        borderColor="black"
+                        onChange={(e) => {
+                          if (
+                            (values.filterCategory === 'TAGS' &&
+                              e.target.value !== 'TAGS') ||
+                            (values.filterCategory !== 'TAGS' &&
+                              e.target.value === 'TAGS')
+                          ) {
+                            values.filterValue = ''
+                          }
+                          handleChange(e)
+                        }}
+                      >
+                        <option hidden value="">
+                          <Trans>Value</Trans>
+                        </option>
+                        {orderByOptions.map(({ value, text }, idx) => {
                           return (
                             <option key={idx} value={value}>
                               {text}
                             </option>
                           )
-                        })
-                      ) : (
-                        <>
-                          <option value="PASS">
-                            <Trans>Pass</Trans>
-                          </option>
-                          <option value="INFO">
-                            <Trans>Info</Trans>
-                          </option>
-                          <option value="FAIL">
-                            <Trans>Fail</Trans>
-                          </option>
-                        </>
-                      )}
-                    </Select>
-                    <Text color="red.500" mt={0}>
-                      {errors.filterValue}
-                    </Text>
-                  </Box>
-                  <Button ml="auto" variant="primary" type="submit">
-                    <Trans>Apply</Trans>
-                  </Button>
-                </Flex>
-              </form>
-            )
-          }}
-        </Formik>
-      </Box>
+                        })}
+                        <option value="TAGS">
+                          <Trans>Tag</Trans>
+                        </option>
+                      </Select>
+                      <Text color="red.500" mt={0}>
+                        {errors.filterCategory}
+                      </Text>
+                    </Box>
+                    <Box maxW="25%" mx="1">
+                      <Select
+                        name="comparison"
+                        borderColor="black"
+                        onChange={handleChange}
+                      >
+                        <option hidden value="">
+                          <Trans>Comparison</Trans>
+                        </option>
+                        <option value="EQUAL">
+                          <Trans>EQUALS</Trans>
+                        </option>
+                        <option value="NOT_EQUAL">
+                          <Trans>DOES NOT EQUAL</Trans>
+                        </option>
+                      </Select>
+                      <Text color="red.500" mt={0}>
+                        {errors.comparison}
+                      </Text>
+                    </Box>
+                    <Box maxW="25%" mx="1">
+                      <Select
+                        name="filterValue"
+                        borderColor="black"
+                        onChange={handleChange}
+                      >
+                        <option hidden value="">
+                          <Trans>Status or tag</Trans>
+                        </option>
+                        {values.filterCategory === 'TAGS' ? (
+                          filterTagOptions.map(({ value, text }, idx) => {
+                            return (
+                              <option key={idx} value={value}>
+                                {text}
+                              </option>
+                            )
+                          })
+                        ) : (
+                          <>
+                            <option value="PASS">
+                              <Trans>Pass</Trans>
+                            </option>
+                            <option value="INFO">
+                              <Trans>Info</Trans>
+                            </option>
+                            <option value="FAIL">
+                              <Trans>Fail</Trans>
+                            </option>
+                          </>
+                        )}
+                      </Select>
+                      <Text color="red.500" mt={0}>
+                        {errors.filterValue}
+                      </Text>
+                    </Box>
+                    <Button ml="auto" variant="primary" type="submit">
+                      <Trans>Apply</Trans>
+                    </Button>
+                  </Flex>
+                </form>
+              )
+            }}
+          </Formik>
+        </Box>
+      )}
       <ListOf
         elements={nodes}
         ifEmpty={() => (
@@ -347,68 +349,72 @@ export function OrganizationDomains({ orgSlug }) {
 
       <SubdomainWarning mb="4" />
 
-      <Flex align="center" mb="2">
-        {filters.map(({ filterCategory, comparison, filterValue }, idx) => {
-          const statuses = {
-            HTTPS_STATUS: `HTTPS`,
-            HSTS_STATUS: `HSTS`,
-            CIPHERS_STATUS: `Ciphers`,
-            CURVES_STATUS: t`Curves`,
-            PROTOCOLS_STATUS: t`Protocols`,
-            SPF_STATUS: `SPF`,
-            DKIM_STATUS: `DKIM`,
-            DMARC_STATUS: `DMARC`,
-          }
-          return (
-            <Tag
-              fontSize="lg"
-              borderWidth="1px"
-              borderColor="gray.300"
-              key={idx}
-              mx="1"
-              my="1"
-              bg={
-                filterValue === 'PASS'
-                  ? 'strongMuted'
-                  : filterValue === 'FAIL'
-                  ? 'weakMuted'
-                  : filterValue === 'INFO'
-                  ? 'infoMuted'
-                  : 'gray.100'
-              }
-            >
-              {comparison === 'NOT_EQUAL' && <Text mr="1">!</Text>}
-              {filterCategory === 'TAGS' ? (
-                <TagLabel>{filterValue}</TagLabel>
-              ) : (
-                <>
-                  <TagLabel>{statuses[filterCategory]}</TagLabel>
-                  <TagRightIcon
-                    color={
-                      filterValue === 'PASS'
-                        ? 'strong'
-                        : filterValue === 'FAIL'
-                        ? 'weak'
-                        : 'info'
-                    }
-                    as={
-                      filterValue === 'PASS'
-                        ? CheckCircleIcon
-                        : filterValue === 'FAIL'
-                        ? WarningIcon
-                        : InfoIcon
-                    }
-                  />
-                </>
-              )}
+      {orgSlug !== 'my-tracker' && (
+        <Flex align="center" mb="2">
+          {filters.map(({ filterCategory, comparison, filterValue }, idx) => {
+            const statuses = {
+              HTTPS_STATUS: `HTTPS`,
+              HSTS_STATUS: `HSTS`,
+              CIPHERS_STATUS: `Ciphers`,
+              CURVES_STATUS: t`Curves`,
+              PROTOCOLS_STATUS: t`Protocols`,
+              SPF_STATUS: `SPF`,
+              DKIM_STATUS: `DKIM`,
+              DMARC_STATUS: `DMARC`,
+            }
+            return (
+              <Tag
+                fontSize="lg"
+                borderWidth="1px"
+                borderColor="gray.300"
+                key={idx}
+                mx="1"
+                my="1"
+                bg={
+                  filterValue === 'PASS'
+                    ? 'strongMuted'
+                    : filterValue === 'FAIL'
+                    ? 'weakMuted'
+                    : filterValue === 'INFO'
+                    ? 'infoMuted'
+                    : 'gray.100'
+                }
+              >
+                {comparison === 'NOT_EQUAL' && <Text mr="1">!</Text>}
+                {filterCategory === 'TAGS' ? (
+                  <TagLabel>{filterValue}</TagLabel>
+                ) : (
+                  <>
+                    <TagLabel>{statuses[filterCategory]}</TagLabel>
+                    <TagRightIcon
+                      color={
+                        filterValue === 'PASS'
+                          ? 'strong'
+                          : filterValue === 'FAIL'
+                          ? 'weak'
+                          : 'info'
+                      }
+                      as={
+                        filterValue === 'PASS'
+                          ? CheckCircleIcon
+                          : filterValue === 'FAIL'
+                          ? WarningIcon
+                          : InfoIcon
+                      }
+                    />
+                  </>
+                )}
 
-              <TagCloseButton
-                onClick={() => setFilters(filters.filter((_, i) => i !== idx))}
-              />
-            </Tag>
-          )
-        })}
-      </Flex>
+                <TagCloseButton
+                  onClick={() =>
+                    setFilters(filters.filter((_, i) => i !== idx))
+                  }
+                />
+              </Tag>
+            )
+          })}
+        </Flex>
+      )}
 
       {domainList}
 

From 36a5dbd3435184a9b3d4976c87667472a51778ce Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Fri, 31 Mar 2023 15:21:15 -0300
Subject: [PATCH 05/14] move myTracker to the A stream

---
 frontend/src/app/App.js            | 19 ++++--------
 frontend/src/domains/DomainCard.js | 46 +++++++++++++-----------------
 2 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/frontend/src/app/App.js b/frontend/src/app/App.js
index 3db3a3aa7c..e272abbf3f 100644
--- a/frontend/src/app/App.js
+++ b/frontend/src/app/App.js
@@ -29,8 +29,6 @@ import { LandingPage } from '../landing/LandingPage'
 import { NotificationBanner } from './NotificationBanner'
 import { IS_LOGIN_REQUIRED } from '../graphql/queries'
 import { useLingui } from '@lingui/react'
-import { ABTestingWrapper } from './ABTestWrapper'
-import { ABTestVariant } from './ABTestVariant'
 
 const GuidancePage = lazyWithRetry(() => import('../guidance/GuidancePage'))
 const PageNotFound = lazyWithRetry(() => import('./PageNotFound'))
@@ -118,13 +116,10 @@ export function App() {
 
         {isLoggedIn() && (
           <>
-            <ABTestingWrapper insiderVariantName="B">
-              <ABTestVariant name="B">
-                <RouteLink to="/my-tracker">
-                  <Trans>myTracker</Trans>
-                </RouteLink>
-              </ABTestVariant>
-            </ABTestingWrapper>
+            <RouteLink to="/my-tracker">
+              <Trans>myTracker</Trans>
+            </RouteLink>
+
             <RouteLink to="/user">
               <Trans>Account Settings</Trans>
             </RouteLink>
@@ -346,11 +341,7 @@ export function App() {
 
             <Page path="/my-tracker/:activeTab?" title={t`myTracker`}>
               {isLoggedIn() ? (
-                <ABTestingWrapper insiderVariantName="B">
-                  <ABTestVariant name="B">
-                    <MyTrackerPage />
-                  </ABTestVariant>
-                </ABTestingWrapper>
+                <MyTrackerPage />
               ) : (
                 <Redirect
                   to={{
diff --git a/frontend/src/domains/DomainCard.js b/frontend/src/domains/DomainCard.js
index 33c946ff7b..1604d207b5 100644
--- a/frontend/src/domains/DomainCard.js
+++ b/frontend/src/domains/DomainCard.js
@@ -22,8 +22,6 @@ import { StarIcon } from '@chakra-ui/icons'
 import { FAVOURITE_DOMAIN, UNFAVOURITE_DOMAIN } from '../graphql/mutations'
 import { useMutation } from '@apollo/client'
 import { useUserVar } from '../utilities/userState'
-import { ABTestingWrapper } from '../app/ABTestWrapper'
-import { ABTestVariant } from '../app/ABTestVariant'
 
 export function DomainCard({
   id,
@@ -219,30 +217,26 @@ export function DomainCard({
         </Stack>
         <Stack ml={4}>
           <ScanDomainButton domainUrl={url} />
-          <ABTestingWrapper insiderVariantName="B">
-            <ABTestVariant name="B">
-              {isLoggedIn() &&
-                (location.pathname.match('my-tracker') ? (
-                  <IconButton
-                    onClick={async () => {
-                      await unfavouriteDomain({ variables: { domainId: id } })
-                    }}
-                    variant="primary"
-                    aria-label={`unfavourite ${url}`}
-                    icon={<StarIcon color="moderate" />}
-                  />
-                ) : (
-                  <IconButton
-                    onClick={async () => {
-                      await favouriteDomain({ variables: { domainId: id } })
-                    }}
-                    variant="primary"
-                    aria-label={`favourite ${url}`}
-                    icon={<StarIcon />}
-                  />
-                ))}
-            </ABTestVariant>
-          </ABTestingWrapper>
+          {isLoggedIn() &&
+            (location.pathname.match('my-tracker') ? (
+              <IconButton
+                onClick={async () => {
+                  await unfavouriteDomain({ variables: { domainId: id } })
+                }}
+                variant="primary"
+                aria-label={`unfavourite ${url}`}
+                icon={<StarIcon color="moderate" />}
+              />
+            ) : (
+              <IconButton
+                onClick={async () => {
+                  await favouriteDomain({ variables: { domainId: id } })
+                }}
+                variant="primary"
+                aria-label={`favourite ${url}`}
+                icon={<StarIcon />}
+              />
+            ))}
         </Stack>
       </Flex>
     </ListItem>

From 25265c96baf4e20f1124ec0cd0e640c3527870ae Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Fri, 31 Mar 2023 15:23:50 -0300
Subject: [PATCH 06/14] move activity logs to A stream

---
 frontend/src/admin/AdminPanel.js | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/frontend/src/admin/AdminPanel.js b/frontend/src/admin/AdminPanel.js
index b445913d39..ce2337721a 100644
--- a/frontend/src/admin/AdminPanel.js
+++ b/frontend/src/admin/AdminPanel.js
@@ -16,8 +16,6 @@ import { UserList } from './UserList'
 
 import { ErrorFallbackMessage } from '../components/ErrorFallbackMessage'
 import { AuditLogTable } from './AuditLogTable'
-import { ABTestingWrapper } from '../app/ABTestWrapper'
-import { ABTestVariant } from '../app/ABTestVariant'
 
 export function AdminPanel({ activeMenu, orgSlug, permission, orgId }) {
   return (
@@ -30,13 +28,9 @@ export function AdminPanel({ activeMenu, orgSlug, permission, orgId }) {
           <Tab borderTopWidth="4px">
             <Trans>Users</Trans>
           </Tab>
-          <ABTestingWrapper insiderVariantName="B">
-            <ABTestVariant name="B">
-              <Tab borderTopWidth="4px">
-                <Trans>Activity</Trans>
-              </Tab>
-            </ABTestVariant>
-          </ABTestingWrapper>
+          <Tab borderTopWidth="4px">
+            <Trans>Activity</Trans>
+          </Tab>
         </TabList>
 
         <TabPanels>
@@ -62,13 +56,9 @@ export function AdminPanel({ activeMenu, orgSlug, permission, orgId }) {
             </ErrorBoundary>
           </TabPanel>
           <TabPanel>
-            <ABTestingWrapper insiderVariantName="B">
-              <ABTestVariant name="B">
-                <ErrorBoundary FallbackComponent={ErrorFallbackMessage}>
-                  <AuditLogTable orgId={orgId} />
-                </ErrorBoundary>
-              </ABTestVariant>
-            </ABTestingWrapper>
+            <ErrorBoundary FallbackComponent={ErrorFallbackMessage}>
+              <AuditLogTable orgId={orgId} />
+            </ErrorBoundary>
           </TabPanel>
         </TabPanels>
       </Tabs>

From bd1f9089c528e39977bf82c47ca8a732c0a7195e Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Mon, 3 Apr 2023 09:05:55 -0300
Subject: [PATCH 07/14] fix AdminDomains test

---
 frontend/src/admin/__tests__/AdminDomains.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/admin/__tests__/AdminDomains.test.js b/frontend/src/admin/__tests__/AdminDomains.test.js
index 437523adf6..e035332e1c 100644
--- a/frontend/src/admin/__tests__/AdminDomains.test.js
+++ b/frontend/src/admin/__tests__/AdminDomains.test.js
@@ -279,7 +279,7 @@ describe('<AdminDomains />', () => {
       userEvent.click(confirmButton)
 
       await waitFor(() =>
-        expect(getByText(/Unable to create new domain./i)).toBeVisible(),
+        expect(getByText(/Unable to create new domain./i)).toBeInTheDocument(),
       )
     })
 

From ca11cdb6c3c6e63f7b16c779a8d1370de0efd665 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Mon, 3 Apr 2023 12:44:55 -0300
Subject: [PATCH 08/14] add dismissable alert banner

---
 frontend/src/app/App.js | 44 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/App.js b/frontend/src/app/App.js
index e272abbf3f..dbf9131b80 100644
--- a/frontend/src/app/App.js
+++ b/frontend/src/app/App.js
@@ -5,7 +5,18 @@ import {
   Redirect,
   useLocation,
 } from 'react-router-dom'
-import { CSSReset, Flex, Link, Text } from '@chakra-ui/react'
+import {
+  Alert,
+  AlertIcon,
+  AlertTitle,
+  Box,
+  CloseButton,
+  CSSReset,
+  Flex,
+  Link,
+  Text,
+  useDisclosure,
+} from '@chakra-ui/react'
 import { t, Trans } from '@lingui/macro'
 import { ErrorBoundary } from 'react-error-boundary'
 import { useQuery } from '@apollo/client'
@@ -75,6 +86,7 @@ export function App() {
     useUserVar()
   const { i18n } = useLingui()
   const { data } = useQuery(IS_LOGIN_REQUIRED, {})
+  const { isOpen: isVisible, onClose } = useDisclosure({ defaultIsOpen: true })
   const location = useLocation()
 
   // Close websocket on user jwt change (refresh/logout)
@@ -163,6 +175,36 @@ export function App() {
           </Text>
         </NotificationBanner>
       )}
+      {isVisible && (
+        <Alert status="warning" variant="left-accent" mx="4" my="2" maxW="98%">
+          <AlertIcon />
+          <Box>
+            <AlertTitle>
+              <Trans>Attention Tracker Users</Trans>
+            </AlertTitle>
+            <Text>
+              <Trans>
+                In an effort to consolidate a complete list of digital services
+                across the GC, new domains will be added to all organizations.
+                To allow organization admins time to react to this change, new
+                domains will be tagged as "new" for easy identification and
+                hidden from affecting summary scores. For more information,{' '}
+                <Link color="blue.600" href="">
+                  see the full blog post here
+                </Link>
+                . Thank you for helping make GC cyber space safer for all.
+              </Trans>
+            </Text>
+          </Box>
+          <CloseButton
+            alignSelf="flex-start"
+            position="relative"
+            right={-1}
+            top={-1}
+            onClick={onClose}
+          />
+        </Alert>
+      )}
 
       <Main mb={{ base: '40px', md: 'none' }}>
         <Suspense fallback={<LoadingMessage />}>

From 23344251c47bf58152d7da3ea8f5229dbf4309c7 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Thu, 20 Apr 2023 16:35:30 -0300
Subject: [PATCH 09/14] put ABTestVariant inside Wrapper file

---
 frontend/src/app/ABTestVariant.js  | 10 ----------
 frontend/src/app/ABTestWrapper.js  | 15 +++++++++------
 frontend/src/app/TopBanner.js      | 24 ++++--------------------
 frontend/src/domains/DomainCard.js |  3 +--
 4 files changed, 14 insertions(+), 38 deletions(-)
 delete mode 100644 frontend/src/app/ABTestVariant.js

diff --git a/frontend/src/app/ABTestVariant.js b/frontend/src/app/ABTestVariant.js
deleted file mode 100644
index 03a2d305c8..0000000000
--- a/frontend/src/app/ABTestVariant.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react'
-import { any } from 'prop-types'
-
-export function ABTestVariant({ children }) {
-  return <>{children}</>
-}
-
-ABTestVariant.propTypes = {
-  children: any,
-}
diff --git a/frontend/src/app/ABTestWrapper.js b/frontend/src/app/ABTestWrapper.js
index 25660a0be3..8b5e8dcd9f 100644
--- a/frontend/src/app/ABTestWrapper.js
+++ b/frontend/src/app/ABTestWrapper.js
@@ -6,6 +6,10 @@ const isInsiderUser = ({ userName, insideUser }) => {
   return userName.endsWith('@tbs-sct.gc.ca') || insideUser
 }
 
+export function ABTestVariant({ children }) {
+  return <>{children}</>
+}
+
 export function ABTestingWrapper({ children, insiderVariantName = 'B' }) {
   const { currentUser } = useUserVar()
   let childIndex = 0
@@ -32,17 +36,16 @@ export function ABTestingWrapper({ children, insiderVariantName = 'B' }) {
       insideUser: currentUser?.insideUser || false,
     })
   ) {
-    childIndex = children.findIndex(
-      (variant) => variant.props.name === insiderVariantName,
-    )
+    childIndex = children.findIndex((variant) => variant.props.name === insiderVariantName)
   } else {
-    childIndex = children.findIndex(
-      (variant) => variant.props.name !== insiderVariantName,
-    )
+    childIndex = children.findIndex((variant) => variant.props.name !== insiderVariantName)
   }
   return <>{children[childIndex]}</>
 }
 
+ABTestVariant.propTypes = {
+  children: any,
+}
 ABTestingWrapper.propTypes = {
   insiderVariantName: string,
   children: any,
diff --git a/frontend/src/app/TopBanner.js b/frontend/src/app/TopBanner.js
index 986dec746d..69421487de 100644
--- a/frontend/src/app/TopBanner.js
+++ b/frontend/src/app/TopBanner.js
@@ -16,8 +16,7 @@ import { useUserVar } from '../utilities/userState'
 import { SIGN_OUT } from '../graphql/mutations'
 import { PhaseBanner } from './PhaseBanner'
 import { useLingui } from '@lingui/react'
-import { ABTestingWrapper } from './ABTestWrapper'
-import { ABTestVariant } from './ABTestVariant'
+import { ABTestingWrapper, ABTestVariant } from './ABTestWrapper'
 
 export const TopBanner = (props) => {
   const { isLoggedIn, logout } = useUserVar()
@@ -53,12 +52,7 @@ export const TopBanner = (props) => {
       <Flex align="center" fontFamily="body" {...props}>
         <Link href="https://www.canada.ca/" isExternal>
           <Flex>
-            <Box
-              ml="8"
-              mr="4"
-              width={{ base: 272, md: 360 }}
-              display={{ base: 'none', md: 'initial' }}
-            >
+            <Box ml="8" mr="4" width={{ base: 272, md: 360 }} display={{ base: 'none', md: 'initial' }}>
               <Image
                 src={i18n.locale === 'en' ? sigEn : sigFr}
                 pr="auto"
@@ -72,20 +66,10 @@ export const TopBanner = (props) => {
 
         <Link as={RouteLink} to="/">
           <Flex align="center">
-            <Box
-              my="4"
-              ml="4"
-              width={{ base: 0, md: 125 }}
-              display={{ base: 'none', md: 'initial' }}
-            >
+            <Box my="4" ml="4" width={{ base: 0, md: 125 }} display={{ base: 'none', md: 'initial' }}>
               <Image src={trackerLogo} alt={t`Tracker logo outline`} />
             </Box>
-            <Box
-              mr="4"
-              my="4"
-              width={{ base: 0, md: 125 }}
-              display={{ base: 'none', md: 'initial' }}
-            >
+            <Box mr="4" my="4" width={{ base: 0, md: 125 }} display={{ base: 'none', md: 'initial' }}>
               <Image src={trackerText} alt={t`Tracker logo text`} />
             </Box>
           </Flex>
diff --git a/frontend/src/domains/DomainCard.js b/frontend/src/domains/DomainCard.js
index b793e9cfe2..b4fd1639af 100644
--- a/frontend/src/domains/DomainCard.js
+++ b/frontend/src/domains/DomainCard.js
@@ -16,8 +16,7 @@ import {
 } from '@chakra-ui/react'
 import { Link as RouteLink, useLocation } from 'react-router-dom'
 import { array, bool, object, string } from 'prop-types'
-import { ABTestingWrapper } from '../app/ABTestWrapper'
-import { ABTestVariant } from '../app/ABTestVariant'
+import { ABTestingWrapper, ABTestVariant } from '../app/ABTestWrapper'
 import { StatusBadge } from './StatusBadge'
 import { ScanDomainButton } from './ScanDomainButton'
 import { StarIcon } from '@chakra-ui/icons'

From 20327cb44d555b93a563c42dfe18dd1ac11827ad Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Thu, 20 Apr 2023 16:42:41 -0300
Subject: [PATCH 10/14] put hidden and archive features back into B stream

---
 frontend/src/admin/AdminDomainCard.js         |  67 +++----
 frontend/src/admin/AdminDomainModal.js        | 172 ++++++------------
 .../OrganizationDomains.js                    |  31 +++-
 3 files changed, 101 insertions(+), 169 deletions(-)

diff --git a/frontend/src/admin/AdminDomainCard.js b/frontend/src/admin/AdminDomainCard.js
index fb4aa47e58..c472c353b7 100644
--- a/frontend/src/admin/AdminDomainCard.js
+++ b/frontend/src/admin/AdminDomainCard.js
@@ -1,27 +1,16 @@
 import React from 'react'
 import { Trans } from '@lingui/macro'
 import { array, bool, string } from 'prop-types'
-import {
-  Flex,
-  Grid,
-  Link,
-  ListItem,
-  Stack,
-  Tag,
-  TagLabel,
-  Text,
-} from '@chakra-ui/react'
+import { Flex, Grid, Link, ListItem, Stack, Tag, TagLabel, Text } from '@chakra-ui/react'
 import { ExternalLinkIcon } from '@chakra-ui/icons'
+import { ABTestVariant, ABTestingWrapper } from '../app/ABTestWrapper'
 
 import { sanitizeUrl } from '../utilities/sanitizeUrl'
 
 export function AdminDomainCard({ url, tags, isHidden, isArchived, ...rest }) {
   return (
     <ListItem {...rest}>
-      <Grid
-        templateColumns={{ base: 'auto', md: '40% 60%' }}
-        columnGap="1.5rem"
-      >
+      <Grid templateColumns={{ base: 'auto', md: '40% 60%' }} columnGap="1.5rem">
         <Stack isInline align="center">
           <Text fontWeight="bold">
             <Trans>Domain:</Trans>
@@ -42,41 +31,29 @@ export function AdminDomainCard({ url, tags, isHidden, isArchived, ...rest }) {
         <Flex>
           {tags?.map((tag, idx) => {
             return (
-              <Tag
-                key={idx}
-                m="1"
-                borderRadius="full"
-                borderWidth="1px"
-                borderColor="gray.900"
-              >
+              <Tag key={idx} m="1" borderRadius="full" borderWidth="1px" borderColor="gray.900">
                 <TagLabel mx="auto">{tag}</TagLabel>
               </Tag>
             )
           })}
-          {isHidden && (
-            <Tag
-              m="1"
-              borderRadius="full"
-              borderWidth="1px"
-              borderColor="gray.900"
-            >
-              <TagLabel mx="auto">
-                <Trans>Hidden</Trans>
-              </TagLabel>
-            </Tag>
-          )}
-          {isArchived && (
-            <Tag
-              m="1"
-              borderRadius="full"
-              borderWidth="1px"
-              borderColor="gray.900"
-            >
-              <TagLabel mx="auto">
-                <Trans>Archived</Trans>
-              </TagLabel>
-            </Tag>
-          )}
+          <ABTestingWrapper insiderVariantName="B">
+            <ABTestVariant name="B">
+              {isHidden && (
+                <Tag m="1" borderRadius="full" borderWidth="1px" borderColor="gray.900">
+                  <TagLabel mx="auto">
+                    <Trans>Hidden</Trans>
+                  </TagLabel>
+                </Tag>
+              )}
+              {isArchived && (
+                <Tag m="1" borderRadius="full" borderWidth="1px" borderColor="gray.900">
+                  <TagLabel mx="auto">
+                    <Trans>Archived</Trans>
+                  </TagLabel>
+                </Tag>
+              )}
+            </ABTestVariant>
+          </ABTestingWrapper>
         </Flex>
       </Grid>
     </ListItem>
diff --git a/frontend/src/admin/AdminDomainModal.js b/frontend/src/admin/AdminDomainModal.js
index 058e5962e1..ed16e8d7a9 100644
--- a/frontend/src/admin/AdminDomainModal.js
+++ b/frontend/src/admin/AdminDomainModal.js
@@ -30,26 +30,16 @@ import {
   Tooltip,
   useToast,
 } from '@chakra-ui/react'
-import {
-  AddIcon,
-  MinusIcon,
-  QuestionOutlineIcon,
-  SmallAddIcon,
-} from '@chakra-ui/icons'
+import { AddIcon, MinusIcon, QuestionOutlineIcon, SmallAddIcon } from '@chakra-ui/icons'
 import { array, bool, func, number, object, string } from 'prop-types'
 import { Field, FieldArray, Formik } from 'formik'
 import { useMutation } from '@apollo/client'
 
 import { DomainField } from '../components/fields/DomainField'
 import { CREATE_DOMAIN, UPDATE_DOMAIN } from '../graphql/mutations'
+import { ABTestVariant, ABTestingWrapper } from '../app/ABTestWrapper'
 
-export function AdminDomainModal({
-  isOpen,
-  onClose,
-  validationSchema,
-  orgId,
-  ...props
-}) {
+export function AdminDomainModal({ isOpen, onClose, validationSchema, orgId, ...props }) {
   const {
     editingDomainId,
     editingDomainUrl,
@@ -82,9 +72,7 @@ export function AdminDomainModal({
       if (createDomain.result.__typename === 'Domain') {
         toast({
           title: i18n._(t`Domain added`),
-          description: i18n._(
-            t`${createDomain.result.domain} was added to ${orgSlug}`,
-          ),
+          description: i18n._(t`${createDomain.result.domain} was added to ${orgSlug}`),
           status: 'success',
           duration: 9000,
           isClosable: true,
@@ -176,9 +164,7 @@ export function AdminDomainModal({
     const stringValues = values?.map((label) => {
       return label[i18n.locale]
     })
-    const difference = tagOptions.filter(
-      (label) => !stringValues?.includes(label[i18n.locale]),
-    )
+    const difference = tagOptions.filter((label) => !stringValues?.includes(label[i18n.locale]))
     return difference?.map((label, idx) => {
       return (
         <Tag
@@ -200,12 +186,7 @@ export function AdminDomainModal({
   }
 
   return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onClose}
-      initialFocusRef={initialFocusRef}
-      motionPreset="slideInBottom"
-    >
+    <Modal isOpen={isOpen} onClose={onClose} initialFocusRef={initialFocusRef} motionPreset="slideInBottom">
       <ModalOverlay />
       <ModalContent pb={4}>
         <Formik
@@ -253,30 +234,15 @@ export function AdminDomainModal({
             }
           }}
         >
-          {({
-            handleSubmit,
-            handleChange,
-            isSubmitting,
-            values,
-            errors,
-            touched,
-          }) => (
+          {({ handleSubmit, handleChange, isSubmitting, values, errors, touched }) => (
             <form id="form" onSubmit={handleSubmit}>
               <ModalHeader>
-                {mutation === 'update' ? (
-                  <Trans>Edit Domain Details</Trans>
-                ) : (
-                  <Trans>Add Domain Details</Trans>
-                )}
+                {mutation === 'update' ? <Trans>Edit Domain Details</Trans> : <Trans>Add Domain Details</Trans>}
               </ModalHeader>
               <ModalCloseButton />
               <ModalBody>
                 <Stack spacing={4} p={25}>
-                  <DomainField
-                    name="domainUrl"
-                    label={t`New Domain URL:`}
-                    placeholder={t`New Domain URL`}
-                  />
+                  <DomainField name="domainUrl" label={t`New Domain URL:`} placeholder={t`New Domain URL`} />
 
                   <FieldArray
                     name="selectors"
@@ -295,12 +261,7 @@ export function AdminDomainModal({
                               touched.selectors[index]
                             }
                           >
-                            <Grid
-                              gridTemplateColumns="auto 1fr"
-                              gap="0.5em"
-                              alignItems="center"
-                              mb="0.5em"
-                            >
+                            <Grid gridTemplateColumns="auto 1fr" gap="0.5em" alignItems="center" mb="0.5em">
                               <IconButton
                                 variant="danger"
                                 icon={<MinusIcon size="icons.xs" />}
@@ -310,11 +271,7 @@ export function AdminDomainModal({
                                 onClick={() => arrayHelpers.remove(index)}
                                 aria-label="remove-dkim-selector"
                               />
-                              <Field
-                                id={`selectors.${index}`}
-                                name={`selectors.${index}`}
-                                h="1.5rem"
-                              >
+                              <Field id={`selectors.${index}`} name={`selectors.${index}`} h="1.5rem">
                                 {({ field }) => (
                                   <Input
                                     {...field}
@@ -327,9 +284,7 @@ export function AdminDomainModal({
                               </Field>
 
                               <FormErrorMessage gridColumn="2 / 3" mt={0}>
-                                {errors &&
-                                  errors.selectors &&
-                                  errors.selectors[index]}
+                                {errors && errors.selectors && errors.selectors[index]}
                               </FormErrorMessage>
                             </Grid>
                           </FormControl>
@@ -359,9 +314,7 @@ export function AdminDomainModal({
                                 <TagCloseButton
                                   ml="auto"
                                   onClick={() => arrayHelpers.remove(idx)}
-                                  aria-label={`remove-tag-${
-                                    label[i18n.locale]
-                                  }`}
+                                  aria-label={`remove-tag-${label[i18n.locale]}`}
                                 />
                               </Tag>
                             )
@@ -374,82 +327,67 @@ export function AdminDomainModal({
                       </Box>
                     )}
                   />
-
-                  <Flex align="center">
-                    <Tooltip
-                      label={t`Prevent this domain from being counted in your organization's summaries.`}
-                    >
-                      <QuestionOutlineIcon tabIndex={0} />
-                    </Tooltip>
-                    <label>
-                      <Switch
-                        isFocusable={true}
-                        name="hideDomain"
-                        mx="2"
-                        defaultChecked={values.hideDomain}
-                        onChange={handleChange}
-                      />
-                    </label>
-                    <Badge variant="outline" color="gray.900" p="1.5">
-                      <Trans>Hide domain</Trans>
-                    </Badge>
-                  </Flex>
-
-                  {permission === 'SUPER_ADMIN' && (
-                    <Box>
+                  <ABTestingWrapper insiderVariantName="B">
+                    <ABTestVariant name="B">
                       <Flex align="center">
-                        <Tooltip
-                          label={t`Prevent this domain from being visible, scanned, and being counted in any summaries.`}
-                        >
+                        <Tooltip label={t`Prevent this domain from being counted in your organization's summaries.`}>
                           <QuestionOutlineIcon tabIndex={0} />
                         </Tooltip>
                         <label>
                           <Switch
-                            colorScheme="red"
                             isFocusable={true}
-                            name="archiveDomain"
+                            name="hideDomain"
                             mx="2"
-                            defaultChecked={values.archiveDomain}
+                            defaultChecked={values.hideDomain}
                             onChange={handleChange}
                           />
                         </label>
                         <Badge variant="outline" color="gray.900" p="1.5">
-                          <Trans>Archive domain</Trans>
+                          <Trans>Hide domain</Trans>
                         </Badge>
                       </Flex>
+                      {permission === 'SUPER_ADMIN' && (
+                        <Box>
+                          <Flex align="center">
+                            <Tooltip
+                              label={t`Prevent this domain from being visible, scanned, and being counted in any summaries.`}
+                            >
+                              <QuestionOutlineIcon tabIndex={0} />
+                            </Tooltip>
+                            <label>
+                              <Switch
+                                colorScheme="red"
+                                isFocusable={true}
+                                name="archiveDomain"
+                                mx="2"
+                                defaultChecked={values.archiveDomain}
+                                onChange={handleChange}
+                              />
+                            </label>
+                            <Badge variant="outline" color="gray.900" p="1.5">
+                              <Trans>Archive domain</Trans>
+                            </Badge>
+                          </Flex>
 
-                      <Text fontSize="sm">
-                        {orgCount > 0 ? (
-                          <Trans>
-                            Note: This will affect results for {orgCount}{' '}
-                            organizations
-                          </Trans>
-                        ) : (
-                          <Trans>
-                            Note: This could affect results for multiple
-                            organizations
-                          </Trans>
-                        )}
+                          <Text fontSize="sm">
+                            {orgCount > 0 ? (
+                              <Trans>Note: This will affect results for {orgCount} organizations</Trans>
+                            ) : (
+                              <Trans>Note: This could affect results for multiple organizations</Trans>
+                            )}
+                          </Text>
+                        </Box>
+                      )}
+                      <Text>
+                        <Trans>Please allow up to 24 hours for summaries to reflect any changes.</Trans>
                       </Text>
-                    </Box>
-                  )}
-
-                  <Text>
-                    <Trans>
-                      Please allow up to 24 hours for summaries to reflect any
-                      changes.
-                    </Trans>
-                  </Text>
+                    </ABTestVariant>
+                  </ABTestingWrapper>
                 </Stack>
               </ModalBody>
 
               <ModalFooter>
-                <Button
-                  variant="primary"
-                  isLoading={isSubmitting}
-                  type="submit"
-                  mr="4"
-                >
+                <Button variant="primary" isLoading={isSubmitting} type="submit" mr="4">
                   <Trans>Confirm</Trans>
                 </Button>
               </ModalFooter>
diff --git a/frontend/src/organizationDetails/OrganizationDomains.js b/frontend/src/organizationDetails/OrganizationDomains.js
index 4a73eab93e..8354fb9938 100644
--- a/frontend/src/organizationDetails/OrganizationDomains.js
+++ b/frontend/src/organizationDetails/OrganizationDomains.js
@@ -28,6 +28,7 @@ import { SearchBox } from '../components/SearchBox'
 import { Formik } from 'formik'
 import { getRequirement, schemaToValidation } from '../utilities/fieldRequirements'
 import { CheckCircleIcon, InfoIcon, WarningIcon } from '@chakra-ui/icons'
+import { ABTestVariant, ABTestingWrapper } from '../app/ABTestWrapper'
 
 export function OrganizationDomains({ orgSlug }) {
   const [orderDirection, setOrderDirection] = useState('ASC')
@@ -94,6 +95,9 @@ export function OrganizationDomains({ orgSlug }) {
     { value: t`TEST`, text: t`Test` },
     { value: t`WEB`, text: t`Web` },
     { value: t`INACTIVE`, text: t`Inactive` },
+  ]
+
+  const hiddenFilterOptions = [
     { value: `HIDDEN`, text: t`Hidden` },
     { value: `ARCHIVED`, text: t`Archived` },
   ]
@@ -186,13 +190,26 @@ export function OrganizationDomains({ orgSlug }) {
                           <Trans>Status or tag</Trans>
                         </option>
                         {values.filterCategory === 'TAGS' ? (
-                          filterTagOptions.map(({ value, text }, idx) => {
-                            return (
-                              <option key={idx} value={value}>
-                                {text}
-                              </option>
-                            )
-                          })
+                          <>
+                            {filterTagOptions.map(({ value, text }, idx) => {
+                              return (
+                                <option key={idx} value={value}>
+                                  {text}
+                                </option>
+                              )
+                            })}
+                            <ABTestingWrapper insiderVariantName="B">
+                              <ABTestVariant name="B">
+                                {hiddenFilterOptions.map(({ value, text }, idx) => {
+                                  return (
+                                    <option key={idx} value={value}>
+                                      {text}
+                                    </option>
+                                  )
+                                })}
+                              </ABTestVariant>
+                            </ABTestingWrapper>
+                          </>
                         ) : (
                           <>
                             <option value="PASS">

From 082d1a38aa95e9f055e5ee7fd7806fe900467195 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Thu, 20 Apr 2023 16:44:55 -0300
Subject: [PATCH 11/14] rehide hidden domains in landing page summaries

---
 services/summaries/summaries.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/services/summaries/summaries.py b/services/summaries/summaries.py
index cb35f24ce2..4e87fdd830 100644
--- a/services/summaries/summaries.py
+++ b/services/summaries/summaries.py
@@ -53,7 +53,8 @@ def update_scan_summaries(host=DB_URL, name=DB_NAME, user=DB_USER,
         scan_total = 0
         for domain in db.collection("domains"):
             archived = domain.get("archived")
-            if archived != True:
+            hidden = is_domain_hidden(domain, db)
+            if archived != True and hidden != True:
                 # We don't want to count domains not passing or failing
                 # (i.e unreachable or unscanned) towards the total.
                 if domain.get("status", {}).get(scan_type) == "fail":
@@ -112,7 +113,8 @@ def update_dmarc_phase_chart_summaries(db):
 
     for domain in db.collection("domains"):
         archived = domain.get("archived")
-        if archived != True:
+        hidden = is_domain_hidden(domain, db)
+        if archived != True and hidden != True:
             phase = domain.get("phase")
 
             if phase is None:
@@ -180,7 +182,8 @@ def update_chart_summaries(host=DB_URL, name=DB_NAME, user=DB_USER,
         domain_total = 0
         for domain in db.collection("domains"):
             archived = domain.get("archived")
-            if archived != True:
+            hidden = is_domain_hidden(domain, db)
+            if archived != True and hidden != True:
                 category_status = []
                 for scan_type in scan_types:
                     category_status.append(domain.get("status", {}).get(scan_type))

From 8168d23b4026ae2be32e92e79b92f43d73cc2366 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Fri, 21 Apr 2023 08:39:39 -0300
Subject: [PATCH 12/14] comment out alert banner for domain consolidation

---
 frontend/src/app/App.js | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/frontend/src/app/App.js b/frontend/src/app/App.js
index 21a62572a2..008a1ddae2 100644
--- a/frontend/src/app/App.js
+++ b/frontend/src/app/App.js
@@ -1,21 +1,16 @@
 import React, { Suspense, useEffect } from 'react'
+import { Switch, Link as RouteLink, Redirect, useLocation } from 'react-router-dom'
 import {
-  Switch,
-  Link as RouteLink,
-  Redirect,
-  useLocation,
-} from 'react-router-dom'
-import {
-  Alert,
-  AlertIcon,
-  AlertTitle,
-  Box,
-  CloseButton,
+  // Alert,
+  // AlertIcon,
+  // AlertTitle,
+  // Box,
+  // CloseButton,
   CSSReset,
   Flex,
   Link,
   Text,
-  useDisclosure,
+  // useDisclosure,
 } from '@chakra-ui/react'
 import { t, Trans } from '@lingui/macro'
 import { ErrorBoundary } from 'react-error-boundary'
@@ -67,7 +62,7 @@ export function App() {
   const { currentUser, isLoggedIn, isEmailValidated, currentTFAMethod } = useUserVar()
   const { i18n } = useLingui()
   const { data } = useQuery(IS_LOGIN_REQUIRED, {})
-  const { isOpen: isVisible, onClose } = useDisclosure({ defaultIsOpen: true })
+  // const { isOpen: isVisible, onClose } = useDisclosure({ defaultIsOpen: true })
   const location = useLocation()
 
   // Close websocket on user jwt change (refresh/logout)
@@ -155,7 +150,7 @@ export function App() {
           </Text>
         </NotificationBanner>
       )}
-      {isVisible && (
+      {/* {isVisible && (
         <Alert status="warning" variant="left-accent" mx="4" my="2" maxW="98%">
           <AlertIcon />
           <Box>
@@ -184,7 +179,7 @@ export function App() {
             onClick={onClose}
           />
         </Alert>
-      )}
+      )} */}
 
       <Main mb={{ base: '40px', md: 'none' }}>
         <Suspense fallback={<LoadingMessage />}>

From f720c13e60729a430d456fec4f3e029e9d19190b Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Mon, 15 May 2023 09:03:57 -0300
Subject: [PATCH 13/14] cleanup

---
 ...-domain-connections-by-organizations-id.js | 15 +------
 frontend/src/app/App.js                       | 43 +------------------
 2 files changed, 3 insertions(+), 55 deletions(-)

diff --git a/api/src/domain/loaders/load-domain-connections-by-organizations-id.js b/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
index 14363becb2..4bacf576bd 100644
--- a/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
+++ b/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
@@ -4,18 +4,7 @@ import { t } from '@lingui/macro'
 
 export const loadDomainConnectionsByOrgId =
   ({ query, userKey, language, cleanseInput, i18n, auth: { loginRequiredBool } }) =>
-  async ({
-    orgId,
-    permission,
-    after,
-    before,
-    first,
-    last,
-    ownership,
-    orderBy,
-    search,
-    filters = [],
-  }) => {
+  async ({ orgId, permission, after, before, first, last, ownership, orderBy, search, filters = [] }) => {
     const userDBId = `users/${userKey}`
     let afterTemplate = aql``
     let afterVar = aql``
@@ -409,7 +398,7 @@ export const loadDomainConnectionsByOrgId =
       showArchivedDomains = aql``
     }
     let showHiddenDomains = aql`FILTER e.hidden != true`
-    if (['admin', 'super_admin'].includes(permission)) {
+    if (['super_admin'].includes(permission)) {
       showHiddenDomains = aql``
     }
 
diff --git a/frontend/src/app/App.js b/frontend/src/app/App.js
index 008a1ddae2..4242ec5632 100644
--- a/frontend/src/app/App.js
+++ b/frontend/src/app/App.js
@@ -1,17 +1,6 @@
 import React, { Suspense, useEffect } from 'react'
 import { Switch, Link as RouteLink, Redirect, useLocation } from 'react-router-dom'
-import {
-  // Alert,
-  // AlertIcon,
-  // AlertTitle,
-  // Box,
-  // CloseButton,
-  CSSReset,
-  Flex,
-  Link,
-  Text,
-  // useDisclosure,
-} from '@chakra-ui/react'
+import { CSSReset, Flex, Link, Text } from '@chakra-ui/react'
 import { t, Trans } from '@lingui/macro'
 import { ErrorBoundary } from 'react-error-boundary'
 import { useQuery } from '@apollo/client'
@@ -150,36 +139,6 @@ export function App() {
           </Text>
         </NotificationBanner>
       )}
-      {/* {isVisible && (
-        <Alert status="warning" variant="left-accent" mx="4" my="2" maxW="98%">
-          <AlertIcon />
-          <Box>
-            <AlertTitle>
-              <Trans>Attention Tracker Users</Trans>
-            </AlertTitle>
-            <Text>
-              <Trans>
-                In an effort to consolidate a complete list of digital services
-                across the GC, new domains will be added to all organizations.
-                To allow organization admins time to react to this change, new
-                domains will be tagged as "new" for easy identification and
-                hidden from affecting summary scores. For more information,{' '}
-                <Link color="blue.600" href="">
-                  see the full blog post here
-                </Link>
-                . Thank you for helping make GC cyber space safer for all.
-              </Trans>
-            </Text>
-          </Box>
-          <CloseButton
-            alignSelf="flex-start"
-            position="relative"
-            right={-1}
-            top={-1}
-            onClick={onClose}
-          />
-        </Alert>
-      )} */}
 
       <Main mb={{ base: '40px', md: 'none' }}>
         <Suspense fallback={<LoadingMessage />}>

From c9f2725b1c2a0b6139c24f44b761feff93eb2917 Mon Sep 17 00:00:00 2001
From: lcampbell <l.campbell144768@gmail.com>
Date: Mon, 15 May 2023 09:18:59 -0300
Subject: [PATCH 14/14] cert status info box

---
 frontend/src/locales/en.po | 666 +++++++++++++++++++------------------
 frontend/src/locales/fr.po | 666 +++++++++++++++++++------------------
 2 files changed, 696 insertions(+), 636 deletions(-)

diff --git a/frontend/src/locales/en.po b/frontend/src/locales/en.po
index 14488d8fcf..d460c017c9 100644
--- a/frontend/src/locales/en.po
+++ b/frontend/src/locales/en.po
@@ -57,7 +57,7 @@ msgstr "404 - Page Not Found"
 #~ msgid "6.2.3 All remaining websites and web services must be accessible through a secure connection, as outlined in Section 6.1, by December 31, 2019."
 #~ msgstr "6.2.3 All remaining websites and web services must be accessible through a secure connection, as outlined in Section 6.1, by December 31, 2019."
 
-#: src/guidance/GuidancePage.js:68
+#: src/guidance/GuidancePage.js:70
 msgid "A DNS request for this service has resulted in the following error code:"
 msgstr "A DNS request for this service has resulted in the following error code:"
 
@@ -77,11 +77,11 @@ msgstr "A more detailed breakdown of each domain can be found by clicking on its
 msgid "A verification link has been sent to your email account"
 msgstr "A verification link has been sent to your email account"
 
-#: src/admin/UserListModal.js:280
+#: src/admin/UserListModal.js:261
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: src/domains/DomainCard.js:170
+#: src/domains/DomainCard.js:169
 msgid "ARCHIVED"
 msgstr "ARCHIVED"
 
@@ -110,7 +110,7 @@ msgstr "Account"
 msgid "Account Closed Successfully"
 msgstr "Account Closed Successfully"
 
-#: src/app/App.js:110
+#: src/app/App.js:101
 #: src/app/FloatingMenu.js:177
 #: src/user/UserPage.js:150
 msgid "Account Settings"
@@ -120,7 +120,7 @@ msgstr "Account Settings"
 msgid "Account created."
 msgstr "Account created."
 
-#: src/admin/WebCheckPage.js:68
+#: src/admin/WebCheckPage.js:61
 #: src/createOrganization/CreateOrganizationPage.js:184
 #: src/createOrganization/CreateOrganizationPage.js:189
 #: src/organizations/Organizations.js:61
@@ -155,7 +155,7 @@ msgstr "Action"
 msgid "Action:"
 msgstr "Action:"
 
-#: src/admin/AdminPanel.js:36
+#: src/admin/AdminPanel.js:32
 msgid "Activity"
 msgstr "Activity"
 
@@ -167,15 +167,15 @@ msgstr "Add"
 msgid "Add Domain"
 msgstr "Add Domain"
 
-#: src/admin/AdminDomainModal.js:271
+#: src/admin/AdminDomainModal.js:240
 msgid "Add Domain Details"
 msgstr "Add Domain Details"
 
-#: src/admin/UserListModal.js:237
+#: src/admin/UserListModal.js:220
 msgid "Add User"
 msgstr "Add User"
 
-#: src/app/App.js:216
+#: src/app/App.js:207
 msgid "Admin"
 msgstr "Admin"
 
@@ -183,7 +183,7 @@ msgstr "Admin"
 msgid "Admin Portal"
 msgstr "Admin Portal"
 
-#: src/app/App.js:118
+#: src/app/App.js:109
 msgid "Admin Profile"
 msgstr "Admin Profile"
 
@@ -224,11 +224,11 @@ msgid "An error occured when you attempted to download all domain statuses."
 msgstr "An error occured when you attempted to download all domain statuses."
 
 #: src/app/FloatingMenu.js:38
-#: src/app/TopBanner.js:31
+#: src/app/TopBanner.js:30
 msgid "An error occured when you attempted to sign out"
 msgstr "An error occured when you attempted to sign out"
 
-#: src/domains/DomainCard.js:49
+#: src/domains/DomainCard.js:47
 msgid "An error occurred while favouriting a domain."
 msgstr "An error occurred while favouriting a domain."
 
@@ -240,7 +240,7 @@ msgstr "An error occurred while removing this organization."
 msgid "An error occurred while requesting a scan."
 msgstr "An error occurred while requesting a scan."
 
-#: src/domains/DomainCard.js:75
+#: src/domains/DomainCard.js:73
 msgid "An error occurred while unfavouriting a domain."
 msgstr "An error occurred while unfavouriting a domain."
 
@@ -280,11 +280,11 @@ msgstr "An error occurred while updating your phone number."
 msgid "An error occurred while verifying your phone number."
 msgstr "An error occurred while verifying your phone number."
 
-#: src/admin/AdminDomainModal.js:75
-#: src/admin/AdminDomainModal.js:124
+#: src/admin/AdminDomainModal.js:63
+#: src/admin/AdminDomainModal.js:110
 #: src/admin/AdminDomains.js:103
-#: src/admin/UserListModal.js:53
-#: src/admin/UserListModal.js:151
+#: src/admin/UserListModal.js:47
+#: src/admin/UserListModal.js:141
 #: src/auth/TwoFactorAuthenticatePage.js:29
 #: src/createOrganization/CreateOrganizationPage.js:56
 #: src/user/UserPage.js:83
@@ -307,7 +307,7 @@ msgstr "Any products or related services provided to you by TBS are and will rem
 #~ msgid "Application Portfolio Management (APM) systems; and"
 #~ msgstr "Application Portfolio Management (APM) systems; and"
 
-#: src/organizationDetails/OrganizationDomains.js:237
+#: src/organizationDetails/OrganizationDomains.js:233
 msgid "Apply"
 msgstr "Apply"
 
@@ -316,11 +316,11 @@ msgstr "Apply"
 msgid "April"
 msgstr "April"
 
-#: src/admin/AdminDomainModal.js:421
+#: src/admin/AdminDomainModal.js:368
 msgid "Archive domain"
 msgstr "Archive domain"
 
-#: src/admin/AdminDomainCard.js:80
+#: src/admin/AdminDomainCard.js:51
 #: src/organizationDetails/OrganizationDomains.js:103
 msgid "Archived"
 msgstr "Archived"
@@ -352,11 +352,11 @@ msgstr "Audit Logs"
 msgid "August"
 msgstr "August"
 
-#: src/app/App.js:182
+#: src/app/App.js:173
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: src/app/TopBanner.js:98
+#: src/app/TopBanner.js:82
 msgid "BETA"
 msgstr "BETA"
 
@@ -381,7 +381,7 @@ msgstr "Below are steps on how government organizations can leverage the Tracker
 msgid "Blank fields will not be included when updating the organization."
 msgstr "Blank fields will not be included when updating the organization."
 
-#: src/domains/DomainCard.js:138
+#: src/domains/DomainCard.js:136
 #: src/guidance/WebGuidance.js:83
 msgid "Blocked"
 msgstr "Blocked"
@@ -416,18 +416,24 @@ msgstr "Canadians rely on the Government of Canada to provide secure digital ser
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/guidance/WebTLSResults.js:227
+#: src/guidance/WebTLSResults.js:268
 msgid "Certificate Chain"
 msgstr "Certificate Chain"
 
-#: src/guidance/WebTLSResults.js:235
+#: src/guidance/WebTLSResults.js:276
 msgid "Certificate chain info could not be found during the scan."
 msgstr "Certificate chain info could not be found during the scan."
 
-#: src/domains/DomainCard.js:187
+#: src/domains/DomainCard.js:186
+#: src/organizationDetails/OrganizationDomains.js:279
 msgid "Certificates"
 msgstr "Certificates"
 
+#: src/domains/DomainsPage.js:71
+#: src/organizationDetails/OrganizationDomains.js:83
+msgid "Certificates Status"
+msgstr "Certificates Status"
+
 #: src/auth/ResetPasswordPage.js:126
 #: src/user/EditableUserPassword.js:153
 msgid "Change Password"
@@ -469,15 +475,15 @@ msgstr "Changes Required for ITPIN Compliance"
 msgid "Check your associated Tracker email for the verification link"
 msgstr "Check your associated Tracker email for the verification link"
 
-#: src/domains/DomainCard.js:189
-#: src/domains/DomainsPage.js:154
+#: src/domains/DomainCard.js:188
+#: src/domains/DomainsPage.js:155
 #: src/guidance/WebTLSResults.js:101
-#: src/organizationDetails/OrganizationDomains.js:281
+#: src/organizationDetails/OrganizationDomains.js:280
 msgid "Ciphers"
 msgstr "Ciphers"
 
-#: src/domains/DomainsPage.js:71
-#: src/organizationDetails/OrganizationDomains.js:87
+#: src/domains/DomainsPage.js:72
+#: src/organizationDetails/OrganizationDomains.js:84
 msgid "Ciphers Status"
 msgstr "Ciphers Status"
 
@@ -523,7 +529,7 @@ msgstr "Code field must not be empty"
 msgid "Collect and analyze DMARC reports."
 msgstr "Collect and analyze DMARC reports."
 
-#: src/organizationDetails/OrganizationDomains.js:188
+#: src/organizationDetails/OrganizationDomains.js:175
 msgid "Comparison"
 msgstr "Comparison"
 
@@ -531,12 +537,12 @@ msgstr "Comparison"
 msgid "Compliant"
 msgstr "Compliant"
 
-#: src/admin/AdminDomainModal.js:459
+#: src/admin/AdminDomainModal.js:391
 #: src/admin/AdminDomains.js:386
 #: src/admin/OrganizationInformation.js:393
 #: src/admin/OrganizationInformation.js:520
 #: src/admin/SuperAdminUserList.js:441
-#: src/admin/UserListModal.js:299
+#: src/admin/UserListModal.js:274
 #: src/user/EditableUserDisplayName.js:168
 #: src/user/EditableUserEmail.js:168
 #: src/user/EditableUserPassword.js:182
@@ -562,20 +568,20 @@ msgstr "Confirm removal of domain:"
 #~ msgid "Confirm removal of user:"
 #~ msgstr "Confirm removal of user:"
 
-#: src/app/ReadGuidancePage.js:216
-msgid "Consider prioritizing websites and web services that exchange Protected data."
-msgstr "Consider prioritizing websites and web services that exchange Protected data."
-
 #: src/guidance/WebConnectionResults.js:99
 msgid "Connection Results"
 msgstr "Connection Results"
 
+#: src/app/ReadGuidancePage.js:216
+msgid "Consider prioritizing websites and web services that exchange Protected data."
+msgstr "Consider prioritizing websites and web services that exchange Protected data."
+
 #: src/app/FloatingMenu.js:238
 msgid "Contact"
 msgstr "Contact"
 
-#: src/app/App.js:191
-#: src/app/App.js:346
+#: src/app/App.js:182
+#: src/app/App.js:333
 #: src/app/ContactUsPage.js:39
 #: src/app/SlideMessage.js:103
 msgid "Contact Us"
@@ -621,18 +627,18 @@ msgid "Create"
 msgstr "Create"
 
 #: src/app/FloatingMenu.js:200
-#: src/app/TopBanner.js:143
+#: src/app/TopBanner.js:127
 #: src/auth/CreateUserPage.js:243
 msgid "Create Account"
 msgstr "Create Account"
 
 #: src/admin/AdminPage.js:130
-#: src/app/App.js:305
+#: src/app/App.js:292
 #: src/createOrganization/CreateOrganizationPage.js:237
 msgid "Create Organization"
 msgstr "Create Organization"
 
-#: src/app/App.js:159
+#: src/app/App.js:150
 msgid "Create an Account"
 msgstr "Create an Account"
 
@@ -660,21 +666,21 @@ msgstr "Current Password:"
 msgid "Current Phone Number:"
 msgstr "Current Phone Number:"
 
-#: src/domains/DomainCard.js:190
-#: src/domains/DomainsPage.js:155
+#: src/domains/DomainCard.js:189
+#: src/domains/DomainsPage.js:156
 #: src/guidance/WebTLSResults.js:155
-#: src/organizationDetails/OrganizationDomains.js:282
-#: src/organizationDetails/OrganizationDomains.js:328
+#: src/organizationDetails/OrganizationDomains.js:281
+#: src/organizationDetails/OrganizationDomains.js:325
 msgid "Curves"
 msgstr "Curves"
 
-#: src/domains/DomainsPage.js:72
-#: src/organizationDetails/OrganizationDomains.js:88
+#: src/domains/DomainsPage.js:73
+#: src/organizationDetails/OrganizationDomains.js:85
 msgid "Curves Status"
 msgstr "Curves Status"
 
-#: src/domains/DomainsPage.js:164
-#: src/organizationDetails/OrganizationDomains.js:291
+#: src/domains/DomainsPage.js:165
+#: src/organizationDetails/OrganizationDomains.js:290
 msgid "DKIM"
 msgstr "DKIM"
 
@@ -700,7 +706,7 @@ msgstr "DKIM Failures by IP Address"
 msgid "DKIM Results"
 msgstr "DKIM Results"
 
-#: src/admin/AdminDomainModal.js:325
+#: src/admin/AdminDomainModal.js:280
 msgid "DKIM Selector"
 msgstr "DKIM Selector"
 
@@ -708,12 +714,12 @@ msgstr "DKIM Selector"
 msgid "DKIM Selectors"
 msgstr "DKIM Selectors"
 
-#: src/admin/AdminDomainModal.js:288
+#: src/admin/AdminDomainModal.js:252
 msgid "DKIM Selectors:"
 msgstr "DKIM Selectors:"
 
-#: src/domains/DomainsPage.js:75
-#: src/organizationDetails/OrganizationDomains.js:91
+#: src/domains/DomainsPage.js:76
+#: src/organizationDetails/OrganizationDomains.js:88
 msgid "DKIM Status"
 msgstr "DKIM Status"
 
@@ -721,8 +727,8 @@ msgstr "DKIM Status"
 #~ msgid "DKIM record could not be found for this selector."
 #~ msgstr "DKIM record could not be found for this selector."
 
-#: src/domains/DomainsPage.js:168
-#: src/organizationDetails/OrganizationDomains.js:295
+#: src/domains/DomainsPage.js:169
+#: src/organizationDetails/OrganizationDomains.js:294
 msgid "DMARC"
 msgstr "DMARC"
 
@@ -758,9 +764,9 @@ msgstr "DMARC Implementation Phase: {0}"
 msgid "DMARC Phases"
 msgstr "DMARC Phases"
 
-#: src/dmarc/DmarcReportPage.js:92
-#: src/domains/DomainCard.js:233
-#: src/guidance/GuidancePage.js:150
+#: src/dmarc/DmarcReportPage.js:95
+#: src/domains/DomainCard.js:232
+#: src/guidance/GuidancePage.js:152
 msgid "DMARC Report"
 msgstr "DMARC Report"
 
@@ -768,13 +774,13 @@ msgstr "DMARC Report"
 msgid "DMARC Report for {domainSlug}"
 msgstr "DMARC Report for {domainSlug}"
 
-#: src/domains/DomainsPage.js:76
-#: src/organizationDetails/OrganizationDomains.js:92
+#: src/domains/DomainsPage.js:77
+#: src/organizationDetails/OrganizationDomains.js:89
 msgid "DMARC Status"
 msgstr "DMARC Status"
 
-#: src/app/App.js:95
-#: src/app/App.js:263
+#: src/app/App.js:89
+#: src/app/App.js:254
 #: src/app/FloatingMenu.js:131
 #: src/dmarc/DmarcByDomainPage.js:181
 #: src/dmarc/DmarcByDomainPage.js:241
@@ -790,7 +796,7 @@ msgstr "DMARC Summaries"
 #~ msgid "DMARC record could not be found during the scan."
 #~ msgstr "DMARC record could not be found during the scan."
 
-#: src/dmarc/DmarcReportPage.js:182
+#: src/dmarc/DmarcReportPage.js:185
 msgid "DNS Host"
 msgstr "DNS Host"
 
@@ -806,7 +812,7 @@ msgstr "DNS Scan Complete"
 msgid "DNS scan for domain \"{0}\" has completed."
 msgstr "DNS scan for domain \"{0}\" has completed."
 
-#: src/organizationDetails/OrganizationDomains.js:194
+#: src/organizationDetails/OrganizationDomains.js:181
 msgid "DOES NOT EQUAL"
 msgstr "DOES NOT EQUAL"
 
@@ -894,11 +900,11 @@ msgstr "Disposition"
 
 #: src/admin/AuditLogTable.js:76
 #: src/dmarc/DmarcByDomainPage.js:124
-#: src/dmarc/DmarcByDomainPage.js:312
+#: src/dmarc/DmarcByDomainPage.js:324
 #: src/domains/DomainsPage.js:68
-#: src/domains/DomainsPage.js:153
-#: src/organizationDetails/OrganizationDomains.js:280
-#: src/organizationDetails/OrganizationDomains.js:314
+#: src/domains/DomainsPage.js:154
+#: src/organizationDetails/OrganizationDomains.js:278
+#: src/organizationDetails/OrganizationDomains.js:312
 msgid "Domain"
 msgstr "Domain"
 
@@ -919,7 +925,7 @@ msgstr "Domain URL"
 msgid "Domain URL:"
 msgstr "Domain URL:"
 
-#: src/admin/AdminDomainModal.js:86
+#: src/admin/AdminDomainModal.js:74
 msgid "Domain added"
 msgstr "Domain added"
 
@@ -935,7 +941,7 @@ msgstr "Domain removed"
 msgid "Domain removed from {orgSlug}"
 msgstr "Domain removed from {orgSlug}"
 
-#: src/admin/AdminDomainModal.js:135
+#: src/admin/AdminDomainModal.js:121
 msgid "Domain updated"
 msgstr "Domain updated"
 
@@ -943,19 +949,19 @@ msgstr "Domain updated"
 msgid "Domain url field must not be empty"
 msgstr "Domain url field must not be empty"
 
-#: src/admin/AdminDomainCard.js:29
-#: src/admin/WebCheckPage.js:147
-#: src/domains/DomainCard.js:129
+#: src/admin/AdminDomainCard.js:16
+#: src/admin/WebCheckPage.js:129
+#: src/domains/DomainCard.js:127
 #: src/domains/ScanDomain.js:211
 msgid "Domain:"
 msgstr "Domain:"
 
-#: src/admin/AdminPanel.js:28
-#: src/app/App.js:92
-#: src/app/App.js:229
+#: src/admin/AdminPanel.js:26
+#: src/app/App.js:86
+#: src/app/App.js:220
 #: src/app/FloatingMenu.js:116
-#: src/domains/DomainsPage.js:81
-#: src/domains/DomainsPage.js:115
+#: src/domains/DomainsPage.js:82
+#: src/domains/DomainsPage.js:116
 #: src/organizationDetails/OrganizationDetails.js:139
 #: src/organizationDetails/OrganizationDomains.js:108
 #: src/summaries/Doughnut.js:50
@@ -980,7 +986,7 @@ msgstr "Don't have an account? <0>Sign up</0>"
 #~ msgid "Dploy DKIM records and keys for all domains and senders; and"
 #~ msgstr "Dploy DKIM records and keys for all domains and senders; and"
 
-#: src/organizationDetails/OrganizationDomains.js:191
+#: src/organizationDetails/OrganizationDomains.js:178
 msgid "EQUALS"
 msgstr "EQUALS"
 
@@ -1003,7 +1009,7 @@ msgstr "Edit"
 msgid "Edit Display Name"
 msgstr "Edit Display Name"
 
-#: src/admin/AdminDomainModal.js:269
+#: src/admin/AdminDomainModal.js:240
 msgid "Edit Domain Details"
 msgstr "Edit Domain Details"
 
@@ -1019,19 +1025,19 @@ msgstr "Edit Organization"
 msgid "Edit Phone Number"
 msgstr "Edit Phone Number"
 
-#: src/admin/UserListModal.js:233
+#: src/admin/UserListModal.js:216
 msgid "Edit User"
 msgstr "Edit User"
 
 #: src/admin/SuperAdminUserList.js:148
 #: src/components/fields/EmailField.js:15
-#: src/domains/DomainCard.js:195
+#: src/domains/DomainCard.js:194
 #: src/user/EditableUserTFAMethod.js:166
 msgid "Email"
 msgstr "Email"
 
 #: src/domains/ScanDomain.js:245
-#: src/guidance/GuidancePage.js:103
+#: src/guidance/GuidancePage.js:105
 msgid "Email Guidance"
 msgstr "Email Guidance"
 
@@ -1055,7 +1061,7 @@ msgstr "Email Sent"
 msgid "Email Validated"
 msgstr "Email Validated"
 
-#: src/app/App.js:301
+#: src/app/App.js:288
 msgid "Email Verification"
 msgstr "Email Verification"
 
@@ -1065,7 +1071,7 @@ msgstr "Email Verification"
 msgid "Email cannot be empty"
 msgstr "Email cannot be empty"
 
-#: src/admin/UserListModal.js:65
+#: src/admin/UserListModal.js:59
 msgid "Email invitation sent"
 msgstr "Email invitation sent"
 
@@ -1152,7 +1158,7 @@ msgstr "Envelope From"
 msgid "Eventually"
 msgstr "Eventually"
 
-#: src/guidance/WebTLSResults.js:380
+#: src/guidance/WebTLSResults.js:421
 msgid "Expired:"
 msgstr "Expired:"
 
@@ -1164,9 +1170,9 @@ msgstr "Export to CSV"
 #~ msgid "FAQ"
 #~ msgstr "FAQ"
 
-#: src/dmarc/DmarcReportPage.js:126
-#: src/dmarc/DmarcReportPage.js:127
-#: src/organizationDetails/OrganizationDomains.js:227
+#: src/dmarc/DmarcReportPage.js:129
+#: src/dmarc/DmarcReportPage.js:130
+#: src/organizationDetails/OrganizationDomains.js:223
 msgid "Fail"
 msgstr "Fail"
 
@@ -1194,7 +1200,7 @@ msgstr "Fail SPF %"
 msgid "Fake email domain blocks (reject + quarantine):"
 msgstr "Fake email domain blocks (reject + quarantine):"
 
-#: src/domains/DomainCard.js:59
+#: src/domains/DomainCard.js:57
 msgid "Favourited Domain"
 msgstr "Favourited Domain"
 
@@ -1215,7 +1221,7 @@ msgstr "February"
 #~ msgid "Filters"
 #~ msgstr "Filters"
 
-#: src/organizationDetails/OrganizationDomains.js:145
+#: src/organizationDetails/OrganizationDomains.js:138
 msgid "Filters:"
 msgstr "Filters:"
 
@@ -1255,7 +1261,7 @@ msgstr "For details related to terms pertaining to privacy, please refer to"
 msgid "For users interested in using new features that are still in progress."
 msgstr "For users interested in using new features that are still in progress."
 
-#: src/app/App.js:185
+#: src/app/App.js:176
 #: src/auth/ForgotPasswordPage.js:75
 msgid "Forgot Password"
 msgstr "Forgot Password"
@@ -1316,11 +1322,11 @@ msgstr "Getting Started"
 msgid "Getting an Account:"
 msgstr "Getting an Account:"
 
-#: src/domains/DomainsPage.js:150
+#: src/domains/DomainsPage.js:126
 msgid "Getting domain statuses"
 msgstr "Getting domain statuses"
 
-#: src/components/InfoPanel.js:32
+#: src/components/InfoPanel.js:27
 msgid "Glossary"
 msgstr "Glossary"
 
@@ -1340,10 +1346,9 @@ msgstr "Government of Canada Employees"
 #~ msgid "Graph direction:"
 #~ msgstr "Graph direction:"
 
-#: src/app/App.js:350
-#: src/app/ReadGuidancePage.js:28
-#: src/dmarc/DmarcReportPage.js:193
-#: src/dmarc/DmarcReportPage.js:606
+#: src/app/App.js:337
+#: src/dmarc/DmarcReportPage.js:196
+#: src/dmarc/DmarcReportPage.js:690
 msgid "Guidance"
 msgstr "Guidance"
 
@@ -1351,7 +1356,7 @@ msgstr "Guidance"
 #~ msgid "Guidance Tags"
 #~ msgstr "Guidance Tags"
 
-#: src/guidance/GuidancePage.js:43
+#: src/guidance/GuidancePage.js:45
 msgid "Guidance results"
 msgstr "Guidance results"
 
@@ -1360,13 +1365,13 @@ msgstr "Guidance results"
 #~ msgid "Guidance:"
 #~ msgstr "Guidance:"
 
-#: src/domains/DomainCard.js:163
+#: src/domains/DomainCard.js:162
 msgid "HIDDEN"
 msgstr "HIDDEN"
 
-#: src/domains/DomainCard.js:186
-#: src/domains/DomainsPage.js:156
-#: src/organizationDetails/OrganizationDomains.js:283
+#: src/domains/DomainCard.js:185
+#: src/domains/DomainsPage.js:157
+#: src/organizationDetails/OrganizationDomains.js:282
 msgid "HSTS"
 msgstr "HSTS"
 
@@ -1391,7 +1396,7 @@ msgid "HSTS Preloaded"
 msgstr "HSTS Preloaded"
 
 #: src/domains/DomainsPage.js:70
-#: src/organizationDetails/OrganizationDomains.js:86
+#: src/organizationDetails/OrganizationDomains.js:82
 msgid "HSTS Status"
 msgstr "HSTS Status"
 
@@ -1411,9 +1416,9 @@ msgstr "HTTP Live"
 msgid "HTTP Upgrades"
 msgstr "HTTP Upgrades"
 
-#: src/domains/DomainCard.js:185
-#: src/domains/DomainsPage.js:158
-#: src/organizationDetails/OrganizationDomains.js:285
+#: src/domains/DomainCard.js:184
+#: src/domains/DomainsPage.js:159
+#: src/organizationDetails/OrganizationDomains.js:284
 msgid "HTTPS"
 msgstr "HTTPS"
 
@@ -1443,7 +1448,7 @@ msgid "HTTPS Scan Complete"
 msgstr "HTTPS Scan Complete"
 
 #: src/domains/DomainsPage.js:69
-#: src/organizationDetails/OrganizationDomains.js:85
+#: src/organizationDetails/OrganizationDomains.js:81
 msgid "HTTPS Status"
 msgstr "HTTPS Status"
 
@@ -1459,11 +1464,11 @@ msgstr "HTTPS is configured and HTTP connections redirect to HTTPS"
 msgid "HTTPS scan for domain \"{0}\" has completed."
 msgstr "HTTPS scan for domain \"{0}\" has completed."
 
-#: src/guidance/WebTLSResults.js:395
+#: src/guidance/WebTLSResults.js:436
 msgid "Hash Algorithm:"
 msgstr "Hash Algorithm:"
 
-#: src/dmarc/DmarcReportPage.js:188
+#: src/dmarc/DmarcReportPage.js:191
 msgid "Header From"
 msgstr "Header From"
 
@@ -1471,21 +1476,25 @@ msgstr "Header From"
 #~ msgid "Heartbleed Vulnerability:"
 #~ msgstr "Heartbleed Vulnerability:"
 
+#: src/guidance/WebTLSResults.js:229
+msgid "Heartbleed Vulnerable"
+msgstr "Heartbleed Vulnerable"
+
 #: src/app/ReadGuidancePage.js:23
 #~ msgid "Help us make government websites more secure. Please complete the following steps to become compliant with the Government of Canada's web security standards. If you have any questions about this process, please <0>contact us</0>."
 #~ msgstr "Help us make government websites more secure. Please complete the following steps to become compliant with the Government of Canada's web security standards. If you have any questions about this process, please <0>contact us</0>."
 
-#: src/admin/AdminDomainCard.js:68
+#: src/admin/AdminDomainCard.js:44
 #: src/organizationDetails/OrganizationDomains.js:102
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/admin/AdminDomainModal.js:398
+#: src/admin/AdminDomainModal.js:346
 msgid "Hide domain"
 msgstr "Hide domain"
 
-#: src/app/App.js:83
-#: src/app/App.js:155
+#: src/app/App.js:77
+#: src/app/App.js:146
 #: src/app/FloatingMenu.js:175
 msgid "Home"
 msgstr "Home"
@@ -1498,8 +1507,7 @@ msgstr "Home"
 msgid "Host from reverse DNS of source IP address."
 msgstr "Host from reverse DNS of source IP address."
 
-#: src/app/ReadGuidancePage.js:396
-#: src/guidance/WebTLSResults.js:247
+#: src/guidance/WebTLSResults.js:288
 msgid "Hostname Matches"
 msgstr "Hostname Matches"
 
@@ -1507,7 +1515,7 @@ msgstr "Hostname Matches"
 #~ msgid "Hostname Validated"
 #~ msgstr "Hostname Validated"
 
-#: src/app/ReadGuidancePage.js:239
+#: src/app/ReadGuidancePage.js:396
 msgid "How can I edit my domain list?"
 msgstr "How can I edit my domain list?"
 
@@ -1515,7 +1523,7 @@ msgstr "How can I edit my domain list?"
 msgid "I agree to all <0>Terms, Privacy Policy & Code of Conduct Guidelines <1/></0>"
 msgstr "I agree to all <0>Terms, Privacy Policy & Code of Conduct Guidelines <1/></0>"
 
-#: src/organizationDetails/OrganizationDomains.js:101
+#: src/organizationDetails/OrganizationDomains.js:98
 msgid "INACTIVE"
 msgstr "INACTIVE"
 
@@ -1568,7 +1576,7 @@ msgstr "If at any time you or your representatives wish to adjust or cancel thes
 #~ msgid "If at any time you or your representatives wish to adjust or cancel these services, please contact us at"
 #~ msgstr "If at any time you or your representatives wish to adjust or cancel these services, please contact us at"
 
-#: src/guidance/GuidancePage.js:73
+#: src/guidance/GuidancePage.js:75
 msgid "If you believe this could be the result of an issue with the scan, rescan the service using the refresh button. If you believe this is because the service no longer exists (NXDOMAIN), this domain should be removed from all affiliated organizations."
 msgstr "If you believe this could be the result of an issue with the scan, rescan the service using the refresh button. If you believe this is because the service no longer exists (NXDOMAIN), this domain should be removed from all affiliated organizations."
 
@@ -1580,15 +1588,15 @@ msgstr "If you believe this was caused by a problem with Tracker, please <0>Repo
 #~ msgid "If you believe this was caused by a problem with Tracker, please use the \"Report an Issue\" link below"
 #~ msgstr "If you believe this was caused by a problem with Tracker, please use the \"Report an Issue\" link below"
 
+#: src/app/ReadGuidancePage.js:88
+msgid "If your organization has no affiliated users within Tracker, contact the <0>TBS Cyber Security</0> to assist in onboarding."
+msgstr "If your organization has no affiliated users within Tracker, contact the <0>TBS Cyber Security</0> to assist in onboarding."
+
 #: src/guidance/WebConnectionResults.js:138
 #: src/guidance/WebConnectionResults.js:178
 msgid "Immediately"
 msgstr "Immediately"
 
-#: src/app/ReadGuidancePage.js:88
-msgid "If your organization has no affiliated users within Tracker, contact the <0>TBS Cyber Security</0> to assist in onboarding."
-msgstr "If your organization has no affiliated users within Tracker, contact the <0>TBS Cyber Security</0> to assist in onboarding."
-
 #: src/guidance/WebGuidance.js:19
 #~ msgid "Implementation"
 #~ msgstr "Implementation"
@@ -1613,7 +1621,7 @@ msgstr "Implementation: <0>Implementation guidance: email domain protection (ITS
 msgid "Implemented"
 msgstr "Implemented"
 
-#: src/organizationDetails/OrganizationDomains.js:101
+#: src/organizationDetails/OrganizationDomains.js:98
 msgid "Inactive"
 msgstr "Inactive"
 
@@ -1626,7 +1634,7 @@ msgstr "Incorrect authenticate.result typename."
 msgid "Incorrect closeAccount.result typename."
 msgstr "Incorrect closeAccount.result typename."
 
-#: src/admin/AdminDomainModal.js:108
+#: src/admin/AdminDomainModal.js:94
 msgid "Incorrect createDomain.result typename."
 msgstr "Incorrect createDomain.result typename."
 
@@ -1634,7 +1642,7 @@ msgstr "Incorrect createDomain.result typename."
 msgid "Incorrect createOrganization.result typename."
 msgstr "Incorrect createOrganization.result typename."
 
-#: src/admin/UserListModal.js:84
+#: src/admin/UserListModal.js:78
 msgid "Incorrect inviteUserToOrg.result typename."
 msgstr "Incorrect inviteUserToOrg.result typename."
 
@@ -1655,12 +1663,12 @@ msgstr "Incorrect removeOrganization.result typename."
 msgid "Incorrect resetPassword.result typename."
 msgstr "Incorrect resetPassword.result typename."
 
-#: src/admin/AdminDomainModal.js:107
-#: src/admin/AdminDomainModal.js:156
+#: src/admin/AdminDomainModal.js:93
+#: src/admin/AdminDomainModal.js:142
 #: src/admin/AdminDomains.js:133
 #: src/admin/SuperAdminUserList.js:110
-#: src/admin/UserListModal.js:83
-#: src/admin/UserListModal.js:132
+#: src/admin/UserListModal.js:77
+#: src/admin/UserListModal.js:124
 #: src/auth/CreateUserPage.js:83
 #: src/auth/ResetPasswordPage.js:60
 #: src/auth/SignInPage.js:100
@@ -1698,7 +1706,7 @@ msgstr "Incorrect typename received."
 msgid "Incorrect update method received."
 msgstr "Incorrect update method received."
 
-#: src/admin/AdminDomainModal.js:157
+#: src/admin/AdminDomainModal.js:143
 msgid "Incorrect updateDomain.result typename."
 msgstr "Incorrect updateDomain.result typename."
 
@@ -1718,7 +1726,7 @@ msgstr "Incorrect updateUserPassword.result typename."
 msgid "Incorrect updateUserProfile.result typename."
 msgstr "Incorrect updateUserProfile.result typename."
 
-#: src/admin/UserListModal.js:133
+#: src/admin/UserListModal.js:125
 msgid "Incorrect updateUserRole.result typename."
 msgstr "Incorrect updateUserRole.result typename."
 
@@ -1742,7 +1750,7 @@ msgstr "Individuals from a departmental information technology group may contact
 #~ msgid "Individuals with questions about the accuracy of their domain’s compliance data may contact the TBS Cyber Security mailbox."
 #~ msgstr "Individuals with questions about the accuracy of their domain’s compliance data may contact the TBS Cyber Security mailbox."
 
-#: src/organizationDetails/OrganizationDomains.js:224
+#: src/organizationDetails/OrganizationDomains.js:220
 msgid "Info"
 msgstr "Info"
 
@@ -1814,12 +1822,11 @@ msgstr "Is DKIM aligned. Can be true or false."
 msgid "Is SPF aligned. Can be true or false."
 msgstr "Is SPF aligned. Can be true or false."
 
-#: src/app/ReadGuidancePage.js:378
-#: src/guidance/WebTLSResults.js:383
+#: src/guidance/WebTLSResults.js:424
 msgid "Issuer:"
 msgstr "Issuer:"
 
-#: src/app/ReadGuidancePage.js:221
+#: src/app/ReadGuidancePage.js:378
 msgid "It is not clear to me why a domain has failed?"
 msgstr "It is not clear to me why a domain has failed?"
 
@@ -1881,11 +1888,11 @@ msgstr "Last 30 Days"
 #~ msgid "Last Scanned"
 #~ msgstr "Last Scanned"
 
-#: src/admin/WebCheckPage.js:154
+#: src/admin/WebCheckPage.js:136
 msgid "Last Scanned:"
 msgstr "Last Scanned:"
 
-#: src/guidance/WebTLSResults.js:267
+#: src/guidance/WebTLSResults.js:308
 msgid "Leaf Certificate is EV"
 msgstr "Leaf Certificate is EV"
 
@@ -1928,14 +1935,14 @@ msgstr "Login"
 msgid "Login to your account"
 msgstr "Login to your account"
 
-#: src/app/ReadGuidancePage.js:117
-msgid "Managing Your Domains:"
-msgstr "Managing Your Domains:"
-
 #: src/guidance/EmailGuidance.js:178
 msgid "Lookups:"
 msgstr "Lookups:"
 
+#: src/app/ReadGuidancePage.js:117
+msgid "Managing Your Domains:"
+msgstr "Managing Your Domains:"
+
 #: src/components/MonthSelect.js:19
 #: src/utilities/months.js:6
 msgid "March"
@@ -1965,15 +1972,15 @@ msgstr "Monitor DMARC reports and correct misconfigurations."
 msgid "Monitor DMARC reports;"
 msgstr "Monitor DMARC reports;"
 
+#: src/guidance/WebTLSResults.js:402
+msgid "More details"
+msgstr "More details"
+
 #: src/app/ReadGuidancePage.js:604
 msgid "Mozilla SSL Configuration Generator"
 msgstr "Mozilla SSL Configuration Generator"
 
-#: src/guidance/WebTLSResults.js:361
-msgid "More details"
-msgstr "More details"
-
-#: src/guidance/WebTLSResults.js:258
+#: src/guidance/WebTLSResults.js:299
 msgid "Must Staple"
 msgstr "Must Staple"
 
@@ -1981,11 +1988,11 @@ msgstr "Must Staple"
 #~ msgid "My Tracker"
 #~ msgstr "My Tracker"
 
-#: src/organizationDetails/OrganizationDomains.js:96
+#: src/organizationDetails/OrganizationDomains.js:93
 msgid "NEW"
 msgstr "NEW"
 
-#: src/admin/WebCheckPage.js:67
+#: src/admin/WebCheckPage.js:60
 #: src/createOrganization/CreateOrganizationPage.js:173
 #: src/createOrganization/CreateOrganizationPage.js:178
 #: src/organizations/Organizations.js:60
@@ -2004,7 +2011,7 @@ msgstr "Name (FR)"
 msgid "Name:"
 msgstr "Name:"
 
-#: src/guidance/WebTLSResults.js:365
+#: src/guidance/WebTLSResults.js:406
 msgid "Names:"
 msgstr "Names:"
 
@@ -2030,7 +2037,7 @@ msgstr "Negative"
 msgid "Never"
 msgstr "Never"
 
-#: src/organizationDetails/OrganizationDomains.js:96
+#: src/organizationDetails/OrganizationDomains.js:93
 msgid "New"
 msgstr "New"
 
@@ -2038,11 +2045,11 @@ msgstr "New"
 msgid "New Display Name:"
 msgstr "New Display Name:"
 
-#: src/admin/AdminDomainModal.js:280
+#: src/admin/AdminDomainModal.js:245
 msgid "New Domain URL"
 msgstr "New Domain URL"
 
-#: src/admin/AdminDomainModal.js:279
+#: src/admin/AdminDomainModal.js:245
 msgid "New Domain URL:"
 msgstr "New Domain URL:"
 
@@ -2071,16 +2078,17 @@ msgstr "New Value:"
 #: src/guidance/WebConnectionResults.js:188
 #: src/guidance/WebConnectionResults.js:206
 #: src/guidance/WebConnectionResults.js:215
-#: src/guidance/WebTLSResults.js:250
-#: src/guidance/WebTLSResults.js:261
-#: src/guidance/WebTLSResults.js:270
-#: src/guidance/WebTLSResults.js:281
-#: src/guidance/WebTLSResults.js:292
-#: src/guidance/WebTLSResults.js:303
-#: src/guidance/WebTLSResults.js:314
-#: src/guidance/WebTLSResults.js:380
-#: src/guidance/WebTLSResults.js:389
-#: src/guidance/WebTLSResults.js:392
+#: src/guidance/WebTLSResults.js:233
+#: src/guidance/WebTLSResults.js:291
+#: src/guidance/WebTLSResults.js:302
+#: src/guidance/WebTLSResults.js:311
+#: src/guidance/WebTLSResults.js:322
+#: src/guidance/WebTLSResults.js:333
+#: src/guidance/WebTLSResults.js:344
+#: src/guidance/WebTLSResults.js:355
+#: src/guidance/WebTLSResults.js:421
+#: src/guidance/WebTLSResults.js:430
+#: src/guidance/WebTLSResults.js:433
 msgid "No"
 msgstr "No"
 
@@ -2093,8 +2101,8 @@ msgid "No DMARC phase information available for this organization."
 msgstr "No DMARC phase information available for this organization."
 
 #: src/admin/AdminDomains.js:156
-#: src/domains/DomainsPage.js:88
-#: src/organizationDetails/OrganizationDomains.js:251
+#: src/domains/DomainsPage.js:89
+#: src/organizationDetails/OrganizationDomains.js:246
 msgid "No Domains"
 msgstr "No Domains"
 
@@ -2102,7 +2110,7 @@ msgstr "No Domains"
 msgid "No HTTPS configuration information available for this organization."
 msgstr "No HTTPS configuration information available for this organization."
 
-#: src/admin/WebCheckPage.js:101
+#: src/admin/WebCheckPage.js:94
 #: src/organizations/Organizations.js:81
 msgid "No Organizations"
 msgstr "No Organizations"
@@ -2139,12 +2147,12 @@ msgstr "No data for the Fully Aligned by IP Address table"
 msgid "No data for the SPF Failures by IP Address table"
 msgstr "No data for the SPF Failures by IP Address table"
 
-#: src/domains/DomainsPage.js:135
-#: src/domains/DomainsPage.js:143
+#: src/domains/DomainsPage.js:136
+#: src/domains/DomainsPage.js:144
 msgid "No data found"
 msgstr "No data found"
 
-#: src/domains/DomainsPage.js:136
+#: src/domains/DomainsPage.js:137
 msgid "No data found when retrieving all domain statuses."
 msgstr "No data found when retrieving all domain statuses."
 
@@ -2168,7 +2176,7 @@ msgstr "No known weak protocols used."
 msgid "No scan data for this organization."
 msgstr "No scan data for this organization."
 
-#: src/guidance/GuidancePage.js:88
+#: src/guidance/GuidancePage.js:90
 msgid "No scan data is currently available for this service. You may request a scan using the refresh button, or wait up to 24 hours for data to refresh."
 msgstr "No scan data is currently available for this service. You may request a scan using the refresh button, or wait up to 24 hours for data to refresh."
 
@@ -2189,12 +2197,12 @@ msgstr "Non-compliant"
 msgid "None"
 msgstr "None"
 
-#: src/guidance/WebTLSResults.js:352
-#: src/guidance/WebTLSResults.js:377
+#: src/guidance/WebTLSResults.js:393
+#: src/guidance/WebTLSResults.js:418
 msgid "Not After:"
 msgstr "Not After:"
 
-#: src/guidance/WebTLSResults.js:374
+#: src/guidance/WebTLSResults.js:415
 msgid "Not Before:"
 msgstr "Not Before:"
 
@@ -2206,11 +2214,11 @@ msgstr "Not Implemented"
 msgid "Note that compliance data does not automatically refresh. Modifications to domains could take 24 hours to update."
 msgstr "Note that compliance data does not automatically refresh. Modifications to domains could take 24 hours to update."
 
-#: src/admin/AdminDomainModal.js:432
+#: src/admin/AdminDomainModal.js:376
 msgid "Note: This could affect results for multiple organizations"
 msgstr "Note: This could affect results for multiple organizations"
 
-#: src/admin/AdminDomainModal.js:427
+#: src/admin/AdminDomainModal.js:374
 msgid "Note: This will affect results for {orgCount} organizations"
 msgstr "Note: This will affect results for {orgCount} organizations"
 
@@ -2299,26 +2307,26 @@ msgstr "Organization name does not match."
 msgid "Organization not updated"
 msgstr "Organization not updated"
 
-#: src/guidance/GuidancePage.js:157
+#: src/guidance/GuidancePage.js:159
 msgid "Organization(s):"
 msgstr "Organization(s):"
 
 #: src/admin/AdminPage.js:77
 #: src/admin/AdminPage.js:93
-#: src/admin/UserListModal.js:255
+#: src/admin/UserListModal.js:238
 msgid "Organization:"
 msgstr "Organization:"
 
 #: src/admin/AdminPage.js:189
-#: src/app/App.js:89
-#: src/app/App.js:195
+#: src/app/App.js:83
+#: src/app/App.js:186
 #: src/app/FloatingMenu.js:103
 #: src/organizations/Organizations.js:72
 #: src/organizations/Organizations.js:109
 msgid "Organizations"
 msgstr "Organizations"
 
-#: src/organizationDetails/OrganizationDomains.js:97
+#: src/organizationDetails/OrganizationDomains.js:94
 msgid "PROD"
 msgstr "PROD"
 
@@ -2326,9 +2334,9 @@ msgstr "PROD"
 msgid "Page {0} of {1}"
 msgstr "Page {0} of {1}"
 
-#: src/dmarc/DmarcReportPage.js:117
-#: src/dmarc/DmarcReportPage.js:118
-#: src/organizationDetails/OrganizationDomains.js:221
+#: src/dmarc/DmarcReportPage.js:120
+#: src/dmarc/DmarcReportPage.js:121
+#: src/organizationDetails/OrganizationDomains.js:217
 msgid "Pass"
 msgstr "Pass"
 
@@ -2410,7 +2418,7 @@ msgstr "Phone number field must not be empty"
 msgid "Phone number must be a valid phone number that is 10-15 digits long"
 msgstr "Phone number must be a valid phone number that is 10-15 digits long"
 
-#: src/admin/AdminDomainModal.js:442
+#: src/admin/AdminDomainModal.js:382
 msgid "Please allow up to 24 hours for summaries to reflect any changes."
 msgstr "Please allow up to 24 hours for summaries to reflect any changes."
 
@@ -2465,7 +2473,7 @@ msgstr "Positive"
 #~ msgid "Preloaded Status:"
 #~ msgstr "Preloaded Status:"
 
-#: src/admin/AdminDomainModal.js:384
+#: src/admin/AdminDomainModal.js:333
 msgid "Prevent this domain from being counted in your organization's summaries."
 msgstr "Prevent this domain from being counted in your organization's summaries."
 
@@ -2473,7 +2481,7 @@ msgstr "Prevent this domain from being counted in your organization's summaries.
 #~ msgid "Prevent this domain from being scanned and being counted in any summaries."
 #~ msgstr "Prevent this domain from being scanned and being counted in any summaries."
 
-#: src/admin/AdminDomainModal.js:406
+#: src/admin/AdminDomainModal.js:353
 msgid "Prevent this domain from being visible, scanned, and being counted in any summaries."
 msgstr "Prevent this domain from being visible, scanned, and being counted in any summaries."
 
@@ -2481,7 +2489,7 @@ msgstr "Prevent this domain from being visible, scanned, and being counted in an
 #~ msgid "Previous"
 #~ msgstr "Previous"
 
-#: src/app/App.js:334
+#: src/app/App.js:321
 #: src/app/FloatingMenu.js:219
 #: src/app/SlideMessage.js:88
 #: src/termsConditions/TermsConditionsPage.js:41
@@ -2496,7 +2504,7 @@ msgstr "Privacy Act."
 msgid "Privacy Notice Statement"
 msgstr "Privacy Notice Statement"
 
-#: src/organizationDetails/OrganizationDomains.js:97
+#: src/organizationDetails/OrganizationDomains.js:94
 msgid "Prod"
 msgstr "Prod"
 
@@ -2504,16 +2512,16 @@ msgstr "Prod"
 msgid "Protect domains that do not send email - GOV.UK (www.gov.uk)"
 msgstr "Protect domains that do not send email - GOV.UK (www.gov.uk)"
 
-#: src/domains/DomainCard.js:188
-#: src/domains/DomainsPage.js:161
+#: src/domains/DomainCard.js:187
+#: src/domains/DomainsPage.js:162
 #: src/guidance/WebTLSResults.js:52
-#: src/organizationDetails/OrganizationDomains.js:288
-#: src/organizationDetails/OrganizationDomains.js:329
+#: src/organizationDetails/OrganizationDomains.js:287
+#: src/organizationDetails/OrganizationDomains.js:326
 msgid "Protocols"
 msgstr "Protocols"
 
-#: src/domains/DomainsPage.js:73
-#: src/organizationDetails/OrganizationDomains.js:89
+#: src/domains/DomainsPage.js:74
+#: src/organizationDetails/OrganizationDomains.js:86
 msgid "Protocols Status"
 msgstr "Protocols Status"
 
@@ -2546,11 +2554,15 @@ msgstr "Province (FR)"
 msgid "Province:"
 msgstr "Province:"
 
+#: src/guidance/WebTLSResults.js:253
+msgid "ROBOT Vulnerable"
+msgstr "ROBOT Vulnerable"
+
 #: src/app/ReadGuidancePage.js:259
 #~ msgid "Read Guidance"
 #~ msgstr "Read Guidance"
 
-#: src/app/App.js:193
+#: src/app/App.js:184
 msgid "Read guidance"
 msgstr "Read guidance"
 
@@ -2559,11 +2571,11 @@ msgstr "Read guidance"
 msgid "Reason"
 msgstr "Reason"
 
-#: src/guidance/WebTLSResults.js:278
+#: src/guidance/WebTLSResults.js:319
 msgid "Received Chain Contains Anchor Certificate"
 msgstr "Received Chain Contains Anchor Certificate"
 
-#: src/guidance/WebTLSResults.js:289
+#: src/guidance/WebTLSResults.js:330
 msgid "Received Chain Has Valid Order"
 msgstr "Received Chain Has Valid Order"
 
@@ -2573,7 +2585,7 @@ msgstr "Received Chain Has Valid Order"
 msgid "Record:"
 msgstr "Record:"
 
-#: src/app/ReadGuidancePage.js:355
+#: src/app/ReadGuidancePage.js:555
 msgid "References:"
 msgstr "References:"
 
@@ -2603,7 +2615,7 @@ msgstr "Remove Domain"
 msgid "Remove Organization"
 msgstr "Remove Organization"
 
-#: src/admin/UserListModal.js:235
+#: src/admin/UserListModal.js:218
 msgid "Remove User"
 msgstr "Remove User"
 
@@ -2611,7 +2623,7 @@ msgstr "Remove User"
 msgid "Removed Organization"
 msgstr "Removed Organization"
 
-#: src/app/App.js:342
+#: src/app/App.js:329
 #: src/app/FloatingMenu.js:230
 #: src/app/SlideMessage.js:99
 msgid "Report an Issue"
@@ -2621,7 +2633,7 @@ msgstr "Report an Issue"
 msgid "Request a domain to be scanned:"
 msgstr "Request a domain to be scanned:"
 
-#: src/domains/DomainsPage.js:126
+#: src/domains/DomainsPage.js:127
 msgid "Request successfully sent to get all domain statuses - this may take a minute."
 msgstr "Request successfully sent to get all domain statuses - this may take a minute."
 
@@ -2641,7 +2653,7 @@ msgstr "Requirements: <0>Email Management Services Configuration Requirements</0
 msgid "Requirements: <0>Web Sites and Services Management Configuration Requirements</0>"
 msgstr "Requirements: <0>Web Sites and Services Management Configuration Requirements</0>"
 
-#: src/app/App.js:220
+#: src/app/App.js:178
 msgid "Reset Password"
 msgstr "Reset Password"
 
@@ -2680,15 +2692,15 @@ msgstr "Results for scans of email technologies (DMARC, SPF, DKIM)."
 msgid "Results for scans of web technologies (TLS, HTTPS)."
 msgstr "Results for scans of web technologies (TLS, HTTPS)."
 
-#: src/guidance/WebTLSResults.js:392
+#: src/guidance/WebTLSResults.js:433
 msgid "Revoked:"
 msgstr "Revoked:"
 
-#: src/admin/UserListModal.js:113
+#: src/admin/UserListModal.js:105
 msgid "Role updated"
 msgstr "Role updated"
 
-#: src/admin/UserListModal.js:263
+#: src/admin/UserListModal.js:246
 msgid "Role:"
 msgstr "Role:"
 
@@ -2697,12 +2709,12 @@ msgstr "Role:"
 msgid "Rotate DKIM keys annually."
 msgstr "Rotate DKIM keys annually."
 
-#: src/guidance/WebTLSResults.js:399
+#: src/guidance/WebTLSResults.js:440
 msgid "SAN List:"
 msgstr "SAN List:"
 
-#: src/domains/DomainsPage.js:162
-#: src/organizationDetails/OrganizationDomains.js:289
+#: src/domains/DomainsPage.js:163
+#: src/organizationDetails/OrganizationDomains.js:288
 msgid "SPF"
 msgstr "SPF"
 
@@ -2728,8 +2740,8 @@ msgstr "SPF Failures by IP Address"
 msgid "SPF Results"
 msgstr "SPF Results"
 
-#: src/domains/DomainsPage.js:74
-#: src/organizationDetails/OrganizationDomains.js:90
+#: src/domains/DomainsPage.js:75
+#: src/organizationDetails/OrganizationDomains.js:87
 msgid "SPF Status"
 msgstr "SPF Status"
 
@@ -2750,11 +2762,11 @@ msgstr "SPF Status"
 #~ msgid "SSL scan for domain \"{0}\" has completed."
 #~ msgstr "SSL scan for domain \"{0}\" has completed."
 
-#: src/organizationDetails/OrganizationDomains.js:98
+#: src/organizationDetails/OrganizationDomains.js:95
 msgid "STAGING"
 msgstr "STAGING"
 
-#: src/admin/UserListModal.js:285
+#: src/admin/UserListModal.js:265
 msgid "SUPER_ADMIN"
 msgstr "SUPER_ADMIN"
 
@@ -2771,8 +2783,8 @@ msgstr "Save"
 msgid "Scan Domain"
 msgstr "Scan Domain"
 
-#: src/domains/DomainCard.js:143
-#: src/guidance/GuidancePage.js:138
+#: src/domains/DomainCard.js:141
+#: src/guidance/GuidancePage.js:140
 msgid "Scan Pending"
 msgstr "Scan Pending"
 
@@ -2810,12 +2822,12 @@ msgstr "Search by initiated by, resource name"
 
 #: src/dmarc/DmarcByDomainPage.js:221
 #: src/dmarc/DmarcByDomainPage.js:292
-#: src/domains/DomainsPage.js:228
-#: src/organizationDetails/OrganizationDomains.js:351
+#: src/domains/DomainsPage.js:189
+#: src/organizationDetails/OrganizationDomains.js:313
 msgid "Search for a domain"
 msgstr "Search for a domain"
 
-#: src/admin/WebCheckPage.js:192
+#: src/admin/WebCheckPage.js:174
 msgid "Search for a tagged organization"
 msgstr "Search for a tagged organization"
 
@@ -2834,7 +2846,7 @@ msgstr "Search for an organization"
 #: src/admin/AdminDomains.js:252
 #: src/admin/UserList.js:149
 #: src/components/ReactTableGlobalFilter.js:36
-#: src/components/SearchBox.js:67
+#: src/components/SearchBox.js:44
 msgid "Search:"
 msgstr "Search:"
 
@@ -2879,7 +2891,7 @@ msgstr "Selector must be either a string containing alphanumeric characters and
 #~ msgid "Selector must be string ending in '._domainkey'"
 #~ msgstr "Selector must be string ending in '._domainkey'"
 
-#: src/guidance/WebTLSResults.js:389
+#: src/guidance/WebTLSResults.js:430
 msgid "Self-signed:"
 msgstr "Self-signed:"
 
@@ -2888,7 +2900,7 @@ msgstr "Self-signed:"
 msgid "September"
 msgstr "September"
 
-#: src/guidance/WebTLSResults.js:371
+#: src/guidance/WebTLSResults.js:412
 msgid "Serial:"
 msgstr "Serial:"
 
@@ -2910,7 +2922,7 @@ msgstr "Show {pageSize}"
 msgid "Showing data for period:"
 msgstr "Showing data for period:"
 
-#: src/guidance/WebTLSResults.js:285
+#: src/guidance/WebTLSResults.js:326
 msgid "Shows if all the certificates in the bundle provided by the server were sent in the correct order."
 msgstr "Shows if all the certificates in the bundle provided by the server were sent in the correct order."
 
@@ -2942,10 +2954,14 @@ msgstr "Shows if the HTTPS connection is live."
 msgid "Shows if the HTTPS endpoint downgrades to unsecured HTTP immediately, eventually, or never."
 msgstr "Shows if the HTTPS endpoint downgrades to unsecured HTTP immediately, eventually, or never."
 
-#: src/guidance/WebTLSResults.js:274
+#: src/guidance/WebTLSResults.js:315
 msgid "Shows if the certificate bundle provided from the server included the root certificate."
 msgstr "Shows if the certificate bundle provided from the server included the root certificate."
 
+#: src/organizationDetails/OrganizationDomains.js:279
+msgid "Shows if the domain has a valid SSL certificate."
+msgstr "Shows if the domain has a valid SSL certificate."
+
 #: src/domains/DomainsPage.js:185
 #: src/organizationDetails/OrganizationDomains.js:126
 #~ msgid "Shows if the domain is compliant with"
@@ -2961,66 +2977,74 @@ msgstr "Shows if the certificate bundle provided from the server included the ro
 #~ msgid "Shows if the domain is policy compliant."
 #~ msgstr "Shows if the domain is policy compliant."
 
-#: src/domains/DomainsPage.js:165
-#: src/organizationDetails/OrganizationDomains.js:292
+#: src/domains/DomainsPage.js:166
+#: src/organizationDetails/OrganizationDomains.js:291
 msgid "Shows if the domain meets the DomainKeys Identified Mail (DKIM) requirements."
 msgstr "Shows if the domain meets the DomainKeys Identified Mail (DKIM) requirements."
 
-#: src/domains/DomainsPage.js:156
-#: src/organizationDetails/OrganizationDomains.js:283
+#: src/domains/DomainsPage.js:157
+#: src/organizationDetails/OrganizationDomains.js:282
 msgid "Shows if the domain meets the HSTS requirements."
 msgstr "Shows if the domain meets the HSTS requirements."
 
-#: src/domains/DomainsPage.js:159
-#: src/organizationDetails/OrganizationDomains.js:286
+#: src/domains/DomainsPage.js:160
+#: src/organizationDetails/OrganizationDomains.js:285
 msgid "Shows if the domain meets the Hypertext Transfer Protocol Secure (HTTPS) requirements."
 msgstr "Shows if the domain meets the Hypertext Transfer Protocol Secure (HTTPS) requirements."
 
-#: src/domains/DomainsPage.js:169
-#: src/organizationDetails/OrganizationDomains.js:296
+#: src/domains/DomainsPage.js:170
+#: src/organizationDetails/OrganizationDomains.js:295
 msgid "Shows if the domain meets the Message Authentication, Reporting, and Conformance (DMARC) requirements."
 msgstr "Shows if the domain meets the Message Authentication, Reporting, and Conformance (DMARC) requirements."
 
-#: src/domains/DomainsPage.js:162
-#: src/organizationDetails/OrganizationDomains.js:289
+#: src/domains/DomainsPage.js:163
+#: src/organizationDetails/OrganizationDomains.js:288
 msgid "Shows if the domain meets the Sender Policy Framework (SPF) requirements."
 msgstr "Shows if the domain meets the Sender Policy Framework (SPF) requirements."
 
-#: src/domains/DomainsPage.js:161
-#: src/organizationDetails/OrganizationDomains.js:288
+#: src/domains/DomainsPage.js:162
+#: src/organizationDetails/OrganizationDomains.js:287
 msgid "Shows if the domain uses acceptable protocols."
 msgstr "Shows if the domain uses acceptable protocols."
 
-#: src/domains/DomainsPage.js:154
-#: src/organizationDetails/OrganizationDomains.js:281
+#: src/domains/DomainsPage.js:155
+#: src/organizationDetails/OrganizationDomains.js:280
 msgid "Shows if the domain uses only ciphers that are strong or acceptable."
 msgstr "Shows if the domain uses only ciphers that are strong or acceptable."
 
-#: src/domains/DomainsPage.js:155
-#: src/organizationDetails/OrganizationDomains.js:282
+#: src/domains/DomainsPage.js:156
+#: src/organizationDetails/OrganizationDomains.js:281
 msgid "Shows if the domain uses only curves that are strong or acceptable."
 msgstr "Shows if the domain uses only curves that are strong or acceptable."
 
-#: src/guidance/WebTLSResults.js:243
+#: src/guidance/WebTLSResults.js:284
 msgid "Shows if the hostname on the server certificate matches the the hostname from the HTTP request."
 msgstr "Shows if the hostname on the server certificate matches the the hostname from the HTTP request."
 
-#: src/guidance/WebTLSResults.js:254
+#: src/guidance/WebTLSResults.js:295
 msgid "Shows if the leaf certificate includes the \"OCSP Must-Staple\" extension."
 msgstr "Shows if the leaf certificate includes the \"OCSP Must-Staple\" extension."
 
-#: src/guidance/WebTLSResults.js:264
+#: src/guidance/WebTLSResults.js:305
 msgid "Shows if the leaf certificate is an Extended Validation Certificate."
 msgstr "Shows if the leaf certificate is an Extended Validation Certificate."
 
-#: src/guidance/WebTLSResults.js:296
+#: src/guidance/WebTLSResults.js:337
 msgid "Shows if the received certificates are free from the use of the deprecated SHA-1 algorithm."
 msgstr "Shows if the received certificates are free from the use of the deprecated SHA-1 algorithm."
 
-#: src/guidance/WebTLSResults.js:307
+#: src/guidance/WebTLSResults.js:348
 msgid "Shows if the received certificates are not relying on a distrusted Symantec root certificate."
 msgstr "Shows if the received certificates are not relying on a distrusted Symantec root certificate."
 
+#: src/guidance/WebTLSResults.js:224
+msgid "Shows if the server was found to be vulnerable to the Heartbleed vulnerability."
+msgstr "Shows if the server was found to be vulnerable to the Heartbleed vulnerability."
+
+#: src/guidance/WebTLSResults.js:237
+msgid "Shows if the server was found to be vulnerable to the ROBOT vulnerability."
+msgstr "Shows if the server was found to be vulnerable to the ROBOT vulnerability."
+
 #: src/guidance/WebConnectionResults.js:191
 msgid "Shows the duration of time, in seconds, that the HSTS header is valid."
 msgstr "Shows the duration of time, in seconds, that the HSTS header is valid."
@@ -3065,9 +3089,9 @@ msgstr "Shows the total number of emails that have been sent by this domain duri
 #~ msgid "Siganture Hash:"
 #~ msgstr "Siganture Hash:"
 
-#: src/app/App.js:165
+#: src/app/App.js:156
 #: src/app/FloatingMenu.js:197
-#: src/app/TopBanner.js:134
+#: src/app/TopBanner.js:118
 #: src/auth/SignInPage.js:189
 msgid "Sign In"
 msgstr "Sign In"
@@ -3078,12 +3102,12 @@ msgid "Sign In."
 msgstr "Sign In."
 
 #: src/app/FloatingMenu.js:192
-#: src/app/TopBanner.js:122
+#: src/app/TopBanner.js:106
 msgid "Sign Out"
 msgstr "Sign Out"
 
 #: src/app/FloatingMenu.js:48
-#: src/app/TopBanner.js:41
+#: src/app/TopBanner.js:40
 msgid "Sign Out."
 msgstr "Sign Out."
 
@@ -3091,11 +3115,11 @@ msgstr "Sign Out."
 #~ msgid "Sign in with your username and password."
 #~ msgstr "Sign in with your username and password."
 
-#: src/guidance/WebTLSResults.js:357
+#: src/guidance/WebTLSResults.js:398
 msgid "Signature Hash:"
 msgstr "Signature Hash:"
 
-#: src/app/App.js:77
+#: src/app/App.js:71
 msgid "Skip to main content"
 msgstr "Skip to main content"
 
@@ -3103,7 +3127,7 @@ msgstr "Skip to main content"
 msgid "Slug:"
 msgstr "Slug:"
 
-#: src/components/SearchBox.js:95
+#: src/components/SearchBox.js:66
 msgid "Sort by:"
 msgstr "Sort by:"
 
@@ -3111,7 +3135,7 @@ msgstr "Sort by:"
 msgid "Source IP Address"
 msgstr "Source IP Address"
 
-#: src/organizationDetails/OrganizationDomains.js:98
+#: src/organizationDetails/OrganizationDomains.js:95
 msgid "Staging"
 msgstr "Staging"
 
@@ -3119,7 +3143,7 @@ msgstr "Staging"
 #~ msgid "Status"
 #~ msgstr "Status"
 
-#: src/organizationDetails/OrganizationDomains.js:208
+#: src/organizationDetails/OrganizationDomains.js:191
 msgid "Status or tag"
 msgstr "Status or tag"
 
@@ -3139,7 +3163,7 @@ msgstr "Status:"
 #~ msgid "Strong Curves:"
 #~ msgstr "Strong Curves:"
 
-#: src/guidance/WebTLSResults.js:368
+#: src/guidance/WebTLSResults.js:409
 msgid "Subject:"
 msgstr "Subject:"
 
@@ -3148,7 +3172,7 @@ msgstr "Subject:"
 msgid "Submit"
 msgstr "Submit"
 
-#: src/admin/UserListModal.js:164
+#: src/admin/UserListModal.js:154
 msgid "Successfully removed user {0}."
 msgstr "Successfully removed user {0}."
 
@@ -3165,7 +3189,7 @@ msgstr "Super Admin Menu:"
 #~ msgid "Supports ECDH Key Exchange:"
 #~ msgstr "Supports ECDH Key Exchange:"
 
-#: src/app/TopBanner.js:67
+#: src/app/TopBanner.js:61
 msgid "Symbol of the Government of Canada"
 msgstr "Symbol of the Government of Canada"
 
@@ -3185,7 +3209,7 @@ msgstr "TBS be identified as the source; and"
 msgid "TBS reserves the right to refuse service, and may reject your application for an account, or cancel an existing account, for any reason, at our sole discretion."
 msgstr "TBS reserves the right to refuse service, and may reject your application for an account, or cancel an existing account, for any reason, at our sole discretion."
 
-#: src/organizationDetails/OrganizationDomains.js:99
+#: src/organizationDetails/OrganizationDomains.js:96
 msgid "TEST"
 msgstr "TEST"
 
@@ -3193,7 +3217,7 @@ msgstr "TEST"
 #~ msgid "TLS"
 #~ msgstr "TLS"
 
-#: src/guidance/WebTLSResults.js:208
+#: src/guidance/WebTLSResults.js:211
 msgid "TLS Results"
 msgstr "TLS Results"
 
@@ -3205,7 +3229,7 @@ msgstr "TLS Scan Complete"
 msgid "TLS scan for domain \"{0}\" has completed."
 msgstr "TLS scan for domain \"{0}\" has completed."
 
-#: src/organizationDetails/OrganizationDomains.js:174
+#: src/organizationDetails/OrganizationDomains.js:165
 msgid "Tag"
 msgstr "Tag"
 
@@ -3217,11 +3241,11 @@ msgstr "Technical implementation guidance:"
 msgid "Termination"
 msgstr "Termination"
 
-#: src/app/App.js:189
+#: src/app/App.js:180
 msgid "Terms & Conditions"
 msgstr "Terms & Conditions"
 
-#: src/app/App.js:338
+#: src/app/App.js:325
 #: src/app/FloatingMenu.js:225
 #: src/app/SlideMessage.js:92
 msgid "Terms & conditions"
@@ -3235,7 +3259,7 @@ msgstr "Terms and Conditions"
 msgid "Terms of Use"
 msgstr "Terms of Use"
 
-#: src/organizationDetails/OrganizationDomains.js:99
+#: src/organizationDetails/OrganizationDomains.js:96
 msgid "Test"
 msgstr "Test"
 
@@ -3267,16 +3291,16 @@ msgstr "The address/domain used in the \"From\" field."
 msgid "The advice, guidance or services provided to you by TBS will be provided on an “as-is” basis, without warrantee or representation of any kind, and TBS will not be liable for any loss, liability, damage or cost, including loss of data or interruptions of business arising from the provision of such advice, guidance or services by Tracker. Consequently, TBS recommends, that the users exercise their own skill and care with respect to their use of the advice, guidance and services that Tracker provides."
 msgstr "The advice, guidance or services provided to you by TBS will be provided on an “as-is” basis, without warrantee or representation of any kind, and TBS will not be liable for any loss, liability, damage or cost, including loss of data or interruptions of business arising from the provision of such advice, guidance or services by Tracker. Consequently, TBS recommends, that the users exercise their own skill and care with respect to their use of the advice, guidance and services that Tracker provides."
 
+#: src/dmarc/DmarcByDomainPage.js:324
+#: src/domains/DomainsPage.js:154
+#: src/organizationDetails/OrganizationDomains.js:278
+msgid "The domain address."
+msgstr "The domain address."
+
 #: src/dmarc/DmarcReportPage.js:231
 msgid "The domains used for DKIM validation."
 msgstr "The domains used for DKIM validation."
 
-#: src/dmarc/DmarcByDomainPage.js:312
-#: src/domains/DomainsPage.js:153
-#: src/organizationDetails/OrganizationDomains.js:280
-msgid "The domain address."
-msgstr "The domain address."
-
 #: src/guidance/WebTLSResults.js:60
 msgid "The following ciphers are from known weak protocols and must be disabled:"
 msgstr "The following ciphers are from known weak protocols and must be disabled:"
@@ -3317,7 +3341,7 @@ msgstr "The results of DKIM verification of the message. Can be pass, fail, neut
 msgid "The summary cards show two metrics that Tracker scans:"
 msgstr "The summary cards show two metrics that Tracker scans:"
 
-#: src/admin/UserListModal.js:114
+#: src/admin/UserListModal.js:106
 msgid "The user's role has been successfully updated"
 msgstr "The user's role has been successfully updated"
 
@@ -3363,7 +3387,7 @@ msgstr "This domain no longer exists"
 msgid "This field cannot be empty"
 msgstr "This field cannot be empty"
 
-#: src/app/TopBanner.js:106
+#: src/app/TopBanner.js:90
 msgid "This is a new service, we are constantly improving."
 msgstr "This is a new service, we are constantly improving."
 
@@ -3387,11 +3411,11 @@ msgstr "Time Generated (UTC)"
 #~ msgid "Timestamp"
 #~ msgstr "Timestamp"
 
-#: src/app/App.js:127
+#: src/app/App.js:118
 msgid "To enable full app functionality and maximize your account's security, <0>please verify your account</0>."
 msgstr "To enable full app functionality and maximize your account's security, <0>please verify your account</0>."
 
-#: src/app/App.js:141
+#: src/app/App.js:132
 msgid "To maximize your account's security, <0>please activate a multi-factor authentication option</0>."
 msgstr "To maximize your account's security, <0>please activate a multi-factor authentication option</0>."
 
@@ -3435,11 +3459,11 @@ msgstr "Tracker does not automatically add selectors, so it is likely that they
 #~ msgid "Tracker does not automatically add selectors, so it is likely that they are not in the system yet. More information can be found in Getting Started with Tracker - Managing Your Domains."
 #~ msgstr "Tracker does not automatically add selectors, so it is likely that they are not in the system yet. More information can be found in Getting Started with Tracker - Managing Your Domains."
 
-#: src/app/TopBanner.js:81
+#: src/app/TopBanner.js:70
 msgid "Tracker logo outline"
 msgstr "Tracker logo outline"
 
-#: src/app/TopBanner.js:89
+#: src/app/TopBanner.js:73
 msgid "Tracker logo text"
 msgstr "Tracker logo text"
 
@@ -3468,11 +3492,11 @@ msgstr "Two-Factor Authentication:"
 msgid "URL:"
 msgstr "URL:"
 
-#: src/admin/UserListModal.js:276
+#: src/admin/UserListModal.js:258
 msgid "USER"
 msgstr "USER"
 
-#: src/admin/UserListModal.js:103
+#: src/admin/UserListModal.js:95
 msgid "Unable to change user role, please try again."
 msgstr "Unable to change user role, please try again."
 
@@ -3489,7 +3513,7 @@ msgstr "Unable to close this account."
 msgid "Unable to create account, please try again."
 msgstr "Unable to create account, please try again."
 
-#: src/admin/AdminDomainModal.js:98
+#: src/admin/AdminDomainModal.js:84
 msgid "Unable to create new domain."
 msgstr "Unable to create new domain."
 
@@ -3501,7 +3525,7 @@ msgstr "Unable to create new organization."
 msgid "Unable to create your account, please try again."
 msgstr "Unable to create your account, please try again."
 
-#: src/admin/UserListModal.js:74
+#: src/admin/UserListModal.js:68
 msgid "Unable to invite user."
 msgstr "Unable to invite user."
 
@@ -3518,7 +3542,7 @@ msgstr "Unable to remove domain."
 msgid "Unable to remove this organization."
 msgstr "Unable to remove this organization."
 
-#: src/admin/UserListModal.js:172
+#: src/admin/UserListModal.js:162
 msgid "Unable to remove user."
 msgstr "Unable to remove user."
 
@@ -3545,7 +3569,7 @@ msgstr "Unable to send verification email"
 msgid "Unable to sign in to your account, please try again."
 msgstr "Unable to sign in to your account, please try again."
 
-#: src/admin/AdminDomainModal.js:147
+#: src/admin/AdminDomainModal.js:133
 msgid "Unable to update domain."
 msgstr "Unable to update domain."
 
@@ -3577,7 +3601,7 @@ msgstr "Unable to update to your preferred language, please try again."
 msgid "Unable to update to your username, please try again."
 msgstr "Unable to update to your username, please try again."
 
-#: src/admin/UserListModal.js:123
+#: src/admin/UserListModal.js:115
 msgid "Unable to update user role."
 msgstr "Unable to update user role."
 
@@ -3597,10 +3621,15 @@ msgstr "Unable to verify your phone number, please try again."
 msgid "Understanding Scan Metrics:"
 msgstr "Understanding Scan Metrics:"
 
-#: src/domains/DomainCard.js:84
+#: src/domains/DomainCard.js:83
 msgid "Unfavourited Domain"
 msgstr "Unfavourited Domain"
 
+#: src/guidance/WebTLSResults.js:233
+#: src/guidance/WebTLSResults.js:256
+msgid "Unknown"
+msgstr "Unknown"
+
 #: src/summaries/RadialBarChart.js:43
 #: src/summaries/SummaryGroup.js:28
 #: src/summaries/SummaryGroup.js:54
@@ -3669,20 +3698,20 @@ msgstr "User List"
 msgid "User email does not match"
 msgstr "User email does not match"
 
-#: src/admin/UserListModal.js:64
+#: src/admin/UserListModal.js:58
 msgid "User invited"
 msgstr "User invited"
 
-#: src/admin/UserListModal.js:163
+#: src/admin/UserListModal.js:153
 msgid "User removed."
 msgstr "User removed."
 
-#: src/admin/UserListModal.js:247
+#: src/admin/UserListModal.js:230
 msgid "User:"
 msgstr "User:"
 
 #: src/admin/AdminPage.js:190
-#: src/admin/AdminPanel.js:31
+#: src/admin/AdminPanel.js:29
 #: src/organizationDetails/OrganizationDetails.js:143
 msgid "Users"
 msgstr "Users"
@@ -3691,7 +3720,7 @@ msgstr "Users"
 msgid "Users exercise due diligence in ensuring the accuracy of the materials reproduced;"
 msgstr "Users exercise due diligence in ensuring the accuracy of the materials reproduced;"
 
-#: src/organizationDetails/OrganizationDomains.js:164
+#: src/organizationDetails/OrganizationDomains.js:155
 msgid "Value"
 msgstr "Value"
 
@@ -3705,11 +3734,11 @@ msgstr "Verification code must only contains numbers"
 msgid "Verified"
 msgstr "Verified"
 
-#: src/guidance/WebTLSResults.js:311
+#: src/guidance/WebTLSResults.js:352
 msgid "Verified Chain Free of Legacy Symantec Anchor"
 msgstr "Verified Chain Free of Legacy Symantec Anchor"
 
-#: src/guidance/WebTLSResults.js:300
+#: src/guidance/WebTLSResults.js:341
 msgid "Verified Chain Free of SHA1 Signature"
 msgstr "Verified Chain Free of SHA1 Signature"
 
@@ -3729,11 +3758,11 @@ msgstr "Verify Account"
 msgid "View Details"
 msgstr "View Details"
 
-#: src/domains/DomainCard.js:222
+#: src/domains/DomainCard.js:221
 msgid "View Results"
 msgstr "View Results"
 
-#: src/dmarc/DmarcReportPage.js:577
+#: src/dmarc/DmarcReportPage.js:661
 msgid "Volume of messages spoofing domain (reject + quarantine + none):"
 msgstr "Volume of messages spoofing domain (reject + quarantine + none):"
 
@@ -3741,11 +3770,11 @@ msgstr "Volume of messages spoofing domain (reject + quarantine + none):"
 #~ msgid "Volume of messages spoofing {domainSlug} (reject + quarantine + none):"
 #~ msgstr "Volume of messages spoofing {domainSlug} (reject + quarantine + none):"
 
-#: src/admin/WebCheckPage.js:176
+#: src/admin/WebCheckPage.js:158
 msgid "Vulnerability Scan Dashboard"
 msgstr "Vulnerability Scan Dashboard"
 
-#: src/organizationDetails/OrganizationDomains.js:100
+#: src/organizationDetails/OrganizationDomains.js:97
 msgid "WEB"
 msgstr "WEB"
 
@@ -3781,20 +3810,20 @@ msgstr "We've sent you an email with an authentication code to sign into Tracker
 #~ msgid "Weak Curves:"
 #~ msgstr "Weak Curves:"
 
-#: src/organizationDetails/OrganizationDomains.js:100
+#: src/organizationDetails/OrganizationDomains.js:97
 msgid "Web"
 msgstr "Web"
 
-#: src/domains/DomainCard.js:182
+#: src/domains/DomainCard.js:181
 msgid "Web (HTTPS/TLS)"
 msgstr "Web (HTTPS/TLS)"
 
-#: src/admin/WebCheckPage.js:173
+#: src/admin/WebCheckPage.js:155
 msgid "Web Check"
 msgstr "Web Check"
 
 #: src/domains/ScanDomain.js:242
-#: src/guidance/GuidancePage.js:100
+#: src/guidance/GuidancePage.js:102
 msgid "Web Guidance"
 msgstr "Web Guidance"
 
@@ -3880,16 +3909,17 @@ msgstr "Wiki"
 #: src/guidance/WebConnectionResults.js:188
 #: src/guidance/WebConnectionResults.js:206
 #: src/guidance/WebConnectionResults.js:215
-#: src/guidance/WebTLSResults.js:250
-#: src/guidance/WebTLSResults.js:261
-#: src/guidance/WebTLSResults.js:270
-#: src/guidance/WebTLSResults.js:281
-#: src/guidance/WebTLSResults.js:292
-#: src/guidance/WebTLSResults.js:303
-#: src/guidance/WebTLSResults.js:314
-#: src/guidance/WebTLSResults.js:380
-#: src/guidance/WebTLSResults.js:389
-#: src/guidance/WebTLSResults.js:392
+#: src/guidance/WebTLSResults.js:233
+#: src/guidance/WebTLSResults.js:291
+#: src/guidance/WebTLSResults.js:302
+#: src/guidance/WebTLSResults.js:311
+#: src/guidance/WebTLSResults.js:322
+#: src/guidance/WebTLSResults.js:333
+#: src/guidance/WebTLSResults.js:344
+#: src/guidance/WebTLSResults.js:355
+#: src/guidance/WebTLSResults.js:421
+#: src/guidance/WebTLSResults.js:430
+#: src/guidance/WebTLSResults.js:433
 msgid "Yes"
 msgstr "Yes"
 
@@ -3909,12 +3939,12 @@ msgstr "You agree to protect any information disclosed to you by TBS in accordan
 msgid "You agree to use our website, products and services only for lawful purposes and in a manner that does not infringe the rights of, or restrict or inhibit the use and enjoyment of, the website, products or services by any third party. Additionally, you must not misuse, compromise or interfere with our services, or introduce material to our services that is malicious or technologically harmful. You must not attempt to gain unauthorized access to, tamper with, reverse engineer, or modify our website, products or services, the server(s) on which they are stored, or any server, computer or database connected to our website, products or services. We may suspend or stop providing our products or services to you if you do not comply with our terms or policies or if we are investigating suspected misconduct. Any suspected illegal use of our website, products or services may be reported to the relevant law enforcement authorities and where necessary we will co-operate with those authorities by disclosing your identity to them."
 msgstr "You agree to use our website, products and services only for lawful purposes and in a manner that does not infringe the rights of, or restrict or inhibit the use and enjoyment of, the website, products or services by any third party. Additionally, you must not misuse, compromise or interfere with our services, or introduce material to our services that is malicious or technologically harmful. You must not attempt to gain unauthorized access to, tamper with, reverse engineer, or modify our website, products or services, the server(s) on which they are stored, or any server, computer or database connected to our website, products or services. We may suspend or stop providing our products or services to you if you do not comply with our terms or policies or if we are investigating suspected misconduct. Any suspected illegal use of our website, products or services may be reported to the relevant law enforcement authorities and where necessary we will co-operate with those authorities by disclosing your identity to them."
 
-#: src/domains/DomainCard.js:60
+#: src/domains/DomainCard.js:58
 msgid "You have successfully added {url} to myTracker."
 msgstr "You have successfully added {url} to myTracker."
 
 #: src/app/FloatingMenu.js:49
-#: src/app/TopBanner.js:42
+#: src/app/TopBanner.js:41
 msgid "You have successfully been signed out."
 msgstr "You have successfully been signed out."
 
@@ -3927,7 +3957,7 @@ msgstr "You have successfully been signed out."
 msgid "You have successfully removed {0}."
 msgstr "You have successfully removed {0}."
 
-#: src/domains/DomainCard.js:86
+#: src/domains/DomainCard.js:84
 msgid "You have successfully removed {url} from myTracker."
 msgstr "You have successfully removed {url} from myTracker."
 
@@ -3975,7 +4005,7 @@ msgstr "You may now sign in with your new password"
 msgid "You will need a Tracker account to use certain products and services. You are responsible for maintaining the confidentiality of your account, password and for restricting access to your account. You also agree to accept responsibility for all activities that occur under your account or password. TBS accepts no liability for any loss or damage arising from your failure to maintain the security of your account or password."
 msgstr "You will need a Tracker account to use certain products and services. You are responsible for maintaining the confidentiality of your account, password and for restricting access to your account. You also agree to accept responsibility for all activities that occur under your account or password. TBS accepts no liability for any loss or damage arising from your failure to maintain the security of your account or password."
 
-#: src/app/App.js:271
+#: src/app/App.js:262
 msgid "Your Account"
 msgstr "Your Account"
 
@@ -4011,8 +4041,8 @@ msgstr "contact us"
 #~ msgid "https://https-everywhere.canada.ca/en/help/"
 #~ msgstr "https://https-everywhere.canada.ca/en/help/"
 
-#: src/app/App.js:105
-#: src/app/App.js:284
+#: src/app/App.js:97
+#: src/app/App.js:275
 #: src/user/MyTrackerPage.js:43
 #: src/user/MyTrackerPage.js:74
 msgid "myTracker"
@@ -4054,7 +4084,7 @@ msgstr "user email"
 msgid "weak"
 msgstr "weak"
 
-#: src/admin/AdminDomainModal.js:88
+#: src/admin/AdminDomainModal.js:75
 msgid "{0} was added to {orgSlug}"
 msgstr "{0} was added to {orgSlug}"
 
@@ -4074,11 +4104,11 @@ msgstr "{count} records..."
 msgid "{domainSlug} does not support aggregate data"
 msgstr "{domainSlug} does not support aggregate data"
 
-#: src/admin/AdminDomainModal.js:137
+#: src/admin/AdminDomainModal.js:123
 msgid "{editingDomainUrl} from {orgSlug} successfully updated to {0}"
 msgstr "{editingDomainUrl} from {orgSlug} successfully updated to {0}"
 
-#: src/components/InfoPanel.js:52
+#: src/components/InfoPanel.js:47
 msgid "{info}"
 msgstr "{info}"
 
@@ -4086,7 +4116,7 @@ msgstr "{info}"
 #~ msgid "{label}"
 #~ msgstr "{label}"
 
-#: src/components/InfoPanel.js:49
+#: src/components/InfoPanel.js:44
 msgid "{title}"
 msgstr "{title}"
 
diff --git a/frontend/src/locales/fr.po b/frontend/src/locales/fr.po
index 317a455afd..20c9d5dda7 100644
--- a/frontend/src/locales/fr.po
+++ b/frontend/src/locales/fr.po
@@ -57,7 +57,7 @@ msgstr "404 - Page non trouvée"
 #~ msgid "6.2.3 All remaining websites and web services must be accessible through a secure connection, as outlined in Section 6.1, by December 31, 2019."
 #~ msgstr "6.2.3 Tous les sites web et services web restants doivent être accessibles par une connexion sécurisée, comme indiqué à la section 6.1, d'ici le 31 décembre 2019."
 
-#: src/guidance/GuidancePage.js:68
+#: src/guidance/GuidancePage.js:70
 msgid "A DNS request for this service has resulted in the following error code:"
 msgstr "Une requête DNS pour ce service a donné lieu au code d'erreur suivant :"
 
@@ -77,11 +77,11 @@ msgstr "Une ventilation plus détaillée de chaque domaine peut être trouvée e
 msgid "A verification link has been sent to your email account"
 msgstr "Un lien de vérification a été envoyé à votre compte de messagerie."
 
-#: src/admin/UserListModal.js:280
+#: src/admin/UserListModal.js:261
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: src/domains/DomainCard.js:170
+#: src/domains/DomainCard.js:169
 msgid "ARCHIVED"
 msgstr "ARCHIVES"
 
@@ -110,7 +110,7 @@ msgstr "Compte"
 msgid "Account Closed Successfully"
 msgstr "Compte clôturé avec succès"
 
-#: src/app/App.js:110
+#: src/app/App.js:101
 #: src/app/FloatingMenu.js:177
 #: src/user/UserPage.js:150
 msgid "Account Settings"
@@ -120,7 +120,7 @@ msgstr "Paramètres du compte"
 msgid "Account created."
 msgstr "Compte créé"
 
-#: src/admin/WebCheckPage.js:68
+#: src/admin/WebCheckPage.js:61
 #: src/createOrganization/CreateOrganizationPage.js:184
 #: src/createOrganization/CreateOrganizationPage.js:189
 #: src/organizations/Organizations.js:61
@@ -155,7 +155,7 @@ msgstr "Action"
 msgid "Action:"
 msgstr "Action :"
 
-#: src/admin/AdminPanel.js:36
+#: src/admin/AdminPanel.js:32
 msgid "Activity"
 msgstr "Activité"
 
@@ -167,15 +167,15 @@ msgstr "Ajouter"
 msgid "Add Domain"
 msgstr "Ajouter un domaine"
 
-#: src/admin/AdminDomainModal.js:271
+#: src/admin/AdminDomainModal.js:240
 msgid "Add Domain Details"
 msgstr "Ajouter les détails du domaine"
 
-#: src/admin/UserListModal.js:237
+#: src/admin/UserListModal.js:220
 msgid "Add User"
 msgstr "Ajouter un utilisateur"
 
-#: src/app/App.js:216
+#: src/app/App.js:207
 msgid "Admin"
 msgstr "Administrateur"
 
@@ -183,7 +183,7 @@ msgstr "Administrateur"
 msgid "Admin Portal"
 msgstr "Portail Admin"
 
-#: src/app/App.js:118
+#: src/app/App.js:109
 msgid "Admin Profile"
 msgstr "Profil de l'administrateur"
 
@@ -224,11 +224,11 @@ msgid "An error occured when you attempted to download all domain statuses."
 msgstr "Une erreur s'est produite lorsque vous avez tenté de télécharger tous les statuts de domaine."
 
 #: src/app/FloatingMenu.js:38
-#: src/app/TopBanner.js:31
+#: src/app/TopBanner.js:30
 msgid "An error occured when you attempted to sign out"
 msgstr "Une erreur s'est produite lorsque vous avez tenté de vous déconnecter."
 
-#: src/domains/DomainCard.js:49
+#: src/domains/DomainCard.js:47
 msgid "An error occurred while favouriting a domain."
 msgstr "Une erreur s'est produite lors de la mise en favori d'un domaine."
 
@@ -240,7 +240,7 @@ msgstr "Une erreur s'est produite lors de la suppression de cette organisation."
 msgid "An error occurred while requesting a scan."
 msgstr "Une erreur s'est produite lors de la demande d'un scan."
 
-#: src/domains/DomainCard.js:75
+#: src/domains/DomainCard.js:73
 msgid "An error occurred while unfavouriting a domain."
 msgstr "Une erreur s'est produite lors du dé-favorisage d'un domaine."
 
@@ -280,11 +280,11 @@ msgstr "Une erreur s'est produite lors de la mise à jour de votre numéro de t
 msgid "An error occurred while verifying your phone number."
 msgstr "Une erreur s'est produite lors de la mise à jour de votre numéro de téléphone."
 
-#: src/admin/AdminDomainModal.js:75
-#: src/admin/AdminDomainModal.js:124
+#: src/admin/AdminDomainModal.js:63
+#: src/admin/AdminDomainModal.js:110
 #: src/admin/AdminDomains.js:103
-#: src/admin/UserListModal.js:53
-#: src/admin/UserListModal.js:151
+#: src/admin/UserListModal.js:47
+#: src/admin/UserListModal.js:141
 #: src/auth/TwoFactorAuthenticatePage.js:29
 #: src/createOrganization/CreateOrganizationPage.js:56
 #: src/user/UserPage.js:83
@@ -307,7 +307,7 @@ msgstr "Tous les produits ou services connexes qui vous sont fournis par le SCT
 #~ msgid "Application Portfolio Management (APM) systems; and"
 #~ msgstr "les systèmes de gestion du portefeuille d’applications (GPA);"
 
-#: src/organizationDetails/OrganizationDomains.js:237
+#: src/organizationDetails/OrganizationDomains.js:233
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -316,11 +316,11 @@ msgstr "Appliquer"
 msgid "April"
 msgstr "Avril"
 
-#: src/admin/AdminDomainModal.js:421
+#: src/admin/AdminDomainModal.js:368
 msgid "Archive domain"
 msgstr "Archiver ce domaine"
 
-#: src/admin/AdminDomainCard.js:80
+#: src/admin/AdminDomainCard.js:51
 #: src/organizationDetails/OrganizationDomains.js:103
 msgid "Archived"
 msgstr "Archivé"
@@ -352,11 +352,11 @@ msgstr "Journaux d'audit"
 msgid "August"
 msgstr "Août"
 
-#: src/app/App.js:182
+#: src/app/App.js:173
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: src/app/TopBanner.js:98
+#: src/app/TopBanner.js:82
 msgid "BETA"
 msgstr "BETA"
 
@@ -381,7 +381,7 @@ msgstr "Voici la façon dont les organisations gouvernementales peuvent tirer pa
 msgid "Blank fields will not be included when updating the organization."
 msgstr "Les champs vides ne seront pas pris en compte lors de la mise à jour de l'organisation."
 
-#: src/domains/DomainCard.js:138
+#: src/domains/DomainCard.js:136
 #: src/guidance/WebGuidance.js:83
 msgid "Blocked"
 msgstr "Bloqué"
@@ -416,18 +416,24 @@ msgstr "Les Canadiens comptent sur le gouvernement du Canada pour fournir des se
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/guidance/WebTLSResults.js:227
+#: src/guidance/WebTLSResults.js:268
 msgid "Certificate Chain"
 msgstr "Chaîne de certificats"
 
-#: src/guidance/WebTLSResults.js:235
+#: src/guidance/WebTLSResults.js:276
 msgid "Certificate chain info could not be found during the scan."
 msgstr "Les informations sur la chaîne de certificats n'ont pas pu être trouvées pendant l'analyse."
 
-#: src/domains/DomainCard.js:187
+#: src/domains/DomainCard.js:186
+#: src/organizationDetails/OrganizationDomains.js:279
 msgid "Certificates"
 msgstr "Certificats"
 
+#: src/domains/DomainsPage.js:71
+#: src/organizationDetails/OrganizationDomains.js:83
+msgid "Certificates Status"
+msgstr ""
+
 #: src/auth/ResetPasswordPage.js:126
 #: src/user/EditableUserPassword.js:153
 msgid "Change Password"
@@ -469,15 +475,15 @@ msgstr "Changements requis pour la mise en conformité ITPIN"
 msgid "Check your associated Tracker email for the verification link"
 msgstr "Vérifiez le lien de vérification dans votre courriel de suivi associé."
 
-#: src/domains/DomainCard.js:189
-#: src/domains/DomainsPage.js:154
+#: src/domains/DomainCard.js:188
+#: src/domains/DomainsPage.js:155
 #: src/guidance/WebTLSResults.js:101
-#: src/organizationDetails/OrganizationDomains.js:281
+#: src/organizationDetails/OrganizationDomains.js:280
 msgid "Ciphers"
 msgstr "Ciphers"
 
-#: src/domains/DomainsPage.js:71
-#: src/organizationDetails/OrganizationDomains.js:87
+#: src/domains/DomainsPage.js:72
+#: src/organizationDetails/OrganizationDomains.js:84
 msgid "Ciphers Status"
 msgstr "État du chiffrement"
 
@@ -523,7 +529,7 @@ msgstr "Le champ de code ne doit pas être vide"
 msgid "Collect and analyze DMARC reports."
 msgstr "Recueillir et analyser les rapports DMARC."
 
-#: src/organizationDetails/OrganizationDomains.js:188
+#: src/organizationDetails/OrganizationDomains.js:175
 msgid "Comparison"
 msgstr "Comparaison"
 
@@ -531,12 +537,12 @@ msgstr "Comparaison"
 msgid "Compliant"
 msgstr "Conforme"
 
-#: src/admin/AdminDomainModal.js:459
+#: src/admin/AdminDomainModal.js:391
 #: src/admin/AdminDomains.js:386
 #: src/admin/OrganizationInformation.js:393
 #: src/admin/OrganizationInformation.js:520
 #: src/admin/SuperAdminUserList.js:441
-#: src/admin/UserListModal.js:299
+#: src/admin/UserListModal.js:274
 #: src/user/EditableUserDisplayName.js:168
 #: src/user/EditableUserEmail.js:168
 #: src/user/EditableUserPassword.js:182
@@ -562,20 +568,20 @@ msgstr "Confirmer la suppression du domaine:"
 #~ msgid "Confirm removal of user:"
 #~ msgstr "Confirmer le retrait de l'utilisateur:"
 
-#: src/app/ReadGuidancePage.js:216
-msgid "Consider prioritizing websites and web services that exchange Protected data."
-msgstr "Envisagez de donner la priorité aux sites web et aux services web qui échangent des données protégées."
-
 #: src/guidance/WebConnectionResults.js:99
 msgid "Connection Results"
 msgstr "Résultats de la connexion"
 
+#: src/app/ReadGuidancePage.js:216
+msgid "Consider prioritizing websites and web services that exchange Protected data."
+msgstr "Envisagez de donner la priorité aux sites web et aux services web qui échangent des données protégées."
+
 #: src/app/FloatingMenu.js:238
 msgid "Contact"
 msgstr "Contact"
 
-#: src/app/App.js:191
-#: src/app/App.js:346
+#: src/app/App.js:182
+#: src/app/App.js:333
 #: src/app/ContactUsPage.js:39
 #: src/app/SlideMessage.js:103
 msgid "Contact Us"
@@ -621,18 +627,18 @@ msgid "Create"
 msgstr "Créer"
 
 #: src/app/FloatingMenu.js:200
-#: src/app/TopBanner.js:143
+#: src/app/TopBanner.js:127
 #: src/auth/CreateUserPage.js:243
 msgid "Create Account"
 msgstr "Créer un compte"
 
 #: src/admin/AdminPage.js:130
-#: src/app/App.js:305
+#: src/app/App.js:292
 #: src/createOrganization/CreateOrganizationPage.js:237
 msgid "Create Organization"
 msgstr "Créer une organisation"
 
-#: src/app/App.js:159
+#: src/app/App.js:150
 msgid "Create an Account"
 msgstr "Créer un compte"
 
@@ -660,21 +666,21 @@ msgstr "Mot de passe actuel:"
 msgid "Current Phone Number:"
 msgstr "Numéro de téléphone actuel:"
 
-#: src/domains/DomainCard.js:190
-#: src/domains/DomainsPage.js:155
+#: src/domains/DomainCard.js:189
+#: src/domains/DomainsPage.js:156
 #: src/guidance/WebTLSResults.js:155
-#: src/organizationDetails/OrganizationDomains.js:282
-#: src/organizationDetails/OrganizationDomains.js:328
+#: src/organizationDetails/OrganizationDomains.js:281
+#: src/organizationDetails/OrganizationDomains.js:325
 msgid "Curves"
 msgstr "Courbes"
 
-#: src/domains/DomainsPage.js:72
-#: src/organizationDetails/OrganizationDomains.js:88
+#: src/domains/DomainsPage.js:73
+#: src/organizationDetails/OrganizationDomains.js:85
 msgid "Curves Status"
 msgstr "État des courbes"
 
-#: src/domains/DomainsPage.js:164
-#: src/organizationDetails/OrganizationDomains.js:291
+#: src/domains/DomainsPage.js:165
+#: src/organizationDetails/OrganizationDomains.js:290
 msgid "DKIM"
 msgstr "DKIM"
 
@@ -700,7 +706,7 @@ msgstr "Défaillances DKIM par adresse IP"
 msgid "DKIM Results"
 msgstr "Résultats DKIM"
 
-#: src/admin/AdminDomainModal.js:325
+#: src/admin/AdminDomainModal.js:280
 msgid "DKIM Selector"
 msgstr "Sélecteur DKIM"
 
@@ -708,12 +714,12 @@ msgstr "Sélecteur DKIM"
 msgid "DKIM Selectors"
 msgstr "Sélecteurs DKIM"
 
-#: src/admin/AdminDomainModal.js:288
+#: src/admin/AdminDomainModal.js:252
 msgid "DKIM Selectors:"
 msgstr "Sélecteurs DKIM:"
 
-#: src/domains/DomainsPage.js:75
-#: src/organizationDetails/OrganizationDomains.js:91
+#: src/domains/DomainsPage.js:76
+#: src/organizationDetails/OrganizationDomains.js:88
 msgid "DKIM Status"
 msgstr "Statut DKIM"
 
@@ -721,8 +727,8 @@ msgstr "Statut DKIM"
 #~ msgid "DKIM record could not be found for this selector."
 #~ msgstr "Un enregistrement DKIM n'a pas pu être trouvé pour ce sélecteur."
 
-#: src/domains/DomainsPage.js:168
-#: src/organizationDetails/OrganizationDomains.js:295
+#: src/domains/DomainsPage.js:169
+#: src/organizationDetails/OrganizationDomains.js:294
 msgid "DMARC"
 msgstr "DMARC"
 
@@ -758,9 +764,9 @@ msgstr "Phase de mise en œuvre de DMARC: {0}"
 msgid "DMARC Phases"
 msgstr "Phases DMARC"
 
-#: src/dmarc/DmarcReportPage.js:92
-#: src/domains/DomainCard.js:233
-#: src/guidance/GuidancePage.js:150
+#: src/dmarc/DmarcReportPage.js:95
+#: src/domains/DomainCard.js:232
+#: src/guidance/GuidancePage.js:152
 msgid "DMARC Report"
 msgstr "Rapport DMARC "
 
@@ -768,13 +774,13 @@ msgstr "Rapport DMARC "
 msgid "DMARC Report for {domainSlug}"
 msgstr "Rapport DMARC pour {domainSlug}"
 
-#: src/domains/DomainsPage.js:76
-#: src/organizationDetails/OrganizationDomains.js:92
+#: src/domains/DomainsPage.js:77
+#: src/organizationDetails/OrganizationDomains.js:89
 msgid "DMARC Status"
 msgstr "Statut DMARC"
 
-#: src/app/App.js:95
-#: src/app/App.js:263
+#: src/app/App.js:89
+#: src/app/App.js:254
 #: src/app/FloatingMenu.js:131
 #: src/dmarc/DmarcByDomainPage.js:181
 #: src/dmarc/DmarcByDomainPage.js:241
@@ -790,7 +796,7 @@ msgstr "Résumés DMARC"
 #~ msgid "DMARC record could not be found during the scan."
 #~ msgstr "L'enregistrement DMARC n'a pas pu être trouvé pendant le scan."
 
-#: src/dmarc/DmarcReportPage.js:182
+#: src/dmarc/DmarcReportPage.js:185
 msgid "DNS Host"
 msgstr "Hôte DNS"
 
@@ -806,7 +812,7 @@ msgstr "Scan DNS terminé"
 msgid "DNS scan for domain \"{0}\" has completed."
 msgstr "Le scan DNS du domaine \"{0}\" est terminé."
 
-#: src/organizationDetails/OrganizationDomains.js:194
+#: src/organizationDetails/OrganizationDomains.js:181
 msgid "DOES NOT EQUAL"
 msgstr "N'EST PAS ÉGAL"
 
@@ -894,11 +900,11 @@ msgstr "Disposition"
 
 #: src/admin/AuditLogTable.js:76
 #: src/dmarc/DmarcByDomainPage.js:124
-#: src/dmarc/DmarcByDomainPage.js:312
+#: src/dmarc/DmarcByDomainPage.js:324
 #: src/domains/DomainsPage.js:68
-#: src/domains/DomainsPage.js:153
-#: src/organizationDetails/OrganizationDomains.js:280
-#: src/organizationDetails/OrganizationDomains.js:314
+#: src/domains/DomainsPage.js:154
+#: src/organizationDetails/OrganizationDomains.js:278
+#: src/organizationDetails/OrganizationDomains.js:312
 msgid "Domain"
 msgstr "Domaine"
 
@@ -919,7 +925,7 @@ msgstr "URL du domaine"
 msgid "Domain URL:"
 msgstr "URL du domaine:"
 
-#: src/admin/AdminDomainModal.js:86
+#: src/admin/AdminDomainModal.js:74
 msgid "Domain added"
 msgstr "Domaine ajouté"
 
@@ -935,7 +941,7 @@ msgstr "Domaine supprimé"
 msgid "Domain removed from {orgSlug}"
 msgstr "Domaine supprimé de {orgSlug}"
 
-#: src/admin/AdminDomainModal.js:135
+#: src/admin/AdminDomainModal.js:121
 msgid "Domain updated"
 msgstr "Domaine mis à jour"
 
@@ -943,19 +949,19 @@ msgstr "Domaine mis à jour"
 msgid "Domain url field must not be empty"
 msgstr "Le champ de l'url du domaine ne doit pas être vide"
 
-#: src/admin/AdminDomainCard.js:29
-#: src/admin/WebCheckPage.js:147
-#: src/domains/DomainCard.js:129
+#: src/admin/AdminDomainCard.js:16
+#: src/admin/WebCheckPage.js:129
+#: src/domains/DomainCard.js:127
 #: src/domains/ScanDomain.js:211
 msgid "Domain:"
 msgstr "Domaine:"
 
-#: src/admin/AdminPanel.js:28
-#: src/app/App.js:92
-#: src/app/App.js:229
+#: src/admin/AdminPanel.js:26
+#: src/app/App.js:86
+#: src/app/App.js:220
 #: src/app/FloatingMenu.js:116
-#: src/domains/DomainsPage.js:81
-#: src/domains/DomainsPage.js:115
+#: src/domains/DomainsPage.js:82
+#: src/domains/DomainsPage.js:116
 #: src/organizationDetails/OrganizationDetails.js:139
 #: src/organizationDetails/OrganizationDomains.js:108
 #: src/summaries/Doughnut.js:50
@@ -976,7 +982,7 @@ msgstr "Domaines utilisés pour la validation SPF."
 msgid "Don't have an account? <0>Sign up</0>"
 msgstr "Vous n'avez pas de compte ? <0>S'inscrire</0>"
 
-#: src/organizationDetails/OrganizationDomains.js:191
+#: src/organizationDetails/OrganizationDomains.js:178
 msgid "EQUALS"
 msgstr "ÉGAUX"
 
@@ -995,7 +1001,7 @@ msgstr "Edit"
 msgid "Edit Display Name"
 msgstr "Modifier le nom d'affichage"
 
-#: src/admin/AdminDomainModal.js:269
+#: src/admin/AdminDomainModal.js:240
 msgid "Edit Domain Details"
 msgstr "Modifier les détails d'un domaine"
 
@@ -1011,19 +1017,19 @@ msgstr "Organisation d'édition"
 msgid "Edit Phone Number"
 msgstr "Modifier le numéro de téléphone"
 
-#: src/admin/UserListModal.js:233
+#: src/admin/UserListModal.js:216
 msgid "Edit User"
 msgstr "Modifier l'utilisateur"
 
 #: src/admin/SuperAdminUserList.js:148
 #: src/components/fields/EmailField.js:15
-#: src/domains/DomainCard.js:195
+#: src/domains/DomainCard.js:194
 #: src/user/EditableUserTFAMethod.js:166
 msgid "Email"
 msgstr "Courriel"
 
 #: src/domains/ScanDomain.js:245
-#: src/guidance/GuidancePage.js:103
+#: src/guidance/GuidancePage.js:105
 msgid "Email Guidance"
 msgstr "Conseils par courriel"
 
@@ -1047,7 +1053,7 @@ msgstr "Courriel envoyé"
 msgid "Email Validated"
 msgstr "Courriel validé"
 
-#: src/app/App.js:301
+#: src/app/App.js:288
 msgid "Email Verification"
 msgstr "Vérification de l'e-mail"
 
@@ -1057,7 +1063,7 @@ msgstr "Vérification de l'e-mail"
 msgid "Email cannot be empty"
 msgstr "Le courriel ne peut être vide"
 
-#: src/admin/UserListModal.js:65
+#: src/admin/UserListModal.js:59
 msgid "Email invitation sent"
 msgstr "Envoi d'une invitation par courriel"
 
@@ -1136,7 +1142,7 @@ msgstr "Enveloppe De"
 msgid "Eventually"
 msgstr "Éventuellement"
 
-#: src/guidance/WebTLSResults.js:380
+#: src/guidance/WebTLSResults.js:421
 msgid "Expired:"
 msgstr "Expiré :"
 
@@ -1148,9 +1154,9 @@ msgstr "Exportation vers CSV"
 #~ msgid "FAQ"
 #~ msgstr "FAQ"
 
-#: src/dmarc/DmarcReportPage.js:126
-#: src/dmarc/DmarcReportPage.js:127
-#: src/organizationDetails/OrganizationDomains.js:227
+#: src/dmarc/DmarcReportPage.js:129
+#: src/dmarc/DmarcReportPage.js:130
+#: src/organizationDetails/OrganizationDomains.js:223
 msgid "Fail"
 msgstr "Échec"
 
@@ -1178,7 +1184,7 @@ msgstr "Échec du SPF %"
 msgid "Fake email domain blocks (reject + quarantine):"
 msgstr "Blocs de domaines de faux e-mails (rejet + quarantaine) :"
 
-#: src/domains/DomainCard.js:59
+#: src/domains/DomainCard.js:57
 msgid "Favourited Domain"
 msgstr "Domaine favori"
 
@@ -1195,7 +1201,7 @@ msgstr "Février"
 #~ msgid "Filters"
 #~ msgstr "Filtres"
 
-#: src/organizationDetails/OrganizationDomains.js:145
+#: src/organizationDetails/OrganizationDomains.js:138
 msgid "Filters:"
 msgstr "Filtres :"
 
@@ -1227,7 +1233,7 @@ msgstr "Pour plus de détails concernant les termes relatifs à la vie privée,
 msgid "For users interested in using new features that are still in progress."
 msgstr "Pour les utilisateurs intéressés par l'utilisation de nouvelles fonctionnalités qui sont encore en cours de développement."
 
-#: src/app/App.js:185
+#: src/app/App.js:176
 #: src/auth/ForgotPasswordPage.js:75
 msgid "Forgot Password"
 msgstr "Mot de passe oublié"
@@ -1288,11 +1294,11 @@ msgstr "Pour commencer"
 msgid "Getting an Account:"
 msgstr "Ouverture d'un compte :"
 
-#: src/domains/DomainsPage.js:150
+#: src/domains/DomainsPage.js:126
 msgid "Getting domain statuses"
 msgstr "Obtenir les statuts des domaines"
 
-#: src/components/InfoPanel.js:32
+#: src/components/InfoPanel.js:27
 msgid "Glossary"
 msgstr "Glossaire"
 
@@ -1312,10 +1318,9 @@ msgstr "Employés du gouvernement du Canada"
 #~ msgid "Graph direction:"
 #~ msgstr "Direction du graphique :"
 
-#: src/app/App.js:350
-#: src/app/ReadGuidancePage.js:28
-#: src/dmarc/DmarcReportPage.js:193
-#: src/dmarc/DmarcReportPage.js:606
+#: src/app/App.js:337
+#: src/dmarc/DmarcReportPage.js:196
+#: src/dmarc/DmarcReportPage.js:690
 msgid "Guidance"
 msgstr "Orientation"
 
@@ -1323,7 +1328,7 @@ msgstr "Orientation"
 #~ msgid "Guidance Tags"
 #~ msgstr "Étiquettes d'orientation"
 
-#: src/guidance/GuidancePage.js:43
+#: src/guidance/GuidancePage.js:45
 msgid "Guidance results"
 msgstr "Résultats de l'orientation"
 
@@ -1332,13 +1337,13 @@ msgstr "Résultats de l'orientation"
 #~ msgid "Guidance:"
 #~ msgstr "Orientation:"
 
-#: src/domains/DomainCard.js:163
+#: src/domains/DomainCard.js:162
 msgid "HIDDEN"
 msgstr "CACHÉ"
 
-#: src/domains/DomainCard.js:186
-#: src/domains/DomainsPage.js:156
-#: src/organizationDetails/OrganizationDomains.js:283
+#: src/domains/DomainCard.js:185
+#: src/domains/DomainsPage.js:157
+#: src/organizationDetails/OrganizationDomains.js:282
 msgid "HSTS"
 msgstr "HSTS"
 
@@ -1363,7 +1368,7 @@ msgid "HSTS Preloaded"
 msgstr "HSTS préchargé"
 
 #: src/domains/DomainsPage.js:70
-#: src/organizationDetails/OrganizationDomains.js:86
+#: src/organizationDetails/OrganizationDomains.js:82
 msgid "HSTS Status"
 msgstr "Statut HSTS"
 
@@ -1383,9 +1388,9 @@ msgstr "HTTP Live"
 msgid "HTTP Upgrades"
 msgstr "Mises à jour HTTP"
 
-#: src/domains/DomainCard.js:185
-#: src/domains/DomainsPage.js:158
-#: src/organizationDetails/OrganizationDomains.js:285
+#: src/domains/DomainCard.js:184
+#: src/domains/DomainsPage.js:159
+#: src/organizationDetails/OrganizationDomains.js:284
 msgid "HTTPS"
 msgstr "HTTPS"
 
@@ -1415,7 +1420,7 @@ msgid "HTTPS Scan Complete"
 msgstr "Scan HTTPS terminé"
 
 #: src/domains/DomainsPage.js:69
-#: src/organizationDetails/OrganizationDomains.js:85
+#: src/organizationDetails/OrganizationDomains.js:81
 msgid "HTTPS Status"
 msgstr "Statut HTTPS"
 
@@ -1431,11 +1436,11 @@ msgstr "HTTPS est configuré et les connexions HTTP sont redirigées vers HTTPS.
 msgid "HTTPS scan for domain \"{0}\" has completed."
 msgstr "L'analyse HTTPS du domaine \"{0}\" est terminée."
 
-#: src/guidance/WebTLSResults.js:395
+#: src/guidance/WebTLSResults.js:436
 msgid "Hash Algorithm:"
 msgstr "Algorithme de hachage :"
 
-#: src/dmarc/DmarcReportPage.js:188
+#: src/dmarc/DmarcReportPage.js:191
 msgid "Header From"
 msgstr "En-tête De"
 
@@ -1443,21 +1448,25 @@ msgstr "En-tête De"
 #~ msgid "Heartbleed Vulnerability:"
 #~ msgstr "Vulnérabilité Heartbleed:"
 
+#: src/guidance/WebTLSResults.js:229
+msgid "Heartbleed Vulnerable"
+msgstr ""
+
 #: src/app/ReadGuidancePage.js:23
 #~ msgid "Help us make government websites more secure. Please complete the following steps to become compliant with the Government of Canada's web security standards. If you have any questions about this process, please <0>contact us</0>."
 #~ msgstr "Aidez-nous à rendre les sites Web du gouvernement plus sûrs. Veuillez suivre les étapes suivantes pour vous conformer aux normes de sécurité Web du gouvernement du Canada. Si vous avez des questions sur ce processus, veuillez <0>nous contacter</0>."
 
-#: src/admin/AdminDomainCard.js:68
+#: src/admin/AdminDomainCard.js:44
 #: src/organizationDetails/OrganizationDomains.js:102
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/admin/AdminDomainModal.js:398
+#: src/admin/AdminDomainModal.js:346
 msgid "Hide domain"
 msgstr "Cacher ce domaine"
 
-#: src/app/App.js:83
-#: src/app/App.js:155
+#: src/app/App.js:77
+#: src/app/App.js:146
 #: src/app/FloatingMenu.js:175
 msgid "Home"
 msgstr "Accueil"
@@ -1470,8 +1479,7 @@ msgstr "Accueil"
 msgid "Host from reverse DNS of source IP address."
 msgstr "Hôte du DNS inversé de l'adresse IP source."
 
-#: src/app/ReadGuidancePage.js:396
-#: src/guidance/WebTLSResults.js:247
+#: src/guidance/WebTLSResults.js:288
 msgid "Hostname Matches"
 msgstr "Correspondance des noms d'hôtes"
 
@@ -1479,7 +1487,7 @@ msgstr "Correspondance des noms d'hôtes"
 #~ msgid "Hostname Validated"
 #~ msgstr "Nom d'hôte validé"
 
-#: src/app/ReadGuidancePage.js:239
+#: src/app/ReadGuidancePage.js:396
 msgid "How can I edit my domain list?"
 msgstr "Comment puis-je modifier ma liste de domaines?"
 
@@ -1487,7 +1495,7 @@ msgstr "Comment puis-je modifier ma liste de domaines?"
 msgid "I agree to all <0>Terms, Privacy Policy & Code of Conduct Guidelines <1/></0>"
 msgstr "J'accepte toutes les <0>Conditions générales, la politique de confidentialité et les directives du code de conduite<1/></0>."
 
-#: src/organizationDetails/OrganizationDomains.js:101
+#: src/organizationDetails/OrganizationDomains.js:98
 msgid "INACTIVE"
 msgstr "INACTIF"
 
@@ -1540,7 +1548,7 @@ msgstr "Si, à tout moment, vous ou vos représentants souhaitez ajuster ou annu
 #~ msgid "If at any time you or your representatives wish to adjust or cancel these services, please contact us at"
 #~ msgstr "Si, à tout moment, vous ou vos représentants souhaitez adapter ou annuler ces services, veuillez nous contacter à l'adresse suivante"
 
-#: src/guidance/GuidancePage.js:73
+#: src/guidance/GuidancePage.js:75
 msgid "If you believe this could be the result of an issue with the scan, rescan the service using the refresh button. If you believe this is because the service no longer exists (NXDOMAIN), this domain should be removed from all affiliated organizations."
 msgstr "Si vous pensez que cela peut être le résultat d'un problème avec l'analyse, réanalysez le service en utilisant le bouton d'actualisation. Si vous pensez que c'est parce que le service n'existe plus (NXDOMAIN), ce domaine doit être supprimé de toutes les organisations affiliées."
 
@@ -1552,15 +1560,15 @@ msgstr "Si vous pensez que cela a été causé par un problème avec Tracker, ve
 #~ msgid "If you believe this was caused by a problem with Tracker, please use the \"Report an Issue\" link below"
 #~ msgstr "Si vous pensez que cela est dû à un problème avec Suivi, veuillez utiliser le lien \"Signaler un problème\" ci-dessous"
 
+#: src/app/ReadGuidancePage.js:88
+msgid "If your organization has no affiliated users within Tracker, contact the <0>TBS Cyber Security</0> to assist in onboarding."
+msgstr "Si votre organisation n'a pas d'utilisateurs affiliés à Suivi, contactez l’<0>équipe responsable de la cybersécurité du SCT</0> pour vous aider à l'intégrer."
+
 #: src/guidance/WebConnectionResults.js:138
 #: src/guidance/WebConnectionResults.js:178
 msgid "Immediately"
 msgstr "Immédiatement"
 
-#: src/app/ReadGuidancePage.js:88
-msgid "If your organization has no affiliated users within Tracker, contact the <0>TBS Cyber Security</0> to assist in onboarding."
-msgstr "Si votre organisation n'a pas d'utilisateurs affiliés à Suivi, contactez l’<0>équipe responsable de la cybersécurité du SCT</0> pour vous aider à l'intégrer."
-
 #: src/guidance/WebGuidance.js:19
 #~ msgid "Implementation"
 #~ msgstr "Mise en œuvre"
@@ -1585,7 +1593,7 @@ msgstr "Mise en œuvre : <0>Conseils de mise en œuvre : protection du domaine d
 msgid "Implemented"
 msgstr "Mis en œuvre"
 
-#: src/organizationDetails/OrganizationDomains.js:101
+#: src/organizationDetails/OrganizationDomains.js:98
 msgid "Inactive"
 msgstr "Inactif"
 
@@ -1598,7 +1606,7 @@ msgstr "Incorrect authenticate.result typename."
 msgid "Incorrect closeAccount.result typename."
 msgstr "Incorrect closeAccount.result typename."
 
-#: src/admin/AdminDomainModal.js:108
+#: src/admin/AdminDomainModal.js:94
 msgid "Incorrect createDomain.result typename."
 msgstr "Incorrect createDomain.result typename."
 
@@ -1606,7 +1614,7 @@ msgstr "Incorrect createDomain.result typename."
 msgid "Incorrect createOrganization.result typename."
 msgstr "createOrganization.result incorrecte typename."
 
-#: src/admin/UserListModal.js:84
+#: src/admin/UserListModal.js:78
 msgid "Incorrect inviteUserToOrg.result typename."
 msgstr "Incorrect inviteUserToOrg.result typename."
 
@@ -1627,12 +1635,12 @@ msgstr "Incorrect removeOrganization.result typename."
 msgid "Incorrect resetPassword.result typename."
 msgstr "Incorrect resetPassword.result typename."
 
-#: src/admin/AdminDomainModal.js:107
-#: src/admin/AdminDomainModal.js:156
+#: src/admin/AdminDomainModal.js:93
+#: src/admin/AdminDomainModal.js:142
 #: src/admin/AdminDomains.js:133
 #: src/admin/SuperAdminUserList.js:110
-#: src/admin/UserListModal.js:83
-#: src/admin/UserListModal.js:132
+#: src/admin/UserListModal.js:77
+#: src/admin/UserListModal.js:124
 #: src/auth/CreateUserPage.js:83
 #: src/auth/ResetPasswordPage.js:60
 #: src/auth/SignInPage.js:100
@@ -1670,7 +1678,7 @@ msgstr "Incorrect typename received."
 msgid "Incorrect update method received."
 msgstr "Méthode de mise à jour incorrecte reçue."
 
-#: src/admin/AdminDomainModal.js:157
+#: src/admin/AdminDomainModal.js:143
 msgid "Incorrect updateDomain.result typename."
 msgstr "Incorrect updateDomain.result typename."
 
@@ -1690,7 +1698,7 @@ msgstr "Incorrect updateUserPassword.result typename."
 msgid "Incorrect updateUserProfile.result typename."
 msgstr "Incorrect updateUserProfile.result typename."
 
-#: src/admin/UserListModal.js:133
+#: src/admin/UserListModal.js:125
 msgid "Incorrect updateUserRole.result typename."
 msgstr "Incorrect updateUserRole.result typename."
 
@@ -1714,7 +1722,7 @@ msgstr "Les personnes d'un groupe ministériel de technologie de l'information p
 #~ msgid "Individuals with questions about the accuracy of their domain’s compliance data may contact the TBS Cyber Security mailbox."
 #~ msgstr "Les personnes ayant des questions sur l'exactitude des données de conformité de leur domaine peuvent contacter la boîte aux lettres de la cybersécurité du SCT."
 
-#: src/organizationDetails/OrganizationDomains.js:224
+#: src/organizationDetails/OrganizationDomains.js:220
 msgid "Info"
 msgstr "Info"
 
@@ -1786,12 +1794,11 @@ msgstr "Est aligné sur la norme DKIM. Peut être vrai ou faux."
 msgid "Is SPF aligned. Can be true or false."
 msgstr "Est aligné sur le SPF. Peut être vrai ou faux."
 
-#: src/app/ReadGuidancePage.js:378
-#: src/guidance/WebTLSResults.js:383
+#: src/guidance/WebTLSResults.js:424
 msgid "Issuer:"
 msgstr "Émetteur :"
 
-#: src/app/ReadGuidancePage.js:221
+#: src/app/ReadGuidancePage.js:378
 msgid "It is not clear to me why a domain has failed?"
 msgstr "Je ne comprends pas pourquoi un domaine a échoué."
 
@@ -1853,11 +1860,11 @@ msgstr "Les 30 derniers jours"
 #~ msgid "Last Scanned"
 #~ msgstr "Dernière numérisation"
 
-#: src/admin/WebCheckPage.js:154
+#: src/admin/WebCheckPage.js:136
 msgid "Last Scanned:"
 msgstr "Dernier balayage :"
 
-#: src/guidance/WebTLSResults.js:267
+#: src/guidance/WebTLSResults.js:308
 msgid "Leaf Certificate is EV"
 msgstr "Le certificat Leaf est EV"
 
@@ -1900,14 +1907,14 @@ msgstr "Connexion"
 msgid "Login to your account"
 msgstr "Connectez-vous à votre compte"
 
-#: src/app/ReadGuidancePage.js:117
-msgid "Managing Your Domains:"
-msgstr "Gérer vos domaines :"
-
 #: src/guidance/EmailGuidance.js:178
 msgid "Lookups:"
 msgstr "Les recherches :"
 
+#: src/app/ReadGuidancePage.js:117
+msgid "Managing Your Domains:"
+msgstr "Gérer vos domaines :"
+
 #: src/components/MonthSelect.js:19
 #: src/utilities/months.js:6
 msgid "March"
@@ -1937,23 +1944,23 @@ msgstr "Surveiller les rapports DMARC et corriger les erreurs de configuration."
 msgid "Monitor DMARC reports;"
 msgstr "Surveiller les rapports DMARC."
 
+#: src/guidance/WebTLSResults.js:402
+msgid "More details"
+msgstr "Plus de détails"
+
 #: src/app/ReadGuidancePage.js:604
 msgid "Mozilla SSL Configuration Generator"
 msgstr "Générateur de configuration SSL de Mozilla"
 
-#: src/guidance/WebTLSResults.js:361
-msgid "More details"
-msgstr "Plus de détails"
-
-#: src/guidance/WebTLSResults.js:258
+#: src/guidance/WebTLSResults.js:299
 msgid "Must Staple"
 msgstr "Agrafe obligatoire"
 
-#: src/organizationDetails/OrganizationDomains.js:96
+#: src/organizationDetails/OrganizationDomains.js:93
 msgid "NEW"
 msgstr "NOUVEAU"
 
-#: src/admin/WebCheckPage.js:67
+#: src/admin/WebCheckPage.js:60
 #: src/createOrganization/CreateOrganizationPage.js:173
 #: src/createOrganization/CreateOrganizationPage.js:178
 #: src/organizations/Organizations.js:60
@@ -1972,7 +1979,7 @@ msgstr "Nom (FR)"
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/guidance/WebTLSResults.js:365
+#: src/guidance/WebTLSResults.js:406
 msgid "Names:"
 msgstr "Noms :"
 
@@ -1998,7 +2005,7 @@ msgstr "Négatif"
 msgid "Never"
 msgstr "Jamais"
 
-#: src/organizationDetails/OrganizationDomains.js:96
+#: src/organizationDetails/OrganizationDomains.js:93
 msgid "New"
 msgstr "Nouveau"
 
@@ -2006,11 +2013,11 @@ msgstr "Nouveau"
 msgid "New Display Name:"
 msgstr "Nouveau nom d'affichage:"
 
-#: src/admin/AdminDomainModal.js:280
+#: src/admin/AdminDomainModal.js:245
 msgid "New Domain URL"
 msgstr "Nouvelle URL de domaine"
 
-#: src/admin/AdminDomainModal.js:279
+#: src/admin/AdminDomainModal.js:245
 msgid "New Domain URL:"
 msgstr "Nouvelle URL de domaine:"
 
@@ -2039,16 +2046,17 @@ msgstr "Nouvelle valeur :"
 #: src/guidance/WebConnectionResults.js:188
 #: src/guidance/WebConnectionResults.js:206
 #: src/guidance/WebConnectionResults.js:215
-#: src/guidance/WebTLSResults.js:250
-#: src/guidance/WebTLSResults.js:261
-#: src/guidance/WebTLSResults.js:270
-#: src/guidance/WebTLSResults.js:281
-#: src/guidance/WebTLSResults.js:292
-#: src/guidance/WebTLSResults.js:303
-#: src/guidance/WebTLSResults.js:314
-#: src/guidance/WebTLSResults.js:380
-#: src/guidance/WebTLSResults.js:389
-#: src/guidance/WebTLSResults.js:392
+#: src/guidance/WebTLSResults.js:233
+#: src/guidance/WebTLSResults.js:291
+#: src/guidance/WebTLSResults.js:302
+#: src/guidance/WebTLSResults.js:311
+#: src/guidance/WebTLSResults.js:322
+#: src/guidance/WebTLSResults.js:333
+#: src/guidance/WebTLSResults.js:344
+#: src/guidance/WebTLSResults.js:355
+#: src/guidance/WebTLSResults.js:421
+#: src/guidance/WebTLSResults.js:430
+#: src/guidance/WebTLSResults.js:433
 msgid "No"
 msgstr "Non"
 
@@ -2061,8 +2069,8 @@ msgid "No DMARC phase information available for this organization."
 msgstr "Aucune information sur la phase DMARC n'est disponible pour cette organisation."
 
 #: src/admin/AdminDomains.js:156
-#: src/domains/DomainsPage.js:88
-#: src/organizationDetails/OrganizationDomains.js:251
+#: src/domains/DomainsPage.js:89
+#: src/organizationDetails/OrganizationDomains.js:246
 msgid "No Domains"
 msgstr "Aucun domaine"
 
@@ -2070,7 +2078,7 @@ msgstr "Aucun domaine"
 msgid "No HTTPS configuration information available for this organization."
 msgstr "Aucune information de configuration HTTPS disponible pour cette organisation."
 
-#: src/admin/WebCheckPage.js:101
+#: src/admin/WebCheckPage.js:94
 #: src/organizations/Organizations.js:81
 msgid "No Organizations"
 msgstr "Aucune organisation"
@@ -2107,12 +2115,12 @@ msgstr "Pas de données pour le tableau Entièrement aligné par adresse IP"
 msgid "No data for the SPF Failures by IP Address table"
 msgstr "Aucune donnée pour le tableau des défaillances du SPF par adresse IP"
 
-#: src/domains/DomainsPage.js:135
-#: src/domains/DomainsPage.js:143
+#: src/domains/DomainsPage.js:136
+#: src/domains/DomainsPage.js:144
 msgid "No data found"
 msgstr "Aucune donnée trouvée"
 
-#: src/domains/DomainsPage.js:136
+#: src/domains/DomainsPage.js:137
 msgid "No data found when retrieving all domain statuses."
 msgstr "Aucune donnée n'a été trouvée lors de la récupération de tous les statuts de domaine."
 
@@ -2136,7 +2144,7 @@ msgstr "Aucun protocole faible connu n'a été utilisé."
 msgid "No scan data for this organization."
 msgstr "Aucune donnée d'analyse pour cette organisation."
 
-#: src/guidance/GuidancePage.js:88
+#: src/guidance/GuidancePage.js:90
 msgid "No scan data is currently available for this service. You may request a scan using the refresh button, or wait up to 24 hours for data to refresh."
 msgstr "Aucune donnée de balayage n'est actuellement disponible pour ce service. Vous pouvez demander un scan en utilisant le bouton d'actualisation, ou attendre jusqu'à 24 heures pour que les données soient actualisées."
 
@@ -2157,12 +2165,12 @@ msgstr "Non conforme"
 msgid "None"
 msgstr "Aucun"
 
-#: src/guidance/WebTLSResults.js:352
-#: src/guidance/WebTLSResults.js:377
+#: src/guidance/WebTLSResults.js:393
+#: src/guidance/WebTLSResults.js:418
 msgid "Not After:"
 msgstr "Pas après :"
 
-#: src/guidance/WebTLSResults.js:374
+#: src/guidance/WebTLSResults.js:415
 msgid "Not Before:"
 msgstr "Pas avant :"
 
@@ -2174,11 +2182,11 @@ msgstr "Non mis en œuvre"
 msgid "Note that compliance data does not automatically refresh. Modifications to domains could take 24 hours to update."
 msgstr "Notez que les données de conformité ne sont pas automatiquement actualisées. La mise à jour des modifications apportées aux domaines peut prendre 24 heures."
 
-#: src/admin/AdminDomainModal.js:432
+#: src/admin/AdminDomainModal.js:376
 msgid "Note: This could affect results for multiple organizations"
 msgstr "Note : Cela pourrait affecter les résultats de plusieurs organisations"
 
-#: src/admin/AdminDomainModal.js:427
+#: src/admin/AdminDomainModal.js:374
 msgid "Note: This will affect results for {orgCount} organizations"
 msgstr "Note : Ceci affectera les résultats pour les organisations {orgCount}."
 
@@ -2267,26 +2275,26 @@ msgstr "Le nom de l'organisation ne correspond pas."
 msgid "Organization not updated"
 msgstr "Organisation non mise à jour"
 
-#: src/guidance/GuidancePage.js:157
+#: src/guidance/GuidancePage.js:159
 msgid "Organization(s):"
 msgstr "Organisation(s) :"
 
 #: src/admin/AdminPage.js:77
 #: src/admin/AdminPage.js:93
-#: src/admin/UserListModal.js:255
+#: src/admin/UserListModal.js:238
 msgid "Organization:"
 msgstr "Organisation:"
 
 #: src/admin/AdminPage.js:189
-#: src/app/App.js:89
-#: src/app/App.js:195
+#: src/app/App.js:83
+#: src/app/App.js:186
 #: src/app/FloatingMenu.js:103
 #: src/organizations/Organizations.js:72
 #: src/organizations/Organizations.js:109
 msgid "Organizations"
 msgstr "Organisations"
 
-#: src/organizationDetails/OrganizationDomains.js:97
+#: src/organizationDetails/OrganizationDomains.js:94
 msgid "PROD"
 msgstr "PROD"
 
@@ -2294,9 +2302,9 @@ msgstr "PROD"
 msgid "Page {0} of {1}"
 msgstr "Page {0} de {1}"
 
-#: src/dmarc/DmarcReportPage.js:117
-#: src/dmarc/DmarcReportPage.js:118
-#: src/organizationDetails/OrganizationDomains.js:221
+#: src/dmarc/DmarcReportPage.js:120
+#: src/dmarc/DmarcReportPage.js:121
+#: src/organizationDetails/OrganizationDomains.js:217
 msgid "Pass"
 msgstr "Passez"
 
@@ -2378,7 +2386,7 @@ msgstr "Le champ du numéro de téléphone ne doit pas être vide"
 msgid "Phone number must be a valid phone number that is 10-15 digits long"
 msgstr "Le numéro de téléphone doit être un numéro de téléphone valide de 10 à 15 chiffres."
 
-#: src/admin/AdminDomainModal.js:442
+#: src/admin/AdminDomainModal.js:382
 msgid "Please allow up to 24 hours for summaries to reflect any changes."
 msgstr "Veuillez prévoir jusqu'à 24 heures pour que les résumés reflètent les changements éventuels."
 
@@ -2433,7 +2441,7 @@ msgstr "Positif"
 #~ msgid "Preloaded Status:"
 #~ msgstr "Statut préchargé:"
 
-#: src/admin/AdminDomainModal.js:384
+#: src/admin/AdminDomainModal.js:333
 msgid "Prevent this domain from being counted in your organization's summaries."
 msgstr "Empêchez ce domaine d'être comptabilisé dans les résumés de votre organisation."
 
@@ -2441,7 +2449,7 @@ msgstr "Empêchez ce domaine d'être comptabilisé dans les résumés de votre o
 #~ msgid "Prevent this domain from being scanned and being counted in any summaries."
 #~ msgstr "Empêchez ce domaine d'être scanné et d'être compté dans les résumés."
 
-#: src/admin/AdminDomainModal.js:406
+#: src/admin/AdminDomainModal.js:353
 msgid "Prevent this domain from being visible, scanned, and being counted in any summaries."
 msgstr "Empêchez ce domaine d'être visible, d'être scanné et d'être compté dans les résumés."
 
@@ -2449,7 +2457,7 @@ msgstr "Empêchez ce domaine d'être visible, d'être scanné et d'être compté
 #~ msgid "Previous"
 #~ msgstr "Précédent"
 
-#: src/app/App.js:334
+#: src/app/App.js:321
 #: src/app/FloatingMenu.js:219
 #: src/app/SlideMessage.js:88
 #: src/termsConditions/TermsConditionsPage.js:41
@@ -2464,7 +2472,7 @@ msgstr "Loi sur la protection de la vie privée."
 msgid "Privacy Notice Statement"
 msgstr "Déclaration de confidentialité"
 
-#: src/organizationDetails/OrganizationDomains.js:97
+#: src/organizationDetails/OrganizationDomains.js:94
 msgid "Prod"
 msgstr "Prod"
 
@@ -2472,16 +2480,16 @@ msgstr "Prod"
 msgid "Protect domains that do not send email - GOV.UK (www.gov.uk)"
 msgstr "Protéger les domaines qui n'envoient pas de courrier électronique - GOV.UK (www.gov.uk)"
 
-#: src/domains/DomainCard.js:188
-#: src/domains/DomainsPage.js:161
+#: src/domains/DomainCard.js:187
+#: src/domains/DomainsPage.js:162
 #: src/guidance/WebTLSResults.js:52
-#: src/organizationDetails/OrganizationDomains.js:288
-#: src/organizationDetails/OrganizationDomains.js:329
+#: src/organizationDetails/OrganizationDomains.js:287
+#: src/organizationDetails/OrganizationDomains.js:326
 msgid "Protocols"
 msgstr "Protocoles"
 
-#: src/domains/DomainsPage.js:73
-#: src/organizationDetails/OrganizationDomains.js:89
+#: src/domains/DomainsPage.js:74
+#: src/organizationDetails/OrganizationDomains.js:86
 msgid "Protocols Status"
 msgstr "Statut des protocoles"
 
@@ -2510,11 +2518,15 @@ msgstr "Province (FR)"
 msgid "Province:"
 msgstr "Province:"
 
+#: src/guidance/WebTLSResults.js:253
+msgid "ROBOT Vulnerable"
+msgstr ""
+
 #: src/app/ReadGuidancePage.js:259
 #~ msgid "Read Guidance"
 #~ msgstr "Conseils de lecture"
 
-#: src/app/App.js:193
+#: src/app/App.js:184
 msgid "Read guidance"
 msgstr "Conseils de lecture"
 
@@ -2523,11 +2535,11 @@ msgstr "Conseils de lecture"
 msgid "Reason"
 msgstr "Raison"
 
-#: src/guidance/WebTLSResults.js:278
+#: src/guidance/WebTLSResults.js:319
 msgid "Received Chain Contains Anchor Certificate"
 msgstr "La chaîne reçue contient le certificat d'ancrage"
 
-#: src/guidance/WebTLSResults.js:289
+#: src/guidance/WebTLSResults.js:330
 msgid "Received Chain Has Valid Order"
 msgstr "La chaîne reçue a un ordre valide"
 
@@ -2537,7 +2549,7 @@ msgstr "La chaîne reçue a un ordre valide"
 msgid "Record:"
 msgstr "Record :"
 
-#: src/app/ReadGuidancePage.js:355
+#: src/app/ReadGuidancePage.js:555
 msgid "References:"
 msgstr "Références :"
 
@@ -2567,7 +2579,7 @@ msgstr "Supprimer un domaine"
 msgid "Remove Organization"
 msgstr "Supprimer l'organisation"
 
-#: src/admin/UserListModal.js:235
+#: src/admin/UserListModal.js:218
 msgid "Remove User"
 msgstr "Supprimer l'utilisateur"
 
@@ -2575,7 +2587,7 @@ msgstr "Supprimer l'utilisateur"
 msgid "Removed Organization"
 msgstr "Organisation supprimée"
 
-#: src/app/App.js:342
+#: src/app/App.js:329
 #: src/app/FloatingMenu.js:230
 #: src/app/SlideMessage.js:99
 msgid "Report an Issue"
@@ -2585,7 +2597,7 @@ msgstr "Signaler un problème"
 msgid "Request a domain to be scanned:"
 msgstr "Demander qu'un domaine soit scanné:"
 
-#: src/domains/DomainsPage.js:126
+#: src/domains/DomainsPage.js:127
 msgid "Request successfully sent to get all domain statuses - this may take a minute."
 msgstr "La requête a été envoyée avec succès pour obtenir les statuts de tous les domaines - cela peut prendre une minute."
 
@@ -2605,7 +2617,7 @@ msgstr "Exigences : <0>Configuration requise pour les services de gestion du cou
 msgid "Requirements: <0>Web Sites and Services Management Configuration Requirements</0>"
 msgstr "Exigences : <0>Exigences de configuration de la gestion des sites et services web</0>"
 
-#: src/app/App.js:220
+#: src/app/App.js:178
 msgid "Reset Password"
 msgstr "Réinitialiser le mot de passe"
 
@@ -2644,15 +2656,15 @@ msgstr "Résultats des analyses des technologies du courrier électronique (DMAR
 msgid "Results for scans of web technologies (TLS, HTTPS)."
 msgstr "Résultats pour les analyses des technologies web (TLS, HTTPS)."
 
-#: src/guidance/WebTLSResults.js:392
+#: src/guidance/WebTLSResults.js:433
 msgid "Revoked:"
 msgstr "Révoqué :"
 
-#: src/admin/UserListModal.js:113
+#: src/admin/UserListModal.js:105
 msgid "Role updated"
 msgstr "Rôle mis à jour"
 
-#: src/admin/UserListModal.js:263
+#: src/admin/UserListModal.js:246
 msgid "Role:"
 msgstr "Fonction:"
 
@@ -2661,12 +2673,12 @@ msgstr "Fonction:"
 msgid "Rotate DKIM keys annually."
 msgstr "Effectuer la rotation des clés DKIM annuellement."
 
-#: src/guidance/WebTLSResults.js:399
+#: src/guidance/WebTLSResults.js:440
 msgid "SAN List:"
 msgstr "Liste des SAN :"
 
-#: src/domains/DomainsPage.js:162
-#: src/organizationDetails/OrganizationDomains.js:289
+#: src/domains/DomainsPage.js:163
+#: src/organizationDetails/OrganizationDomains.js:288
 msgid "SPF"
 msgstr "SPF"
 
@@ -2692,8 +2704,8 @@ msgstr "Défaillances du SPF par adresse IP"
 msgid "SPF Results"
 msgstr "Résultats du SPF"
 
-#: src/domains/DomainsPage.js:74
-#: src/organizationDetails/OrganizationDomains.js:90
+#: src/domains/DomainsPage.js:75
+#: src/organizationDetails/OrganizationDomains.js:87
 msgid "SPF Status"
 msgstr "Statut SPF"
 
@@ -2714,11 +2726,11 @@ msgstr "Statut SPF"
 #~ msgid "SSL scan for domain \"{0}\" has completed."
 #~ msgstr "Le scan SSL pour le domaine \"{0}\" est terminé."
 
-#: src/organizationDetails/OrganizationDomains.js:98
+#: src/organizationDetails/OrganizationDomains.js:95
 msgid "STAGING"
 msgstr "DEV"
 
-#: src/admin/UserListModal.js:285
+#: src/admin/UserListModal.js:265
 msgid "SUPER_ADMIN"
 msgstr "SUPER_ADMIN"
 
@@ -2735,8 +2747,8 @@ msgstr "Sauvez"
 msgid "Scan Domain"
 msgstr "Domaine de balayage"
 
-#: src/domains/DomainCard.js:143
-#: src/guidance/GuidancePage.js:138
+#: src/domains/DomainCard.js:141
+#: src/guidance/GuidancePage.js:140
 msgid "Scan Pending"
 msgstr "Scan en attente"
 
@@ -2774,12 +2786,12 @@ msgstr "Recherche par initié par, nom de la ressource"
 
 #: src/dmarc/DmarcByDomainPage.js:221
 #: src/dmarc/DmarcByDomainPage.js:292
-#: src/domains/DomainsPage.js:228
-#: src/organizationDetails/OrganizationDomains.js:351
+#: src/domains/DomainsPage.js:189
+#: src/organizationDetails/OrganizationDomains.js:313
 msgid "Search for a domain"
 msgstr "Rechercher un domaine"
 
-#: src/admin/WebCheckPage.js:192
+#: src/admin/WebCheckPage.js:174
 msgid "Search for a tagged organization"
 msgstr "Recherche d'une organisation étiquetée"
 
@@ -2798,7 +2810,7 @@ msgstr "Rechercher une organisation"
 #: src/admin/AdminDomains.js:252
 #: src/admin/UserList.js:149
 #: src/components/ReactTableGlobalFilter.js:36
-#: src/components/SearchBox.js:67
+#: src/components/SearchBox.js:44
 msgid "Search:"
 msgstr "Recherche:"
 
@@ -2843,7 +2855,7 @@ msgstr "Le sélecteur doit être soit une chaîne contenant des caractères alph
 #~ msgid "Selector must be string ending in '._domainkey'"
 #~ msgstr "Le sélecteur doit être une chaîne se terminant par '._domainkey'"
 
-#: src/guidance/WebTLSResults.js:389
+#: src/guidance/WebTLSResults.js:430
 msgid "Self-signed:"
 msgstr "Auto-signé :"
 
@@ -2852,7 +2864,7 @@ msgstr "Auto-signé :"
 msgid "September"
 msgstr "Septembre"
 
-#: src/guidance/WebTLSResults.js:371
+#: src/guidance/WebTLSResults.js:412
 msgid "Serial:"
 msgstr "En série :"
 
@@ -2874,7 +2886,7 @@ msgstr "Voir {pageSize}"
 msgid "Showing data for period:"
 msgstr "Affichage des données pour la période:"
 
-#: src/guidance/WebTLSResults.js:285
+#: src/guidance/WebTLSResults.js:326
 msgid "Shows if all the certificates in the bundle provided by the server were sent in the correct order."
 msgstr "Indique si tous les certificats du paquet fourni par le serveur ont été envoyés dans le bon ordre."
 
@@ -2906,10 +2918,14 @@ msgstr "Indique si la connexion HTTPS est active."
 msgid "Shows if the HTTPS endpoint downgrades to unsecured HTTP immediately, eventually, or never."
 msgstr "Indique si le point de terminaison HTTPS passe en HTTP non sécurisé immédiatement, éventuellement ou jamais."
 
-#: src/guidance/WebTLSResults.js:274
+#: src/guidance/WebTLSResults.js:315
 msgid "Shows if the certificate bundle provided from the server included the root certificate."
 msgstr "Indique si le paquet de certificats fourni par le serveur comprend le certificat racine."
 
+#: src/organizationDetails/OrganizationDomains.js:279
+msgid "Shows if the domain has a valid SSL certificate."
+msgstr ""
+
 #: src/domains/DomainsPage.js:185
 #: src/organizationDetails/OrganizationDomains.js:126
 #~ msgid "Shows if the domain is compliant with"
@@ -2925,18 +2941,18 @@ msgstr "Indique si le paquet de certificats fourni par le serveur comprend le ce
 #~ msgid "Shows if the domain is policy compliant."
 #~ msgstr "Indique si le domaine est conforme à la politique."
 
-#: src/domains/DomainsPage.js:165
-#: src/organizationDetails/OrganizationDomains.js:292
+#: src/domains/DomainsPage.js:166
+#: src/organizationDetails/OrganizationDomains.js:291
 msgid "Shows if the domain meets the DomainKeys Identified Mail (DKIM) requirements."
 msgstr "Indique si le domaine répond aux exigences de DomainKeys Identified Mail (DKIM)."
 
-#: src/domains/DomainsPage.js:156
-#: src/organizationDetails/OrganizationDomains.js:283
+#: src/domains/DomainsPage.js:157
+#: src/organizationDetails/OrganizationDomains.js:282
 msgid "Shows if the domain meets the HSTS requirements."
 msgstr "Indique si le domaine répond aux exigences du HSTS."
 
-#: src/domains/DomainsPage.js:159
-#: src/organizationDetails/OrganizationDomains.js:286
+#: src/domains/DomainsPage.js:160
+#: src/organizationDetails/OrganizationDomains.js:285
 msgid "Shows if the domain meets the Hypertext Transfer Protocol Secure (HTTPS) requirements."
 msgstr "Indique si le domaine répond aux exigences du protocole de transfert hypertexte sécurisé (HTTPS)."
 
@@ -2946,51 +2962,59 @@ msgstr "Indique si le domaine répond aux exigences du protocole de transfert hy
 #~ msgid "Shows if the domain meets the Hypertext Transfer ol Secure (HTTPS) requirements."
 #~ msgstr "Indique si le domaine répond aux exigences de Hypertext Transfer ol Secure (HTTPS)."
 
-#: src/domains/DomainsPage.js:169
-#: src/organizationDetails/OrganizationDomains.js:296
+#: src/domains/DomainsPage.js:170
+#: src/organizationDetails/OrganizationDomains.js:295
 msgid "Shows if the domain meets the Message Authentication, Reporting, and Conformance (DMARC) requirements."
 msgstr "Indique si le domaine répond aux exigences de Message Authentication, Reporting, and Conformance (DMARC)."
 
-#: src/domains/DomainsPage.js:162
-#: src/organizationDetails/OrganizationDomains.js:289
+#: src/domains/DomainsPage.js:163
+#: src/organizationDetails/OrganizationDomains.js:288
 msgid "Shows if the domain meets the Sender Policy Framework (SPF) requirements."
 msgstr "Indique si le domaine répond aux exigences du Sender Policy Framework (SPF)."
 
-#: src/domains/DomainsPage.js:161
-#: src/organizationDetails/OrganizationDomains.js:288
+#: src/domains/DomainsPage.js:162
+#: src/organizationDetails/OrganizationDomains.js:287
 msgid "Shows if the domain uses acceptable protocols."
 msgstr "Indique si le domaine utilise des protocoles acceptables."
 
-#: src/domains/DomainsPage.js:154
-#: src/organizationDetails/OrganizationDomains.js:281
+#: src/domains/DomainsPage.js:155
+#: src/organizationDetails/OrganizationDomains.js:280
 msgid "Shows if the domain uses only ciphers that are strong or acceptable."
 msgstr "Indique si le domaine utilise uniquement des ciphers forts ou acceptables."
 
-#: src/domains/DomainsPage.js:155
-#: src/organizationDetails/OrganizationDomains.js:282
+#: src/domains/DomainsPage.js:156
+#: src/organizationDetails/OrganizationDomains.js:281
 msgid "Shows if the domain uses only curves that are strong or acceptable."
 msgstr "Indique si le domaine utilise uniquement des courbes fortes ou acceptables"
 
-#: src/guidance/WebTLSResults.js:243
+#: src/guidance/WebTLSResults.js:284
 msgid "Shows if the hostname on the server certificate matches the the hostname from the HTTP request."
 msgstr "Indique si le nom d'hôte figurant sur le certificat du serveur correspond au nom d'hôte figurant dans la requête HTTP."
 
-#: src/guidance/WebTLSResults.js:254
+#: src/guidance/WebTLSResults.js:295
 msgid "Shows if the leaf certificate includes the \"OCSP Must-Staple\" extension."
 msgstr "Indique si le certificat feuille comprend l'extension \"OCSP Must-Staple\"."
 
-#: src/guidance/WebTLSResults.js:264
+#: src/guidance/WebTLSResults.js:305
 msgid "Shows if the leaf certificate is an Extended Validation Certificate."
 msgstr "Indique si le certificat de la feuille est un certificat de validation étendue."
 
-#: src/guidance/WebTLSResults.js:296
+#: src/guidance/WebTLSResults.js:337
 msgid "Shows if the received certificates are free from the use of the deprecated SHA-1 algorithm."
 msgstr "Indique si les certificats reçus sont exempts de l'utilisation de l'algorithme SHA-1 déprécié."
 
-#: src/guidance/WebTLSResults.js:307
+#: src/guidance/WebTLSResults.js:348
 msgid "Shows if the received certificates are not relying on a distrusted Symantec root certificate."
 msgstr "Indique si les certificats reçus ne reposent pas sur un certificat racine Symantec douteux."
 
+#: src/guidance/WebTLSResults.js:224
+msgid "Shows if the server was found to be vulnerable to the Heartbleed vulnerability."
+msgstr ""
+
+#: src/guidance/WebTLSResults.js:237
+msgid "Shows if the server was found to be vulnerable to the ROBOT vulnerability."
+msgstr ""
+
 #: src/guidance/WebConnectionResults.js:191
 msgid "Shows the duration of time, in seconds, that the HSTS header is valid."
 msgstr "Indique la durée, en secondes, pendant laquelle l'en-tête HSTS est valide."
@@ -3035,9 +3059,9 @@ msgstr "Indique le nombre total d'e-mails qui ont été envoyés par ce domaine
 #~ msgid "Siganture Hash:"
 #~ msgstr "Siganture Hash :"
 
-#: src/app/App.js:165
+#: src/app/App.js:156
 #: src/app/FloatingMenu.js:197
-#: src/app/TopBanner.js:134
+#: src/app/TopBanner.js:118
 #: src/auth/SignInPage.js:189
 msgid "Sign In"
 msgstr "Se connecter"
@@ -3048,12 +3072,12 @@ msgid "Sign In."
 msgstr "Se connecter."
 
 #: src/app/FloatingMenu.js:192
-#: src/app/TopBanner.js:122
+#: src/app/TopBanner.js:106
 msgid "Sign Out"
 msgstr "Déconnexion"
 
 #: src/app/FloatingMenu.js:48
-#: src/app/TopBanner.js:41
+#: src/app/TopBanner.js:40
 msgid "Sign Out."
 msgstr "Déconnexion."
 
@@ -3061,11 +3085,11 @@ msgstr "Déconnexion."
 #~ msgid "Sign in with your username and password."
 #~ msgstr "Connectez-vous avec votre nom d'utilisateur et votre mot de passe."
 
-#: src/guidance/WebTLSResults.js:357
+#: src/guidance/WebTLSResults.js:398
 msgid "Signature Hash:"
 msgstr "Signature Hash :"
 
-#: src/app/App.js:77
+#: src/app/App.js:71
 msgid "Skip to main content"
 msgstr "Passer au contenu principal"
 
@@ -3073,7 +3097,7 @@ msgstr "Passer au contenu principal"
 msgid "Slug:"
 msgstr "Slug:"
 
-#: src/components/SearchBox.js:95
+#: src/components/SearchBox.js:66
 msgid "Sort by:"
 msgstr "Trier par:"
 
@@ -3081,11 +3105,11 @@ msgstr "Trier par:"
 msgid "Source IP Address"
 msgstr "Adresse IP source"
 
-#: src/organizationDetails/OrganizationDomains.js:98
+#: src/organizationDetails/OrganizationDomains.js:95
 msgid "Staging"
 msgstr "Dév"
 
-#: src/organizationDetails/OrganizationDomains.js:208
+#: src/organizationDetails/OrganizationDomains.js:191
 msgid "Status or tag"
 msgstr "Statut ou étiquette"
 
@@ -3101,7 +3125,7 @@ msgstr "Statut :"
 #~ msgid "Strong Curves:"
 #~ msgstr "Courbes fortes:"
 
-#: src/guidance/WebTLSResults.js:368
+#: src/guidance/WebTLSResults.js:409
 msgid "Subject:"
 msgstr "Sujet :"
 
@@ -3110,7 +3134,7 @@ msgstr "Sujet :"
 msgid "Submit"
 msgstr "Soumettre"
 
-#: src/admin/UserListModal.js:164
+#: src/admin/UserListModal.js:154
 msgid "Successfully removed user {0}."
 msgstr "L'utilisateur {0} a été supprimé."
 
@@ -3127,7 +3151,7 @@ msgstr "Super Admin Menu :"
 #~ msgid "Supports ECDH Key Exchange:"
 #~ msgstr "Supporte l'échange de clés ECDH:"
 
-#: src/app/TopBanner.js:67
+#: src/app/TopBanner.js:61
 msgid "Symbol of the Government of Canada"
 msgstr "Symbole du gouvernement du Canada"
 
@@ -3147,7 +3171,7 @@ msgstr "le SCT soit identifié comme la source; et"
 msgid "TBS reserves the right to refuse service, and may reject your application for an account, or cancel an existing account, for any reason, at our sole discretion."
 msgstr "TBS se réserve le droit de refuser le service, de rejeter votre demande de compte ou d'annuler un compte existant, pour quelque raison que ce soit, à sa seule discrétion."
 
-#: src/organizationDetails/OrganizationDomains.js:99
+#: src/organizationDetails/OrganizationDomains.js:96
 msgid "TEST"
 msgstr "TEST"
 
@@ -3155,7 +3179,7 @@ msgstr "TEST"
 #~ msgid "TLS"
 #~ msgstr "TLS"
 
-#: src/guidance/WebTLSResults.js:208
+#: src/guidance/WebTLSResults.js:211
 msgid "TLS Results"
 msgstr "Résultats TLS"
 
@@ -3167,7 +3191,7 @@ msgstr "Scan TLS terminé"
 msgid "TLS scan for domain \"{0}\" has completed."
 msgstr "Le scan TLS pour le domaine \"{0}\" est terminé."
 
-#: src/organizationDetails/OrganizationDomains.js:174
+#: src/organizationDetails/OrganizationDomains.js:165
 msgid "Tag"
 msgstr "Tag"
 
@@ -3179,11 +3203,11 @@ msgstr "Conseils techniques de mise en œuvre :"
 msgid "Termination"
 msgstr "Terminaison"
 
-#: src/app/App.js:189
+#: src/app/App.js:180
 msgid "Terms & Conditions"
 msgstr "Termes et conditions"
 
-#: src/app/App.js:338
+#: src/app/App.js:325
 #: src/app/FloatingMenu.js:225
 #: src/app/SlideMessage.js:92
 msgid "Terms & conditions"
@@ -3197,7 +3221,7 @@ msgstr "Termes et conditions"
 msgid "Terms of Use"
 msgstr "Conditions d'utilisation"
 
-#: src/organizationDetails/OrganizationDomains.js:99
+#: src/organizationDetails/OrganizationDomains.js:96
 msgid "Test"
 msgstr "Test"
 
@@ -3229,16 +3253,16 @@ msgstr "Adresse/domaine utilisé(e) dans le champ \"From\"."
 msgid "The advice, guidance or services provided to you by TBS will be provided on an “as-is” basis, without warrantee or representation of any kind, and TBS will not be liable for any loss, liability, damage or cost, including loss of data or interruptions of business arising from the provision of such advice, guidance or services by Tracker. Consequently, TBS recommends, that the users exercise their own skill and care with respect to their use of the advice, guidance and services that Tracker provides."
 msgstr "Les conseils, orientations ou services qui vous sont fournis par le SCT le seront “tels quels“, sans garantie ni déclaration d'aucune sorte, et le SCT ne pourra être tenu responsable de toute perte, responsabilité, dommage ou coût, y compris la perte de données ou les interruptions d'activité découlant de la fourniture de ces conseils, orientations ou services par Suivi. Par conséquent, TBS recommande aux utilisateurs d'exercer leur propre compétence et leur propre prudence en ce qui concerne l'utilisation des conseils, orientations et services fournis par Suivi."
 
+#: src/dmarc/DmarcByDomainPage.js:324
+#: src/domains/DomainsPage.js:154
+#: src/organizationDetails/OrganizationDomains.js:278
+msgid "The domain address."
+msgstr "L'adresse du domaine."
+
 #: src/dmarc/DmarcReportPage.js:231
 msgid "The domains used for DKIM validation."
 msgstr "Les domaines utilisés pour la validation DKIM."
 
-#: src/dmarc/DmarcByDomainPage.js:312
-#: src/domains/DomainsPage.js:153
-#: src/organizationDetails/OrganizationDomains.js:280
-msgid "The domain address."
-msgstr "L'adresse du domaine."
-
 #: src/guidance/WebTLSResults.js:60
 msgid "The following ciphers are from known weak protocols and must be disabled:"
 msgstr "Les chiffrements suivants proviennent de protocoles faibles connus et doivent être désactivés :"
@@ -3279,7 +3303,7 @@ msgstr "Résultats de la vérification DKIM du message. Il peut s'agir d'un succ
 msgid "The summary cards show two metrics that Tracker scans:"
 msgstr "Les cartes récapitulatives présentent deux mesures que Suivi analyse :"
 
-#: src/admin/UserListModal.js:114
+#: src/admin/UserListModal.js:106
 msgid "The user's role has been successfully updated"
 msgstr "Le rôle de l'utilisateur a été mis à jour avec succès"
 
@@ -3325,7 +3349,7 @@ msgstr "Ce domaine n'existe plus"
 msgid "This field cannot be empty"
 msgstr "Ce champ ne peut pas être vide"
 
-#: src/app/TopBanner.js:106
+#: src/app/TopBanner.js:90
 msgid "This is a new service, we are constantly improving."
 msgstr "Il s'agit d'un nouveau service, que nous améliorons constamment."
 
@@ -3345,11 +3369,11 @@ msgstr "Temps généré"
 msgid "Time Generated (UTC)"
 msgstr "Heure générée (UTC)"
 
-#: src/app/App.js:127
+#: src/app/App.js:118
 msgid "To enable full app functionality and maximize your account's security, <0>please verify your account</0>."
 msgstr "Pour activer toutes les fonctionnalités de l'application et maximiser la sécurité de votre compte, <0>vous devez vérifier votre compte</0>."
 
-#: src/app/App.js:141
+#: src/app/App.js:132
 msgid "To maximize your account's security, <0>please activate a multi-factor authentication option</0>."
 msgstr "Pour maximiser la sécurité de votre compte, <0>vous devez activer une option d'authentification multifactorielle</0>."
 
@@ -3389,11 +3413,11 @@ msgstr "Suivi n'ajoute pas automatiquement les sélecteurs, il est donc probable
 #~ msgid "Tracker does not automatically add selectors, so it is likely that they are not in the system yet. More information can be found in Getting Started with Tracker - Managing Your Domains."
 #~ msgstr "Suivi n'ajoute pas automatiquement les sélecteurs, il est donc probable qu'ils ne soient pas encore dans le système. Pour plus d'informations, consultez la section Premiers pas avec Suivi - Gérer vos domaines."
 
-#: src/app/TopBanner.js:81
+#: src/app/TopBanner.js:70
 msgid "Tracker logo outline"
 msgstr "Contour du logo Suivi"
 
-#: src/app/TopBanner.js:89
+#: src/app/TopBanner.js:73
 msgid "Tracker logo text"
 msgstr "Texte du logo du Suivi"
 
@@ -3422,11 +3446,11 @@ msgstr "Authentification à deux facteurs:"
 msgid "URL:"
 msgstr "URL :"
 
-#: src/admin/UserListModal.js:276
+#: src/admin/UserListModal.js:258
 msgid "USER"
 msgstr "UTILISATEUR"
 
-#: src/admin/UserListModal.js:103
+#: src/admin/UserListModal.js:95
 msgid "Unable to change user role, please try again."
 msgstr "Impossible de modifier le rôle de l'utilisateur, veuillez réessayer."
 
@@ -3443,7 +3467,7 @@ msgstr "Impossible de fermer ce compte."
 msgid "Unable to create account, please try again."
 msgstr "Impossible de créer un compte, veuillez réessayer."
 
-#: src/admin/AdminDomainModal.js:98
+#: src/admin/AdminDomainModal.js:84
 msgid "Unable to create new domain."
 msgstr "Impossible de créer un nouveau domaine."
 
@@ -3455,7 +3479,7 @@ msgstr "Impossible de créer une nouvelle organisation."
 msgid "Unable to create your account, please try again."
 msgstr "Impossible de créer votre compte, veuillez réessayer"
 
-#: src/admin/UserListModal.js:74
+#: src/admin/UserListModal.js:68
 msgid "Unable to invite user."
 msgstr "Impossible d'inviter un utilisateur."
 
@@ -3472,7 +3496,7 @@ msgstr "Impossible de supprimer le domaine."
 msgid "Unable to remove this organization."
 msgstr "Impossible de supprimer cette organisation."
 
-#: src/admin/UserListModal.js:172
+#: src/admin/UserListModal.js:162
 msgid "Unable to remove user."
 msgstr "Impossible de supprimer l'utilisateur."
 
@@ -3499,7 +3523,7 @@ msgstr "Impossible d'envoyer l'e-mail de vérification"
 msgid "Unable to sign in to your account, please try again."
 msgstr "Impossible de vous connecter à votre compte, veuillez réessayer."
 
-#: src/admin/AdminDomainModal.js:147
+#: src/admin/AdminDomainModal.js:133
 msgid "Unable to update domain."
 msgstr "Impossible de mettre à jour le domaine."
 
@@ -3531,7 +3555,7 @@ msgstr "Impossible de mettre à jour votre langue préférée, veuillez réessay
 msgid "Unable to update to your username, please try again."
 msgstr "Impossible de mettre à jour votre nom d'utilisateur, veuillez réessayer."
 
-#: src/admin/UserListModal.js:123
+#: src/admin/UserListModal.js:115
 msgid "Unable to update user role."
 msgstr "Impossible de mettre à jour le rôle de l'utilisateur."
 
@@ -3551,10 +3575,15 @@ msgstr "Impossible de vérifier votre numéro de téléphone, veuillez réessaye
 msgid "Understanding Scan Metrics:"
 msgstr "Comprendre les métriques d'analyse :"
 
-#: src/domains/DomainCard.js:84
+#: src/domains/DomainCard.js:83
 msgid "Unfavourited Domain"
 msgstr "Domaine non favorisé"
 
+#: src/guidance/WebTLSResults.js:233
+#: src/guidance/WebTLSResults.js:256
+msgid "Unknown"
+msgstr ""
+
 #: src/summaries/RadialBarChart.js:43
 #: src/summaries/SummaryGroup.js:28
 #: src/summaries/SummaryGroup.js:54
@@ -3623,20 +3652,20 @@ msgstr "Liste des utilisateurs"
 msgid "User email does not match"
 msgstr "L'email de l'utilisateur ne correspond pas"
 
-#: src/admin/UserListModal.js:64
+#: src/admin/UserListModal.js:58
 msgid "User invited"
 msgstr "Utilisateur invité"
 
-#: src/admin/UserListModal.js:163
+#: src/admin/UserListModal.js:153
 msgid "User removed."
 msgstr "Utilisateur supprimé."
 
-#: src/admin/UserListModal.js:247
+#: src/admin/UserListModal.js:230
 msgid "User:"
 msgstr "Utilisateur:"
 
 #: src/admin/AdminPage.js:190
-#: src/admin/AdminPanel.js:31
+#: src/admin/AdminPanel.js:29
 #: src/organizationDetails/OrganizationDetails.js:143
 msgid "Users"
 msgstr "Utilisateurs"
@@ -3645,7 +3674,7 @@ msgstr "Utilisateurs"
 msgid "Users exercise due diligence in ensuring the accuracy of the materials reproduced;"
 msgstr "Les utilisateurs font preuve de diligence raisonnable en s'assurant de l'exactitude des documents reproduits;"
 
-#: src/organizationDetails/OrganizationDomains.js:164
+#: src/organizationDetails/OrganizationDomains.js:155
 msgid "Value"
 msgstr "Valeur"
 
@@ -3659,11 +3688,11 @@ msgstr "Le code de vérification ne doit contenir que des chiffres"
 msgid "Verified"
 msgstr "Vérifié"
 
-#: src/guidance/WebTLSResults.js:311
+#: src/guidance/WebTLSResults.js:352
 msgid "Verified Chain Free of Legacy Symantec Anchor"
 msgstr "Chaîne vérifiée exempte d'ancre Symantec ancienne"
 
-#: src/guidance/WebTLSResults.js:300
+#: src/guidance/WebTLSResults.js:341
 msgid "Verified Chain Free of SHA1 Signature"
 msgstr "Chaîne vérifiée sans signature SHA1"
 
@@ -3683,11 +3712,11 @@ msgstr "Vérifier le compte"
 msgid "View Details"
 msgstr "Voir les détails"
 
-#: src/domains/DomainCard.js:222
+#: src/domains/DomainCard.js:221
 msgid "View Results"
 msgstr "Voir les résultats"
 
-#: src/dmarc/DmarcReportPage.js:577
+#: src/dmarc/DmarcReportPage.js:661
 msgid "Volume of messages spoofing domain (reject + quarantine + none):"
 msgstr "Volume de messages usurpant domaine (rejet + quarantaine + aucun) :"
 
@@ -3695,11 +3724,11 @@ msgstr "Volume de messages usurpant domaine (rejet + quarantaine + aucun) :"
 #~ msgid "Volume of messages spoofing {domainSlug} (reject + quarantine + none):"
 #~ msgstr "Volume de messages usurpant {domainSlug} (rejet + quarantaine + aucun) :"
 
-#: src/admin/WebCheckPage.js:176
+#: src/admin/WebCheckPage.js:158
 msgid "Vulnerability Scan Dashboard"
 msgstr "Tableau de bord de l'analyse des vulnérabilités"
 
-#: src/organizationDetails/OrganizationDomains.js:100
+#: src/organizationDetails/OrganizationDomains.js:97
 msgid "WEB"
 msgstr "WEB"
 
@@ -3731,20 +3760,20 @@ msgstr "Nous vous avons envoyé un e-mail avec un code d'authentification pour v
 #~ msgid "Weak Curves:"
 #~ msgstr "Courbes faibles:"
 
-#: src/organizationDetails/OrganizationDomains.js:100
+#: src/organizationDetails/OrganizationDomains.js:97
 msgid "Web"
 msgstr "Web"
 
-#: src/domains/DomainCard.js:182
+#: src/domains/DomainCard.js:181
 msgid "Web (HTTPS/TLS)"
 msgstr "Web (HTTPS/TLS)"
 
-#: src/admin/WebCheckPage.js:173
+#: src/admin/WebCheckPage.js:155
 msgid "Web Check"
 msgstr "Vérification du Web"
 
 #: src/domains/ScanDomain.js:242
-#: src/guidance/GuidancePage.js:100
+#: src/guidance/GuidancePage.js:102
 msgid "Web Guidance"
 msgstr "Conseils sur le Web"
 
@@ -3822,16 +3851,17 @@ msgstr "Wiki"
 #: src/guidance/WebConnectionResults.js:188
 #: src/guidance/WebConnectionResults.js:206
 #: src/guidance/WebConnectionResults.js:215
-#: src/guidance/WebTLSResults.js:250
-#: src/guidance/WebTLSResults.js:261
-#: src/guidance/WebTLSResults.js:270
-#: src/guidance/WebTLSResults.js:281
-#: src/guidance/WebTLSResults.js:292
-#: src/guidance/WebTLSResults.js:303
-#: src/guidance/WebTLSResults.js:314
-#: src/guidance/WebTLSResults.js:380
-#: src/guidance/WebTLSResults.js:389
-#: src/guidance/WebTLSResults.js:392
+#: src/guidance/WebTLSResults.js:233
+#: src/guidance/WebTLSResults.js:291
+#: src/guidance/WebTLSResults.js:302
+#: src/guidance/WebTLSResults.js:311
+#: src/guidance/WebTLSResults.js:322
+#: src/guidance/WebTLSResults.js:333
+#: src/guidance/WebTLSResults.js:344
+#: src/guidance/WebTLSResults.js:355
+#: src/guidance/WebTLSResults.js:421
+#: src/guidance/WebTLSResults.js:430
+#: src/guidance/WebTLSResults.js:433
 msgid "Yes"
 msgstr "Oui"
 
@@ -3851,12 +3881,12 @@ msgstr "Vous acceptez de protéger toute information qui vous est divulguée par
 msgid "You agree to use our website, products and services only for lawful purposes and in a manner that does not infringe the rights of, or restrict or inhibit the use and enjoyment of, the website, products or services by any third party. Additionally, you must not misuse, compromise or interfere with our services, or introduce material to our services that is malicious or technologically harmful. You must not attempt to gain unauthorized access to, tamper with, reverse engineer, or modify our website, products or services, the server(s) on which they are stored, or any server, computer or database connected to our website, products or services. We may suspend or stop providing our products or services to you if you do not comply with our terms or policies or if we are investigating suspected misconduct. Any suspected illegal use of our website, products or services may be reported to the relevant law enforcement authorities and where necessary we will co-operate with those authorities by disclosing your identity to them."
 msgstr "Vous acceptez d'utiliser notre site Web, nos produits et nos services uniquement à des fins légales et de manière à ne pas enfreindre les droits d'un tiers, ni à restreindre ou à empêcher l'utilisation et la jouissance du site Web, des produits ou des services par un tiers. En outre, vous ne devez pas abuser, compromettre ou interférer avec nos services, ni introduire dans nos services des éléments malveillants ou technologiquement dangereux. Vous ne devez pas tenter d'obtenir un accès non autorisé à notre site Web, à nos produits ou services, au(x) serveur(s) sur le(s)quel(s) ils sont stockés, ou à tout serveur, ordinateur ou base de données connecté à notre site Web, à nos produits ou à nos services, ni les altérer, les désosser ou les modifier. Nous pouvons suspendre ou cesser de vous fournir nos produits ou services si vous ne respectez pas nos conditions ou politiques ou si nous enquêtons sur une suspicion de mauvaise conduite. Tout soupçon d'utilisation illégale de notre site web, de nos produits ou de nos services peut être signalé aux autorités compétentes chargées de l'application de la loi et, si nécessaire, nous coopérerons avec ces autorités en leur divulguant votre identité."
 
-#: src/domains/DomainCard.js:60
+#: src/domains/DomainCard.js:58
 msgid "You have successfully added {url} to myTracker."
 msgstr "Vous avez ajouté avec succès {url} à monSuivi."
 
 #: src/app/FloatingMenu.js:49
-#: src/app/TopBanner.js:42
+#: src/app/TopBanner.js:41
 msgid "You have successfully been signed out."
 msgstr "Vous avez été déconnecté avec succès."
 
@@ -3869,7 +3899,7 @@ msgstr "Vous avez été déconnecté avec succès."
 msgid "You have successfully removed {0}."
 msgstr "Vous avez retiré {0} avec succès."
 
-#: src/domains/DomainCard.js:86
+#: src/domains/DomainCard.js:84
 msgid "You have successfully removed {url} from myTracker."
 msgstr "Vous avez réussi à supprimer {url} de monSuivi."
 
@@ -3917,7 +3947,7 @@ msgstr "Vous pouvez maintenant vous connecter avec votre nouveau mot de passe"
 msgid "You will need a Tracker account to use certain products and services. You are responsible for maintaining the confidentiality of your account, password and for restricting access to your account. You also agree to accept responsibility for all activities that occur under your account or password. TBS accepts no liability for any loss or damage arising from your failure to maintain the security of your account or password."
 msgstr "Vous aurez besoin d'un compte Suivi pour utiliser certains produits et services. Vous êtes responsable du maintien de la confidentialité de votre compte et de votre mot de passe et de la restriction de l'accès à votre compte. Vous acceptez également d'assumer la responsabilité de toutes les activités qui se déroulent sous votre compte ou votre mot de passe. Le SCT n'accepte aucune responsabilité pour toute perte ou tout dommage résultant de votre incapacité à maintenir la sécurité de votre compte ou de votre mot de passe."
 
-#: src/app/App.js:271
+#: src/app/App.js:262
 msgid "Your Account"
 msgstr "Votre compte"
 
@@ -3953,8 +3983,8 @@ msgstr "contactez-nous"
 #~ msgid "https://https-everywhere.canada.ca/en/help/"
 #~ msgstr "https://https-everywhere.canada.ca/en/help/"
 
-#: src/app/App.js:105
-#: src/app/App.js:284
+#: src/app/App.js:97
+#: src/app/App.js:275
 #: src/user/MyTrackerPage.js:43
 #: src/user/MyTrackerPage.js:74
 msgid "myTracker"
@@ -3996,7 +4026,7 @@ msgstr "e-mail de l'utilisateur"
 msgid "weak"
 msgstr "faible"
 
-#: src/admin/AdminDomainModal.js:88
+#: src/admin/AdminDomainModal.js:75
 msgid "{0} was added to {orgSlug}"
 msgstr "{0} a été ajouté à {orgSlug}"
 
@@ -4016,11 +4046,11 @@ msgstr "{count} enregistrements..."
 msgid "{domainSlug} does not support aggregate data"
 msgstr "{domainSlug} ne supporte pas les données agrégées"
 
-#: src/admin/AdminDomainModal.js:137
+#: src/admin/AdminDomainModal.js:123
 msgid "{editingDomainUrl} from {orgSlug} successfully updated to {0}"
 msgstr "{editingDomainUrl} de {orgSlug} mis à jour avec succès à {0}"
 
-#: src/components/InfoPanel.js:52
+#: src/components/InfoPanel.js:47
 msgid "{info}"
 msgstr "{info}"
 
@@ -4028,7 +4058,7 @@ msgstr "{info}"
 #~ msgid "{label}"
 #~ msgstr "{label}"
 
-#: src/components/InfoPanel.js:49
+#: src/components/InfoPanel.js:44
 msgid "{title}"
 msgstr "{title}"