Merge branch 'dev' into fix-translated-images-link

Author: nhsz

src/components/PageHero.tsx

@@ -97,8 +97,6 @@ const PageHero = ({
           {subtitle}
         </Text>
         {buttons && (
-          // FIXME: remove the `ul` override once removed the corresponding
-          // global styles in `src/@chakra-ui/gatsby-plugin/styles.ts`
           <Wrap spacing={2} overflow="visible" sx={{ ul: { m: 0 } }}>
             {buttons.map((button, idx) => {
               if (isButtonLink(button)) {

src/components/SideNav.tsx

@@ -144,7 +144,6 @@ export interface SideNavProps {
 // TODO set tree state based on if current path is a child
 // of the given parent. Currently all `path` items default to open
 // and they only collapse when clicked on.
-// e.g. solution: https://github.com/hasura/gatsby-gitbook-starter/blob/5c165af40e48fc55eb06b45b95c84eb64b17ed32/src/components/sidebar/tree.js
 const SideNav = ({ path }: SideNavProps) => {
   const { t } = useTranslation("page-developers-docs")
 

src/global.d.ts

@@ -14,10 +14,6 @@ declare global {
       GITHUB_TOKEN: string
       ALGOLIA_ADMIN_KEY: string
       ETHERSCAN_API_KEY: string
-      GATSBY_ALGOLIA_APP_ID: string
-      GATSBY_ALGOLIA_SEARCH_KEY: string
-      GATSBY_GITHUB_TOKEN_READ_ONLY: string
-      GATSBY_FUNCTIONS_PATH: string
       CROWDIN_API_KEY: string
     }
   }

src/layouts/Roadmap.tsx

@@ -141,52 +141,50 @@ export const RoadmapLayout: React.FC<IProps> = ({
         />
       ) : (
         <HeroContainer>
-            <TitleCard>
-              {/* TODO: Double check this slug works */}
-              <Breadcrumbs slug={slug} mb="8" />
-              <Title>{frontmatter.title}</Title>
-              <OldText>{frontmatter.description}</OldText>
-              {frontmatter?.buttons && (
-                // FIXME: remove the `ul` override once removed the corresponding
-                // global styles in `src/@chakra-ui/gatsby-plugin/styles.ts`
-                <Wrap spacing={2} marginBottom={4} sx={{ ul: { m: 0 } }}>
-                  {frontmatter.buttons.map((button, idx) => {
-                    if (button?.to) {
-                      return (
-                        <WrapItem key={idx}>
-                          <ButtonLink variant={button?.variant} to={button?.to}>
-                            {button.label}
-                          </ButtonLink>
-                        </WrapItem>
-                      )
-                    }
+          <TitleCard>
+            {/* TODO: Double check this slug works */}
+            <Breadcrumbs slug={slug} mb="8" />
+            <Title>{frontmatter.title}</Title>
+            <OldText>{frontmatter.description}</OldText>
+            {frontmatter?.buttons && (
+              <Wrap spacing={2} marginBottom={4} sx={{ ul: { m: 0 } }}>
+                {frontmatter.buttons.map((button, idx) => {
+                  if (button?.to) {
                     return (
                       <WrapItem key={idx}>
-                        <Button variant={button?.variant} toId={button?.toId}>
-                          {button?.label}
-                        </Button>
+                        <ButtonLink variant={button?.variant} to={button?.to}>
+                          {button.label}
+                        </ButtonLink>
                       </WrapItem>
                     )
-                  })}
-                </Wrap>
-              )}
-              <TableOfContents
-                position="relative"
-                zIndex="2"
-                items={tocItems}
-                isMobile
-              />
-            </TitleCard>
-            <Center>
-              <Image
-                src={frontmatter.image}
-                alt={frontmatter.alt ?? ""}
-                style={{ objectFit: "contain" }}
-                width={1504}
-                height={345}
-                priority
-              />
-            </Center>
+                  }
+                  return (
+                    <WrapItem key={idx}>
+                      <Button variant={button?.variant} toId={button?.toId}>
+                        {button?.label}
+                      </Button>
+                    </WrapItem>
+                  )
+                })}
+              </Wrap>
+            )}
+            <TableOfContents
+              position="relative"
+              zIndex="2"
+              items={tocItems}
+              isMobile
+            />
+          </TitleCard>
+          <Center>
+            <Image
+              src={frontmatter.image}
+              alt={frontmatter.alt ?? ""}
+              style={{ objectFit: "contain" }}
+              width={1504}
+              height={345}
+              priority
+            />
+          </Center>
         </HeroContainer>
       )}
       <Page>

src/lib/utils/url.ts

@@ -17,7 +17,6 @@ export const isPdf = (href: string): boolean => href.endsWith(".pdf")
 export const sanitizeHitUrl = (url: string): string =>
   url
     .replace(/^https?:\/\/[^\/]+(?=\/)/, "")
-    .replace("#gatsby-focus-wrapper", "")
     .replace("#main-content", "")
     .replace("#content", "")
     .replace("#top", "")

src/pages/bug-bounty.tsx

@@ -747,7 +747,6 @@ const BugBountiesPage = () => {
                 <Translation id="page-bug-bounty:bug-bounty-faq-q1-contentPreview" />
               }
             >
-              {/* TODO: Check <code> styling compared to Gatsby repo */}
               <Text>
                 <Translation id="page-bug-bounty:bug-bounty-faq-q1-content-1" />
               </Text>