From a07ee2d74d8528b32b932eacbaf2b40f69a4aac6 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Wed, 21 Sep 2022 23:23:50 -0300
Subject: [PATCH 001/108] refactor all the components

---
 src/components/BeaconChainActions.tsx         |  40 +-
 src/components/Breadcrumbs.tsx                |  12 +-
 src/components/ButtonDropdown.tsx             |   8 +-
 src/components/EthExchanges.tsx               |  33 +-
 src/components/FeedbackWidget.tsx             |  19 +-
 src/components/FileContributors.tsx           |   6 +-
 src/components/Footer.tsx                     |   8 +-
 src/components/Layer2/Layer2Onboard.tsx       |  34 +-
 src/components/Layer2ProductCard.tsx          |  14 +-
 src/components/Layout.tsx                     |  49 +-
 src/components/Link.tsx                       |   7 +-
 src/components/Logo.tsx                       |  10 +-
 src/components/MergeArticleList.tsx           |  83 +--
 src/components/MergeInfographic.tsx           |  14 +-
 src/components/Nav/Dropdown.tsx               |  11 +-
 src/components/Nav/Menu.tsx                   |   6 +-
 src/components/Nav/Mobile.tsx                 |  14 +-
 src/components/Nav/index.tsx                  |   9 +-
 src/components/PageMetadata.tsx               |  12 +-
 src/components/Roadmap.tsx                    |  15 +-
 src/components/Search/Input.tsx               |   7 +-
 src/components/Search/index.tsx               |   6 +-
 src/components/ShardChainsList.tsx            |  56 +-
 src/components/SideNav.tsx                    |   7 +-
 src/components/StablecoinAccordion.tsx        |  71 +-
 src/components/StablecoinBoxGrid.tsx          |   7 +-
 .../Staking/StakingCommunityCallout.tsx       |   7 +-
 .../Staking/StakingLaunchpadWidget.tsx        |  15 +-
 src/components/Staking/StakingStatsBox.tsx    |  10 +-
 src/components/StatsBoxGrid.tsx               |  54 +-
 src/components/Translation.tsx                |   8 +-
 src/components/Trilemma.tsx                   |  13 +-
 src/components/TutorialMetadata.tsx           |   6 +-
 src/pages-conditional/dapps.tsx               | 619 +++++-------------
 src/pages-conditional/eth.tsx                 |  27 +-
 src/pages-conditional/wallets.tsx             |  54 +-
 src/pages-conditional/what-is-ethereum.tsx    |  80 +--
 src/pages/assets.tsx                          | 255 +++-----
 src/pages/bug-bounty.tsx                      |  54 +-
 src/pages/community.tsx                       | 104 +--
 .../translation-program/acknowledgements.tsx  |  30 +-
 src/pages/developers/index.tsx                |  18 +-
 src/pages/developers/learning-tools.tsx       |  11 +-
 src/pages/developers/local-environment.tsx    |  20 +-
 src/pages/developers/tutorials.tsx            |  15 +-
 src/pages/get-eth.tsx                         |  48 +-
 src/pages/index.tsx                           | 136 ++--
 src/pages/languages.tsx                       |  19 +-
 src/pages/layer-2.tsx                         | 136 ++--
 src/pages/learn/index.tsx                     | 191 ++----
 src/pages/run-a-node.tsx                      |  44 +-
 src/pages/stablecoins.tsx                     | 176 ++---
 src/pages/staking/deposit-contract.tsx        |  27 +-
 src/pages/staking/index.tsx                   |  58 +-
 src/pages/upgrades/get-involved/index.tsx     |  17 +-
 src/pages/upgrades/index.tsx                  | 116 +---
 src/pages/upgrades/vision.tsx                 |  17 +-
 src/pages/wallets/find-wallet.tsx             |  12 +-
 src/scripts/mergeTranslations.ts              |   2 +-
 src/templates/static.tsx                      |   8 +-
 src/templates/upgrade.tsx                     |   6 +-
 src/templates/use-cases.tsx                   |   2 -
 src/utils/translations.ts                     |  29 +-
 63 files changed, 968 insertions(+), 2034 deletions(-)

diff --git a/src/components/BeaconChainActions.tsx b/src/components/BeaconChainActions.tsx
index 3725fcf9664..29f7eaa0a66 100644
--- a/src/components/BeaconChainActions.tsx
+++ b/src/components/BeaconChainActions.tsx
@@ -1,9 +1,8 @@
 import React from "react"
 import { useStaticQuery, graphql } from "gatsby"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
-import { translateMessageId } from "../utils/translations"
 import { getImage, ImageDataLike } from "../utils/image"
 
 import CardList from "./CardList"
@@ -88,7 +87,7 @@ type BeaconQueryTypes = {
 }
 
 const BeaconChainActions: React.FC = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const data = useStaticQuery<BeaconQueryTypes>(BeaconStaticQuery)
 
   const datapoints: Array<CardListItem> = [
@@ -97,44 +96,32 @@ const BeaconChainActions: React.FC = () => {
       image: getImage(data.beaconscan)!,
       alt: "",
       link: "https://beaconscan.com",
-      description: translateMessageId("consensus-beaconscan-desc", intl),
+      description: t("consensus-beaconscan-desc"),
     },
     {
       title: "beaconcha.in",
       image: getImage(data.beaconchain)!,
       alt: "",
       link: "https://beaconcha.in",
-      description: translateMessageId("consensus-beaconcha-in-desc", intl),
+      description: t("consensus-beaconcha-in-desc"),
     },
   ]
 
   //TODO: we should refactor the naming here instead of using authors into the description field
   const reads: Array<CardListItem> = [
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-two-point-oh",
-        intl
-      ),
+      title: t("page-upgrade-article-title-two-point-oh"),
       description: "Status",
       link: "https://our.status.im/two-point-oh-the-beacon-chain/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-beacon-chain-explainer",
-        intl
-      ),
+      title: t("page-upgrade-article-title-beacon-chain-explainer"),
       description: "Ethos.dev",
       link: "https://ethos.dev/beacon-chain/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-sharding-consensus",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethereum-foundation",
-        intl
-      ),
+      title: t("page-upgrade-article-title-sharding-consensus"),
+      description: t("page-upgrade-article-author-ethereum-foundation"),
       link: "https://blog.ethereum.org/2020/03/27/sharding-consensus/",
     },
   ]
@@ -144,8 +131,8 @@ const BeaconChainActions: React.FC = () => {
       <StyledCardContainer>
         <StyledCardLeft
           emoji=":money_with_wings:"
-          title={translateMessageId("consensus-become-staker", intl)}
-          description={translateMessageId("consensus-become-staker-desc", intl)}
+          title={t("consensus-become-staker")}
+          description={t("consensus-become-staker-desc")}
         >
           <StyledButtonLink to="https://launchpad.ethereum.org">
             <Translation id="get-started" />
@@ -156,11 +143,8 @@ const BeaconChainActions: React.FC = () => {
         </StyledCardLeft>
         <StyledCardRight
           emoji=":computer:"
-          title={translateMessageId("consensus-run-beacon-chain", intl)}
-          description={translateMessageId(
-            "consensus-run-beacon-chain-desc",
-            intl
-          )}
+          title={t("consensus-run-beacon-chain")}
+          description={t("consensus-run-beacon-chain-desc")}
         >
           <ButtonLink variant="outline" to="/upgrades/get-involved/">
             <Translation id="consensus-run-beacon-chain" />
diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx
index be3ade28881..5460a050ca1 100644
--- a/src/components/Breadcrumbs.tsx
+++ b/src/components/Breadcrumbs.tsx
@@ -1,10 +1,10 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import Link from "./Link"
-import { isLang, supportedLanguages } from "../utils/languages"
-import { isTranslationKey, translateMessageId } from "../utils/translations"
+import { isLang } from "../utils/languages"
+import { isTranslationKey } from "../utils/translations"
 
 const ListContainer = styled.nav`
   margin-bottom: 2rem;
@@ -71,7 +71,7 @@ const Breadcrumbs: React.FC<IProps> = ({
   startDepth = 0,
   ...restProps
 }) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const slugChunk = slug.split("/")
   const sliced = slugChunk.filter((item) => !!item).slice(startDepth)
@@ -79,9 +79,9 @@ const Breadcrumbs: React.FC<IProps> = ({
   const crumbs = sliced.map((path, idx) => {
     // If homepage (e.g. "en"), set text to "home" translation
     const text = isLang(path)
-      ? translateMessageId("page-index-meta-title", intl)
+      ? t("page-index-meta-title")
       : isTranslationKey(path)
-      ? translateMessageId(path, intl)
+      ? t(path)
       : ""
 
     return {
diff --git a/src/components/ButtonDropdown.tsx b/src/components/ButtonDropdown.tsx
index 501bcc139cb..cdbb6f74fe3 100644
--- a/src/components/ButtonDropdown.tsx
+++ b/src/components/ButtonDropdown.tsx
@@ -1,7 +1,7 @@
 // Libraries
 import React, { useState, createRef } from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { motion } from "framer-motion"
 import { MdMenu } from "react-icons/md"
 
@@ -12,7 +12,7 @@ import Translation from "./Translation"
 
 // Utils
 import { useOnClickOutside } from "../hooks/useOnClickOutside"
-import { translateMessageId, TranslationKey } from "../utils/translations"
+import { TranslationKey } from "../utils/translations"
 import { trackCustomEvent } from "../utils/matomo"
 
 const Container = styled.div`
@@ -120,7 +120,7 @@ export interface IProps {
 
 const ButtonDropdown: React.FC<IProps> = ({ list, className }) => {
   const [isOpen, setIsOpen] = useState<boolean>(false)
-  const intl = useIntl()
+  const { t } = useTranslation()
   const ref = createRef<HTMLInputElement>()
 
   useOnClickOutside(ref, () => setIsOpen(false))
@@ -136,7 +136,7 @@ const ButtonDropdown: React.FC<IProps> = ({ list, className }) => {
     <Container
       className={className}
       ref={ref}
-      aria-label={`Select ${translateMessageId(list.text, intl)}`}
+      aria-label={`Select ${t(list.text)}`}
     >
       <Button
         variant="outline"
diff --git a/src/components/EthExchanges.tsx b/src/components/EthExchanges.tsx
index 9f682bf7801..be6820cf4ba 100644
--- a/src/components/EthExchanges.tsx
+++ b/src/components/EthExchanges.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react"
 import { useStaticQuery, graphql } from "gatsby"
 import { IGatsbyImageData } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 
 import CardList from "./CardList"
@@ -12,7 +12,6 @@ import { StyledSelect as Select } from "./SharedStyledComponents"
 
 import { getLocaleTimestamp } from "../utils/time"
 import { trackCustomEvent } from "../utils/matomo"
-import { translateMessageId } from "../utils/translations"
 import { getImage, ImageDataLike } from "../utils/image"
 import { Lang } from "../utils/languages"
 
@@ -214,13 +213,11 @@ interface State {
 
 // TODO move component into get-eth.js page?
 const EthExchanges = () => {
-  const intl = useIntl()
+  const { language } = useI18next()
+  const { t } = useTranslation()
   const [state, setState] = useState<State>()
 
-  const placeholderString = translateMessageId(
-    "page-get-eth-exchanges-search",
-    intl
-  )
+  const placeholderString = t("page-get-eth-exchanges-search")
   const data = useStaticQuery(graphql`
     query EthExchanges {
       exchangesByCountry: allExchangesByCountryCsv {
@@ -597,7 +594,7 @@ const EthExchanges = () => {
   }
 
   const lastUpdated = getLocaleTimestamp(
-    intl.locale as Lang,
+    language as Lang,
     data.timestamp.parent.fields.gitLogLatestDate
   )
 
@@ -643,15 +640,11 @@ const EthExchanges = () => {
       .map((exchange) => {
         // Add state exceptions if Country is USA
         let description: string | null = null
-        if (
-          state?.selectedCountry?.value ===
-          translateMessageId("page-get-eth-exchanges-usa", intl)
-        ) {
+        if (state?.selectedCountry?.value === t("page-get-eth-exchanges-usa")) {
           const exceptions = exchanges[exchange].usaExceptions
           if (exceptions.length > 0) {
-            description = `${translateMessageId(
-              "page-get-eth-exchanges-except",
-              intl
+            description = `${t(
+              "page-get-eth-exchanges-except"
             )} ${exceptions.join(", ")}`
           }
         }
@@ -683,14 +676,12 @@ const EthExchanges = () => {
             // Add state exceptions if Country is USA
             let description: string | null = null
             if (
-              state?.selectedCountry?.value ===
-              translateMessageId("page-get-eth-exchanges-usa", intl)
+              state?.selectedCountry?.value === t("page-get-eth-exchanges-usa")
             ) {
               const exceptions = walletProviders[currentProvider].usaExceptions
               if (exceptions.length > 0) {
-                description = `${translateMessageId(
-                  "page-get-eth-exchanges-except",
-                  intl
+                description = `${t(
+                  "page-get-eth-exchanges-except"
                 )} ${exceptions.join(", ")}`
               }
               // Filter out wallets that only service USA
@@ -725,7 +716,7 @@ const EthExchanges = () => {
         <Translation id="page-get-eth-exchanges-intro" />
       </Intro>
       <StyledSelect
-        aria-label={translateMessageId("page-get-eth-exchanges-header", intl)}
+        aria-label={t("page-get-eth-exchanges-header")}
         className="react-select-container"
         classNamePrefix="react-select"
         options={exchangesByCountry}
diff --git a/src/components/FeedbackWidget.tsx b/src/components/FeedbackWidget.tsx
index 2a5b755a087..7b389c027d7 100644
--- a/src/components/FeedbackWidget.tsx
+++ b/src/components/FeedbackWidget.tsx
@@ -1,6 +1,6 @@
 // Library imports
 import React, { useState, useEffect, useRef, useMemo } from "react"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 import FocusTrap from "focus-trap-react"
 // Component imports
@@ -12,7 +12,6 @@ import NakedButton from "./NakedButton"
 import FeedbackGlyph from "../assets/feedback-glyph.svg"
 // Utility imports
 import { trackCustomEvent } from "../utils/matomo"
-import { translateMessageId } from "../utils/translations"
 // Hook imports
 import { useOnClickOutside } from "../hooks/useOnClickOutside"
 import { useKeyPress } from "../hooks/useKeyPress"
@@ -150,7 +149,7 @@ export interface IProps {
 }
 
 const FeedbackWidget: React.FC<IProps> = ({ className }) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const containerRef = useRef<HTMLInputElement>(null)
   useOnClickOutside(containerRef, () => handleClose(), [`mousedown`])
   const [location, setLocation] = useState("")
@@ -258,10 +257,7 @@ const FeedbackWidget: React.FC<IProps> = ({ className }) => {
                   <Button
                     variant="outline-color"
                     onClick={handleSurveyOpen}
-                    aria-label={translateMessageId(
-                      "feedback-widget-thank-you-cta",
-                      intl
-                    )}
+                    aria-label={t("feedback-widget-thank-you-cta")}
                   >
                     <Translation id="feedback-widget-thank-you-cta" />
                   </Button>
@@ -270,24 +266,21 @@ const FeedbackWidget: React.FC<IProps> = ({ className }) => {
                     <Button
                       variant="outline-color"
                       onClick={() => handleSubmit(true)}
-                      aria-label={translateMessageId("yes", intl)}
+                      aria-label={t("yes")}
                     >
                       <Translation id="yes" />
                     </Button>
                     <Button
                       variant="outline-color"
                       onClick={() => handleSubmit(false)}
-                      aria-label={translateMessageId("no", intl)}
+                      aria-label={t("no")}
                     >
                       <Translation id="no" />
                     </Button>
                   </>
                 )}
               </ButtonContainer>
-              <IconContainer
-                onClick={handleClose}
-                aria-label={translateMessageId("close", intl)}
-              >
+              <IconContainer onClick={handleClose} aria-label={t("close")}>
                 <Icon name="close" />
               </IconContainer>
             </Container>
diff --git a/src/components/FileContributors.tsx b/src/components/FileContributors.tsx
index 8ea5765552a..57fddb7b889 100644
--- a/src/components/FileContributors.tsx
+++ b/src/components/FileContributors.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 import { css, Theme } from "@emotion/react"
 import styled from "@emotion/styled"
 import { useQuery, gql } from "@apollo/client"
@@ -259,7 +259,7 @@ const FileContributors: React.FC<IProps> = ({
   editPath,
 }) => {
   const [isModalOpen, setModalOpen] = useState(false)
-  const intl = useIntl()
+  const { language } = useI18next()
 
   const { loading, error, data } = useQuery(COMMIT_HISTORY, {
     variables: { relativePath },
@@ -332,7 +332,7 @@ const FileContributors: React.FC<IProps> = ({
               </Link>
             )}
             {!lastContributor.user && <span>{lastContributor.name}</span>},{" "}
-            {getLocaleTimestamp(intl.locale as Lang, lastCommit.committedDate)}
+            {getLocaleTimestamp(language as Lang, lastCommit.committedDate)}
           </Info>
         </LeftContent>
         <ButtonContainer>
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index fd447bd87b2..266dacc0d21 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 import { StaticQuery, graphql } from "gatsby"
 import { Icon } from "@chakra-ui/react"
 import { FaDiscord, FaGithub, FaTwitter, FaYoutube } from "react-icons/fa"
@@ -136,9 +136,9 @@ export interface LinkSection {
 export interface IProps {}
 
 const Footer: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { language } = useI18next()
 
-  const isPageRightToLeft = isLangRightToLeft(intl.locale as Lang)
+  const isPageRightToLeft = isLangRightToLeft(language as Lang)
 
   const linkSections: Array<LinkSection> = [
     {
@@ -377,7 +377,7 @@ const Footer: React.FC<IProps> = () => {
             <LastUpdated>
               <Translation id="website-last-updated" />:{" "}
               {getLocaleTimestamp(
-                intl.locale as Lang,
+                language as Lang,
                 data.allSiteBuildMetadata.edges[0].node.buildTime
               )}
             </LastUpdated>
diff --git a/src/components/Layer2/Layer2Onboard.tsx b/src/components/Layer2/Layer2Onboard.tsx
index f96d850307a..a75c28f8b93 100644
--- a/src/components/Layer2/Layer2Onboard.tsx
+++ b/src/components/Layer2/Layer2Onboard.tsx
@@ -2,7 +2,7 @@
 import { GatsbyImage, IGatsbyImageData } from "gatsby-plugin-image"
 import React, { useState } from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 // Components
 import ButtonLink from "../ButtonLink"
@@ -15,7 +15,6 @@ import cexSupport from "../../data/layer-2/cex-layer-2-support.json"
 
 //Utils
 import { trackCustomEvent } from "../../utils/matomo"
-import { translateMessageId } from "../../utils/translations"
 
 // Styles
 const Content = styled.div`
@@ -201,7 +200,7 @@ const Layer2Onboard: React.FC<IProps> = ({
   ethIcon,
   ethIconAlt,
 }) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const [selectedExchange, setSelectedExchange] = useState<Exchange>()
   const [selectedL2, setSelectedL2] = useState<Layer2>()
@@ -262,30 +261,20 @@ const Layer2Onboard: React.FC<IProps> = ({
               })
               setSelectedL2(selectedOption.l2)
             }}
-            placeholder={translateMessageId(
-              "layer-2-onboard-wallet-input-placeholder",
-              intl
-            )}
+            placeholder={t("layer-2-onboard-wallet-input-placeholder")}
           />
         </LeftSelect>
         {selectedL2 && (
           <LeftSelected>
             <SelectedContainer>
               <p>
-                <b>{`${translateMessageId(
-                  "layer-2-onboard-wallet-selected-1",
-                  intl
-                )} ${selectedL2.name} ${translateMessageId(
-                  "layer-2-onboard-wallet-selected-2",
-                  intl
-                )}`}</b>
+                <b>{`${t("layer-2-onboard-wallet-selected-1")} ${
+                  selectedL2.name
+                } ${t("layer-2-onboard-wallet-selected-2")}`}</b>
               </p>
               <p>{selectedL2.bridgeWallets.join(", ")}</p>
               <ButtonLinkMargin to={selectedL2.bridge}>
-                {`${selectedL2.name} ${translateMessageId(
-                  "layer-2-bridge",
-                  intl
-                )}`}
+                {`${selectedL2.name} ${t("layer-2-bridge")}`}
               </ButtonLinkMargin>
             </SelectedContainer>
           </LeftSelected>
@@ -318,10 +307,7 @@ const Layer2Onboard: React.FC<IProps> = ({
               })
               setSelectedExchange(selectedOption.cex)
             }}
-            placeholder={translateMessageId(
-              "layer-2-onboard-exchange-input-placeholder",
-              intl
-            )}
+            placeholder={t("layer-2-onboard-exchange-input-placeholder")}
           />
         </RightSelect>
         <EthLogo>
@@ -353,9 +339,7 @@ const Layer2Onboard: React.FC<IProps> = ({
                 </Flex50>
               </TwoColumnContent>
               <ButtonLink to={selectedExchange.url}>
-                {`${translateMessageId("layer-2-go-to", intl)} ${
-                  selectedExchange.name
-                }`}
+                {`${t("layer-2-go-to")} ${selectedExchange.name}`}
               </ButtonLink>
             </SelectedContainer>
           </RightSelected>
diff --git a/src/components/Layer2ProductCard.tsx b/src/components/Layer2ProductCard.tsx
index 5113ca7035d..d82e6089143 100644
--- a/src/components/Layer2ProductCard.tsx
+++ b/src/components/Layer2ProductCard.tsx
@@ -1,7 +1,7 @@
 // Libraries
 import React from "react"
 import { GatsbyImage, IGatsbyImageData } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { Box, Center, Flex, Heading, Image, Text } from "@chakra-ui/react"
 
 // Components
@@ -38,7 +38,7 @@ const Layer2ProductCard: React.FC<IProps> = ({
   tokenLists,
   ecosystemPortal,
 }) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   return (
     <Flex
@@ -83,29 +83,29 @@ const Layer2ProductCard: React.FC<IProps> = ({
           </Text>
           {note.length > 0 && (
             <Text opacity="0.8" fontSize="sm" mb={2} lineHeight="140%">
-              {translateMessageId("layer-2-note", intl)} {note}
+              {t("layer-2-note")} {note}
             </Text>
           )}
         </Box>
         {bridge && (
           <Link to={bridge}>
-            {name} {translateMessageId("layer-2-bridge", intl)}
+            {name} {t("layer-2-bridge")}
           </Link>
         )}
         {ecosystemPortal && (
           <Link to={ecosystemPortal}>
-            {name} {translateMessageId("layer-2-ecosystem-portal", intl)}
+            {name} {t("layer-2-ecosystem-portal")}
           </Link>
         )}
         {tokenLists && (
           <Link to={tokenLists}>
-            {name} {translateMessageId("layer-2-token-lists", intl)}
+            {name} {t("layer-2-token-lists")}
           </Link>
         )}
       </Flex>
       <Box>
         <ButtonLink m={2} to={url} display="flex">
-          {translateMessageId("layer-2-explore", intl)} {name}
+          {t("layer-2-explore")} {name}
         </ButtonLink>
       </Box>
     </Flex>
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 73fd604fd44..911608a62cb 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -3,8 +3,6 @@ import { ApolloProvider } from "@apollo/client"
 import { useColorModeValue } from "@chakra-ui/react"
 import { ThemeProvider } from "@emotion/react"
 import styled from "@emotion/styled"
-import { IntlProvider } from "react-intl"
-import { LocaleProvider } from "gatsby-theme-i18n"
 
 import { lightTheme, darkTheme } from "../theme"
 
@@ -93,7 +91,6 @@ const Layout: React.FC<IProps> = ({
   const [isZenMode, setIsZenMode] = useState<boolean>(false)
   const [shouldShowSideNav, setShouldShowSideNav] = useState<boolean>(false)
   const locale = pageContext.locale
-  const messages = require(`../intl/${locale}.json`)
 
   // Exit Zen Mode on 'esc' click
   useKeyPress(`Escape`, () => handleZenModeChange(false))
@@ -141,31 +138,35 @@ const Layout: React.FC<IProps> = ({
     !isTranslationBannerIgnored
 
   return (
-    <LocaleProvider pageContext={pageContext}>
-      {/* our current react-intl types does not support react 18 */}
-      {/* TODO: once we upgrade react-intl to v6, remove this ts-ignore */}
-      {/* @ts-ignore */}
-      <IntlProvider locale={locale!} key={locale} messages={messages}>
-        <ApolloProvider client={client}>
-          <ThemeProvider theme={theme}>
-            <SkipLink hrefId="#main-content" />
-            <TranslationBanner
-              shouldShow={shouldShowTranslationBanner}
-              isPageContentEnglish={isPageContentEnglish}
-              isPageRightToLeft={isPageRightToLeft}
-              originalPagePath={pageContext.originalPath!}
-            />
-            <TranslationBannerLegal
-              shouldShow={isLegal}
-              isPageRightToLeft={isPageRightToLeft}
-              originalPagePath={pageContext.originalPath!}
-            />
-            <ContentContainer>
+    <ApolloProvider client={client}>
+      <ThemeProvider theme={theme}>
+        <SkipLink hrefId="#main-content" />
+        <TranslationBanner
+          shouldShow={shouldShowTranslationBanner}
+          isPageContentEnglish={isPageContentEnglish}
+          isPageRightToLeft={isPageRightToLeft}
+          originalPagePath={pageContext.originalPath!}
+        />
+        <TranslationBannerLegal
+          shouldShow={isLegal}
+          isPageRightToLeft={isPageRightToLeft}
+          originalPagePath={pageContext.originalPath!}
+        />
+        <ContentContainer>
+          <VisuallyHidden isHidden={isZenMode}>
+            <Nav path={path} />
+            {shouldShowSideNav && <SideNavMobile path={path} />}
+          </VisuallyHidden>
+          <SkipLinkAnchor id="main-content" />
+          {isMergePage && <Centered id="confetti-easter-egg" />}
+          <MainContainer>
+            {shouldShowSideNav && (
               <VisuallyHidden isHidden={isZenMode}>
                 <Nav path={path} />
                 {shouldShowSideNav && <SideNavMobile path={path} />}
               </VisuallyHidden>
               <SkipLinkAnchor id="main-content" />
+              {isMergePage && <Centered id="confetti-easter-egg" />}
               <MainContainer>
                 {shouldShowSideNav && (
                   <VisuallyHidden isHidden={isZenMode}>
@@ -187,8 +188,6 @@ const Layout: React.FC<IProps> = ({
             </ContentContainer>
           </ThemeProvider>
         </ApolloProvider>
-      </IntlProvider>
-    </LocaleProvider>
   )
 }
 
diff --git a/src/components/Link.tsx b/src/components/Link.tsx
index 46c56eb9d13..a20c43efe9d 100644
--- a/src/components/Link.tsx
+++ b/src/components/Link.tsx
@@ -1,9 +1,8 @@
 import React from "react"
 import { Icon, Link as ChakraLink, LinkProps, useTheme } from "@chakra-ui/react"
 import { navigate as gatsbyNavigate } from "gatsby"
-import { LocalizedLink as IntlLink } from "gatsby-theme-i18n"
+import { Link as IntlLink } from "gatsby-plugin-react-i18next"
 import { NavigateOptions } from "@reach/router"
-import { IntlShape } from "react-intl"
 
 import { BsQuestionSquareFill } from "react-icons/bs"
 
@@ -145,14 +144,14 @@ const Link: React.FC<IProps> = ({
 
 export function navigate(
   to: string,
-  intl: IntlShape,
+  language: Lang,
   options?: NavigateOptions<{}>
 ) {
   if (typeof window === "undefined") {
     return
   }
 
-  const link = `/${intl.locale as Lang}${to}`
+  const link = `/${language}${to}`
   gatsbyNavigate(link, options)
 }
 
diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx
index 7f25bc8474c..6d69b468946 100644
--- a/src/components/Logo.tsx
+++ b/src/components/Logo.tsx
@@ -2,15 +2,14 @@ import React from "react"
 import { useStaticQuery, graphql } from "gatsby"
 import { useColorMode } from "@chakra-ui/react"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
-import { translateMessageId } from "../utils/translations"
 import { getImage } from "../utils/image"
 
 export interface IProps {}
 
 const Logo: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const { colorMode } = useColorMode()
   const isDarkTheme = colorMode === "dark"
   const data = useStaticQuery(graphql`
@@ -40,10 +39,7 @@ const Logo: React.FC<IProps> = () => {
 
   const image = isDarkTheme ? data.light : data.dark
   return (
-    <GatsbyImage
-      image={getImage(image)!}
-      alt={translateMessageId("ethereum-foundation-logo", intl)}
-    />
+    <GatsbyImage image={getImage(image)!} alt={t("ethereum-foundation-logo")} />
   )
 }
 
diff --git a/src/components/MergeArticleList.tsx b/src/components/MergeArticleList.tsx
index 520079ff75c..3ac0084ba4a 100644
--- a/src/components/MergeArticleList.tsx
+++ b/src/components/MergeArticleList.tsx
@@ -1,9 +1,7 @@
 import React from "react"
 import styled from "@emotion/styled"
 import CardList, { CardListItem } from "./CardList"
-import { useIntl } from "react-intl"
-
-import { translateMessageId } from "../utils/translations"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 const Container = styled.div`
   margin-bottom: 4rem;
@@ -12,91 +10,46 @@ const Container = styled.div`
 export interface IProps {}
 
 const MergeArticleList: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const reads: Array<CardListItem> = [
     {
-      title: translateMessageId("page-upgrade-article-title-ethmerge", intl),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethmerge",
-        intl
-      ),
+      title: t("page-upgrade-article-title-ethmerge"),
+      description: t("page-upgrade-article-author-ethmerge"),
       link: "https://ethmerge.com/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-merge-is-coming",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-alchemy",
-        intl
-      ),
+      title: t("page-upgrade-article-title-merge-is-coming"),
+      description: t("page-upgrade-article-author-alchemy"),
       link: "https://www.alchemy.com/the-merge",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-state-of-the-merge",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-consensys",
-        intl
-      ),
+      title: t("page-upgrade-article-title-state-of-the-merge"),
+      description: t("page-upgrade-article-author-consensys"),
       link: "https://consensys.net/blog/news/the-state-of-the-merge-an-update-on-ethereums-merge-to-proof-of-stake-in-2022/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-ropsten-merge-testnet",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethereum-foundation",
-        intl
-      ),
+      title: t("page-upgrade-article-title-ropsten-merge-testnet"),
+      description: t("page-upgrade-article-author-ethereum-foundation"),
       link: "https://blog.ethereum.org/2022/05/30/ropsten-merge-announcement/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-execution-layer-specs",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethereum-foundation",
-        intl
-      ),
+      title: t("page-upgrade-article-title-execution-layer-specs"),
+      description: t("page-upgrade-article-author-ethereum-foundation"),
       link: "https://github.com/ethereum/execution-specs/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-consensus-layer-specs",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethereum-foundation",
-        intl
-      ),
+      title: t("page-upgrade-article-title-consensus-layer-specs"),
+      description: t("page-upgrade-article-author-ethereum-foundation"),
       link: "https://github.com/ethereum/consensus-specs/tree/dev/specs/bellatrix",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-engine-api-specs",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethereum-foundation",
-        intl
-      ),
+      title: t("page-upgrade-article-title-engine-api-specs"),
+      description: t("page-upgrade-article-author-ethereum-foundation"),
       link: "https://github.com/ethereum/execution-apis/tree/main/src/engine",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-hitchhikers-guide-to-ethereum",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-delphi-digital",
-        intl
-      ),
+      title: t("page-upgrade-article-title-hitchhikers-guide-to-ethereum"),
+      description: t("page-upgrade-article-author-delphi-digital"),
       link: "https://members.delphidigital.io/reports/the-hitchhikers-guide-to-ethereum",
     },
   ]
diff --git a/src/components/MergeInfographic.tsx b/src/components/MergeInfographic.tsx
index f6deb1c1ae1..ee7ac57c73f 100644
--- a/src/components/MergeInfographic.tsx
+++ b/src/components/MergeInfographic.tsx
@@ -1,11 +1,11 @@
 // Library imports
 import React from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 // Component imports
 import Translation from "./Translation"
 // Utility imports
-import { translateMessageId, TranslationKey } from "../utils/translations"
+import { TranslationKey } from "../utils/translations"
 // SVG imports
 import InfographicBg from "../assets/upgrades/merge-infographic-bg.svg"
 
@@ -106,18 +106,14 @@ export interface IProps {
 }
 
 const MergeInfographic: React.FC<IProps> = ({ className }) => {
-  const intl = useIntl()
-  const getString: StringGetter = (id: TranslationKey) =>
-    translateMessageId(id, intl)
+  const { t } = useTranslation()
+  const getString: StringGetter = (id: TranslationKey) => t(id)
 
   return (
     <Container
       className={className}
       role="img"
-      aria-label={translateMessageId(
-        "page-upgrades-merge-infographic-alt-text",
-        intl
-      )}
+      aria-label={t("page-upgrades-merge-infographic-alt-text")}
     >
       <ExecutionLayer aria-hidden="true">
         <Translation id="page-upgrades-merge-infographic-el" />
diff --git a/src/components/Nav/Dropdown.tsx b/src/components/Nav/Dropdown.tsx
index 4339987487a..f15d49a0d38 100644
--- a/src/components/Nav/Dropdown.tsx
+++ b/src/components/Nav/Dropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState, createRef, useContext } from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 import { motion } from "framer-motion"
 
 import Translation from "../Translation"
@@ -8,7 +8,7 @@ import Icon from "../Icon"
 import Link from "../Link"
 
 import { useOnClickOutside } from "../../hooks/useOnClickOutside"
-import { getDirection, translateMessageId } from "../../utils/translations"
+import { getDirection } from "../../utils/translations"
 import { Lang } from "../../utils/languages"
 
 import { ISection } from "./types"
@@ -140,10 +140,11 @@ const NavDropdown: React.FC<IProps> & {
   Title: typeof Title
 } = ({ children, section, hasSubNav }) => {
   const [isOpen, setIsOpen] = useState(false)
-  const intl = useIntl()
+  const { t } = useTranslation()
+  const { language } = useI18next()
   const ref = createRef<HTMLLIElement>()
 
-  const direction = getDirection(intl.locale as Lang)
+  const direction = getDirection(language as Lang)
 
   const toggle = () => setIsOpen((isOpen) => !isOpen)
   const close = () => setIsOpen(false)
@@ -174,7 +175,7 @@ const NavDropdown: React.FC<IProps> & {
     <DropdownContext.Provider
       value={{ isOpen, toggle, close, tabInteractionHandler }}
     >
-      <NavListItem ref={ref} aria-label={translateMessageId(ariaLabel, intl)}>
+      <NavListItem ref={ref} aria-label={t(ariaLabel)}>
         <DropdownTitle
           dir={direction}
           onClick={() => toggle()}
diff --git a/src/components/Nav/Menu.tsx b/src/components/Nav/Menu.tsx
index 73b03b910f1..b47bb4f7e6c 100644
--- a/src/components/Nav/Menu.tsx
+++ b/src/components/Nav/Menu.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 
 import NavDropdown from "./Dropdown"
 import Translation from "../Translation"
@@ -21,8 +21,8 @@ export interface IProps {
 }
 
 const Menu: React.FC<IProps> = ({ path, sections }) => {
-  const intl = useIntl()
-  const direction = getDirection(intl.locale as Lang)
+  const { language } = useI18next()
+  const direction = getDirection(language as Lang)
   const shouldShowSubNav = path.includes("/developers/")
 
   const { useEthereum, learn, ...restSections } = sections
diff --git a/src/components/Nav/Mobile.tsx b/src/components/Nav/Mobile.tsx
index a8e1338b43f..ea9fd7c5e31 100644
--- a/src/components/Nav/Mobile.tsx
+++ b/src/components/Nav/Mobile.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { motion } from "framer-motion"
 
 import Emoji from "../OldEmoji"
@@ -10,7 +10,6 @@ import NakedButton from "../NakedButton"
 import Search from "../Search"
 import Translation from "../Translation"
 import { NavLink } from "../SharedStyledComponents"
-import { translateMessageId } from "../../utils/translations"
 
 import { ISections } from "./types"
 
@@ -279,7 +278,7 @@ const MobileNavMenu: React.FC<IProps> = ({
   toggleTheme,
   linkSections,
 }) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const isOpen = isMenuOpen || isSearchOpen
 
@@ -291,13 +290,13 @@ const MobileNavMenu: React.FC<IProps> = ({
     <Container>
       <MenuButton
         onClick={() => toggleMenu("search")}
-        aria-label={translateMessageId("aria-toggle-search-button", intl)}
+        aria-label={t("aria-toggle-search-button")}
       >
         <OtherIcon name="search" />
       </MenuButton>
       <MenuButton
         onClick={() => toggleMenu("menu")}
-        aria-label={translateMessageId("aria-toggle-menu-button", intl)}
+        aria-label={t("aria-toggle-menu-button")}
       >
         <GlyphButton viewBox="0 0 24 40">
           <motion.path
@@ -323,10 +322,7 @@ const MobileNavMenu: React.FC<IProps> = ({
           {Object.keys(linkSections).map((sectionKey, idx) => {
             const section = linkSections[sectionKey]
             return section.items ? (
-              <NavListItem
-                key={idx}
-                aria-label={`Select ${translateMessageId(section.text, intl)}`}
-              >
+              <NavListItem key={idx} aria-label={`Select ${t(section.text)}`}>
                 <SectionTitle>
                   <Translation id={section.text} />
                 </SectionTitle>
diff --git a/src/components/Nav/index.tsx b/src/components/Nav/index.tsx
index 380f1bd28f3..76ece62af75 100644
--- a/src/components/Nav/index.tsx
+++ b/src/components/Nav/index.tsx
@@ -2,7 +2,7 @@ import React, { useState } from "react"
 import { useColorMode } from "@chakra-ui/react"
 import styled from "@emotion/styled"
 import { cloneDeep } from "lodash"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import Menu from "./Menu"
 import MobileNavMenu from "./Mobile"
@@ -12,7 +12,6 @@ import Icon from "../Icon"
 import Search from "../Search"
 import Translation from "../Translation"
 import { NavLink } from "../SharedStyledComponents"
-import { translateMessageId } from "../../utils/translations"
 import HomeIcon from "../../assets/eth-home-icon.svg"
 
 import { IItem, ISections } from "./types"
@@ -143,7 +142,7 @@ const Nav: React.FC<IProps> = ({ path }) => {
   const { colorMode, toggleColorMode } = useColorMode()
   const [isMenuOpen, setIsMenuOpen] = useState(false)
   const [isSearchOpen, setIsSearchOpen] = useState(false)
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const isDarkTheme = colorMode === "dark"
 
@@ -421,7 +420,7 @@ const Nav: React.FC<IProps> = ({ path }) => {
 
   return (
     <NavContainer>
-      <StyledNav aria-label={translateMessageId("nav-primary", intl)}>
+      <StyledNav aria-label={t("nav-primary")}>
         <NavContent>
           <HomeLogoNavLink to="/" aria-label={translateMessageId("home", intl)}>
             <HomeLogo />
@@ -461,7 +460,7 @@ const Nav: React.FC<IProps> = ({ path }) => {
         </NavContent>
       </StyledNav>
       {shouldShowSubNav && (
-        <SubNav aria-label={translateMessageId("nav-developers", intl)}>
+        <SubNav aria-label={t("nav-developers")}>
           {ednLinks.map((link, idx) => (
             <NavLink
               key={idx}
diff --git a/src/components/PageMetadata.tsx b/src/components/PageMetadata.tsx
index 329f7f28682..cc4887c7901 100644
--- a/src/components/PageMetadata.tsx
+++ b/src/components/PageMetadata.tsx
@@ -2,12 +2,11 @@ import React from "react"
 import PropTypes from "prop-types"
 import { Helmet } from "react-helmet"
 import { useStaticQuery, graphql } from "gatsby"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 import { useLocation } from "@reach/router"
 import { getSrc } from "gatsby-plugin-image"
 
 import { isLang } from "../utils/languages"
-import { translateMessageId } from "../utils/translations"
 
 type NameMeta = {
   name: string
@@ -100,11 +99,12 @@ const PageMetadata: React.FC<IProps> = ({
 
   const location = useLocation()
 
-  const intl = useIntl()
+  const { t } = useTranslation()
+  const { language } = useI18next()
 
-  const desc = description || translateMessageId("site-description", intl)
+  const desc = description || t("site-description")
 
-  const siteTitle = translateMessageId("site-title", intl)
+  const siteTitle = t("site-title")
 
   /* Set canonical URL w/ language path to avoid duplicate content */
   /* e.g. set ethereum.org/about/ to ethereum.org/en/about/ */
@@ -135,7 +135,7 @@ const PageMetadata: React.FC<IProps> = ({
 
   return (
     <Helmet
-      htmlAttributes={{ lang: intl.locale }}
+      htmlAttributes={{ lang: language }}
       title={title}
       titleTemplate={`%s | ${siteTitle}`}
       link={[{ rel: "canonical", key: canonical, href: canonical }]}
diff --git a/src/components/Roadmap.tsx b/src/components/Roadmap.tsx
index 4a3f109b01a..384b75f347c 100644
--- a/src/components/Roadmap.tsx
+++ b/src/components/Roadmap.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 import axios from "axios"
 
@@ -7,8 +7,6 @@ import Translation from "./Translation"
 import Link from "./Link"
 import { FakeLinkExternal, CardItem as Item } from "./SharedStyledComponents"
 
-import { translateMessageId } from "../utils/translations"
-
 import { GATSBY_FUNCTIONS_PATH } from "../constants"
 
 const Section = styled.div`
@@ -68,9 +66,10 @@ const IssueSection: React.FC<IPropsIssueSection> = ({ issues }) => {
 export interface IProps {}
 
 const Roadmap: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
+  const { language } = useI18next()
   const issue: Issue = {
-    title: translateMessageId("loading", intl),
+    title: t("loading"),
     labels: [],
   }
   const blankIssues: Array<Issue> = Array(6).fill(issue)
@@ -144,8 +143,8 @@ const Roadmap: React.FC<IProps> = () => {
       .catch((error) => {
         console.error(error)
         const errorIssue: Issue = {
-          title: translateMessageId("loading-error", intl),
-          errorMsg: translateMessageId("refresh", intl),
+          title: t("loading-error"),
+          errorMsg: t("refresh"),
           labels: [],
         }
         const errorIssues: Array<Issue> = Array(3).fill(errorIssue)
@@ -155,7 +154,7 @@ const Roadmap: React.FC<IProps> = () => {
           implemented: errorIssues,
         })
       })
-  }, [intl])
+  }, [language])
 
   return (
     <div>
diff --git a/src/components/Search/Input.tsx b/src/components/Search/Input.tsx
index 9657e3e4f7d..47b9806a33e 100644
--- a/src/components/Search/Input.tsx
+++ b/src/components/Search/Input.tsx
@@ -1,10 +1,9 @@
 import React, { ChangeEvent, FormEvent } from "react"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 import { connectSearchBox } from "react-instantsearch-dom"
 
 import Icon from "../Icon"
-import { translateMessageId } from "../../utils/translations"
 
 const Form = styled.form`
   margin: 0;
@@ -72,8 +71,8 @@ const Input: React.FC<IInputProps> = ({
   inputRef,
   ...rest
 }) => {
-  const intl = useIntl()
-  const searchString = translateMessageId("search", intl)
+  const { t } = useTranslation()
+  const searchString = t("search")
 
   const handleInputChange = (event: ChangeEvent<HTMLInputElement>): void => {
     const value = event.target.value
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index a77b03ec74b..c0de8e920f3 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef, MouseEventHandler } from "react"
 import { Link as GatsbyLink } from "gatsby"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 import {
   Configure,
   InstantSearch,
@@ -217,7 +217,7 @@ const Search: React.FC<ISearchProps> = ({
   handleSearchSelect,
   useKeyboardShortcut = false,
 }) => {
-  const intl = useIntl()
+  const { language } = useI18next()
   const containerRef = useRef<HTMLDivElement>(null)
   const inputRef = useRef<HTMLInputElement>(null)
   const [query, setQuery] = useState(``)
@@ -275,7 +275,7 @@ const Search: React.FC<ISearchProps> = ({
         indexName={indices[0].name}
         onSearchStateChange={({ query }) => setQuery(query)}
       >
-        <Configure filters={`lang:${intl.locale}`} hitsPerPage={8} />
+        <Configure filters={`lang:${language}`} hitsPerPage={8} />
         <Input
           inputRef={inputRef}
           query={query}
diff --git a/src/components/ShardChainsList.tsx b/src/components/ShardChainsList.tsx
index 7949d737fa2..9fc51cdd63a 100644
--- a/src/components/ShardChainsList.tsx
+++ b/src/components/ShardChainsList.tsx
@@ -1,9 +1,7 @@
 import React from "react"
 import styled from "@emotion/styled"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import CardList, { CardListItem } from "./CardList"
-import { useIntl } from "react-intl"
-
-import { translateMessageId } from "../utils/translations"
 
 const Container = styled.div`
   margin-bottom: 4rem;
@@ -12,61 +10,31 @@ const Container = styled.div`
 export interface IProps {}
 
 const ShardChainsList: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const reads: Array<CardListItem> = [
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-sharding-is-great",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-vitalik-buterin",
-        intl
-      ),
+      title: t("page-upgrade-article-title-sharding-is-great"),
+      description: t("page-upgrade-article-author-vitalik-buterin"),
       link: "https://vitalik.ca/general/2021/04/07/sharding.html",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-rollup-roadmap",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-vitalik-buterin",
-        intl
-      ),
+      title: t("page-upgrade-article-title-rollup-roadmap"),
+      description: t("page-upgrade-article-author-vitalik-buterin"),
       link: "https://ethereum-magicians.org/t/a-rollup-centric-ethereum-roadmap/4698",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-two-point-oh",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethos-dev",
-        intl
-      ),
+      title: t("page-upgrade-article-title-two-point-oh"),
+      description: t("page-upgrade-article-author-ethos-dev"),
       link: "https://ethos.dev/beacon-chain/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-sharding-consensus",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethereum-foundation",
-        intl
-      ),
+      title: t("page-upgrade-article-title-sharding-consensus"),
+      description: t("page-upgrade-article-author-ethereum-foundation"),
       link: "https://blog.ethereum.org/2020/03/27/sharding-consensus/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-hitchhikers-guide-to-ethereum",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-delphi-digital",
-        intl
-      ),
+      title: t("page-upgrade-article-title-hitchhikers-guide-to-ethereum"),
+      description: t("page-upgrade-article-author-delphi-digital"),
       link: "https://members.delphidigital.io/reports/the-hitchhikers-guide-to-ethereum",
     },
   ]
diff --git a/src/components/SideNav.tsx b/src/components/SideNav.tsx
index 836c6664d11..e8394842e73 100644
--- a/src/components/SideNav.tsx
+++ b/src/components/SideNav.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react"
 import styled from "@emotion/styled"
 import { motion } from "framer-motion"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import Icon from "./Icon"
 import Link from "./Link"
@@ -9,7 +9,6 @@ import Translation from "./Translation"
 import { dropdownIconContainerVariant } from "./SharedStyledComponents"
 
 import docLinks from "../data/developer-docs-links.yaml"
-import { translateMessageId } from "../utils/translations"
 import { DeveloperDocsLink } from "../types"
 
 const IconContainer = styled(motion.div)`
@@ -154,10 +153,10 @@ export interface IProps {
 // 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: React.FC<IProps> = ({ path }) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   return (
-    <Nav aria-label={translateMessageId("nav-developers-docs", intl)}>
+    <Nav aria-label={t("nav-developers-docs")}>
       {docLinks.map((item, idx) => (
         <NavLink item={item} path={path} key={idx} />
       ))}
diff --git a/src/components/StablecoinAccordion.tsx b/src/components/StablecoinAccordion.tsx
index dd67c00df72..e52493c9b3f 100644
--- a/src/components/StablecoinAccordion.tsx
+++ b/src/components/StablecoinAccordion.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react"
 import { useStaticQuery, graphql } from "gatsby"
 import { getImage } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 // TODO add motion animation
 // import { motion } from "framer-motion"
@@ -20,8 +20,8 @@ import {
   RightColumn,
 } from "./SharedStyledComponents"
 
-import { translateMessageId } from "../utils/translations"
 import { isMobile } from "../utils/isMobile"
+import { Lang } from "../utils/languages"
 
 const Card = styled.div`
   border-radius: 2px;
@@ -219,7 +219,8 @@ export interface IProps {}
 
 const StablecoinAccordion: React.FC<IProps> = () => {
   const [openSection, setOpenSection] = useState<string>("") // default to all closed
-  const intl = useIntl()
+  const { language } = useI18next()
+  const { t } = useTranslation()
   const data = useStaticQuery(graphql`
     {
       uniswap: file(relativePath: { eq: "dapps/uni.png" }) {
@@ -390,25 +391,25 @@ const StablecoinAccordion: React.FC<IProps> = () => {
       title: "Uniswap",
       image: getImage(data.uniswap)!,
       link: "https://uniswap.org",
-      alt: translateMessageId("uniswap-logo", intl),
+      alt: t("uniswap-logo")!,
     },
     {
       title: "Loopring",
       image: getImage(data.loopring)!,
       link: "https://loopring.org",
-      alt: translateMessageId("loopring-logo", intl),
+      alt: t("loopring-logo")!,
     },
     {
       title: "1inch",
       image: getImage(data.oneinch)!,
       link: "https://app.1inch.io",
-      alt: translateMessageId("1inch-logo", intl),
+      alt: t("1inch-logo")!,
     },
     {
       title: "Matcha",
       image: getImage(data.matcha)!,
       link: "https://matcha.xyz",
-      alt: translateMessageId("matcha-logo", intl),
+      alt: t("matcha-logo")!,
     },
   ]
 
@@ -417,61 +418,43 @@ const StablecoinAccordion: React.FC<IProps> = () => {
       title: "Compound",
       image: getImage(data.compound)!,
       link: "https://compound.finance",
-      alt: translateMessageId("compound-logo", intl),
+      alt: t("compound-logo")!,
     },
     {
       title: "Aave",
       image: getImage(data.aave)!,
       link: "https://aave.com",
-      alt: translateMessageId("aave-logo", intl),
+      alt: t("aave-logo")!,
     },
     {
       title: "Oasis",
       image: getImage(data.oasis)!,
       link: "https://oasis.app",
-      alt: translateMessageId("oasis-logo", intl),
+      alt: t("oasis-logo")!,
     },
   ]
 
   const earn: Array<CardListItem> = [
     {
-      title: translateMessageId(
-        "page-stablecoins-accordion-earn-project-bounties",
-        intl
-      ),
+      title: t("page-stablecoins-accordion-earn-project-bounties")!,
       image: getImage(data.gitcoin)!,
       link: "https://gitcoin.co/explorer",
-      description: translateMessageId(
-        "page-stablecoins-accordion-earn-project-1-description",
-        intl
-      ),
-      alt: translateMessageId("gitcoin-logo", intl),
+      description: t("page-stablecoins-accordion-earn-project-1-description")!,
+      alt: t("gitcoin-logo")!,
     },
     {
-      title: translateMessageId(
-        "page-stablecoins-accordion-earn-project-community",
-        intl
-      ),
+      title: t("page-stablecoins-accordion-earn-project-community")!,
       image: getImage(data.maker)!,
       link: "https://makerdao.world/en/resources/",
-      description: translateMessageId(
-        "page-stablecoins-accordion-earn-project-2-description",
-        intl
-      ),
-      alt: translateMessageId("makerdao-logo", intl),
+      description: t("page-stablecoins-accordion-earn-project-2-description")!,
+      alt: t("makerdao-logo")!,
     },
     {
-      title: translateMessageId(
-        "page-stablecoins-accordion-earn-project-bug-bounties",
-        intl
-      ),
+      title: t("page-stablecoins-accordion-earn-project-bug-bounties")!,
       image: getImage(data.eth)!,
       link: "/bug-bounty/",
-      description: translateMessageId(
-        "page-stablecoins-accordion-earn-project-3-description",
-        intl
-      ),
-      alt: translateMessageId("ethereum-logo", intl),
+      description: t("page-stablecoins-accordion-earn-project-3-description")!,
+      alt: t("ethereum-logo")!,
     },
   ]
 
@@ -480,37 +463,37 @@ const StablecoinAccordion: React.FC<IProps> = () => {
       title: "Coinbase",
       image: getImage(data.coinbase)!,
       link: "https://coinbase.com",
-      alt: translateMessageId("coinbase-logo", intl),
+      alt: t("coinbase-logo")!,
     },
     {
       title: "Gemini",
       image: getImage(data.gemini)!,
       link: "https://gemini.com",
-      alt: translateMessageId("gemini-logo", intl),
+      alt: t("gemini-logo")!,
     },
     {
       title: "Kraken",
       image: getImage(data.kraken)!,
       link: "https://kraken.com",
-      alt: translateMessageId("kraken-logo", intl),
+      alt: t("kraken-logo")!,
     },
     {
       title: "Coinmama",
       image: getImage(data.coinmama)!,
       link: "https://coinmama.com",
-      alt: translateMessageId("coinmama-logo", intl),
+      alt: t("coinmama-logo")!,
     },
     {
       title: "Bittrex",
       image: getImage(data.bittrex)!,
       link: "https://global.bittrex.com",
-      alt: translateMessageId("bittrex-logo", intl),
+      alt: t("bittrex-logo")!,
     },
     {
       title: "Binance",
       image: getImage(data.binance)!,
       link: "https://binance.com",
-      alt: translateMessageId("binance-logo", intl),
+      alt: t("binance-logo")!,
     },
   ]
 
@@ -523,7 +506,7 @@ const StablecoinAccordion: React.FC<IProps> = () => {
       setOpenSection(selectedSection)
     }
     if (isMobile()) {
-      navigate(`/stablecoins/#${selectedSection}`, intl)
+      navigate(`/stablecoins/#${selectedSection}`, language as Lang)
     }
   }
 
diff --git a/src/components/StablecoinBoxGrid.tsx b/src/components/StablecoinBoxGrid.tsx
index c20956c89d3..caff73d8df9 100644
--- a/src/components/StablecoinBoxGrid.tsx
+++ b/src/components/StablecoinBoxGrid.tsx
@@ -1,10 +1,11 @@
 import React, { useState } from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 import Link, { navigate } from "./Link"
 import Emoji from "./OldEmoji"
 import Translation from "./Translation"
 import { isMobile } from "../utils/isMobile"
+import { Lang } from "../utils/languages"
 
 const OpenTitle = styled.h3`
   font-size: 2.5rem;
@@ -273,14 +274,14 @@ export interface IProps {
 }
 
 const StablecoinBoxGrid: React.FC<IProps> = ({ items }) => {
-  const intl = useIntl()
+  const { language } = useI18next()
   const [indexOpen, setOpenIndex] = useState<number>(0)
 
   // TODO generalize
   const handleSelect = (idx: number): void => {
     setOpenIndex(idx)
     if (isMobile()) {
-      navigate(`/stablecoins/#type-${idx}`, intl)
+      navigate(`/stablecoins/#type-${idx}`, language as Lang)
     }
   }
 
diff --git a/src/components/Staking/StakingCommunityCallout.tsx b/src/components/Staking/StakingCommunityCallout.tsx
index 9febc132b9b..675f20c5f2c 100644
--- a/src/components/Staking/StakingCommunityCallout.tsx
+++ b/src/components/Staking/StakingCommunityCallout.tsx
@@ -1,5 +1,5 @@
 import React from "react"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 import { graphql, useStaticQuery } from "gatsby"
 
@@ -7,7 +7,6 @@ import ButtonLink from "../ButtonLink"
 import CalloutBanner from "../CalloutBanner"
 import Translation from "../Translation"
 
-import { translateMessageId } from "../../utils/translations"
 import { trackCustomEvent } from "../../utils/matomo"
 import { getImage } from "../../utils/image"
 
@@ -34,7 +33,7 @@ export interface IProps {
 }
 
 const StakingCommunityCallout: React.FC<IProps> = (props) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const { image } = useStaticQuery(graphql`
     {
       image: file(relativePath: { eq: "enterprise-eth.png" }) {
@@ -54,7 +53,7 @@ const StakingCommunityCallout: React.FC<IProps> = (props) => {
     <StyledCallout
       {...props}
       image={getImage(image)!}
-      alt={translateMessageId("page-staking-image-alt", intl)}
+      alt={t("page-staking-image-alt")}
       titleKey={"page-staking-join-community"}
       descriptionKey={"page-staking-join-community-desc"}
     >
diff --git a/src/components/Staking/StakingLaunchpadWidget.tsx b/src/components/Staking/StakingLaunchpadWidget.tsx
index 1857e030fa9..947f42cfa92 100644
--- a/src/components/Staking/StakingLaunchpadWidget.tsx
+++ b/src/components/Staking/StakingLaunchpadWidget.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import { StyledSelect as Select } from "../SharedStyledComponents"
 import ButtonLink from "../ButtonLink"
@@ -8,7 +8,6 @@ import Emoji from "../OldEmoji"
 import Translation from "../Translation"
 
 import { trackCustomEvent } from "../../utils/matomo"
-import { translateMessageId } from "../../utils/translations"
 
 const Container = styled.div`
   display: flex;
@@ -48,7 +47,7 @@ const ButtonContainer = styled.div`
 export interface IProps {}
 
 const StakingLaunchpadWidget: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const [selection, setSelection] = useState("testnet")
 
   const handleChange = (e) => {
@@ -101,14 +100,8 @@ const StakingLaunchpadWidget: React.FC<IProps> = () => {
         <ButtonContainer style={{ marginBottom: "1rem" }}>
           <ButtonLink to={data[selection].url}>
             {selection === "mainnet"
-              ? translateMessageId(
-                  "page-staking-launchpad-widget-mainnet-start",
-                  intl
-                )
-              : translateMessageId(
-                  "page-staking-launchpad-widget-testnet-start",
-                  intl
-                )}
+              ? t("page-staking-launchpad-widget-mainnet-start")
+              : t("page-staking-launchpad-widget-testnet-start")}
           </ButtonLink>
         </ButtonContainer>
         <p>
diff --git a/src/components/Staking/StakingStatsBox.tsx b/src/components/Staking/StakingStatsBox.tsx
index 0bedf87eee3..36768fd43bd 100644
--- a/src/components/Staking/StakingStatsBox.tsx
+++ b/src/components/Staking/StakingStatsBox.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 
 import Translation from "../Translation"
 import StatErrorMessage from "../StatErrorMessage"
@@ -52,16 +52,14 @@ const Label = styled.p`
 export interface IProps {}
 
 const StatsBoxGrid: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { language } = useI18next()
   const [totalEth, setTotalEth] = useState<string>("0")
   const [totalValidators, setTotalValidators] = useState<string>("0")
   const [currentApr, setCurrentApr] = useState<string>("0")
   const [error, setError] = useState(false)
 
   useEffect(() => {
-    const localeForStatsBoxNumbers = getLocaleForNumberFormat(
-      intl.locale as Lang
-    )
+    const localeForStatsBoxNumbers = getLocaleForNumberFormat(language as Lang)
 
     const formatInteger = (amount: number): string =>
       new Intl.NumberFormat(localeForStatsBoxNumbers).format(amount)
@@ -100,7 +98,7 @@ const StatsBoxGrid: React.FC<IProps> = () => {
         setError(true)
       }
     })()
-  }, [intl.locale])
+  }, [language])
 
   // TODO: Improve error handling
   if (error) return <StatErrorMessage />
diff --git a/src/components/StatsBoxGrid.tsx b/src/components/StatsBoxGrid.tsx
index 254522ace9a..92f981d346f 100644
--- a/src/components/StatsBoxGrid.tsx
+++ b/src/components/StatsBoxGrid.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 import axios from "axios"
 import { kebabCase } from "lodash"
 import { AreaChart, ResponsiveContainer, Area, XAxis } from "recharts"
@@ -14,7 +14,6 @@ import StatLoadingMessage from "./StatLoadingMessage"
 
 import {
   isLangRightToLeft,
-  translateMessageId,
   getLocaleForNumberFormat,
 } from "../utils/translations"
 import { getData } from "../utils/cache"
@@ -305,7 +304,8 @@ interface IFetchTxResponse {
 export interface IProps {}
 
 const StatsBoxGrid: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
+  const { language } = useI18next()
 
   const [ethPrices, setEthPrices] = useState<State>({
     data: [],
@@ -337,9 +337,7 @@ const StatsBoxGrid: React.FC<IProps> = () => {
   const [selectedRangeTxs, setSelectedRangeTxs] = useState<string>(ranges[0])
 
   useEffect(() => {
-    const localeForStatsBoxNumbers = getLocaleForNumberFormat(
-      intl.locale as Lang
-    )
+    const localeForStatsBoxNumbers = getLocaleForNumberFormat(language as Lang)
 
     const formatPrice = (price: number): string => {
       return new Intl.NumberFormat(localeForStatsBoxNumbers, {
@@ -483,20 +481,14 @@ const StatsBoxGrid: React.FC<IProps> = () => {
       }
     }
     fetchTxCount()
-  }, [intl.locale])
+  }, [language])
 
   const metrics: Array<Metric> = [
     {
       apiProvider: "CoinGecko",
       apiUrl: "https://www.coingecko.com/en/coins/ethereum",
-      title: translateMessageId(
-        "page-index-network-stats-eth-price-description",
-        intl
-      ),
-      description: translateMessageId(
-        "page-index-network-stats-eth-price-explainer",
-        intl
-      ),
+      title: t("page-index-network-stats-eth-price-description"),
+      description: t("page-index-network-stats-eth-price-explainer"),
       buttonContainer: (
         <RangeSelector
           state={selectedRangePrice}
@@ -509,14 +501,8 @@ const StatsBoxGrid: React.FC<IProps> = () => {
     {
       apiProvider: "Etherscan",
       apiUrl: "https://etherscan.io/",
-      title: translateMessageId(
-        "page-index-network-stats-tx-day-description",
-        intl
-      ),
-      description: translateMessageId(
-        "page-index-network-stats-tx-day-explainer",
-        intl
-      ),
+      title: t("page-index-network-stats-tx-day-description"),
+      description: t("page-index-network-stats-tx-day-explainer"),
       buttonContainer: (
         <RangeSelector
           state={selectedRangeTxs}
@@ -529,14 +515,8 @@ const StatsBoxGrid: React.FC<IProps> = () => {
     {
       apiProvider: "DeFi Llama",
       apiUrl: "https://defillama.com/",
-      title: translateMessageId(
-        "page-index-network-stats-value-defi-description",
-        intl
-      ),
-      description: translateMessageId(
-        "page-index-network-stats-value-defi-explainer",
-        intl
-      ),
+      title: t("page-index-network-stats-value-defi-description"),
+      description: t("page-index-network-stats-value-defi-explainer"),
       buttonContainer: (
         <RangeSelector
           state={selectedRangeTvl}
@@ -549,14 +529,8 @@ const StatsBoxGrid: React.FC<IProps> = () => {
     {
       apiProvider: "Etherscan",
       apiUrl: "https://etherscan.io/nodetracker",
-      title: translateMessageId(
-        "page-index-network-stats-nodes-description",
-        intl
-      ),
-      description: translateMessageId(
-        "page-index-network-stats-nodes-explainer",
-        intl
-      ),
+      title: t("page-index-network-stats-nodes-description"),
+      description: t("page-index-network-stats-nodes-explainer"),
       buttonContainer: (
         <RangeSelector
           state={selectedRangeNodes}
@@ -567,7 +541,7 @@ const StatsBoxGrid: React.FC<IProps> = () => {
       range: selectedRangeNodes,
     },
   ]
-  const dir = isLangRightToLeft(intl.locale as Lang) ? "rtl" : "ltr"
+  const dir = isLangRightToLeft(language as Lang) ? "rtl" : "ltr"
   return (
     <Grid>
       {metrics.map((metric, idx) => (
diff --git a/src/components/Translation.tsx b/src/components/Translation.tsx
index 16f4cba390f..ff0fae7e74e 100644
--- a/src/components/Translation.tsx
+++ b/src/components/Translation.tsx
@@ -1,11 +1,9 @@
 import React from "react"
-import { FormattedHTMLMessage } from "react-intl"
-import { getDefaultMessage, TranslationKey } from "../utils/translations"
+import { Trans } from "gatsby-plugin-react-i18next"
+import { TranslationKey } from "../utils/translations"
 
 // Wrapper on <FormattedHTMLMessage /> to always fallback to English
 // Use this component for any user-facing string
-const Translation = ({ id }: { id: TranslationKey }) => (
-  <FormattedHTMLMessage id={id} defaultMessage={getDefaultMessage(id)} />
-)
+const Translation = ({ id }: { id: TranslationKey }) => <Trans>{id}</Trans>
 
 export default Translation
diff --git a/src/components/Trilemma.tsx b/src/components/Trilemma.tsx
index 8efe64fae2a..3e1dfde358f 100644
--- a/src/components/Trilemma.tsx
+++ b/src/components/Trilemma.tsx
@@ -1,9 +1,8 @@
 import React, { useState } from "react"
 import styled from "@emotion/styled"
 import { motion } from "framer-motion"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
-import { translateMessageId } from "../utils/translations"
 import Translation from "./Translation"
 import Icon from "./Icon"
 import Card from "./Card"
@@ -182,7 +181,7 @@ const CloseIconContainer = styled.span`
 export interface IProps {}
 
 const Trilemma: React.FC<IProps> = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const [state, setState] = useState({
     isDecentralizedAndSecure: false,
@@ -385,16 +384,16 @@ const Trilemma: React.FC<IProps> = () => {
           />
         </CircleSelect>
         <Text x="400" y="540" isActive={isEthereum}>
-          {translateMessageId("ethereum", intl)}
+          {t("ethereum")}
         </Text>
         <Text x="460" y="150" isActive={isDecentralized}>
-          {translateMessageId("page-upgrades-vision-trilemma-text-1", intl)}
+          {t("page-upgrades-vision-trilemma-text-1")}
         </Text>
         <Text x="-24" y="486" isActive={isSecure}>
-          {translateMessageId("page-upgrades-vision-trilemma-text-2", intl)}
+          {t("page-upgrades-vision-trilemma-text-2")}
         </Text>
         <Text x="540" y="835" isActive={isScalable}>
-          {translateMessageId("page-upgrades-vision-trilemma-text-3", intl)}
+          {t("page-upgrades-vision-trilemma-text-3")}
         </Text>
       </Triangle>
     </Container>
diff --git a/src/components/TutorialMetadata.tsx b/src/components/TutorialMetadata.tsx
index f84e27c2842..1ae93fd2666 100644
--- a/src/components/TutorialMetadata.tsx
+++ b/src/components/TutorialMetadata.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 import CopyToClipboard from "./CopyToClipboard"
 import Pill from "./Pill"
 import Link from "./Link"
@@ -95,7 +95,7 @@ export const getSkillTranslationId = (skill: Skill): TranslationKey =>
   `page-tutorial-${Skill[skill.toUpperCase() as keyof typeof Skill]}`
 
 const TutorialMetadata: React.FC<IProps> = ({ tutorial }) => {
-  const intl = useIntl()
+  const { language } = useI18next()
 
   const frontmatter = tutorial.frontmatter
   const hasSource = frontmatter.source && frontmatter.sourceUrl
@@ -129,7 +129,7 @@ const TutorialMetadata: React.FC<IProps> = ({ tutorial }) => {
         {published && (
           <DataContainer>
             <Emoji size={1} mr={`0.5em`} text=":calendar:" />
-            {getLocaleTimestamp(intl.locale as Lang, published)}
+            {getLocaleTimestamp(language as Lang, published)}
           </DataContainer>
         )}
         <DataContainer>
diff --git a/src/pages-conditional/dapps.tsx b/src/pages-conditional/dapps.tsx
index 8a046e9f971..a6c525473f7 100644
--- a/src/pages-conditional/dapps.tsx
+++ b/src/pages-conditional/dapps.tsx
@@ -2,7 +2,7 @@ import React, { useRef, useState, useEffect } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 
 import Translation from "../components/Translation"
 import Pill from "../components/Pill"
@@ -34,7 +34,6 @@ import {
 } from "../components/SharedStyledComponents"
 import FeedbackCard from "../components/FeedbackCard"
 
-import { translateMessageId } from "../utils/translations"
 import { getImage, getSrc } from "../utils/image"
 import { Context } from "../types"
 
@@ -347,7 +346,8 @@ const DappsPage = ({
   data,
   location,
 }: PageProps<Queries.DappsPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
+  const { language } = useI18next()
   const [selectedCategory, setCategory] = useState<CategoryType>(
     CategoryType.FINANCE
   )
@@ -392,7 +392,7 @@ const DappsPage = ({
     } else {
       // If within `window` and not in the bottom mobile selection...
       if (window) {
-        newPath = `/${intl.locale}${newPath}`
+        newPath = `/${language}${newPath}`
         // Apply new path without page refresh
         window.history.pushState(null, "", newPath)
       }
@@ -409,220 +409,124 @@ const DappsPage = ({
 
   const features = [
     {
-      title: translateMessageId("page-dapps-features-1-title", intl),
-      description: translateMessageId(
-        "page-dapps-features-1-description",
-        intl
-      ),
+      title: t("page-dapps-features-1-title"),
+      description: t("page-dapps-features-1-description"),
       emoji: ":bust_in_silhouette:",
     },
     {
-      title: translateMessageId("page-dapps-features-2-title", intl),
-      description: translateMessageId(
-        "page-dapps-features-2-description",
-        intl
-      ),
+      title: t("page-dapps-features-2-title"),
+      description: t("page-dapps-features-2-description"),
       emoji: ":megaphone:",
     },
     {
-      title: translateMessageId("page-dapps-features-3-title", intl),
-      description: translateMessageId(
-        "page-dapps-features-3-description",
-        intl
-      ),
+      title: t("page-dapps-features-3-title"),
+      description: t("page-dapps-features-3-description"),
       emoji: ":money-mouth_face:",
     },
     {
-      title: translateMessageId("page-dapps-features-4-title", intl),
-      description: translateMessageId(
-        "page-dapps-features-4-description",
-        intl
-      ),
+      title: t("page-dapps-features-4-title"),
+      description: t("page-dapps-features-4-description"),
       emoji: ":electric_plug:",
     },
     {
-      title: translateMessageId("page-dapps-features-5-title", intl),
-      description: translateMessageId(
-        "page-dapps-features-5-description",
-        intl
-      ),
+      title: t("page-dapps-features-5-title"),
+      description: t("page-dapps-features-5-description"),
       emoji: ":detective:",
     },
     {
-      title: translateMessageId("page-dapps-features-6-title", intl),
-      description: translateMessageId(
-        "page-dapps-features-6-description",
-        intl
-      ),
+      title: t("page-dapps-features-6-title"),
+      description: t("page-dapps-features-6-description"),
       emoji: ":key:",
     },
     {
-      title: translateMessageId("page-dapps-features-7-title", intl),
-      description: translateMessageId(
-        "page-dapps-features-7-description",
-        intl
-      ),
+      title: t("page-dapps-features-7-title"),
+      description: t("page-dapps-features-7-description"),
       emoji: ":antenna_with_bars:",
     },
   ]
 
   const categories: Categories = {
     [CategoryType.FINANCE]: {
-      title: translateMessageId("page-dapps-finance-button", intl),
+      title: t("page-dapps-finance-button"),
       emoji: ":money_with_wings:",
-      benefitsTitle: translateMessageId(
-        "page-dapps-finance-benefits-title",
-        intl
-      ),
-      benefitsDescription: translateMessageId(
-        "page-dapps-finance-benefits-description",
-        intl
-      ),
+      benefitsTitle: t("page-dapps-finance-benefits-title"),
+      benefitsDescription: t("page-dapps-finance-benefits-description"),
       benefits: [
         {
           emoji: ":open_lock:",
-          title: translateMessageId(
-            "page-dapps-finance-benefits-1-title",
-            intl
-          ),
-          description: translateMessageId(
-            "page-dapps-finance-benefits-1-description",
-            intl
-          ),
+          title: t("page-dapps-finance-benefits-1-title"),
+          description: t("page-dapps-finance-benefits-1-description"),
         },
         {
           emoji: ":bank:",
-          title: translateMessageId(
-            "page-dapps-finance-benefits-2-title",
-            intl
-          ),
-          description: translateMessageId(
-            "page-dapps-finance-benefits-2-description",
-            intl
-          ),
+          title: t("page-dapps-finance-benefits-2-title"),
+          description: t("page-dapps-finance-benefits-2-description"),
         },
         {
           emoji: ":scales:",
-          title: translateMessageId(
-            "page-dapps-finance-benefits-3-title",
-            intl
-          ),
-          description: translateMessageId(
-            "page-dapps-finance-benefits-3-description",
-            intl
-          ),
+          title: t("page-dapps-finance-benefits-3-title"),
+          description: t("page-dapps-finance-benefits-3-description"),
         },
         {
           emoji: ":chains:",
-          title: translateMessageId(
-            "page-dapps-finance-benefits-4-title",
-            intl
-          ),
-          description: translateMessageId(
-            "page-dapps-finance-benefits-4-description",
-            intl
-          ),
+          title: t("page-dapps-finance-benefits-4-title"),
+          description: t("page-dapps-finance-benefits-4-description"),
         },
       ],
     },
     [CategoryType.COLLECTIBLES]: {
-      title: translateMessageId("page-dapps-collectibles-button", intl),
+      title: t("page-dapps-collectibles-button"),
       emoji: ":frame_with_picture:",
-      benefitsTitle: translateMessageId(
-        "page-dapps-collectibles-benefits-title",
-        intl
-      ),
-      benefitsDescription: translateMessageId(
-        "page-dapps-collectibles-benefits-description",
-        intl
-      ),
+      benefitsTitle: t("page-dapps-collectibles-benefits-title"),
+      benefitsDescription: t("page-dapps-collectibles-benefits-description"),
       benefits: [
         {
           emoji: ":white_check_mark:",
-          title: translateMessageId(
-            "page-dapps-collectibles-benefits-1-title",
-            intl
-          ),
-          description: translateMessageId(
-            "page-dapps-collectibles-benefits-1-description",
-            intl
-          ),
+          title: t("page-dapps-collectibles-benefits-1-title"),
+          description: t("page-dapps-collectibles-benefits-1-description"),
         },
         {
           emoji: ":man_singer:",
-          title: translateMessageId(
-            "page-dapps-collectibles-benefits-2-title",
-            intl
-          ),
-          description: translateMessageId(
-            "page-dapps-collectibles-benefits-2-description",
-            intl
-          ),
+          title: t("page-dapps-collectibles-benefits-2-title"),
+          description: t("page-dapps-collectibles-benefits-2-description"),
         },
         {
           emoji: ":shopping_bags:",
-          title: translateMessageId(
-            "page-dapps-collectibles-benefits-3-title",
-            intl
-          ),
-          description: translateMessageId(
-            "page-dapps-collectibles-benefits-3-description",
-            intl
-          ),
+          title: t("page-dapps-collectibles-benefits-3-title"),
+          description: t("page-dapps-collectibles-benefits-3-description"),
         },
         {
           emoji: ":department_store:",
-          title: translateMessageId(
-            "page-dapps-collectibles-benefits-4-title",
-            intl
-          ),
-          description: translateMessageId(
-            "page-dapps-collectibles-benefits-4-description",
-            intl
-          ),
+          title: t("page-dapps-collectibles-benefits-4-title"),
+          description: t("page-dapps-collectibles-benefits-4-description"),
         },
       ],
     },
     [CategoryType.GAMING]: {
-      title: translateMessageId("page-dapps-gaming-button", intl),
+      title: t("page-dapps-gaming-button"),
       emoji: ":video_game:",
-      benefitsTitle: translateMessageId(
-        "page-dapps-gaming-benefits-title",
-        intl
-      ),
-      benefitsDescription: translateMessageId(
-        "page-dapps-gaming-benefits-description",
-        intl
-      ),
+      benefitsTitle: t("page-dapps-gaming-benefits-title"),
+      benefitsDescription: t("page-dapps-gaming-benefits-description"),
       benefits: [
         {
           emoji: ":crossed_swords:",
-          title: translateMessageId("page-dapps-gaming-benefits-1-title", intl),
-          description: translateMessageId(
-            "page-dapps-gaming-benefits-1-description",
-            intl
-          ),
+          title: t("page-dapps-gaming-benefits-1-title"),
+          description: t("page-dapps-gaming-benefits-1-description"),
         },
         {
           emoji: ":european_castle:",
-          title: translateMessageId("page-dapps-gaming-benefits-2-title", intl),
-          description: translateMessageId(
-            "page-dapps-gaming-benefits-2-description",
-            intl
-          ),
+          title: t("page-dapps-gaming-benefits-2-title"),
+          description: t("page-dapps-gaming-benefits-2-description"),
         },
         {
           emoji: ":handshake:",
-          title: translateMessageId("page-dapps-gaming-benefits-3-title", intl),
-          description: translateMessageId(
-            "page-dapps-gaming-benefits-3-description",
-            intl
-          ),
+          title: t("page-dapps-gaming-benefits-3-title"),
+          description: t("page-dapps-gaming-benefits-3-description"),
         },
       ],
     },
     [CategoryType.TECHNOLOGY]: {
-      title: translateMessageId("page-dapps-technology-button", intl),
+      title: t("page-dapps-technology-button"),
       emoji: ":keyboard:",
     },
   }
@@ -632,514 +536,385 @@ const DappsPage = ({
   const lending = [
     {
       title: "Aave",
-      description: translateMessageId("page-dapps-dapp-description-aave", intl),
+      description: t("page-dapps-dapp-description-aave"),
       link: "https://aave.com/",
       image: getImage(data.aave),
-      alt: translateMessageId("page-dapps-aave-logo-alt", intl),
+      alt: t("page-dapps-aave-logo-alt"),
     },
     {
       title: "Compound",
-      description: translateMessageId(
-        "page-dapps-dapp-description-compound",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-compound"),
       link: "https://compound.finance/",
       image: getImage(data.compound),
-      alt: translateMessageId("page-dapps-compound-logo-alt", intl),
+      alt: t("page-dapps-compound-logo-alt"),
     },
     {
       title: "Oasis",
-      description: translateMessageId(
-        "page-dapps-dapp-description-oasis",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-oasis"),
       link: "https://oasis.app/",
       image: getImage(data.dai),
-      alt: translateMessageId("page-dapps-oasis-logo-alt", intl),
+      alt: t("page-dapps-oasis-logo-alt"),
     },
   ]
 
   const dex = [
     {
       title: "Uniswap",
-      description: translateMessageId(
-        "page-dapps-dapp-description-uniswap",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-uniswap"),
       link: "https://uniswap.org/",
       image: getImage(data.uniswap),
-      alt: translateMessageId("page-dapps-uniswap-logo-alt", intl),
+      alt: t("page-dapps-uniswap-logo-alt"),
     },
     {
       title: "Matcha",
-      description: translateMessageId(
-        "page-dapps-dapp-description-matcha",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-matcha"),
       link: "https://matcha.xyz",
       image: getImage(data.matcha),
-      alt: translateMessageId("page-dapps-matcha-logo-alt", intl),
+      alt: t("page-dapps-matcha-logo-alt"),
     },
     {
       title: "1inch",
-      description: translateMessageId(
-        "page-dapps-dapp-description-1inch",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-1inch"),
       link: "https://1inch.exchange/",
       image: getImage(data.oneinch),
-      alt: translateMessageId("page-dapps-1inch-logo-alt", intl),
+      alt: t("page-dapps-1inch-logo-alt"),
     },
   ]
 
   const trading = [
     {
       title: "Polymarket",
-      description: translateMessageId(
-        "page-dapps-dapp-description-polymarket",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-polymarket"),
       link: "https://polymarket.com",
       image: getImage(data.polymarket),
-      alt: translateMessageId("page-dapps-polymarket-logo-alt", intl),
+      alt: t("page-dapps-polymarket-logo-alt"),
     },
     {
       title: "Augur",
-      description: translateMessageId(
-        "page-dapps-dapp-description-augur",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-augur"),
       link: "https://augur.net",
       image: getImage(data.augur),
-      alt: translateMessageId("page-dapps-augur-logo-alt", intl),
+      alt: t("page-dapps-augur-logo-alt"),
     },
     {
       title: "Loopring",
-      description: translateMessageId(
-        "page-dapps-dapp-description-loopring",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-loopring"),
       link: "https://loopring.org/#/",
       image: getImage(data.loopring),
-      alt: translateMessageId("page-dapps-loopring-logo-alt", intl),
+      alt: t("page-dapps-loopring-logo-alt"),
     },
   ]
 
   const lottery = [
     {
       title: "Gitcoin Grants",
-      description: translateMessageId(
-        "page-dapps-dapp-description-gitcoin-grants",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-gitcoin-grants"),
       link: "https://gitcoin.co/grants/?",
       image: getImage(data.gitcoin),
-      alt: translateMessageId("page-dapps-gitcoin-grants-logo-alt", intl),
+      alt: t("page-dapps-gitcoin-grants-logo-alt"),
     },
   ]
 
   const payments = [
     {
       title: "Tornado cash",
-      description: translateMessageId(
-        "page-dapps-dapp-description-tornado-cash",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-tornado-cash"),
       link: "https://tornado.cash/",
       image: getImage(data.tornado),
-      alt: translateMessageId("page-dapps-tornado-cash-logo-alt", intl),
+      alt: t("page-dapps-tornado-cash-logo-alt"),
     },
     {
       title: "Sablier",
-      description: translateMessageId(
-        "page-dapps-dapp-description-sablier",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-sablier"),
       link: "https://pay.sablier.finance/",
       image: getImage(data.sablier),
-      alt: translateMessageId("page-dapps-sablier-logo-alt", intl),
+      alt: t("page-dapps-sablier-logo-alt"),
     },
   ]
 
   const investments = [
     {
       title: "Token Sets",
-      description: translateMessageId(
-        "page-dapps-dapp-description-token-sets",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-token-sets"),
       link: "https://www.tokensets.com/",
       image: getImage(data.set),
-      alt: translateMessageId("page-dapps-token-sets-logo-alt", intl),
+      alt: t("page-dapps-token-sets-logo-alt"),
     },
     {
       title: "PoolTogether",
-      description: translateMessageId(
-        "page-dapps-dapp-description-pooltogether",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-pooltogether"),
       link: "https://pooltogether.com/",
       image: getImage(data.pooltogether),
-      alt: translateMessageId("page-dapps-pooltogether-logo-alt", intl),
+      alt: t("page-dapps-pooltogether-logo-alt"),
     },
     {
       title: "Index Coop",
-      description: translateMessageId(
-        "page-dapps-dapp-description-index-coop",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-index-coop"),
       link: "https://www.indexcoop.com/",
       image: getImage(data.index),
-      alt: translateMessageId("page-dapps-index-coop-logo-alt", intl),
+      alt: t("page-dapps-index-coop-logo-alt"),
     },
   ]
 
   const insurance = [
     {
       title: "Nexus Mutual",
-      description: translateMessageId(
-        "page-dapps-dapp-description-nexus-mutual",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-nexus-mutual"),
       link: "https://nexusmutual.io/",
       image: getImage(data.nexus),
-      alt: translateMessageId("page-dapps-nexus-mutual-logo-alt", intl),
+      alt: t("page-dapps-nexus-mutual-logo-alt"),
     },
     {
       title: "Etherisc",
-      description: translateMessageId(
-        "page-dapps-dapp-description-etherisc",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-etherisc"),
       link: "https://etherisc.com/",
       image: getImage(data.etherisc),
-      alt: translateMessageId("page-dapps-etherisc-logo-alt", intl),
+      alt: t("page-dapps-etherisc-logo-alt"),
     },
   ]
 
   const portfolios = [
     {
       title: "Zapper",
-      description: translateMessageId(
-        "page-dapps-dapp-description-zapper",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-zapper"),
       link: "https://zapper.fi/",
       image: getImage(data.zapper),
-      alt: translateMessageId("page-dapps-zapper-logo-alt", intl),
+      alt: t("page-dapps-zapper-logo-alt"),
     },
     {
       title: "Zerion",
-      description: translateMessageId(
-        "page-dapps-dapp-description-zerion",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-zerion"),
       link: "https://app.zerion.io/",
       image: getImage(data.zerion),
-      alt: translateMessageId("page-dapps-zerion-logo-alt", intl),
+      alt: t("page-dapps-zerion-logo-alt"),
     },
     {
       title: "Rotki",
-      description: translateMessageId(
-        "page-dapps-dapp-description-rotki",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-rotki"),
       link: "https://rotki.com/",
       image: getImage(data.rotki),
-      alt: translateMessageId("page-dapps-rotki-logo-alt", intl),
+      alt: t("page-dapps-rotki-logo-alt"),
     },
     {
       title: "Krystal",
-      description: translateMessageId(
-        "page-dapps-dapp-description-krystal",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-krystal"),
       link: "https://defi.krystal.app/",
       image: getImage(data.krystal),
-      alt: translateMessageId("page-dapps-krystal-logo-alt", intl),
+      alt: t("page-dapps-krystal-logo-alt"),
     },
   ]
 
   const computing = [
     {
       title: "Golem",
-      description: translateMessageId(
-        "page-dapps-dapp-description-golem",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-golem"),
       link: "https://golem.network/",
       image: getImage(data.golem),
-      alt: translateMessageId("page-dapps-golem-logo-alt", intl),
+      alt: t("page-dapps-golem-logo-alt"),
     },
     {
       title: "radicle.xyz",
-      description: translateMessageId(
-        "page-dapps-dapp-description-radicle",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-radicle"),
       link: "https://radicle.xyz/",
       image: getImage(data.radicle),
-      alt: translateMessageId("page-dapps-radicle-logo-alt", intl),
+      alt: t("page-dapps-radicle-logo-alt"),
     },
   ]
 
   const marketplaces = [
     {
       title: "Gitcoin",
-      description: translateMessageId(
-        "page-dapps-dapp-description-gitcoin",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-gitcoin"),
       link: "https://gitcoin.co/",
       image: getImage(data.gitcoin),
-      alt: translateMessageId("page-dapps-gitcoin-logo-alt", intl),
+      alt: t("page-dapps-gitcoin-logo-alt"),
     },
   ]
 
   const utilities = [
     {
       title: "Ethereum Name Service (ENS)",
-      description: translateMessageId("page-dapps-dapp-description-ens", intl),
+      description: t("page-dapps-dapp-description-ens"),
       link: "http://ens.domains/",
       image: getImage(data.ens),
-      alt: translateMessageId("page-dapps-ens-logo-alt", intl),
+      alt: t("page-dapps-ens-logo-alt"),
     },
   ]
 
   const browsers = [
     {
       title: "Brave",
-      description: translateMessageId(
-        "page-dapps-dapp-description-brave",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-brave"),
       link: "https://brave.com/",
       image: getImage(data.brave),
-      alt: translateMessageId("page-dapps-brave-logo-alt", intl),
+      alt: t("page-dapps-brave-logo-alt"),
     },
     {
       title: "Opera",
-      description: translateMessageId(
-        "page-dapps-dapp-description-opera",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-opera"),
       link: "https://www.opera.com/crypto",
       image: getImage(data.opera),
-      alt: translateMessageId("page-dapps-opera-logo-alt", intl),
+      alt: t("page-dapps-opera-logo-alt"),
     },
   ]
 
   const arts = [
     {
       title: "Foundation",
-      description: translateMessageId(
-        "page-dapps-dapp-description-foundation",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-foundation"),
       link: "https://foundation.app/",
       image: getImage(data.foundation),
-      alt: translateMessageId("page-dapps-foundation-logo-alt", intl),
+      alt: t("page-dapps-foundation-logo-alt"),
     },
     {
       title: "SuperRare",
-      description: translateMessageId(
-        "page-dapps-dapp-description-superrare",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-superrare"),
       link: "https://www.superrare.co",
       image: getImage(data.superrare),
-      alt: translateMessageId("page-dapps-superrare-logo-alt", intl),
+      alt: t("page-dapps-superrare-logo-alt"),
     },
     {
       title: "Nifty Gateway",
-      description: translateMessageId(
-        "page-dapps-dapp-description-nifty-gateway",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-nifty-gateway"),
       link: "https://niftygateway.com/",
       image: getImage(data.nifty),
-      alt: translateMessageId("page-dapps-nifty-gateway-logo-alt", intl),
+      alt: t("page-dapps-nifty-gateway-logo-alt"),
     },
     {
       title: "Async Art",
-      description: translateMessageId(
-        "page-dapps-dapp-description-async-art",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-async-art"),
       link: "https://async.art/",
       image: getImage(data.asyncart),
-      alt: translateMessageId("page-dapps-async-logo-alt", intl),
+      alt: t("page-dapps-async-logo-alt"),
     },
   ]
 
   const music = [
     {
       title: "Audius",
-      description: translateMessageId(
-        "page-dapps-dapp-description-audius",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-audius"),
       link: "https://audius.co/",
       image: getImage(data.audius),
-      alt: translateMessageId("page-dapps-audius-logo-alt", intl),
+      alt: t("page-dapps-audius-logo-alt"),
     },
   ]
 
   const collectibles = [
     {
       title: "OpenSea",
-      description: translateMessageId(
-        "page-dapps-dapp-description-opensea",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-opensea"),
       link: "https://opensea.io/",
       image: getImage(data.opensea),
-      alt: translateMessageId("page-dapps-opensea-logo-alt", intl),
+      alt: t("page-dapps-opensea-logo-alt"),
     },
     {
       title: "marble.cards",
-      description: translateMessageId(
-        "page-dapps-dapp-description-marble-cards",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-marble-cards"),
       link: "https://marble.cards/",
       image: getImage(data.marble),
-      alt: translateMessageId("page-dapps-marble-cards-logo-alt", intl),
+      alt: t("page-dapps-marble-cards-logo-alt"),
     },
     {
       title: "Rarible",
-      description: translateMessageId(
-        "page-dapps-dapp-description-rarible",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-rarible"),
       link: "https://rarible.com/",
       image: getImage(data.rarible),
-      alt: translateMessageId("page-dapps-rarible-logo-alt", intl),
+      alt: t("page-dapps-rarible-logo-alt"),
     },
     {
       title: "CryptoPunks",
-      description: translateMessageId(
-        "page-dapps-dapp-description-cryptopunks",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-cryptopunks"),
       link: "https://www.larvalabs.com/cryptopunks",
       image: getImage(data.cryptopunks),
-      alt: translateMessageId("page-dapps-cryptopunks-logo-alt", intl),
+      alt: t("page-dapps-cryptopunks-logo-alt"),
     },
     {
       title: "POAP - Proof of Attendance Protocol",
-      description: translateMessageId("page-dapps-dapp-description-poap", intl),
+      description: t("page-dapps-dapp-description-poap"),
       link: "https://poap.xyz",
       image: getImage(data.poap),
-      alt: translateMessageId("page-dapps-poap-logo-alt", intl),
+      alt: t("page-dapps-poap-logo-alt"),
     },
   ]
 
   const worlds = [
     {
       title: "Cryptovoxels",
-      description: translateMessageId(
-        "page-dapps-dapp-description-cryptovoxels",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-cryptovoxels"),
       link: "https://www.cryptovoxels.com/",
       image: getImage(data.cryptovoxels),
-      alt: translateMessageId("page-dapps-cryptovoxels-logo-alt", intl),
+      alt: t("page-dapps-cryptovoxels-logo-alt"),
     },
     {
       title: "Decentraland",
-      description: translateMessageId(
-        "page-dapps-dapp-description-decentraland",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-decentraland"),
       link: "https://decentraland.org/",
       image: getImage(data.decentraland),
-      alt: translateMessageId("page-dapps-decentraland-logo-alt", intl),
+      alt: t("page-dapps-decentraland-logo-alt"),
     },
   ]
 
   const competitive = [
     {
       title: "Axie Infinity",
-      description: translateMessageId(
-        "page-dapps-dapp-description-axie-infinity",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-axie-infinity"),
       link: "https://axieinfinity.com/",
       image: getImage(data.axie),
-      alt: translateMessageId("page-dapps-axie-infinity-logo-alt", intl),
+      alt: t("page-dapps-axie-infinity-logo-alt"),
     },
     {
       title: "Gods Unchained",
-      description: translateMessageId(
-        "page-dapps-dapp-description-gods-unchained",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-gods-unchained"),
       link: "https://godsunchained.com/",
       image: getImage(data.gods),
-      alt: translateMessageId("page-dapps-gods-unchained-logo-alt", intl),
+      alt: t("page-dapps-gods-unchained-logo-alt"),
     },
     {
       title: "Dark Forest",
-      description: translateMessageId(
-        "page-dapps-dapp-description-dark-forest",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-dark-forest"),
       link: "https://zkga.me/",
       image: getImage(data.darkforest),
-      alt: translateMessageId("page-dapps-dark-forest-logo-alt", intl),
+      alt: t("page-dapps-dark-forest-logo-alt"),
     },
   ]
 
   const editorChoices = [
     {
       name: "Uniswap",
-      description: translateMessageId(
-        "page-dapps-editors-choice-uniswap",
-        intl
-      ),
+      description: t("page-dapps-editors-choice-uniswap"),
       url: "https://uniswap.exchange/swap",
       image: getImage(data.uniswapec),
-      alt: translateMessageId("page-dapps-uniswap-logo-alt", intl),
+      alt: t("page-dapps-uniswap-logo-alt"),
       background: "#212f46",
       type: CategoryType.FINANCE,
       pillColor: "tagMint",
     },
     {
       name: "Dark Forest",
-      description: translateMessageId(
-        "page-dapps-editors-choice-dark-forest",
-        intl
-      ),
+      description: t("page-dapps-editors-choice-dark-forest"),
       url: "https://zkga.me",
       image: getImage(data.darkforestec),
-      alt: translateMessageId("page-dapps-dark-forest-logo-alt", intl),
+      alt: t("page-dapps-dark-forest-logo-alt"),
       background: "#080808",
       type: CategoryType.GAMING,
       pillColor: "tagOrange",
     },
     {
       name: "Foundation",
-      description: translateMessageId(
-        "page-dapps-editors-choice-foundation",
-        intl
-      ),
+      description: t("page-dapps-editors-choice-foundation"),
       url: "https://foundation.app",
       image: getImage(data.foundationec),
-      alt: translateMessageId("page-dapps-foundation-logo-alt", intl),
+      alt: t("page-dapps-foundation-logo-alt"),
       background: "#ffffff",
       type: CategoryType.COLLECTIBLES,
       pillColor: "tagBlue",
     },
     {
       name: "PoolTogether",
-      description: translateMessageId(
-        "page-dapps-editors-choice-pooltogether",
-        intl
-      ),
+      description: t("page-dapps-editors-choice-pooltogether"),
       url: "https://pooltogether.com",
       image: getImage(data.pooltogetherec),
-      alt: translateMessageId("page-dapps-pooltogether-logo-alt", intl),
+      alt: t("page-dapps-pooltogether-logo-alt"),
       background: "#7e4cf2",
       type: CategoryType.FINANCE,
       pillColor: "tagMint",
@@ -1147,18 +922,18 @@ const DappsPage = ({
   ]
 
   const heroContent = {
-    title: translateMessageId("decentralized-applications-dapps", intl),
-    header: translateMessageId("page-dapps-hero-header", intl),
-    subtitle: translateMessageId("page-dapps-hero-subtitle", intl),
+    title: t("decentralized-applications-dapps"),
+    header: t("page-dapps-hero-header"),
+    subtitle: t("page-dapps-hero-subtitle"),
     image: getImage(data.doge)!,
-    alt: translateMessageId("page-dapps-doge-img-alt", intl),
+    alt: t("page-dapps-doge-img-alt"),
     buttons: [
       {
-        content: translateMessageId("page-dapps-explore-dapps-title", intl),
+        content: t("page-dapps-explore-dapps-title"),
         to: "#explore",
       },
       {
-        content: translateMessageId("page-dapps-what-are-dapps", intl),
+        content: t("page-dapps-what-are-dapps"),
         to: "#what-are-dapps",
         variant: "outline",
       },
@@ -1167,8 +942,8 @@ const DappsPage = ({
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("decentralized-applications-dapps", intl)}
-        description={translateMessageId("page-dapps-desc", intl)}
+        title={t("decentralized-applications-dapps")}
+        description={t("page-dapps-desc")}
         image={getSrc(data.ogImage)}
       />
       <PageHero content={heroContent} />
@@ -1298,16 +1073,13 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-lending",
-                    intl
-                  )}
+                  category={t("page-dapps-category-lending")}
                   content={lending}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={translateMessageId("page-dapps-category-dex", intl)}
+                  category={t("page-dapps-category-dex")}
                   content={dex}
                 />
               </RightColumn>
@@ -1315,19 +1087,13 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-trading",
-                    intl
-                  )}
+                  category={t("page-dapps-category-trading")}
                   content={trading}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-investments",
-                    intl
-                  )}
+                  category={t("page-dapps-category-investments")}
                   content={investments}
                 />
               </RightColumn>
@@ -1335,19 +1101,13 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-payments",
-                    intl
-                  )}
+                  category={t("page-dapps-category-payments")}
                   content={payments}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-lottery",
-                    intl
-                  )}
+                  category={t("page-dapps-category-lottery")}
                   content={lottery}
                 />
               </RightColumn>
@@ -1355,19 +1115,13 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-insurance",
-                    intl
-                  )}
+                  category={t("page-dapps-category-insurance")}
                   content={insurance}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-portfolios",
-                    intl
-                  )}
+                  category={t("page-dapps-category-portfolios")}
                   content={portfolios}
                 />
               </RightColumn>
@@ -1377,10 +1131,7 @@ const DappsPage = ({
               descriptionKey={"page-dapps-wallet-callout-description"}
               image={getImage(data.wallet)!}
               maxImageWidth={300}
-              alt={translateMessageId(
-                "page-dapps-wallet-callout-image-alt",
-                intl
-              )}
+              alt={t("page-dapps-wallet-callout-image-alt")}
             >
               <div>
                 <ButtonLink to="/wallets/find-wallet/">
@@ -1412,19 +1163,13 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-worlds",
-                    intl
-                  )}
+                  category={t("page-dapps-category-worlds")}
                   content={worlds}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-competitive",
-                    intl
-                  )}
+                  category={t("page-dapps-category-competitive")}
                   content={competitive}
                 />
               </RightColumn>
@@ -1453,19 +1198,13 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-utilities",
-                    intl
-                  )}
+                  category={t("page-dapps-category-utilities")}
                   content={utilities}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-marketplaces",
-                    intl
-                  )}
+                  category={t("page-dapps-category-marketplaces")}
                   content={marketplaces}
                 />
               </RightColumn>
@@ -1473,19 +1212,13 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-computing",
-                    intl
-                  )}
+                  category={t("page-dapps-category-computing")}
                   content={computing}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-browsers",
-                    intl
-                  )}
+                  category={t("page-dapps-category-browsers")}
                   content={browsers}
                 />
               </RightColumn>
@@ -1514,27 +1247,18 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-arts",
-                    intl
-                  )}
+                  category={t("page-dapps-category-arts")}
                   content={arts}
                 />
 
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-music",
-                    intl
-                  )}
+                  category={t("page-dapps-category-music")}
                   content={music}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={translateMessageId(
-                    "page-dapps-category-collectibles",
-                    intl
-                  )}
+                  category={t("page-dapps-category-collectibles")}
                   content={collectibles}
                 />
               </RightColumn>
@@ -1630,7 +1354,7 @@ const DappsPage = ({
           <StyledGhostCard>
             <MagiciansImage
               image={getImage(data.magicians)!}
-              alt={translateMessageId("page-dapps-magician-img-alt", intl)}
+              alt={t("page-dapps-magician-img-alt")}
             />
           </StyledGhostCard>
         </ImageContainer>
@@ -1672,10 +1396,7 @@ const DappsPage = ({
               titleKey="page-dapps-learn-callout-title"
               descriptionKey="page-dapps-learn-callout-description"
               image={getImage(data.developers)}
-              alt={translateMessageId(
-                "page-dapps-learn-callout-image-alt",
-                intl
-              )}
+              alt={t("page-dapps-learn-callout-image-alt")}
             >
               <div>
                 <ButtonLink to="/developers/">
diff --git a/src/pages-conditional/eth.tsx b/src/pages-conditional/eth.tsx
index 1edb521b9f6..152342139b1 100644
--- a/src/pages-conditional/eth.tsx
+++ b/src/pages-conditional/eth.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import { Center } from "@chakra-ui/react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { graphql, PageProps } from "gatsby"
 
 import Translation from "../components/Translation"
@@ -31,7 +31,6 @@ import {
 import FeedbackCard from "../components/FeedbackCard"
 import QuizWidget from "../components/Quiz/QuizWidget"
 
-import { translateMessageId } from "../utils/translations"
 import { getImage, getSrc } from "../utils/image"
 import { Context } from "../types"
 
@@ -274,13 +273,13 @@ const cardListContent = [
 ]
 
 const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const data = props.data
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-eth-whats-eth-meta-title", intl)}
-        description={translateMessageId("page-eth-whats-eth-meta-desc", intl)}
+        title={t("page-eth-whats-eth-meta-title")}
+        description={t("page-eth-whats-eth-meta-desc")}
         image={getSrc(data.ogImage)}
       />
       <Content>
@@ -305,7 +304,7 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
           </Header>
           <Hero
             image={getImage(data.eth)!}
-            alt={translateMessageId("page-eth-whats-eth-hero-alt", intl)}
+            alt={t("page-eth-whats-eth-hero-alt")}
             loading="eager"
           />
         </HeroContainer>
@@ -374,11 +373,8 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
           </div>
           <CentralActionCard
             to="/what-is-ethereum/"
-            title={translateMessageId("page-eth-whats-ethereum", intl)}
-            description={translateMessageId(
-              "page-eth-whats-ethereum-desc",
-              intl
-            )}
+            title={t("page-eth-whats-ethereum")}
+            description={t("page-eth-whats-ethereum-desc")}
             image={getImage(data.ethereum)!}
           />
           <TextDivider />
@@ -394,11 +390,8 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
             </p>
             <CentralActionCard
               to="/defi/"
-              title={translateMessageId("page-eth-whats-defi", intl)}
-              description={translateMessageId(
-                "page-eth-whats-defi-description",
-                intl
-              )}
+              title={t("page-eth-whats-defi")}
+              description={t("page-eth-whats-defi-description")}
               image={getImage(data.defi)!}
             />
           </div>
@@ -446,7 +439,7 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
           titleKey={"page-eth-where-to-buy"}
           descriptionKey={"page-eth-where-to-buy-desc"}
           image={getImage(data.ethCat)!}
-          alt={translateMessageId("page-eth-cat-img-alt", intl)}
+          alt={t("page-eth-cat-img-alt")}
           maxImageWidth={300}
         >
           <div>
diff --git a/src/pages-conditional/wallets.tsx b/src/pages-conditional/wallets.tsx
index fafee332546..0cc357c2074 100644
--- a/src/pages-conditional/wallets.tsx
+++ b/src/pages-conditional/wallets.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import { Center } from "@chakra-ui/react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { graphql, PageProps } from "gatsby"
 
 import PageHero from "../components/PageHero"
@@ -25,7 +25,6 @@ import {
 import FeedbackCard from "../components/FeedbackCard"
 import QuizWidget from "../components/Quiz/QuizWidget"
 
-import { translateMessageId } from "../utils/translations"
 import { getImage, getSrc } from "../utils/image"
 import { Context } from "../types"
 
@@ -221,18 +220,18 @@ const articles = [
 const WalletsPage = ({
   data,
 }: PageProps<Queries.WalletsPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const heroContent = {
-    title: translateMessageId("page-wallets-title", intl),
-    header: translateMessageId("page-wallets-slogan", intl),
-    subtitle: translateMessageId("page-wallets-subtitle", intl),
+    title: t("page-wallets-title"),
+    header: t("page-wallets-slogan"),
+    subtitle: t("page-wallets-subtitle"),
     image: getImage(data.hero)!,
-    alt: translateMessageId("page-wallets-alt", intl),
+    alt: t("page-wallets-alt"),
     buttons: [
       {
         to: "/wallets/find-wallet/",
-        content: translateMessageId("page-wallets-find-wallet-link", intl),
+        content: t("page-wallets-find-wallet-link"),
       },
     ],
   }
@@ -240,8 +239,8 @@ const WalletsPage = ({
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-wallets-meta-title", intl)}
-        description={translateMessageId("page-wallets-meta-description", intl)}
+        title={t("page-wallets-meta-title")}
+        description={t("page-wallets-meta-description")}
         image={getSrc(data.ogImage)}
       />
       <PageHero content={heroContent} isReverse />
@@ -361,23 +360,14 @@ const WalletsPage = ({
             <ChecklistItem
               key="0"
               emoji=":white_check_mark:"
-              title={translateMessageId(
-                "page-wallets-take-responsibility",
-                intl
-              )}
-              description={translateMessageId(
-                "page-wallets-take-responsibility-desc",
-                intl
-              )}
+              title={t("page-wallets-take-responsibility")}
+              description={t("page-wallets-take-responsibility-desc")}
             />
             <ChecklistItem
               key="1"
               emoji=":white_check_mark:"
-              title={translateMessageId("page-wallets-seed-phrase", intl)}
-              description={translateMessageId(
-                "page-wallets-seed-phrase-desc",
-                intl
-              )}
+              title={t("page-wallets-seed-phrase")}
+              description={t("page-wallets-seed-phrase-desc")}
             >
               <p>
                 <Translation id="page-wallets-seed-phrase-example" />
@@ -394,20 +384,14 @@ const WalletsPage = ({
             <ChecklistItem
               key="2"
               emoji=":white_check_mark:"
-              title={translateMessageId("page-wallets-bookmarking", intl)}
-              description={translateMessageId(
-                "page-wallets-bookmarking-desc",
-                intl
-              )}
+              title={t("page-wallets-bookmarking")}
+              description={t("page-wallets-bookmarking-desc")}
             />
             <ChecklistItem
               key="3"
               emoji=":white_check_mark:"
-              title={translateMessageId("page-wallets-triple-check", intl)}
-              description={translateMessageId(
-                "page-wallets-triple-check-desc",
-                intl
-              )}
+              title={t("page-wallets-triple-check")}
+              description={t("page-wallets-triple-check-desc")}
             />
           </div>
         </LeftColumn>
@@ -430,7 +414,7 @@ const WalletsPage = ({
           <StyledCallout
             image={getImage(data.eth)}
             titleKey="page-wallets-get-some"
-            alt={translateMessageId("page-wallets-get-some-alt", intl)}
+            alt={t("page-wallets-get-some-alt")}
             descriptionKey="page-wallets-get-some-desc"
           >
             <div>
@@ -442,7 +426,7 @@ const WalletsPage = ({
           <StyledCallout
             image={getImage(data.dapps)}
             titleKey="page-wallets-try-dapps"
-            alt={translateMessageId("page-wallets-try-dapps-alt", intl)}
+            alt={t("page-wallets-try-dapps-alt")}
             descriptionKey="page-wallets-try-dapps-desc"
           >
             <div>
diff --git a/src/pages-conditional/what-is-ethereum.tsx b/src/pages-conditional/what-is-ethereum.tsx
index c3adf2c05cd..0cd3adb10e1 100644
--- a/src/pages-conditional/what-is-ethereum.tsx
+++ b/src/pages-conditional/what-is-ethereum.tsx
@@ -3,7 +3,7 @@ import styled from "@emotion/styled"
 import { useTheme } from "@emotion/react"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 
 import Translation from "../components/Translation"
 import Callout from "../components/Callout"
@@ -37,10 +37,7 @@ import Slider, { EmblaSlide } from "../components/Slider"
 import FeedbackCard from "../components/FeedbackCard"
 import QuizWidget from "../components/Quiz/QuizWidget"
 
-import {
-  getLocaleForNumberFormat,
-  translateMessageId,
-} from "../utils/translations"
+import { getLocaleForNumberFormat } from "../utils/translations"
 import { Lang } from "../utils/languages"
 import { trackCustomEvent } from "../utils/matomo"
 import { getImage, getSrc } from "../utils/image"
@@ -241,10 +238,11 @@ const Stat: React.FC<{ stat: IFetchStat }> = ({ stat }) => {
 const WhatIsEthereumPage = ({
   data,
 }: PageProps<Queries.WhatIsEthereumQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
+  const { language } = useI18next()
   const theme = useTheme()
 
-  const localeForStatsBoxNumbers = getLocaleForNumberFormat(intl.locale as Lang)
+  const localeForStatsBoxNumbers = getLocaleForNumberFormat(language as Lang)
 
   const txCount = useFetchStat<
     Array<{ unixTimeStamp: string; transactionCount: number }>
@@ -264,61 +262,40 @@ const WhatIsEthereumPage = ({
   const cards = [
     {
       emoji: ":bank:",
-      title: translateMessageId("page-what-is-ethereum-banking-card", intl),
-      description: translateMessageId(
-        "page-what-is-ethereum-banking-card-desc",
-        intl
-      ),
+      title: t("page-what-is-ethereum-banking-card"),
+      description: t("page-what-is-ethereum-banking-card-desc"),
     },
 
     {
       emoji: ":detective:",
-      title: translateMessageId("page-what-is-ethereum-internet-card", intl),
-      description: translateMessageId(
-        "page-what-is-ethereum-internet-card-desc",
-        intl
-      ),
+      title: t("page-what-is-ethereum-internet-card"),
+      description: t("page-what-is-ethereum-internet-card-desc"),
     },
     {
       emoji: ":busts_in_silhouette:",
-      title: translateMessageId("page-what-is-ethereum-p2p-card", intl),
-      description: translateMessageId(
-        "page-what-is-ethereum-p2p-card-desc",
-        intl
-      ),
+      title: t("page-what-is-ethereum-p2p-card"),
+      description: t("page-what-is-ethereum-p2p-card-desc"),
     },
     {
       emoji: ":shield:",
-      title: translateMessageId("page-what-is-ethereum-censorless-card", intl),
-      description: translateMessageId(
-        "page-what-is-ethereum-censorless-card-desc",
-        intl
-      ),
+      title: t("page-what-is-ethereum-censorless-card"),
+      description: t("page-what-is-ethereum-censorless-card-desc"),
     },
     {
       emoji: ":shopping_bags:",
-      title: translateMessageId("page-what-is-ethereum-commerce-card", intl),
-      description: translateMessageId(
-        "page-what-is-ethereum-commerce-card-desc",
-        intl
-      ),
+      title: t("page-what-is-ethereum-commerce-card"),
+      description: t("page-what-is-ethereum-commerce-card-desc"),
     },
     {
       emoji: ":handshake:",
-      title: translateMessageId("page-what-is-ethereum-composable-card", intl),
-      description: translateMessageId(
-        "page-what-is-ethereum-composable-card-desc",
-        intl
-      ),
+      title: t("page-what-is-ethereum-composable-card"),
+      description: t("page-what-is-ethereum-composable-card-desc"),
     },
   ]
 
   const tabs = [
     {
-      title: translateMessageId(
-        "page-what-is-ethereum-blockchain-tab-title",
-        intl
-      ),
+      title: t("page-what-is-ethereum-blockchain-tab-title"),
       eventName: "Blockchain tab",
       content: (
         <TabContent>
@@ -327,10 +304,7 @@ const WhatIsEthereumPage = ({
       ),
     },
     {
-      title: translateMessageId(
-        "page-what-is-ethereum-cryptocurrency-tab-title",
-        intl
-      ),
+      title: t("page-what-is-ethereum-cryptocurrency-tab-title"),
       eventName: "Cryptocurrency tab",
       content: (
         <TabContent>
@@ -367,11 +341,8 @@ const WhatIsEthereumPage = ({
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-what-is-ethereum-meta-title", intl)}
-        description={translateMessageId(
-          "page-what-is-ethereum-meta-description",
-          intl
-        )}
+        title={t("page-what-is-ethereum-meta-title")}
+        description={t("page-what-is-ethereum-meta-description")}
         image={getSrc(data.ogImage)}
       />
       <Content>
@@ -394,10 +365,7 @@ const WhatIsEthereumPage = ({
           </Header>
           <Hero
             image={getImage(data.hero)!}
-            alt={translateMessageId(
-              "page-what-is-ethereum-alt-img-bazaar",
-              intl
-            )}
+            alt={t("page-what-is-ethereum-alt-img-bazaar")}
             loading="eager"
           />
         </HeroContainer>
@@ -921,7 +889,7 @@ const WhatIsEthereumPage = ({
           <StyledCallout
             image={getImage(data.developers)!}
             titleKey="page-what-is-ethereum-build"
-            alt={translateMessageId("page-what-is-ethereum-alt-img-lego", intl)}
+            alt={t("page-what-is-ethereum-alt-img-lego")}
             descriptionKey="page-what-is-ethereum-build-desc"
           >
             <div>
@@ -933,7 +901,7 @@ const WhatIsEthereumPage = ({
           <StyledCallout
             image={getImage(data.community)!}
             titleKey="page-what-is-ethereum-community"
-            alt={translateMessageId("page-what-is-ethereum-alt-img-comm", intl)}
+            alt={t("page-what-is-ethereum-alt-img-comm")}
             descriptionKey="page-what-is-ethereum-comm-desc"
           >
             <div>
diff --git a/src/pages/assets.tsx b/src/pages/assets.tsx
index 701d48fbb49..6b4168f0ab5 100644
--- a/src/pages/assets.tsx
+++ b/src/pages/assets.tsx
@@ -1,6 +1,6 @@
 // Libraries
 import React from "react"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { useTheme } from "@emotion/react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
@@ -22,7 +22,6 @@ import FeedbackCard from "../components/FeedbackCard"
 import { Context } from "../types"
 
 // Utils
-import { translateMessageId } from "../utils/translations"
 import { getImage } from "../utils/image"
 
 const Image = styled(GatsbyImage)`
@@ -86,7 +85,7 @@ const Header = styled.header`
 `
 
 const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const theme = useTheme()
   const isDarkTheme = theme.isDark
   const assetPageHeroImage = isDarkTheme
@@ -95,15 +94,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-assets-meta-title", intl)}
-        description={translateMessageId("page-assets-meta-desc", intl)}
+        title={t("page-assets-meta-title")}
+        description={t("page-assets-meta-desc")}
       />
       <Content>
         <HeroContainer>
           <Header>
             <Image
               image={getImage(assetPageHeroImage)!}
-              alt={translateMessageId("page-assets-eth-diamond-gray", intl)}
+              alt={t("page-assets-eth-diamond-gray")}
             />
             <h1>
               <Translation id="page-assets-h1" />
@@ -125,8 +124,8 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-hero", intl)}
-            alt={translateMessageId("page-assets-hero", intl)}
+            title={t("page-assets-hero")}
+            alt={t("page-assets-hero")}
             image={data.hero}
             artistName="Liam Cobb"
             artistUrl="https://liamcobb.com/"
@@ -152,22 +151,22 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-doge", intl)}
-            alt={translateMessageId("page-assets-doge", intl)}
+            title={t("page-assets-doge")}
+            alt={t("page-assets-doge")}
             image={data.doge}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-blocks", intl)}
-            alt={translateMessageId("page-assets-blocks", intl)}
+            title={t("page-assets-blocks")}
+            alt={t("page-assets-blocks")}
             image={data.developers}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-enterprise", intl)}
-            alt={translateMessageId("page-assets-enterprise", intl)}
+            title={t("page-assets-enterprise")}
+            alt={t("page-assets-enterprise")}
             image={data.enterprise}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
@@ -176,22 +175,22 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-infrastructure", intl)}
-            alt={translateMessageId("page-assets-infrastructure", intl)}
+            title={t("page-assets-infrastructure")}
+            alt={t("page-assets-infrastructure")}
             image={data.infrastructure}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-finance", intl)}
-            alt={translateMessageId("page-assets-finance", intl)}
+            title={t("page-assets-finance")}
+            alt={t("page-assets-finance")}
             image={data.finance}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-impact", intl)}
-            alt={translateMessageId("page-assets-impact", intl)}
+            title={t("page-assets-impact")}
+            alt={t("page-assets-impact")}
             image={data.impact}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
@@ -200,15 +199,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-future", intl)}
-            alt={translateMessageId("page-assets-future", intl)}
+            title={t("page-assets-future")}
+            alt={t("page-assets-future")}
             image={data.future}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-hackathon", intl)}
-            alt={translateMessageId("page-assets-hackathon", intl)}
+            title={t("page-assets-hackathon")}
+            alt={t("page-assets-hackathon")}
             image={data.hackathon}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
@@ -217,15 +216,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-robot", intl)}
-            alt={translateMessageId("page-assets-robot", intl)}
+            title={t("page-assets-robot")}
+            alt={t("page-assets-robot")}
             image={data.wallet}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-robot", intl)}
-            alt={translateMessageId("page-assets-robot", intl)}
+            title={t("page-assets-robot")}
+            alt={t("page-assets-robot")}
             image={data.wallet}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
@@ -235,15 +234,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-bazaar", intl)}
-            alt={translateMessageId("page-assets-bazaar", intl)}
+            title={t("page-assets-bazaar")}
+            alt={t("page-assets-bazaar")}
             image={data.whatIsEthereum}
             artistName="Viktor Hachmang"
             artistUrl="http://viktorhachmang.nl/"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth", intl)}
-            alt={translateMessageId("page-assets-eth", intl)}
+            title={t("page-assets-eth")}
+            alt={t("page-assets-eth")}
             image={data.eth}
             artistName="Viktor Hachmang"
             artistUrl="http://viktorhachmang.nl/"
@@ -252,15 +251,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-mainnet", intl)}
-            alt={translateMessageId("page-assets-mainnet", intl)}
+            title={t("page-assets-mainnet")}
+            alt={t("page-assets-mainnet")}
             image={data.oldShip}
             artistName="Viktor Hachmang"
             artistUrl="https://viktorhachmang.nl"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-merge", intl)}
-            alt={translateMessageId("page-assets-merge", intl)}
+            title={t("page-assets-merge")}
+            alt={t("page-assets-merge")}
             image={data.merge}
             artistName="Viktor Hachmang"
             artistUrl="https://viktorhachmang.nl"
@@ -269,15 +268,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-beacon-chain", intl)}
-            alt={translateMessageId("page-assets-beacon-chain", intl)}
+            title={t("page-assets-beacon-chain")}
+            alt={t("page-assets-beacon-chain")}
             image={data.beaconChain}
             artistName="Viktor Hachmang"
             artistUrl="http://viktorhachmang.nl/"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-sharding", intl)}
-            alt={translateMessageId("page-assets-sharding", intl)}
+            title={t("page-assets-sharding")}
+            alt={t("page-assets-sharding")}
             image={data.newRings}
             artistName="Viktor Hachmang"
             artistUrl="https://viktorhachmang.nl"
@@ -286,15 +285,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-defi", intl)}
-            alt={translateMessageId("page-assets-defi", intl)}
+            title={t("page-assets-defi")}
+            alt={t("page-assets-defi")}
             image={data.defi}
             artistName="Patrick Atkins"
             artistUrl="https://www.patrickatkins.co.uk/"
           />
           <AssetDownload
-            title={translateMessageId("page-assets-dao", intl)}
-            alt={translateMessageId("page-assets-dao", intl)}
+            title={t("page-assets-dao")}
+            alt={t("page-assets-dao")}
             image={data.dao}
             artistName="Patrick Atkins"
             artistUrl="https://www.patrickatkins.co.uk/"
@@ -303,15 +302,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-leslie-the-rhino", intl)}
-            alt={translateMessageId("page-assets-leslie-the-rhino", intl)}
+            title={t("page-assets-leslie-the-rhino")}
+            alt={t("page-assets-leslie-the-rhino")}
             artistName="Tomo Saito"
             artistUrl="https://tomosaito.com/"
             image={data.leslieTheRhino}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-leslie-the-rhino", intl)}
-            alt={translateMessageId("page-assets-leslie-the-rhino", intl)}
+            title={t("page-assets-leslie-the-rhino")}
+            alt={t("page-assets-leslie-the-rhino")}
             artistName="Tomo Saito"
             artistUrl="https://tomosaito.com/"
             image={data.leslieTheRhino}
@@ -333,96 +332,69 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-glyph", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-glyph", intl)}
+            title={t("page-assets-eth-diamond-glyph")}
+            alt={t("page-assets-eth-diamond-glyph")}
             image={data.ethDiamondGlyph}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-gray", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-gray", intl)}
+            title={t("page-assets-eth-diamond-gray")}
+            alt={t("page-assets-eth-diamond-gray")}
             image={data.ethDiamondBlack}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-color", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-color", intl)}
+            title={t("page-assets-eth-diamond-color")}
+            alt={t("page-assets-eth-diamond-color")}
             image={data.ethDiamondColor}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-purple", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-purple", intl)}
+            title={t("page-assets-eth-diamond-purple")}
+            alt={t("page-assets-eth-diamond-purple")}
             image={data.ethDiamondPurple}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-colored", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-colored", intl)}
+            title={t("page-assets-eth-diamond-colored")}
+            alt={t("page-assets-eth-diamond-colored")}
             image={data.ethGlyphColored}
           />
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-diamond-colored-svg",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-diamond-colored-svg",
-              intl
-            )}
+            title={t("page-assets-eth-diamond-colored-svg")}
+            alt={t("page-assets-eth-diamond-colored-svg")}
             svg={EthGlyphColoredSvg}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-portrait-gray",
-              intl
-            )}
-            alt={translateMessageId("page-assets-eth-logo-portrait-gray", intl)}
+            title={t("page-assets-eth-logo-portrait-gray")}
+            alt={t("page-assets-eth-logo-portrait-gray")}
             image={data.ethPortraitBlack}
           />
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-landscape-gray",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-logo-landscape-gray",
-              intl
-            )}
+            title={t("page-assets-eth-logo-landscape-gray")}
+            alt={t("page-assets-eth-logo-landscape-gray")}
             image={data.ethLandscapeBlack}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-wordmark-gray", intl)}
-            alt={translateMessageId("page-assets-eth-wordmark-gray", intl)}
+            title={t("page-assets-eth-wordmark-gray")}
+            alt={t("page-assets-eth-wordmark-gray")}
             image={data.ethWordmarkBlack}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-portrait-purple",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-logo-portrait-purple",
-              intl
-            )}
+            title={t("page-assets-eth-logo-portrait-purple")}
+            alt={t("page-assets-eth-logo-portrait-purple")}
             image={data.ethPortraitPurple}
           />
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-landscape-purple",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-logo-landscape-purple",
-              intl
-            )}
+            title={t("page-assets-eth-logo-landscape-purple")}
+            alt={t("page-assets-eth-logo-landscape-purple")}
             image={data.ethLandscapePurple}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-wordmark-purple", intl)}
-            alt={translateMessageId("page-assets-eth-wordmark-purple", intl)}
+            title={t("page-assets-eth-wordmark-purple")}
+            alt={t("page-assets-eth-wordmark-purple")}
             image={data.ethWordmarkPurple}
           />
         </Row>
@@ -433,107 +405,74 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-white", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-white", intl)}
+            title={t("page-assets-eth-diamond-white")}
+            alt={t("page-assets-eth-diamond-white")}
             image={data.ethDiamondBlackWhite}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-gray", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-gray", intl)}
+            title={t("page-assets-eth-diamond-gray")}
+            alt={t("page-assets-eth-diamond-gray")}
             image={data.ethDiamondBlackGray}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-purple", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-purple", intl)}
+            title={t("page-assets-eth-diamond-purple")}
+            alt={t("page-assets-eth-diamond-purple")}
             image={data.ethDiamondPurplePurple}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-diamond-white", intl)}
-            alt={translateMessageId("page-assets-eth-diamond-white", intl)}
+            title={t("page-assets-eth-diamond-white")}
+            alt={t("page-assets-eth-diamond-white")}
             image={data.ethDiamondPurpleWhite}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-portrait-gray",
-              intl
-            )}
-            alt={translateMessageId("page-assets-eth-logo-portrait-gray", intl)}
+            title={t("page-assets-eth-logo-portrait-gray")}
+            alt={t("page-assets-eth-logo-portrait-gray")}
             image={data.ethPortraitBlackGray}
           />
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-landscape-gray",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-logo-landscape-gray",
-              intl
-            )}
+            title={t("page-assets-eth-logo-landscape-gray")}
+            alt={t("page-assets-eth-logo-landscape-gray")}
             image={data.ethLandscapeBlackGray}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-wordmark-gray", intl)}
-            alt={translateMessageId("page-assets-eth-wordmark-gray", intl)}
+            title={t("page-assets-eth-wordmark-gray")}
+            alt={t("page-assets-eth-wordmark-gray")}
             image={data.ethWordmarkBlackGray}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-portrait-purple",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-logo-portrait-purple",
-              intl
-            )}
+            title={t("page-assets-eth-logo-portrait-purple")}
+            alt={t("page-assets-eth-logo-portrait-purple")}
             image={data.ethPortraitPurplePurple}
           />
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-landscape-purple",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-logo-landscape-purple",
-              intl
-            )}
+            title={t("page-assets-eth-logo-landscape-purple")}
+            alt={t("page-assets-eth-logo-landscape-purple")}
             image={data.ethLandscapePurplePurple}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-wordmark-purple", intl)}
-            alt={translateMessageId("page-assets-eth-wordmark-purple", intl)}
+            title={t("page-assets-eth-wordmark-purple")}
+            alt={t("page-assets-eth-wordmark-purple")}
             image={data.ethWordmarkPurplePurple}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-portrait-white",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-logo-portrait-white",
-              intl
-            )}
+            title={t("page-assets-eth-logo-portrait-white")}
+            alt={t("page-assets-eth-logo-portrait-white")}
             image={data.ethPortraitPurpleWhite}
           />
           <AssetDownload
-            title={translateMessageId(
-              "page-assets-eth-logo-landscape-white",
-              intl
-            )}
-            alt={translateMessageId(
-              "page-assets-eth-logo-landscape-white",
-              intl
-            )}
+            title={t("page-assets-eth-logo-landscape-white")}
+            alt={t("page-assets-eth-logo-landscape-white")}
             image={data.ethLandscapePurpleWhite}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-eth-wordmark-white", intl)}
-            alt={translateMessageId("page-assets-eth-wordmark-white", intl)}
+            title={t("page-assets-eth-wordmark-white")}
+            alt={t("page-assets-eth-wordmark-white")}
             image={data.ethWordmarkPurpleWhite}
           />
         </Row>
diff --git a/src/pages/bug-bounty.tsx b/src/pages/bug-bounty.tsx
index fc14a7e184d..dc276e953c4 100644
--- a/src/pages/bug-bounty.tsx
+++ b/src/pages/bug-bounty.tsx
@@ -1,11 +1,10 @@
-import React, { ReactNode, useContext } from "react"
+import React, { ReactNode } from "react"
 import { useTheme } from "@emotion/react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
-import { translateMessageId } from "../utils/translations"
 import Translation from "../components/Translation"
 import Card from "../components/Card"
 import Leaderboard from "../components/Leaderboard"
@@ -264,7 +263,7 @@ const BugBountiesPage = ({
   data,
   location,
 }: PageProps<Queries.BugBountyPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const theme = useTheme()
   const isDarkTheme = theme.isDark
 
@@ -392,11 +391,8 @@ const BugBountiesPage = ({
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-upgrades-bug-bounty-meta-title", intl)}
-        description={translateMessageId(
-          "page-upgrades-bug-bounty-meta-description",
-          intl
-        )}
+        title={t("page-upgrades-bug-bounty-meta-title")}
+        description={t("page-upgrades-bug-bounty-meta-description")}
       />
       <Content>
         <HeroCard>
@@ -459,14 +455,8 @@ const BugBountiesPage = ({
           <StyledCardContainer>
             <StyledCard
               emoji=":ledger:"
-              title={translateMessageId(
-                "page-upgrades-bug-bounty-ledger-title",
-                intl
-              )}
-              description={translateMessageId(
-                "page-upgrades-bug-bounty-ledger-desc",
-                intl
-              )}
+              title={t("page-upgrades-bug-bounty-ledger-title")}
+              description={t("page-upgrades-bug-bounty-ledger-desc")}
             >
               <Link to="https://github.com/ethereum/consensus-specs">
                 <Translation id="page-upgrades-bug-bounty-specs" />
@@ -523,14 +513,8 @@ const BugBountiesPage = ({
             </StyledCard>
             <StyledCard
               emoji=":computer:"
-              title={translateMessageId(
-                "page-upgrades-bug-bounty-client-bugs",
-                intl
-              )}
-              description={translateMessageId(
-                "page-upgrades-bug-bounty-client-bugs-desc",
-                intl
-              )}
+              title={t("page-upgrades-bug-bounty-client-bugs")}
+              description={t("page-upgrades-bug-bounty-client-bugs-desc")}
             >
               <div>
                 <p>
@@ -561,14 +545,8 @@ const BugBountiesPage = ({
             </StyledCard>
             <StyledCard
               emoji=":book:"
-              title={translateMessageId(
-                "page-upgrades-bug-bounty-misc-bugs",
-                intl
-              )}
-              description={translateMessageId(
-                "page-upgrades-bug-bounty-misc-bugs-desc",
-                intl
-              )}
+              title={t("page-upgrades-bug-bounty-misc-bugs")}
+              description={t("page-upgrades-bug-bounty-misc-bugs-desc")}
             >
               <div>
                 <p>
@@ -586,14 +564,8 @@ const BugBountiesPage = ({
             </StyledCard>
             <StyledCard
               emoji=":scroll:"
-              title={translateMessageId(
-                "page-upgrades-bug-bounty-deposit-bugs",
-                intl
-              )}
-              description={translateMessageId(
-                "page-upgrades-bug-bounty-deposit-bugs-desc",
-                intl
-              )}
+              title={t("page-upgrades-bug-bounty-deposit-bugs")}
+              description={t("page-upgrades-bug-bounty-deposit-bugs-desc")}
             >
               <div>
                 <h4>
diff --git a/src/pages/community.tsx b/src/pages/community.tsx
index 98a5023a3f5..fd5dc68f394 100644
--- a/src/pages/community.tsx
+++ b/src/pages/community.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import ActionCard from "../components/ActionCard"
 import Callout from "../components/Callout"
@@ -20,7 +20,6 @@ import {
   GrayContainer,
   Page,
 } from "../components/SharedStyledComponents"
-import { translateMessageId } from "../utils/translations"
 import { getImage } from "../utils/image"
 import { Context } from "../types"
 
@@ -325,55 +324,43 @@ interface IGetInvolvedCard {
 const CommunityPage = ({
   data,
 }: PageProps<Queries.CommunityPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const heroContent = {
-    title: translateMessageId("page-community-hero-title", intl),
-    header: translateMessageId("page-community-hero-header", intl),
-    subtitle: translateMessageId("page-community-hero-subtitle", intl),
+    title: t("page-community-hero-title"),
+    header: t("page-community-hero-header"),
+    subtitle: t("page-community-hero-subtitle"),
     image: getImage(data.enterprise)!,
-    alt: translateMessageId("page-community-hero-alt", intl),
+    alt: t("page-community-hero-alt"),
   }
 
   const cards: Array<ICard> = [
     {
       image: getImage(data.docking),
-      title: translateMessageId("page-community-card-1-title", intl),
-      description: translateMessageId(
-        "page-community-card-1-description",
-        intl
-      ),
-      alt: translateMessageId("page-index-get-started-wallet-image-alt", intl),
+      title: t("page-community-card-1-title"),
+      description: t("page-community-card-1-description"),
+      alt: t("page-index-get-started-wallet-image-alt"),
       to: "/community/online/",
     },
     {
       image: getImage(data.eth),
-      title: translateMessageId("page-community-card-2-title", intl),
-      description: translateMessageId(
-        "page-community-card-2-description",
-        intl
-      ),
-      alt: translateMessageId("page-index-get-started-eth-image-alt", intl),
+      title: t("page-community-card-2-title"),
+      description: t("page-community-card-2-description"),
+      alt: t("page-index-get-started-eth-image-alt"),
       to: "/community/events/",
     },
     {
       image: getImage(data.doge),
-      title: translateMessageId("page-community-card-3-title", intl),
-      description: translateMessageId(
-        "page-community-card-3-description",
-        intl
-      ),
-      alt: translateMessageId("page-index-get-started-dapps-image-alt", intl),
+      title: t("page-community-card-3-title"),
+      description: t("page-community-card-3-description"),
+      alt: t("page-index-get-started-dapps-image-alt"),
       to: "/community/get-involved/",
     },
     {
       image: getImage(data.future),
-      title: translateMessageId("page-community-card-4-title", intl),
-      description: translateMessageId(
-        "page-community-card-4-description",
-        intl
-      ),
-      alt: translateMessageId("page-index-get-started-dapps-image-alt", intl),
+      title: t("page-community-card-4-title"),
+      description: t("page-community-card-4-description"),
+      alt: t("page-index-get-started-dapps-image-alt"),
       to: "/community/grants/",
     },
   ]
@@ -381,47 +368,26 @@ const CommunityPage = ({
   const whyGetInvolvedCards: Array<IGetInvolvedCard> = [
     {
       emoji: ":mage:",
-      title: translateMessageId(
-        "page-community-why-get-involved-card-1-title",
-        intl
-      ),
-      description: translateMessageId(
-        "page-community-why-get-involved-card-1-description",
-        intl
-      ),
+      title: t("page-community-why-get-involved-card-1-title"),
+      description: t("page-community-why-get-involved-card-1-description"),
     },
     {
       emoji: ":dollar:",
-      title: translateMessageId(
-        "page-community-why-get-involved-card-2-title",
-        intl
-      ),
-      description: translateMessageId(
-        "page-community-why-get-involved-card-2-description",
-        intl
-      ),
+      title: t("page-community-why-get-involved-card-2-title"),
+      description: t("page-community-why-get-involved-card-2-description"),
     },
     {
       emoji: ":collision:",
-      title: translateMessageId(
-        "page-community-why-get-involved-card-3-title",
-        intl
-      ),
-      description: translateMessageId(
-        "page-community-why-get-involved-card-3-description",
-        intl
-      ),
+      title: t("page-community-why-get-involved-card-3-title"),
+      description: t("page-community-why-get-involved-card-3-description"),
     },
   ]
 
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-community-meta-title", intl)}
-        description={translateMessageId(
-          "page-community-meta-description",
-          intl
-        )}
+        title={t("page-community-meta-title")}
+        description={t("page-community-meta-description")}
       />
       <PageHero isReverse content={heroContent} />
       <Divider />
@@ -458,10 +424,7 @@ const CommunityPage = ({
             <ImageContainer>
               <IntroImage
                 image={getImage(data.developerBlocks)!}
-                alt={translateMessageId(
-                  "page-community-get-involved-image-alt",
-                  intl
-                )}
+                alt={t("page-community-get-involved-image-alt")}
               />
             </ImageContainer>
           </IntroRow>
@@ -500,10 +463,7 @@ const CommunityPage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.ethereum)!}
-              alt={translateMessageId(
-                "page-community-open-source-image-alt",
-                intl
-              )}
+              alt={t("page-community-open-source-image-alt")}
             />
           </ImageContainer>
         </RowReverse>
@@ -534,7 +494,7 @@ const CommunityPage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.finance)!}
-              alt={translateMessageId("page-index-internet-image-alt", intl)}
+              alt={t("page-index-internet-image-alt")}
             />
           </ImageContainer>
         </Row>
@@ -557,7 +517,7 @@ const CommunityPage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.hackathon)!}
-              alt={translateMessageId("page-community-support-alt", intl)}
+              alt={t("page-community-support-alt")}
             />
           </ImageContainer>
         </RowReverse>
@@ -575,7 +535,7 @@ const CommunityPage = ({
           <StyledCallout
             image={getImage(data.eth)}
             titleKey="page-community-get-eth-title"
-            alt={translateMessageId("page-community-get-eth-alt", intl)}
+            alt={t("page-community-get-eth-alt")}
             descriptionKey="page-community-get-eth-description"
           >
             <div>
@@ -587,7 +547,7 @@ const CommunityPage = ({
           <StyledCallout
             image={getImage(data.doge)}
             titleKey="page-community-explore-dapps-title"
-            alt={translateMessageId("page-community-explore-dapps-alt", intl)}
+            alt={t("page-community-explore-dapps-alt")}
             descriptionKey="page-community-explore-dapps-description"
           >
             <div>
diff --git a/src/pages/contributing/translation-program/acknowledgements.tsx b/src/pages/contributing/translation-program/acknowledgements.tsx
index 975c46920d1..2430a6d20e8 100644
--- a/src/pages/contributing/translation-program/acknowledgements.tsx
+++ b/src/pages/contributing/translation-program/acknowledgements.tsx
@@ -2,7 +2,7 @@
 import React from "react"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 import { useTheme } from "@emotion/react"
 import type { Context } from "../../../types"
@@ -18,7 +18,6 @@ import { Content, Page } from "../../../components/SharedStyledComponents"
 import FeedbackCard from "../../../components/FeedbackCard"
 
 // Utils
-import { translateMessageId } from "../../../utils/translations"
 import { getImage } from "../../../utils/image"
 
 // Styles
@@ -110,7 +109,7 @@ const TranslatorAcknowledgements = ({
   data,
   location,
 }: PageProps<Queries.TranslatorAcknowledgementsPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const theme = useTheme()
   const isDarkTheme = theme.isDark
   const themedCertificateImage = isDarkTheme
@@ -120,13 +119,11 @@ const TranslatorAcknowledgements = ({
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId(
-          "page-contributing-translation-program-acknowledgements-meta-title",
-          intl
+        title={t(
+          "page-contributing-translation-program-acknowledgements-meta-title"
         )}
-        description={translateMessageId(
-          "page-contributing-translation-program-acknowledgements-meta-description",
-          intl
+        description={t(
+          "page-contributing-translation-program-acknowledgements-meta-description"
         )}
       />
 
@@ -161,9 +158,8 @@ const TranslatorAcknowledgements = ({
           <RightColumn>
             <Image
               image={getImage(data.dogeComputer)!}
-              alt={translateMessageId(
-                "page-contributing-translation-program-acknowledgements-hero-image-alt",
-                intl
+              alt={t(
+                "page-contributing-translation-program-acknowledgements-hero-image-alt"
               )}
               objectFit="contain"
             />
@@ -194,13 +190,11 @@ const TranslatorAcknowledgements = ({
         </p>
         <CentralActionCard
           to="/contributing/translation-program/contributors/"
-          title={translateMessageId(
-            "page-contributing-translation-program-acknowledgements-our-translators-view-all",
-            intl
+          title={t(
+            "page-contributing-translation-program-acknowledgements-our-translators-view-all"
           )}
-          description={translateMessageId(
-            "page-contributing-translation-program-acknowledgements-our-translators-cta",
-            intl
+          description={t(
+            "page-contributing-translation-program-acknowledgements-our-translators-cta"
           )}
           image={getImage(data.ethereum)!}
         />
diff --git a/src/pages/developers/index.tsx b/src/pages/developers/index.tsx
index ffbd5facbda..c56b3948437 100644
--- a/src/pages/developers/index.tsx
+++ b/src/pages/developers/index.tsx
@@ -2,7 +2,7 @@ import React, { ReactNode } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import Card from "../../components/Card"
 import Callout from "../../components/Callout"
@@ -18,7 +18,6 @@ import {
 } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 
-import { translateMessageId } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 import { Context } from "../../types"
@@ -242,13 +241,13 @@ const paths: Array<IDevelopersPath> = [
 const DevelopersPage = ({
   data,
 }: PageProps<Queries.DevelopersIndexPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-developer-meta-title", intl)}
-        description={translateMessageId("page-developers-meta-desc", intl)}
+        title={t("page-developer-meta-title")}
+        description={t("page-developers-meta-desc")}
       />
       <Content>
         <HeroContainer>
@@ -269,7 +268,7 @@ const DevelopersPage = ({
           </HeroCopyContainer>
           <Hero
             image={getImage(data.ednHero)!}
-            alt={translateMessageId("alt-eth-blocks", intl)}
+            alt={t("alt-eth-blocks")}
             loading="eager"
           />
         </HeroContainer>
@@ -310,7 +309,7 @@ const DevelopersPage = ({
             image={getImage(data.developers)}
             titleKey="page-developers-improve-ethereum"
             descriptionKey="page-developers-improve-ethereum-desc"
-            alt={translateMessageId("alt-eth-blocks", intl)}
+            alt={t("alt-eth-blocks")}
           >
             <div>
               <ButtonLink to="https://github.com/ethereum/ethereum-org-website">
@@ -374,10 +373,7 @@ const DevelopersPage = ({
               <Translation id="page-developers-language-desc" />
             </p>
             <ImageContainer>
-              <Image
-                image={getImage(data.doge)!}
-                alt={translateMessageId("page-assets-doge", intl)}
-              />
+              <Image image={getImage(data.doge)!} alt={t("page-assets-doge")} />
             </ImageContainer>
           </Column>
           <Column>
diff --git a/src/pages/developers/learning-tools.tsx b/src/pages/developers/learning-tools.tsx
index 5df453ec317..3c13d821531 100644
--- a/src/pages/developers/learning-tools.tsx
+++ b/src/pages/developers/learning-tools.tsx
@@ -2,7 +2,7 @@
 import React, { useEffect, useState } from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { shuffle } from "lodash"
 // Component imports
 import PageMetadata from "../../components/PageMetadata"
@@ -14,7 +14,6 @@ import { Content, Page } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 import LearningToolsCardGrid from "../../components/LearningToolsCardGrid"
 // Util imports
-import { translateMessageId } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 // Type imports
 import { Context, LearningTool } from "../../types"
@@ -79,7 +78,7 @@ const StackContainer = styled(Content)`
 const LearningToolsPage = ({
   data,
 }: PageProps<Queries.DevelopersLearningToolsPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const [randomizedSandboxes, setRandomizedSandboxes] = useState<
     Array<LearningTool>
   >([])
@@ -236,8 +235,8 @@ const LearningToolsPage = ({
   return (
     <StyledPage>
       <PageMetadata
-        title={translateMessageId("page-learning-tools-meta-title", intl)}
-        description={translateMessageId("page-learning-tools-meta-desc", intl)}
+        title={t("page-learning-tools-meta-title")}
+        description={t("page-learning-tools-meta-desc")}
       />
       <Header>
         <H1>
@@ -280,7 +279,7 @@ const LearningToolsPage = ({
       <Content>
         <CalloutBanner
           image={getImage(data.learn)!}
-          alt={translateMessageId("page-index-tout-enterprise-image-alt", intl)}
+          alt={t("page-index-tout-enterprise-image-alt")}
           titleKey={"page-learning-tools-documentation"}
           descriptionKey={"page-learning-tools-documentation-desc"}
         >
diff --git a/src/pages/developers/local-environment.tsx b/src/pages/developers/local-environment.tsx
index eb33227556f..ebaf32acb06 100644
--- a/src/pages/developers/local-environment.tsx
+++ b/src/pages/developers/local-environment.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage, IGatsbyImageData } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { shuffle } from "lodash"
 
 // import ActionCard from "../../components/ActionCard"
@@ -23,7 +23,7 @@ import {
 } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 
-import { translateMessageId, TranslationKey } from "../../utils/translations"
+import { TranslationKey } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 import { Context } from "../../types"
@@ -382,7 +382,7 @@ const frameworksList: Array<IFramework> = [
 const ChooseStackPage = ({
   data,
 }: PageProps<Queries.DevelopersLocalEnvironmentPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const [frameworks, setFrameworks] = useState<Array<IFramework>>([])
 
   useEffect(() => {
@@ -399,14 +399,8 @@ const ChooseStackPage = ({
   return (
     <StyledPage>
       <PageMetadata
-        title={translateMessageId(
-          "page-local-environment-setup-meta-title",
-          intl
-        )}
-        description={translateMessageId(
-          "page-local-environment-setup-meta-desc",
-          intl
-        )}
+        title={t("page-local-environment-setup-meta-title")}
+        description={t("page-local-environment-setup-meta-desc")}
       />
       <HeroContent>
         <Slogan>
@@ -451,7 +445,7 @@ const ChooseStackPage = ({
           <Column>
             <Hero
               image={getImage(data.hero)!}
-              alt={translateMessageId("alt-eth-blocks", intl)}
+              alt={t("alt-eth-blocks")}
               loading="eager"
             />
           </Column>
@@ -466,7 +460,7 @@ const ChooseStackPage = ({
               name={framework.name}
               githubUrl={framework.githubUrl}
               repoLangCount={2}
-              alt={translateMessageId(framework.alt, intl)}
+              alt={t(framework.alt)}
             >
               <Translation id={framework.description} />
             </ProductCard>
diff --git a/src/pages/developers/tutorials.tsx b/src/pages/developers/tutorials.tsx
index aa76b64c090..8c1c09df05f 100644
--- a/src/pages/developers/tutorials.tsx
+++ b/src/pages/developers/tutorials.tsx
@@ -1,10 +1,9 @@
 import React, { useEffect, useMemo, useState } from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 
 import Translation from "../../components/Translation"
-import { translateMessageId } from "../../utils/translations"
 import Icon from "../../components/Icon"
 import ButtonLink from "../../components/ButtonLink"
 import Link from "../../components/Link"
@@ -271,7 +270,8 @@ const TutorialsPage = ({
     [filteredTutorialsByLang]
   )
 
-  const intl = useIntl()
+  const { t } = useTranslation()
+  const { language } = useI18next()
   const [isModalOpen, setModalOpen] = useState(false)
   const [filteredTutorials, setFilteredTutorials] = useState(
     filteredTutorialsByLang
@@ -306,11 +306,8 @@ const TutorialsPage = ({
   return (
     <StyledPage>
       <PageMetadata
-        title={translateMessageId("page-tutorials-meta-title", intl)}
-        description={translateMessageId(
-          "page-tutorials-meta-description",
-          intl
-        )}
+        title={t("page-tutorials-meta-title")}
+        description={t("page-tutorials-meta-description")}
       />
       <PageTitle>
         <Translation id="page-tutorial-title" />
@@ -429,7 +426,7 @@ const TutorialsPage = ({
                 {/* TODO: Refactor each tutorial tag as a component */}
                 <Emoji text=":writing_hand:" size={1} mr={`0.5em`} />
                 {tutorial.author} •
-                {published(intl.locale, tutorial.published ?? "")}
+                {published(language, tutorial.published ?? "")}
                 {tutorial.timeToRead && (
                   <>
                     {" "}
diff --git a/src/pages/get-eth.tsx b/src/pages/get-eth.tsx
index 42d261bb646..50cb67f2c16 100644
--- a/src/pages/get-eth.tsx
+++ b/src/pages/get-eth.tsx
@@ -1,10 +1,9 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
 
-import { translateMessageId, TranslationKey } from "../utils/translations"
 import Translation from "../components/Translation"
 import CardList from "../components/CardList"
 import EthExchanges from "../components/EthExchanges"
@@ -176,7 +175,7 @@ const StyledInfoBanner = styled(InfoBanner)<{
 `
 
 const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const decentralizedExchanges: Array<CardListItem> = [
     {
       title: "Localcryptos.com",
@@ -221,26 +220,17 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
 
   const safetyArticles: Array<CardListItem> = [
     {
-      title: translateMessageId(
-        "page-get-eth-article-protecting-yourself",
-        intl
-      ),
+      title: t("page-get-eth-article-protecting-yourself"),
       link: "https://support.mycrypto.com/staying-safe/protecting-yourself-and-your-funds",
       description: "MyCrypto",
     },
     {
-      title: translateMessageId(
-        "page-get-eth-article-keeping-crypto-safe",
-        intl
-      ),
-      link: "https://web.archive.org/web/20190716160333/https://blog.coinbase.com/the-keys-to-keeping-your-crypto-safe-96d497cce6cf?gi=548619266f28",
+      title: t("page-get-eth-article-keeping-crypto-safe"),
+      link: "https://blog.coinbase.com/the-keys-to-keeping-your-crypto-safe-96d497cce6cf",
       description: "Coinbase",
     },
     {
-      title: translateMessageId(
-        "page-get-eth-article-store-digital-assets",
-        intl
-      ),
+      title: t("page-get-eth-article-store-digital-assets"),
       link: "https://media.consensys.net/how-to-store-digital-assets-on-ethereum-a2bfdcf66bd0",
       description: "ConsenSys",
     },
@@ -249,14 +239,14 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-get-eth-meta-title", intl)}
-        description={translateMessageId("page-get-eth-meta-description", intl)}
+        title={t("page-get-eth-meta-title")}
+        description={t("page-get-eth-meta-description")}
       />
 
       <HeroContainer>
         <Hero
           image={getImage(data.hero)!}
-          alt={translateMessageId("page-get-eth-hero-image-alt", intl)}
+          alt={t("page-get-eth-hero-image-alt")}
           loading="eager"
         />
         <Header>
@@ -278,13 +268,13 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
       <CardContainer>
         <StyledCard
           emoji=":office_building:"
-          title={translateMessageId("page-get-eth-cex", intl)}
-          description={translateMessageId("page-get-eth-cex-desc", intl)}
+          title={t("page-get-eth-cex")}
+          description={t("page-get-eth-cex-desc")}
         />
         <StyledCard
           emoji=":busts_in_silhouette:"
-          title={translateMessageId("page-get-eth-dex", intl)}
-          description={translateMessageId("page-get-eth-dex-desc", intl)}
+          title={t("page-get-eth-dex")}
+          description={t("page-get-eth-dex-desc")}
         >
           <Link to="#dex">
             <Translation id="page-get-eth-try-dex" />
@@ -292,11 +282,8 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
         </StyledCard>
         <StyledCard
           emoji=":robot:"
-          title={translateMessageId("page-get-eth-wallets", intl)}
-          description={translateMessageId(
-            "page-get-eth-wallets-purchasing",
-            intl
-          )}
+          title={t("page-get-eth-wallets")}
+          description={t("page-get-eth-wallets-purchasing")}
         >
           <Link to="/wallets/">
             <Translation id="page-get-eth-wallets-link" />
@@ -429,10 +416,7 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
         titleKey="page-get-eth-use-your-eth"
         descriptionKey="page-get-eth-use-your-eth-dapps"
         image={getImage(data.dapps)!}
-        alt={translateMessageId(
-          "page-index-sections-individuals-image-alt" as TranslationKey,
-          intl
-        )}
+        alt={t("page-index-sections-individuals-image-alt")}
         maxImageWidth={600}
       >
         <div>
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 2232ca719bd..4b5d56f4c62 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
 import styled from "@emotion/styled"
@@ -23,7 +23,7 @@ import {
   GrayContainer,
   LeftColumn,
 } from "../components/SharedStyledComponents"
-import { translateMessageId, isLangRightToLeft } from "../utils/translations"
+import { isLangRightToLeft } from "../utils/translations"
 import { getImage } from "../utils/image"
 
 import SimpleWalletContent from "!!raw-loader!../data/SimpleWallet.sol"
@@ -414,7 +414,7 @@ const HomePage = ({
   data,
   pageContext: { language = "en" },
 }: PageProps<Queries.IndexPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const [isModalOpen, setModalOpen] = useState(false)
   const [activeCode, setActiveCode] = useState(0)
   const dir = isLangRightToLeft(language) ? "rtl" : "ltr"
@@ -429,42 +429,30 @@ const HomePage = ({
   const cards = [
     {
       image: getImage(data.robotfixed),
-      title: translateMessageId("page-index-get-started-wallet-title", intl),
-      description: translateMessageId(
-        "page-index-get-started-wallet-description",
-        intl
-      ),
-      alt: translateMessageId("page-index-get-started-wallet-image-alt", intl),
+      title: t("page-index-get-started-wallet-title"),
+      description: t("page-index-get-started-wallet-description"),
+      alt: t("page-index-get-started-wallet-image-alt"),
       to: "/wallets/find-wallet/",
     },
     {
       image: getImage(data.ethfixed),
-      title: translateMessageId("page-index-get-started-eth-title", intl),
-      description: translateMessageId(
-        "page-index-get-started-eth-description",
-        intl
-      ),
-      alt: translateMessageId("page-index-get-started-eth-image-alt", intl),
+      title: t("page-index-get-started-eth-title"),
+      description: t("page-index-get-started-eth-description"),
+      alt: t("page-index-get-started-eth-image-alt"),
       to: "/get-eth/",
     },
     {
       image: getImage(data.dogefixed),
-      title: translateMessageId("page-index-get-started-dapps-title", intl),
-      description: translateMessageId(
-        "page-index-get-started-dapps-description",
-        intl
-      ),
-      alt: translateMessageId("page-index-get-started-dapps-image-alt", intl),
+      title: t("page-index-get-started-dapps-title"),
+      description: t("page-index-get-started-dapps-description"),
+      alt: t("page-index-get-started-dapps-image-alt"),
       to: "/dapps/",
     },
     {
       image: getImage(data.devfixed),
-      title: translateMessageId("page-index-get-started-devs-title", intl),
-      description: translateMessageId(
-        "page-index-get-started-devs-description",
-        intl
-      ),
-      alt: translateMessageId("page-index-get-started-devs-image-alt", intl),
+      title: t("page-index-get-started-devs-title"),
+      description: t("page-index-get-started-devs-description"),
+      alt: t("page-index-get-started-devs-image-alt"),
       to: "/developers/",
     },
   ]
@@ -472,32 +460,23 @@ const HomePage = ({
   const touts = [
     {
       image: getImage(data.merge),
-      alt: translateMessageId("page-index-tout-upgrades-image-alt", intl),
-      title: translateMessageId("page-index-tout-upgrades-title", intl),
-      description: translateMessageId(
-        "page-index-tout-upgrades-description",
-        intl
-      ),
+      alt: t("page-index-tout-upgrades-image-alt"),
+      title: t("page-index-tout-upgrades-title"),
+      description: t("page-index-tout-upgrades-description"),
       to: "/upgrades/",
     },
     {
       image: getImage(data.infrastructurefixed),
-      alt: translateMessageId("page-index-tout-enterprise-image-alt", intl),
-      title: translateMessageId("page-index-tout-enterprise-title", intl),
-      description: translateMessageId(
-        "page-index-tout-enterprise-description",
-        intl
-      ),
+      alt: t("page-index-tout-enterprise-image-alt"),
+      title: t("page-index-tout-enterprise-title"),
+      description: t("page-index-tout-enterprise-description"),
       to: "/enterprise/",
     },
     {
       image: getImage(data.enterprise),
-      alt: translateMessageId("page-index-tout-community-image-alt", intl),
-      title: translateMessageId("page-index-tout-community-title", intl),
-      description: translateMessageId(
-        "page-index-tout-community-description",
-        intl
-      ),
+      alt: t("page-index-tout-community-image-alt"),
+      title: t("page-index-tout-community-title"),
+      description: t("page-index-tout-community-description"),
       to: "/community/",
     },
   ]
@@ -509,50 +488,26 @@ const HomePage = ({
 
   const codeExamples: Array<CodeExample> = [
     {
-      title: translateMessageId(
-        "page-index-developers-code-example-title-0",
-        intl
-      ),
-      description: translateMessageId(
-        "page-index-developers-code-example-description-0",
-        intl
-      ),
+      title: t("page-index-developers-code-example-title-0"),
+      description: t("page-index-developers-code-example-description-0"),
       codeLanguage: "language-solidity",
       code: SimpleWalletContent,
     },
     {
-      title: translateMessageId(
-        "page-index-developers-code-example-title-1",
-        intl
-      ),
-      description: translateMessageId(
-        "page-index-developers-code-example-description-1",
-        intl
-      ),
+      title: t("page-index-developers-code-example-title-1"),
+      description: t("page-index-developers-code-example-description-1"),
       codeLanguage: "language-solidity",
       code: SimpleTokenContent,
     },
     {
-      title: translateMessageId(
-        "page-index-developers-code-example-title-2",
-        intl
-      ),
-      description: translateMessageId(
-        "page-index-developers-code-example-description-2",
-        intl
-      ),
+      title: t("page-index-developers-code-example-title-2"),
+      description: t("page-index-developers-code-example-description-2"),
       codeLanguage: "language-javascript",
       code: CreateWalletContent,
     },
     {
-      title: translateMessageId(
-        "page-index-developers-code-example-title-3",
-        intl
-      ),
-      description: translateMessageId(
-        "page-index-developers-code-example-description-3",
-        intl
-      ),
+      title: t("page-index-developers-code-example-title-3"),
+      description: t("page-index-developers-code-example-description-3"),
       codeLanguage: "language-solidity",
       code: SimpleDomainRegistryContent,
     },
@@ -561,12 +516,12 @@ const HomePage = ({
   return (
     <Page dir={dir}>
       <PageMetadata
-        title={translateMessageId("page-index-meta-title", intl)}
-        description={translateMessageId("page-index-meta-description", intl)}
+        title={t("page-index-meta-title")}
+        description={t("page-index-meta-description")}
       />
       <Hero
         image={getImage(data.hero)!}
-        alt={translateMessageId("page-index-hero-image-alt", intl)}
+        alt={t("page-index-hero-image-alt")}
         loading="eager"
       />
       <Morpher />
@@ -595,10 +550,7 @@ const HomePage = ({
             <ImageContainer>
               <IntroImage
                 image={getImage(data.hackathon)!}
-                alt={translateMessageId(
-                  "page-index-get-started-image-alt",
-                  intl
-                )}
+                alt={t("page-index-get-started-image-alt")}
               />
             </ImageContainer>
           </IntroRow>
@@ -637,10 +589,7 @@ const HomePage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.ethereum)!}
-              alt={translateMessageId(
-                "page-index-what-is-ethereum-image-alt",
-                intl
-              )}
+              alt={t("page-index-what-is-ethereum-image-alt")}
             />
           </ImageContainer>
         </RowReverse>
@@ -665,7 +614,7 @@ const HomePage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.impact)!}
-              alt={translateMessageId("page-index-defi-image-alt", intl)}
+              alt={t("page-index-defi-image-alt")}
             />
           </ImageContainer>
         </Row>
@@ -675,7 +624,7 @@ const HomePage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.infrastructure)!}
-              alt={translateMessageId("page-index-nft-alt", intl)}
+              alt={t("page-index-nft-alt")}
             />
           </ImageContainer>
           <FeatureContent>
@@ -718,7 +667,7 @@ const HomePage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.future)!}
-              alt={translateMessageId("page-index-internet-image-alt", intl)}
+              alt={t("page-index-internet-image-alt")}
             />
           </ImageContainer>
         </Row>
@@ -798,10 +747,7 @@ const HomePage = ({
           descriptionKey={"page-index-contribution-banner-description"}
           image={getImage(data.finance)!}
           maxImageWidth={600}
-          alt={translateMessageId(
-            "page-index-contribution-banner-image-alt",
-            intl
-          )}
+          alt={t("page-index-contribution-banner-image-alt")}
         >
           <ButtonRow>
             <ButtonLink to="/contributing/">
diff --git a/src/pages/languages.tsx b/src/pages/languages.tsx
index 15572e2bc17..27a2ed6d4a9 100644
--- a/src/pages/languages.tsx
+++ b/src/pages/languages.tsx
@@ -1,14 +1,14 @@
 import React, { useState } from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import PageMetadata from "../components/PageMetadata"
 import Translation from "../components/Translation"
 import Link from "../components/Link"
 import { Page, Content } from "../components/SharedStyledComponents"
 
-import { Lang, Language, languageMetadata } from "../utils/languages"
-import { translateMessageId, TranslationKey } from "../utils/translations"
+import { Language, languageMetadata } from "../utils/languages"
+import { TranslationKey } from "../utils/translations"
 import { CardItem as LangItem } from "../components/SharedStyledComponents"
 import Icon from "../components/Icon"
 import NakedButton from "../components/NakedButton"
@@ -73,22 +73,19 @@ interface TranslatedLanguage extends Language {
 }
 
 const LanguagesPage = () => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const [keyword, setKeyword] = useState<string>("")
   const resetKeyword = (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault()
     setKeyword("")
   }
-  const searchString = translateMessageId(
-    "page-languages-filter-placeholder",
-    intl
-  )
+  const searchString = t("page-languages-filter-placeholder")
   let translationsCompleted: Array<TranslatedLanguage> = []
   for (const lang in languageMetadata) {
     const langMetadata = {
       ...languageMetadata[lang],
       path: "/",
-      name: translateMessageId(`language-${lang}` as TranslationKey, intl),
+      name: t(`language-${lang}` as TranslationKey),
     }
 
     const nativeLangTitle = langMetadata.localName
@@ -105,8 +102,8 @@ const LanguagesPage = () => {
   return (
     <StyledPage>
       <PageMetadata
-        title={translateMessageId("page-languages-meta-title", intl)}
-        description={translateMessageId("page-languages-meta-desc", intl)}
+        title={t("page-languages-meta-title")}
+        description={t("page-languages-meta-desc")}
       />
       <Content>
         <ContentContainer>
diff --git a/src/pages/layer-2.tsx b/src/pages/layer-2.tsx
index 55d70378f98..5a28446c159 100644
--- a/src/pages/layer-2.tsx
+++ b/src/pages/layer-2.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 
 // Data
 import layer2Data from "../data/layer-2/layer-2.json"
@@ -30,11 +30,7 @@ import { CardGrid, Content, Page } from "../components/SharedStyledComponents"
 
 // Utils
 import { getData } from "../utils/cache"
-import {
-  translateMessageId,
-  getLocaleForNumberFormat,
-  TranslationKey,
-} from "../utils/translations"
+import { getLocaleForNumberFormat, TranslationKey } from "../utils/translations"
 import { Lang } from "../utils/languages"
 import { getImage } from "../utils/image"
 
@@ -203,15 +199,14 @@ interface FeeDataResponse {
 }
 
 const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
+  const { language } = useI18next()
   const [tvl, setTVL] = useState("loading...")
   const [percentChangeL2, setL2PercentChange] = useState("loading...")
   const [averageFee, setAverageFee] = useState("loading...")
 
   useEffect(() => {
-    const localeForStatsBoxNumbers = getLocaleForNumberFormat(
-      intl.locale as Lang
-    )
+    const localeForStatsBoxNumbers = getLocaleForNumberFormat(language as Lang)
 
     const fetchL2Beat = async (): Promise<void> => {
       try {
@@ -280,26 +275,26 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
       }
     }
     fetchCryptoStats()
-  }, [intl.locale])
+  }, [language])
 
   const heroContent = {
-    title: translateMessageId("layer-2-hero-title", intl),
-    header: translateMessageId("layer-2-hero-header", intl),
-    subtitle: translateMessageId("layer-2-hero-subtitle", intl),
+    title: t("layer-2-hero-title"),
+    header: t("layer-2-hero-header"),
+    subtitle: t("layer-2-hero-subtitle"),
     image: getImage(data.heroImage)!,
-    alt: translateMessageId("layer-2-hero-alt-text", intl),
+    alt: t("layer-2-hero-alt-text"),
     buttons: [
       {
-        content: translateMessageId("layer-2-hero-button-1", intl),
+        content: t("layer-2-hero-button-1"),
         toId: "what-is-layer-2",
       },
       {
-        content: translateMessageId("layer-2-hero-button-2", intl),
+        content: t("layer-2-hero-button-2"),
         toId: "use-layer-2",
         variant: "outline",
       },
       {
-        content: translateMessageId("layer-2-hero-button-3", intl),
+        content: t("layer-2-hero-button-3"),
         toId: "how-to-get-onto-layer-2",
         variant: "outline",
       },
@@ -309,49 +304,34 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
   const layer2Cards = [
     {
       emoji: ":money_with_wings:",
-      title: translateMessageId("layer-2-lower-fees-title", intl),
-      description: translateMessageId("layer-2-lower-fees-description", intl),
+      title: t("layer-2-lower-fees-title"),
+      description: t("layer-2-lower-fees-description"),
     },
     {
       emoji: ":closed_lock_with_key:",
-      title: translateMessageId("layer-2-maintain-security-title", intl),
-      description: translateMessageId(
-        "layer-2-maintain-security-description",
-        intl
-      ),
+      title: t("layer-2-maintain-security-title"),
+      description: t("layer-2-maintain-security-description"),
     },
     {
       emoji: ":hammer_and_wrench:",
-      title: translateMessageId("layer-2-expand-use-cases-title", intl),
-      description: translateMessageId(
-        "layer-2-expand-use-cases-description",
-        intl
-      ),
+      title: t("layer-2-expand-use-cases-title"),
+      description: t("layer-2-expand-use-cases-description"),
     },
   ]
 
   const rollupCards = [
     {
       image: getImage(data.optimisticRollup),
-      title: translateMessageId("layer-2-optimistic-rollups-title", intl),
-      description: translateMessageId(
-        "layer-2-optimistic-rollups-description",
-        intl
-      ),
-      childSentence: translateMessageId(
-        "layer-2-optimistic-rollups-childSentance",
-        intl
-      ),
+      title: t("layer-2-optimistic-rollups-title"),
+      description: t("layer-2-optimistic-rollups-description"),
+      childSentence: t("layer-2-optimistic-rollups-childSentance"),
       childLink: "/developers/docs/scaling/optimistic-rollups/",
     },
     {
       image: getImage(data.zkRollup),
-      title: translateMessageId("layer-2-zk-rollups-title", intl),
-      description: translateMessageId("layer-2-zk-rollups-description", intl),
-      childSentence: translateMessageId(
-        "layer-2-zk-rollups-childSentance",
-        intl
-      ),
+      title: t("layer-2-zk-rollups-title"),
+      description: t("layer-2-zk-rollups-description"),
+      childSentence: t("layer-2-zk-rollups-childSentance"),
       childLink: "/developers/docs/scaling/zk-rollups/",
     },
   ]
@@ -360,30 +340,21 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
     information: [
       {
         title: "L2BEAT",
-        description: translateMessageId(
-          "layer-2-tools-l2beat-description",
-          intl
-        ),
+        description: t("layer-2-tools-l2beat-description"),
         link: "https://l2beat.com",
         image: getImage(data.l2beat),
         alt: "L2BEAT",
       },
       {
         title: "L2 Fees",
-        description: translateMessageId(
-          "layer-2-tools-l2fees-description",
-          intl
-        ),
+        description: t("layer-2-tools-l2fees-description"),
         link: "https://l2fees.info",
         image: getImage(data.doge),
         alt: "L2 Fees",
       },
       {
         title: "Chainlist",
-        description: translateMessageId(
-          "layer-2-tools-chainlist-description",
-          intl
-        ),
+        description: t("layer-2-tools-chainlist-description"),
         link: "https://chainlist.org",
         image: getImage(data.doge),
         alt: "Chainlist",
@@ -392,30 +363,21 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
     walletManagers: [
       {
         title: "Zapper",
-        description: translateMessageId(
-          "layer-2-tools-zapper-description",
-          intl
-        ),
+        description: t("layer-2-tools-zapper-description"),
         link: "https://zapper.fi/",
         image: getImage(data.zapper),
         alt: "Zapper",
       },
       {
         title: "Zerion",
-        description: translateMessageId(
-          "layer-2-tools-zerion-description",
-          intl
-        ),
+        description: t("layer-2-tools-zerion-description"),
         link: "https://zerion.io",
         image: getImage(data.zerion),
         alt: "Zerion",
       },
       {
         title: "DeBank",
-        description: translateMessageId(
-          "layer-2-tools-debank-description",
-          intl
-        ),
+        description: t("layer-2-tools-debank-description"),
         link: "https://debank.com",
         image: getImage(data.debank),
         alt: "DeBank",
@@ -729,12 +691,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
                   key={idx}
                   background={l2.background}
                   image={getImage(data[l2.imageKey])!}
-                  description={translateMessageId(
-                    l2.descriptionKey as TranslationKey,
-                    intl
-                  )}
+                  description={t(l2.descriptionKey as TranslationKey)}
                   url={l2.website}
-                  note={translateMessageId(l2.noteKey as TranslationKey, intl)}
+                  note={t(l2.noteKey as TranslationKey)}
                   name={l2.name}
                   bridge={l2.bridge}
                   ecosystemPortal={l2.ecosystemPortal}
@@ -761,12 +720,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
                   key={idx}
                   background={l2.background}
                   image={getImage(data[l2.imageKey])!}
-                  description={translateMessageId(
-                    l2.descriptionKey as TranslationKey,
-                    intl
-                  )}
+                  description={t(l2.descriptionKey as TranslationKey)}
                   url={l2.website}
-                  note={translateMessageId(l2.noteKey as TranslationKey, intl)}
+                  note={t(l2.noteKey as TranslationKey)}
                   name={l2.name}
                   bridge={l2.bridge}
                   ecosystemPortal={l2.ecosystemPortal}
@@ -819,7 +775,7 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
         <Layer2Onboard
           layer2DataCombined={layer2DataCombined}
           ethIcon={getImage(data.ethHome)!}
-          ethIconAlt={translateMessageId("ethereum-logo", intl)}
+          ethIconAlt={t("ethereum-logo")}
         />
       </PaddedContent>
 
@@ -847,16 +803,12 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
         <h2>
           <Translation id="layer-2-faq-title" />
         </h2>
-        <ExpandableCard
-          title={`${translateMessageId("layer-2-faq-question-1-title", intl)}`}
-        >
+        <ExpandableCard title={`${t("layer-2-faq-question-1-title")}`}>
           <p>
             <Translation id="layer-2-faq-question-1-description-1" />
           </p>
         </ExpandableCard>
-        <ExpandableCard
-          title={`${translateMessageId("layer-2-faq-question-2-title", intl)}`}
-        >
+        <ExpandableCard title={`${t("layer-2-faq-question-2-title")}`}>
           <p>
             <Translation id="layer-2-faq-question-2-description-1" />
           </p>
@@ -877,9 +829,7 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             </Link>
           </p>
         </ExpandableCard>
-        <ExpandableCard
-          title={`${translateMessageId("layer-2-faq-question-3-title", intl)}`}
-        >
+        <ExpandableCard title={`${t("layer-2-faq-question-3-title")}`}>
           <p>
             <Translation id="layer-2-faq-question-3-description-1" />{" "}
           </p>
@@ -889,9 +839,7 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             </Link>
           </p>
         </ExpandableCard>
-        <ExpandableCard
-          title={`${translateMessageId("layer-2-faq-question-4-title", intl)}`}
-        >
+        <ExpandableCard title={`${t("layer-2-faq-question-4-title")}`}>
           <p>
             <Translation id="layer-2-faq-question-4-description-1" />
           </p>
@@ -907,9 +855,7 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             </Link>
           </p>
         </ExpandableCard>
-        <ExpandableCard
-          title={`${translateMessageId("layer-2-faq-question-5-title", intl)}`}
-        >
+        <ExpandableCard title={`${t("layer-2-faq-question-5-title")}`}>
           <p>
             <Translation id="layer-2-faq-question-5-description-1" />{" "}
             <Link to="/contributing/adding-layer-2s/">
diff --git a/src/pages/learn/index.tsx b/src/pages/learn/index.tsx
index 30d8fe924e3..09f9e61ee65 100644
--- a/src/pages/learn/index.tsx
+++ b/src/pages/learn/index.tsx
@@ -3,7 +3,7 @@ import React from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
 
 // Components
 import { CardGrid as OriginalCardGrid } from "../../components/SharedStyledComponents"
@@ -19,7 +19,7 @@ import Translation from "../../components/Translation"
 
 // Utils
 import { Lang } from "../../utils/languages"
-import { translateMessageId, isLangRightToLeft } from "../../utils/translations"
+import { isLangRightToLeft } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 // Types
@@ -190,49 +190,50 @@ const CardGrid = styled(OriginalCardGrid)`
 `
 
 const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
-  const intl = useIntl()
-  const isRightToLeft = isLangRightToLeft(intl.locale as Lang)
+  const { t } = useTranslation()
+  const { language } = useI18next()
+  const isRightToLeft = isLangRightToLeft(language as Lang)
 
   const tocItems = [
     {
       id: "what-is-crypto-ethereum",
-      title: translateMessageId("toc-what-is-crypto-ethereum", intl),
+      title: t("toc-what-is-crypto-ethereum"),
     },
     {
       id: "how-do-i-use-ethereum",
-      title: translateMessageId("toc-how-do-i-use-ethereum", intl),
+      title: t("toc-how-do-i-use-ethereum"),
     },
     {
       id: "what-is-ethereum-used-for",
-      title: translateMessageId("toc-what-is-ethereum-used-for", intl),
+      title: t("toc-what-is-ethereum-used-for"),
     },
     {
       id: "strengthen-the-ethereum-network",
-      title: translateMessageId("toc-strengthen-the-ethereum-network", intl),
+      title: t("toc-strengthen-the-ethereum-network"),
     },
     {
       id: "learn-about-the-ethereum-protocol",
-      title: translateMessageId("toc-learn-about-the-ethereum-protocol", intl),
+      title: t("toc-learn-about-the-ethereum-protocol"),
     },
     {
       id: "learn-about-the-ethereum-community",
-      title: translateMessageId("toc-learn-about-the-ethereum-community", intl),
+      title: t("toc-learn-about-the-ethereum-community"),
     },
     {
       id: "books-and-podcasts",
-      title: translateMessageId("toc-books-and-podcasts", intl),
+      title: t("toc-books-and-podcasts"),
     },
   ]
 
   const heroContent = {
-    title: translateMessageId("hero-title", intl),
-    header: translateMessageId("hero-header", intl),
-    subtitle: translateMessageId("hero-subtitle", intl),
+    title: t("hero-title"),
+    header: t("hero-header"),
+    subtitle: t("hero-subtitle"),
     image: getImage(data.heroImage)!,
     alt: "",
     buttons: [
       {
-        content: translateMessageId("hero-button-lets-get-started", intl),
+        content: t("hero-button-lets-get-started"),
         toId: tocItems[0].id,
       },
     ],
@@ -240,10 +241,7 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
 
   return (
     <Container>
-      <PageMetadata
-        title={translateMessageId("hero-title", intl)}
-        description={""}
-      />
+      <PageMetadata title={t("hero-title")} description={""} />
 
       <HeroBackground>
         <HeroContainer>
@@ -273,20 +271,14 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={translateMessageId("what-is-ethereum-card-title", intl)}
-                description={translateMessageId(
-                  "what-is-ethereum-card-description",
-                  intl
-                )}
+                title={t("what-is-ethereum-card-title")}
+                description={t("what-is-ethereum-card-description")}
               >
                 <>
                   <CardImage>
                     <GatsbyImage
                       image={getImage(data.whatIsEth)!}
-                      alt={translateMessageId(
-                        "what-is-ethereum-card-image-alt",
-                        intl
-                      )}
+                      alt={t("what-is-ethereum-card-image-alt")}
                     />
                   </CardImage>
                   <ButtonLink to="/what-is-ethereum/">
@@ -295,11 +287,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("what-is-eth-card-title", intl)}
-                description={translateMessageId(
-                  "what-is-eth-description",
-                  intl
-                )}
+                title={t("what-is-eth-card-title")}
+                description={t("what-is-eth-description")}
               >
                 <>
                   <CardImage>
@@ -311,14 +300,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId(
-                  "where-can-i-get-eth-card-title",
-                  intl
-                )}
-                description={translateMessageId(
-                  "where-can-i-get-eth-card-description",
-                  intl
-                )}
+                title={t("where-can-i-get-eth-card-title")}
+                description={t("where-can-i-get-eth-card-description")}
               >
                 <>
                   <CardImage>
@@ -360,20 +343,14 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={translateMessageId("what-is-a-wallet-card-title", intl)}
-                description={translateMessageId(
-                  "what-is-a-wallet-card-description",
-                  intl
-                )}
+                title={t("what-is-a-wallet-card-title")}
+                description={t("what-is-a-wallet-card-description")}
               >
                 <>
                   <CardImage>
                     <GatsbyImage
                       image={getImage(data.wallet)!}
-                      alt={translateMessageId(
-                        "what-is-a-wallet-card-alt",
-                        intl
-                      )}
+                      alt={t("what-is-a-wallet-card-alt")}
                     />
                   </CardImage>
                   <ButtonLink to="/wallets/">
@@ -382,11 +359,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("find-a-wallet-card-title", intl)}
-                description={translateMessageId(
-                  "find-a-wallet-card-description",
-                  intl
-                )}
+                title={t("find-a-wallet-card-title")}
+                description={t("find-a-wallet-card-description")}
               >
                 <>
                   <CardImage>
@@ -401,14 +375,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId(
-                  "crypto-security-basics-card-title",
-                  intl
-                )}
-                description={translateMessageId(
-                  "crypto-security-basics-card-description",
-                  intl
-                )}
+                title={t("crypto-security-basics-card-title")}
+                description={t("crypto-security-basics-card-description")}
               >
                 <>
                   <CardImage>
@@ -464,8 +432,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={translateMessageId("defi-card-title", intl)}
-                description={translateMessageId("defi-card-description", intl)}
+                title={t("defi-card-title")}
+                description={t("defi-card-description")}
               >
                 <>
                   <CardImage>
@@ -480,11 +448,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("stablecoins-card-title", intl)}
-                description={translateMessageId(
-                  "stablecoins-card-description",
-                  intl
-                )}
+                title={t("stablecoins-card-title")}
+                description={t("stablecoins-card-description")}
               >
                 <>
                   <CardImage>
@@ -496,8 +461,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("nft-card-title", intl)}
-                description={translateMessageId("nft-card-description", intl)}
+                title={t("nft-card-title")}
+                description={t("nft-card-description")}
               >
                 <>
                   <CardImage>
@@ -512,8 +477,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("dao-card-title", intl)}
-                description={translateMessageId("dao-card-description", intl)}
+                title={t("dao-card-title")}
+                description={t("dao-card-description")}
               >
                 <>
                   <CardImage>
@@ -525,8 +490,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("dapp-card-title", intl)}
-                description={translateMessageId("dapp-card-description", intl)}
+                title={t("dapp-card-title")}
+                description={t("dapp-card-description")}
               >
                 <>
                   <CardImage>
@@ -541,11 +506,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <CardGradient
-                title={translateMessageId("emerging-use-cases-title", intl)}
-                description={translateMessageId(
-                  "emerging-use-cases-description",
-                  intl
-                )}
+                title={t("emerging-use-cases-title")}
+                description={t("emerging-use-cases-description")}
               >
                 <ul>
                   <li>
@@ -602,11 +564,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={translateMessageId("staking-ethereum-card-title", intl)}
-                description={translateMessageId(
-                  "staking-ethereum-card-description",
-                  intl
-                )}
+                title={t("staking-ethereum-card-title")}
+                description={t("staking-ethereum-card-description")}
               >
                 <>
                   <CardImage>
@@ -618,11 +577,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("run-a-node-card-title", intl)}
-                description={translateMessageId(
-                  "run-a-node-card-description",
-                  intl
-                )}
+                title={t("run-a-node-card-title")}
+                description={t("run-a-node-card-description")}
               >
                 <>
                   <CardImage>
@@ -646,14 +602,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={translateMessageId(
-                  "energy-consumption-card-title",
-                  intl
-                )}
-                description={translateMessageId(
-                  "energy-consumption-card-description",
-                  intl
-                )}
+                title={t("energy-consumption-card-title")}
+                description={t("energy-consumption-card-description")}
               >
                 <>
                   <CardImage>
@@ -665,11 +615,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("ethereum-upgrades-card-title", intl)}
-                description={translateMessageId(
-                  "ethereum-upgrades-card-description",
-                  intl
-                )}
+                title={t("ethereum-upgrades-card-title")}
+                description={t("ethereum-upgrades-card-description")}
               >
                 <>
                   <CardImage>
@@ -681,14 +628,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId(
-                  "ethereum-whitepaper-card-title",
-                  intl
-                )}
-                description={translateMessageId(
-                  "ethereum-whitepaper-card-description",
-                  intl
-                )}
+                title={t("ethereum-whitepaper-card-title")}
+                description={t("ethereum-whitepaper-card-description")}
               >
                 <>
                   <CardImage>
@@ -736,17 +677,14 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={translateMessageId("community-hub-card-title", intl)}
-                description={translateMessageId(
-                  "community-hub-card-description",
-                  intl
-                )}
+                title={t("community-hub-card-title")}
+                description={t("community-hub-card-description")}
               >
                 <>
                   <CardImage>
                     <GatsbyImage
                       image={getImage(data.enterprise)!}
-                      alt={translateMessageId("community-hub-card-alt", intl)}
+                      alt={t("community-hub-card-alt")}
                     />
                   </CardImage>
                   <ButtonLink to="/community/">
@@ -755,11 +693,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId("get-involved-card-title", intl)}
-                description={translateMessageId(
-                  "get-involved-card-description",
-                  intl
-                )}
+                title={t("get-involved-card-title")}
+                description={t("get-involved-card-description")}
               >
                 <>
                   <CardImage>
@@ -771,14 +706,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={translateMessageId(
-                  "online-communities-card-title",
-                  intl
-                )}
-                description={translateMessageId(
-                  "online-communities-card-description",
-                  intl
-                )}
+                title={t("online-communities-card-title")}
+                description={t("online-communities-card-description")}
               >
                 <>
                   <CardImage>
diff --git a/src/pages/run-a-node.tsx b/src/pages/run-a-node.tsx
index 232edd5dfd2..d15ffb4ef3f 100644
--- a/src/pages/run-a-node.tsx
+++ b/src/pages/run-a-node.tsx
@@ -2,7 +2,7 @@
 import React, { ComponentType, SVGProps } from "react"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 
 // Assets
@@ -40,7 +40,7 @@ import Icon from "../components/Icon"
 import NakedButton from "../components/NakedButton"
 
 // Utils
-import { translateMessageId, TranslationKey } from "../utils/translations"
+import { TranslationKey } from "../utils/translations"
 import { scrollIntoView } from "../utils/scrollIntoView"
 import { getImage } from "../utils/image"
 
@@ -404,13 +404,13 @@ interface RunANodeCard {
 }
 
 const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const heroContent = {
     title: <Translation id="page-run-a-node-title" />,
     header: <Translation id="page-run-a-node-hero-header" />,
     subtitle: <Translation id="page-run-a-node-hero-subtitle" />,
     image: getImage(data.ethereumInside)!,
-    alt: translateMessageId("page-run-a-node-hero-alt", intl),
+    alt: t("page-run-a-node-hero-alt"),
     buttons: [
       {
         content: <Translation id="page-run-a-node-hero-cta-1" />,
@@ -485,11 +485,8 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
   return (
     <GappedPage>
       <PageMetadata
-        title={translateMessageId("page-run-a-node-title", intl)}
-        description={translateMessageId(
-          "page-run-a-node-meta-description",
-          intl
-        )}
+        title={t("page-run-a-node-title")}
+        description={t("page-run-a-node-meta-description")}
       />
       <HeroContainer>
         <Hero content={heroContent} isReverse />
@@ -561,10 +558,10 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
             return (
               <ExpandableCard
                 contentPreview={<Translation id={preview} />}
-                title={translateMessageId(title, intl)}
+                title={t(title)}
                 // TODO: make a11y svgs (using <title>)
                 // @ts-ignore
-                alt={translateMessageId(alt, intl)}
+                alt={t(alt)}
                 svg={image}
                 key={idx}
               >
@@ -603,10 +600,7 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
               <Terminal
                 // TODO: make a11y svgs (using <title>)
                 // @ts-ignore
-                alt={translateMessageId(
-                  "page-run-a-node-glyph-alt-terminal",
-                  intl
-                )}
+                alt={t("page-run-a-node-glyph-alt-terminal")}
               />
             </ColumnNarrow>
           </SoftwareHighlight>
@@ -621,10 +615,7 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
               <Dappnode
                 // TODO: make a11y svgs (using <title>)
                 // @ts-ignore
-                alt={translateMessageId(
-                  "page-run-a-node-glyph-alt-dappnode",
-                  intl
-                )}
+                alt={t("page-run-a-node-glyph-alt-dappnode")}
               />
             </ColumnNarrow>
           </SoftwareHighlight>
@@ -642,10 +633,7 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
               <Dapptap
                 // TODO: make a11y svgs (using <title>)
                 // @ts-ignore
-                alt={translateMessageId(
-                  "page-run-a-node-glyph-alt-phone",
-                  intl
-                )}
+                alt={t("page-run-a-node-glyph-alt-phone")}
               />
             </ColumnNarrow>
           </SoftwareHighlight>
@@ -736,10 +724,7 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
             <HardwareGlyph
               // TODO: make a11y svgs (using <title>)
               // @ts-ignore
-              alt={translateMessageId(
-                "page-run-a-node-glyph-alt-hardware",
-                intl
-              )}
+              alt={t("page-run-a-node-glyph-alt-hardware")}
             />
             <h3>
               <Translation id="page-run-a-node-build-your-own-hardware-title" />
@@ -823,10 +808,7 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
             <DownloadGlyph
               // TODO: make a11y svgs (using <title>)
               // @ts-ignore
-              alt={translateMessageId(
-                "page-run-a-node-glyph-alt-software",
-                intl
-              )}
+              alt={t("page-run-a-node-glyph-alt-software")}
             />
             <h3>
               <Translation id="page-run-a-node-build-your-own-software" />
diff --git a/src/pages/stablecoins.tsx b/src/pages/stablecoins.tsx
index bec854dc489..df037b3cc2a 100644
--- a/src/pages/stablecoins.tsx
+++ b/src/pages/stablecoins.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState, useMemo } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import ButtonLink from "../components/ButtonLink"
 import CalloutBanner from "../components/CalloutBanner"
@@ -31,7 +31,6 @@ import Tooltip from "../components/Tooltip"
 import Translation from "../components/Translation"
 
 import { getData } from "../utils/cache"
-import { translateMessageId } from "../utils/translations"
 import { getImage } from "../utils/image"
 
 const StyledContent = styled(Content)`
@@ -311,22 +310,15 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
     markets: [],
     marketsHasError: false,
   })
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   // Stablecoin types
-  const FIAT = translateMessageId(
-    "page-stablecoins-stablecoins-table-type-fiat-backed",
-    intl
+  const FIAT = t("page-stablecoins-stablecoins-table-type-fiat-backed")
+  const CRYPTO = t("page-stablecoins-stablecoins-table-type-crypto-backed")
+  const ASSET = t(
+    "page-stablecoins-stablecoins-table-type-precious-metals-backed"
   )
-  const CRYPTO = translateMessageId(
-    "page-stablecoins-stablecoins-table-type-crypto-backed",
-    intl
-  )
-  const ASSET = translateMessageId(
-    "page-stablecoins-stablecoins-table-type-precious-metals-backed",
-    intl
-  )
-  const ALGORITHMIC = translateMessageId("page-stablecoins-algorithmic", intl)
+  const ALGORITHMIC = t("page-stablecoins-algorithmic")
 
   const stablecoins = useMemo(
     () => ({
@@ -411,19 +403,16 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
 
   const features = [
     {
-      title: translateMessageId("page-stablecoins-fiat-backed", intl),
-      description: translateMessageId(
-        "page-stablecoins-fiat-backed-description",
-        intl
-      ),
+      title: t("page-stablecoins-fiat-backed"),
+      description: t("page-stablecoins-fiat-backed-description"),
       emoji: ":dollar:",
       pros: [
-        translateMessageId("page-stablecoins-fiat-backed-pro-1", intl),
-        translateMessageId("page-stablecoins-fiat-backed-pro-2", intl),
+        t("page-stablecoins-fiat-backed-pro-1"),
+        t("page-stablecoins-fiat-backed-pro-2"),
       ],
       cons: [
-        translateMessageId("page-stablecoins-fiat-backed-con-1", intl),
-        translateMessageId("page-stablecoins-fiat-backed-con-2", intl),
+        t("page-stablecoins-fiat-backed-con-1"),
+        t("page-stablecoins-fiat-backed-con-2"),
       ],
       links: [
         { text: "USDC", url: "https://www.coinbase.com/usdc" },
@@ -431,53 +420,42 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
       ],
     },
     {
-      title: translateMessageId("page-stablecoins-crypto-backed", intl),
-      description: translateMessageId(
-        "page-stablecoins-crypto-backed-description",
-        intl
-      ),
+      title: t("page-stablecoins-crypto-backed"),
+      description: t("page-stablecoins-crypto-backed-description"),
       emoji: ":unicorn:",
       pros: [
-        translateMessageId("page-stablecoins-crypto-backed-pro-1", intl),
-        translateMessageId("page-stablecoins-crypto-backed-pro-2", intl),
-        translateMessageId("page-stablecoins-crypto-backed-pro-3", intl),
+        t("page-stablecoins-crypto-backed-pro-1"),
+        t("page-stablecoins-crypto-backed-pro-2"),
+        t("page-stablecoins-crypto-backed-pro-3"),
       ],
       cons: [
-        translateMessageId("page-stablecoins-crypto-backed-con-1", intl),
-        translateMessageId("page-stablecoins-crypto-backed-con-2", intl),
+        t("page-stablecoins-crypto-backed-con-1"),
+        t("page-stablecoins-crypto-backed-con-2"),
       ],
       links: [{ text: "Dai", url: "https://makerdao.com/en/" }],
     },
     {
-      title: translateMessageId("page-stablecoins-precious-metals", intl),
-      description: translateMessageId(
-        "page-stablecoins-precious-metals-description",
-        intl
-      ),
+      title: t("page-stablecoins-precious-metals"),
+      description: t("page-stablecoins-precious-metals-description"),
       emoji: ":gem_stone:",
-      pros: [
-        translateMessageId("page-stablecoins-precious-metals-pro-1", intl),
-      ],
+      pros: [t("page-stablecoins-precious-metals-pro-1")],
       cons: [
-        translateMessageId("page-stablecoins-precious-metals-con-1", intl),
-        translateMessageId("page-stablecoins-precious-metals-con-2", intl),
+        t("page-stablecoins-precious-metals-con-1"),
+        t("page-stablecoins-precious-metals-con-2"),
       ],
       links: [{ text: "Pax Gold", url: "https://paxos.com/paxgold/" }],
     },
     {
-      title: translateMessageId("page-stablecoins-algorithmic", intl),
-      description: translateMessageId(
-        "page-stablecoins-algorithmic-description",
-        intl
-      ),
+      title: t("page-stablecoins-algorithmic"),
+      description: t("page-stablecoins-algorithmic-description"),
       emoji: ":chart_with_downwards_trend:",
       pros: [
-        translateMessageId("page-stablecoins-algorithmic-pro-1", intl),
-        translateMessageId("page-stablecoins-algorithmic-pro-2", intl),
+        t("page-stablecoins-algorithmic-pro-1"),
+        t("page-stablecoins-algorithmic-pro-2"),
       ],
       cons: [
-        translateMessageId("page-stablecoins-algorithmic-con-1", intl),
-        translateMessageId("page-stablecoins-algorithmic-con-2", intl),
+        t("page-stablecoins-algorithmic-con-1"),
+        t("page-stablecoins-algorithmic-con-2"),
       ],
       links: [{ text: "Ampleforth", url: "https://www.ampleforth.org/" }],
     },
@@ -486,31 +464,19 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
   const tokens = [
     {
       emoji: ":globe_showing_americas:",
-      description: translateMessageId(
-        "page-stablecoins-stablecoins-feature-1",
-        intl
-      ),
+      description: t("page-stablecoins-stablecoins-feature-1"),
     },
     {
       emoji: ":chart_with_upwards_trend:",
-      description: translateMessageId(
-        "page-stablecoins-stablecoins-feature-2",
-        intl
-      ),
+      description: t("page-stablecoins-stablecoins-feature-2"),
     },
     {
       emoji: ":handshake:",
-      description: translateMessageId(
-        "page-stablecoins-stablecoins-feature-3",
-        intl
-      ),
+      description: t("page-stablecoins-stablecoins-feature-3"),
     },
     {
       emoji: ":key:",
-      description: translateMessageId(
-        "page-stablecoins-stablecoins-feature-4",
-        intl
-      ),
+      description: t("page-stablecoins-stablecoins-feature-4"),
     },
   ]
 
@@ -518,69 +484,48 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
     {
       background: "linear-gradient(225deg, #aa589b 0%, #5cb8c4 100%)",
       url: "https://aave.com",
-      alt: translateMessageId("aave-logo", intl),
+      alt: t("aave-logo"),
       image: getImage(data.aave),
       name: "Aave",
-      description: translateMessageId(
-        "page-stablecoins-stablecoins-dapp-description-1",
-        intl
-      ),
+      description: t("page-stablecoins-stablecoins-dapp-description-1"),
     },
     {
       background: "#f9fafb",
       url: "https://compound.finance",
-      alt: translateMessageId("compound-logo", intl),
+      alt: t("compound-logo"),
       image: getImage(data.compound),
       name: "Compound",
-      description: translateMessageId(
-        "page-stablecoins-stablecoins-dapp-description-2",
-        intl
-      ),
+      description: t("page-stablecoins-stablecoins-dapp-description-2"),
     },
     {
       background: "linear-gradient(135deg, #c7efe6 0%, #eeeac7 100%)",
       url: "https://oasis.app",
-      alt: translateMessageId("oasis-logo", intl),
+      alt: t("oasis-logo"),
       image: getImage(data.oasis),
       name: "Oasis",
-      description: translateMessageId(
-        "page-stablecoins-stablecoins-dapp-description-4",
-        intl
-      ),
+      description: t("page-stablecoins-stablecoins-dapp-description-4"),
     },
   ]
 
   const tableColumns = [
-    translateMessageId(
-      "page-stablecoins-stablecoins-table-header-column-1",
-      intl
-    ),
-    translateMessageId(
-      "page-stablecoins-stablecoins-table-header-column-2",
-      intl
-    ),
-    translateMessageId(
-      "page-stablecoins-stablecoins-table-header-column-3",
-      intl
-    ),
+    t("page-stablecoins-stablecoins-table-header-column-1"),
+    t("page-stablecoins-stablecoins-table-header-column-2"),
+    t("page-stablecoins-stablecoins-table-header-column-3"),
   ]
 
   const heroContent = {
-    title: translateMessageId("page-stablecoins-title", intl),
-    header: translateMessageId("page-stablecoins-hero-header", intl),
-    subtitle: translateMessageId("page-stablecoins-hero-subtitle", intl),
+    title: t("page-stablecoins-title"),
+    header: t("page-stablecoins-hero-header"),
+    subtitle: t("page-stablecoins-hero-subtitle"),
     image: getImage(data.stablecoins)!,
-    alt: translateMessageId("page-stablecoins-hero-alt", intl),
+    alt: t("page-stablecoins-hero-alt"),
     buttons: [
       {
-        content: translateMessageId("page-stablecoins-hero-button", intl),
+        content: t("page-stablecoins-hero-button"),
         toId: "explore",
       },
       {
-        content: translateMessageId(
-          "page-stablecoins-how-they-work-button",
-          intl
-        ),
+        content: t("page-stablecoins-how-they-work-button"),
         toId: "how",
         variant: "outline",
       },
@@ -590,10 +535,7 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
   const toolsData = [
     {
       title: "Stablecoins.wtf",
-      description: translateMessageId(
-        "page-stablecoins-tools-stablecoinswtf-description",
-        intl
-      ),
+      description: t("page-stablecoins-tools-stablecoinswtf-description"),
       link: "https://stablecoins.wtf",
       image: getImage(data.stablecoinswtf),
       alt: "Stablecoins.wtf",
@@ -603,11 +545,8 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-stablecoins-title", intl)}
-        description={translateMessageId(
-          "page-stablecoins-meta-description",
-          intl
-        )}
+        title={t("page-stablecoins-title")}
+        description={t("page-stablecoins-meta-description")}
       />
       <PageHero isReverse content={heroContent} />
       {/* <HeroSectionContent>
@@ -724,7 +663,7 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
               </StyledLeftColumn>
               <Image
                 image={getImage(data.dailarge)!}
-                alt={translateMessageId("page-stablecoins-dai-logo", intl)}
+                alt={t("page-stablecoins-dai-logo")}
               />
             </StyledDaiBanner>
             <USDCBanner>
@@ -759,7 +698,7 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
               </StyledLeftColumn>
               <Image
                 image={getImage(data.usdclarge)!}
-                alt={translateMessageId("page-stablecoins-usdc-logo", intl)}
+                alt={t("page-stablecoins-usdc-logo")}
               />
             </USDCBanner>
           </Row>
@@ -799,10 +738,7 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
           }
           image={getImage(data.doge)!}
           maxImageWidth={600}
-          alt={translateMessageId(
-            "page-stablecoins-stablecoins-dapp-callout-image-alt",
-            intl
-          )}
+          alt={t("page-stablecoins-stablecoins-dapp-callout-image-alt")}
         >
           <ButtonLinkContainer>
             <ButtonLink to="/dapps/">
diff --git a/src/pages/staking/deposit-contract.tsx b/src/pages/staking/deposit-contract.tsx
index fbe2060aea1..135ce916808 100644
--- a/src/pages/staking/deposit-contract.tsx
+++ b/src/pages/staking/deposit-contract.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
 import makeBlockie from "ethereum-blockies-base64"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import Breadcrumbs from "../../components/Breadcrumbs"
 import ButtonLink from "../../components/ButtonLink"
@@ -21,7 +21,7 @@ import {
   FakeLink,
 } from "../../components/SharedStyledComponents"
 import { DEPOSIT_CONTRACT_ADDRESS } from "../../data/addresses"
-import { translateMessageId, TranslationKey } from "../../utils/translations"
+import { TranslationKey } from "../../utils/translations"
 import type { Context } from "../../types"
 import FeedbackCard from "../../components/FeedbackCard"
 import { getImage } from "../../utils/image"
@@ -191,7 +191,7 @@ const DepositContractPage = ({
   data,
   location,
 }: PageProps<Queries.DepositContractPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const [state, setState] = useState<{
     browserHasTextToSpeechSupport: boolean
@@ -301,8 +301,8 @@ const DepositContractPage = ({
     state.userWillCheckOtherSources
 
   const textToSpeechText = state.isSpeechActive
-    ? translateMessageId("page-staking-deposit-contract-stop-reading", intl)
-    : translateMessageId("page-staking-deposit-contract-read-aloud", intl)
+    ? t("page-staking-deposit-contract-stop-reading")
+    : t("page-staking-deposit-contract-read-aloud")
   const textToSpeechEmoji = state.isSpeechActive
     ? ":speaker_high_volume:"
     : ":speaker:"
@@ -310,14 +310,8 @@ const DepositContractPage = ({
     <Page>
       <Flex>
         <PageMetadata
-          title={translateMessageId(
-            "page-staking-deposit-contract-meta-title",
-            intl
-          )}
-          description={translateMessageId(
-            "page-staking-deposit-contract-meta-desc",
-            intl
-          )}
+          title={t("page-staking-deposit-contract-meta-title")}
+          description={t("page-staking-deposit-contract-meta-desc")}
         />
         <LeftColumn>
           <Breadcrumbs slug={location.pathname} startDepth={1} />
@@ -444,12 +438,7 @@ const DepositContractPage = ({
                       <Emoji text={textToSpeechEmoji} size={1} />
                     </TextToSpeech>
                   )}
-                  <Tooltip
-                    content={translateMessageId(
-                      "page-staking-deposit-contract-warning",
-                      intl
-                    )}
-                  >
+                  <Tooltip content={t("page-staking-deposit-contract-warning")}>
                     <Address>{CHUNKED_ADDRESS}</Address>
                   </Tooltip>
                   <ButtonRow>
diff --git a/src/pages/staking/index.tsx b/src/pages/staking/index.tsx
index 40c09ca7769..36dbf890aaa 100644
--- a/src/pages/staking/index.tsx
+++ b/src/pages/staking/index.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 
 import ButtonDropdown, {
@@ -24,7 +24,7 @@ import StakingHierarchy from "../../components/Staking/StakingHierarchy"
 import StakingHomeTableOfContents from "../../components/Staking/StakingHomeTableOfContents"
 import StakingCommunityCallout from "../../components/Staking/StakingCommunityCallout"
 
-import { translateMessageId, TranslationKey } from "../../utils/translations"
+import { TranslationKey } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 import type { Context } from "../../types"
 
@@ -249,14 +249,14 @@ const benefits: Array<BenefitsType> = [
 const StakingPage = ({
   data,
 }: PageProps<Queries.StakingPageIndexQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const heroContent = {
-    title: translateMessageId("page-staking-hero-title", intl),
-    header: translateMessageId("page-staking-hero-header", intl),
-    subtitle: translateMessageId("page-staking-hero-subtitle", intl),
+    title: t("page-staking-hero-title"),
+    header: t("page-staking-hero-header"),
+    subtitle: t("page-staking-hero-subtitle"),
     image: getImage(data.rhino)!,
-    alt: translateMessageId("page-staking-image-alt", intl),
+    alt: t("page-staking-image-alt"),
     buttons: [],
   }
 
@@ -303,35 +303,35 @@ const StakingPage = ({
     ],
   }
 
-  // TODO: use translateMessageId() for these strings
+  // TODO: use t() for these strings
   const tocItems = {
     whatIsStaking: {
       id: "what-is-staking",
-      title: translateMessageId("page-staking-section-what-title", intl),
+      title: t("page-staking-section-what-title"),
     },
     whyStakeYourEth: {
       id: "why-stake-your-eth",
-      title: translateMessageId("page-staking-section-why-title", intl),
+      title: t("page-staking-section-why-title"),
     },
     howToStakeYourEth: {
       id: "how-to-stake-your-eth",
-      title: translateMessageId("page-staking-toc-how-to-stake-your-eth", intl),
+      title: t("page-staking-toc-how-to-stake-your-eth"),
     },
     comparisonOfOptions: {
       id: "comparison-of-options",
-      title: translateMessageId("page-staking-toc-comparison-of-options", intl),
+      title: t("page-staking-toc-comparison-of-options"),
     },
     joinTheCommunity: {
       id: "join-the-community",
-      title: translateMessageId("page-staking-join-community", intl),
+      title: t("page-staking-join-community"),
     },
     faq: {
       id: "faq",
-      title: translateMessageId("page-staking-toc-faq", intl),
+      title: t("page-staking-toc-faq"),
     },
     further: {
       id: "further",
-      title: translateMessageId("page-staking-toc-further", intl),
+      title: t("page-staking-toc-further"),
     },
   }
 
@@ -340,8 +340,8 @@ const StakingPage = ({
   return (
     <PageContainer>
       <PageMetadata
-        title={translateMessageId("page-staking-meta-title", intl)}
-        description={translateMessageId("page-staking-meta-description", intl)}
+        title={t("page-staking-meta-title")}
+        description={t("page-staking-meta-description")}
       />
       <HeroStatsWrapper>
         <PageHero content={heroContent} />
@@ -377,14 +377,12 @@ const StakingPage = ({
               {benefits.map(
                 ({ title, description, emoji, linkText, to }, idx) => (
                   <StyledCard
-                    title={translateMessageId(title, intl)}
+                    title={t(title)}
                     emoji={emoji}
                     key={idx}
-                    description={translateMessageId(description, intl)}
+                    description={t(description)}
                   >
-                    {to && linkText && (
-                      <Link to={to}>{translateMessageId(linkText, intl)}</Link>
-                    )}
+                    {to && linkText && <Link to={to}>{t(linkText)}</Link>}
                   </StyledCard>
                 )
               )}
@@ -609,9 +607,7 @@ const StakingPage = ({
           <StakingCommunityCallout id={tocItems.joinTheCommunity.id} />
           <Content>
             <h2 id={tocItems.faq.id}>{tocItems.faq.title}</h2>
-            <ExpandableCard
-              title={translateMessageId("page-staking-faq-4-question", intl)}
-            >
+            <ExpandableCard title={t("page-staking-faq-4-question")}>
               <p>
                 <Translation id="page-staking-faq-4-answer-p1" />
               </p>
@@ -622,19 +618,13 @@ const StakingPage = ({
                 <Translation id="page-upgrades-merge-btn" />
               </ButtonLink>
             </ExpandableCard>
-            <ExpandableCard
-              title={translateMessageId("page-staking-faq-1-question", intl)}
-            >
+            <ExpandableCard title={t("page-staking-faq-1-question")}>
               <Translation id="page-staking-faq-1-answer" />
             </ExpandableCard>
-            <ExpandableCard
-              title={translateMessageId("page-staking-faq-2-question", intl)}
-            >
+            <ExpandableCard title={t("page-staking-faq-2-question")}>
               <Translation id="page-staking-faq-2-answer" />
             </ExpandableCard>
-            <ExpandableCard
-              title={translateMessageId("page-staking-faq-3-question", intl)}
-            >
+            <ExpandableCard title={t("page-staking-faq-3-question")}>
               <p>
                 <Translation id="page-staking-faq-3-answer-p1" />
               </p>
diff --git a/src/pages/upgrades/get-involved/index.tsx b/src/pages/upgrades/get-involved/index.tsx
index 5d13b100940..948a0ca4521 100644
--- a/src/pages/upgrades/get-involved/index.tsx
+++ b/src/pages/upgrades/get-involved/index.tsx
@@ -2,9 +2,9 @@ import React, { useState, useEffect, ReactNode } from "react"
 import { useTheme } from "@emotion/react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { shuffle } from "lodash"
-import { translateMessageId, TranslationKey } from "../../../utils/translations"
+import { TranslationKey } from "../../../utils/translations"
 import Card from "../../../components/Card"
 import Leaderboard, { Person } from "../../../components/Leaderboard"
 import CalloutBanner from "../../../components/CalloutBanner"
@@ -185,7 +185,7 @@ const GetInvolvedPage = ({
   data,
   location,
 }: PageProps<Queries.GetInvolvedPageQuery>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const theme = useTheme()
   const isDarkTheme = theme.isDark
 
@@ -376,7 +376,7 @@ const GetInvolvedPage = ({
             image={getImage(client.image(isDarkTheme))!}
             name={client.name}
             description={client.description}
-            alt={translateMessageId(client.alt, intl)}
+            alt={t(client.alt)}
             githubUrl={client.githubUrl}
             hideStars={true}
           >
@@ -390,11 +390,8 @@ const GetInvolvedPage = ({
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-upgrades-get-involved", intl)}
-        description={translateMessageId(
-          "page-upgrades-get-involved-meta-description",
-          intl
-        )}
+        title={t("page-upgrades-get-involved")}
+        description={t("page-upgrades-get-involved-meta-description")}
       />
       <Content>
         <HeroCard>
@@ -457,7 +454,7 @@ const GetInvolvedPage = ({
       <Staking>
         <StyledCalloutBanner
           image={getImage(data.rhino)!}
-          alt={translateMessageId("page-staking-image-alt", intl)}
+          alt={t("page-staking-image-alt")}
           titleKey={"page-upgrades-get-involved-stake"}
           descriptionKey={"page-upgrades-get-involved-stake-desc"}
         >
diff --git a/src/pages/upgrades/index.tsx b/src/pages/upgrades/index.tsx
index a811de3a7ff..e78ea1705c7 100644
--- a/src/pages/upgrades/index.tsx
+++ b/src/pages/upgrades/index.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import ButtonLink from "../../components/ButtonLink"
 import Card from "../../components/Card"
@@ -27,7 +27,6 @@ import {
 } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 
-import { translateMessageId } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 const Row = styled.div`
@@ -226,21 +225,21 @@ const paths = [
 ]
 
 const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const heroContent: IPageHeroContent = {
-    title: translateMessageId("page-upgrades-upgrades", intl),
-    header: translateMessageId("page-upgrades-upgrading", intl),
-    subtitle: translateMessageId("page-upgrades-upgrade-desc", intl),
+    title: t("page-upgrades-upgrades"),
+    header: t("page-upgrades-upgrading"),
+    subtitle: t("page-upgrades-upgrade-desc"),
     image: getImage(data.merge)!,
-    alt: translateMessageId("page-dapps-doge-img-alt", intl),
+    alt: t("page-dapps-doge-img-alt"),
     buttons: [
       {
-        content: translateMessageId("page-upgrades-explore-btn", intl),
+        content: t("page-upgrades-explore-btn"),
         to: "/upgrades/beacon-chain/",
       },
       {
-        content: translateMessageId("page-upgrades-whats-ethereum", intl),
+        content: t("page-upgrades-whats-ethereum"),
         to: "/what-is-ethereum/",
         variant: "outline",
       },
@@ -274,8 +273,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-upgrades-meta-title", intl)}
-        description={translateMessageId("page-upgrades-meta-desc", intl)}
+        title={t("page-upgrades-meta-title")}
+        description={t("page-upgrades-meta-desc")}
       />
       <PageHero content={heroContent} />
       <Divider />
@@ -322,7 +321,7 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
       </Content>
       <StyledCallout
         image={getImage(data.oldship)!}
-        alt={translateMessageId("page-eth-whats-eth-hero-alt", intl)}
+        alt={t("page-eth-whats-eth-hero-alt")}
         titleKey={"page-upgrades-dive"}
         descriptionKey={"page-upgrades-dive-desc"}
       >
@@ -466,14 +465,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
           <StakingRightColumn>
             <StakingCard
               emoji=":money_with_wings:"
-              title={translateMessageId(
-                "page-upgrades-index-staking-learn",
-                intl
-              )}
-              description={translateMessageId(
-                "page-upgrades-index-staking-learn-desc",
-                intl
-              )}
+              title={t("page-upgrades-index-staking-learn")}
+              description={t("page-upgrades-index-staking-learn-desc")}
             >
               <ButtonLink to="/staking/">
                 <Translation id="page-staking-deposit-contract-staking-more-link" />
@@ -491,11 +484,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
         <Faq>
           <LeftColumn>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-1-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-1-title", intl)}
+              contentPreview={t("page-upgrades-question-1-desc")}
+              title={t("page-upgrades-question-1-title")}
             >
               <Link to="/upgrades/beacon-chain/">
                 <Translation id="page-upgrades-beacon-chain-title" />
@@ -517,11 +507,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-2-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-2-title", intl)}
+              contentPreview={t("page-upgrades-question-2-desc")}
+              title={t("page-upgrades-question-2-title")}
             >
               <p>
                 <Translation id="page-upgrades-answer-1" />{" "}
@@ -540,11 +527,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-3-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-3-title", intl)}
+              contentPreview={t("page-upgrades-question-3-desc")}
+              title={t("page-upgrades-question-3-title")}
             >
               <p>
                 <Translation id="page-upgrades-question3-answer-1" />{" "}
@@ -584,11 +568,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </ul>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-4-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-4-title", intl)}
+              contentPreview={t("page-upgrades-question-4-desc")}
+              title={t("page-upgrades-question-4-title")}
             >
               <p>
                 <Translation id="page-upgrades-question-4-answer-1" />{" "}
@@ -610,11 +591,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-5-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-5-title", intl)}
+              contentPreview={t("page-upgrades-question-5-desc")}
+              title={t("page-upgrades-question-5-title")}
             >
               <p>
                 <Translation id="page-upgrades-question-5-answer-1" />
@@ -626,14 +604,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-11-desc",
-                intl
-              )}
-              title={translateMessageId(
-                "page-upgrades-question-11-title",
-                intl
-              )}
+              contentPreview={t("page-upgrades-question-11-desc")}
+              title={t("page-upgrades-question-11-title")}
             >
               <p>
                 <Translation id="page-upgrades-question-11-answer-1" />
@@ -645,11 +617,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
           </LeftColumn>
           <RightColumn>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-6-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-6-title", intl)}
+              contentPreview={t("page-upgrades-question-6-desc")}
+              title={t("page-upgrades-question-6-title")}
             >
               <p>
                 <Translation id="page-upgrades-question-6-answer-1" />
@@ -689,11 +658,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-7-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-7-title", intl)}
+              contentPreview={t("page-upgrades-question-7-desc")}
+              title={t("page-upgrades-question-7-title")}
             >
               <p>
                 <Translation id="page-upgrades-question-7-teams" />
@@ -737,11 +703,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-8-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-8-title", intl)}
+              contentPreview={t("page-upgrades-question-8-desc")}
+              title={t("page-upgrades-question-8-title")}
             >
               <p>
                 <Translation id="page-upgrades-question-8-answer-1" />
@@ -765,11 +728,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-9-desc",
-                intl
-              )}
-              title={translateMessageId("page-upgrades-question-9-title", intl)}
+              contentPreview={t("page-upgrades-question-9-desc")}
+              title={t("page-upgrades-question-9-title")}
             >
               <p>
                 <Translation id="page-upgrades-question-9-answer-1" />{" "}
@@ -802,14 +762,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={translateMessageId(
-                "page-upgrades-question-10-desc",
-                intl
-              )}
-              title={translateMessageId(
-                "page-upgrades-question-10-title",
-                intl
-              )}
+              contentPreview={t("page-upgrades-question-10-desc")}
+              title={t("page-upgrades-question-10-title")}
             >
               <p>
                 <Translation id="page-upgrades-question-10-answer-0" />
diff --git a/src/pages/upgrades/vision.tsx b/src/pages/upgrades/vision.tsx
index a6e7c569501..5b780e904b7 100644
--- a/src/pages/upgrades/vision.tsx
+++ b/src/pages/upgrades/vision.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import Translation from "../../components/Translation"
 import Card from "../../components/Card"
@@ -24,7 +24,6 @@ import {
 } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 
-import { translateMessageId } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 const ProblemCardContainer = styled(CardContainer)`
@@ -94,14 +93,14 @@ const VisionPage = ({
   data,
   location,
 }: PageProps<Queries.UpgradesVisionPageQuery>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   const heroContent: IPageHeroContent = {
-    title: translateMessageId("page-upgrades-vision-title", intl),
-    header: translateMessageId("page-upgrades-vision-future", intl),
-    subtitle: translateMessageId("page-upgrades-vision-subtitle", intl),
+    title: t("page-upgrades-vision-title"),
+    header: t("page-upgrades-vision-future"),
+    subtitle: t("page-upgrades-vision-subtitle"),
     image: getImage(data.oldship)!,
-    alt: translateMessageId("page-eth-whats-eth-hero-alt", intl),
+    alt: t("page-eth-whats-eth-hero-alt"),
   }
 
   const upgrades = [
@@ -132,8 +131,8 @@ const VisionPage = ({
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId("page-upgrades-vision-meta-title", intl)}
-        description={translateMessageId("page-upgrades-vision-meta-desc", intl)}
+        title={t("page-upgrades-vision-meta-title")}
+        description={t("page-upgrades-vision-meta-desc")}
       />
       <PageHero content={heroContent} />
       <Divider />
diff --git a/src/pages/wallets/find-wallet.tsx b/src/pages/wallets/find-wallet.tsx
index b165e89a42c..7dbdfa63eca 100644
--- a/src/pages/wallets/find-wallet.tsx
+++ b/src/pages/wallets/find-wallet.tsx
@@ -2,7 +2,7 @@
 import React, { useState, useRef } from "react"
 import { graphql } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import styled from "@emotion/styled"
 import { shuffle } from "lodash"
 
@@ -24,7 +24,6 @@ import walletData from "../../data/wallets/wallet-data"
 import FilterBurger from "../../assets/wallets/filter_burger.svg"
 
 // Utils
-import { translateMessageId } from "../../utils/translations"
 import { trackCustomEvent } from "../../utils/matomo"
 import { getImage } from "../../utils/image"
 import { useOnClickOutside } from "../../hooks/useOnClickOutside"
@@ -360,7 +359,7 @@ const filterDefault = {
 const randomizedWalletData = shuffle(walletData)
 
 const FindWalletPage = ({ data, location }) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   const wrapperRef = useRef<HTMLDivElement>(null)
 
   const [showFeatureFilters, setShowFeatureFilters] = useState(false)
@@ -394,11 +393,8 @@ const FindWalletPage = ({ data, location }) => {
   return (
     <PageStyled showMobileSidebar={showMobileSidebar}>
       <PageMetadata
-        title={translateMessageId("page-find-wallet-meta-title", intl)}
-        description={translateMessageId(
-          "page-find-wallet-meta-description",
-          intl
-        )}
+        title={t("page-find-wallet-meta-title")}
+        description={t("page-find-wallet-meta-description")}
       />
 
       <HeroContainer>
diff --git a/src/scripts/mergeTranslations.ts b/src/scripts/mergeTranslations.ts
index 758de264507..5cafd12bd94 100644
--- a/src/scripts/mergeTranslations.ts
+++ b/src/scripts/mergeTranslations.ts
@@ -27,7 +27,7 @@ const mergeTranslations = (): void => {
         mergeObjects(result, obj)
       })
 
-      const outputFilename = `src/intl/${currentTranslation}.json`
+      const outputFilename = `./i18n/locales/${currentTranslation}.json`
 
       fs.writeFileSync(
         outputFilename,
diff --git a/src/templates/static.tsx b/src/templates/static.tsx
index 9f6d4b02974..7bc1f485e7c 100644
--- a/src/templates/static.tsx
+++ b/src/templates/static.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 import { MDXProvider } from "@mdx-js/react"
 import { MDXRenderer } from "gatsby-plugin-mdx"
 import styled from "@emotion/styled"
@@ -162,7 +162,7 @@ const StaticPage = ({
   data: { siteData, pageData: mdx },
   pageContext: { relativePath },
 }: PageProps<Queries.StaticPageQuery, Context>) => {
-  const intl = useIntl()
+  const { language } = useI18next()
 
   if (!siteData || !mdx?.frontmatter || !mdx.parent)
     throw new Error(
@@ -206,10 +206,10 @@ const StaticPage = ({
         <ContentContainer>
           <Breadcrumbs slug={slug} />
           <LastUpdated
-            dir={isLangRightToLeft(intl.locale as Lang) ? "rtl" : "ltr"}
+            dir={isLangRightToLeft(language as Lang) ? "rtl" : "ltr"}
           >
             <Translation id="page-last-updated" />:{" "}
-            {getLocaleTimestamp(intl.locale as Lang, lastUpdatedDate)}
+            {getLocaleTimestamp(language as Lang, lastUpdatedDate)}
           </LastUpdated>
           <MobileTableOfContents
             editPath={absoluteEditPath}
diff --git a/src/templates/upgrade.tsx b/src/templates/upgrade.tsx
index ebe523cf3d7..a46064e10d8 100644
--- a/src/templates/upgrade.tsx
+++ b/src/templates/upgrade.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { graphql, PageProps } from "gatsby"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 import { MDXProvider } from "@mdx-js/react"
 import { MDXRenderer } from "gatsby-plugin-mdx"
 import styled from "@emotion/styled"
@@ -334,7 +334,7 @@ const dropdownLinks: ButtonDropdownList = {
 const UpgradePage = ({
   data: { mdx },
 }: PageProps<Queries.UpgradePageQuery, Context>) => {
-  const intl = useIntl()
+  const { language } = useI18next()
 
   if (!mdx?.frontmatter || !mdx.parent)
     throw new Error(
@@ -373,7 +373,7 @@ const UpgradePage = ({
           </SummaryBox>
           <LastUpdated>
             <Translation id="page-last-updated" />:{" "}
-            {getLocaleTimestamp(intl.locale as Lang, lastUpdatedDate)}
+            {getLocaleTimestamp(language as Lang, lastUpdatedDate)}
           </LastUpdated>
         </TitleCard>
         <Image image={getImage(mdx.frontmatter.image)!} alt="" />
diff --git a/src/templates/use-cases.tsx b/src/templates/use-cases.tsx
index cf45e4f8cb1..153fa199270 100644
--- a/src/templates/use-cases.tsx
+++ b/src/templates/use-cases.tsx
@@ -1,5 +1,4 @@
 import React from "react"
-import { useIntl } from "react-intl"
 import { graphql, PageProps } from "gatsby"
 import { MDXProvider } from "@mdx-js/react"
 import { MDXRenderer } from "gatsby-plugin-mdx"
@@ -308,7 +307,6 @@ const UseCasePage = ({
   data: { siteData, pageData: mdx },
   pageContext,
 }: PageProps<Queries.UseCasePageQuery, Context>) => {
-  const intl = useIntl()
   if (!siteData || !mdx?.frontmatter)
     throw new Error(
       "UseCases page template query does not return expected values"
diff --git a/src/utils/translations.ts b/src/utils/translations.ts
index ca4e31dda08..5c96433e6bd 100644
--- a/src/utils/translations.ts
+++ b/src/utils/translations.ts
@@ -1,9 +1,7 @@
-import { IntlShape } from "react-intl"
-
 import type { Lang } from "./languages"
 import type { Direction } from "../types"
 
-import defaultStrings from "../intl/en.json"
+import defaultStrings from "../../i18n/locales/en.json"
 
 export type TranslationKey = keyof typeof defaultStrings
 
@@ -40,31 +38,6 @@ export const getDirection = (lang?: Lang): Direction => {
   return isLangRightToLeft(lang) ? "rtl" : "ltr"
 }
 
-export const translateMessageId = (
-  id: TranslationKey,
-  intl: IntlShape
-): string => {
-  if (!id) {
-    consoleError(`No id provided for translation.`)
-    return ""
-  }
-  if (!intl || !intl.formatMessage) {
-    consoleError(`Invalid/no intl provided for translation id ${id}`)
-    return ""
-  }
-  const translation = intl.formatMessage({
-    id,
-    defaultMessage: getDefaultMessage(id),
-  })
-  if (translation === id) {
-    consoleError(
-      `Intl ID string "${id}" has no match. Default message of "" returned.`
-    )
-    return ""
-  }
-  return translation
-}
-
 // Overwrites the default Persian numbering of the Farsi language to use Hindu-Arabic numerals (0-9)
 // Context: https://github.com/ethereum/ethereum-org-website/pull/5490#pullrequestreview-892596553
 export const getLocaleForNumberFormat = (locale: Lang): Lang => {

From 10a9be7acca6ce6d14c02f5835d0f72662a8be74 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Fri, 28 Oct 2022 19:15:21 -0300
Subject: [PATCH 002/108] initial commit to implement
 gatsby-plugin-react-i18next

---
 .gitignore                                    |   1 +
 gatsby-browser.tsx                            |  50 +-
 gatsby-config.ts                              |  48 +-
 gatsby-node.ts                                | 102 ++--
 gatsby-ssr.tsx                                |  26 +-
 package.json                                  |  11 +-
 src/components/Layout.tsx                     |   6 +-
 src/components/Link.tsx                       |   2 +-
 src/pages-conditional/dapps.tsx               |  11 +-
 src/pages-conditional/eth.tsx                 |  11 +-
 src/pages-conditional/wallets.tsx             |  11 +-
 src/pages-conditional/what-is-ethereum.tsx    |  11 +-
 src/pages/404.tsx                             |  16 +-
 src/pages/assets.tsx                          |  11 +-
 src/pages/bug-bounty.tsx                      |  11 +-
 src/pages/community.tsx                       |  11 +-
 .../translation-program/acknowledgements.tsx  |  11 +-
 .../translation-program/contributors.tsx      |  26 +-
 src/pages/developers/index.tsx                |  11 +-
 src/pages/developers/learning-tools.tsx       |  11 +-
 src/pages/developers/local-environment.tsx    |  11 +-
 src/pages/developers/tutorials.tsx            |  11 +-
 src/pages/get-eth.tsx                         |  11 +-
 src/pages/index.tsx                           |  11 +-
 src/pages/layer-2.tsx                         |  11 +-
 src/pages/learn/index.tsx                     |   9 +
 src/pages/run-a-node.tsx                      |  11 +-
 src/pages/stablecoins.tsx                     |  11 +-
 src/pages/staking/deposit-contract.tsx        |  11 +-
 src/pages/staking/index.tsx                   |  11 +-
 src/pages/upgrades/index.tsx                  |  11 +-
 src/pages/wallets/find-wallet.tsx             |  11 +-
 src/scripts/mergeTranslations.ts              |   6 +-
 src/templates/docs.tsx                        |  11 +-
 src/templates/staking.tsx                     |  11 +-
 src/templates/static.tsx                      |  11 +-
 src/templates/tutorial.tsx                    |  11 +-
 src/templates/upgrade.tsx                     |  11 +-
 src/templates/use-cases.tsx                   |  11 +-
 src/types.ts                                  |  18 +-
 src/utils/translations.ts                     |  20 +-
 yarn.lock                                     | 513 ++++++++++++++----
 42 files changed, 853 insertions(+), 298 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3920d43afc2..779cf0195b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@ yarn-error.log
 src/data/contributors.json
 # These files are generated by `yarn merge-translations` command
 src/intl/*.json
+i18n/locales
 # Auto generated code when gatsby build the site
 src/gatsby-types.d.ts
 
diff --git a/gatsby-browser.tsx b/gatsby-browser.tsx
index 709de7493a1..3c483e0e496 100644
--- a/gatsby-browser.tsx
+++ b/gatsby-browser.tsx
@@ -5,8 +5,7 @@
  */
 
 import React from "react"
-import browserLang from "browser-lang"
-import { withPrefix, GatsbyBrowser } from "gatsby"
+import { GatsbyBrowser } from "gatsby"
 
 import Prism from "prism-react-renderer/prism"
 ;(typeof global !== "undefined" ? global : window).Prism = Prism
@@ -17,12 +16,6 @@ import "@formatjs/intl-numberformat/polyfill"
 import "@formatjs/intl-numberformat/locale-data/en"
 
 import Layout from "./src/components/Layout"
-import {
-  supportedLanguages,
-  defaultLanguage,
-  isLang,
-} from "./src/utils/languages"
-import { IS_DEV } from "./src/utils/env"
 import { Context } from "./src/types"
 
 // Default languages included:
@@ -31,38 +24,19 @@ require("prismjs/components/prism-solidity")
 
 // Prevents <Layout/> from unmounting on page transitions
 // https://www.gatsbyjs.com/docs/layout-components/#how-to-prevent-layout-components-from-unmounting
-// @ts-ignore: returning `null` is not accepted by the `GatsbyBrowser` type def.
 export const wrapPageElement: GatsbyBrowser<
   any,
   Context
 >["wrapPageElement"] = ({ element, props }) => {
-  const { location, pageContext } = props
-  const { pathname, search } = location
-  const { originalPath } = pageContext
-
-  const [, pathLocale] = pathname.split("/")
-
-  // client side redirect on paths that don't have a locale in them. Most useful
-  // on dev env where we don't have server redirects
-  if (IS_DEV && !isLang(pathLocale)) {
-    let detected =
-      window.localStorage.getItem("eth-org-language") ||
-      browserLang({
-        languages: supportedLanguages,
-        fallback: defaultLanguage,
-      })
-
-    if (!isLang(detected)) {
-      detected = defaultLanguage
-    }
-
-    const queryParams = search || ""
-    const newUrl = withPrefix(`/${detected}${originalPath}${queryParams}`)
-    window.localStorage.setItem("eth-org-language", detected)
-    window.location.replace(newUrl)
-
-    return null
-  }
-
-  return <Layout {...props}>{element}</Layout>
+  const newElement = React.cloneElement(
+    element, // I18nextProvider
+    element.props,
+    React.cloneElement(
+      element.props.children, // I18nextContext.Provider
+      element.props.children.props,
+      React.createElement(Layout, props, element.props.children.props.children)
+    )
+  )
+
+  return newElement
 }
diff --git a/gatsby-config.ts b/gatsby-config.ts
index 5869b08be3f..be387dc89be 100644
--- a/gatsby-config.ts
+++ b/gatsby-config.ts
@@ -35,24 +35,6 @@ const config: GatsbyConfig = {
     editContentUrl: `https://github.com/ethereum/ethereum-org-website/tree/dev/`,
   },
   plugins: [
-    // i18n support
-    {
-      resolve: `gatsby-theme-i18n`,
-      options: {
-        defaultLang: defaultLanguage,
-        prefixDefault: true,
-        locales: supportedLanguages.length
-          ? supportedLanguages.join(" ")
-          : null,
-        configPath: path.resolve(`./i18n/config.json`),
-      },
-    },
-    {
-      resolve: `gatsby-theme-i18n-react-intl`,
-      options: {
-        defaultLocale: `./src/intl/en.json`,
-      },
-    },
     // Web app manifest
     {
       resolve: `gatsby-plugin-manifest`,
@@ -265,6 +247,36 @@ const config: GatsbyConfig = {
         generateMatchPathRewrites: false,
       },
     },
+    // i18n support
+    {
+      resolve: `gatsby-source-filesystem`,
+      options: {
+        path: path.resolve(`./i18n/locales`),
+        name: `locale`,
+      },
+    },
+    {
+      resolve: `gatsby-plugin-react-i18next`,
+      options: {
+        localeJsonSourceName: `locale`, // name given to `gatsby-source-filesystem` plugin.
+        languages: supportedLanguages,
+        defaultLanguage: defaultLanguage,
+        // if you are using Helmet, you must include siteUrl, and make sure you add http:https
+        siteUrl,
+        // if you are using trailingSlash gatsby config include it here, as well (the default is 'always')
+        trailingSlash: "always",
+        // you can pass any i18next options
+        i18nextOptions: {
+          fallbackLng: defaultLanguage,
+          interpolation: {
+            escapeValue: false, // not needed for react as it escapes by default
+          },
+          keySeparator: false,
+          nsSeparator: false,
+        },
+      },
+    },
+    "gatsby-plugin-webpack-bundle-analyser-v2",
   ],
   // https://www.gatsbyjs.com/docs/reference/release-notes/v2.28/#feature-flags-in-gatsby-configjs
   flags: {
diff --git a/gatsby-node.ts b/gatsby-node.ts
index ef5f9af66ab..9d267206084 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -290,11 +290,16 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
               isOutdated: false,
               isContentEnglish: true,
               relativePath, // Use English path for template MDX query
-              // gatsby i18n theme context
-              locale: lang,
-              hrefLang: lang,
-              originalPath: langSlug.slice(3),
-              dateFormat: "MM/DD/YYYY",
+              // gatsby i18n plugin
+              i18n: {
+                language: lang,
+                languages: supportedLanguages,
+                defaultLanguage: defaultLanguage,
+                generateDefaultLanguagePage: false,
+                routed: true,
+                originalPath: langSlug.slice(3),
+                path: langSlug,
+              },
             },
           })
         }
@@ -310,11 +315,16 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
         isOutdated: !!node.fields.isOutdated,
         isDefaultLang: language === defaultLanguage,
         relativePath,
-        // gatsby i18n theme context
-        locale: language,
-        hrefLang: language,
-        originalPath: slug.slice(3),
-        dateFormat: "MM/DD/YYYY",
+        // gatsby i18n plugin
+        i18n: {
+          language,
+          languages: supportedLanguages,
+          defaultLanguage: defaultLanguage,
+          generateDefaultLanguagePage: false,
+          routed: true,
+          originalPath: slug.slice(3),
+          path: slug,
+        },
       },
     })
   })
@@ -344,9 +354,7 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
           page,
           lang
         )
-
         const slug = `/${lang}${originalPath}`
-
         createPage<Context>({
           path: slug,
           component: path.resolve(`src/pages-conditional/${page}.tsx`),
@@ -355,11 +363,16 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
             slug,
             isContentEnglish,
             isOutdated,
-            // gatsby i18n theme context
-            locale: lang,
-            hrefLang: lang,
-            originalPath,
-            dateFormat: "MM/DD/YYYY",
+            // gatsby i18n plugin
+            i18n: {
+              language: lang,
+              languages: supportedLanguages,
+              defaultLanguage: defaultLanguage,
+              generateDefaultLanguagePage: false,
+              routed: true,
+              originalPath,
+              path: slug,
+            },
           },
         })
       }
@@ -378,42 +391,47 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
 
   const isDefaultLang = page.path.startsWith(`/${defaultLanguage}`)
 
-  if (isDefaultLang) {
-    const path = page.path.slice(3)
-
-    if (IS_DEV) {
-      // create routes without the lang prefix e.g. `/{path}` as our i18n plugin
-      // only creates `/{lang}/{path}` routes. This is useful on dev env to avoid
-      // getting a 404 since we don't have server side redirects
-      createPage({ ...page, path })
-    }
-
-    if (!IS_DEV && !path.match(/^\/404(\/|.html)$/)) {
-      // on prod, indicate our servers to redirect the root paths to the
-      // `/{defaultLang}/{path}`
-      createRedirect({
-        ...commonRedirectProps,
-        fromPath: path,
-        toPath: page.path,
-      })
-    }
-  }
+  // if (isDefaultLang) {
+  //   const path = page.path.slice(3)
+
+  //   if (IS_DEV) {
+  //     // create routes without the lang prefix e.g. `/{path}` as our i18n plugin
+  //     // only creates `/{lang}/{path}` routes. This is useful on dev env to avoid
+  //     // getting a 404 since we don't have server side redirects
+  //     createPage({ ...page, path })
+  //   }
+
+  //   if (!IS_DEV && !path.match(/^\/404(\/|.html)$/)) {
+  //     // on prod, indicate our servers to redirect the root paths to the
+  //     // `/{defaultLang}/{path}`
+  //     createRedirect({
+  //       ...commonRedirectProps,
+  //       fromPath: path,
+  //       toPath: page.path,
+  //     })
+  //   }
+  // }
 
   if (!page.context) {
     return
   }
 
-  const isTranslated = page.context.locale !== defaultLanguage
-  const hasNoContext = page.context.isOutdated === undefined
+  const isMdxPage = page.context.isOutdated !== undefined
+
+  if (!isMdxPage) {
+    const isDefaultLang = page.context.language === defaultLanguage
 
-  if (isTranslated && hasNoContext) {
     const { isOutdated, isContentEnglish } = await checkIsPageOutdated(
-      page.context.originalPath,
-      page.context.locale
+      page.context.i18n.originalPath,
+      page.context.language
     )
+
+    const path = isDefaultLang ? `/${defaultLanguage}${page.path}` : page.path
+
     deletePage(page)
     createPage<Context>({
       ...page,
+      path,
       context: {
         ...page.context,
         isOutdated,
diff --git a/gatsby-ssr.tsx b/gatsby-ssr.tsx
index e0925d5ceb6..3ea24abf4f2 100644
--- a/gatsby-ssr.tsx
+++ b/gatsby-ssr.tsx
@@ -11,26 +11,22 @@ import type { GatsbySSR } from "gatsby"
 import Layout from "./src/components/Layout"
 
 import { Context } from "./src/types"
-import { IS_DEV } from "./src/utils/env"
-import { isLang } from "./src/utils/languages"
 
 // Prevents <Layout/> from unmounting on page transitions
 // https://www.gatsbyjs.com/docs/layout-components/#how-to-prevent-layout-components-from-unmounting
-// @ts-ignore: returning `null` is not accepted by the `GatsbySSR` type def.
 export const wrapPageElement: GatsbySSR<any, Context>["wrapPageElement"] = ({
   element,
   props,
 }) => {
-  const { location } = props
-  const { pathname } = location
-
-  const [, pathLocale] = pathname.split("/")
-
-  // this is to avoid having hydration issues on dev mode. Check the logic
-  // inside gatsby-browser.tsx
-  if (IS_DEV && !isLang(pathLocale)) {
-    return null
-  }
-
-  return <Layout {...props}>{element}</Layout>
+  const newElement = React.cloneElement(
+    element, // I18nextProvider
+    element.props,
+    React.cloneElement(
+      element.props.children, // I18nextContext.Provider
+      element.props.children.props,
+      React.createElement(Layout, props, element.props.children.props.children)
+    )
+  )
+
+  return newElement
 }
diff --git a/package.json b/package.json
index 4dbe1478226..709f813748a 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "gatsby-plugin-netlify": "^5.0.1",
     "gatsby-plugin-react-helmet": "^5.0.0",
     "gatsby-plugin-react-helmet-canonical-urls": "^1.4.0",
+    "gatsby-plugin-react-i18next": "^2.0.4",
     "gatsby-plugin-react-svg": "^3.1.0",
     "gatsby-plugin-robots-txt": "^1.7.1",
     "gatsby-plugin-sharp": "^4.21.0",
@@ -47,13 +48,12 @@
     "gatsby-remark-images": "^6.21.0",
     "gatsby-remark-reading-time": "^1.1.0",
     "gatsby-source-filesystem": "^4.21.1",
-    "gatsby-theme-i18n": "^3.0.0",
-    "gatsby-theme-i18n-react-intl": "^3.0.0",
     "gatsby-transformer-csv": "^4.0.0",
     "gatsby-transformer-gitinfo": "^1.1.0",
     "gatsby-transformer-json": "^4.11.0",
     "gatsby-transformer-remark": "^3.0.0",
     "gatsby-transformer-sharp": "^4.21.0",
+    "i18next": "^21.9.2",
     "is-relative-url": "^3.0.0",
     "lodash": "^4.17.21",
     "luxon": "^1.24.1",
@@ -66,15 +66,18 @@
     "react-dom": "^18.0.0",
     "react-emoji-render": "^1.2.4",
     "react-helmet": "^6.1.0",
+    "react-i18next": "^11.18.6",
     "react-icons": "^4.3.1",
     "react-instantsearch-dom": "^6.32.0",
-    "react-intl": "^3.12.1",
+    "react-rewards": "^2.0.4",
     "react-select": "^4.3.0",
     "recharts": "^2.1.9",
     "styled-system": "^5.1.5",
     "unist-util-visit-parents": "^2.1.2"
   },
   "devDependencies": {
+    "@babel/cli": "^7.18.10",
+    "@babel/plugin-transform-typescript": "^7.19.1",
     "@netlify/functions": "^1.2.0",
     "@types/browser-lang": "^0.1.0",
     "@types/github-slugger": "^1.3.0",
@@ -85,7 +88,9 @@
     "@types/react-dom": "^18.0.6",
     "@types/react-instantsearch-core": "^6.26.2",
     "@types/styled-system": "^5.1.15",
+    "babel-plugin-i18next-extract": "^0.9.0",
     "babel-preset-gatsby": "^2.23.0",
+    "gatsby-plugin-webpack-bundle-analyser-v2": "^1.1.27",
     "github-slugger": "^1.3.0",
     "gray-matter": "^4.0.3",
     "husky": "^4.2.5",
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 911608a62cb..52602e696f2 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -90,7 +90,7 @@ const Layout: React.FC<IProps> = ({
 
   const [isZenMode, setIsZenMode] = useState<boolean>(false)
   const [shouldShowSideNav, setShouldShowSideNav] = useState<boolean>(false)
-  const locale = pageContext.locale
+  const locale = pageContext.i18n.language
 
   // Exit Zen Mode on 'esc' click
   useKeyPress(`Escape`, () => handleZenModeChange(false))
@@ -145,12 +145,12 @@ const Layout: React.FC<IProps> = ({
           shouldShow={shouldShowTranslationBanner}
           isPageContentEnglish={isPageContentEnglish}
           isPageRightToLeft={isPageRightToLeft}
-          originalPagePath={pageContext.originalPath!}
+          originalPagePath={pageContext.i18n.originalPath || ""}
         />
         <TranslationBannerLegal
           shouldShow={isLegal}
           isPageRightToLeft={isPageRightToLeft}
-          originalPagePath={pageContext.originalPath!}
+          originalPagePath={pageContext.i18n.originalPath || ""}
         />
         <ContentContainer>
           <VisuallyHidden isHidden={isZenMode}>
diff --git a/src/components/Link.tsx b/src/components/Link.tsx
index a20c43efe9d..e1703607e4f 100644
--- a/src/components/Link.tsx
+++ b/src/components/Link.tsx
@@ -54,7 +54,7 @@ const Link: React.FC<IProps> = ({
 
   // TODO: in the next PR we are going to deprecate the `to` prop and just use `href`
   // this is to support the ButtonLink component which uses the `to` prop
-  const to = (toProp || href)!
+  const to = (toProp ?? href)!
 
   const isExternal = url.isExternal(to)
   const isHash = url.isHash(to)
diff --git a/src/pages-conditional/dapps.tsx b/src/pages-conditional/dapps.tsx
index a6c525473f7..be3a499f99e 100644
--- a/src/pages-conditional/dapps.tsx
+++ b/src/pages-conditional/dapps.tsx
@@ -1442,7 +1442,16 @@ export const editorImage = graphql`
 `
 
 export const query = graphql`
-  query DappsPage {
+  query DappsPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     doge: file(relativePath: { eq: "doge-computer.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages-conditional/eth.tsx b/src/pages-conditional/eth.tsx
index 152342139b1..f9a2bc4ac48 100644
--- a/src/pages-conditional/eth.tsx
+++ b/src/pages-conditional/eth.tsx
@@ -521,7 +521,16 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
 export default EthPage
 
 export const query = graphql`
-  query EthPage {
+  query EthPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     eth: file(relativePath: { eq: "eth.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages-conditional/wallets.tsx b/src/pages-conditional/wallets.tsx
index 0cc357c2074..d5409239ef0 100644
--- a/src/pages-conditional/wallets.tsx
+++ b/src/pages-conditional/wallets.tsx
@@ -478,7 +478,16 @@ export const listImage = graphql`
 `
 
 export const query = graphql`
-  query WalletsPage {
+  query WalletsPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     hero: file(relativePath: { eq: "wallet.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/pages-conditional/what-is-ethereum.tsx b/src/pages-conditional/what-is-ethereum.tsx
index 0cd3adb10e1..315de633163 100644
--- a/src/pages-conditional/what-is-ethereum.tsx
+++ b/src/pages-conditional/what-is-ethereum.tsx
@@ -955,7 +955,16 @@ export const calloutImage = graphql`
 `
 
 export const query = graphql`
-  query WhatIsEthereum {
+  query WhatIsEthereum($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     hero: file(relativePath: { eq: "what-is-ethereum.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index d428b840456..f66ffc1a59f 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -1,11 +1,11 @@
 import React from "react"
 import styled from "@emotion/styled"
+import { graphql, PageProps } from "gatsby"
 
 import Link from "../components/Link"
 import Translation from "../components/Translation"
 
 import { Page, Content } from "../components/SharedStyledComponents"
-import { PageProps } from "gatsby"
 
 const StyledPage = styled(Page)`
   margin-top: 4rem;
@@ -29,3 +29,17 @@ const NotFoundPage = (props: PageProps) => (
 )
 
 export default NotFoundPage
+
+export const query = graphql`
+  query NotFoundPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
+  }
+`
diff --git a/src/pages/assets.tsx b/src/pages/assets.tsx
index 6b4168f0ab5..15409c45afd 100644
--- a/src/pages/assets.tsx
+++ b/src/pages/assets.tsx
@@ -493,7 +493,16 @@ export const assetItem = graphql`
 `
 
 export const query = graphql`
-  query AssetsPage {
+  query AssetsPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     ethDiamondBlackHero: file(
       relativePath: { eq: "assets/eth-diamond-black.png" }
     ) {
diff --git a/src/pages/bug-bounty.tsx b/src/pages/bug-bounty.tsx
index dc276e953c4..76f2bc5f02e 100644
--- a/src/pages/bug-bounty.tsx
+++ b/src/pages/bug-bounty.tsx
@@ -859,7 +859,16 @@ export const ClientLogosSmall = graphql`
 `
 
 export const query = graphql`
-  query BugBountyPage {
+  query BugBountyPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     consensusBountyHunters: allConsensusBountyHuntersCsv(
       sort: { order: DESC, fields: score }
     ) {
diff --git a/src/pages/community.tsx b/src/pages/community.tsx
index fd5dc68f394..1188d936d78 100644
--- a/src/pages/community.tsx
+++ b/src/pages/community.tsx
@@ -566,7 +566,16 @@ const CommunityPage = ({
 export default CommunityPage
 
 export const query = graphql`
-  query CommunityPage {
+  query CommunityPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     enterprise: file(relativePath: { eq: "enterprise-eth.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/contributing/translation-program/acknowledgements.tsx b/src/pages/contributing/translation-program/acknowledgements.tsx
index 2430a6d20e8..d886bc1c934 100644
--- a/src/pages/contributing/translation-program/acknowledgements.tsx
+++ b/src/pages/contributing/translation-program/acknowledgements.tsx
@@ -269,7 +269,16 @@ const TranslatorAcknowledgements = ({
 export default TranslatorAcknowledgements
 
 export const query = graphql`
-  query TranslatorAcknowledgementsPage {
+  query TranslatorAcknowledgementsPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     dogeComputer: file(relativePath: { eq: "doge-computer.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/contributing/translation-program/contributors.tsx b/src/pages/contributing/translation-program/contributors.tsx
index d72c66cda6a..3989974be0d 100644
--- a/src/pages/contributing/translation-program/contributors.tsx
+++ b/src/pages/contributing/translation-program/contributors.tsx
@@ -1,7 +1,7 @@
 // Libraries
 import React from "react"
 import styled from "@emotion/styled"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 import { graphql, PageProps } from "gatsby"
 import type { Context } from "../../../types"
 
@@ -17,7 +17,6 @@ import {
 } from "../../../components/SharedStyledComponents"
 
 // Utils
-import { translateMessageId } from "../../../utils/translations"
 import FeedbackCard from "../../../components/FeedbackCard"
 
 // Styles
@@ -46,7 +45,7 @@ const Contributors = ({
   data,
   location,
 }: PageProps<Queries.ContributorsPageQuery, Context>) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   // TODO: Remove specific user checks once Acolad has updated their usernames
   const translatorData =
     data.allTimeData?.data?.flatMap(
@@ -85,13 +84,11 @@ const Contributors = ({
   return (
     <Page>
       <PageMetadata
-        title={translateMessageId(
-          "page-contributing-translation-program-contributors-meta-title",
-          intl
+        title={t(
+          "page-contributing-translation-program-contributors-meta-title"
         )}
-        description={translateMessageId(
-          "page-contributing-translation-program-contributors-meta-description",
-          intl
+        description={t(
+          "page-contributing-translation-program-contributors-meta-description"
         )}
       />
 
@@ -153,7 +150,16 @@ const Contributors = ({
 export default Contributors
 
 export const query = graphql`
-  query ContributorsPage {
+  query ContributorsPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     allTimeData: alltimeJson {
       data {
         user {
diff --git a/src/pages/developers/index.tsx b/src/pages/developers/index.tsx
index c56b3948437..d8d2bc8217a 100644
--- a/src/pages/developers/index.tsx
+++ b/src/pages/developers/index.tsx
@@ -555,7 +555,16 @@ const DevelopersPage = ({
 export default DevelopersPage
 
 export const query = graphql`
-  query DevelopersIndexPage {
+  query DevelopersIndexPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     ednHero: file(relativePath: { eq: "enterprise-eth.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/developers/learning-tools.tsx b/src/pages/developers/learning-tools.tsx
index 3c13d821531..b71525d04bc 100644
--- a/src/pages/developers/learning-tools.tsx
+++ b/src/pages/developers/learning-tools.tsx
@@ -313,7 +313,16 @@ export const learningToolImage = graphql`
 `
 
 export const query = graphql`
-  query DevelopersLearningToolsPage {
+  query DevelopersLearningToolsPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     captureTheEther: file(
       relativePath: { eq: "dev-tools/capturetheether.png" }
     ) {
diff --git a/src/pages/developers/local-environment.tsx b/src/pages/developers/local-environment.tsx
index ebaf32acb06..a7f899d6fd1 100644
--- a/src/pages/developers/local-environment.tsx
+++ b/src/pages/developers/local-environment.tsx
@@ -614,7 +614,16 @@ export const devtoolImage = graphql`
 `
 
 export const query = graphql`
-  query DevelopersLocalEnvironmentPage {
+  query DevelopersLocalEnvironmentPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     hero: file(relativePath: { eq: "developers-eth-blocks.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/developers/tutorials.tsx b/src/pages/developers/tutorials.tsx
index 8c1c09df05f..26459754140 100644
--- a/src/pages/developers/tutorials.tsx
+++ b/src/pages/developers/tutorials.tsx
@@ -466,7 +466,16 @@ const TutorialsPage = ({
 export default TutorialsPage
 
 export const query = graphql`
-  query DevelopersTutorialsPage {
+  query DevelopersTutorialsPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     allTutorials: allMdx(
       filter: { slug: { regex: "/tutorials/" } }
       sort: { fields: frontmatter___published, order: DESC }
diff --git a/src/pages/get-eth.tsx b/src/pages/get-eth.tsx
index 50cb67f2c16..9478e028c2f 100644
--- a/src/pages/get-eth.tsx
+++ b/src/pages/get-eth.tsx
@@ -446,7 +446,16 @@ export const listItemImage = graphql`
 `
 
 export const query = graphql`
-  query GetEthPage {
+  query GetEthPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     hero: file(relativePath: { eq: "get-eth.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 4b5d56f4c62..1e738a26126 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -769,7 +769,16 @@ const HomePage = ({
 export default HomePage
 
 export const query = graphql`
-  query IndexPage {
+  query IndexPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     hero: file(relativePath: { eq: "home/hero.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/pages/layer-2.tsx b/src/pages/layer-2.tsx
index 5a28446c159..56e61f4c162 100644
--- a/src/pages/layer-2.tsx
+++ b/src/pages/layer-2.tsx
@@ -923,7 +923,16 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
 export default Layer2Page
 
 export const query = graphql`
-  query Layer2Page {
+  query Layer2Page($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     dao: file(relativePath: { eq: "use-cases/dao-2.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/learn/index.tsx b/src/pages/learn/index.tsx
index 09f9e61ee65..ba16c98fb67 100644
--- a/src/pages/learn/index.tsx
+++ b/src/pages/learn/index.tsx
@@ -872,6 +872,15 @@ export const cardImageFragment = graphql`
 
 export const query = graphql`
   query LearnPage {
+    locales: allLocale {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     heroImage: file(relativePath: { eq: "eth.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/run-a-node.tsx b/src/pages/run-a-node.tsx
index d15ffb4ef3f..8bdfa5b2a35 100644
--- a/src/pages/run-a-node.tsx
+++ b/src/pages/run-a-node.tsx
@@ -1000,7 +1000,16 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
 export default RunANodePage
 
 export const query = graphql`
-  query RunANodePage {
+  query RunANodePage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     ethereumInside: file(
       relativePath: { eq: "run-a-node/ethereum-inside.png" }
     ) {
diff --git a/src/pages/stablecoins.tsx b/src/pages/stablecoins.tsx
index df037b3cc2a..3ff54b0c1d8 100644
--- a/src/pages/stablecoins.tsx
+++ b/src/pages/stablecoins.tsx
@@ -829,7 +829,16 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
 export default StablecoinsPage
 
 export const query = graphql`
-  query StablecoinsPage {
+  query StablecoinsPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     stablecoins: file(relativePath: { eq: "stablecoins/hero.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/staking/deposit-contract.tsx b/src/pages/staking/deposit-contract.tsx
index 135ce916808..5c4543b5e80 100644
--- a/src/pages/staking/deposit-contract.tsx
+++ b/src/pages/staking/deposit-contract.tsx
@@ -500,7 +500,16 @@ export const sourceImage = graphql`
 `
 
 export const query = graphql`
-  query DepositContractPage {
+  query DepositContractPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     consensys: file(relativePath: { eq: "projects/consensys.png" }) {
       ...sourceImage
     }
diff --git a/src/pages/staking/index.tsx b/src/pages/staking/index.tsx
index 36dbf890aaa..1c173f4403e 100644
--- a/src/pages/staking/index.tsx
+++ b/src/pages/staking/index.tsx
@@ -718,7 +718,16 @@ const StakingPage = ({
 export default StakingPage
 
 export const query = graphql`
-  query StakingPageIndex {
+  query StakingPageIndex($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     rhino: file(relativePath: { eq: "upgrades/upgrade_rhino.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/upgrades/index.tsx b/src/pages/upgrades/index.tsx
index e78ea1705c7..e27f3a54d2c 100644
--- a/src/pages/upgrades/index.tsx
+++ b/src/pages/upgrades/index.tsx
@@ -829,7 +829,16 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
 export default Eth2IndexPage
 
 export const query = graphql`
-  query UpgradesPage {
+  query UpgradesPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     oldship: file(relativePath: { eq: "upgrades/oldship.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/wallets/find-wallet.tsx b/src/pages/wallets/find-wallet.tsx
index 7dbdfa63eca..302c6e06208 100644
--- a/src/pages/wallets/find-wallet.tsx
+++ b/src/pages/wallets/find-wallet.tsx
@@ -565,7 +565,16 @@ const FindWalletPage = ({ data, location }) => {
 export default FindWalletPage
 
 export const query = graphql`
-  {
+  query FindWalletPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     hero: file(relativePath: { eq: "wallets/find-wallet-hero.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/scripts/mergeTranslations.ts b/src/scripts/mergeTranslations.ts
index 5cafd12bd94..e027055ba40 100644
--- a/src/scripts/mergeTranslations.ts
+++ b/src/scripts/mergeTranslations.ts
@@ -27,8 +27,12 @@ const mergeTranslations = (): void => {
         mergeObjects(result, obj)
       })
 
-      const outputFilename = `./i18n/locales/${currentTranslation}.json`
+      const dir = `./i18n/locales/${currentTranslation}`
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true })
+      }
 
+      const outputFilename = `${dir}/index.json`
       fs.writeFileSync(
         outputFilename,
         JSON.stringify(result, null, 2).concat("\n")
diff --git a/src/templates/docs.tsx b/src/templates/docs.tsx
index c84e48e8ef7..e5aa01f9c8e 100644
--- a/src/templates/docs.tsx
+++ b/src/templates/docs.tsx
@@ -245,7 +245,16 @@ const DocsPage = ({
 }
 
 export const query = graphql`
-  query DocsPage($relativePath: String) {
+  query DocsPage($language: String!, $relativePath: String) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     siteData: site {
       siteMetadata {
         editContentUrl
diff --git a/src/templates/staking.tsx b/src/templates/staking.tsx
index 5ca2e2f7a37..03f6662623f 100644
--- a/src/templates/staking.tsx
+++ b/src/templates/staking.tsx
@@ -456,7 +456,16 @@ const StakingPage = ({
 }
 
 export const stakingPageQuery = graphql`
-  query StakingPage($relativePath: String) {
+  query StakingPage($language: String!, $relativePath: String) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     pageData: mdx(fields: { relativePath: { eq: $relativePath } }) {
       fields {
         slug
diff --git a/src/templates/static.tsx b/src/templates/static.tsx
index 7bc1f485e7c..7db21844b2d 100644
--- a/src/templates/static.tsx
+++ b/src/templates/static.tsx
@@ -237,7 +237,16 @@ const StaticPage = ({
 }
 
 export const staticPageQuery = graphql`
-  query StaticPage($relativePath: String) {
+  query StaticPage($language: String!, $relativePath: String) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     siteData: site {
       siteMetadata {
         editContentUrl
diff --git a/src/templates/tutorial.tsx b/src/templates/tutorial.tsx
index c564c4d2059..3ca1d0e687a 100644
--- a/src/templates/tutorial.tsx
+++ b/src/templates/tutorial.tsx
@@ -220,7 +220,16 @@ const TutorialPage = ({
 export default TutorialPage
 
 export const query = graphql`
-  query TutorialPage($relativePath: String) {
+  query TutorialPage($language: String!, $relativePath: String) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     siteData: site {
       siteMetadata {
         editContentUrl
diff --git a/src/templates/upgrade.tsx b/src/templates/upgrade.tsx
index a46064e10d8..f463bb98295 100644
--- a/src/templates/upgrade.tsx
+++ b/src/templates/upgrade.tsx
@@ -413,7 +413,16 @@ const UpgradePage = ({
 }
 
 export const upgradePageQuery = graphql`
-  query UpgradePage($relativePath: String) {
+  query UpgradePage($language: String!, $relativePath: String) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     mdx(fields: { relativePath: { eq: $relativePath } }) {
       fields {
         slug
diff --git a/src/templates/use-cases.tsx b/src/templates/use-cases.tsx
index 153fa199270..35d1b2110d3 100644
--- a/src/templates/use-cases.tsx
+++ b/src/templates/use-cases.tsx
@@ -433,7 +433,16 @@ const UseCasePage = ({
 }
 
 export const useCasePageQuery = graphql`
-  query UseCasePage($relativePath: String) {
+  query UseCasePage($language: String!, $relativePath: String) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     siteData: site {
       siteMetadata {
         editContentUrl
diff --git a/src/types.ts b/src/types.ts
index 3222c05334e..ee5cd4c6b6d 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -14,6 +14,17 @@ export type Intl = {
   redirect: boolean
 }
 
+export type I18NextContext = {
+  language: string
+  routed: boolean
+  languages: string[]
+  defaultLanguage: string
+  generateDefaultLanguagePage: boolean
+  originalPath: string
+  path: string
+  siteUrl?: string
+}
+
 export type Context = {
   slug: string
   relativePath?: string
@@ -23,12 +34,7 @@ export type Context = {
   isLegal?: boolean
   isDefaultLang?: boolean
   isContentEnglish?: boolean
-
-  // gatsby i18n theme context
-  locale: Lang
-  hrefLang: string
-  originalPath: string
-  dateFormat: string
+  i18n: I18NextContext
 }
 
 export interface DeveloperDocsLink {
diff --git a/src/utils/translations.ts b/src/utils/translations.ts
index 5c96433e6bd..d1073711d1b 100644
--- a/src/utils/translations.ts
+++ b/src/utils/translations.ts
@@ -1,31 +1,13 @@
 import type { Lang } from "./languages"
 import type { Direction } from "../types"
 
-import defaultStrings from "../../i18n/locales/en.json"
+import defaultStrings from "../../i18n/locales/en/index.json"
 
 export type TranslationKey = keyof typeof defaultStrings
 
 export const isTranslationKey = (key: string): key is TranslationKey =>
   Object.keys(defaultStrings).includes(key as TranslationKey)
 
-const consoleError = (message: string): void => {
-  const { NODE_ENV } = process.env
-  if (NODE_ENV === "development") {
-    console.error(message)
-  }
-}
-
-// Returns the en.json value
-export const getDefaultMessage = (key: TranslationKey): string => {
-  const defaultMessage = defaultStrings[key]
-  if (defaultMessage === undefined) {
-    consoleError(
-      `No key "${key}" in en.json. Cannot provide a default message.`
-    )
-  }
-  return defaultMessage || ""
-}
-
 export const isLangRightToLeft = (lang: Lang): boolean => {
   return lang === "ar" || lang === "fa"
 }
diff --git a/yarn.lock b/yarn.lock
index 0b901603978..fb9e71e52a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -248,6 +248,22 @@
   dependencies:
     tslib "~2.0.1"
 
+"@babel/cli@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a"
+  integrity sha512-dLvWH+ZDFAkd2jPBSghrsFBuXrREvFwjpDycXbmUoeochqKYe4zNSLEJYErpLg8dvxvZYe79/MkN461XCwpnGw==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.8"
+    commander "^4.0.1"
+    convert-source-map "^1.1.0"
+    fs-readdir-recursive "^1.1.0"
+    glob "^7.2.0"
+    make-dir "^2.1.0"
+    slash "^2.0.0"
+  optionalDependencies:
+    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
+    chokidar "^3.4.0"
+
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -291,6 +307,11 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483"
   integrity sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==
 
+"@babel/compat-data@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.1.tgz#72d647b4ff6a4f82878d184613353af1dd0290f9"
+  integrity sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg==
+
 "@babel/core@7.12.9":
   version "7.12.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
@@ -334,6 +355,27 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
+"@babel/core@^7.18.9":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.1.tgz#c8fa615c5e88e272564ace3d42fbc8b17bfeb22b"
+  integrity sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.19.0"
+    "@babel/helper-compilation-targets" "^7.19.1"
+    "@babel/helper-module-transforms" "^7.19.0"
+    "@babel/helpers" "^7.19.0"
+    "@babel/parser" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
+    semver "^6.3.0"
+
 "@babel/eslint-parser@^7.15.4":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.16.5.tgz#48d3485091d6e36915358e4c0d0b2ebe6da90462"
@@ -361,6 +403,15 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a"
+  integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==
+  dependencies:
+    "@babel/types" "^7.19.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
@@ -420,6 +471,16 @@
     browserslist "^4.20.2"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz#7f630911d83b408b76fe584831c98e5395d7a17c"
+  integrity sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==
+  dependencies:
+    "@babel/compat-data" "^7.19.1"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
+    semver "^6.3.0"
+
 "@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.5":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz#5d1bcd096792c1ebec6249eebc6358eec55d0cad"
@@ -459,6 +520,19 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
+"@babel/helper-create-class-features-plugin@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
+  integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.9"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+
 "@babel/helper-create-regexp-features-plugin@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"
@@ -541,6 +615,14 @@
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.9"
 
+"@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
+
 "@babel/helper-get-function-arity@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
@@ -590,6 +672,13 @@
   dependencies:
     "@babel/types" "^7.17.0"
 
+"@babel/helper-member-expression-to-functions@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
+  dependencies:
+    "@babel/types" "^7.18.9"
+
 "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
@@ -653,6 +742,20 @@
     "@babel/traverse" "^7.17.12"
     "@babel/types" "^7.17.12"
 
+"@babel/helper-module-transforms@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30"
+  integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
+
 "@babel/helper-optimise-call-expression@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
@@ -667,6 +770,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
 "@babel/helper-plugin-utils@7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
@@ -682,6 +792,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
   integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
 
+"@babel/helper-plugin-utils@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
+  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
+
 "@babel/helper-remap-async-to-generator@^7.16.5":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz#e706646dc4018942acb4b29f7e185bc246d65ac3"
@@ -713,6 +828,17 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
+"@babel/helper-replace-supers@^7.18.9":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
+
 "@babel/helper-simple-access@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517"
@@ -825,6 +951,15 @@
     "@babel/traverse" "^7.17.9"
     "@babel/types" "^7.17.0"
 
+"@babel/helpers@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18"
+  integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
+
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
@@ -877,6 +1012,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240"
   integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==
 
+"@babel/parser@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.1.tgz#6f6d6c2e621aad19a92544cc217ed13f1aac5b4c"
+  integrity sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2":
   version "7.16.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183"
@@ -1196,6 +1336,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
+"@babel/plugin-syntax-typescript@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285"
+  integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-arrow-functions@^7.0.0":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45"
@@ -1677,6 +1824,15 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-typescript" "^7.16.7"
 
+"@babel/plugin-transform-typescript@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.1.tgz#adcf180a041dcbd29257ad31b0c65d4de531ce8d"
+  integrity sha512-+ILcOU+6mWLlvCwnL920m2Ow3wWx3Wo8n2t5aROQmV55GZt+hOiLvBaa3DNzRjSEHa1aauRs4/YLmkCfFkhhRQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/plugin-syntax-typescript" "^7.18.6"
+
 "@babel/plugin-transform-unicode-escapes@^7.16.5":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz#80507c225af49b4f4ee647e2a0ce53d2eeff9e85"
@@ -1835,7 +1991,14 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.12.7", "@babel/template@^7.18.6":
+"@babel/runtime@^7.14.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
+  integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.12.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
   integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
@@ -1926,6 +2089,31 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.1.tgz#0fafe100a8c2a603b4718b1d9bf2568d1d193347"
+  integrity sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.19.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.19.1"
+    "@babel/types" "^7.19.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
+  integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
+  dependencies:
+    "@babel/helper-string-parser" "^7.18.10"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.15.4", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.4.4":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.12.tgz#1210690a516489c0200f355d87619157fbbd69a0"
@@ -1951,6 +2139,15 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600"
+  integrity sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.18.10"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    to-fast-properties "^2.0.0"
+
 "@builder.io/partytown@^0.5.2":
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/@builder.io/partytown/-/partytown-0.5.4.tgz#1a89069978734e132fa4a59414ddb64e4b94fde7"
@@ -2906,13 +3103,6 @@
   dependencies:
     tslib "^2.1.0"
 
-"@formatjs/intl-displaynames@^1.2.0":
-  version "1.2.10"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-1.2.10.tgz#bb9625cca90b099978cd967c6a98aaf4e23fc878"
-  integrity sha512-GROA2RP6+7Ouu0WnHFF78O5XIU7pBfI19WM1qm93l6MFWibUk67nCfVCK3VAYJkLy8L8ZxjkYT11VIAfvSz8wg==
-  dependencies:
-    "@formatjs/intl-utils" "^2.3.0"
-
 "@formatjs/intl-getcanonicallocales@1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.8.0.tgz#2987a879f399b2fdf2812e76431f1db8a5b02a64"
@@ -2920,13 +3110,6 @@
   dependencies:
     tslib "^2.1.0"
 
-"@formatjs/intl-listformat@^1.4.1":
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-1.4.8.tgz#70b81005e7dcf74329cb5b314a940ce5fce36cd0"
-  integrity sha512-WNMQlEg0e50VZrGIkgD5n7+DAMGt3boKi1GJALfhFMymslJb5i+5WzWxyj/3a929Z6MAFsmzRIJjKuv+BxKAOQ==
-  dependencies:
-    "@formatjs/intl-utils" "^2.3.0"
-
 "@formatjs/intl-locale@^2.4.14":
   version "2.4.41"
   resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-2.4.41.tgz#c2597392b130a7589299e7c76b0731b62829680d"
@@ -2951,25 +3134,6 @@
     "@formatjs/ecma402-abstract" "1.7.1"
     tslib "^2.1.0"
 
-"@formatjs/intl-relativetimeformat@^4.5.9":
-  version "4.5.16"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-4.5.16.tgz#7449cef3213dd66d25924ca41f125f87b58df95a"
-  integrity sha512-IQ0haY97oHAH5OYUdykNiepdyEWj3SAT+Fp9ZpR85ov2JNiFx+12WWlxlVS8ehdyncC2ZMt/SwFIy2huK2+6/A==
-  dependencies:
-    "@formatjs/intl-utils" "^2.3.0"
-
-"@formatjs/intl-unified-numberformat@^3.2.0":
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.7.tgz#9995a24568908188e716d81a1de5b702b2ee00e2"
-  integrity sha512-KnWgLRHzCAgT9eyt3OS34RHoyD7dPDYhRcuKn+/6Kv2knDF8Im43J6vlSW6Hm1w63fNq3ZIT1cFk7RuVO3Psag==
-  dependencies:
-    "@formatjs/intl-utils" "^2.3.0"
-
-"@formatjs/intl-utils@^2.2.0", "@formatjs/intl-utils@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz#2dc8c57044de0340eb53a7ba602e59abf80dc799"
-  integrity sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ==
-
 "@gatsbyjs/parcel-namer-relative-to-cwd@^1.6.0":
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/@gatsbyjs/parcel-namer-relative-to-cwd/-/parcel-namer-relative-to-cwd-1.6.0.tgz#d1db17b7dbd52a7c1ee913ff7892b82976e5984d"
@@ -3729,7 +3893,7 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.13":
+"@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.8":
   version "0.3.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
   integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
@@ -3926,6 +4090,11 @@
   dependencies:
     is-promise "^4.0.0"
 
+"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
+  version "2.1.8-no-fsevents.3"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
+  integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -4303,6 +4472,11 @@
     schema-utils "^2.6.5"
     source-map "^0.7.3"
 
+"@polka/url@^1.0.0-next.20":
+  version "1.0.0-next.21"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
+  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
+
 "@popperjs/core@^2.9.3":
   version "2.11.5"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
@@ -4611,14 +4785,6 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
-  integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
-  dependencies:
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-
 "@types/http-cache-semantics@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
@@ -4631,11 +4797,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/invariant@^2.2.31":
-  version "2.2.35"
-  resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.35.tgz#cd3ebf581a6557452735688d8daba6cf0bd5a3be"
-  integrity sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg==
-
 "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
@@ -5286,7 +5447,7 @@ acorn-jsx@^5.3.1:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.1.1:
+acorn-walk@^8.0.0, acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -5301,6 +5462,11 @@ acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.0.4:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
+
 acorn@^8.4.1, acorn@^8.5.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
@@ -5781,6 +5947,17 @@ babel-plugin-extract-import-names@1.6.22:
   dependencies:
     "@babel/helper-plugin-utils" "7.10.4"
 
+babel-plugin-i18next-extract@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-i18next-extract/-/babel-plugin-i18next-extract-0.9.0.tgz#d003985901c6be3d9ce91a70ccd6503121a98c8e"
+  integrity sha512-i/kcv6YlYFvUR8rICPBxP4xQXenFOGe+84hzYLXItJYrLlimph4lne6hoZXYgaU3mVJmtRokcBmn4RvcitizXA==
+  dependencies:
+    "@babel/core" "^7.18.9"
+    "@babel/types" "7.18.10"
+    deepmerge "^4.2.2"
+    i18next "^21.8.14"
+    json-stable-stringify "^1.0.1"
+
 babel-plugin-lodash@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196"
@@ -6240,6 +6417,16 @@ browserslist@^4.21.0:
     node-releases "^2.0.5"
     update-browserslist-db "^1.0.0"
 
+browserslist@^4.21.3:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+  dependencies:
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
+
 browserslist@^4.6.6:
   version "4.20.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
@@ -6466,6 +6653,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001286, can
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz#473d35dabf5e448b463095cab7924e96ccfb8c00"
   integrity sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==
 
+caniuse-lite@^1.0.30001400:
+  version "1.0.30001410"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz#b5a86366fbbf439d75dd3db1d21137a73e829f44"
+  integrity sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==
+
 capital-case@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
@@ -6653,10 +6845,10 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.4.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
-  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
+chokidar@^3.4.0, chokidar@^3.4.2, chokidar@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -6668,10 +6860,10 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chokidar@^3.4.2, chokidar@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+chokidar@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -6880,6 +7072,11 @@ commander@^2.20.0, commander@^2.20.3:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
+commander@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
 commander@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
@@ -7011,7 +7208,7 @@ convert-hrtime@^3.0.0:
   resolved "https://registry.yarnpkg.com/convert-hrtime/-/convert-hrtime-3.0.0.tgz#62c7593f5809ca10be8da858a6d2f702bcda00aa"
   integrity sha512-7V+KqSvMiHp8yWDuwfww06XleMWVVB9b9tURBx+G7UTADuo5hYPuowKloz4OzOqbPezxgo+fdQ1522WzPG4OeA==
 
-convert-source-map@^1.5.0, convert-source-map@^1.7.0:
+convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
@@ -8028,6 +8225,11 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.19.tgz#b02bfdc6a5f1c683849a462cd54258288c087433"
   integrity sha512-TeAjwsC/vhvxEtX/xN1JQUMkl+UrwKXlB4rwLyuLYVuBuRtqJJrU4Jy5pCVihMQg4m1ceZ3MEJ0yYuxHj8vC+w==
 
+electron-to-chromium@^1.4.251:
+  version "1.4.259"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.259.tgz#dc72260121e7cb0863adf27a4951ffab5e7310f8"
+  integrity sha512-dzbPZG0PKsqiSxfZovjBZn5InX4OoSITSsJ5S/U0QRrFaKsQtHx352zbyqtiDpNpX5lnPCAeBS6D+QpWipqDRw==
+
 electron-to-chromium@^1.4.84:
   version "1.4.103"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz#abfe376a4d70fa1e1b4b353b95df5d6dfd05da3a"
@@ -9273,6 +9475,11 @@ fs-monkey@1.0.3:
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
   integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
 
+fs-readdir-recursive@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
+  integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -9648,6 +9855,18 @@ gatsby-plugin-react-helmet@^5.0.0:
   dependencies:
     "@babel/runtime" "^7.15.4"
 
+gatsby-plugin-react-i18next@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-react-i18next/-/gatsby-plugin-react-i18next-2.0.4.tgz#30578f114ee3b365671ab025b85672d9cb5ee933"
+  integrity sha512-B1SXBpFxuhTL1FVhLXmeVLEx6F+40xfJt3Puj3vU2N6E/3ZV0Arq8guhmOUHNHpNYjL/A+/nfxZD2V/HOfa+Vw==
+  dependencies:
+    bluebird "^3.7.2"
+    browser-lang "^0.1.0"
+    outdent "^0.8.0"
+    path-to-regexp "^6.2.0"
+  optionalDependencies:
+    react-helmet "^6.1.0"
+
 gatsby-plugin-react-svg@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/gatsby-plugin-react-svg/-/gatsby-plugin-react-svg-3.1.0.tgz#00269f182793f1f624bbfb9817608f6ee26f7b70"
@@ -9727,6 +9946,14 @@ gatsby-plugin-utils@^3.15.0:
     mini-svg-data-uri "^1.4.4"
     svgo "^2.8.0"
 
+gatsby-plugin-webpack-bundle-analyser-v2@^1.1.27:
+  version "1.1.27"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-webpack-bundle-analyser-v2/-/gatsby-plugin-webpack-bundle-analyser-v2-1.1.27.tgz#449b3b0e66376a0c3580eb5607101f0f79a6125d"
+  integrity sha512-GjX4zU70TOvu3OhpKG8JD/GGfr8tCxjwJKKfRu3WZQTkjIEIGkodxcsdOIbuSHov83hQhlLQBZj037mkCrjrfQ==
+  dependencies:
+    "@babel/runtime" "^7.17.8"
+    webpack-bundle-analyzer "^4.5.0"
+
 gatsby-react-router-scroll@^5.21.0:
   version "5.21.0"
   resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-5.21.0.tgz#48df6fccd99750a5004783d3f9634ec14c36e2b6"
@@ -9833,16 +10060,6 @@ gatsby-telemetry@^3.21.0:
     lodash "^4.17.21"
     node-fetch "^2.6.7"
 
-gatsby-theme-i18n-react-intl@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gatsby-theme-i18n-react-intl/-/gatsby-theme-i18n-react-intl-3.0.0.tgz#2a6711b5f37d2386547c801fe407aca3da6bd94d"
-  integrity sha512-FORodw1fbI5favqgY1cqoqE4N0gNxNEt1/nibGG7phWJwWlw0rFgMQnXBIn5UKzDGiX9FVihevqUn14Eo3PTqA==
-
-gatsby-theme-i18n@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gatsby-theme-i18n/-/gatsby-theme-i18n-3.0.0.tgz#dd4482f0f4842d3142a0d992f29afb6ecd1a62a4"
-  integrity sha512-M8r498/x0IwAQIbt8CQ3G7I9D2bUTBv4dvxD9EPgOGCW9qTVjH5al31vTkxSQ9ialn9BewMQugWQ7AEWwIDrhQ==
-
 gatsby-transformer-csv@^4.0.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/gatsby-transformer-csv/-/gatsby-transformer-csv-4.4.0.tgz#a9e0ff54042ae69b97342114726ba664c67f02e4"
@@ -10213,7 +10430,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3:
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0, glob@^7.2.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -10765,7 +10982,7 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -10794,6 +11011,13 @@ html-entities@^2.1.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
   integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
+html-parse-stringify@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
+  integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==
+  dependencies:
+    void-elements "3.1.0"
+
 html-void-elements@^1.0.0, html-void-elements@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
@@ -10930,6 +11154,13 @@ husky@^4.2.5:
     slash "^3.0.0"
     which-pm-runs "^1.0.0"
 
+i18next@^21.8.14, i18next@^21.9.2:
+  version "21.9.2"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.2.tgz#3f7c5594393eb27117c1db4c38f5ec766e68de0e"
+  integrity sha512-00fVrLQOwy45nm3OtC9l1WiLK3nJlIYSljgCt0qzTaAy65aciMdRy9GsuW+a2AtKtdg9/njUGfRH30LRupV7ZQ==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -11100,26 +11331,6 @@ internmap@^1.0.0:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
-intl-format-cache@^4.2.21:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-4.3.1.tgz#484d31a9872161e6c02139349b259a6229ade377"
-  integrity sha512-OEUYNA7D06agqPOYhbTkl0T8HA3QKSuwWh1HiClEnpd9vw7N+3XsQt5iZ0GUEchp5CW1fQk/tary+NsbF3yQ1Q==
-
-intl-messageformat-parser@^3.6.4:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-3.6.4.tgz#5199d106d816c3dda26ee0694362a9cf823978fb"
-  integrity sha512-RgPGwue0mJtoX2Ax8EmMzJzttxjnva7gx0Q7mKJ4oALrTZvtmCeAw5Msz2PcjW4dtCh/h7vN/8GJCxZO1uv+OA==
-  dependencies:
-    "@formatjs/intl-unified-numberformat" "^3.2.0"
-
-intl-messageformat@^7.8.4:
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-7.8.4.tgz#c29146a06b9cd26662978a4d95fff2b133e3642f"
-  integrity sha512-yS0cLESCKCYjseCOGXuV4pxJm/buTfyCJ1nzQjryHmSehlptbZbn9fnlk1I9peLopZGGbjj46yHHiTAEZ1qOTA==
-  dependencies:
-    intl-format-cache "^4.2.21"
-    intl-messageformat-parser "^3.6.4"
-
 invariant@^2.2.1, invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -11774,6 +11985,13 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
+json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha512-i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg==
+  dependencies:
+    jsonify "~0.0.0"
+
 json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -11800,6 +12018,11 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA==
+
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
@@ -12269,7 +12492,7 @@ luxon@^1.24.1:
   resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.28.0.tgz#e7f96daad3938c06a62de0fb027115d251251fbf"
   integrity sha512-TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ==
 
-make-dir@^2.0.0:
+make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -12790,6 +13013,11 @@ mri@^1.1.5:
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
   integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
 
+mrmime@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
+  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -13097,6 +13325,11 @@ node-releases@^2.0.5:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
   integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
 
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -13340,6 +13573,11 @@ opencollective-postinstall@^2.0.2:
   resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
   integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
 
+opener@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
+
 opentracing@^0.14.5:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/opentracing/-/opentracing-0.14.5.tgz#891fa92cd90a24e64f99bc964370227310926c85"
@@ -13380,6 +13618,11 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
+outdent@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/outdent/-/outdent-0.8.0.tgz#2ebc3e77bf49912543f1008100ff8e7f44428eb0"
+  integrity sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==
+
 p-cancelable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
@@ -13781,6 +14024,11 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
+path-to-regexp@^6.2.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.1.tgz#d54934d6798eb9e5ef14e7af7962c945906918e5"
+  integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==
+
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -14659,6 +14907,14 @@ react-helmet@^6.1.0:
     react-fast-compare "^3.1.1"
     react-side-effect "^2.1.0"
 
+react-i18next@^11.18.6:
+  version "11.18.6"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887"
+  integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==
+  dependencies:
+    "@babel/runtime" "^7.14.5"
+    html-parse-stringify "^3.0.1"
+
 react-icons@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.3.1.tgz#2fa92aebbbc71f43d2db2ed1aed07361124e91ca"
@@ -14693,24 +14949,6 @@ react-instantsearch-dom@^6.32.0:
     react-fast-compare "^3.0.0"
     react-instantsearch-core "6.32.0"
 
-react-intl@^3.12.1:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-3.12.1.tgz#e9a783ea20302e9da25e4eda59e5593a43d2ec80"
-  integrity sha512-cgumW29mwROIqyp8NXStYsoIm27+8FqnxykiLSawWjOxGIBeLuN/+p2srei5SRIumcJefOkOIHP+NDck05RgHg==
-  dependencies:
-    "@formatjs/intl-displaynames" "^1.2.0"
-    "@formatjs/intl-listformat" "^1.4.1"
-    "@formatjs/intl-relativetimeformat" "^4.5.9"
-    "@formatjs/intl-unified-numberformat" "^3.2.0"
-    "@formatjs/intl-utils" "^2.2.0"
-    "@types/hoist-non-react-statics" "^3.3.1"
-    "@types/invariant" "^2.2.31"
-    hoist-non-react-statics "^3.3.2"
-    intl-format-cache "^4.2.21"
-    intl-messageformat "^7.8.4"
-    intl-messageformat-parser "^3.6.4"
-    shallow-equal "^1.2.1"
-
 react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -15634,11 +15872,6 @@ shallow-compare@^1.2.2:
   resolved "https://registry.yarnpkg.com/shallow-compare/-/shallow-compare-1.2.2.tgz#fa4794627bf455a47c4f56881d8a6132d581ffdb"
   integrity sha512-LUMFi+RppPlrHzbqmFnINTrazo0lPNwhcgzuAXVVcfy/mqPDrQmHAyz5bvV0gDAuRFrk804V0HpQ6u9sZ0tBeg==
 
-shallow-equal@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
-  integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==
-
 sharp@^0.30.7:
   version "0.30.7"
   resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.7.tgz#7862bda98804fdd1f0d5659c85e3324b90d94c7c"
@@ -15734,6 +15967,15 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+sirv@^1.0.7:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
+  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
+  dependencies:
+    "@polka/url" "^1.0.0-next.20"
+    mrmime "^1.0.0"
+    totalist "^1.0.0"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -15749,6 +15991,11 @@ sitemap@^7.0.0:
     arg "^5.0.0"
     sax "^1.2.4"
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -16728,6 +16975,11 @@ toml@^3.0.0:
   resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
   integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
 
+totalist@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
+  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -17290,6 +17542,14 @@ update-browserslist-db@^1.0.0:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-browserslist-db@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18"
+  integrity sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 update-notifier@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
@@ -17554,6 +17814,11 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+void-elements@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+  integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==
+
 watchpack-chokidar2@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
@@ -17621,6 +17886,21 @@ webpack-assets-manifest@^5.1.0:
     schema-utils "^3.0"
     tapable "^2.0"
 
+webpack-bundle-analyzer@^4.5.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz#bee2ee05f4ba4ed430e4831a319126bb4ed9f5a6"
+  integrity sha512-oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw==
+  dependencies:
+    acorn "^8.0.4"
+    acorn-walk "^8.0.0"
+    chalk "^4.1.0"
+    commander "^7.2.0"
+    gzip-size "^6.0.0"
+    lodash "^4.17.20"
+    opener "^1.5.2"
+    sirv "^1.0.7"
+    ws "^7.3.1"
+
 webpack-dev-middleware@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz#179cc40795882cae510b1aa7f3710cbe93c9333e"
@@ -17850,6 +18130,11 @@ ws@7.4.5:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
   integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
 
+ws@^7.3.1:
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+
 ws@~7.4.2:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"

From 20ba84c27aee0fc8c43db15098eeda2bb3950098 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Fri, 28 Oct 2022 20:47:42 -0300
Subject: [PATCH 003/108] fixes

---
 src/components/Layer2ProductCard.tsx     |  3 --
 src/components/Layout.tsx                | 43 ++++++++++--------------
 src/components/LearningToolsCardGrid.tsx |  8 ++---
 src/components/Nav/index.tsx             |  2 +-
 src/components/Quiz/QuizSummary.tsx      | 10 +++---
 src/pages/assets.tsx                     | 12 +++----
 src/pages/developers/learning-tools.tsx  |  2 +-
 7 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/src/components/Layer2ProductCard.tsx b/src/components/Layer2ProductCard.tsx
index d82e6089143..d598c27b71f 100644
--- a/src/components/Layer2ProductCard.tsx
+++ b/src/components/Layer2ProductCard.tsx
@@ -8,9 +8,6 @@ import { Box, Center, Flex, Heading, Image, Text } from "@chakra-ui/react"
 import ButtonLink from "./ButtonLink"
 import Link from "./Link"
 
-// Utils
-import { translateMessageId } from "../utils/translations"
-
 export interface IProps {
   children?: React.ReactNode
   url?: string
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 52602e696f2..5335b3cc597 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -158,36 +158,27 @@ const Layout: React.FC<IProps> = ({
             {shouldShowSideNav && <SideNavMobile path={path} />}
           </VisuallyHidden>
           <SkipLinkAnchor id="main-content" />
-          {isMergePage && <Centered id="confetti-easter-egg" />}
           <MainContainer>
             {shouldShowSideNav && (
               <VisuallyHidden isHidden={isZenMode}>
-                <Nav path={path} />
-                {shouldShowSideNav && <SideNavMobile path={path} />}
+                <SideNav path={path} />
               </VisuallyHidden>
-              <SkipLinkAnchor id="main-content" />
-              {isMergePage && <Centered id="confetti-easter-egg" />}
-              <MainContainer>
-                {shouldShowSideNav && (
-                  <VisuallyHidden isHidden={isZenMode}>
-                    <SideNav path={path} />
-                  </VisuallyHidden>
-                )}
-                <MainContent>
-                  <ZenModeContext.Provider
-                    value={{ isZenMode, handleZenModeChange }}
-                  >
-                    <Main>{children}</Main>
-                  </ZenModeContext.Provider>
-                </MainContent>
-              </MainContainer>
-              <VisuallyHidden isHidden={isZenMode}>
-                <Footer />
-              </VisuallyHidden>
-              <FeedbackWidget />
-            </ContentContainer>
-          </ThemeProvider>
-        </ApolloProvider>
+            )}
+            <MainContent>
+              <ZenModeContext.Provider
+                value={{ isZenMode, handleZenModeChange }}
+              >
+                <Main>{children}</Main>
+              </ZenModeContext.Provider>
+            </MainContent>
+          </MainContainer>
+          <VisuallyHidden isHidden={isZenMode}>
+            <Footer />
+          </VisuallyHidden>
+          <FeedbackWidget />
+        </ContentContainer>
+      </ThemeProvider>
+    </ApolloProvider>
   )
 }
 
diff --git a/src/components/LearningToolsCardGrid.tsx b/src/components/LearningToolsCardGrid.tsx
index 164d53d91b5..0aced4d5c53 100644
--- a/src/components/LearningToolsCardGrid.tsx
+++ b/src/components/LearningToolsCardGrid.tsx
@@ -1,12 +1,10 @@
 // Library imports
 import React from "react"
 import { Grid } from "@chakra-ui/react"
-import { useIntl } from "react-intl"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 // Component imports
 import ProductCard from "./ProductCard"
 import Translation from "./Translation"
-// Util imports
-import { translateMessageId } from "../utils/translations"
 // Type imports
 import { LearningToolsCardGridProps } from "../types"
 
@@ -14,7 +12,7 @@ import { LearningToolsCardGridProps } from "../types"
 const LearningToolsCardGrid: React.FC<LearningToolsCardGridProps> = ({
   category,
 }) => {
-  const intl = useIntl()
+  const { t } = useTranslation()
   return (
     <Grid
       templateColumns="repeat(auto-fill, minmax(min(100%, 280px), 1fr))"
@@ -28,7 +26,7 @@ const LearningToolsCardGrid: React.FC<LearningToolsCardGridProps> = ({
             key={name}
             background={background}
             url={url}
-            alt={translateMessageId(alt, intl)}
+            alt={t(alt)}
             image={image}
             name={name}
             subjects={subjects}
diff --git a/src/components/Nav/index.tsx b/src/components/Nav/index.tsx
index 76ece62af75..95cded6dd6e 100644
--- a/src/components/Nav/index.tsx
+++ b/src/components/Nav/index.tsx
@@ -422,7 +422,7 @@ const Nav: React.FC<IProps> = ({ path }) => {
     <NavContainer>
       <StyledNav aria-label={t("nav-primary")}>
         <NavContent>
-          <HomeLogoNavLink to="/" aria-label={translateMessageId("home", intl)}>
+          <HomeLogoNavLink to="/" aria-label={t("home")}>
             <HomeLogo />
           </HomeLogoNavLink>
           {/* Desktop */}
diff --git a/src/components/Quiz/QuizSummary.tsx b/src/components/Quiz/QuizSummary.tsx
index 2b3ac94eaec..486c31dd443 100644
--- a/src/components/Quiz/QuizSummary.tsx
+++ b/src/components/Quiz/QuizSummary.tsx
@@ -1,7 +1,7 @@
 // Import libraries
-import React, { useMemo } from "react"
+import React from "react"
 import { Box, Flex, Text, useMediaQuery } from "@chakra-ui/react"
-import { useIntl } from "react-intl"
+import { useI18next } from "gatsby-plugin-react-i18next"
 
 // Import utilities
 import { numberToPercent } from "../../utils/numberToPercent"
@@ -21,7 +21,7 @@ const QuizSummary: React.FC<IProps> = ({
   questionCount,
   ratioCorrect,
 }) => {
-  const { locale } = useIntl()
+  const { language } = useI18next()
   const [largerThanMobile] = useMediaQuery("(min-width: 30em)")
 
   const valueStyles = { fontWeight: "700", mb: 2 }
@@ -54,7 +54,9 @@ const QuizSummary: React.FC<IProps> = ({
         overflowX="hidden"
       >
         <Flex>
-          <Text {...valueStyles}>{numberToPercent(ratioCorrect, locale)}</Text>
+          <Text {...valueStyles}>
+            {numberToPercent(ratioCorrect, language)}
+          </Text>
           <Text {...labelStyles}>Score</Text>
         </Flex>
         <Flex>
diff --git a/src/pages/assets.tsx b/src/pages/assets.tsx
index 15409c45afd..0488e6d09ae 100644
--- a/src/pages/assets.tsx
+++ b/src/pages/assets.tsx
@@ -133,18 +133,18 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
         </Row>
         <Row>
           <AssetDownload
-            title={translateMessageId("page-assets-hero-panda", intl)}
-            alt={translateMessageId("page-assets-hero-panda", intl)}
+            title={t("page-assets-hero-panda")}
+            alt={t("page-assets-hero-panda")}
             image={data.heroPanda}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-merge-panda", intl)}
-            alt={translateMessageId("page-assets-merge-panda", intl)}
+            title={t("page-assets-merge-panda")}
+            alt={t("page-assets-merge-panda")}
             image={data.mergePanda}
           />
           <AssetDownload
-            title={translateMessageId("page-assets-merge-panda-svg", intl)}
-            alt={translateMessageId("page-assets-merge-panda-svg", intl)}
+            title={t("page-assets-merge-panda-svg")}
+            alt={t("page-assets-merge-panda-svg")}
             svg={MergePandaSvg}
           />
         </Row>
diff --git a/src/pages/developers/learning-tools.tsx b/src/pages/developers/learning-tools.tsx
index b71525d04bc..aabd0d8d63c 100644
--- a/src/pages/developers/learning-tools.tsx
+++ b/src/pages/developers/learning-tools.tsx
@@ -215,7 +215,7 @@ const LearningToolsPage = ({
       name: "Platzi",
       description: "page-learning-tools-platzi-description",
       url: "https://platzi.com/escuela/escuela-blockchain/",
-      image: getImage(data.platzi),
+      image: getImage(data.platzi)!,
       alt: "page-learning-tools-platzi-logo-alt",
       background: "#121f3d",
       subjects: ["Solidity", "web3"],

From 9ed0d41ec9d01ee3ffc6f6f2753017c2de62fadc Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Fri, 28 Oct 2022 22:10:00 -0300
Subject: [PATCH 004/108] remove analyzer

---
 gatsby-config.ts |  1 -
 package.json     |  1 -
 yarn.lock        | 71 +++++-------------------------------------------
 3 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/gatsby-config.ts b/gatsby-config.ts
index be387dc89be..ef4bedc53c6 100644
--- a/gatsby-config.ts
+++ b/gatsby-config.ts
@@ -276,7 +276,6 @@ const config: GatsbyConfig = {
         },
       },
     },
-    "gatsby-plugin-webpack-bundle-analyser-v2",
   ],
   // https://www.gatsbyjs.com/docs/reference/release-notes/v2.28/#feature-flags-in-gatsby-configjs
   flags: {
diff --git a/package.json b/package.json
index 709f813748a..19a89389abc 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,6 @@
     "@types/styled-system": "^5.1.15",
     "babel-plugin-i18next-extract": "^0.9.0",
     "babel-preset-gatsby": "^2.23.0",
-    "gatsby-plugin-webpack-bundle-analyser-v2": "^1.1.27",
     "github-slugger": "^1.3.0",
     "gray-matter": "^4.0.3",
     "husky": "^4.2.5",
diff --git a/yarn.lock b/yarn.lock
index fb9e71e52a5..5fe2271f895 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1991,7 +1991,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.14.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8":
+"@babel/runtime@^7.14.5", "@babel/runtime@^7.17.2":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
   integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
@@ -4472,11 +4472,6 @@
     schema-utils "^2.6.5"
     source-map "^0.7.3"
 
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.21"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
-  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
-
 "@popperjs/core@^2.9.3":
   version "2.11.5"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
@@ -5447,7 +5442,7 @@ acorn-jsx@^5.3.1:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.0.0, acorn-walk@^8.1.1:
+acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -5462,11 +5457,6 @@ acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
-  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
-
 acorn@^8.4.1, acorn@^8.5.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
@@ -9946,14 +9936,6 @@ gatsby-plugin-utils@^3.15.0:
     mini-svg-data-uri "^1.4.4"
     svgo "^2.8.0"
 
-gatsby-plugin-webpack-bundle-analyser-v2@^1.1.27:
-  version "1.1.27"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-webpack-bundle-analyser-v2/-/gatsby-plugin-webpack-bundle-analyser-v2-1.1.27.tgz#449b3b0e66376a0c3580eb5607101f0f79a6125d"
-  integrity sha512-GjX4zU70TOvu3OhpKG8JD/GGfr8tCxjwJKKfRu3WZQTkjIEIGkodxcsdOIbuSHov83hQhlLQBZj037mkCrjrfQ==
-  dependencies:
-    "@babel/runtime" "^7.17.8"
-    webpack-bundle-analyzer "^4.5.0"
-
 gatsby-react-router-scroll@^5.21.0:
   version "5.21.0"
   resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-5.21.0.tgz#48df6fccd99750a5004783d3f9634ec14c36e2b6"
@@ -13013,11 +12995,6 @@ mri@^1.1.5:
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
   integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
 
-mrmime@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
-  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -13573,11 +13550,6 @@ opencollective-postinstall@^2.0.2:
   resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
   integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
 
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
 opentracing@^0.14.5:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/opentracing/-/opentracing-0.14.5.tgz#891fa92cd90a24e64f99bc964370227310926c85"
@@ -14990,6 +14962,11 @@ react-resize-detector@^7.1.2:
   dependencies:
     lodash "^4.17.21"
 
+react-rewards@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/react-rewards/-/react-rewards-2.0.4.tgz#617f6c1bb591f74bb0e0455cc6ff355ee6d36665"
+  integrity sha512-Lw7gIhD8yPDzC6boaVmcXwuTHRLSLAdqB3kZc+29YWvdHWsuc3fdAZlxI8Cm8fvD8fhP+3JkZBtzX224czw15w==
+
 react-select@^4.3.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"
@@ -15967,15 +15944,6 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-sirv@^1.0.7:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
-  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
-  dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^1.0.0"
-
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -16975,11 +16943,6 @@ toml@^3.0.0:
   resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
   integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
 
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
-
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -17886,21 +17849,6 @@ webpack-assets-manifest@^5.1.0:
     schema-utils "^3.0"
     tapable "^2.0"
 
-webpack-bundle-analyzer@^4.5.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz#bee2ee05f4ba4ed430e4831a319126bb4ed9f5a6"
-  integrity sha512-oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw==
-  dependencies:
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    chalk "^4.1.0"
-    commander "^7.2.0"
-    gzip-size "^6.0.0"
-    lodash "^4.17.20"
-    opener "^1.5.2"
-    sirv "^1.0.7"
-    ws "^7.3.1"
-
 webpack-dev-middleware@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz#179cc40795882cae510b1aa7f3710cbe93c9333e"
@@ -18130,11 +18078,6 @@ ws@7.4.5:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
   integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
 
-ws@^7.3.1:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
-
 ws@~7.4.2:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"

From bf6db9ed5279f886665e57b60a31c6f085129575 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Sat, 29 Oct 2022 12:56:16 -0300
Subject: [PATCH 005/108] fix redirects on non mdx pages

---
 gatsby-node.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gatsby-node.ts b/gatsby-node.ts
index 9d267206084..8eaf09d020e 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -420,13 +420,20 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
 
   if (!isMdxPage) {
     const isDefaultLang = page.context.language === defaultLanguage
+    const path = isDefaultLang ? `/${defaultLanguage}${page.path}` : page.path
 
     const { isOutdated, isContentEnglish } = await checkIsPageOutdated(
       page.context.i18n.originalPath,
       page.context.language
     )
 
-    const path = isDefaultLang ? `/${defaultLanguage}${page.path}` : page.path
+    if (isDefaultLang) {
+      createRedirect({
+        ...commonRedirectProps,
+        fromPath: path,
+        toPath: page.path,
+      })
+    }
 
     deletePage(page)
     createPage<Context>({

From f4d00eed5bb1bddccc765bd16c73c967c5b63480 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 31 Oct 2022 15:42:29 -0300
Subject: [PATCH 006/108] add redirects of defaultLang pages

---
 gatsby-node.ts | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gatsby-node.ts b/gatsby-node.ts
index 8eaf09d020e..05063450bdc 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -389,8 +389,6 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
 }) => {
   const { createPage, deletePage, createRedirect } = actions
 
-  const isDefaultLang = page.path.startsWith(`/${defaultLanguage}`)
-
   // if (isDefaultLang) {
   //   const path = page.path.slice(3)
 
@@ -427,14 +425,6 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
       page.context.language
     )
 
-    if (isDefaultLang) {
-      createRedirect({
-        ...commonRedirectProps,
-        fromPath: path,
-        toPath: page.path,
-      })
-    }
-
     deletePage(page)
     createPage<Context>({
       ...page,
@@ -446,6 +436,14 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
         isContentEnglish,
       },
     })
+
+    if (isDefaultLang) {
+      createRedirect({
+        ...commonRedirectProps,
+        fromPath: page.path,
+        toPath: path,
+      })
+    }
   }
 }
 

From db8d10f6010e3528c61d49dc032043a10e33bf18 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 31 Oct 2022 17:52:15 -0300
Subject: [PATCH 007/108] add comments

---
 gatsby-node.ts | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/gatsby-node.ts b/gatsby-node.ts
index 05063450bdc..6ea014e0eff 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -389,43 +389,35 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
 }) => {
   const { createPage, deletePage, createRedirect } = actions
 
-  // if (isDefaultLang) {
-  //   const path = page.path.slice(3)
-
-  //   if (IS_DEV) {
-  //     // create routes without the lang prefix e.g. `/{path}` as our i18n plugin
-  //     // only creates `/{lang}/{path}` routes. This is useful on dev env to avoid
-  //     // getting a 404 since we don't have server side redirects
-  //     createPage({ ...page, path })
-  //   }
-
-  //   if (!IS_DEV && !path.match(/^\/404(\/|.html)$/)) {
-  //     // on prod, indicate our servers to redirect the root paths to the
-  //     // `/{defaultLang}/{path}`
-  //     createRedirect({
-  //       ...commonRedirectProps,
-  //       fromPath: path,
-  //       toPath: page.path,
-  //     })
-  //   }
-  // }
-
   if (!page.context) {
     return
   }
 
-  const isMdxPage = page.context.isOutdated !== undefined
+  // these are the native Gatsby pages (those living under `/pages`)
+  // which do not pass through the `createPages` hook thus they don't have our
+  // custom context in them
+  const isPageWithoutCustomContext = page.context.isOutdated === undefined
 
-  if (!isMdxPage) {
+  if (isPageWithoutCustomContext) {
     const isDefaultLang = page.context.language === defaultLanguage
     const path = isDefaultLang ? `/${defaultLanguage}${page.path}` : page.path
 
+    // as we don't have our custom context for this page, we calculate & add it
+    // later to them
     const { isOutdated, isContentEnglish } = await checkIsPageOutdated(
       page.context.i18n.originalPath,
       page.context.language
     )
 
-    deletePage(page)
+    // on dev, we will have 2 pages for the default lang
+    // - 1 for the ones with the prefix `/{defaultLang}/learn/`
+    // - 1 for the ones without the prefix `/learn/`
+    //   we do this to avoid having a 404 on those without the prefix since in
+    //   dev we don't have the redirects from the server
+    if (!IS_DEV) {
+      deletePage(page)
+    }
+
     createPage<Context>({
       ...page,
       path,
@@ -437,7 +429,7 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
       },
     })
 
-    if (isDefaultLang) {
+    if (isDefaultLang && !path.match(/^\/404(\/|.html)$/)) {
       createRedirect({
         ...commonRedirectProps,
         fromPath: page.path,

From ba73184c95a76f400f684beac2575036a86a7e90 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 31 Oct 2022 18:04:00 -0300
Subject: [PATCH 008/108] enable generateDefaultLanguagePage

---
 gatsby-config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gatsby-config.ts b/gatsby-config.ts
index ef4bedc53c6..58cd9cf336b 100644
--- a/gatsby-config.ts
+++ b/gatsby-config.ts
@@ -261,6 +261,7 @@ const config: GatsbyConfig = {
         localeJsonSourceName: `locale`, // name given to `gatsby-source-filesystem` plugin.
         languages: supportedLanguages,
         defaultLanguage: defaultLanguage,
+        generateDefaultLanguagePage: true,
         // if you are using Helmet, you must include siteUrl, and make sure you add http:https
         siteUrl,
         // if you are using trailingSlash gatsby config include it here, as well (the default is 'always')

From 5fb1643e665391ab0b197197f19fd5657e06777e Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 31 Oct 2022 18:16:53 -0300
Subject: [PATCH 009/108] add translations to languages page

---
 src/pages/languages.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/pages/languages.tsx b/src/pages/languages.tsx
index 27a2ed6d4a9..da97291ef61 100644
--- a/src/pages/languages.tsx
+++ b/src/pages/languages.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from "react"
+import { graphql } from "gatsby"
 import styled from "@emotion/styled"
 import { useTranslation } from "gatsby-plugin-react-i18next"
 
@@ -167,3 +168,17 @@ const LanguagesPage = () => {
 }
 
 export default LanguagesPage
+
+export const query = graphql`
+  query LanguagesPage($language: String!) {
+    locales: allLocale(filter: { language: { eq: $language } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
+  }
+`

From 47379981384e0ea239c269ab60b3c773abd692bc Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 31 Oct 2022 19:37:47 -0300
Subject: [PATCH 010/108] fix redirects

---
 gatsby-node.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gatsby-node.ts b/gatsby-node.ts
index 6ea014e0eff..b347f4b1251 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -399,14 +399,14 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
   const isPageWithoutCustomContext = page.context.isOutdated === undefined
 
   if (isPageWithoutCustomContext) {
-    const isDefaultLang = page.context.language === defaultLanguage
-    const path = isDefaultLang ? `/${defaultLanguage}${page.path}` : page.path
+    const { language, i18n } = page.context
+    const isDefaultLang = language === defaultLanguage
 
     // as we don't have our custom context for this page, we calculate & add it
     // later to them
     const { isOutdated, isContentEnglish } = await checkIsPageOutdated(
-      page.context.i18n.originalPath,
-      page.context.language
+      i18n.originalPath,
+      language
     )
 
     // on dev, we will have 2 pages for the default lang
@@ -414,13 +414,10 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
     // - 1 for the ones without the prefix `/learn/`
     //   we do this to avoid having a 404 on those without the prefix since in
     //   dev we don't have the redirects from the server
-    if (!IS_DEV) {
-      deletePage(page)
-    }
 
+    deletePage(page)
     createPage<Context>({
       ...page,
-      path,
       context: {
         ...page.context,
         isOutdated,
@@ -429,11 +426,14 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
       },
     })
 
-    if (isDefaultLang && !path.match(/^\/404(\/|.html)$/)) {
+    const rootPath = page.path.slice(3)
+    // `routed` means that the page have the lang prefix on the url
+    // e.g. `/en/learn` or `/en`
+    if (isDefaultLang && i18n.routed && !rootPath.match(/^\/404(\/|.html)$/)) {
       createRedirect({
         ...commonRedirectProps,
-        fromPath: page.path,
-        toPath: path,
+        fromPath: rootPath,
+        toPath: page.path,
       })
     }
   }

From d7cbb98839f40c30b9a8685ef56cab637a4826f4 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 31 Oct 2022 22:02:03 -0300
Subject: [PATCH 011/108] fix custom 404 pages

---
 gatsby-node.ts            | 46 +++++++++++++++++++++++++--------------
 src/components/Layout.tsx |  1 -
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/gatsby-node.ts b/gatsby-node.ts
index b347f4b1251..e1f10ec4f43 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -409,14 +409,7 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
       language
     )
 
-    // on dev, we will have 2 pages for the default lang
-    // - 1 for the ones with the prefix `/{defaultLang}/learn/`
-    // - 1 for the ones without the prefix `/learn/`
-    //   we do this to avoid having a 404 on those without the prefix since in
-    //   dev we don't have the redirects from the server
-
-    deletePage(page)
-    createPage<Context>({
+    let newPage = {
       ...page,
       context: {
         ...page.context,
@@ -424,17 +417,38 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
         //display TranslationBanner for translation-component pages that are still in English
         isContentEnglish,
       },
-    })
+    }
+
+    // there seems to be a bug in the i18n plugin where 404 pages get a
+    // duplicated `/lang` in their `matchPath`s
+    if (newPage.matchPath?.includes(`/${language}/${language}/*`)) {
+      newPage = { ...newPage, matchPath: `/${language}/*` }
+    }
+
+    // on dev, we will have 2 pages for the default lang
+    // - 1 for the ones with the prefix `/{defaultLang}/learn/`
+    // - 1 for the ones without the prefix `/learn/`
+    //   we do this to avoid having a 404 on those without the prefix since in
+    //   dev we don't have the redirects from the server
+    deletePage(page)
+
+    if (IS_DEV) {
+      createPage<Context>(newPage)
+    }
 
-    const rootPath = page.path.slice(3)
     // `routed` means that the page have the lang prefix on the url
     // e.g. `/en/learn` or `/en`
-    if (isDefaultLang && i18n.routed && !rootPath.match(/^\/404(\/|.html)$/)) {
-      createRedirect({
-        ...commonRedirectProps,
-        fromPath: rootPath,
-        toPath: page.path,
-      })
+    if (!IS_DEV && i18n.routed) {
+      createPage<Context>(newPage)
+
+      const rootPath = page.path.slice(3)
+      if (isDefaultLang && !rootPath.match(/^\/404(\/|.html)$/)) {
+        createRedirect({
+          ...commonRedirectProps,
+          fromPath: rootPath,
+          toPath: page.path,
+        })
+      }
     }
   }
 }
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 5335b3cc597..8eed283bd5d 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -90,7 +90,6 @@ const Layout: React.FC<IProps> = ({
 
   const [isZenMode, setIsZenMode] = useState<boolean>(false)
   const [shouldShowSideNav, setShouldShowSideNav] = useState<boolean>(false)
-  const locale = pageContext.i18n.language
 
   // Exit Zen Mode on 'esc' click
   useKeyPress(`Escape`, () => handleZenModeChange(false))

From 69126da232a73e22c501d095ca003481be6ac1ff Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Tue, 1 Nov 2022 10:20:20 -0300
Subject: [PATCH 012/108] use gatsby-plugin-layout to wrap the page with a
 component and simplify our browser & ssr gatsby files

---
 gatsby-browser.tsx | 25 -------------------------
 gatsby-config.ts   | 10 ++++++++++
 gatsby-ssr.tsx     | 27 ---------------------------
 package.json       |  1 +
 yarn.lock          |  7 +++++++
 5 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/gatsby-browser.tsx b/gatsby-browser.tsx
index 3c483e0e496..bfb9a18f2c4 100644
--- a/gatsby-browser.tsx
+++ b/gatsby-browser.tsx
@@ -4,9 +4,6 @@
  * See: https://www.gatsbyjs.org/docs/browser-apis/
  */
 
-import React from "react"
-import { GatsbyBrowser } from "gatsby"
-
 import Prism from "prism-react-renderer/prism"
 ;(typeof global !== "undefined" ? global : window).Prism = Prism
 
@@ -15,28 +12,6 @@ import "@formatjs/intl-locale/polyfill"
 import "@formatjs/intl-numberformat/polyfill"
 import "@formatjs/intl-numberformat/locale-data/en"
 
-import Layout from "./src/components/Layout"
-import { Context } from "./src/types"
-
 // Default languages included:
 // https://github.com/FormidableLabs/prism-react-renderer/blob/master/src/vendor/prism/includeLangs.js
 require("prismjs/components/prism-solidity")
-
-// Prevents <Layout/> from unmounting on page transitions
-// https://www.gatsbyjs.com/docs/layout-components/#how-to-prevent-layout-components-from-unmounting
-export const wrapPageElement: GatsbyBrowser<
-  any,
-  Context
->["wrapPageElement"] = ({ element, props }) => {
-  const newElement = React.cloneElement(
-    element, // I18nextProvider
-    element.props,
-    React.cloneElement(
-      element.props.children, // I18nextContext.Provider
-      element.props.children.props,
-      React.createElement(Layout, props, element.props.children.props.children)
-    )
-  )
-
-  return newElement
-}
diff --git a/gatsby-config.ts b/gatsby-config.ts
index 58cd9cf336b..59b8f75643b 100644
--- a/gatsby-config.ts
+++ b/gatsby-config.ts
@@ -255,6 +255,15 @@ const config: GatsbyConfig = {
         name: `locale`,
       },
     },
+    // Wraps the entire page with a custom layout component
+    // Note: keep this before the i18n plugin declaration in order to have the
+    // i18n provider wrapping the layout component
+    {
+      resolve: `gatsby-plugin-layout`,
+      options: {
+        component: path.resolve(`./src/components/Layout`),
+      },
+    },
     {
       resolve: `gatsby-plugin-react-i18next`,
       options: {
@@ -262,6 +271,7 @@ const config: GatsbyConfig = {
         languages: supportedLanguages,
         defaultLanguage: defaultLanguage,
         generateDefaultLanguagePage: true,
+        redirect: false,
         // if you are using Helmet, you must include siteUrl, and make sure you add http:https
         siteUrl,
         // if you are using trailingSlash gatsby config include it here, as well (the default is 'always')
diff --git a/gatsby-ssr.tsx b/gatsby-ssr.tsx
index 3ea24abf4f2..22ddf1ee242 100644
--- a/gatsby-ssr.tsx
+++ b/gatsby-ssr.tsx
@@ -3,30 +3,3 @@
  *
  * See: https://www.gatsbyjs.org/docs/ssr-apis/
  */
-
-import React from "react"
-
-import type { GatsbySSR } from "gatsby"
-
-import Layout from "./src/components/Layout"
-
-import { Context } from "./src/types"
-
-// Prevents <Layout/> from unmounting on page transitions
-// https://www.gatsbyjs.com/docs/layout-components/#how-to-prevent-layout-components-from-unmounting
-export const wrapPageElement: GatsbySSR<any, Context>["wrapPageElement"] = ({
-  element,
-  props,
-}) => {
-  const newElement = React.cloneElement(
-    element, // I18nextProvider
-    element.props,
-    React.cloneElement(
-      element.props.children, // I18nextContext.Provider
-      element.props.children.props,
-      React.createElement(Layout, props, element.props.children.props.children)
-    )
-  )
-
-  return newElement
-}
diff --git a/package.json b/package.json
index 19a89389abc..f2218584aa3 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "gatsby-plugin-emotion": "^7.19.0",
     "gatsby-plugin-gatsby-cloud": "^4.20.0",
     "gatsby-plugin-image": "^2.21.0",
+    "gatsby-plugin-layout": "^3.24.0",
     "gatsby-plugin-manifest": "^4.21.0",
     "gatsby-plugin-matomo": "^0.9.0",
     "gatsby-plugin-mdx": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5fe2271f895..2805cdfbc4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9741,6 +9741,13 @@ gatsby-plugin-image@^2.21.0:
     objectFitPolyfill "^2.3.5"
     prop-types "^15.8.1"
 
+gatsby-plugin-layout@^3.24.0:
+  version "3.24.0"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-layout/-/gatsby-plugin-layout-3.24.0.tgz#2c3a046187e7c749f93eedb10101e7c806498c5e"
+  integrity sha512-h0cFnHKPF30swrpcWt1d8EbSr3yXX5gE7WUhIrg15uszFIsFFK0gveXWVUs71Y+FrZHIPd4ASvGnHheL47VWnQ==
+  dependencies:
+    "@babel/runtime" "^7.15.4"
+
 gatsby-plugin-manifest@^4.21.0:
   version "4.21.0"
   resolved "https://registry.yarnpkg.com/gatsby-plugin-manifest/-/gatsby-plugin-manifest-4.21.0.tgz#15f0c6905be2604e22f2f7dddf239411393ab8f4"

From 6f2e080131bc3d62d1bc9f728e4926c44bdabfd0 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Thu, 3 Nov 2022 15:06:39 -0300
Subject: [PATCH 013/108] dangerously insert html translation string in
 specific parts of the code

---
 gatsby-config.ts                              | 18 ++++--
 src/components/FeedbackCard.tsx               | 13 +++--
 src/components/Staking/StakingHierarchy.tsx   | 19 ++++--
 .../Staking/StakingHowSoloWorks.tsx           | 10 +++-
 src/components/Translation.tsx                |  7 ++-
 src/pages-conditional/what-is-ethereum.tsx    | 16 +++--
 src/pages/layer-2.tsx                         | 58 +++++++++++--------
 src/pages/run-a-node.tsx                      |  8 ++-
 src/pages/staking/index.tsx                   | 18 ++++--
 src/pages/upgrades/vision.tsx                 |  8 ++-
 10 files changed, 114 insertions(+), 61 deletions(-)

diff --git a/gatsby-config.ts b/gatsby-config.ts
index 59b8f75643b..6f2e358d13a 100644
--- a/gatsby-config.ts
+++ b/gatsby-config.ts
@@ -272,15 +272,25 @@ const config: GatsbyConfig = {
         defaultLanguage: defaultLanguage,
         generateDefaultLanguagePage: true,
         redirect: false,
-        // if you are using Helmet, you must include siteUrl, and make sure you add http:https
         siteUrl,
-        // if you are using trailingSlash gatsby config include it here, as well (the default is 'always')
         trailingSlash: "always",
-        // you can pass any i18next options
+        // i18next options
         i18nextOptions: {
           fallbackLng: defaultLanguage,
           interpolation: {
-            escapeValue: false, // not needed for react as it escapes by default
+            escapeValue: false,
+          },
+          react: {
+            transSupportBasicHtmlNodes: true,
+            transKeepBasicHtmlNodesFor: [
+              "br",
+              "strong",
+              "i",
+              "bold",
+              "b",
+              "em",
+              "sup",
+            ],
           },
           keySeparator: false,
           nsSeparator: false,
diff --git a/src/components/FeedbackCard.tsx b/src/components/FeedbackCard.tsx
index 95950424607..e49bae78697 100644
--- a/src/components/FeedbackCard.tsx
+++ b/src/components/FeedbackCard.tsx
@@ -2,6 +2,7 @@
 import React, { ReactNode, useState } from "react"
 import { Icon } from "@chakra-ui/react"
 import styled from "@emotion/styled"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 // Component imports
 import Button from "./Button"
 import Translation from "./Translation"
@@ -51,6 +52,7 @@ const FeedbackCard: React.FC<IProps> = ({
   isArticle = false,
   className,
 }) => {
+  const { t } = useTranslation()
   const [feedbackSubmitted, setFeedbackSubmitted] = useState(false)
   const surveyUrl = useSurvey(feedbackSubmitted)
 
@@ -88,10 +90,13 @@ const FeedbackCard: React.FC<IProps> = ({
       <Content>
         <Title>{getTitle(feedbackSubmitted)}</Title>
         {feedbackSubmitted && (
-          <p>
-            <Translation id="feedback-widget-thank-you-subtitle" />{" "}
-            <Translation id="feedback-widget-thank-you-subtitle-ext" />
-          </p>
+          <p
+            dangerouslySetInnerHTML={{
+              __html: `${t("feedback-widget-thank-you-subtitle")} ${t(
+                "feedback-widget-thank-you-subtitle-ext"
+              )}`,
+            }}
+          />
         )}
         <ButtonContainer>
           {!feedbackSubmitted ? (
diff --git a/src/components/Staking/StakingHierarchy.tsx b/src/components/Staking/StakingHierarchy.tsx
index df86fa3572c..01718b12d44 100644
--- a/src/components/Staking/StakingHierarchy.tsx
+++ b/src/components/Staking/StakingHierarchy.tsx
@@ -1,6 +1,7 @@
 // Libraries
 import React from "react"
 import styled from "@emotion/styled"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 // Components
 import ButtonLink from "../ButtonLink"
@@ -254,6 +255,8 @@ const Line = styled.aside`
 export interface IProps {}
 
 const StakingHierarchy: React.FC<IProps> = () => {
+  const { t } = useTranslation()
+
   return (
     <Container>
       <Section number={1}>
@@ -287,9 +290,11 @@ const StakingHierarchy: React.FC<IProps> = () => {
           <SoloGlyph />
         </Glyph>
         <Content>
-          <p>
-            <Translation id="page-staking-hierarchy-solo-p1" />
-          </p>
+          <p
+            dangerouslySetInnerHTML={{
+              __html: t("page-staking-hierarchy-solo-p1"),
+            }}
+          />
           <p>
             <Translation id="page-staking-hierarchy-solo-p2" />
           </p>
@@ -441,9 +446,11 @@ const StakingHierarchy: React.FC<IProps> = () => {
           <p>
             <Translation id="page-staking-hierarchy-cex-p2" />
           </p>
-          <p>
-            <Translation id="page-staking-hierarchy-cex-p3" />
-          </p>
+          <p
+            dangerouslySetInnerHTML={{
+              __html: t("page-staking-hierarchy-cex-p3"),
+            }}
+          />
         </Content>
       </Section>
     </Container>
diff --git a/src/components/Staking/StakingHowSoloWorks.tsx b/src/components/Staking/StakingHowSoloWorks.tsx
index 01f544bb57c..9a137961e03 100644
--- a/src/components/Staking/StakingHowSoloWorks.tsx
+++ b/src/components/Staking/StakingHowSoloWorks.tsx
@@ -2,6 +2,7 @@ import React from "react"
 import styled from "@emotion/styled"
 import { graphql, useStaticQuery } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
+import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import OrderedList from "../OrderedList"
 import Translation from "../Translation"
@@ -22,6 +23,7 @@ const Image = styled(GatsbyImage)``
 export interface IProps {}
 
 const StakingHowSoloWorks: React.FC<IProps> = () => {
+  const { t } = useTranslation()
   const { image } = useStaticQuery(graphql`
     {
       image: file(relativePath: { eq: "hackathon_transparent.png" }) {
@@ -38,9 +40,11 @@ const StakingHowSoloWorks: React.FC<IProps> = () => {
   `)
 
   const items = [
-    <p>
-      <Translation id="page-staking-how-solo-works-item-1" />
-    </p>,
+    <p
+      dangerouslySetInnerHTML={{
+        __html: t("page-staking-how-solo-works-item-1"),
+      }}
+    />,
     <p>
       <Translation id="page-staking-how-solo-works-item-2" />
     </p>,
diff --git a/src/components/Translation.tsx b/src/components/Translation.tsx
index ff0fae7e74e..9e3a2d9be91 100644
--- a/src/components/Translation.tsx
+++ b/src/components/Translation.tsx
@@ -1,9 +1,12 @@
 import React from "react"
 import { Trans } from "gatsby-plugin-react-i18next"
-import { TranslationKey } from "../utils/translations"
+
+interface Props extends React.ComponentProps<typeof Trans> {
+  id: string
+}
 
 // Wrapper on <FormattedHTMLMessage /> to always fallback to English
 // Use this component for any user-facing string
-const Translation = ({ id }: { id: TranslationKey }) => <Trans>{id}</Trans>
+const Translation = ({ id, ...rest }: Props) => <Trans i18nKey={id} {...rest} />
 
 export default Translation
diff --git a/src/pages-conditional/what-is-ethereum.tsx b/src/pages-conditional/what-is-ethereum.tsx
index 315de633163..ce902404b96 100644
--- a/src/pages-conditional/what-is-ethereum.tsx
+++ b/src/pages-conditional/what-is-ethereum.tsx
@@ -649,17 +649,21 @@ const WhatIsEthereumPage = ({
                   <p>
                     <Translation id="page-what-is-ethereum-slide-2-desc-1" />
                   </p>
-                  <p>
-                    <Translation id="page-what-is-ethereum-slide-2-desc-2" />
-                  </p>
+                  <p
+                    dangerouslySetInnerHTML={{
+                      __html: t("page-what-is-ethereum-slide-2-desc-2"),
+                    }}
+                  />
                 </EmblaSlide>
                 <EmblaSlide>
                   <h3>
                     <Translation id="page-what-is-ethereum-slide-3-title" />
                   </h3>
-                  <p>
-                    <Translation id="page-what-is-ethereum-slide-3-desc-1" />
-                  </p>
+                  <p
+                    dangerouslySetInnerHTML={{
+                      __html: t("page-what-is-ethereum-slide-3-desc-1"),
+                    }}
+                  />
                 </EmblaSlide>
                 <EmblaSlide>
                   <h3>
diff --git a/src/pages/layer-2.tsx b/src/pages/layer-2.tsx
index 56e61f4c162..e094b5f490f 100644
--- a/src/pages/layer-2.tsx
+++ b/src/pages/layer-2.tsx
@@ -552,12 +552,16 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             <h2>
               <Translation id="layer-2-why-do-we-need-layer-2-title" />
             </h2>
-            <p>
-              <Translation id="layer-2-why-do-we-need-layer-2-1" />
-            </p>
-            <p>
-              <Translation id="layer-2-why-do-we-need-layer-2-2" />
-            </p>
+            <p
+              dangerouslySetInnerHTML={{
+                __html: t("layer-2-why-do-we-need-layer-2-1"),
+              }}
+            />
+            <p
+              dangerouslySetInnerHTML={{
+                __html: t("layer-2-why-do-we-need-layer-2-2"),
+              }}
+            />
 
             <h3>
               <Translation id="layer-2-why-do-we-need-layer-2-scalability" />
@@ -565,9 +569,11 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             <p>
               <Translation id="layer-2-why-do-we-need-layer-2-scalability-1" />
             </p>
-            <p>
-              <Translation id="layer-2-why-do-we-need-layer-2-scalability-2" />
-            </p>
+            <p
+              dangerouslySetInnerHTML={{
+                __html: t("layer-2-why-do-we-need-layer-2-scalability-2"),
+              }}
+            />
             <Link to="/upgrades/vision/">
               <Translation id="layer-2-why-do-we-need-layer-2-scalability-3" />
             </Link>
@@ -603,9 +609,7 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             <h3>
               <Translation id="layer-2-rollups-title" />
             </h3>
-            <p>
-              <Translation id="layer-2-rollups-1" />
-            </p>
+            <p dangerouslySetInnerHTML={{ __html: t("layer-2-rollups-1") }} />
             <p>
               <Translation id="layer-2-rollups-2" />
             </p>
@@ -673,9 +677,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
         <p>
           <Translation id="layer-2-use-layer-2-1" />
         </p>
-        <p>
-          <Translation id="layer-2-contract-accounts" />
-        </p>
+        <p
+          dangerouslySetInnerHTML={{ __html: t("layer-2-contract-accounts") }}
+        />
         <h3>
           <Translation id="layer-2-use-layer-2-generalized-title" />
         </h3>
@@ -843,12 +847,16 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
           <p>
             <Translation id="layer-2-faq-question-4-description-1" />
           </p>
-          <p>
-            <Translation id="layer-2-faq-question-4-description-2" />
-          </p>
-          <p>
-            <Translation id="layer-2-faq-question-4-description-3" />{" "}
-          </p>
+          <p
+            dangerouslySetInnerHTML={{
+              __html: t("layer-2-faq-question-4-description-2"),
+            }}
+          />
+          <p
+            dangerouslySetInnerHTML={{
+              __html: t("layer-2-faq-question-4-description-3"),
+            }}
+          />
           <p>
             <Link to="/bridges/">
               <Translation id="layer-2-more-on-bridges" />
@@ -862,9 +870,11 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
               <Translation id="layer-2-faq-question-5-view-listing-policy" />
             </Link>
           </p>
-          <p>
-            <Translation id="layer-2-faq-question-5-description-2" />
-          </p>
+          <p
+            dangerouslySetInnerHTML={{
+              __html: t("layer-2-faq-question-5-description-2"),
+            }}
+          />
         </ExpandableCard>
       </PaddedContent>
 
diff --git a/src/pages/run-a-node.tsx b/src/pages/run-a-node.tsx
index 8bdfa5b2a35..2dcf2bb5fc3 100644
--- a/src/pages/run-a-node.tsx
+++ b/src/pages/run-a-node.tsx
@@ -943,9 +943,11 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
           <StyledEmoji text=":cut_of_meat:" size={2} />
           <Translation id="page-run-a-node-staking-plans-title" />
         </h3>
-        <p>
-          <Translation id="page-run-a-node-staking-plans-description" />
-        </p>
+        <p
+          dangerouslySetInnerHTML={{
+            __html: t("page-run-a-node-staking-plans-description"),
+          }}
+        />
         <p>
           <Translation id="page-run-a-node-staking-plans-ethstaker-link-description" />{" "}
           -{" "}
diff --git a/src/pages/staking/index.tsx b/src/pages/staking/index.tsx
index 1c173f4403e..472c0e9885d 100644
--- a/src/pages/staking/index.tsx
+++ b/src/pages/staking/index.tsx
@@ -470,9 +470,13 @@ const StakingPage = ({
                   <li>
                     <Translation id="page-staking-section-comparison-solo-requirements-li2" />
                   </li>
-                  <li>
-                    <Translation id="page-staking-section-comparison-solo-requirements-li3" />
-                  </li>
+                  <li
+                    dangerouslySetInnerHTML={{
+                      __html: t(
+                        "page-staking-section-comparison-solo-requirements-li3"
+                      ),
+                    }}
+                  />
                 </ul>
               </div>
               <div style={{ gridArea: "solo-cta" }}>
@@ -628,9 +632,11 @@ const StakingPage = ({
               <p>
                 <Translation id="page-staking-faq-3-answer-p1" />
               </p>
-              <p>
-                <Translation id="page-staking-faq-3-answer-p2" />
-              </p>
+              <p
+                dangerouslySetInnerHTML={{
+                  __html: t("page-staking-faq-3-answer-p2"),
+                }}
+              />
             </ExpandableCard>
           </Content>
           <Content>
diff --git a/src/pages/upgrades/vision.tsx b/src/pages/upgrades/vision.tsx
index 5b780e904b7..5bb40ccb982 100644
--- a/src/pages/upgrades/vision.tsx
+++ b/src/pages/upgrades/vision.tsx
@@ -218,9 +218,11 @@ const VisionPage = ({
           <p>
             <Translation id="page-upgrades-vision-scalability-desc" />
           </p>
-          <p>
-            <Translation id="page-upgrades-vision-scalability-desc-3" />
-          </p>
+          <p
+            dangerouslySetInnerHTML={{
+              __html: t("page-upgrades-vision-scalability-desc-3"),
+            }}
+          />
           <p>
             <Translation id="page-upgrades-vision-scalability-desc-4" />{" "}
             <Link to="/upgrades/sharding/">

From 2e7dc1f2138dd0c8d516407cd4af6ea06e3097d1 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Thu, 3 Nov 2022 22:47:31 -0300
Subject: [PATCH 014/108] fix translation function

---
 src/pages-conditional/dapps.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages-conditional/dapps.tsx b/src/pages-conditional/dapps.tsx
index f61c0edc648..2f10e1b092c 100644
--- a/src/pages-conditional/dapps.tsx
+++ b/src/pages-conditional/dapps.tsx
@@ -557,10 +557,10 @@ const DappsPage = ({
     },
     {
       title: "PWN",
-      description: translateMessageId("page-dapps-dapp-description-pwn", intl),
+      description: t("page-dapps-dapp-description-pwn"),
       link: "https://pwn.xyz",
       image: getImage(data.pwn),
-      alt: translateMessageId("page-dapps-pwn-image-alt", intl),
+      alt: t("page-dapps-pwn-image-alt"),
     },
   ]
 

From 5ee0309e1ae1a593ad35eb90432cbf57826c145b Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Fri, 4 Nov 2022 10:32:54 -0300
Subject: [PATCH 015/108] cleanup

---
 package.json |   4 -
 yarn.lock    | 299 +++------------------------------------------------
 2 files changed, 14 insertions(+), 289 deletions(-)

diff --git a/package.json b/package.json
index 75453946944..c793b0cc7ac 100644
--- a/package.json
+++ b/package.json
@@ -70,15 +70,12 @@
     "react-i18next": "^11.18.6",
     "react-icons": "^4.3.1",
     "react-instantsearch-dom": "^6.32.0",
-    "react-rewards": "^2.0.4",
     "react-select": "^4.3.0",
     "recharts": "^2.1.9",
     "styled-system": "^5.1.5",
     "unist-util-visit-parents": "^2.1.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.18.10",
-    "@babel/plugin-transform-typescript": "^7.19.1",
     "@netlify/functions": "^1.2.0",
     "@types/browser-lang": "^0.1.0",
     "@types/github-slugger": "^1.3.0",
@@ -89,7 +86,6 @@
     "@types/react-dom": "^18.0.6",
     "@types/react-instantsearch-core": "^6.26.2",
     "@types/styled-system": "^5.1.15",
-    "babel-plugin-i18next-extract": "^0.9.0",
     "babel-preset-gatsby": "^2.23.0",
     "github-slugger": "^1.3.0",
     "gray-matter": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 2805cdfbc4c..cd9023286d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -248,22 +248,6 @@
   dependencies:
     tslib "~2.0.1"
 
-"@babel/cli@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a"
-  integrity sha512-dLvWH+ZDFAkd2jPBSghrsFBuXrREvFwjpDycXbmUoeochqKYe4zNSLEJYErpLg8dvxvZYe79/MkN461XCwpnGw==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.8"
-    commander "^4.0.1"
-    convert-source-map "^1.1.0"
-    fs-readdir-recursive "^1.1.0"
-    glob "^7.2.0"
-    make-dir "^2.1.0"
-    slash "^2.0.0"
-  optionalDependencies:
-    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
-    chokidar "^3.4.0"
-
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -307,11 +291,6 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483"
   integrity sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==
 
-"@babel/compat-data@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.1.tgz#72d647b4ff6a4f82878d184613353af1dd0290f9"
-  integrity sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg==
-
 "@babel/core@7.12.9":
   version "7.12.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
@@ -355,27 +334,6 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@^7.18.9":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.1.tgz#c8fa615c5e88e272564ace3d42fbc8b17bfeb22b"
-  integrity sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.0"
-    "@babel/helper-compilation-targets" "^7.19.1"
-    "@babel/helper-module-transforms" "^7.19.0"
-    "@babel/helpers" "^7.19.0"
-    "@babel/parser" "^7.19.1"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.1"
-    "@babel/types" "^7.19.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
 "@babel/eslint-parser@^7.15.4":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.16.5.tgz#48d3485091d6e36915358e4c0d0b2ebe6da90462"
@@ -403,15 +361,6 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a"
-  integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==
-  dependencies:
-    "@babel/types" "^7.19.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
 "@babel/helper-annotate-as-pure@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
@@ -471,16 +420,6 @@
     browserslist "^4.20.2"
     semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz#7f630911d83b408b76fe584831c98e5395d7a17c"
-  integrity sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==
-  dependencies:
-    "@babel/compat-data" "^7.19.1"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.21.3"
-    semver "^6.3.0"
-
 "@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.5":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz#5d1bcd096792c1ebec6249eebc6358eec55d0cad"
@@ -520,19 +459,6 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
-"@babel/helper-create-class-features-plugin@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
-  integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.9"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-
 "@babel/helper-create-regexp-features-plugin@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"
@@ -615,14 +541,6 @@
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
-
 "@babel/helper-get-function-arity@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
@@ -672,13 +590,6 @@
   dependencies:
     "@babel/types" "^7.17.0"
 
-"@babel/helper-member-expression-to-functions@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
-  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
-  dependencies:
-    "@babel/types" "^7.18.9"
-
 "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
@@ -742,20 +653,6 @@
     "@babel/traverse" "^7.17.12"
     "@babel/types" "^7.17.12"
 
-"@babel/helper-module-transforms@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30"
-  integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.0"
-    "@babel/types" "^7.19.0"
-
 "@babel/helper-optimise-call-expression@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
@@ -770,13 +667,6 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
 "@babel/helper-plugin-utils@7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
@@ -792,11 +682,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
   integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
 
-"@babel/helper-plugin-utils@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
-  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
-
 "@babel/helper-remap-async-to-generator@^7.16.5":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz#e706646dc4018942acb4b29f7e185bc246d65ac3"
@@ -828,17 +713,6 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-replace-supers@^7.18.9":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
-  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/traverse" "^7.19.1"
-    "@babel/types" "^7.19.0"
-
 "@babel/helper-simple-access@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517"
@@ -951,15 +825,6 @@
     "@babel/traverse" "^7.17.9"
     "@babel/types" "^7.17.0"
 
-"@babel/helpers@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18"
-  integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.0"
-    "@babel/types" "^7.19.0"
-
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
@@ -1012,11 +877,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240"
   integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==
 
-"@babel/parser@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.1.tgz#6f6d6c2e621aad19a92544cc217ed13f1aac5b4c"
-  integrity sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2":
   version "7.16.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183"
@@ -1336,13 +1196,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-syntax-typescript@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285"
-  integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-arrow-functions@^7.0.0":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45"
@@ -1824,15 +1677,6 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-typescript" "^7.16.7"
 
-"@babel/plugin-transform-typescript@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.1.tgz#adcf180a041dcbd29257ad31b0c65d4de531ce8d"
-  integrity sha512-+ILcOU+6mWLlvCwnL920m2Ow3wWx3Wo8n2t5aROQmV55GZt+hOiLvBaa3DNzRjSEHa1aauRs4/YLmkCfFkhhRQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.19.0"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/plugin-syntax-typescript" "^7.18.6"
-
 "@babel/plugin-transform-unicode-escapes@^7.16.5":
   version "7.16.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz#80507c225af49b4f4ee647e2a0ce53d2eeff9e85"
@@ -1998,7 +1842,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.12.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6":
+"@babel/template@^7.12.7", "@babel/template@^7.18.6":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
   integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
@@ -2089,31 +1933,6 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.1.tgz#0fafe100a8c2a603b4718b1d9bf2568d1d193347"
-  integrity sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.0"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.19.1"
-    "@babel/types" "^7.19.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
-  integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
-  dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    to-fast-properties "^2.0.0"
-
 "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.15.4", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.4.4":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.12.tgz#1210690a516489c0200f355d87619157fbbd69a0"
@@ -2139,15 +1958,6 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600"
-  integrity sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    to-fast-properties "^2.0.0"
-
 "@builder.io/partytown@^0.5.2":
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/@builder.io/partytown/-/partytown-0.5.4.tgz#1a89069978734e132fa4a59414ddb64e4b94fde7"
@@ -3893,7 +3703,7 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.8":
+"@jridgewell/trace-mapping@^0.3.13":
   version "0.3.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
   integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
@@ -4090,11 +3900,6 @@
   dependencies:
     is-promise "^4.0.0"
 
-"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
-  version "2.1.8-no-fsevents.3"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
-  integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -5937,17 +5742,6 @@ babel-plugin-extract-import-names@1.6.22:
   dependencies:
     "@babel/helper-plugin-utils" "7.10.4"
 
-babel-plugin-i18next-extract@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-i18next-extract/-/babel-plugin-i18next-extract-0.9.0.tgz#d003985901c6be3d9ce91a70ccd6503121a98c8e"
-  integrity sha512-i/kcv6YlYFvUR8rICPBxP4xQXenFOGe+84hzYLXItJYrLlimph4lne6hoZXYgaU3mVJmtRokcBmn4RvcitizXA==
-  dependencies:
-    "@babel/core" "^7.18.9"
-    "@babel/types" "7.18.10"
-    deepmerge "^4.2.2"
-    i18next "^21.8.14"
-    json-stable-stringify "^1.0.1"
-
 babel-plugin-lodash@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196"
@@ -6407,16 +6201,6 @@ browserslist@^4.21.0:
     node-releases "^2.0.5"
     update-browserslist-db "^1.0.0"
 
-browserslist@^4.21.3:
-  version "4.21.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
-  dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
-
 browserslist@^4.6.6:
   version "4.20.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
@@ -6643,11 +6427,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001286, can
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz#473d35dabf5e448b463095cab7924e96ccfb8c00"
   integrity sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==
 
-caniuse-lite@^1.0.30001400:
-  version "1.0.30001410"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz#b5a86366fbbf439d75dd3db1d21137a73e829f44"
-  integrity sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==
-
 capital-case@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
@@ -6835,10 +6614,10 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.4.0, chokidar@^3.4.2, chokidar@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+chokidar@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -6850,10 +6629,10 @@ chokidar@^3.4.0, chokidar@^3.4.2, chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chokidar@^3.4.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
-  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
+chokidar@^3.4.2, chokidar@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -7062,11 +6841,6 @@ commander@^2.20.0, commander@^2.20.3:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
 commander@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
@@ -7198,7 +6972,7 @@ convert-hrtime@^3.0.0:
   resolved "https://registry.yarnpkg.com/convert-hrtime/-/convert-hrtime-3.0.0.tgz#62c7593f5809ca10be8da858a6d2f702bcda00aa"
   integrity sha512-7V+KqSvMiHp8yWDuwfww06XleMWVVB9b9tURBx+G7UTADuo5hYPuowKloz4OzOqbPezxgo+fdQ1522WzPG4OeA==
 
-convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
+convert-source-map@^1.5.0, convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
@@ -8215,11 +7989,6 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.19.tgz#b02bfdc6a5f1c683849a462cd54258288c087433"
   integrity sha512-TeAjwsC/vhvxEtX/xN1JQUMkl+UrwKXlB4rwLyuLYVuBuRtqJJrU4Jy5pCVihMQg4m1ceZ3MEJ0yYuxHj8vC+w==
 
-electron-to-chromium@^1.4.251:
-  version "1.4.259"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.259.tgz#dc72260121e7cb0863adf27a4951ffab5e7310f8"
-  integrity sha512-dzbPZG0PKsqiSxfZovjBZn5InX4OoSITSsJ5S/U0QRrFaKsQtHx352zbyqtiDpNpX5lnPCAeBS6D+QpWipqDRw==
-
 electron-to-chromium@^1.4.84:
   version "1.4.103"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz#abfe376a4d70fa1e1b4b353b95df5d6dfd05da3a"
@@ -9465,11 +9234,6 @@ fs-monkey@1.0.3:
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
   integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
 
-fs-readdir-recursive@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
-  integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
-
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -10419,7 +10183,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0, glob@^7.2.3:
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -11143,7 +10907,7 @@ husky@^4.2.5:
     slash "^3.0.0"
     which-pm-runs "^1.0.0"
 
-i18next@^21.8.14, i18next@^21.9.2:
+i18next@^21.9.2:
   version "21.9.2"
   resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.2.tgz#3f7c5594393eb27117c1db4c38f5ec766e68de0e"
   integrity sha512-00fVrLQOwy45nm3OtC9l1WiLK3nJlIYSljgCt0qzTaAy65aciMdRy9GsuW+a2AtKtdg9/njUGfRH30LRupV7ZQ==
@@ -11974,13 +11738,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  integrity sha512-i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg==
-  dependencies:
-    jsonify "~0.0.0"
-
 json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -12007,11 +11764,6 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-  integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA==
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
@@ -12481,7 +12233,7 @@ luxon@^1.24.1:
   resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.28.0.tgz#e7f96daad3938c06a62de0fb027115d251251fbf"
   integrity sha512-TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ==
 
-make-dir@^2.0.0, make-dir@^2.1.0:
+make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -13309,11 +13061,6 @@ node-releases@^2.0.5:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
   integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
 
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
-
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -14969,11 +14716,6 @@ react-resize-detector@^7.1.2:
   dependencies:
     lodash "^4.17.21"
 
-react-rewards@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/react-rewards/-/react-rewards-2.0.4.tgz#617f6c1bb591f74bb0e0455cc6ff355ee6d36665"
-  integrity sha512-Lw7gIhD8yPDzC6boaVmcXwuTHRLSLAdqB3kZc+29YWvdHWsuc3fdAZlxI8Cm8fvD8fhP+3JkZBtzX224czw15w==
-
 react-select@^4.3.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"
@@ -15966,11 +15708,6 @@ sitemap@^7.0.0:
     arg "^5.0.0"
     sax "^1.2.4"
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -17512,14 +17249,6 @@ update-browserslist-db@^1.0.0:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-update-browserslist-db@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18"
-  integrity sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
 update-notifier@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"

From 851434388a581230fcd2104cc9e336dbb3223fae Mon Sep 17 00:00:00 2001
From: tylerapfledderer <tyler.pfledderer@gmail.com>
Date: Mon, 7 Nov 2022 22:17:36 -0500
Subject: [PATCH 016/108] refactor(leaderboard): implement Chakra's
 `useColorModeValue`

---
 src/components/Leaderboard.tsx | 79 ++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index ce0798f0604..5fff6145b67 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -3,9 +3,9 @@ import {
   Box,
   Avatar,
   Flex,
-  useColorMode,
   LinkOverlay,
   LinkBox,
+  useColorModeValue,
 } from "@chakra-ui/react"
 import Emoji from "./Emoji"
 import Link from "./Link"
@@ -26,12 +26,21 @@ export interface IProps {
 }
 
 const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
-  const { colorMode } = useColorMode()
+  const colorModeStyles = useColorModeValue(
+    {
+      listBoxShadow: "tableBox.light",
+      linkBoxShadow: "tableItemBox.light",
+    },
+    {
+      listBoxShadow: "tableBox.dark",
+      linkBoxShadow: "tableItemBox.dark",
+    }
+  )
 
   return (
     <Box
       bgColor="background"
-      boxShadow={colorMode === "dark" ? "tableBox.dark" : "tableBox.light"}
+      boxShadow={colorModeStyles.listBoxShadow}
       w="100%"
       mb={8}
     >
@@ -59,40 +68,36 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
               display="flex"
               justifyContent="space-between"
               alignItems="center"
-              boxShadow={
-                colorMode === "dark"
-                  ? "tableItemBox.dark"
-                  : "tableItemBox.light"
-              }
-              mb={0.25}
-              p={4}
-              w="100%"
-              _hover={{
-                textDecor: "none",
-                borderRadius: 0.5,
-                boxShadow: "0 0 1px primary",
-                background: "tableBackgroundHover",
-              }}
-            >
-              <Box mr={4} opacity="0.4">
-                {idx + 1}
-              </Box>
-              <Avatar
-                src={avatarImg}
-                name={avatarAlt}
-                mr={4}
-                h={10}
-                w={10}
-                display={{ base: "none", xs: "block" }}
-              />
-              <Flex flex="1 1 75%" direction="column" mr={8}>
-                <LinkOverlay
-                  as={Link}
-                  href={hasGitHub ? `${githubUrl}${username}` : "#"}
-                  textDecor="none"
-                  color="text"
-                  hideArrow
-                >
+                boxShadow={colorModeStyles.linkBoxShadow}
+                mb={0.25}
+                p={4}
+                w="100%"
+                _hover={{
+                  textDecor: "none",
+                  borderRadius: 0.5,
+                  boxShadow: "0 0 1px primary",
+                  background: "tableBackgroundHover",
+                }}
+              >
+                <Box mr={4} opacity="0.4">
+                  {idx + 1}
+                </Box>
+                <Avatar
+                  src={avatarImg}
+                  name={avatarAlt}
+                  mr={4}
+                  h={10}
+                  w={10}
+                  display={{ base: "none", xs: "block" }}
+                />
+                <Flex flex="1 1 75%" direction="column" mr={8}>
+                  <LinkOverlay
+                    as={Link}
+                    href={hasGitHub ? `${githubUrl}${username}` : "#"}
+                    textDecor="none"
+                    color="text"
+                    hideArrow
+                  >
                   {name}{" "}
                 </LinkOverlay>
 

From 9dea744177e10dd2474415229d2df64d444a6eed Mon Sep 17 00:00:00 2001
From: tylerapfledderer <tyler.pfledderer@gmail.com>
Date: Mon, 7 Nov 2022 22:20:29 -0500
Subject: [PATCH 017/108] refactor(leaderboard): add visually hidden text for
 accessibility

---
 src/components/Leaderboard.tsx | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index 5fff6145b67..6595c91ee6e 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -6,6 +6,7 @@ import {
   LinkOverlay,
   LinkBox,
   useColorModeValue,
+  VisuallyHidden,
 } from "@chakra-ui/react"
 import Emoji from "./Emoji"
 import Link from "./Link"
@@ -62,6 +63,14 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
           } else if (idx === 2) {
             emoji = ":3rd_place_medal:"
           }
+
+          const PLACE_WORDS = [
+            "first",
+            "second",
+            "third",
+            "fourth",
+            "fifth",
+          ] as const
           return (
             <LinkBox
               key={idx}
@@ -98,8 +107,12 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
                     color="text"
                     hideArrow
                   >
-                  {name}{" "}
-                </LinkOverlay>
+                    <VisuallyHidden>{`In ${PLACE_WORDS[idx]} place with ${score} points`}</VisuallyHidden>
+                    {name}{" "}
+                    {hasGitHub && (
+                      <VisuallyHidden>(See Github Profile)</VisuallyHidden>
+                    )}
+                  </LinkOverlay>
 
                 <Box fontSize="sm" opacity="0.6">
                   {score}{" "}

From cda3de3f530369b8d8746adb790b7c32df6c8ed4 Mon Sep 17 00:00:00 2001
From: tylerapfledderer <tyler.pfledderer@gmail.com>
Date: Mon, 7 Nov 2022 22:21:21 -0500
Subject: [PATCH 018/108] refactor(leaderboard): convert to list with label

---
 src/components/Leaderboard.tsx | 49 +++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index 6595c91ee6e..8a32e0469f9 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -7,6 +7,8 @@ import {
   LinkBox,
   useColorModeValue,
   VisuallyHidden,
+  List,
+  ListItem,
 } from "@chakra-ui/react"
 import Emoji from "./Emoji"
 import Link from "./Link"
@@ -39,11 +41,12 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
   )
 
   return (
-    <Box
+    <List
       bgColor="background"
       boxShadow={colorModeStyles.listBoxShadow}
       w="100%"
       mb={8}
+      aria-label="Bug hunting leaderboard"
     >
       {content
         .filter((_, idx) => idx < limit)
@@ -72,11 +75,12 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
             "fifth",
           ] as const
           return (
-            <LinkBox
-              key={idx}
-              display="flex"
-              justifyContent="space-between"
-              alignItems="center"
+            <ListItem>
+              <LinkBox
+                key={idx}
+                display="flex"
+                justifyContent="space-between"
+                alignItems="center"
                 boxShadow={colorModeStyles.linkBoxShadow}
                 mb={0.25}
                 p={4}
@@ -114,24 +118,25 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
                     )}
                   </LinkOverlay>
 
-                <Box fontSize="sm" opacity="0.6">
-                  {score}{" "}
-                  <Translation id="page-upgrades-bug-bounty-leaderboard-points" />
-                </Box>
-              </Flex>
-              {emoji && <Emoji mr={8} fontSize="2xl" text={emoji} />}
-              <Box
-                as="span"
-                _after={{
-                  content: '"↗"',
-                  ml: 0.5,
-                  mr: 1.5,
-                }}
-              ></Box>
-            </LinkBox>
+                  <Box fontSize="sm" opacity="0.6">
+                    {score}{" "}
+                    <Translation id="page-upgrades-bug-bounty-leaderboard-points" />
+                  </Box>
+                </Flex>
+                {emoji && <Emoji mr={8} fontSize="2xl" text={emoji} />}
+                <Box
+                  as="span"
+                  _after={{
+                    content: '"↗"',
+                    ml: 0.5,
+                    mr: 1.5,
+                  }}
+                ></Box>
+              </LinkBox>
+            </ListItem>
           )
         })}
-    </Box>
+    </List>
   )
 }
 

From 5e26d49282c1dfdb770500497162a0cc5cc97f6b Mon Sep 17 00:00:00 2001
From: tylerapfledderer <tyler.pfledderer@gmail.com>
Date: Mon, 7 Nov 2022 22:24:29 -0500
Subject: [PATCH 019/108] refactor(leaderboard): convert `opacity` to `color`

---
 src/components/Leaderboard.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index 8a32e0469f9..d35de15b8cc 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -33,10 +33,12 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
     {
       listBoxShadow: "tableBox.light",
       linkBoxShadow: "tableItemBox.light",
+      scoreColor: "blackAlpha.700",
     },
     {
       listBoxShadow: "tableBox.dark",
       linkBoxShadow: "tableItemBox.dark",
+      scoreColor: "whiteAlpha.600",
     }
   )
 
@@ -118,7 +120,7 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
                     )}
                   </LinkOverlay>
 
-                  <Box fontSize="sm" opacity="0.6">
+                  <Box fontSize="sm" color={colorModeStyles.scoreColor}>
                     {score}{" "}
                     <Translation id="page-upgrades-bug-bounty-leaderboard-points" />
                   </Box>

From 9c0d8855fee76bd5fab8cfec499597f6022ed7ad Mon Sep 17 00:00:00 2001
From: Daniel Olshansky <olshansky.daniel@gmail.com>
Date: Wed, 9 Nov 2022 18:32:35 -0800
Subject: [PATCH 020/108] Update index.md

- Update primary nodes
- Extra details on popular light clients
- Add Pocket network as an RPC provider
---
 .../developers/docs/nodes-and-clients/index.md       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/content/developers/docs/nodes-and-clients/index.md b/src/content/developers/docs/nodes-and-clients/index.md
index 7e2b220ff6b..3a2eeb1683e 100644
--- a/src/content/developers/docs/nodes-and-clients/index.md
+++ b/src/content/developers/docs/nodes-and-clients/index.md
@@ -7,7 +7,7 @@ sidebarDepth: 2
 
 Ethereum is a distributed network of computers (known as nodes) running software that can verify blocks and transaction data. The software application, known as a client, must be run on your computer to turn it into an Ethereum node.
 
-**Note: it is not possible to run an execution client on its own anymore. After [The Merge](/upgrades/merge), both execution and consensus clients must be run together in order for a user to gain access to the Ethereum network.**
+**Note: it is not possible to run an execution client on its own anymore. After [The Merge](/upgrades/merge), both execution and consensus clients must be run together in order for a user to gain access to the Ethereum network. However, a consensus client can still run independently.**
 
 ## Prerequisites {#prerequisites}
 
@@ -19,7 +19,7 @@ If you're new to the topic of nodes, we recommend first checking out our user-fr
 
 A "node" is any instance of Ethereum client software that is connected to other computers also running Ethereum software, forming a network. A client is an implementation of Ethereum that verifies data against the protocol rules and keeps the network secure.
 
-Post-Merge Ethereum consists of two parts: the execution layer and the consensus layer. Both layers are run by different client software. On this page, we'll refer to them as the execution client and consensus client.
+Post-Merge Ethereum consists of two parts: the **execution layer** and the **consensus layer**. Both layers are run by different client software. On this page, we'll refer to them as the execution client and consensus client.
 
 - The execution client (also known as the Execution Engine, EL client or formerly the Eth1 client) listens to new transactions broadcasted in the network, executes them in EVM, and holds the latest state and database of all current Ethereum data.
 - The consensus client (also known as the Beacon Node, CL client or formerly the Eth2 client) implements the proof-of-stake consensus algorithm, which enables the network to achieve agreement based on validated data from the execution client.
@@ -72,13 +72,13 @@ If you want to [run your own node](/developers/docs/nodes-and-clients/run-a-node
 
 ### Light node {#light-node}
 
-Instead of downloading every block, light nodes download block headers. These headers only contain summary information about the contents of the blocks. Any other information required by the light node gets requested from a full node. The light node can then independently verify the data they receive against the state roots in the block headers. Light nodes enable users to participate in the Ethereum network without the powerful hardware or high bandwidth required to run full nodes. Eventually, light nodes might run on mobile phones or embedded devices. The light nodes do not participate in consensus (i.e. they cannot be miners/validators), but they can access the Ethereum blockchain with the same functionality as a full node.
+Instead of downloading every block, light nodes download block headers. These headers only contain summary information about the contents of the blocks. Any other information required by the light node gets requested from a full node. The light node can then independently verify the data they receive against the state roots in the block headers. Light nodes enable users to participate in the Ethereum network without the powerful hardware or high bandwidth required to run full nodes. Eventually, light nodes might run on mobile phones or embedded devices. The light nodes do not participate in consensus (i.e. they cannot be miners/validators), but they can access the Ethereum blockchain with the same functionality and security guarantees as a full node.
 
-The execution client Geth includes a [light sync](https://github.com/ethereum/devp2p/blob/master/caps/les.md) option. However, a light Geth node relies upon full nodes serving light node data. Few full nodes opt to serve light node data, meaning light nodes often fail to find peers. There are currently no production-ready light clients on the consensus layer; however, several are in development.
+The execution client Geth includes a [light sync](https://github.com/ethereum/devp2p/blob/master/caps/les.md) option. However, a light Geth node relies upon full nodes serving light node data. Few full nodes opt to serve light node data, meaning light nodes often fail to find peers.
 
 There are also potential routes to providing light client data over the [gossip network](https://www.ethportal.net/). This is advantageous because the gossip network could support a network of light nodes without requiring full nodes to serve requests.
 
-Ethereum does not support a large population of light nodes yet, but light node support is an area expected to develop rapidly in the near future.
+Ethereum does not support a large population of light nodes yet, but light node support is an area expected to develop rapidly in the near future. In particular, clients like [Nimbus](https://nimbus.team/), [Helios](https://github.com/a16z/helios) and [LodeStar](https://lodestar.chainsafe.io/) are paving the way at the time of writing.
 
 ### Archive node {#archive-node}
 
@@ -125,7 +125,7 @@ If you're more of a technical user, dive into more details and options on how to
 
 ## Alternatives {#alternatives}
 
-Setting up your own node can cost you time and resources but you don’t always need to run your own instance. In this case, you can use a third party API provider like [Infura](https://infura.io), [Alchemy](https://alchemyapi.io), [Chainstack](https://chainstack.com), or [QuikNode](https://www.quiknode.io). Alternatively, [ArchiveNode](https://archivenode.io/) is a community-funded Archive node that hopes to bring archive data on the Ethereum blockchain to independent developers who otherwise couldn't afford it. For an overview of using these services, check out [nodes as a service](/developers/docs/nodes-and-clients/nodes-as-a-service/).
+Setting up your own node can cost you time and resources but you don’t always need to run your own instance. In this case, you can use a third party API provider like [Infura](https://infura.io), [Alchemy](https://alchemyapi.io), [Chainstack](https://chainstack.com), [Pocket](https://pokt.network/) or [QuikNode](https://www.quiknode.io). Alternatively, [ArchiveNode](https://archivenode.io/) is a community-funded Archive node that hopes to bring archive data on the Ethereum blockchain to independent developers who otherwise couldn't afford it. For an overview of using these services, check out [nodes as a service](/developers/docs/nodes-and-clients/nodes-as-a-service/).
 
 If somebody runs an Ethereum node with a public API in your community, you can point your light wallets (like MetaMask) to a community node [via Custom RPC](https://metamask.zendesk.com/hc/en-us/articles/360015290012-Using-a-Local-Node) and gain more privacy than with some random trusted third party.
 

From df7885650d1552d948714decd4b42539354fab36 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <timothybarrett@hotmail.co.uk>
Date: Fri, 11 Nov 2022 07:51:17 +0000
Subject: [PATCH 021/108] refactor: migrate expanded card to chakra

---
 src/components/ExpandableCard.tsx | 292 ++++++++++++------------------
 1 file changed, 118 insertions(+), 174 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index b1e580bf013..9419fba17a3 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -1,93 +1,22 @@
 // Libraries
 import React, { ComponentType, ReactNode, SVGProps, useState } from "react"
-import styled from "@emotion/styled"
-import { motion } from "framer-motion"
 
 // Components
 import Translation from "./Translation"
 
 // Utils
 import { trackCustomEvent } from "../utils/matomo"
-
-const Card = styled.div`
-  border: 1px solid ${(props) => props.theme.colors.border};
-  border-radius: 2px;
-  padding: 1.5rem;
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 1rem;
-  cursor: pointer;
-  &:hover {
-    background-color: ${(props) => props.theme.colors.ednBackground};
-  }
-`
-
-const Content = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-
-  @media (max-width: ${(props) => props.theme.breakpoints.s}) {
-    flex-direction: column;
-  }
-`
-
-const Title = styled.h3`
-  margin-top: 0rem;
-  font-size: 1.25rem;
-  font-weight: 600;
-  margin-bottom: 0.5rem;
-`
-
-const TextPreview = styled.p`
-  font-size: 0.875rem;
-  font-weight: 400;
-  color: ${(props) => props.theme.colors.text200};
-  margin-bottom: 0rem;
-`
-
-const Text = styled(motion.div)`
-  font-size: 1rem;
-  font-weight: 400;
-  color: ${(props) => props.theme.colors.text};
-  margin-top: 2rem;
-  border-top: 1px solid ${(props) => props.theme.colors.border};
-  padding-top: 1.5rem;
-`
-
-const Question = styled.div`
-  margin-right: 1rem;
-
-  @media (max-width: ${(props) => props.theme.breakpoints.s}) {
-    margin-right: 0;
-    margin-bottom: 0.5rem;
-  }
-`
-
-const Header = styled.div`
-  display: flex;
-  width: 100%;
-  margin: 1rem 0;
-  align-items: center;
-  svg {
-    margin-right: 1.5rem;
-  }
-`
-
-const ButtonContainer = styled.div`
-  margin-left: 1rem;
-
-  @media (max-width: ${(props) => props.theme.breakpoints.s}) {
-    margin-left: 0;
-  }
-`
-
-const ButtonLink = styled.button`
-  border: 0;
-  cursor: pointer;
-  background-color: transparent;
-  color: ${(props) => props.theme.colors.primary};
-`
+import {
+  Accordion,
+  AccordionButton,
+  AccordionItem,
+  AccordionPanel,
+  Box,
+  Button,
+  Fade,
+  Heading,
+  Text as ChakraText,
+} from "@chakra-ui/react"
 
 export interface IProps {
   children?: React.ReactNode
@@ -107,111 +36,126 @@ const ExpandableCard: React.FC<IProps> = ({
   eventName = "",
 }) => {
   const [isVisible, setIsVisible] = useState(false)
-
-  const expandCollapse = {
-    collapsed: {
-      height: 0,
-      transition: {
-        when: "afterChildren",
-      },
-    },
-    expanded: {
-      height: "100%",
-      transition: {
-        when: "beforeChildren",
-      },
-    },
+  const onClick = () => {
+    // Card will not collapse if clicking on a link or selecting text
+    if (
+      window.getSelection()?.toString().length === 0 &&
+      !(window.event?.target as HTMLDivElement)?.className.includes(
+        "ExternalLink"
+      )
+    ) {
+      !isVisible && trackCustomEvent(matomo)
+      setIsVisible(!isVisible)
+    }
   }
 
-  const showHide = {
-    collapsed: {
-      display: "none",
-    },
-    expanded: {
-      display: "inline-block",
-    },
-  }
-
-  const fadeInOut = {
-    collapsed: {
-      opacity: 0,
-      transition: {
-        duration: 0.1,
-      },
-    },
-    expanded: {
-      opacity: 1,
-      transition: {
-        duration: 0.4,
-      },
-    },
-  }
   const matomo = {
     eventAction: `Clicked`,
     eventCategory: `ExpandableCard${eventCategory}`,
     eventName,
   }
+
   return (
-    <Card
-      onClick={() => {
-        // Card will not collapse if clicking on a link or selecting text
-        if (
-          window.getSelection()?.toString().length === 0 &&
-          !(window.event?.target as HTMLDivElement)?.className.includes(
-            "ExternalLink"
-          )
-        ) {
-          !isVisible && trackCustomEvent(matomo)
-          setIsVisible(!isVisible)
-        }
+    <Accordion
+      border="1px solid"
+      borderColor="border"
+      borderRadius="2px"
+      display="flex"
+      flex-direction="column"
+      marginBottom="1rem"
+      cursor="pointer"
+      _hover={{
+        backgroundColor: "ednBackground",
       }}
+      borderBottomWidth="0"
     >
-      <Content>
-        <Question>
-          <Header>
-            {!!Svg && <Svg />}
-            <Title>{title}</Title>
-          </Header>
-          <TextPreview>{contentPreview}</TextPreview>
-        </Question>
-        <ButtonContainer
-          onClick={() => {
-            trackCustomEvent(matomo)
-            setIsVisible(!isVisible)
+      <AccordionItem borderTopWidth="0" flex="1">
+        <AccordionButton
+          width="100%"
+          padding={`1.5rem 1.5rem ${isVisible ? "0" : "1.5rem"}`}
+          flex="1"
+          onClick={onClick}
+          _hover={{
+            backgroundColor: "ednBackground",
           }}
         >
-          {!isVisible && (
-            <ButtonLink onClick={() => setIsVisible(true)}>
-              <Translation id="more" />
-            </ButtonLink>
-          )}
-          {isVisible && (
-            <ButtonLink onClick={() => setIsVisible(false)}>
-              <Translation id="less" />
-            </ButtonLink>
-          )}
-        </ButtonContainer>
-      </Content>
-      <motion.div
-        variants={expandCollapse}
-        animate={isVisible ? "expanded" : "collapsed"}
-        initial={false}
-      >
-        <motion.div
-          variants={showHide}
-          animate={isVisible ? "expanded" : "collapsed"}
-          initial={false}
-        >
-          <Text
-            variants={fadeInOut}
-            animate={isVisible ? "expanded" : "collapsed"}
-            initial={false}
+          <Box
+            display="flex"
+            width="100%"
+            alignItems="center"
+            flexDir={{ base: "column", sm: "row" }}
           >
-            {children}
-          </Text>
-        </motion.div>
-      </motion.div>
-    </Card>
+            <Box
+              marginBottom={{ base: "0.5rem", sm: 0 }}
+              marginRight={{ base: 0, sm: "1rem" }}
+            >
+              <Box
+                display="flex"
+                alignItems="center"
+                sx={{
+                  svg: { marginRight: "1.5rem" },
+                }}
+                margin="1rem 0"
+              >
+                {!!Svg && <Svg />}
+                <Heading
+                  as="h3"
+                  size="md"
+                  fontWeight="semibold"
+                  flex="1"
+                  marginTop="0rem"
+                  marginBottom="0.5rem"
+                >
+                  {title}
+                </Heading>
+              </Box>
+              <ChakraText
+                fontSize="sm"
+                color="text200"
+                marginBottom="0"
+                width="fit-content"
+              >
+                {contentPreview}
+              </ChakraText>
+            </Box>
+            <Button
+              as="div" // we do not want to nest a button in a button
+              ml={{ base: undefined, sm: "auto" }}
+              onClick={onClick}
+              variant="link"
+              color="primary"
+              _hover={{
+                boxShadow: "none",
+                textDecoration: "none",
+              }}
+            >
+              <Translation id={isVisible ? "less" : "more"} />
+            </Button>
+          </Box>
+        </AccordionButton>
+        {isVisible ? (
+          <Fade in={isVisible}>
+            <AccordionPanel
+              paddingX="1.5rem"
+              paddingBottom="1.5rem"
+              paddingTop="0"
+              onClick={onClick}
+            >
+              <Box
+                fontSize="md"
+                color="text"
+                marginTop="2rem"
+                paddingTop="1.5rem"
+                borderTop="1px solid"
+                borderColor="border"
+              >
+                {children}
+              </Box>
+            </AccordionPanel>
+          </Fade>
+        ) : null}
+      </AccordionItem>
+    </Accordion>
   )
 }
 

From faceea39c78b6548ba4585e27238efe5de6ca03a Mon Sep 17 00:00:00 2001
From: yujingwei <yujingwei@xueliman.com>
Date: Fri, 11 Nov 2022 16:00:10 +0800
Subject: [PATCH 022/108] document modify [Fixes #8571]

---
 .../zh/developers/tutorials/send-token-etherjs/index.md         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/translations/zh/developers/tutorials/send-token-etherjs/index.md b/src/content/translations/zh/developers/tutorials/send-token-etherjs/index.md
index 1436c3e1dce..ea2483b1371 100644
--- a/src/content/translations/zh/developers/tutorials/send-token-etherjs/index.md
+++ b/src/content/translations/zh/developers/tutorials/send-token-etherjs/index.md
@@ -99,7 +99,7 @@ window.ethersProvider.getGasPrice() // gasPrice
 2. **`to_address`**：代币接收人的地址
 3. **`send_token_amount`**：您想要发送给接收人的金额
 4. **`gas_limit`**：燃料限制
-5. **`gas_limit`**：燃料价格
+5. **`gas_price`**：燃料价格
 
 [请参阅下文了解如何使用](#how-to-use)
 

From 4466fa4c1e02fbe5d5a0a73dbaeaf94669d1f25f Mon Sep 17 00:00:00 2001
From: Jamie Barrett <timothybarrett@hotmail.co.uk>
Date: Fri, 11 Nov 2022 08:01:49 +0000
Subject: [PATCH 023/108] chore: move matomo const to the right place

---
 src/components/ExpandableCard.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 9419fba17a3..bea233a510e 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -36,6 +36,11 @@ const ExpandableCard: React.FC<IProps> = ({
   eventName = "",
 }) => {
   const [isVisible, setIsVisible] = useState(false)
+  const matomo = {
+    eventAction: `Clicked`,
+    eventCategory: `ExpandableCard${eventCategory}`,
+    eventName,
+  }
   const onClick = () => {
     // Card will not collapse if clicking on a link or selecting text
     if (
@@ -49,12 +54,6 @@ const ExpandableCard: React.FC<IProps> = ({
     }
   }
 
-  const matomo = {
-    eventAction: `Clicked`,
-    eventCategory: `ExpandableCard${eventCategory}`,
-    eventName,
-  }
-
   return (
     <Accordion
       border="1px solid"

From fc4f15efd085e32079be9147ff4389d13bfb42e2 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <timothybarrett@hotmail.co.uk>
Date: Sat, 12 Nov 2022 09:30:09 +0000
Subject: [PATCH 024/108] chore: move fade down a level

---
 src/components/ExpandableCard.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index bea233a510e..3b59d23e3ad 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -133,13 +133,13 @@ const ExpandableCard: React.FC<IProps> = ({
           </Box>
         </AccordionButton>
         {isVisible ? (
-          <Fade in={isVisible}>
-            <AccordionPanel
-              paddingX="1.5rem"
-              paddingBottom="1.5rem"
-              paddingTop="0"
-              onClick={onClick}
-            >
+          <AccordionPanel
+            paddingX="1.5rem"
+            paddingBottom="1.5rem"
+            paddingTop="0"
+            onClick={onClick}
+          >
+            <Fade in={isVisible}>
               <Box
                 fontSize="md"
                 color="text"
@@ -150,8 +150,8 @@ const ExpandableCard: React.FC<IProps> = ({
               >
                 {children}
               </Box>
-            </AccordionPanel>
-          </Fade>
+            </Fade>
+          </AccordionPanel>
         ) : null}
       </AccordionItem>
     </Accordion>

From 487e91e4a79e50dbdeaee2ff3c3a5cd522f76523 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <timothybarrett@hotmail.co.uk>
Date: Sat, 12 Nov 2022 10:08:46 +0000
Subject: [PATCH 025/108] chore: make component controlled

---
 src/components/ExpandableCard.tsx | 41 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 3b59d23e3ad..937c1777f16 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -67,6 +67,7 @@ const ExpandableCard: React.FC<IProps> = ({
         backgroundColor: "ednBackground",
       }}
       borderBottomWidth="0"
+      index={isVisible ? [0] : []}
     >
       <AccordionItem borderTopWidth="0" flex="1">
         <AccordionButton
@@ -132,27 +133,25 @@ const ExpandableCard: React.FC<IProps> = ({
             </Button>
           </Box>
         </AccordionButton>
-        {isVisible ? (
-          <AccordionPanel
-            paddingX="1.5rem"
-            paddingBottom="1.5rem"
-            paddingTop="0"
-            onClick={onClick}
-          >
-            <Fade in={isVisible}>
-              <Box
-                fontSize="md"
-                color="text"
-                marginTop="2rem"
-                paddingTop="1.5rem"
-                borderTop="1px solid"
-                borderColor="border"
-              >
-                {children}
-              </Box>
-            </Fade>
-          </AccordionPanel>
-        ) : null}
+        <AccordionPanel
+          paddingX="1.5rem"
+          paddingBottom="1.5rem"
+          paddingTop="0"
+          onClick={onClick}
+        >
+          <Fade in={isVisible}>
+            <Box
+              fontSize="md"
+              color="text"
+              marginTop="2rem"
+              paddingTop="1.5rem"
+              borderTop="1px solid"
+              borderColor="border"
+            >
+              {children}
+            </Box>
+          </Fade>
+        </AccordionPanel>
       </AccordionItem>
     </Accordion>
   )

From 94c917e4ad34af96475201787235c96c978aa649 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <timothybarrett@hotmail.co.uk>
Date: Sat, 12 Nov 2022 10:26:04 +0000
Subject: [PATCH 026/108] chore: wrap with h3 and replace btn

---
 src/components/ExpandableCard.tsx | 105 +++++++++++++++---------------
 1 file changed, 51 insertions(+), 54 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 937c1777f16..3ca3b39d964 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -15,7 +15,7 @@ import {
   Button,
   Fade,
   Heading,
-  Text as ChakraText,
+  Text,
 } from "@chakra-ui/react"
 
 export interface IProps {
@@ -70,69 +70,66 @@ const ExpandableCard: React.FC<IProps> = ({
       index={isVisible ? [0] : []}
     >
       <AccordionItem borderTopWidth="0" flex="1">
-        <AccordionButton
-          width="100%"
-          padding={`1.5rem 1.5rem ${isVisible ? "0" : "1.5rem"}`}
-          flex="1"
-          onClick={onClick}
-          _hover={{
-            backgroundColor: "ednBackground",
-          }}
-        >
-          <Box
-            display="flex"
+        <h3 style={{ margin: 0 }}>
+          <AccordionButton
             width="100%"
-            alignItems="center"
-            flexDir={{ base: "column", sm: "row" }}
+            padding={`1.5rem 1.5rem ${isVisible ? "0" : "1.5rem"}`}
+            flex="1"
+            onClick={onClick}
+            _hover={{
+              backgroundColor: "ednBackground",
+            }}
           >
             <Box
-              marginBottom={{ base: "0.5rem", sm: 0 }}
-              marginRight={{ base: 0, sm: "1rem" }}
+              display="flex"
+              width="100%"
+              alignItems="center"
+              flexDir={{ base: "column", sm: "row" }}
             >
               <Box
-                display="flex"
-                alignItems="center"
-                sx={{
-                  svg: { marginRight: "1.5rem" },
-                }}
-                margin="1rem 0"
+                marginBottom={{ base: "0.5rem", sm: 0 }}
+                marginRight={{ base: 0, sm: "1rem" }}
               >
-                {!!Svg && <Svg />}
-                <Heading
-                  as="h3"
-                  size="md"
-                  fontWeight="semibold"
-                  flex="1"
-                  marginTop="0rem"
-                  marginBottom="0.5rem"
+                <Box
+                  display="flex"
+                  alignItems="center"
+                  sx={{
+                    svg: { marginRight: "1.5rem" },
+                  }}
+                  margin="1rem 0"
                 >
-                  {title}
-                </Heading>
+                  {!!Svg && <Svg />}
+                  <Text
+                    fontSize="xl"
+                    fontWeight="semibold"
+                    flex="1"
+                    marginTop="0rem"
+                    marginBottom="0.5rem"
+                  >
+                    {title}
+                  </Text>
+                </Box>
+                <Text
+                  fontSize="sm"
+                  color="text200"
+                  marginBottom="0"
+                  width="fit-content"
+                >
+                  {contentPreview}
+                </Text>
               </Box>
-              <ChakraText
-                fontSize="sm"
-                color="text200"
-                marginBottom="0"
-                width="fit-content"
+              <Text
+                fontSize="md"
+                color="primary"
+                ml={{ base: undefined, sm: "auto" }}
+                mt="auto"
+                mb="auto"
               >
-                {contentPreview}
-              </ChakraText>
+                <Translation id={isVisible ? "less" : "more"} />
+              </Text>
             </Box>
-            <Button
-              as="div" // we do not want to nest a button in a button
-              ml={{ base: undefined, sm: "auto" }}
-              onClick={onClick}
-              variant="link"
-              color="primary"
-              _hover={{
-                boxShadow: "none",
-                textDecoration: "none",
-              }}
-            >
-              <Translation id={isVisible ? "less" : "more"} />
-            </Button>
-          </Box>
-        </AccordionButton>
+          </AccordionButton>
+        </h3>
         <AccordionPanel
           paddingX="1.5rem"
           paddingBottom="1.5rem"

From ee4e9ce86a84462c9281c91359157a2c60d6242b Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 14 Nov 2022 20:01:57 -0300
Subject: [PATCH 027/108] replace  with  function

---
 src/pages-conditional/dapps.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages-conditional/dapps.tsx b/src/pages-conditional/dapps.tsx
index cdf9ae92443..bb80dc4636e 100644
--- a/src/pages-conditional/dapps.tsx
+++ b/src/pages-conditional/dapps.tsx
@@ -663,13 +663,10 @@ const DappsPage = ({
     },
     {
       title: "Balancer",
-      description: translateMessageId(
-        "page-dapps-dapp-description-balancer",
-        intl
-      ),
+      description: t("page-dapps-dapp-description-balancer"),
       link: "https://balancer.fi/",
       image: getImage(data.balancer),
-      alt: translateMessageId("page-dapps-balancer-logo-alt", intl),
+      alt: t("page-dapps-balancer-logo-alt"),
     },
   ]
 

From 8f57e73a72fef61a5733bdda74e590406ab0804b Mon Sep 17 00:00:00 2001
From: browny <mahendrabrowny@gmail.com>
Date: Wed, 16 Nov 2022 14:09:11 +0530
Subject: [PATCH 028/108] Refactor `SkipLink.tsx` component to use ChakraUI

---
 src/components/SkipLink.tsx | 44 ++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/components/SkipLink.tsx b/src/components/SkipLink.tsx
index 06ed104af78..77b2105cd35 100644
--- a/src/components/SkipLink.tsx
+++ b/src/components/SkipLink.tsx
@@ -1,28 +1,6 @@
 import React from "react"
-import styled from "@emotion/styled"
 import Translation from "./Translation"
-
-const Div = styled.div`
-  background-color: ${(props) => props.theme.colors.primary};
-`
-
-const Anchor = styled.a`
-  line-height: 2rem;
-  position: absolute;
-  top: -3rem;
-  margin-left: 0.5rem;
-  color: ${(props) => props.theme.colors.background};
-  text-decoration: none;
-
-  &:focus {
-    position: static;
-  }
-`
-
-const DivAnchor = styled.div`
-  height: 80px;
-  margin-top: -80px;
-`
+import { Box, Link } from "@chakra-ui/react"
 
 export interface IProps {
   hrefId: string
@@ -30,14 +8,24 @@ export interface IProps {
 
 export const SkipLink: React.FC<IProps> = ({ hrefId }) => {
   return (
-    <Div>
-      <Anchor href={hrefId}>
+    <Box bg="primary">
+      <Link
+        href={hrefId}
+        lineHeight="2rem"
+        position="absolute"
+        top="-3rem"
+        ml=".5rem"
+        color="background"
+        textDecorationLine="none"
+        _hover={{ textDecoration: "none" }}
+        _focus={{ position: "static" }}
+      >
         <Translation id="skip-to-main-content" />
-      </Anchor>
-    </Div>
+      </Link>
+    </Box>
   )
 }
 
 export const SkipLinkAnchor: React.FC<{ id: string }> = ({ id }) => {
-  return <DivAnchor id={id}></DivAnchor>
+  return <Box height="80px" mt="-80px" id={id}></Box>
 }

From 3c5155c7540725a72c61a3f296b831b9a88b3bf1 Mon Sep 17 00:00:00 2001
From: Bhavesh Mandalapu <mandalapubhavesh@gmail.com>
Date: Thu, 17 Nov 2022 09:28:14 -0600
Subject: [PATCH 029/108] Breadcrumbs.tsx Refactor

---
 src/components/Breadcrumbs.tsx | 91 +++++++++++++++-------------------
 1 file changed, 40 insertions(+), 51 deletions(-)

diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx
index be3ade28881..3d38a228961 100644
--- a/src/components/Breadcrumbs.tsx
+++ b/src/components/Breadcrumbs.tsx
@@ -1,52 +1,11 @@
 import React from "react"
-import styled from "@emotion/styled"
 import { useIntl } from "react-intl"
 
 import Link from "./Link"
 import { isLang, supportedLanguages } from "../utils/languages"
 import { isTranslationKey, translateMessageId } from "../utils/translations"
-
-const ListContainer = styled.nav`
-  margin-bottom: 2rem;
-  list-style-type: none;
-  /* Avoid header overlap: */
-  position: relative;
-  z-index: 1;
-`
-
-const List = styled.ol`
-  margin: 0;
-  list-style-type: none;
-  display: flex;
-  flex-wrap: wrap;
-`
-
-const ListItem = styled.li`
-  margin: 0;
-  margin-right: 0.5rem;
-  font-size: 0.875rem;
-  line-height: 140%;
-  letter-spacing: 0.04em;
-`
-
-const Slash = styled.span`
-  margin-left: 0.5rem;
-  color: ${(props) => props.theme.colors.textTableOfContents};
-`
-
-const CrumbLink = styled(Link)`
-  text-decoration: none;
-  color: ${(props) => props.theme.colors.textTableOfContents};
-
-  &:hover {
-    text-decoration: none;
-    color: ${(props) => props.theme.colors.primary};
-  }
-
-  &.active {
-    color: ${(props) => props.theme.colors.primary};
-  }
-`
+import { Box, UnorderedList, ListItem } from "@chakra-ui/react"
+import ButtonLink from "./ButtonLink"
 
 export interface IProps {
   slug: string
@@ -91,21 +50,51 @@ const Breadcrumbs: React.FC<IProps> = ({
   })
 
   return (
-    <ListContainer aria-label="Breadcrumb" dir="auto" {...restProps}>
-      <List>
+    <Box
+      aria-label="Breadcrumb"
+      dir="auto"
+      {...restProps}
+      as="nav"
+      marginBottom={8}
+      listStyleType="none"
+      position="relative"
+      zIndex={1}
+    >
+      <UnorderedList
+        display="flex"
+        flexWrap="wrap"
+        listStyleType="none"
+        margin={0}
+      >
         {crumbs.map((crumb, idx) => (
-          <ListItem key={idx}>
-            <CrumbLink
+          <ListItem
+            key={idx}
+            margin={0}
+            marginRight={2}
+            fontSize="sm"
+            lineHeight="140%"
+            letterSpacing="wider"
+          >
+            <ButtonLink
+              as={Link}
               to={crumb.fullPath}
               isPartiallyActive={slug === crumb.fullPath}
+              textDecoration="none"
+              color="textTableOfContents"
+              _hover={{ color: "primary", textDecor: "none" }}
+              _active={{ color: "primary" }}
             >
               {crumb.text}
-            </CrumbLink>
-            {idx < crumbs.length - 1 && <Slash>/</Slash>}
+            </ButtonLink>
+            {idx < crumbs.length - 1 && (
+              <Box as="span" marginLeft={2} color="textTableOfContents">
+                /
+              </Box>
+            )}
           </ListItem>
         ))}
-      </List>
-    </ListContainer>
+      </UnorderedList>
+    </Box>
   )
 }
 

From b66361a9f698e26c66d6a75efe17a375a3789fab Mon Sep 17 00:00:00 2001
From: Bhavesh Mandalapu <mandalapubhavesh@gmail.com>
Date: Thu, 17 Nov 2022 19:50:51 -0600
Subject: [PATCH 030/108] Changed ButtonLink to Link

---
 src/components/Breadcrumbs.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx
index 3d38a228961..470f9a83542 100644
--- a/src/components/Breadcrumbs.tsx
+++ b/src/components/Breadcrumbs.tsx
@@ -5,7 +5,6 @@ import Link from "./Link"
 import { isLang, supportedLanguages } from "../utils/languages"
 import { isTranslationKey, translateMessageId } from "../utils/translations"
 import { Box, UnorderedList, ListItem } from "@chakra-ui/react"
-import ButtonLink from "./ButtonLink"
 
 export interface IProps {
   slug: string
@@ -75,7 +74,7 @@ const Breadcrumbs: React.FC<IProps> = ({
             lineHeight="140%"
             letterSpacing="wider"
           >
-            <ButtonLink
+            <Link
               as={Link}
               to={crumb.fullPath}
               isPartiallyActive={slug === crumb.fullPath}
@@ -85,7 +84,7 @@ const Breadcrumbs: React.FC<IProps> = ({
               _active={{ color: "primary" }}
             >
               {crumb.text}
-            </ButtonLink>
+            </Link>
             {idx < crumbs.length - 1 && (
               <Box as="span" marginLeft={2} color="textTableOfContents">
                 /

From ddd42ae92a7f75d0ba36b9c7cbcf75ba8edae76a Mon Sep 17 00:00:00 2001
From: amit-ksh <ksamit1110@gmail.com>
Date: Sat, 19 Nov 2022 10:16:39 +0530
Subject: [PATCH 031/108] refactor: tabs to chakra

---
 src/components/Tabs.tsx | 99 +++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 59 deletions(-)

diff --git a/src/components/Tabs.tsx b/src/components/Tabs.tsx
index 3612afc2513..c162216501e 100644
--- a/src/components/Tabs.tsx
+++ b/src/components/Tabs.tsx
@@ -1,38 +1,11 @@
-import React, { ReactNode, useState } from "react"
-import styled from "@emotion/styled"
-
-const TabList = styled.ul`
-  display: flex;
-  margin: 0;
-  list-style-type: none;
-  list-style-image: none;
-`
-
-const Tab = styled.li`
-  border-bottom: 1px solid ${(props) => props.theme.colors.primary};
-  margin: 0;
-`
-
-const TabButton = styled.button<{ selected: boolean }>`
-  display: block;
-  cursor: pointer;
-  color: ${({ theme, selected }) =>
-    selected ? theme.colors.background : theme.colors.text};
-  background-color: ${({ selected, theme }) =>
-    selected ? theme.colors.primary : "transparent"};
-  border: 0;
-  border-top-left-radius: 0.3rem;
-  border-top-right-radius: 0.3rem;
-  padding: 0.3rem 1rem;
-`
-
-const TabPanel = styled.div`
-  background: ${(props) => props.theme.colors.ednBackground};
-  border-radius: 0.5rem;
-  border: 1px solid ${(props) => props.theme.colors.lightBorder};
-  margin-top: 1rem;
-  padding: 1.5rem;
-`
+import React, { ReactNode } from "react"
+import {
+  Tabs as ChakraTabs,
+  TabList,
+  Tab,
+  TabPanels,
+  TabPanel,
+} from "@chakra-ui/react"
 
 interface Tab {
   title: string
@@ -44,38 +17,46 @@ export interface IProps {
   onTabClick?: (tabIndex: number) => void
 }
 
-/**
- * Minimal & temp Tab component until we migrate over a UI lib
- */
 const Tabs: React.FC<IProps> = ({ tabs, onTabClick }) => {
-  const [selectedIndex, setSelectedIndex] = useState(0)
-  const selectedTab = tabs[selectedIndex]
-
   const handleTabClick = (index: number) => {
-    setSelectedIndex(index)
-
     if (onTabClick) {
       onTabClick(index)
     }
   }
 
   return (
-    <div>
-      <nav>
-        <TabList>
-          {tabs.map((tab, index) => (
-            <Tab key={index} onClick={() => handleTabClick(index)}>
-              <TabButton selected={index === selectedIndex}>
-                {tab.title}
-              </TabButton>
-            </Tab>
-          ))}
-        </TabList>
-      </nav>
-      <main>
-        <TabPanel>{selectedTab.content}</TabPanel>
-      </main>
-    </div>
+    <ChakraTabs as="nav" variant="unstyled">
+      <TabList>
+        {tabs.map((tab, index) => (
+          <Tab
+            key={index}
+            px={4}
+            py="0.3rem"
+            borderBottom="1px solid"
+            borderColor="primary"
+            borderTopRadius="0.3rem"
+            _selected={{ color: "background", bg: "primary" }}
+            onClick={() => handleTabClick(index)}
+          >
+            {tab.title}
+          </Tab>
+        ))}
+      </TabList>
+      <TabPanels as="main" mt={4}>
+        {tabs.map((tab, index) => (
+          <TabPanel
+            key={index}
+            p={6}
+            bg="ednBackground"
+            border="1px solid"
+            borderColor="lightBorder"
+            borderRadius="lg"
+          >
+            {tab.content}
+          </TabPanel>
+        ))}
+      </TabPanels>
+    </ChakraTabs>
   )
 }
 

From bfdc48a610f808519aad353f6da350d3d8045791 Mon Sep 17 00:00:00 2001
From: vdusart <dusartvictor@gmail.com>
Date: Sun, 20 Nov 2022 17:36:08 +0100
Subject: [PATCH 032/108] remove useless import

---
 src/components/Tooltip.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
index daff4c8de2b..298aa0401ee 100644
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, ReactNode, useState } from "react"
+import React, { ReactNode, useState } from "react"
 import styled from "@emotion/styled"
 import * as utils from "../utils/isMobile"
 

From 7f83ddf05b72a8e3dd2cd833f7512503efb61046 Mon Sep 17 00:00:00 2001
From: vdusart <dusartvictor@gmail.com>
Date: Sun, 20 Nov 2022 17:49:42 +0100
Subject: [PATCH 033/108] convert container

---
 src/components/Tooltip.tsx | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
index 298aa0401ee..e7f74c92bc8 100644
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -1,14 +1,8 @@
 import React, { ReactNode, useState } from "react"
 import styled from "@emotion/styled"
+import { Box } from "@chakra-ui/react"
 import * as utils from "../utils/isMobile"
 
-const Container = styled.div`
-  position: relative;
-  display: inline-flex;
-  user-select: none;
-  cursor: pointer;
-`
-
 const Content = styled.div`
   text-align: center;
   white-space: normal;
@@ -68,7 +62,11 @@ const Tooltip: React.FC<IProps> = ({ content, children }) => {
       {isVisible && isMobile && (
         <ModalReturn onClick={() => setIsVisible(false)} />
       )}
-      <Container
+      <Box
+        position="relative"
+        display="inline-flex"
+        userSelect="none"
+        cursor="pointer"
         title="More info"
         onMouseEnter={!isMobile ? () => setIsVisible(true) : undefined}
         onMouseLeave={!isMobile ? () => setIsVisible(false) : undefined}
@@ -81,7 +79,7 @@ const Tooltip: React.FC<IProps> = ({ content, children }) => {
             {content}
           </Content>
         )}
-      </Container>
+      </Box>
     </>
   )
 }

From 12baa137722200bf3b924dd25cc835d6b40eeaae Mon Sep 17 00:00:00 2001
From: vdusart <dusartvictor@gmail.com>
Date: Sun, 20 Nov 2022 19:27:39 +0100
Subject: [PATCH 034/108] convert content to chakra

---
 src/components/Tooltip.tsx | 49 +++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
index e7f74c92bc8..7cb413894a5 100644
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -1,32 +1,8 @@
 import React, { ReactNode, useState } from "react"
 import styled from "@emotion/styled"
-import { Box } from "@chakra-ui/react"
+import { Box, calc } from "@chakra-ui/react"
 import * as utils from "../utils/isMobile"
 
-const Content = styled.div`
-  text-align: center;
-  white-space: normal;
-  width: 200px;
-  color: ${({ theme }) => theme.colors.text};
-  background-color: ${({ theme }) => theme.colors.background};
-  box-shadow: ${({ theme }) => theme.colors.tableBoxShadow};
-  position: absolute;
-  z-index: 10;
-  padding: 1rem 0.5rem;
-  text-transform: none;
-  font-size: ${({ theme }) => theme.fontSizes.s};
-  font-weight: 500;
-  cursor: default;
-  border-radius: 4px;
-  bottom: calc(100% + 1rem);
-  left: 25%;
-  bottom: 125%;
-  transform: translateX(-50%);
-  @media (max-width: ${({ theme }) => theme.breakpoints.m}) {
-    width: 140px;
-  }
-`
-
 const Arrow = styled.span`
   position: absolute;
   bottom: -0.5rem;
@@ -74,10 +50,29 @@ const Tooltip: React.FC<IProps> = ({ content, children }) => {
       >
         {children}
         {isVisible && (
-          <Content>
+          <Box
+            textAlign="center"
+            whiteSpace="normal"
+            w={{ base: "140px", md: "200px" }}
+            color="text"
+            bg="background"
+            boxShadow="tableBoxShadow"
+            position="absolute"
+            zIndex="docked"
+            py={4}
+            px={2}
+            textTransform="none"
+            fontSize="sm"
+            fontWeight="medium"
+            cursor="default"
+            borderRadius="base"
+            bottom="125%"
+            left="25%"
+            transform="translateX(-50%)"
+          >
             <Arrow />
             {content}
-          </Content>
+          </Box>
         )}
       </Box>
     </>

From 80f04d2fd47532d7d57a21a2a31563ba3a40e95d Mon Sep 17 00:00:00 2001
From: vdusart <dusartvictor@gmail.com>
Date: Sun, 20 Nov 2022 19:50:37 +0100
Subject: [PATCH 035/108] convert arrow to chakra

---
 src/components/Tooltip.tsx | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
index 7cb413894a5..c07968c7697 100644
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -1,17 +1,8 @@
 import React, { ReactNode, useState } from "react"
 import styled from "@emotion/styled"
-import { Box, calc } from "@chakra-ui/react"
+import { Box } from "@chakra-ui/react"
 import * as utils from "../utils/isMobile"
 
-const Arrow = styled.span`
-  position: absolute;
-  bottom: -0.5rem;
-  left: calc(50% - 6px);
-  border-right: 10px solid transparent;
-  border-top: 10px solid ${({ theme }) => theme.colors.background};
-  border-left: 10px solid transparent;
-`
-
 // Invisible full screen div "below" the clickable link
 // Added so clicking away anywhere will hide Tooltip
 const ModalReturn = styled.div`
@@ -30,7 +21,7 @@ export interface IProps {
 
 // TODO add `position` prop
 const Tooltip: React.FC<IProps> = ({ content, children }) => {
-  const [isVisible, setIsVisible] = useState<boolean>(false)
+  const [isVisible, setIsVisible] = useState<boolean>(true)
   const isMobile = utils.isMobile()
 
   return (
@@ -45,7 +36,7 @@ const Tooltip: React.FC<IProps> = ({ content, children }) => {
         cursor="pointer"
         title="More info"
         onMouseEnter={!isMobile ? () => setIsVisible(true) : undefined}
-        onMouseLeave={!isMobile ? () => setIsVisible(false) : undefined}
+        onMouseLeave={!isMobile ? () => setIsVisible(true) : undefined}
         onClick={isMobile ? () => setIsVisible(!isVisible) : undefined}
       >
         {children}
@@ -70,7 +61,21 @@ const Tooltip: React.FC<IProps> = ({ content, children }) => {
             left="25%"
             transform="translateX(-50%)"
           >
-            <Arrow />
+            <Box
+              as="span"
+              position="absolute"
+              bottom={-2}
+              left="calc(50% - 6px)"
+              borderRightWidth={10}
+              borderRightStyle="solid"
+              borderRightColor="transparent"
+              borderTopWidth={10}
+              borderTopStyle="solid"
+              borderTopColor="background"
+              borderLeftWidth={10}
+              borderLeftStyle="solid"
+              borderLeftColor="transparent"
+            />
             {content}
           </Box>
         )}

From fd95a7497489b00328f2075ec576964aef8298a2 Mon Sep 17 00:00:00 2001
From: vdusart <dusartvictor@gmail.com>
Date: Sun, 20 Nov 2022 19:57:03 +0100
Subject: [PATCH 036/108] Convert modalReturn to chakra

---
 src/components/Tooltip.tsx | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
index c07968c7697..d60c47b0106 100644
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -1,19 +1,7 @@
 import React, { ReactNode, useState } from "react"
-import styled from "@emotion/styled"
 import { Box } from "@chakra-ui/react"
 import * as utils from "../utils/isMobile"
 
-// Invisible full screen div "below" the clickable link
-// Added so clicking away anywhere will hide Tooltip
-const ModalReturn = styled.div`
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1;
-`
-
 export interface IProps {
   content: ReactNode
   children?: React.ReactNode
@@ -21,13 +9,23 @@ export interface IProps {
 
 // TODO add `position` prop
 const Tooltip: React.FC<IProps> = ({ content, children }) => {
-  const [isVisible, setIsVisible] = useState<boolean>(true)
+  const [isVisible, setIsVisible] = useState<boolean>(false)
   const isMobile = utils.isMobile()
 
   return (
     <>
       {isVisible && isMobile && (
-        <ModalReturn onClick={() => setIsVisible(false)} />
+        // Invisible full screen div "below" the clickable link
+        // Added so clicking away anywhere will hide Tooltip
+        <Box
+          position="fixed"
+          top={0}
+          left={0}
+          w="full"
+          h="full"
+          zIndex={1}
+          onClick={() => setIsVisible(false)}
+        />
       )}
       <Box
         position="relative"
@@ -36,7 +34,7 @@ const Tooltip: React.FC<IProps> = ({ content, children }) => {
         cursor="pointer"
         title="More info"
         onMouseEnter={!isMobile ? () => setIsVisible(true) : undefined}
-        onMouseLeave={!isMobile ? () => setIsVisible(true) : undefined}
+        onMouseLeave={!isMobile ? () => setIsVisible(false) : undefined}
         onClick={isMobile ? () => setIsVisible(!isVisible) : undefined}
       >
         {children}

From f6506b90347f06f0479af0d801b3c0a7c01ecb98 Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Mon, 21 Nov 2022 09:27:12 +0000
Subject: [PATCH 037/108] Update broken Mamba links

---
 .../de/developers/docs/programming-languages/python/index.md    | 2 +-
 .../es/developers/docs/programming-languages/python/index.md    | 2 +-
 .../fr/developers/docs/programming-languages/python/index.md    | 2 +-
 .../hu/developers/docs/programming-languages/python/index.md    | 2 +-
 .../id/developers/docs/programming-languages/python/index.md    | 2 +-
 .../it/developers/docs/programming-languages/python/index.md    | 2 +-
 .../pl/developers/docs/programming-languages/python/index.md    | 2 +-
 .../pt-br/developers/docs/programming-languages/python/index.md | 2 +-
 .../ro/developers/docs/programming-languages/python/index.md    | 2 +-
 .../tr/developers/docs/programming-languages/python/index.md    | 2 +-
 .../zh/developers/docs/programming-languages/python/index.md    | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/content/translations/de/developers/docs/programming-languages/python/index.md b/src/content/translations/de/developers/docs/programming-languages/python/index.md
index 9b2a2a0e036..02ea090c8ab 100644
--- a/src/content/translations/de/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/de/developers/docs/programming-languages/python/index.md
@@ -64,7 +64,7 @@ Sind Sie an einigen grundlegenden Informationen interessiert? Dann sehen Sie sic
 ### Archiviert/Nicht mehr verwaltet: {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) – _Ethereum-Python-Client_
-- [Mamba](https://mamba.black) – _Framework zum Schreiben, Kompilieren und Bereitstellen von Smart Contracts in der Sprache Vyper_
+- [Mamba](https://github.com/arjunaskykok/mamba) – _Framework zum Schreiben, Kompilieren und Bereitstellen von Smart Contracts in der Sprache Vyper_
 
 Sind Sie an weiteren Informationen interessiert? Sehen Sie sich [ethereum.org/developers](/developers/) an.
 
diff --git a/src/content/translations/es/developers/docs/programming-languages/python/index.md b/src/content/translations/es/developers/docs/programming-languages/python/index.md
index 99e97070539..a08f123906b 100644
--- a/src/content/translations/es/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/es/developers/docs/programming-languages/python/index.md
@@ -63,7 +63,7 @@ Utiliza Ethereum para crear aplicaciones descentralizadas (o "dapps"), que aprov
 ### Archivados / Sin soporte: {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) - _Cliente Python para Ethereum_
-- [Mamba](https://mamba.black) - _framework para escribir, compilar y desplegar smart contracts escrito en el lenguaje Vyper_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _framework para escribir, compilar y desplegar smart contracts escrito en el lenguaje Vyper_
 
 ¿Buscas más recursos? Echa un vistazo a [ethereum.org/developers.](/developers/)
 
diff --git a/src/content/translations/fr/developers/docs/programming-languages/python/index.md b/src/content/translations/fr/developers/docs/programming-languages/python/index.md
index 9ee39574189..570e93c1114 100644
--- a/src/content/translations/fr/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/fr/developers/docs/programming-languages/python/index.md
@@ -64,7 +64,7 @@ Besoin d’une approche plus élémentaire ? Consultez [ethereum.org/learn](/le
 ### Archivé / Non entretenu : {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) - _Client Ethereum sous Python_
-- [Mamba](https://mamba.black) - _Infrastructure permettant de rédiger, de compiler et de déployer des contrats intelligents en langage Vyper_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _Infrastructure permettant de rédiger, de compiler et de déployer des contrats intelligents en langage Vyper_
 
 Vous cherchez davantage de ressources ? Consultez [ethereum.org/developers.](/developers/).
 
diff --git a/src/content/translations/hu/developers/docs/programming-languages/python/index.md b/src/content/translations/hu/developers/docs/programming-languages/python/index.md
index 37a9d7469b9..a9450d7e754 100644
--- a/src/content/translations/hu/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/hu/developers/docs/programming-languages/python/index.md
@@ -48,7 +48,7 @@ Szükséged van egy méginkább kezdőknek szóló alapozóra? Tekintsd meg az [
 - [py-wasm](https://github.com/ethereum/py-wasm) - _a web assembly interpreter Python implementációja_
 - [pydevp2p](https://github.com/ethereum/pydevp2p) - _Az Ethereum P2P stack implementációjak_
 - [pymaker](https://github.com/makerdao/pymaker) - _Python API Maker szerződésekre_
-- [Mamba](https://mamba.black) - _keretrendszer Vyper nyelven írt okos szerződések írására, fordítására és telepítésére_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _keretrendszer Vyper nyelven írt okos szerződések írására, fordítására és telepítésére_
 - [Trinity](https://github.com/ethereum/trinity) - _Ethereum Python kliens_
 - [Vyper](https://github.com/ethereum/vyper/) - _Pythonikus okosszerződés nyelv az EVM-re_
 - [Web3.py](https://github.com/ethereum/web3.py) - _Python library Ethereummal történő interakciókra_
diff --git a/src/content/translations/id/developers/docs/programming-languages/python/index.md b/src/content/translations/id/developers/docs/programming-languages/python/index.md
index ed953cddc10..fef6c8e97ad 100644
--- a/src/content/translations/id/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/id/developers/docs/programming-languages/python/index.md
@@ -61,7 +61,7 @@ Perlu penjelasan yang lebih mendasar? Kunjungi [ethereum.org/learn](/learn/) ata
 ### Diarsipkan / Tidak lagi dipertahankan: {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) - _Klien Python Ethereum_
-- [Mamba](https://mamba.black) - _kerangka kerja untuk menulis, mengompilasi, dan menyebarkan kontrak pintar yang ditulis dalam bahasa Vyper_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _kerangka kerja untuk menulis, mengompilasi, dan menyebarkan kontrak pintar yang ditulis dalam bahasa Vyper_
 
 Ingin mencari informasi tambahan? Kunjungi [ethereum.org/developers](/developers/).
 
diff --git a/src/content/translations/it/developers/docs/programming-languages/python/index.md b/src/content/translations/it/developers/docs/programming-languages/python/index.md
index 2b8001c26fa..3bec20d2b27 100644
--- a/src/content/translations/it/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/it/developers/docs/programming-languages/python/index.md
@@ -64,7 +64,7 @@ Hai prima bisogno di nozioni di base? Dai un'occhiata a [ethereum.org/learn](/le
 ### Archiviato / Non più mantenuto: {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) - _Il client Python di Ethereum_
-- [Mamba](https://mamba.black) - _Framework per scrivere, compilare e distribuire smart contract scritti in linguaggio Vyper_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _Framework per scrivere, compilare e distribuire smart contract scritti in linguaggio Vyper_
 
 Cerchi altre risorse? Dai un'occhiata a [ethereum.org/developers](/developers/).
 
diff --git a/src/content/translations/pl/developers/docs/programming-languages/python/index.md b/src/content/translations/pl/developers/docs/programming-languages/python/index.md
index b0665972abe..45d9ba3011b 100644
--- a/src/content/translations/pl/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/pl/developers/docs/programming-languages/python/index.md
@@ -48,7 +48,7 @@ Potrzebujesz bardziej podstawowych informacji? Sprawdź na stronach [ethereum.or
 - [py-wasm](https://github.com/ethereum/py-wasm) - _Implementacja webowego interpretera asemblera przy użyciu języka Python _
 - [pydevp2p](https://github.com/ethereum/pydevp2p) - _Implementacja stosu Ethereum P2P _
 - [pymaker](https://github.com/makerdao/pymaker) - <em x-id="4">API Python dla kontraktów Maker</em>
-- [Mamba](https://mamba.black) - _Framework do tworzenia, kompilowania i wdrażania inteligentnych kontraktów napisanych przy użyciu języka Viper_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _Framework do tworzenia, kompilowania i wdrażania inteligentnych kontraktów napisanych przy użyciu języka Viper_
 - [Trinity](https://github.com/ethereum/trinity) - _Klient Python Ethereum_
 - [Vyper](https://github.com/ethereum/vyper/) - <em x-id="4">Język inteligentnych kontraktów oparty na Pythonie dla EVM</em>
 - [Web3.py](https://github.com/ethereum/web3.py) - _Biblioteka Python do interakcji z Ethereum_
diff --git a/src/content/translations/pt-br/developers/docs/programming-languages/python/index.md b/src/content/translations/pt-br/developers/docs/programming-languages/python/index.md
index 5e01ab19787..b256c065ad1 100644
--- a/src/content/translations/pt-br/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/pt-br/developers/docs/programming-languages/python/index.md
@@ -64,7 +64,7 @@ Precisa de uma introdução geral? Confira [ethereum.org/learn](/learn/) ou [eth
 ### Arquivado / Não mais mantido: {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) - _cliente Ethereum Python_
-- [Mamba](https://mamba.black) - _framework para escrever, compilar e implantar smart contracts escritos em linguagem Vyper_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _framework para escrever, compilar e implantar smart contracts escritos em linguagem Vyper_
 
 Procurando por mais recursos? Confira [ethereum.org/developers](/developers/).
 
diff --git a/src/content/translations/ro/developers/docs/programming-languages/python/index.md b/src/content/translations/ro/developers/docs/programming-languages/python/index.md
index 19fed40cbe5..ee8fa2da294 100644
--- a/src/content/translations/ro/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/ro/developers/docs/programming-languages/python/index.md
@@ -64,7 +64,7 @@ Aveţi nevoie de o scurtă introducere? Accesaţi [ethereum.org/learn](/learn/)
 ### Arhivate/Neîntreținute: {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) - _client Python Ethereum_
-- [Mamba](https://mamba.black) - _framework pentru a scrie, compila și implementa contractele inteligente scrise în limbajul Vyper_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _framework pentru a scrie, compila și implementa contractele inteligente scrise în limbajul Vyper_
 
 Căutaţi şi alte resurse? Accesaţi [ethereum.org/developers.](/developers/).
 
diff --git a/src/content/translations/tr/developers/docs/programming-languages/python/index.md b/src/content/translations/tr/developers/docs/programming-languages/python/index.md
index 0b4c4f4d2e5..d08afdaa565 100644
--- a/src/content/translations/tr/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/tr/developers/docs/programming-languages/python/index.md
@@ -64,7 +64,7 @@ Başlamadan önce daha temel bir bilgiye mi ihtiyacınız var? [ethereum.org/lea
 ### Arşivlenmiş / Artık sürdürülmeyen: {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) - _Ethereum Python istemcisi_
-- [Mamba](https://mamba.black) - _Vyper dilinde yazılmış akıllı sözleşmeleri yazmak, derlemek ve dağıtmak için çerçeve_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _Vyper dilinde yazılmış akıllı sözleşmeleri yazmak, derlemek ve dağıtmak için çerçeve_
 
 Daha fazla kaynak mı arıyorsunuz? Göz atın: [ethereum.org/developers](/developers/).
 
diff --git a/src/content/translations/zh/developers/docs/programming-languages/python/index.md b/src/content/translations/zh/developers/docs/programming-languages/python/index.md
index e4e6ea9c84c..0a6414f7a3f 100644
--- a/src/content/translations/zh/developers/docs/programming-languages/python/index.md
+++ b/src/content/translations/zh/developers/docs/programming-languages/python/index.md
@@ -64,7 +64,7 @@ incomplete: true
 ### 已归档/不再维护： {#archived--no-longer-maintained}
 
 - [Trinity](https://github.com/ethereum/trinity) - _以太坊的 Python 客户端_
-- [Mamba](https://mamba.black) - _一个用 Vyper 语言编写、编译和部署智能合约的框架_
+- [Mamba](https://github.com/arjunaskykok/mamba) - _一个用 Vyper 语言编写、编译和部署智能合约的框架_
 
 想要获取更多的资源？ 请查看 [ethereum.org/developers](/developers/)。
 

From 7d62c9901f8b6b41f4d7cf5d93282a8a64951785 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 21 Nov 2022 18:01:07 -0300
Subject: [PATCH 038/108] update translation functions

---
 src/components/ShardChainsList.tsx | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/components/ShardChainsList.tsx b/src/components/ShardChainsList.tsx
index 2e100149e4f..90ed55a1cb6 100644
--- a/src/components/ShardChainsList.tsx
+++ b/src/components/ShardChainsList.tsx
@@ -38,33 +38,18 @@ const ShardChainsList: React.FC<IProps> = () => {
       link: "https://members.delphidigital.io/reports/the-hitchhikers-guide-to-ethereum",
     },
     {
-      title: translateMessageId("page-upgrade-article-title-eip-4844", intl),
-      description: translateMessageId(
-        "page-upgrade-article-author-eip-4844",
-        intl
-      ),
+      title: t("page-upgrade-article-title-eip-4844"),
+      description: t("page-upgrade-article-author-eip-4844"),
       link: "https://eips.ethereum.org/EIPS/eip-4844",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-proto-danksharding-faq",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-vitalik-buterin",
-        intl
-      ),
+      title: t("page-upgrade-article-title-proto-danksharding-faq"),
+      description: t("page-upgrade-article-author-vitalik-buterin"),
       link: "https://notes.ethereum.org/@vbuterin/proto_danksharding_faq",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-sharding-das",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-vitalik-buterin",
-        intl
-      ),
+      title: t("page-upgrade-article-title-sharding-das"),
+      description: t("page-upgrade-article-author-vitalik-buterin"),
       link: "https://hackmd.io/@vbuterin/sharding_proposal",
     },
   ]

From 0b20b3558a60932d6642d5f2ee415935b43ccfaf Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 21 Nov 2022 18:01:22 -0300
Subject: [PATCH 039/108] fix tutorials filter

---
 src/pages/developers/tutorials.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/developers/tutorials.tsx b/src/pages/developers/tutorials.tsx
index 26459754140..9f7389c92ba 100644
--- a/src/pages/developers/tutorials.tsx
+++ b/src/pages/developers/tutorials.tsx
@@ -260,9 +260,9 @@ const TutorialsPage = ({
       filterTutorialsByLang(
         data.allTutorials.nodes,
         externalTutorials,
-        pageContext.locale
+        pageContext.language
       ),
-    [pageContext.locale]
+    [pageContext.language]
   )
 
   const allTags = useMemo(

From abc03bdef986a487fd365ca4862860eb32ad054c Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:53:57 +0000
Subject: [PATCH 040/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 3ca3b39d964..864270fcb4d 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -58,7 +58,7 @@ const ExpandableCard: React.FC<IProps> = ({
     <Accordion
       border="1px solid"
       borderColor="border"
-      borderRadius="2px"
+      borderRadius="sm"
       display="flex"
       flex-direction="column"
       marginBottom="1rem"

From e56bff84408c6a68053532375e1fc3a3c9bb8169 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:54:14 +0000
Subject: [PATCH 041/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 864270fcb4d..e0784ce2b04 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -61,7 +61,7 @@ const ExpandableCard: React.FC<IProps> = ({
       borderRadius="sm"
       display="flex"
       flex-direction="column"
-      marginBottom="1rem"
+      marginBottom="4"
       cursor="pointer"
       _hover={{
         backgroundColor: "ednBackground",

From 64a342271563337451aa40a7944854cb4e6e0f44 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:54:47 +0000
Subject: [PATCH 042/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index e0784ce2b04..efb227c5142 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -70,7 +70,7 @@ const ExpandableCard: React.FC<IProps> = ({
       index={isVisible ? [0] : []}
     >
       <AccordionItem borderTopWidth="0" flex="1">
-        <h3 style={{ margin: 0 }}>
+        <Heading as="h3" m={0}>
           <AccordionButton
             width="100%"
             padding={`1.5rem 1.5rem ${isVisible ? "0" : "1.5rem"}`}

From c7fbece3a08c4c1b6a936d12ab2d5ef0407d7499 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:55:13 +0000
Subject: [PATCH 043/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index efb227c5142..dab39ff295f 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -73,7 +73,7 @@ const ExpandableCard: React.FC<IProps> = ({
         <Heading as="h3" m={0}>
           <AccordionButton
             width="100%"
-            padding={`1.5rem 1.5rem ${isVisible ? "0" : "1.5rem"}`}
+            p={6}
             flex="1"
             onClick={onClick}
             _hover={{

From 69001bd8d88872f2e3a791ab1b92770940d12257 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:55:20 +0000
Subject: [PATCH 044/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index dab39ff295f..672098dd605 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -136,7 +136,6 @@ const ExpandableCard: React.FC<IProps> = ({
           paddingTop="0"
           onClick={onClick}
         >
-          <Fade in={isVisible}>
             <Box
               fontSize="md"
               color="text"

From 1297718b00c48f229a0a8f8923b89d42b4142947 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:55:28 +0000
Subject: [PATCH 045/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 672098dd605..5be6af3d0df 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -96,7 +96,7 @@ const ExpandableCard: React.FC<IProps> = ({
                   sx={{
                     svg: { marginRight: "1.5rem" },
                   }}
-                  margin="1rem 0"
+                  my="4"
                 >
                   {!!Svg && <Svg />}
                   <Text

From d0a5431ab95733b947acdee8407943f0409d4546 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:55:35 +0000
Subject: [PATCH 046/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 5be6af3d0df..9d63217a29c 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -131,8 +131,8 @@ const ExpandableCard: React.FC<IProps> = ({
           </AccordionButton>
         </h3>
         <AccordionPanel
-          paddingX="1.5rem"
-          paddingBottom="1.5rem"
+          paddingX="2"
+          paddingBottom="2"
           paddingTop="0"
           onClick={onClick}
         >

From 78871d0872bcf5570b37dcd4d5811b2dc63af3a0 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:55:42 +0000
Subject: [PATCH 047/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 9d63217a29c..5325f5e22d1 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -139,8 +139,8 @@ const ExpandableCard: React.FC<IProps> = ({
             <Box
               fontSize="md"
               color="text"
-              marginTop="2rem"
-              paddingTop="1.5rem"
+              marginTop="8"
+              paddingTop="6"
               borderTop="1px solid"
               borderColor="border"
             >

From e9d328b8454ab7d665bd2560a5f6ccf7ad30ff94 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:55:53 +0000
Subject: [PATCH 048/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 5325f5e22d1..149ea16f893 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -87,8 +87,8 @@ const ExpandableCard: React.FC<IProps> = ({
               flexDir={{ base: "column", sm: "row" }}
             >
               <Box
-                marginBottom={{ base: "0.5rem", sm: 0 }}
-                marginRight={{ base: 0, sm: "1rem" }}
+                marginBottom={{ base: 2, sm: 0 }}
+                marginRight={{ base: 0, sm: 4 }}
               >
                 <Box
                   display="flex"

From 3050f21ebee751f2bc3f2df0dbe7c98b174be841 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:55:59 +0000
Subject: [PATCH 049/108] Update src/components/ExpandableCard.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/ExpandableCard.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 149ea16f893..b30cf132be4 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -103,8 +103,7 @@ const ExpandableCard: React.FC<IProps> = ({
                     fontSize="xl"
                     fontWeight="semibold"
                     flex="1"
-                    marginTop="0rem"
-                    marginBottom="0.5rem"
+                    m="0"
                   >
                     {title}
                   </Text>

From 281a9024f4d99a9e045bc2aaf3eb55c91a17a90a Mon Sep 17 00:00:00 2001
From: Jamie Barrett <39060614+jb-0@users.noreply.github.com>
Date: Tue, 22 Nov 2022 07:59:48 +0000
Subject: [PATCH 050/108] chore: rem fade

---
 src/components/ExpandableCard.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index b30cf132be4..2025365f137 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -13,7 +13,6 @@ import {
   AccordionPanel,
   Box,
   Button,
-  Fade,
   Heading,
   Text,
 } from "@chakra-ui/react"
@@ -145,7 +144,6 @@ const ExpandableCard: React.FC<IProps> = ({
             >
               {children}
             </Box>
-          </Fade>
         </AccordionPanel>
       </AccordionItem>
     </Accordion>

From 811fd2fef784a95fde993a148e3f6d13dc41615c Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Tue, 22 Nov 2022 10:37:40 +0000
Subject: [PATCH 051/108] Update Thai (th) Essentials bucket

---
 src/intl/th/page-eth.json              |   6 +-
 src/intl/th/page-wallets.json          |  10 ++-
 src/intl/th/page-what-is-ethereum.json | 115 +++++++++++++------------
 3 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/src/intl/th/page-eth.json b/src/intl/th/page-eth.json
index 41045eeaa3f..517d97fbc70 100644
--- a/src/intl/th/page-eth.json
+++ b/src/intl/th/page-eth.json
@@ -16,9 +16,9 @@
   "page-eth-flexible-amounts-desc": "ETH สามารถถูกแบ่งได้ถึงจุดทศนิยม 18 หลัก เพื่อที่คุณจะได้ไม่ต้องซื้อ 1 ETH แบบเต็มๆ คุณจะซื้อแค่เสี้ยวหนึ่งในแต่ละครั้ง หรือจะซื้อจำนวนแค่ 0.000000000000000001 ETH ก็ได้ถ้าคุณต้องการ",
   "page-eth-fuels": "ETH คือฐานรากสำหรับระบบการเงินของอีเธอเรียม",
   "page-eth-fuels-desc": "ETH เปรียบเสมือนเส้นเลือดที่หล่อเลี้ยงชีวิตของอีเธอเรียม เมื่อคุณส่ง ETH หรือใช้แอปพลิเคชันบนอีเธอเรียม คุณจะต้องจ่ายค่าธรรมเนียมในสกุล ETH จำนวนเล็กน้อยเพื่อใช้งานเครือข่ายอีเธอเรียม ค่าธรรมเนียมนี้คือแรงจูงใจที่จะทำให้นักขุดดำเนินการและยืนยันสิ่งที่คุณพยายามจะทำ",
-  "page-eth-fuels-desc-2": "ปัจจุบัน นักขุดทำหน้าที่เหมือนผู้เก็บบันทึกอีเธอเรียม โดยทำหน้าที่ตรวจสอบและพิสูจน์ว่าไม่มีใครโกง รวมถึงทำงานเพื่อรับสิทธิ์ในเสนอธุรกรรมต่างๆ นักขุดที่ทำหน้าที่นี้ยังได้รางวัลเล็กๆ น้อยๆ เป็น ETH ที่เพิ่งสร้างขึ้นด้วย",
-  "page-eth-fuels-desc-3": "งานที่นักขุดทำช่วยให้อีเธอเรียมมีความปลอดภัย และปราศจากการถูกควบคุมจากใครคนใดคนหนึ่ง กล่าวได้ว่า",
-  "page-eth-fuels-staking": "ในไม่ช้า ETH จะยิ่งมีความสำคัญมากขึ้นในการ Stake เมื่อคุณวาง Stake ETH คุณจะสามารถช่วยรักษาอีเธอเรียมและรับรางวัลได้ ในระบบนี้ ความเสี่ยงที่จะสูญเสีย ETH จะช่วยลดไม่ให้เกิดการโจมตี",
+  "page-eth-fuels-desc-2": "ผู้ตรวจสอบความถูกต้องเป็นเหมือนผู้เก็บบันทึกอีเธอเรียม โดยทำหน้าที่ตรวจสอบและพิสูจน์ว่าไม่มีใครโกง ผู้ตรวจสอบจะได้รับการสุ่มเลือกเพื่อเสนอการทำธุรกรรมบล็อก ผู้ตรวจสอบความถูกต้องที่ทำหน้าที่นี้จะได้รับรางวัลเล็กๆ น้อยๆ จาก ETH ที่เพิ่งสร้างอีกด้วย",
+  "page-eth-fuels-desc-3": "บทบาทของผู้ตรวจสอบความถูกต้องและเงินทุนที่พวกเขาเดิมพันทำให้อีเธอเรียมปลอดภัยและปราศจากการควบคุมจากส่วนกลาง",
+  "page-eth-fuels-staking": "เมื่อคุณเดิมพัน ETH คุณจะช่วยรักษาอีเธอเรียมและรับรางวัล ในระบบนี้ ความเสี่ยงที่จะสูญเสีย ETH ทำให้ผู้โจมตีเปลี่ยนใจ",
   "page-eth-fuels-more-staking": "อ่านเพิ่มเติมเกี่ยวกับการฝาก",
   "page-eth-get-eth-btn": "รับ ETH",
   "page-eth-gov-tokens": "โทเคน Governance",
diff --git a/src/intl/th/page-wallets.json b/src/intl/th/page-wallets.json
index a5d7249008a..009abaca016 100644
--- a/src/intl/th/page-wallets.json
+++ b/src/intl/th/page-wallets.json
@@ -7,7 +7,7 @@
   "page-wallets-blog": "บล็อก Coinbase",
   "page-wallets-bookmarking": "บุ๊กมาร์กวอลเล็ทของคุณ",
   "page-wallets-bookmarking-desc": "ถ้าคุณใช้งานวอลเล็ทบนเว็บไซต์ ให้บุ๊กมาร์กหน้านั้นไว้เพื่อปกป้องตัวเองจากการหลอกลวงแบบฟิชชิ่ง",
-  "page-wallets-cd": "วอลเล็ทฮาร์ดแวร์หรือแบบจับต้องได้ จะทำให้คุณสามารถเก็บคริปโตของคุณแบบออฟไลน์ โดยมีความปลอดภัยสูง",
+  "page-wallets-cd": "วอลเล็ทฮาร์ดแวร์หรือแบบจับต้องได้เป็นอุปกรณ์ที่คุณใช้เก็บคริปโตแบบออฟไลน์ โดยมีความปลอดภัยสูง",
   "page-wallets-desc-2": "คุณจำเป็นต้องมีวอลเล็ทในการส่งเงินและจัดการ ETH ของคุณ",
   "page-wallets-desc-2-link": "เพิ่มเติมเกี่ยวกับ ETH",
   "page-wallets-desc-3": "วอลเล็ทเป็นเพียงแค่เครื่องมือสำหรับจัดการบัญชีอีเธอเรียมของคุณ ดังนั้นคุณสามารถเปลี่ยนผู้ให้บริการเมื่อใดก็ได้ มีหลายเจ้าที่อนุญาตให้คุณจัดการบัญชีอีเธอเรียมมากกว่าหนึ่งบัญชีได้ภายในแอปพลิเคชันเดียว",
@@ -17,7 +17,7 @@
   "page-wallets-ethereum-wallet": "วอลเล็ทคือผลิตภัณฑ์ที่ทำให้คุณสามารถจัดการบัญชีอีเธอเรียมของคุณได้ โดยคุณสามารถดูยอดคงเหลือ ส่งธุรกรรม และอื่นๆ อีกมากมาย",
   "page-wallets-explore": "สำรวจอีเธอเรียม",
   "page-wallets-features-desc": "เราสามารถช่วยคุณเลือกวอลเล็ทตามฟีเจอร์ที่คุณให้ความสำคัญ",
-  "page-wallets-features-title": "Compare wallets based on features",
+  "page-wallets-features-title": "เปรียบเทียบวอลเล็ทต่างๆ โดยดูจากคุณสมบัติ",
   "page-wallets-find-wallet-btn": "ค้นหาวอลเล็ท",
   "page-wallets-find-wallet-link": "ค้นหาวอลเล็ท",
   "page-wallets-get-some": "ซื้อ ETH",
@@ -31,7 +31,7 @@
   "page-wallets-meta-description": "สิ่งที่คุณต้องรู้เพื่อใช้งานวอลเล็ทอีเธอเรียม",
   "page-wallets-meta-title": "วอลเล็ทอีเธอเรียม",
   "page-wallets-mobile": "แอปพลิเคชันบนมือถือที่ทำให้คุณสามารถเข้าถึงเงินของคุณจากที่ไหนก็ได้",
-  "page-wallets-more-on-dapps-btn": "More on dapps",
+  "page-wallets-more-on-dapps-btn": "เรียนรู้เพิ่มเติมเกี่ยวกับ dApp",
   "page-wallets-most-wallets": "ผลิตภัณฑ์ส่วนใหญ่มักจะสร้างบัญชีอีเธอเรียมให้ด้วย ดังนั้นคุณไม่จำเป็นต้องมีบัญชีก่อนที่จะดาวน์โหลดวอลเล็ท",
   "page-wallets-protecting-yourself": "ปกป้องตัวคุณและเงินของคุณ",
   "page-wallets-seed-phrase": "พิมพ์ Seed Phrase ของคุณ",
@@ -54,7 +54,9 @@
   "page-wallets-try-dapps-alt": "ภาพวาดสมาชิกในชุมชนอีเธอเรียมกำลังทำงานร่วมกัน",
   "page-wallets-try-dapps-desc": "Dapp คือแอปพลิเคชันที่สร้างบนอีเธอเรียม พวกมันถูกกว่า ยุติธรรมกว่า และใจดีกับข้อมูลของคุณมากกว่าบรรดาแอปพลิเคชันแบบดั้งเดิมเกือบทั้งหมด",
   "page-wallets-types": "ประเภทของวอลเล็ท",
-  "page-wallets-web-browser": "วอลเล็ทบนเว็บที่ทำให้คุณสามารถใช้งานบัญชีของคุณได้ผ่านเว็บเบราว์เซอร์",
+  "page-wallets-types-desc": "คุณสามารถดูข้อมูลและใช้งานบัญชีได้สองสามวิธี",
+  "page-wallets-web-browser": "วอลเล็ทแบบเบราว์เซอร์เป็นแอปพลิเคชันบนเว็บที่คุณสามารถใช้งานบัญชีของตนได้โดยตรงผ่านเบราว์เซอร์",
+  "page-wallets-web-browser-extension": "วอลเล็ทส่วนขยายเบราว์เซอร์เป็นส่วนขยายที่คุณดาวน์โหลดและทำให้คุณใช้บัญชีและแอปพลิเคชันของตนได้ผ่านทางเบราว์เซอร์",
   "page-wallets-whats-a-wallet": "วอลเล็ทอีเธอเรียมคืออะไร",
   "page-wallets-your-ethereum-account": "บัญชีอีเธอเรียมของคุณ",
   "page-wallets-your-ethereum-account-desc": "วอลเล็ทของคุณคือหน้าต่างไปสู่บัญชีอีเธอเรียมของคุณ โดยคุณสามารถเช็คยอดคงเหลือ ประวัติธุรกรรม และอื่นๆ อีกมากมาย และคุณสามารถเปลี่ยนผู้ให้บริการวอลเล็ทเมื่อไหร่ก็ได้",
diff --git a/src/intl/th/page-what-is-ethereum.json b/src/intl/th/page-what-is-ethereum.json
index 17db4ef155d..b80d345d763 100644
--- a/src/intl/th/page-what-is-ethereum.json
+++ b/src/intl/th/page-what-is-ethereum.json
@@ -10,7 +10,7 @@
   "page-what-is-ethereum-censorless-card-desc": "ไม่มีรัฐบาลหรือองค์กรใดที่มีอำนาจควบคุมอีเธอเรียม ความไร้ศูนย์กลางเช่นนี้ทำให้แทบจะเป็นไปไม่ได้เลยที่ใครจะมาหยุดยั้งคุณจากการได้รับเงินหรือใช้บริการต่างๆ บนอีเธอเรียม",
   "page-what-is-ethereum-comm-desc": "ชุมชนของเราประกอบไปด้วยผู้คนจากหลายสาขาอาชีพ ตั้งแต่ศิลปิน คริปโตอนาธิปัตย์ บริษัทติดอันดับฟอร์จูน 500 และตอนนี้ก็คือคุณ มาลองดูกันว่าคุณจะสามารถเป็นส่วนหนึ่งของชุมชนนี้ได้อย่างไรบ้าง",
   "page-what-is-ethereum-commerce-card": "กิจการค้าการันตี",
-  "page-what-is-ethereum-commerce-card-desc": "ลูกค้ามั่นใจได้ว่าเงินจะถูกส่งมอบต่อเมื่อผู้รับมอบได้ดำเนินการตามข้อตกลงแล้วเท่านั้นจากระบบการรับประกันภายในตัว เช่นเดียวกับผู้พัฒนาที่มั่นใจได้ว่ากฎจะไม่เปลี่ยนแปลงไป",
+  "page-what-is-ethereum-commerce-card-desc": "ลูกค้ามั่นใจได้ว่าเงินจะถูกส่งมอบต่อเมื่อผู้รับมอบได้ทำตามข้อตกลงแล้วเท่านั้นจากระบบการรับประกันภายในตัว เช่นเดียวกับผู้พัฒนาที่มั่นใจได้ว่ากฎจะไม่เปลี่ยนแปลงไป",
   "page-what-is-ethereum-composable-card": "ผลิตภัณฑ์ทุกอย่างสามารถเชื่อมโยงกันได้",
   "page-what-is-ethereum-composable-card-desc": "เนื่องจากทุกแอพสร้างขึ้นจากบล็อกเชนเดียวกันซึ่งมีสถานะเดียวกันทั้งโลก ทำให้แต่ละแอพสามารถสร้างและประกอบเข้าด้วยกันได้ (เหมือนกับการต่อเลโก้) ซึ่งทำให้เกิดการสร้างผลิตภัณฑ์และประสบการณ์ที่ดีขึ้นตลอดเวลา",
   "page-what-is-ethereum-community": "ชุมชนอีเธอเรียม",
@@ -27,73 +27,74 @@
   "page-what-is-ethereum-title": "อีเธอเรียมคืออะไร",
   "page-what-is-ethereum-subtitle": "คำแนะนำอย่างสมบูรณ์สำหรับผู้เริ่มต้นว่าอีเธอเรียมทำงานอย่างไร ทำให้เกิดประโยชน์อย่างไร และใช้งานโดยคนหลายล้านคนทั่วโลกอย่างไร",
   "page-what-is-ethereum-button-lets-start": "เริ่มกันเลย",
-  "page-what-is-ethereum-blockchain-tab-title": "บล็อกเชนคืออะไร?",
+  "page-what-is-ethereum-blockchain-tab-title": "บล็อกเชนคืออะไร",
   "page-what-is-ethereum-blockchain-tab-content": "<b>บล็อกเชนคือฐานข้อมูลของการทำธุรกรรม</b> ซึ่งมีการปรับปรุงและใช้ร่วมกันในคอมพิวเตอร์มากมายที่มีอยู่ในเครือข่าย ทุกครั้งที่การทำธุรกรรมใหม่เกิดขึ้น มันจะถูกเรียกว่า \"บล็อก\" ซึ่งเป็นที่มาของชื่อบล็อกเชน บล็อกเชนส่วนมากเปิดสาธารณะ และสามารถป้อนข้อมูลเพิ่มเข้าไปได้เท่านั้น ไม่สามารถนำออกได้ หากมีคนต้องการเปลี่ยนแปลงข้อมูลหรือโกงระบบ เขาจะต้องทำกับคอมพิวเตอร์ส่วนใหญ่ในระบบ ซึ่งนับเป็นจำนวนมหาศาล สิ่งนี้ทำให้บล็อกเชน เช่น อีเธอเรียม มีความปลอดภัยสูง",
-  "page-what-is-ethereum-cryptocurrency-tab-title": "ทำไมถึงเรียกว่าคริปโตเคอร์เรนซี?",
+  "page-what-is-ethereum-cryptocurrency-tab-title": "ทำไมถึงเรียกว่าคริปโตเคอร์เรนซี",
   "page-what-is-ethereum-cryptocurrency-tab-content": "บล็อกเชนอาศัยการเข้ารหัสเพื่อให้มั่นใจได้ว่าเงินทุนของคุณปลอดภัย ซึ่งเทคนิคเดียวกันนี้ได้ใช้มาเป็นเวลานานในธุรกิจธนาคารเพื่อให้มั่นใจในความปลอดภัยในการทำธุรกรรม ดังนั้นจึงสามารถเรียกได้ว่าคริปโตเคอเรนซีมีระดับความปลอดภัยเทียบเท่ากับธนาคาร",
   "page-what-is-ethereum-summary-title": "สรุป",
   "page-what-is-ethereum-summary-desc-1": "อีเธอเรียมเป็นเทคโนโลยีสำหรับการสร้างแอพและการจัดการ การถือครองสินทรัพย์ การทำธุรกรรม และการสื่อสาร ที่ไม่ถูกควบคุมจากผู้มีอำนาจส่วนกลาง ไม่มีความจำเป็นที่จะต้องใช้ข้อมูลส่วนบุคคลใด ๆ ในการใช้งานอีเธอเรียม ผู้ใช้งานเป็นผู้ควบคุมดูแลข้อมูลส่วนตัวและการเปิดเผยของมูลดังกล่าวด้วยตนเอง อีเธอเรียมมีสกุลเงินดิจิตัลของตนเองชื่อว่า \"อีเธอร์\" ซึ่งจะใช้สำหรับจ่ายค่ากิจกรรมตามที่กำหนดไว้ที่เกิดขึ้นบนเครือข่ายอีเธอเรียม",
   "page-what-is-ethereum-summary-desc-2": "ยังสับสนอยู่ใช่ไหม มาดูกันทีละขั้นตอน",
-  "page-what-is-ethereum-what-is-crypto-title": "คริปโทเคอร์เรนซีคืออะไร?",
+  "page-what-is-ethereum-what-is-crypto-title": "คริปโทเคอร์เรนซีคืออะไร",
   "page-what-is-ethereum-what-is-crypto-desc-1": "<b>คริปโต (ย่อมาจากคริปโตเคอเรนซี) เป็นเงินดิจิตัลรูปแบบใหม่ที่สร้างโดยการเข้ารหัสข้อมูล</b>",
   "page-what-is-ethereum-what-is-crypto-desc-2": "ทั้งหมดเริ่มต้นจากบิทคอยน์ เมื่อปี ค. ศ. 2008 ทำให้คุณส่งเงินทุนไปให้ใครก็ได้จากที่ไหนก็ได้ทั่วโลก สิ่งที่ทำให้เงินดิจิตัลแตกต่างจากการโอนเงินระหว่างธนาคาร หรือบริการธุรกรรมทางการเงินอื่น เช่น เพย์พาล (Paypal) หรือ อาลีเพย์ (Alipay) คือเป็นครั้งแรกที่ไม่ต้องอาศัยคนกลางในการโอนเงิน",
   "page-what-is-ethereum-what-is-crypto-desc-3": "เดี๋ยวก่อน... คนกลางคืออะไร",
-  "page-what-is-ethereum-what-is-crypto-desc-4": "คนกลาง หมายถึงอำนาจส่วนกลาง เช่น ธนาคาร หรือ รัฐบาล ที่สามารถแทรกแซงการทำธุรกรรมระหว่างผู้ส่งและผู้รับได้ คนกลางมีอำนาจในการตรวจตรา ตรวจสอบ หรือตีกลับการทำธุกรรม และยังสามารถแบ่งปันข้อมูลที่ละเอียดอ่อนของคุณไปยังบุคคลที่สาม นอกจากนี้พวกเขามักจะกำหนดว่าคุณจะเข้าถึงบริการทางการเงินใดได้บ้าง",
-  "page-what-is-ethereum-what-is-crypto-desc-5": "ซึ่งคริปโตจะต่างออกไป <b>ธุรกรรมจะเกิดขึ้นโดยตรงระหว่างผู้ส่งและผู้รับ</b> โดยที่ไม่มีอำนาจส่วนกลางมาเกี่ยวข้อง ไม่มีผู้อื่นสามารถเข้าถึงเงินของคุณได้ และ<b>ไม่มีใครกำหนดว่าคุณใช้บริการใดได้บ้าง</b> ซึ่งเป็นผลจากการใช้เทคโนโลยีบล็อกเชนตามแต่การดำเนินการของสกุลเงินดิจิตัลแต่ละสกุล",
+  "page-what-is-ethereum-what-is-crypto-desc-4": "คนกลาง หมายถึงอำนาจส่วนกลาง เช่น ธนาคารหรือรัฐบาล ที่สามารถแทรกแซงการทำธุรกรรมระหว่างผู้ส่งและผู้รับได้ คนกลางมีอำนาจในการตรวจตรา ตรวจสอบ หรือตีกลับการทำธุกรรม และยังสามารถแบ่งปันข้อมูลที่ละเอียดอ่อนของคุณไปยังบุคคลที่สาม นอกจากนี้คนกลางมักจะกำหนดว่าคุณจะเข้าถึงบริการทางการเงินใดได้บ้าง",
+  "page-what-is-ethereum-what-is-crypto-desc-5": "ซึ่งคริปโตจะต่างออกไป <b>ธุรกรรมจะเกิดขึ้นโดยตรงระหว่างผู้ส่งและผู้รับ</b> โดยที่ไม่มีอำนาจส่วนกลางมาเกี่ยวข้อง ไม่มีผู้อื่นสามารถเข้าถึงเงินของคุณได้ และ<b>ไม่มีใครกำหนดว่าคุณใช้บริการใดได้บ้าง</b> ซึ่งเป็นผลจากการใช้เทคโนโลยีบล็อกเชนตามแต่การดำเนินการของสกุลเงินดิจิทัลแต่ละสกุล",
   "page-what-is-ethereum-btc-eth-diff-title": "อีเธอเรียมกับบิทคอยน์ต่างกันอย่างไร",
-  "page-what-is-ethereum-btc-eth-diff-1": "อีเธอเรียมเปิดตัวเมื่อปี ค. ศ. 2015 โดยมีฐานจากจากนวัตกรรมของบิตคอยน์ โดยมีข้อแตกต่างเด่น ๆ บางอย่าง",
-  "page-what-is-ethereum-btc-eth-diff-2": "Both let you use digital money without payment providers or banks. But <b>Ethereum is programmable</b>, so you can also build and deploy decentralized applications on its network.",
-  "page-what-is-ethereum-btc-eth-diff-3": "Ethereum being programmable means that you can build apps that use the blockchain to store data or control what your app can do. This results in a general purpose blockchain that can be programmed to do anything. As there is no limit to what Ethereum can do, it allows for great innovation to happen on the Ethereum network.",
-  "page-what-is-ethereum-btc-eth-diff-4": "While Bitcoin is only a payment network, Ethereum is more like a marketplace of financial services, games, social networks and other apps that respect your privacy and cannot censor you.",
+  "page-what-is-ethereum-btc-eth-diff-1": "อีเธอเรียมเปิดตัวเมื่อปี ค. ศ. 2015 โดยมีฐานจากจากนวัตกรรมของบิตคอยน์ โดยมีข้อแตกต่างเด่นๆ บางอย่าง",
+  "page-what-is-ethereum-btc-eth-diff-2": "ทั้งสองอย่างนี้ทำให้คุณได้ใช้เงินดิจิทัลโดยที่ไม่มีผู้ให้บริการทางการเงินหรือธนาคาร แต่ว่า<b>อีเธอเรียมสามารถป้อนวิธีการทำงานได้</b> ดังนั้นคุณสามารถสร้างและใช้งานแอปพลิเคชันบนเครือข่ายอีเธอเรียมได้",
+  "page-what-is-ethereum-btc-eth-diff-3": "อีเธอเรียมถูกป้อนวิธีการทำงานได้หมายความว่าคุณสามารถสร้างแอปที่ใช้บล็อกเชนในการเก็บข้อมูลหรือกำหนดว่าแอปทำอะไรได้บ้าง ส่งผลให้ได้บล็อกเชนอเนกประสงค์ที่สามารถป้อนวิธีการทำงานให้ทำอะไรก็ได้ เนื่องจากไม่มีข้อจำกัดว่าอีเธอเรียมสามารถทำอะไรได้บ้างจึงมีโอกาสที่จะเกิดนวัตกรรมอันยิ่งใหญ่ได้บนเครือข่ายอีเธอเรียม",
+  "page-what-is-ethereum-btc-eth-diff-4": "ขณะที่บิตคอยน์เป็นเพียงเครืองข่ายในการทำธุรกรรม อีเธอเรียมเป็นคล้ายกับตลาดซื้อขายทางการเงิน เกม เครือข่ายสังคมออนไลน์ และแอปอื่นๆ ที่เคารพความเป็นส่วนตัวและไม่สามารถตรวจสอบคุณได้",
   "page-what-is-ethereum-what-can-eth-do-title": "อีเธอเรียมทำอะไรได้บ้าง",
   "page-what-is-ethereum-why-would-i-use-ethereum-title": "ทำไมจึงควรใช้อีเธอเรียม",
-  "page-what-is-ethereum-why-would-i-use-ethereum-1": "If you’ve ever sent money overseas (or plan to), or had to worry about the future of your assets due to external forces outside of your control where you live, or been fed up by the numerous restrictions and fees imposed by traditional financial institutions for everyday transactions, you might be interested in what cryptocurrencies have to offer.",
-  "page-what-is-ethereum-why-would-i-use-ethereum-2": "Bear in mind that Ethereum is a story that is still being written, and many more reasons to use it are being uncovered as it evolves and develops over time.",
-  "page-what-is-ethereum-slide-1-title": "Cheaper and Faster Crossborder Payments",
-  "page-what-is-ethereum-slide-1-desc-1": "<b>Stablecoins</b> are a novel type of cryptocurrency that relies on a more stable asset as the basis for its value. Most of them are linked to the United States dollar and therefore maintain the value of that currency. These allow for a very cheap and stable global payment system. Many current stablecoins are built on the Ethereum network.",
-  "page-what-is-ethereum-slide-1-desc-2": "Ethereum and stablecoins simplify the process of sending money overseas. It often takes only few minutes to move funds across the globe, as opposed to the several business days or even weeks that it may take your average bank, and for a fraction of the price. Additionally, there is no extra fee for making a high value transaction, and there are zero restrictions on where or why you are sending your money.",
-  "page-what-is-ethereum-slide-2-title": "The Quickest Help in Times of Crisis",
-  "page-what-is-ethereum-slide-2-desc-1": "If you are lucky enough to have multiple banking options through trusted institutions where you live, you may take for granted the financial freedom, security and stability that they offer. But for many people around the world facing political repression or economic hardship, financial institutions may not provide the protection or services they need.",
-  "page-what-is-ethereum-slide-2-desc-2": "When war, economic catastrophes or crackdowns on civil liberties struck the residents of <a href=\"https://time.com/5486673/bitcoin-venezuela-authoritarian/\">Venezuela</a>, <a href=\"https://www.economist.com/the-americas/2021/10/30/cubas-communist-regime-is-trying-to-control-crypto\">Cuba</a>, <a href=\"https://www.aljazeera.com/news/2022/3/21/crypto-provides-fix-for-some-in-crisis-hit-afghanistan\">Afghanistan</a>, <a href=\"https://qz.com/africa/1922466/how-bitcoin-powered-nigerias-endsars-protests/\">Nigeria</a>, <a href=\"https://www.euronews.com/my-europe/2021/12/22/meet-the-ngo-turning-to-cryptocurrencies-to-help-desperate-belarusians\">Belarus</a>, and <a href=\"https://internationalbanker.com/finance/cryptocurrencies-filling-crucial-role-in-the-russia-ukraine-conflict/\">Ukraine</a>, cryptocurrencies constituted the quickest and often the only option to retain financial agency.<sup><a to=\"https://www.financialinclusion.tech/\">1</a></sup> As seen in these examples, cryptocurrencies like Ethereum can provide unfettered access to the global economy when people are cut off from the outside world. Additionally, stablecoins offer a store of value when local currencies are collapsing due to superinflation.",
-  "page-what-is-ethereum-slide-3-title": "Empowering Creators",
-  "page-what-is-ethereum-slide-3-desc-1": "In 2021 alone, artists, musicians, writers, and other creators used Ethereum to earn around $3.5 billion collectively. This makes Ethereum one of the largest global platforms for creators, alongside Spotify, YouTube, and Etsy. <a href=\"https://stark.mirror.xyz/q3OnsK7mvfGtTQ72nfoxLyEV5lfYOqUfJIoKBx7BG1I\">Learn more</a>.",
-  "page-what-is-ethereum-slide-4-title": "Empowering Gamers",
-  "page-what-is-ethereum-slide-4-desc-1": "Play to earn games (where players are actually rewarded for playing the games) have recently emerged and are transforming the gaming industry. Traditionally, it is often prohibited to trade or transfer in-game assets to other players for real money. This forces players to use black market websites that are often a security risk. Blockchain gaming embraces the in-game economy and promotes such behavior in a trusted manner.",
-  "page-what-is-ethereum-slide-4-desc-2": "Moreover, players are incentivized by being able to trade in-game tokens for real money and thus being truly rewarded for their play time.",
-  "page-what-is-ethereum-meet-ether-title": "Meet ether, Ethereum's cryptocurrency",
-  "page-what-is-ethereum-meet-ether-desc-1": "Ethereum has a native cryptocurrency called ether (ETH). It is purely digital, and you can send it to anyone anywhere in the world instantly. The supply of ETH isn’t controlled by any government or company - it is decentralized and completely transparent. New coins (also commonly called tokens) are created only by miners and stakers who maintain the network.",
-  "page-what-is-ethereum-meet-ether-desc-2": "Every action on the Ethereum network requires a certain amount of computational power. This fee is paid in the form of ether. This means you need at least a small amount of ETH to use the network.",
-  "page-what-is-ethereum-what-is-ether": "What is ether?",
+  "page-what-is-ethereum-why-would-i-use-ethereum-1": "หากคุณเคยส่งเงินข้ามประเทศ (หรือวางแผนที่จะทำ) หรือกังวลเกี่ยวกับอนาคตของสินทรัพย์จากผลกระทบภายนอกที่ควบคุมไม่ได้จากที่ที่คุณอยู่ หรือเบื่อกับข้อกำหนดมากมายและค่าธรรมเนียมในการทำธุรกรรมกับสถาบันการเงินเดิมๆ คุณอาจจะสนใจในสิ่งที่สกุลเงินดิจิทัลทำได้",
+  "page-what-is-ethereum-why-would-i-use-ethereum-2": "ตระหนักไว้ในใจว่า อีเธอเรียมเป็นเรื่องราวที่กำลังถูกเขียนอยู่ และเหตุผลมากมายที่จะใช้มันกำลังจะถูกค้นพบในขณะที่มันมีการวิวัฒนาการและพัฒนาไปตามกาลเวลา",
+  "page-what-is-ethereum-slide-1-title": "การทำธุรกรรมข้ามพรมแดนที่ถูกลงและรวดเร็วขึ้น",
+  "page-what-is-ethereum-slide-1-desc-1": "<b>สเตเบิลคอยน์</b> เป็นสกุลเงินดิจิทัลรูปแบบใหม่ที่ยึดสินทรัพย์ที่มีมูลค่าแน่นอนเป็นมูลค่าพื้นฐานของเงินดิจิทัลสกุลนั้น โดยส่วนใหญ่สเตเบิลคอยน์จะยึดอยู่กับดอลลาร์สหรัฐและรักษามูลค่าตามมูลค่าของสกุลเงินนี้ การยึดโยงมูลค่าดังกล่าวทำให้เกิดระบบการทำธุรกรรมทั่วโลกที่มีราคาถูกและเสถียร สกุลเงินที่เป็นสเตเบิลคอยน์หลายสกุลถูกสร้างขึ้นภายใต้เครือข่ายอีเธอเรียม",
+  "page-what-is-ethereum-slide-1-desc-2": "อีเธอเรียมและสเตเบิลคอยน์ เป็นกระบวนการสำหรับส่งเงินข้ามประเทศที่เรียบง่าย โดยมากใช้เวลาไม่กี่นาทีในการส่งเงินทุนไปยังประเทศต่างๆ ซึ่งแตกต่างจากการส่งเงินผ่านธนาคารซึ่งใช้เวลาหลายวัน หรืออาจถึงขั้นหลายสัปดาห์ และมีราคาถูกกว่า ไม่มีค่าธรรมเนียมเพิ่มเติมในการทำธุรกรรมมูลค่าสูง และไม่มีกฎข้อบังคับเรื่องสถานที่และเหตุผลในการทำธุรกรรม",
+  "page-what-is-ethereum-slide-2-title": "ความช่วยเหลือที่เร็วที่สุดในช่วงวิกฤต",
+  "page-what-is-ethereum-slide-2-desc-1": "หากคุณโชคดีพอที่มีตัวเลือกธนาคารที่หลากหลายจากสถาบันที่น่าเชื่อถือในสถานที่ที่คุณอาศัยอยู่ คุณอาจจะมองข้ามในเรื่องอิสรภาพ ความปลอดภัย และเสถียรภาพทางการเงินที่ธนาคารมี แต่สำหรับหลายๆ คน ทั่วโลกที่ประสบปัญหาการกดขี่ทางการเมืองหรือความยากลำบากทางเศรฐกิจ สถาบันทางการเงินอาจจะไม่ให้การปกป้องหรือบริการทางการเงินที่คุณต้องการ",
+  "page-what-is-ethereum-slide-2-desc-2": "เมื่อประชาชนในประเทศ<a href=\"https://time.com/5486673/bitcoin-venezuela-authoritarian/\">เวเนซูเอลา</a><a href=\"https://www.economist.com/the-americas/2021/10/30/cubas-communist-regime-is-trying-to-control-crypto\">คิวบา</a><a href=\"https://www.aljazeera.com/news/2022/3/21/crypto-provides-fix-for-some-in-crisis-hit-afghanistan\">อัฟกานิสถาน</a><a href=\"https://qz.com/africa/1922466/how-bitcoin-powered-nigerias-endsars-protests/\">ไนจีเรีย</a><a href=\"https://www.euronews.com/my-europe/2021/12/22/meet-the-ngo-turning-to-cryptocurrencies-to-help-desperate-belarusians\">เบลารุส</a> และ<a href=\"https://internationalbanker.com/finance/cryptocurrencies-filling-crucial-role-in-the-russia-ukraine-conflict/\">ยูเครม</a>เผชิญกับสภาวะสงคราม วิกฤตเศรษฐกิจ หรือการจำกัดสิทธิพลเมือง คริปโตเคอเรนซีเป็นช่องทางที่รวดเร็วที่สุดและมักเป็นช่องทางเดียวที่เหลืออยู่ <sup><a to=\"https://www.financialinclusion.tech/\">1</a></sup> จากตัวอย่างดังกล่าวจะเห็นได้ว่าคริปโตเคอเรนซี เช่น อีเธอเรียม สามารถให้การเข้าถึงทางเศรษฐกิจทั่วโลกได้อย่างอิสระในขณะที่ประชาชนถูกตัดขาดจากโลกภายนอก อีกทั้งสเตเบิลคอยน์ยังช่วยในการเก็บรักษามูลค่าของเงินในตอนที่ค่าเงินในประเทศทรุดลงจากเงินเฟ้อขั้นรุนแรง",
+  "page-what-is-ethereum-slide-3-title": "เพิ่มขีดความสามารถนักสร้างสรรค์",
+  "page-what-is-ethereum-slide-3-desc-1": "ในปี 2021 ปีเดียว ศิลปิน นักดนตรี นักเขียน และนักสร้างสรรค์ในรูปแบบอื่นๆ ใช้อีเธอเรียมในการหารายได้โดยรวมแล้วประมาณ 3.5 ล้านดอลลาร์สหรัฐ ทำให้อีเธอเรียมกลายเป็นพื้นที่ที่ใหญ่ที่สุดในโลกสำหรับนักสร้างสรรค์ เคียงคู่ไปกับ สปอติฟาย ยูทูบ และเอ็ตซี่ <a href=\"https://stark.mirror.xyz/q3OnsK7mvfGtTQ72nfoxLyEV5lfYOqUfJIoKBx7BG1I\">เรียนรู้เพิ่มเติม</a>",
+  "page-what-is-ethereum-slide-4-title": "เพิ่มขีดความสามารถของเกมเมอร์",
+  "page-what-is-ethereum-slide-4-desc-1": "การมีรายได้จากการเล่นเกม (ผู้เล่นจะได้รับรางวัลจากการเล่นเกมโดยแท้จริง) เกิดขึ้นเมื่อไม่นานมานี้และเป็นการเปลี่ยนโฉมอุตสาหกรรมเกม เดิมทีการแลกเปลี่ยนหรือโยกย้ายสินทรัพย์ในเกมเป็นเงินตรามักจะถูกห้าม จึงเป็นการผลักดันให้ผู้เล่นใช้ตลาดมืดตามเว็บไซต์ต่างๆ ซึ่งบ่อยครั้งมีความเสี่ยงด้านความปลอดภัย การนำบล็อกเชนมาใช้กับเกมโอบรับเศรษฐกิจในเกมและเพิ่มความน่าเชื่อถือให้กับมัน",
+  "page-what-is-ethereum-slide-4-desc-2": "ยิ่งไปกว่านั้นผู้เล่นมีแรงจูงใจจากการที่สามารถและเปลี่ยนเหรียญในเกมเป็นเงินจริงและได้รับรางวัลจริงจากเวลาที่ใช้ในการเล่นเกม",
+  "page-what-is-ethereum-meet-ether-title": "ขอเชิญพบกับ อีเธอร์ สกุลเงินดิจิทัลของอีเธอเรียม",
+  "page-what-is-ethereum-meet-ether-desc-1": "อีเธอเรียมมีสกุลเงินของตัวเองที่ชื่อว่าอีเธอร์ (ETH) ซึ่งเป็นเงินดิจิทัลโดยสมบูรณ์ และคุณสามารถส่งให้ใครก็ได้ที่ไหนก็ได้ในทันทีทั่วโลก แหล่งที่มาของอีเธอร์ไม่ถูกควบคุมโดยรัฐบาลหรือบริษัทจึงเป็นการกระจายศูนย์และโปร่งใสโดยสมบูรณ์ เหรียญใหม่ (มักถูกเรียกว่าโทเคน) จะถูกแจกจ่ายให้เฉพาะสเตกเกอร์ซึ่งเป็นผู้ที่ทำให้เครือข่ายคงอยู่",
+  "page-what-is-ethereum-meet-ether-desc-2": "ทุกการกระทำบนเครือข่ายอีเธอเรียมต้องการกำลังของคอมพิวเตอร์จำนวนหนึ่งซึ่งมีค่าธรรมเนียมที่ต้องจ่ายในรูปแบบของอีเธอร์ คุณจึงต้องการ ETH จำนวนหนึ่งเพื่อใช้งานเครือข่ายนี้",
+  "page-what-is-ethereum-what-is-ether": "อีเธอร์คืออะไร",
   "page-what-is-ethereum-get-eth": "รับ ETH",
-  "page-what-is-ethereum-what-can-i-do-title": "What can I do with ETH coins?",
-  "page-what-is-ethereum-what-can-i-do-desc-1": "Turns out: a lot of things! One of the most prominent usages of the Ethereum technology is decentralized finance (DeFi) that opens entire areas of banking services to anybody with an internet connection. You can use your ether as a collateral to take out loans or provide liquidity to earn interest on your funds.",
-  "page-what-is-ethereum-explore-applications": "Explore applications",
-  "page-what-is-ethereum-learn-defi": "Learn about DeFi",
-  "page-what-is-ethereum-who-runs-ethereum-title": "Who runs Ethereum?",
-  "page-what-is-ethereum-who-runs-ethereum-desc-1": "Ethereum is not controlled by any one entity. It exists solely through the decentralized participation and cooperation of the community. Ethereum makes use of nodes (a computer with a copy of the Ethereum blockchain data) run by volunteers to replace individual server and cloud systems owned by major internet providers and services.",
-  "page-what-is-ethereum-who-runs-ethereum-desc-2": "These distributed nodes, run by individuals and businesses all over the world, provide resiliency to the Ethereum network infrastructure. It is therefore much less vulnerable to hacks or shutdowns. <b>Since its launch in 2015, Ethereum has never suffered downtime</b>. There are thousands of individual nodes running Ethereum network. This makes Ethereum one of the most decentralized cryptocurrencies out there, second only to bitcoin.",
+  "page-what-is-ethereum-what-can-i-do-title": "เหรียญ ETH ใช้ทำอะไรได้บ้าง",
+  "page-what-is-ethereum-what-can-i-do-desc-1": "ทำได้หลายอย่าง! หนึ่งในการใช้งานเด่นๆ ของเทคโนโลยีอีเธอเรียมคือการเงินแบบกระจายศูนย์ (DeFi) ที่เป็นการเปิดพื้นที่การทำธุรกรรมการเงินให้แก่ใครก็ได้ที่มีอินเทอร์เน็ต คุณสามารถใช้อีเธอร์เป็นมัดจำเพื่อกู้ยืมเงินหรือใช้ในการเพิ่มสภาพคล่องเพื่อหารายได้จากดอกเบี้ย",
+  "page-what-is-ethereum-explore-applications": "ดูวิธีใช้",
+  "page-what-is-ethereum-learn-defi": "เรียนรู้เกี่ยวกับการเงินแบบกระจายศูนย์",
+  "page-what-is-ethereum-who-runs-ethereum-title": "ใครบริหารอีเธอเรียม",
+  "page-what-is-ethereum-who-runs-ethereum-desc-1": "อีเธอเรียมไม่ได้ถูกควบคุมโดยผู้ใดผู้หนึ่งแต่เพียงผู้เดียว มันเกิดขึ้นโดยการเข้าร่วมแบบกระจายศูนย์และความร่วมมือกันของชุมชน อีเธอเรียมใช้โหนด (คอมพิวเตอร์ที่มีสำเนาข้อมูลบล็อกเชนอีเธอเรียม) ซึ่งดำเนินการโดยอาสาสมัคร แทนการใช้เซิร์ฟเวอร์และคลาวด์ที่ส่วนใหญ่มีผู้ให้บริการอินเทอร์เน็ตเป็นเจ้าของ",
+  "page-what-is-ethereum-who-runs-ethereum-desc-2": "โหนดที่กระจายตัวเหล่านี้ดำเนินการโดยบุคคลและกิจการทั่วโลก ทำให้โครงสร้างเครือข่ายอีเธอเรียมมีความยืดหยุ่น และยากที่จะถูกโจรกรรมหรือถูกปิด <b>อีเธอเรียมไม่เคยเจอปัญหาการหยุดทำงานตั้งแต่เริ่มดำเนินการในปี ค. ศ. 2015 </b> เครือข่ายอีเธอเรียมดำเนินการผ่านโหนดอิสระหลายพันโหนด ซึ่งทำให้อีเธอเรียมเป็นหนึ่งในสกุลเงินดิจิทัลที่กระจายอำนาจออกจากศูนย์มากที่สุด เป็นรองเพียงแค่บิตคอยน์เท่านั้น",
   "page-what-is-ethereum-run-a-node": "รันโหนด",
-  "page-what-is-ethereum-smart-contract-title": "What are smart contracts?",
-  "page-what-is-ethereum-smart-contract-desc-1": "<b>Smart contracts are simply computer programs</b> living on the Ethereum blockchain. They only <b>execute when triggered by a transaction from a user (or another contract)</b>. They make Ethereum very flexible in what it can do and distinguish it from other cryptocurrencies. These programs are what we now call decentralized apps, or dapps.",
-  "page-what-is-ethereum-smart-contract-desc-2": "Have you ever used a product that changed its terms of service? Or removed a feature you found useful? Once a smart contract is published to Ethereum, it will be online and operational for as long as Ethereum exists. Not even the author can take it down. Since smart contracts are automated, they do not discriminate against any user and are always ready to use.",
-  "page-what-is-ethereum-smart-contract-desc-3": "Popular examples of smart contracts are lending apps, decentralized trading exchanges, insurance, crowdfunding apps - basically anything you can think of.",
-  "page-what-is-ethereum-more-on-smart-contracts": "More on Smart contracts",
-  "page-what-is-ethereum-explore-dapps": "สำรวจ dapps",
-  "page-what-is-ethereum-criminal-activity-title": "I heard crypto is being used as a tool for criminal activity. Is this true?",
-  "page-what-is-ethereum-criminal-activity-desc-1": "Like any form of money, some of it will be misused. However, because all Ethereum transactions happen on an open blockchain, it’s often easier for authorities to track illicit activity than it would be in the traditional financial system, arguably making Ethereum a less appealing choice for those who would rather go undetected.",
-  "page-what-is-ethereum-criminal-activity-desc-2": "Crypto is used much less than fiat currencies for criminal purposes according to the key findings of a recent report by Europol, the European Union Agency for Law Enforcement Cooperation:",
-  "page-what-is-ethereum-criminal-activity-desc-3": "“The use of cryptocurrencies for illicit activities seems to comprise only a small part of the overall cryptocurrency economy, and it appears to be comparatively smaller than the amount of illicit funds involved in traditional finance.”",
-  "page-what-is-ethereum-energy-title": "What about Ethereum's energy consumption?",
-  "page-what-is-ethereum-energy-desc-1": "Ethereum is currently using proof-of-work mechanism that consumes a large amount of energy. In the coming months (Q3/Q4 2022) Ethereum will undergo its biggest update yet and will switch to proof of stake mechanism which will <b>greatly reduce the environmental impact</b> it has.",
-  "page-what-is-ethereum-energy-desc-2": "This update will reduce the energy required to secure Ethereum by about <b>99.95%</b>, creating a <b>more secure network for a much smaller carbon cost</b>. This will make Ethereum a truly low-carbon blockchain while boosting its security and scalability.",
-  "page-what-is-ethereum-more-on-energy-consumption": "More on energy consumption",
-  "page-what-is-ethereum-the-merge-update": "The Merge update",
-  "page-what-is-ethereum-additional-reading": "Additional reading",
-  "page-what-is-ethereum-week-in-ethereum": "Week in Ethereum News",
-  "page-what-is-ethereum-week-in-ethereum-desc": "- A weekly newsletter covering key developments across the ecosystem.",
-  "page-what-is-ethereum-the-year-in-ethereum-2021": "The Year in Ethereum 2021",
-  "page-what-is-ethereum-the-year-in-ethereum-2021-desc": "Jan 17, 2022 - Josh Stark and Evan Van Ness",
-  "page-what-is-ethereum-atoms-institutions-blockchains": "Atoms, Institutions, Blockchains",
-  "page-what-is-ethereum-atoms-institutions-blockchains-desc": "- Why blockchains matter?",
-  "page-what-is-ethereum-ethereum-in-numbers-title": "Ethereum in numbers"
+  "page-what-is-ethereum-smart-contract-title": "สัญญาอัจฉริยะ (สมาร์ตคอนแทร็กต์) คืออะไร",
+  "page-what-is-ethereum-smart-contract-desc-1": "<b>สัญญาอัจฉริยะพูดง่าย ๆ คือ โปรแกรมคอมพิวเตอร์</b> ที่อยู่บนบล็อกเชนอีเธอเรียม ที่จะ<b>ทำงานต่อเมื่อมีการทำธุรกรรมจากผู้ใช้งาน (หรือ จากสัญญาอื่น)</b> สัญญาอัจฉริยะทำให้อีเธอเรียมมีความยืดหยุ่นที่จะทำอะไรได้สูงมากและเป็นสิ่งที่แยกอีเธอเรียมออกจากสกุลเงินดิจิทัลอื่น ๆ โปรแกรมเหล่านี้เราเรียกกันว่าแอปกระจายศูนย์ หรือ DApp",
+  "page-what-is-ethereum-smart-contract-desc-2": "คุณเคยใช้ผลิตภัณฑ์ที่ถูกเปลี่ยนข้อตกลงการให้บริการไหม หรือถูกนำคุณลักษณะที่คุณคิดว่ามีประโยชน์ออกไป เมื่อสัญญาอัจฉริยะถูกประกาศในอีเธอเรียมมันจะอยู่ในรูปแบบออนไลน์และทำงานไปตราบเท่าที่มีอีเธอเรียม ไม่มีใครสามารถระงับได้แม้แต่ผู้เขียน เนื่องจากสัญญาอัจฉริยะเป็นระบบอัตโนมัติ มันจึงไม่แยกว่าใครคือผู้ใช้งานและพร้อมใช้งานอยู่เสมอ",
+  "page-what-is-ethereum-smart-contract-desc-3": "ตัวอย่างของสัญญาอัจฉริยะที่เป็นที่นิยมได้แก่แอพสำหรับกู้ยืมเงิน การแลกเปลี่ยนเงินตราแบบกระจายศูนย์ ประกันภัย และการระดมทุน ซึ่งกล่าวอย่างง่าย ๆ ก็คืออะไรก็ตามที่คุณนึกออก",
+  "page-what-is-ethereum-more-on-smart-contracts": "อ่านเพิ่มเติมเกี่ยวกับสัญญาอัจฉริยะ",
+  "page-what-is-ethereum-explore-dapps": "สำรวจ DApp",
+  "page-what-is-ethereum-criminal-activity-title": "จริงหรือไม่ที่ว่าคริปโตถูกใช้เป็นเครื่องมือสำหรับอาชญากรรม",
+  "page-what-is-ethereum-criminal-activity-desc-1": "พวกมันสามารถถูกนำไปใช้ในทางที่ผิดได้เช่นเดียวกับเงินในรูปแบบอื่น อย่างไรก็ตามการทำธุรกรรมที่เกิดขึ้นในอีเธอเรียมอยู่ในรูปแบบบล็อกเชนแบบเปิด ทำให้ง่ายต่อการตรวจสอบกิจกรรมที่ผิดกฎหมายกว่าระบบการเงินแบบดั้งเดิม ทำให้เป็นไปได้ว่าอีเธอเรียมเป็นตัวเลือกที่น่าดึงดูดน้อยกว่าสำหรับใครก็ตามที่ไม่ต้องการถูกตรวจสอบ",
+  "page-what-is-ethereum-criminal-activity-desc-2": "จากประเด็นหลักในรายงานล่าสุดของสำนักงานตำรวจสากลแห่งสหภาพยุโรปรานยงานว่าคริปโตถูกใช้ในอาชญากรรมน้อยกว่าเงินเฟียตอย่างมาก",
+  "page-what-is-ethereum-criminal-activity-desc-3": "การใช้เงินดิจิทัลในกิจกรรมที่ผิดกฎหมายเป็นเพียงแค่ส่วนน้อยเท่านั้นในเศรษฐกิจเงินดิจิทัลทั้งหมด และน้อยกว่ากันมากเมื่อเทียบกับกิจกรรมผิดกฎหมายที่เกี่ยวข้องกับการเงินแบบดั้งเดิม",
+  "page-what-is-ethereum-energy-title": "แล้วอีเธอเรียมในแง่การใช้พลังงานล่ะ",
+  "page-what-is-ethereum-energy-desc-1": "ในปัจจุบันอีเธอเรียมใช้ Proof-of-Work ซึ่งใช้พลังงานมหาศาล ในอีกไม่กี่เดือนข้างหน้า (ไตรมาสที่ 3/4 ในปี 2022) อีเธอเรียมจะเข้าสู่การเปลี่ยนแปลงครั้งใหญ่ซึ่งจะเปลี่ยนแปลงเป็น Proof-of-Stake ซึ่ง<b>จะลดผลกระทบต่อสิ่งแวดล้อมเป็นอย่างมาก",
+  "page-what-is-ethereum-energy-desc-2": "การเปลี่ยนแปลงครั้งนี้จะลดพลังงานที่ใช้ในการรักษาระบบอีเธอเรียมลงร้อยละ <b>99.95</b> ซึ่งจะเป็นการสร้าง<b>ระบบที่มั่นคงโดยที่มีราคาคาร์บอนที่ลดลง</b> ซึ่งทำให้อีเธอเรียมเป็นบล็อกเชนที่มีความมั่นคงและขยายขนาดได้โดยที่เป็นมิตรกับสิ่งแวดล้อมอย่างแท้จริง",
+  "page-what-is-ethereum-more-on-energy-consumption": "อ่านเพิ่มเติมเรื่องการใช้พลังงาน",
+  "page-what-is-ethereum-energy-consumption-chart-legend": "การใช้พลังงานรายปี (เทราวัตต์/ปี)",
+  "page-what-is-ethereum-the-merge-update": "การอัปเดตเกี่ยวกับเดอะเมิร์จ",
+  "page-what-is-ethereum-additional-reading": "ข้อมูลเพิ่มเติม",
+  "page-what-is-ethereum-week-in-ethereum": "ข่าวอีเธอเรียมประจำสัปดาห์",
+  "page-what-is-ethereum-week-in-ethereum-desc": "จดหมายข่าวรายสัปดาห์เกี่ยวกับการปรับปรุงหลัก ๆ ในระบบนิเวศ",
+  "page-what-is-ethereum-the-year-in-ethereum-2021": "อีเธอเรียมในปี ค.ส. 2021",
+  "page-what-is-ethereum-the-year-in-ethereum-2021-desc": "17 มกราคม 2022 - Josh Stark และ Evan Van Ness",
+  "page-what-is-ethereum-atoms-institutions-blockchains": "อะตอม สถาบัน บล็อกเชน",
+  "page-what-is-ethereum-atoms-institutions-blockchains-desc": "ทำไมบล็อกเชนถึงมีความสำคัญ",
+  "page-what-is-ethereum-ethereum-in-numbers-title": "อีเธอเรียมในเชิงตัวเลข"
 }

From 3e98bbc83a3b697d9b2a8a6b278e3438937534c9 Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Tue, 22 Nov 2022 10:44:40 +0000
Subject: [PATCH 052/108] Update Russian (ru) Community bucket

---
 .../translations/ru/community/events/index.md |  1 +
 .../ru/community/get-involved/index.md        |  6 +++-
 .../translations/ru/community/grants/index.md |  5 +++-
 .../ru/community/language-resources/index.md  | 28 ++++++++++++-------
 .../translations/ru/community/online/index.md |  9 +++---
 .../ru/community/support/index.md             |  8 ++++--
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/content/translations/ru/community/events/index.md b/src/content/translations/ru/community/events/index.md
index 8eec31024ca..c05cdfaac04 100644
--- a/src/content/translations/ru/community/events/index.md
+++ b/src/content/translations/ru/community/events/index.md
@@ -2,6 +2,7 @@
 title: Мероприятия Ethereum
 description: Как участвовать в жизни сообщества Ethereum.
 lang: ru
+hideEditButton: true
 ---
 
 ## Предстоящие мероприятия {#events}
diff --git a/src/content/translations/ru/community/get-involved/index.md b/src/content/translations/ru/community/get-involved/index.md
index 59c38095169..ccba481ad67 100644
--- a/src/content/translations/ru/community/get-involved/index.md
+++ b/src/content/translations/ru/community/get-involved/index.md
@@ -17,6 +17,7 @@ lang: ru
 - [Онлайн-встречи Core Dev](https://www.youtube.com/playlist?list=PLaM7G4Llrb7zfMXCZVEXEABT8OSnd4-7w): смотрите или поучаствуйте сами
 - [Список предпочтений для программы поддержки экосистемы](https://esp.ethereum.foundation/wishlist/) — сферы инструментария, документации и инфраструктуры, в которых активно ищут заявителей на гранты в рамках программы поддержки экосистемы Ethereum
 - [Web3Bridge](https://www.web3bridge.com/) — присоединяйтесь к амбициозному сообществу web3 в их инициативе по выявлению, обучению и поддержке сотен разработчиков и членов сообщества по всей Африке
+- Присоединяйтесь к [Discord-каналу Ethereum Cat Herders](https://discord.io/EthCatHerders)
 
 ## Исследователи и академики <Emoji text=":mag:" size={1} />‍ {#researchers-and-academics}
 
@@ -26,6 +27,8 @@ lang: ru
 - [Ethresear.ch](https://ethresear.ch) — основной форум Ethereum по исследованиям и наиболее влиятельный в мире форум по криптоэкономике
 - [Список предпочтений для программы поддержки экосистемы](https://esp.ethereum.foundation/wishlist/) — области исследований, в которых активно ищут заявителей на гранты в рамках программы поддержки экосистемы Ethereum
 
+[Посмотрите больше активных областей исследований](/community/research/).
+
 ## Нетехнические навыки <Emoji text=":briefcase:" size={1} /> {#non-technical}
 
 Если вы не разработчик, вам может быть трудно понять, с чего начать в Ethereum. Вот несколько предложений, а также ресурсы для конкретных профессиональных умений.
@@ -95,6 +98,7 @@ lang: ru
 - [Вакансии на useWeb3](https://www.useweb3.xyz/jobs)
 - [Вакансии на Web3](https://web3.career)
 - [Web3 Army](https://web3army.xyz/)
+- [Вакансии на Crypto Valley](https://cryptovalley.jobs/)
 
 ## Присоединитесь к DAO {#decentralized-autonomous-organizations-daos}
 
@@ -103,7 +107,7 @@ DAO — децентрализованные автономные организ
 - [DAOSquare](https://www.daosquare.io) [@DAOSquare](https://twitter.com/DAOSquare) — _продвижение концепции децентрализованной автономной организации (DAO) в нетехнических отраслях и помощь в создании стоимости через DAO_
 - [Developer DAO](https://www.developerdao.com/) [@developer_dao](https://twitter.com/developer_dao) — _сообщество разработчиков, которые верят в коллективное владение Интернетом_
 - [dOrg](https://dOrg.tech) [@dOrg_tech](https://twitter.com/dOrg_tech) — _коллектив разработчиков-фрилансеров Web3, работающий как децентрализованная автономная организация (DAO)_
-- [DXdao](https://DXdao.eth.link/) [@DXdao](https://twitter.com/DXdao_) — _децентрализованная разработка и управление для децентрализованных приложений и протоколов_
+- [DXdao](https://DXdao.eth.link/) [@DXdao](https://twitter.com/DXdao_) — _децентрализованная разработка и управление dApps и протоколами_
 - [HausDAO](https://daohaus.club) [@nowdaoit](https://twitter.com/nowdaoit) — _управление сообщества DAOhaus_
 - [Hero DAO](https://herodao.org/) [@hero_dao](https://twitter.com/hero_dao) — _сообщество, создавшее франшизу супергероев_
 - [LexDAO](https://lexdao.coop) [@lex_DAO](https://twitter.com/lex_DAO) — _инжиниринг в сфере юридических вопросов_
diff --git a/src/content/translations/ru/community/grants/index.md b/src/content/translations/ru/community/grants/index.md
index 64094a3d933..dba787df4a6 100644
--- a/src/content/translations/ru/community/grants/index.md
+++ b/src/content/translations/ru/community/grants/index.md
@@ -16,10 +16,11 @@ lang: ru
 
 - [Программа поддержки экосистемы EF](https://esp.ethereum.foundation) — _финансирование проектов с открытым исходным кодом, которые приносят пользу Ethereum, с особым акцентом на универсальные инструменты, инфраструктуру, исследования и общественные блага_
 - [Запросы предложений (RFP) Ethereum](https://github.com/ethereum/requests-for-proposals) — _запросы предложений Фондом Ethereum для работы и проектов в экосистеме Ethereum_
-- [MetaCartel](https://www.metacartel.org/grants/) — _разработка децентрализованных приложений, создание децентрализованной автономной организации (DAO)_ Гранты в размере от 1000 до 8000 долл. США.
+- [MetaCartel](https://www.metacartel.org/grants/) — _разработка децентрализованных приложений, создание DAO_
 - [Децентрализованная автономная организация (DAO) Moloch](https://www.molochdao.com/) — _конфиденциальность, масштабирование второго уровня, безопасность клиентов и многое другое_
 - [Открытые гранты](https://opengrants.com/explore)
 - [Гранты DAO](https://docs.google.com/spreadsheets/d/1XHc-p_MHNRdjacc8uOEjtPoWL86olP4GyxAJOFO0zxY/edit#gid=0) — _таблица Google организаций, предлагающих гранты_
+- [Вызов слияния данных](https://esp.ethereum.foundation/merge-data-challenge) — _мы обращаемся ко всем эфирианам, специалистам по данным, инженерам данных, визуализаторам данных, разработчикам и всем, кто заинтересован в изучении данных Ethereum!_
 
 ## Отдельные проекты {#project-specific}
 
@@ -27,12 +28,14 @@ lang: ru
 
 - [Программа грантов Aave](https://aavegrants.org/) — _гранты DAO от [Aave](https://aave.com/)_
 - [Balancer](https://balancergrants.notion.site/Balancer-Community-Grants-23e562c5bc4347cd8304637bff0058e6) — _фонд экосистемы [Balancer](https://balancer.fi/)_
+- [Программа грантов Chainlink](https://chain.link/community/grants) — _гранты сообщества [Chainlink](https://chain.link/)_
 - [Программа грантов Compound](https://compoundgrants.org/) — _финансовая экосистема [Compound](https://compound.finance/)_
 - [Программа грантов Consensys](https://consensys.net/grants/) — _гранты Ethereum и финансирование блокчейна [Consensys](https://consensys.net/)_
 - [Организация грантов Lido Ecosystem (LEGO)](https://lego.lido.fi/) — _финансовая экосистема [Lido](https://lido.fi/)_
 - [Программа грантов mStable](https://docs.mstable.org/advanced/grants-program) — _сообщество [mStable](https://mstable.org/)_
 - [The Graph](https://airtable.com/shrdfvnFvVch3IOVm) — _экосистема [The Graph](https://thegraph.com/)_
 - [Программа грантов Uniswap](https://www.unigrants.org/) — _сообщество [Uniswap](https://uniswap.org/)_
+- [Web3 Grants](https://web3grants.net) — _обширный список связанных грантов для web3/криптовалют_
 
 ## Квадратичное финансирование {#quadratic-funding}
 
diff --git a/src/content/translations/ru/community/language-resources/index.md b/src/content/translations/ru/community/language-resources/index.md
index d622ee40692..3b983da5785 100644
--- a/src/content/translations/ru/community/language-resources/index.md
+++ b/src/content/translations/ru/community/language-resources/index.md
@@ -59,7 +59,7 @@ lang: ru
 
 **Для разработчиков**
 
-- [DappLearning](https://github.com/Dapp-Learning-DAO/Dapp-Learning) — учебная группа для изучения основных проектов децентрализованных приложений (dApp) и еженедельного обмена мыслями и комментариями
+- [DappLearning](https://github.com/Dapp-Learning-DAO/Dapp-Learning) — учебная группа для изучения основных проектов децентрализованных приложений и еженедельного обмена мыслями и комментариями
 - [LearnBlockchain](https://learnblockchain.cn/) — сообщество разработчиков, где можно обмениваться информацией о технологии блокчейн
 
 **Для исследователей криптографии**
@@ -67,36 +67,44 @@ lang: ru
 - [SecbitLabs](https://mp.weixin.qq.com/s/69_tqBJpr_sbaKtR1sBRMw) — учетная запись в WeChat, где объясняются вопросы криптографии, безопасности и т. д.
 - [Sparkbyte](https://mp.weixin.qq.com/s/9KgKTc_jtJ7bWKdbNPoqvQ) — учетная запись в WeChat, рассказывающая о технологии zk
 
+### Чешский {#cs}
+
+- [Gwei.cz](https://gwei.cz) — локальное сообщество на тему Web3, создает образовательный контент, организует очные и онлайн-мероприятия
+- [Gwei.cz Příručka](https://prirucka.gwei.cz/) — руководство по Ethereum для начинающих
+- [DAO Příručka](https://dao.gwei.cz/) — руководство для начинающих по DAO
+- [Mastering Ethereum](https://ipfs.infura-ipfs.io/ipfs/bafybeidvuxhnsgfx3tncpfxheqglkjwmdxclknlgd7s7qggd2a6bzgb27m) — о тонкостях работы Ethereum на чешском языке
+
 ### Французский {#fr}
 
 - [Ethereum France](https://www.ethereum-france.com/) — Ethereum France организует мероприятия, создает контент и способствует обсуждениям по вопросам Ethereum
 - [Ethereum.fr](https://ethereum.fr/) — новости и образование в сфере Ethereum
 - [BanklessFR](https://banklessfr.substack.com/) — новостная рассылка Bankless на французском языке
-- [CryptoFR](https://cryptofr.com/category/44/ethereum-general) — форум криптовалют, в том числе с обсуждением Ethereum
+- [CryptoFR](https://cryptofr.com/category/44/ethereum-general) — форум о криптовалютах, в том числе с обсуждением Ethereum
 
 ### Немецкий {#de}
 
 - [Microsoft Learn (Solidity)](https://docs.microsoft.com/de-de/learn/modules/blockchain-learning-solidity/) — использование Solidity
-- [Microsoft Learn (смарт-контракты)](https://docs.microsoft.com/de-de/learn/modules/blockchain-solidity-ethereum-smart-contracts/) — написание смарт-контрактов Ethereum с Solidity
+- [Microsoft Learn (умные контракты)](https://docs.microsoft.com/de-de/learn/modules/blockchain-solidity-ethereum-smart-contracts/) — написание умных контрактов Ethereum с помощью Solidity
 - [Microsoft Learn (сети Ethereum)](https://docs.microsoft.com/de-de/learn/modules/blockchain-ethereum-networks/) — подключение и развертывание сетей Ethereum
 - [Microsoft Learn (блокчейны)](https://docs.microsoft.com/de-de/learn/paths/ethereum-blockchain-development/) — введение в блокчейн-разработку
 
 ### Итальянский {#it}
 
-- [Ethereum Italia](https://www.ethereum-italia.it/) — обучение, мероприятия и новости Ethereum, посвященные смарт-контрактам и технологии блокчейн
+- [Ethereum Italia](https://www.ethereum-italia.it/) — обучение, мероприятия и новости Ethereum, посвященные умным контрактам и блокчейн-технологиям
 - [Подкаст Ethereum Italia](https://www.ethereum-italia.it/podcast/) — подкаст Ethereum на итальянском языке
 - [Microsoft Learn (Solidity)](https://docs.microsoft.com/it-it/learn/modules/blockchain-learning-solidity/) — научитесь использовать Solidity
-- [Microsoft Learn (смарт-контракты)](https://docs.microsoft.com/it-it/learn/modules/blockchain-solidity-ethereum-smart-contracts/) — узнайте, как писать смарт-контракты с использованием Solidity
-- [Microsoft Learn (dApps)](https://docs.microsoft.com/it-it/learn/modules/blockchain-create-ui-decentralized-apps/) — создание пользовательского интерфейса с децентрализованными приложениями
+- [Microsoft Learn (смарт-контракты)](https://docs.microsoft.com/it-it/learn/modules/blockchain-solidity-ethereum-smart-contracts/) — узнайте, как писать умные контракты с использованием Solidity
+- [Microsoft Learn (децентрализованные приложения)](https://docs.microsoft.com/it-it/learn/modules/blockchain-create-ui-decentralized-apps/) — создание пользовательского интерфейса с децентрализованными приложениями
 
 ### Испанский {#es}
 
 - [Ethereum Madrid](https://ethereummadrid.com/) — курсы, мероприятия и блог по блокчейну, децентрализованным финансам (DeFi) и управлению
 - [Cointelegraph](https://es.cointelegraph.com/ethereum-for-beginners) — руководство по Ethereum для начинающих на испанском языке
 - [Tutoriales online](https://tutoriales.online/curso/solidity) — изучите Solidity и программирование на Ethereum
-- [Curso Introducción a Ethereum Development](https://youtube.com/playlist?list=PLTqiwJDd_R8y9pfUBjhkVa1IDMwyQz-fU) — основы Solidity, тестирование и развертывание вашего первого смарт-контракта
-- [Curso Introducción a Seguridad y Hacking en Ethereum](https://youtube.com/playlist?list=PLTqiwJDd_R8yHOvteko_DmUxUTMHnlfci) — понимание распространенных уязвимостей и проблем безопасности в реальных смарт-контрактах
-- [Curso Introducción a DeFi Development](https://youtube.com/playlist?list=PLTqiwJDd_R8zZiP9_jNdaPqA3HqoW2lrS) — узнайте, как смарт-контракты по децентрализованным финансам (DeFi) работают в Solidity, и создайте собственного автоматизированного маркет-мейкера
+- [Curso Introducción a Ethereum Development](https://youtube.com/playlist?list=PLTqiwJDd_R8y9pfUBjhkVa1IDMwyQz-fU) — основы Solidity, тестирование и развертывание вашего первого умного контракта
+- [Curso Introducción a Seguridad y Hacking en Ethereum](https://youtube.com/playlist?list=PLTqiwJDd_R8yHOvteko_DmUxUTMHnlfci) — понимание распространенных уязвимостей и проблем безопасности в реальных умных контрактах
+- [Curso Introducción a DeFi Development](https://youtube.com/playlist?list=PLTqiwJDd_R8zZiP9_jNdaPqA3HqoW2lrS) — узнайте, как умные контракты с децентрализованными финансами (DeFi) работают в Solidity, и создайте собственного автоматизированного маркет-мейкера
+- [Cryptoversidad](https://www.youtube.com/c/Cryptoversidad) — нетехнические учебные материалы по блокчейну, от начинающих до продвинутых. Узнайте все о криптовалютах и Ethereum.
 
 ### Турецкий {#tr}
 
@@ -105,7 +113,7 @@ lang: ru
 
 ### Вьетнамский {#vi}
 
-- [Tino Group](https://wiki.tino.org/ethereum-la-gi/) — обзор Ethereum, децентрализованных приложений (dApp) и кошельков, а также часто задаваемые вопросы
+- [Tino Group](https://wiki.tino.org/ethereum-la-gi/) — обзор Ethereum, децентрализованных приложений, кошельков, а также часто задаваемых вопросов
 - [Tap Chi Bitcoin](https://tapchibitcoin.io/tap-chi/tin-tuc-ethereum-eth) — веб-платформа, на которой есть образовательные и новостные подстраницы по Ethereum
 - [Coin68](https://coin68.com/ethereum-tieu-diem/) — криптовалютный портал с новостями и образовательным контентом по Ethereum
 
diff --git a/src/content/translations/ru/community/online/index.md b/src/content/translations/ru/community/online/index.md
index 9e153b04b1a..d9f59f9d1c3 100644
--- a/src/content/translations/ru/community/online/index.md
+++ b/src/content/translations/ru/community/online/index.md
@@ -26,16 +26,17 @@ lang: ru
 <SocialListItem socialIcon="discord"><Link to="https://discord.gg/5W5tVb3">CryptoDevs</Link> — сообщество Discord, сконцентрированное на разработке Ethereum</SocialListItem>
 <SocialListItem socialIcon="discord"><Link to="https://discord.io/ethstaker">EthStaker Discord</Link> — сообщество, сконцентрированное на помощи при управлении проектами, связанными с разработкой Ethereum</SocialListItem>
 <SocialListItem socialIcon="discord"><Link to="https://discord.gg/CetY6Y4">Команда сайта Ethereum.org</Link> — возможность решить проблемы и поговорить о разработке и дизайне ethereum.org с командой и членами сообщества</SocialListItem>
-<SocialListItem socialIcon="discord"><Link to="https://discord.gg/ZH5aXDgWEU">Web3 University</Link> — сообщество, сконцентрированное на изучении вопросов, связанных с разработкой web3</SocialListItem>
+<SocialListItem socialIcon="discord"><Link to="https://discord.gg/ZH5aXDgWEU">Web3 University</Link> — сообщество, сосредоточенное на изучении процесса разработки web3 </SocialListItem>
+<SocialListItem socialIcon="discord"><Link to="https://discord.matos.club/">Matos Discord</Link> — сообщество создателей web3, где собираются строители, представители индустрии и энтузиасты Ethereum. мы заинтересованы в разработке, дизайне и культуре web3. создавайте с нами.</SocialListItem>
 <SocialListItem socialIcon="webpage"><Link to="https://gitter.im/ethereum/solidity/">Solidity Gitter</Link> — чат для разработки Solidity (Gitter)</SocialListItem>
-<SocialListItem socialIcon="webpage"><Link to="https://matrix.to/#/#ethereumsolidity:gitter.im">Solidity Matrix</Link> — чат для разработки Solidity (Matrix)</SocialListItem>
+<SocialListItem socialIcon="webpage"><Link to="https://matrix.to/#/#ethereum_solidity:gitter.im">Solidity Matrix</Link> — чат для разработки Solidity (Matrix)</SocialListItem>
 
 ## YouTube и Twitter {#youtube-and-twitter}
 
-<SocialListItem socialIcon="youtube"><Link to="https://www.youtube.com/c/EthereumFoundation">Ethereum Foundation</Link> — следите за последними новостями Ethereum Foundation</SocialListItem>
+<SocialListItem socialIcon="youtube"><Link to="https://www.youtube.com/c/EthereumFoundation">Ethereum Foundation</Link> — будьте в курсе последних новостей Ethereum Foundation</SocialListItem>
 <SocialListItem socialIcon="twitter"><Link to="https://twitter.com/ethereum">@ethereum</Link> — официальный аккаунт Ethereum Foundation</SocialListItem>
 <SocialListItem socialIcon="twitter"><Link to="https://twitter.com/ethdotorg">@ethdotorg</Link> — портал Ethereum, созданный для нашего растущего глобального сообщества</SocialListItem>
-<SocialListItem socialIcon="webpage"><Link to="https://hive.one/c/Ethereum?page=1">Список влиятельных твиттер-аккаунтов Ethereum</Link></SocialListItem>
+<SocialListItem socialIcon="webpage"><Link to="https://hive.one/c/ethereum?page=1">Список важных твиттер-аккаунтов Ethereum</Link></SocialListItem>
 
 <Divider />
 
diff --git a/src/content/translations/ru/community/support/index.md b/src/content/translations/ru/community/support/index.md
index 48f0e71fbfa..8f9c7454b1e 100644
--- a/src/content/translations/ru/community/support/index.md
+++ b/src/content/translations/ru/community/support/index.md
@@ -104,6 +104,10 @@ _Это не полный список. Нужна помощь в поиске
 
 [Как отменить ожидающие транзакции Ethereum](https://info.etherscan.com/how-to-cancel-ethereum-pending-transactions/)
 
-#### Как я могу выполнить майнинг Ethereum? {#mining-ethereum}
+#### Как я могу добыть Ethereum? {#mining-ethereum}
 
-Мы не рекомендуем покупать оборудование для майнинга, если вы в настоящее время не занимаетесь майнингом Ethereum. Примерно в третьем-четвертом квартале 2022 года произойдет [слияние](/upgrades/merge/), в результате чего Ethereum перейдет с доказательства работы на доказательство владения. Это изменение означает, что майнинг Ethereum станет невозможен.
+Майнинг Ethereum стал невозможен. Майнинг был отключен, когда Ethereum перешел с доказательства работы на доказательство владения. Теперь вместо майнеров в Ethereum появились валидаторы. Валидаторы занимаются стейкингом ETH и получают вознаграждение за обеспечение безопасности сети.
+
+#### Как я могу стать дольщиком (стейкером) или валидатором? {#become-validator}
+
+Чтобы стать валидатором, нужно стать дольщиком 32 ETH в депозитном контракте Ethereum и установить узел валидатора. Более подробная информация доступна на [страницах](/staking) и [лаунчпаде](https://launchpad.ethereum.org/) стейкинга.

From 7e06f57bc83b7b2b59583081c1345f5a62edffdb Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Tue, 22 Nov 2022 11:06:29 +0000
Subject: [PATCH 053/108] Update French (fr) Upgrades and Learn pages 2 buckets

---
 src/content/translations/fr/eips/index.md     |  36 +-
 .../translations/fr/enterprise/index.md       |  13 +-
 .../fr/enterprise/private-ethereum/index.md   |   4 +-
 .../translations/fr/foundation/index.md       |  10 +-
 src/content/translations/fr/glossary/index.md | 406 +++++++++++++-----
 src/content/translations/fr/history/index.md  | 135 +++---
 .../fr/upgrades/beacon-chain/index.md         |  12 +-
 .../translations/fr/upgrades/merge/index.md   |  12 +-
 .../fr/upgrades/sharding/index.md             |   6 +-
 src/intl/fr/page-about.json                   |   2 +-
 src/intl/fr/page-assets.json                  |   5 +-
 ...page-upgrades-get-involved-bug-bounty.json |   6 +-
 src/intl/fr/page-upgrades-index.json          |  78 ++--
 src/intl/fr/page-upgrades.json                |   2 +-
 14 files changed, 466 insertions(+), 261 deletions(-)

diff --git a/src/content/translations/fr/eips/index.md b/src/content/translations/fr/eips/index.md
index 9ff2a9bf0ad..fc2a9d5a6e8 100644
--- a/src/content/translations/fr/eips/index.md
+++ b/src/content/translations/fr/eips/index.md
@@ -1,32 +1,32 @@
 ---
 title: Propositions d'amélioration d'Ethereum (EIP)
-description: Informations de base dont vous avez besoin pour comprendre les propositions d'amélioration d'Ethereum (EIP).
+description: Les informations de base dont vous avez besoin pour comprendre les EIP
 lang: fr
 ---
 
-# Introduction aux propositions d'amélioration d'Ethereum (EIP) {#introduction-to-ethereum-improvement-proposals-eips}
+# Introduction aux propositions d'amélioration d'Ethereum (EIP) {#introduction-to-ethereum-improvement-proposals}
 
 ## En quoi consistent les EIP ? {#what-are-eips}
 
-[Les EIP](https://eips.ethereum.org/) sont des normes spécifiant de nouvelles fonctionnalités ou processus potentiels pour Ethereum. Les EIP contiennent les spécifications techniques des modifications proposées et servent de "source de vérité" pour la communauté. Les mises à niveau du réseau et les normes des applications Ethereum sont discutées et développées via le processus des EIP.
+[Les EIP](https://eips.ethereum.org/) sont des normes spécifiant de nouvelles fonctionnalités ou processus potentiels pour Ethereum. Les EIP contiennent les spécifications techniques des modifications proposées et servent de "source de vérité" pour la communauté. Les mises à niveau du réseau et les normes des applications Ethereum sont discutées et développées via le processus EIP.
 
-N'importe qui dans la communauté Ethereum peut créer une EIP. Les directives pour rédiger des EIP sont incluses dans l'[EIP 1](https://eips.ethereum.org/EIPS/eip-1). L'EIP doit fournir une spécification technique concise de la fonctionnalité et sa justification. L'auteur de l'EIP est chargé d'obtenir un consensus au sein de la communauté et de documenter les opinions divergentes. Le niveau technique étant élevé pour soumettre une EIP bien formulée, la plupart des auteurs d'EIP sont des développeurs d'application ou de protocole.
+N'importe qui dans la communauté Ethereum peut créer une EIP. Les directives pour rédiger des EIP sont incluses dans [EIP-1](https://eips.ethereum.org/EIPS/eip-1). Une EIP devrait avant tout fournir une spécification technique concise assortie d'une petite justification. L'auteur de l'EIP est tenu d'obtenir un consensus au sein de la communauté et de répertorier les opinions alternatives. Compte tenu de la barrière technique élevée que représente la soumission d'une EIP bien formulée, la plupart des auteurs d'EIP sont des développeurs d'application ou de protocole.
 
 ## Pourquoi les EIP sont-elles importantes ? {#why-do-eips-matter}
 
-Les EIP jouent un rôle central dans la façon dont les modifications sont effectuées et documentées sur Ethereum. Elles permettent aux utilisateurs de proposer, de discuter et d'adopter des modifications. Il existe [différents types d'EIP](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1.md#eip-types), y compris les EIP fondamentales pour les changements de protocole de bas niveau qui affectent le consensus et nécessitent une mise à niveau du réseau, et des ERC pour les normes d'applications. Par exemple, les normes pour créer des jetons, comme [ERC-20](https://eips.ethereum.org/EIPS/eip-20) ou [ERC-721](https://eips.ethereum.org/EIPS/eip-721) permettent aux applications d'interagir avec ces jetons pour traiter tous ceux utilisant les mêmes règles, ce qui facilite la création d'applications interopérables.
+Les EIP jouent un rôle central dans la façon dont les modifications sont effectuées et documentées sur Ethereum. Elles permettent aux utilisateurs de proposer, de discuter et d'adopter des modifications. Il existe [différents types d'EIP](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1.md#eip-types), y compris les EIP de base destinées aux changements de protocole de faible niveau qui affectent le consensus et nécessitent une mise à jour du réseau comme [EIP-1559](https://eips.ethereum.org/EIPS/eip-1559), et les ERC pour les normes d'application comme [EIP-20](https://eips.ethereum.org/EIPS/eip-20) et [EIP-721](https://eips.ethereum.org/EIPS/eip-721).
 
-Chaque mise à niveau du réseau consiste en un ensemble d'EIP qui doivent être implémentées par chaque [client Ethereum](/learn/#clients-and-nodes) du réseau. Cela implique que pour conserver un consensus avec les autres clients du réseau principal Ethereum, les développeurs de clients doivent s'assurer qu'ils ont tous implémenté les EIP requises.
+Chaque mise à niveau du réseau consiste en un ensemble d'EIP qui doivent être implémentées par chaque [client Ethereum](/learn/#clients-and-nodes) du réseau. Dès lors, pour maintenir le consensus avec les autres clients du réseau principal Ethereum, les développeurs de clients doivent s'assurer qu'ils ont tous implémenté les EIP requises.
 
-En plus de fournir les spécifications techniques des modifications, les EIP représentent l'unité de la gouvernance sur Ethereum : n'importe qui est libre d'en proposer une, puis divers parties prenantes de la communauté en discutent pour déterminer si elle doit être adoptée comme norme ou incluse dans une mise à niveau du réseau. Les EIP non fondamentales n'ont pas besoin d'être adoptées par toutes les applications (par exemple, vous pouvez créer un jeton non [ERC-20](https://eips.ethereum.org/EIPS/eip-20)), mais les EIP fondamentales doivent être largement adoptées (car tous les nœuds doivent se mettre à niveau pour continuer de faire partie du même réseau). Les EIP fondamentales nécessitent un consensus plus large au sein de la communauté que les EIP non fondamentales.
+En plus de fournir les spécifications techniques des modifications, les EIP représentent l'unité de la gouvernance sur Ethereum : n'importe qui est libre d'en proposer une, puis divers parties prenantes de la communauté en discutent pour déterminer si elle doit être adoptée comme norme ou incluse dans une mise à niveau du réseau. Les EIP non fondamentales n'ont pas besoin d'être adoptées par toutes les applications (par exemple, il est possible de créer un jeton fongible sans implémenter EIP-20), mais les EIP fondamentales doivent être largement adoptées (dans la mesure où tous les nœuds doivent se mettre à niveau pour continuer à faire partie du même réseau). Les EIP fondamentales nécessitent un consensus plus large au sein de la communauté que les EIP non fondamentales.
 
 ## Historique des EIP {#history-of-eips}
 
 Le dépôt [GitHub des EIP](https://github.com/ethereum/EIPs) a été créé en octobre 2015. Le processus des EIP est basé sur celui des [propositions d'amélioration de Bitcoin (BIP)](https://github.com/bitcoin/bips), lui-même basé sur celui des [propositions d'amélioration de Python (PEP)](https://www.python.org/dev/peps/).
 
-Des éditeurs sont chargés de vérifier la solidité technique, l'orthographe/la grammaire et le style du code des EIP. Martin Becze, Vitalik Buterin, Gavin Wood et quelques autres ont été les éditeurs d'origine des EIP de 2015 à fin 2016.
+Les éditeurs d'EIP ont pour tâche de passer en revue les EIP pour en vérifier la solidité technique, les problèmes de formatage et corriger l'orthographe, la grammaire et le style de code. Martin Becze, Vitalik Buterin, Gavin Wood et quelques autres ont été les éditeurs d'origine des EIP de 2015 à fin 2016.
 
-Les éditeurs actuels EIP sont
+Les éditeurs d'EIP actuels sont
 
 - Alex Beregszaszi (@axic)
 - Gavin John (@Pandapip1)
@@ -46,27 +46,21 @@ Les éditeurs Emeritus EIP sont
 
 Si vous souhaitez devenir un éditeur EIP, veuillez consulter [EIP-5069](https://eips.ethereum.org/EIPS/eip-5069).
 
-Les éditeurs d'EIP, avec les membres de la communauté des [Ethereum Cat Herders](https://ethereumcatherders.com/) et des [Ethereum Magicians](https://ethereum-magicians.org/), décident des EIP qui seront implémentées et sont responsables de la facilitation des EIP ainsi que du passage des EIP au stade « Final » ou « Retiré ».
+Les éditeurs d'EIP décident du moment où une proposition peut devenir une EIP, et aident les auteurs d'EIP à faire avancer leurs propositions. [Les Ethereum Cat Herders](https://ethereumcatherders.com/) aident à organiser des réunions entre les éditeurs d'EIP et la communauté (voir [EIPIP](https://github.com/ethereum-cat-herders/EIPIP)).
 
 Le processus complet de normalisation ainsi que la charte sont détaillés dans le document [EIP-1](https://eips.ethereum.org/EIPS/eip-1)
 
 ## En savoir plus {#learn-more}
 
-Si vous souhaitez en savoir plus, consultez le [site dédié aux EIP](https://eips.ethereum.org/), où vous trouverez les informations supplémentaires suivantes :
+Si vous souhaitez en savoir plus sur les EIP, consultez le site [EIPs](https://eips.ethereum.org/) et [EIP-1](https://eips.ethereum.org/EIPS/eip-1). Voici quelques liens utiles :
 
-- [Présentation des différents types d'EIP](https://eips.ethereum.org/)
-- [Liste de toutes les EIP créées](https://eips.ethereum.org/all)
-- [Statuts des EIP et leur signification](https://eips.ethereum.org/)
+- [Une liste de chaque EIP](https://eips.ethereum.org/all)
+- [Une description de tous les types d'EIP](https://eips.ethereum.org/EIPS/eip-1#eip-types)
+- [Une description de tous les statuts EIP](https://eips.ethereum.org/EIPS/eip-1#eip-process)
 
 ## Participer {#participate}
 
-Tout le monde peut créer une EIP ou une ERC, mais il est conseillé de lire [EIP-1](https://eips.ethereum.org/EIPS/eip-1), qui décrit le processus d'EIP, ce qu'est une EIP, les différents types d'EIP, ce que le document EIP doit contenir, le format et le modèle EIP, la liste des éditeurs d'EIP et tout ce que vous devez savoir sur les EIP avant d'en créer une. Votre nouvelle EIP doit définir une nouvelle fonctionnalité qui n'est pas vraiment complexe mais pas une super niche et peut être utilisée par des projets dans l'écosystème Ethereum. L'élément le plus compliqué est la facilitation : en tant qu'auteur, vous devez rassembler la communauté autour de votre EIP, collecter des commentaires, écrire des articles décrivant les problèmes que votre EIP résout, et collaborer avec des projets pour implémenter votre EIP.
-
-Si vous souhaitez suivre la discussion sur les EIP ou faire part de vos commentaires, consultez le [forum Ethereum Magicians](https://ethereum-magicians.org/), où la communauté discute des EIP.
-
-Voir également :
-
-- [Comment créer une EIP](https://eips.ethereum.org/EIPS/eip-1)
+Tout le monde peut créer une EIP. Avant de soumettre une proposition, il est indispensable de lire [EIP-1](https://eips.ethereum.org/EIPS/eip-1) qui décrit le processus EIP et explique comment écrire une EIP et solliciter des commentaires sur [Ethereum Magician](https://ethereum-magicians.org/), où les propositions sont d'abord discutées avec la communauté avant qu'une ébauche ne soit soumise.
 
 ## Références {#references}
 
diff --git a/src/content/translations/fr/enterprise/index.md b/src/content/translations/fr/enterprise/index.md
index b3f99d47e34..999e949bc0e 100644
--- a/src/content/translations/fr/enterprise/index.md
+++ b/src/content/translations/fr/enterprise/index.md
@@ -24,16 +24,16 @@ De nombreuses entreprises et consortiums ont déployé des blockchains privées
 ### Différences principales {#key-differences}
 
 - Sécurité/Immuabilité de la blockchain - La résistance d'une blockchain à la falsification est déterminée par son algorithme de consensus. Le réseau principal Ethereum est sécurisé par l’interaction de milliers de nœuds indépendants gérés par des individus et des mineurs du monde entier. Les chaînes privées possèdent généralement un petit nombre de nœuds, contrôlés par une ou quelques organisations. Ces nœuds peuvent être étroitement contrôlés, mais il suffit d'en compromettre quelques-uns pour réécrire la chaîne ou effectuer des transactions frauduleuses.
-- Performances - Les chaînes d'entreprise privées Ethereum ayant la possibilité d'utiliser des nœuds hautes performances avec des exigences matérielles spéciales ainsi que différents algorithmes de consensus comme la preuve d'autorité, elles peuvent atteindre un débit de transaction plus élevé sur la couche de base (couche 1). Sur le réseau principal Ethereum, un débit élevé peut être atteint en utilisant des [solutions d'évolutivité de couche 2](/developers/docs/scaling/#layer-2-scaling).
+- Performances - Les chaînes d'entreprise privées Ethereum ayant la possibilité d'utiliser des nœuds hautes performances avec des exigences matérielles spéciales ainsi que différents algorithmes de consensus comme la preuve d'autorité, elles peuvent atteindre un débit de transaction plus élevé sur la couche de base (couche 1). Sur le réseau principal Ethereum, un débit élevé peut être atteint en utilisant des [ solutions de mise à l'échelle par la couche 2](/developers/docs/scaling/#layer-2-scaling).
 - Coût - Le coût d'exploitation d'une chaîne privée se reflète principalement dans le travail nécessaire pour la configurer et la gérer, et les serveurs pour l'exécuter. Si se connecter au réseau principal d'Ethereum ne coûte rien, il faut payer pour chaque transaction des frais de gaz en ETH, ce qui représente un coût. Des relais de transactions (c'est-à-dire des stations de gaz) sont en cours de développement afin d'éliminer la nécessité, pour les utilisateurs finaux et les entreprises, d'utiliser directement l'ether dans leurs transactions. Certaines [analyses](https://github.com/EYBlockchain/fundamental-cost-of-ownership/blob/master/EY%20Total%20Cost%20of%20Ownership%20for%20Blockchain%20Solutions.pdf) ont montré que le coût total d'exploitation d'une application peut être inférieur sur le réseau principal par rapport à une chaîne privée.
 - Autorisation des nœuds - Seuls les nœuds autorisés peuvent rejoindre les chaînes privées. N'importe qui peut configurer un nœud sur le réseau principal Ethereum.
 - Confidentialité - L'accès aux données écrites sur les chaînes privées peut être contrôlé en limitant l'accès au réseau, et de façon plus précise avec des contrôles d'accès et des transactions privées. L'ensemble des données écrites sur la couche 1 du réseau principal sont visibles par tous, de sorte que les informations sensibles doivent être stockées et transmises hors chaîne, ou chiffrées. Des modèles de conception facilitant ceci émergent (par ex., Baseline, Aztec), ainsi que des solutions de couche 2, qui permettent de garder les données compartimentées et hors de la couche 1.
 
-### Pourquoi construire sur le réseau principal Ethereum {#why-build-on-ethereum-mainnet}
+### Pourquoi construire sur le réseau principal Ethereum ? {#why-build-on-ethereum-mainnet}
 
 Les entreprises expérimentent la technologie blockchain depuis 2016, lorsque les projets Hyperledger, Quorum et Corda ont été lancés. L'accent était principalement mis sur les blockchains d'entreprise privées avec autorisations, mais à partir de 2019, un changement s'est opéré dans la réflexion sur les blockchains publiques par rapport aux privées pour les applications métiers. Une [enquête](https://assets.ey.com/content/dam/ey-sites/ey-com/en_gl/topics/blockchain/ey-public-blockchain-opportunity-snapshot.pdf) menée par Forrester a révélé que "Les participants à l'enquête ... voient ce potentiel, 75 % d'entre eux déclarant qu’ils sont susceptibles de tirer parti des blockchains publiques à l’avenir, et près d’un tiers assurant qu'ils y sont très favorables”. Chez EY, [Paul Brody explique](https://www.youtube.com/watch?v=-ycu5vGDdZw&feature=youtu.be&t=3668) les avantages de construire sur la blockchain publique, qui (en fonction de l'application) peut offrir une meilleure sécurité/immuabilité, plus de transparence, une réduction du coût total de propriété et la possibilité d'interagir avec toutes les autres applications du réseau principal (effets réseau). Le partage d'un cadre de référence commun entre les entreprises évite la création inutile de nombreux silos isolés qui ne peuvent pas communiquer, partager ni synchroniser les informations.
 
-Une autre avancée qui renforce l'intérêt pour les blockchains publiques est la [couche 2](/developers/docs/scaling/layer-2). La couche 2 est avant tout une catégorie de technologie d’évolutivité qui rend possible les applications à haut débit sur les chaînes publiques. Mais les solutions de la couche 2 peuvent aussi [résoudre certains problèmes qui ont poussé les développeurs en entreprise à choisir des chaînes privées dans le passé](https://entethalliance.org/how-ethereum-layer-2-scaling-solutions-address-barriers-to-enterprises-building-on-mainnet/).
+Une autre avancée qui renforce l'intérêt pour les blockchains publiques est la [couche 2](/developers/docs/scaling/#layer-2-scaling). La couche 2 est avant tout une catégorie de technologie d’évolutivité qui rend possible les applications à haut débit sur les chaînes publiques. Mais les solutions de la couche 2 peuvent aussi [résoudre certains problèmes qui ont poussé les développeurs en entreprise à choisir des chaînes privées dans le passé](https://entethalliance.org/how-ethereum-layer-2-scaling-solutions-address-barriers-to-enterprises-building-on-mainnet/).
 
 Le Baseline Protocol est un projet clé qui définit un protocole permettant une collaboration confidentielle et complexe entre les entreprises sans laisser de données sensibles sur la chaîne. Il a pris une [ampleur importante](https://www.oasis-open.org/2020/08/26/baseline-protocol-achieves-key-milestone-with-release-of-v0-1-implementation-for-enterprise/) en 2020.
 
@@ -58,6 +58,7 @@ Différentes organisations sont à l'origine d'initiatives collaboratives afin d
 - [Hyperledger Besu](https://www.hyperledger.org/use/besu) _- Client Ethereum en open source axé sur les entreprises, développé sous la licence Apache 2.0 et rédigé en Java_
 - [Infura](https://infura.io/) _- Accès évolutif aux API des réseaux Ethereum et IPFS_
 - [Provide](https://provide.services/) _- Infrastructure et API pour les applications d'entreprise Web3_
+- [QuickNode](https://www.quicknode.com/) _fournit des nœuds fiables et rapides avec des API de haut niveau comme NFT API, Token API, etc. tout en livrant une suite de produits unifiée et des solutions pour entreprise_
 - [Unibright](https://unibright.io/) _- Équipe de spécialistes de la blockchain, d'architectes, de développeurs et de consultants ayant plus de 20 ans d'expérience dans les processus métiers et l'intégration_
 
 ### Outils et bibliothèques {#tooling-and-libraries}
@@ -66,12 +67,12 @@ Différentes organisations sont à l'origine d'initiatives collaboratives afin d
 - [Epirus](https://www.web3labs.com/epirus) _- Plateforme Web3 Labs pour développer, déployer et surveiller les applications blockchain_
 - [Ernst & Young Nightfall](https://github.com/EYBlockchain/nightfall) _- Boîte à outils pour les transactions privées_
 - [EthSigner](https://github.com/ConsenSys/ethsigner) _- Application de signature de transactions à utiliser avec un prestataire Web3_
-- [Tenderly](https://tenderly.co/) _- Plateforme de données fournissant des analyses en temps réel, des alertes et une surveillance avec assistance pour les réseaux privés_
+- [Tenderly](https://tenderly.co/) _ - Plateforme de données fournissant des analyses en temps réel, des alertes et une surveillance avec support pour les réseaux privés_
 - [Truffle Suite](https://trufflesuite.com) _- Suite de développement de blockchain (Truffle, Ganache, Drizzle)_
 
 ### Solutions d'évolutivité {#scalability-solutions}
 
-[La couche 2](/developers/docs/scaling/#layer-2-scaling) est un ensemble de technologies ou de systèmes qui fonctionnent sur Ethereum (couche 1), héritent des propriétés de sécurité de la couche 1, et offrent une plus grande capacité de traitement des transactions (débit), des frais de transaction plus bas (coût d'exploitation) et des confirmations de transaction plus rapides que la couche 1. Les solutions de passage à l'échelle de la couche 2 sont sécurisées par la couche 1, mais elles permettent aux applications blockchain de gérer beaucoup plus d'utilisateurs, d'actions ou de données que la couche 1. La plupart d'entre elles tirent parti des avancées récentes en matière de cryptographie et de preuves de connaissance zéro (ZK) pour maximiser les performances et la sécurité.
+[La couche 2](/developers/docs/scaling/#layer-2-scaling) est un ensemble de technologies ou de systèmes qui fonctionnent sur Ethereum (couche 1), héritent des propriétés de sécurité de la couche 1, et offrent une plus grande capacité de traitement des transactions (débit), des frais de transaction plus bas (coût d'exploitation) et des confirmations de transaction plus rapides que la couche 1. Les solutions de mise à l'échelle de la couche 2 sont sécurisées par la couche 1, mais elles permettent aux applications blockchain de gérer beaucoup plus d'utilisateurs, d'actions ou de données que la couche 1. La plupart d'entre elles tirent parti des avancées récentes en matière de cryptographie et de preuves de connaissance zéro (ZK) pour maximiser les performances et la sécurité.
 
 Construire votre application sur une solution de couche 2 peut aider à [répondre à bon nombre de préoccupations qui ont précédemment poussé les entreprises à construire sur des blockchains privées](https://entethalliance.org/how-ethereum-layer-2-scaling-solutions-address-barriers-to-enterprises-building-on-mainnet/), tout en conservant les avantages du réseau principal.
 
@@ -111,7 +112,7 @@ Voici quelques-unes des applications d'entreprise déployées sur le réseau pri
 
 ### Paiements {#payments}
 
-- [Brave Browser](https://basicattentiontoken.org/) _ - Rémunère les utilisateurs pour l'attention qu'ils portent aux publicités et les utilisateurs peuvent payer les éditeurs pour les soutenir, via le jeton Basic Attention._
+- [Le navigateur Brave](https://basicattentiontoken.org/)_rémunère les utilisateurs pour leur attention aux publicités et les utilisateurs peuvent payer les éditeurs afin de les supporter, via le Basic Attention Token_
 - [hCaptcha](https://www.hcaptcha.com/) _ - Système CAPTCHA de prévention des robots qui rémunère les opérateurs de sites web pour le travail effectué par les utilisateurs afin de libeller les données pour l'apprentissage automatique. Désormais déployé par Cloudflare._
 - [Audius](https://audius.co/) _ - Service de streaming qui connecte les fans de musique directement avec les artistes, et permet aux artistes d'être payés en totalité par leurs fans, directement et instantanément pour chaque diffusion._
 - [EthereumAds](https://ethereumads.com/) _- Permet aux opérateurs de sites web de vendre de l'espace publicitaire et d'être payés via Ethereum_
diff --git a/src/content/translations/fr/enterprise/private-ethereum/index.md b/src/content/translations/fr/enterprise/private-ethereum/index.md
index fd2685d391f..781b54ff319 100644
--- a/src/content/translations/fr/enterprise/private-ethereum/index.md
+++ b/src/content/translations/fr/enterprise/private-ethereum/index.md
@@ -15,11 +15,11 @@ Les applications de blockchain d'entreprise peuvent être construites sur le ré
 Différentes organisations sont à l'origine d'initiatives collaboratives afin de rendre Ethereum plus convivial pour les entreprises :
 
 - [Entreprise Ethereum Alliance](https://entethalliance.org/) - L'EEA permet aux organisations d'adopter et d'utiliser la technologie Ethereum dans leurs opérations commerciales quotidiennes. Elle donne à l'écosystème Ethereum les moyens de développer de nouvelles opportunités commerciales, de favoriser son adoption par l'industrie, d'apprendre et de collaborer les uns avec les autres.
-- [Hyperledger Foundation](https://hyperledger.org) _- Hyperledger est un projet collaboratif en open source créé pour faire progresser les technologies blockchain intersectorielles. Il s'agit d'une collaboration mondiale, hébergée par la Linux Foundation, entre des leaders de la finance, de la banque, de l'Internet des objets, des chaînes logistiques, de la fabrication et de la technologie. La fondation a quelques projets qui fonctionnent avec la pile Ethereum, y compris [Besu](https://www.hyperledger.org/use/besu) et [Burrow](https://www.hyperledger.org/projects/hyperledger-burrow)._
+- [Hyperledger Foundation](https://hyperledger.org) _- Hyperledger est un projet collaboratif en open source créé pour faire progresser les technologies blockchain intersectorielles. Il s'agit d'une collaboration mondiale, hébergée par la Linux Foundation, entre des leaders de la finance, de la banque, de l'Internet des objets, des chaînes logistiques, de la fabrication et de la technologie. La fondation a quelques projets qui fonctionnent avec la pile Ethereum, dont [Besu](https://www.hyperledger.org/use/besu) et [Burrow](https://www.hyperledger.org/projects/hyperledger-burrow)._
 
 ### Protocole et infrastructure {#protocol-and-infrastructure}
 
-- [Chainstack](https://chainstack.com/) _ Plateforme multicloud et multiprotocole en tant que service permettant aux entreprises de construire, déployer et gérer rapidement des réseaux et des services décentralisés_
+- [Chainstack](https://chainstack.com/) _ - Plateforme multicloud et multiprotocole en tant que service permettant aux entreprises de construire, déployer et gérer rapidement des réseaux et des services décentralisés_
 - [Clearmatics Autonity](https://www.clearmatics.com/about/) _- Suite de protocoles qui implémente les protocoles P2P et fournit le logiciel client et l'infrastructure_
 - [Hyperledger Besu](https://www.hyperledger.org/use/besu) _- Client Ethereum open source développé sous Apache 2 et rédigé en Java, qui comprend plusieurs algorithmes de consensus, y compris PoW, et PoA (IBFT, IBFT 2.0, Etherhash et Clique). Ses systèmes d'autorisation complets sont conçus spécifiquement pour être utilisés dans un environnement de consortium._
 - [Hyperledger Burrow](https://www.hyperledger.org/projects/hyperledger-burrow) _ - Client de blockchain modulaire avec interprète de contrats intelligents autorisé, partiellement développé pour la spécification de la machine virtuelle Ethereum (EVM)_
diff --git a/src/content/translations/fr/foundation/index.md b/src/content/translations/fr/foundation/index.md
index 652d71805ec..ff800654408 100644
--- a/src/content/translations/fr/foundation/index.md
+++ b/src/content/translations/fr/foundation/index.md
@@ -15,7 +15,7 @@ L'EF n'est pas une entreprise, ni un organisme à but non lucratif traditionnel.
 
 ## Initiatives de l'Ethereum Foundation {#ethereum-foundation-initiatives}
 
-### Programme de soutien à l'écosystème {#ecosystem-support-program}
+### Programme de soutien aux écosystèmes {#ecosystem-support-program}
 
 Le [programme de soutien aux écosystèmes](https://esp.ethereum.foundation/) a été créé pour offrir un soutien financier et non financier aux projets et aux entités au sein de la communauté Ethereum élargie, afin d’accélérer la croissance de l’écosystème. Ce programme est une extension du programme de subvention Ethereum d'origine, qui se concentrait principalement sur le financement.
 
@@ -31,12 +31,10 @@ Pour en savoir plus, visitez [devcon.org](https://devcon.org/), consultez le [bl
 
 ### Programme de bourses {#fellowship-program}
 
-Le [programme de bourses de l'Ethereum Foundation](https://fellowship.ethereum.foundation/) est un projet pilote qui se concentre sur la recherche d'opportunités dans les économies émergentes. Aujourd'hui, les pays en développement représentent plus de 80 % de la population mondiale. Parmi les quelque 400 000 bébés nés chaque jour dans le monde, plus de 360 000 naissent dans les pays en développement. Les populations de ces pays représentent donc non seulement notre avenir en tant que peuple, mais elles peuvent aussi représenter le prochain milliard d'utilisateurs actifs d'Ethereum.
+Le [programme de bourses de la Fondation Ethereum](https://fellowship.ethereum.foundation/) est une initiative visant à combler les lacunes en matière de représentation entre les cultures, les nationalités et les classes économiques. Le programme de bourses s'attache à combler ces écarts en identifiant et en soutenant les individus talentueux qui participent à rendre Ethereum plus pertinent, et en éliminant les obstacles à l'entrée pour les personnes sous-représentées et les communautés qui deviendront le futur du Web3.
 
-Le programme de bourses offre à l'EF l'opportunité de travailler avec des initiateurs de changements dont les projets ont un fort potentiel de générer des retombées dans les économies émergentes par le biais de l'utilisation d'Ethereum. Le programme propose une expérience unique qui regroupe mentorat, expertise et accès aux leaders de l'écosystème Ethereum.
-
-Apprenez-en davantage à l'adresse [fellowship.ethereum.foundation](https://fellowship.ethereum.foundation/) ou consultez l'[article de blog récemment publié sur le programme de bourses](https://blog.ethereum.org/2021/05/07/ethereum-for-the-next-billion/).
+[Plus d'informations sur fellowship.ethereum.foundation](https://fellowship.ethereum.foundation/).
 
 <br/>
 
-Pour plus de renseignements sur la fondation et ses travaux, visitez le site [ethereum.foundation](http://ethereum.foundation/) ou lisez le [blog de l'Ethereum Foundation](https://blog.ethereum.org/).
+Pour plus de renseignements sur la fondation et ses travaux, visitez le site [ethereum.foundation](http://ethereum.foundation/) ou lisez le [blog de l'Ethereum Foundation](https://blog.ethereum.org/) pour obtenir les dernières actualités et annonces d'EF.
diff --git a/src/content/translations/fr/glossary/index.md b/src/content/translations/fr/glossary/index.md
index 8df09e48f2a..1e5ce462b9f 100644
--- a/src/content/translations/fr/glossary/index.md
+++ b/src/content/translations/fr/glossary/index.md
@@ -22,7 +22,7 @@ Type d'attaque mené sur un [réseau](#network) décentralisé où un groupe pre
 Objet contenant une [adresse](#address), un solde, un [nonce](#nonce), ainsi qu'un stockage et un code facultatifs. Il peut s'agir d'un [compte de contrat](#contract-account) ou d'un [compte externe (EOA)](#eoa).
 
 <DocLink to="/developers/docs/accounts">
-  comptes Ethereum
+  Comptes Ethereum
 </DocLink>
 
 ### Adresse {#address}
@@ -41,9 +41,13 @@ Façon standardisée d'interagir avec les [contrats](#contract-account) dans l'
 
 Une interface de programmation d'application (API) est un ensemble de définitions permettant d'utiliser un logiciel. Une API se situe entre une application et un serveur web et facilite le transfert de données entre eux.
 
+### ASIC {#asic}
+
+Circuit intégré spécifique à l’application. Ceci fait généralement référence à un circuit intégré, personnalisé pour le minage de cryptomonnaie.
+
 ### Assert {#assert}
 
-En [Solidity](#solidity), `assert(false)` est compilé en `0xfe`, un code d'opération (opcode) non valide qui utilise tout le [gaz](#gas) restant et annule toutes les modifications. Lorsqu'une déclaration `assert()` échoue, quelque chose ne fonctionne pas du tout comme prévu, et vous devez corriger votre code. Il est conseillé d'utiliser `assert()` pour éviter les conditions qui ne doivent jamais se produire.
+Dans [Solidity](#solidity), `assert(false)` compile en `0xfe`, un code d'opération (opcode) non valide, qui utilise tout le [carburant](#gas) restant et annule toutes les modifications. Lorsqu'une déclaration `assert()` échoue, quelque chose ne fonctionne pas du tout comme prévu, et vous devez corriger votre code. Il est conseillé d'utiliser `assert()` pour éviter les conditions qui ne doivent jamais se produire.
 
 <DocLink to="/developers/docs/smart-contracts/security/">
   Sécurité des contrats intelligents
@@ -51,7 +55,11 @@ En [Solidity](#solidity), `assert(false)` est compilé en `0xfe`, un code d'opé
 
 ### Attestation {#attestation}
 
-Il s'agit du vote d'un validateur pour un bloc de la [chaîne phare](#beacon-chain) ou un [bloc](#block) [de fragments](#shard). Les validateurs doivent attester de la conformité des blocs, signalant qu'ils sont d'accord avec l'état proposé par le bloc.
+Un validateur vote pour un [ bloc](#block). Les validateurs doivent attester de la conformité des blocs, signalant qu'ils sont d'accord avec l'état proposé par le bloc.
+
+<DocLink to="/developers/docs/consensus-mechanisms/pos/attestations/">
+  Attestations
+</DocLink>
 
 <Divider />
 
@@ -67,32 +75,73 @@ Chaque [bloc](#block) a un prix de réserve connu sous le nom de « frais de ba
 
 ### Chaîne phare {#beacon-chain}
 
-Une mise à niveau du réseau qui a introduit une nouvelle couche de consensus, ayant vocation à coordonner tout le réseau Ethereum. Elle introduit la [preuve d'enjeu](#pos) et [les validateurs](#validator) sur Ethereum. Elle sera ensuite fusionnée avec le [réseau principal](#mainnet).
+La chaîne phare a été la blockchain qui a introduit la [preuve d'enjeu](#pos) et [les validateurs](#validator) sur Ethereum. Elle fonctionnait en parallèle du réseau principal par preuve de travail Ethereum depuis novembre 2020 jusqu'à ce que les deux chaînes soient fusionnées en septembre 2022 pour former l'Ethereum d'aujourd'hui.
 
 <DocLink to="/upgrades/beacon-chain/">
   Chaîne phare
 </DocLink>
 
-### Big-endian {#big-endian}
+### Gros-boutiste {#big-endian}
 
 Représentation de nombre positionnel où le chiffre le plus important est le premier en mémoire. Contraire du petit-boutisme (little-endian), où le chiffre le moins significatif arrive en premier.
 
 ### Bloc {#block}
 
-Collection d'informations requises (en-tête de bloc) concernant les [transactions](#transaction) incluses, et ensemble d'autres en-têtes de blocs appelés « [oncles](#ommer) » (ou « ommers »). Les blocs sont ajoutés au réseau Ethereum par les [mineurs](#miner).
+Un bloc est une unité d'information créée par un déposant de bloc [](#block-proposer) et envoyée à d'autres nœuds sur le réseau peer-to-peer. Les blocs incluent des listes de transactions à exécuter et une information liée au consensus qui permettent aux [validateurs](#validator) de vérifier si l'information contenue dans le bloc est valide. Cela permet aux nœuds de mettre à jour leur vue de l'état d'Ethereum.
 
 <DocLink to="/developers/docs/blocks/">
-  Blocs
+  Les blocs
 </DocLink>
 
+### Explorateur de bloc {#block-explorer}
+
+Une interface qui permet à un utilisateur de rechercher des informations depuis et à propos d'une blockchain. Cela inclut la récupération des transactions individuelles, l'activité associée à des adresses spécifiques et des informations sur le réseau.
+
+### En-têtes de bloc {#block-header}
+
+L'en-tête de bloc est une collection de métadonnées à propos d'un bloc et un résumé des transactions incluses dans le bloc d'exécution.
+
+### Propagation de bloc {#block-propagation}
+
+Le procédé de transmission de la confirmation d'un bloc à tous les autres nœuds au sein du réseau.
+
+### Proposant de bloc {#block-proposer}
+
+Le validateur spécifique choisi pour créer un bloc dans un [créneau](#slot) particulier.
+
+### Récompense du bloc {#block-reward}
+
+C'est le total d'ether reversé au mineur ayant validé le bloc.
+
+### Statut du bloc {#block-status}
+
+Les états dans lesquels un bloc peut exister. Quelques états possibles sont :
+
+- proposé : le bloc a été proposé par un validateur
+- programmé : les validateurs soumettent actuellement des données
+- manqué/ignoré : le proposant n'a pas proposé de bloc dans le laps de temps éligible.
+- orphelin : le bloc a été réorganisé par le mécanisme de choix de fourche
+
+### Durée de bloc {#block-time}
+
+L'intervalle de temps entre les blocs ajoutés à la blockchain.
+
+### Validation de bloc {#block-validation}
+
+Le processus de vérification qu'un nouveau bloc contient des transactions valides et qu'il s'appuie sur la chaîne historique la plus lourde.
+
 ### Blockchain {#blockchain}
 
-Dans Ethereum, il s'agit d'une suite de [blocs](#block) validée par le système de [preuve de travail](#pow), chaque bloc étant relié à son prédécesseur jusqu'au [bloc d'origine](#genesis-block). Il n'existe pas de limite de taille de bloc. La blockchain utilise à la place différentes [limites de gaz](#gas-limit).
+Une séquence de [blocs](#block), où chacun est relié à son prédécesseur jusqu'au [bloc d'origine](#genesis-block). L'intégrité de la blockchain est crypto-économiquement sécurisée à l'aide d'un mécanisme de consensus basé sur la preuve d'enjeu.
 
 <DocLink to="/developers/docs/intro-to-ethereum#what-is-a-blockchain">
   Qu'est-ce qu'une blockchain ?
 </DocLink>
 
+### Nœud d'amorçage {#bootnode}
+
+Les nœuds qui peuvent être utilisés pour initier le processus Discovery lors de l'exécution d'un nœud. Les adresses de ces nœuds sont enregistrés dans le code source d'Ethereum.
+
 ### Bytecode {#bytecode}
 
 Un ensemble d'instructions abstraites conçues pour être exécutées efficacement par un interpréteur logiciel ou une machine virtuelle. Contrairement au code source lisible par l'homme, le bytecode est exprimé sous forme numérique.
@@ -105,9 +154,13 @@ La première des deux [fourches majeures](#hard-fork) de la phase de développem
 
 ## C {#section-c}
 
+### Casper-FFG {#casper-ffg}
+
+Casper-FFG est un protocole de consensus par preuve d'enjeu utilisé en conjonction avec l'algorithme de choix de fourche [LMD-GHOST](#lmd-ghost) pour permettre à [des clients de consensus](#consensus-client) de s'entendre sur la tête de la chaîne phare.
+
 ### Point de contrôle {#checkpoint}
 
-La [chaîne phare](#beacon-chain) est cadencée en créneaux (12 secondes) et en périodes (32 créneaux). Le premier créneau d'une période est un point de contrôle. Quand une [supermajorité](#supermajority) de validateurs atteste du lien entre deux points de contrôle, ils peuvent être [justifiés](#justification), puis, quand un autre point de contrôle est justifié pardessus, ils peuvent être [finalisés](#finality).
+La [chaîne phare](#beacon-chain) est cadencée en créneaux (12 secondes) et en périodes (32 créneaux). Le premier créneau d'une période est un point de contrôle. Quand une [supermajorité](#supermajority) de validateurs atteste du lien entre deux points de contrôle, ils peuvent être [justifiés](#justification), puis, quand un autre point de contrôle est justifié en sus, ils peuvent être [finalisés](#finality).
 
 ### Compiler {#compiling}
 
@@ -119,11 +172,15 @@ Traduire du code écrit dans un langage de programmation de haut niveau (par exe
 
 ### Comité {#committee}
 
-Groupe d'au moins 128 [validateurs](#validator) assignés de façon aléatoire par la [chaîne phare](#beacon-chain) à ses blocs et à des blocs de fragments.
+Un groupe d’au moins 128 [validateurs](#validator) ayant la charge de valider des blocs dans chaque créneau. L'un des validateurs au sein du comité est l'agrégateur, responsable de l'agrégation des signatures de tous les autres validateurs au sein du comité qui s'accordent sur une attestation.
+
+### Infaisabilité informatique {#computational-infeasibility}
+
+Un processus est infaisable du point de vue informatique s'il faut un temps trop long en pratique (par ex. des milliards d'années) à le faire pour quiconque pourrait avoir un intérêt à le réaliser.
 
 ### Consensus {#consensus}
 
-Lorsque de nombreux nœuds (généralement, la plupart des nœuds du réseau) ont tous les mêmes blocs dans leur meilleure blockchain validée localement. À ne pas confondre avec les [règles de consensus](#consensus-rules).
+Lorsqu'une supermajorité de nœuds du réseau ont tous les mêmes blocs dans leur meilleure blockchain validée localement. À ne pas confondre avec les [règles de consensus](#consensus-rules).
 
 ### Client de consensus {#consensus-client}
 
@@ -139,47 +196,57 @@ Règles de validation de bloc que les nœuds complets appliquent pour maintenir
 
 ### Fourche Constantinople {#constantinople-fork}
 
-Seconde partie de la phase de développement [Metropolis](#metropolis), initialement prévue pour la mi-2018. Devait inclure le passage à un algorithme de consensus hybride [preuve de travail](#pow)/[preuve d'enjeu](#pos), entre autres.
+Seconde partie de la phase [Metropolis](#metropolis), initialement prévue pour la mi-2018. Devait inclure le passage à un algorithme de consensus hybride [preuve de travail](#pow)/[preuve d'enjeu](#pos), entre autres.
 
 ### Compte de contrat {#contract-account}
 
-Compte contenant du code qui s'exécute chaque fois qu'il reçoit une [transaction](#transaction) d'un autre [compte](#account) (qu'il s'agisse d'un [compte externe](#eoa) ou de [contrat](#contract-account)).
+Compte contenant du code qui s'exécute chaque fois qu'il reçoit une [transaction](#transaction) d'un autre [compte](#account) (qu'il s'agisse d'un [compte externe](#eoa) ou d'un [contrat](#contract-account)).
 
 ### Transaction de création de contrat {#contract-creation-transaction}
 
-[Transaction](#transaction) spéciale, avec l'[adresse zéro](#zero-address) comme destinataire, utilisée pour enregistrer un [contrat](#contract-account) et le publier sur la blockchain Ethereum.
-
-### Lien croisé {#crosslink}
+Une [Transaction](#transaction) spéciale, avec l'[adresse zéro](#zero-address) comme destinataire, utilisée pour enregistrer un [contrat](#contract-account) et le publier sur la blockchain Ethereum.
 
-Un lien croisé fournit un résumé de l'état d'un fragment. Il s'agit de la façon dont les chaînes de [fragments](#shard) communiqueront les unes avec les autres via la [chaîne phare](#beacon-chain) dans le système de [preuve d'enjeu](#proof-of-stake) fragmenté.
-
-<DocLink to="/developers/docs/consensus-mechanisms/pos/#how-does-validation-work">
-  Preuve d'enjeu
-</DocLink>
+### cryptoéconomies {#cryptoeconomics}
 
-<Divider />
+L'économie des cryptomonnaies.
 
 ## D {#section-d}
 
-### Organisation autonome décentralisée (DAO) {#dao}
+### Đ {#D-with-stroke}
 
-Entreprise ou autre organisation fonctionnant sans gestion hiérarchique. DAO peut également faire référence à un contrat intitulé « The DAO » lancé le 30 avril 2016, qui a ensuite été piraté en juin 2016. Ceci a finalement motivé une [fourche majeure](#hard-fork) (nom de code DAO) au bloc 1 192 000, qui a inversé le contrat DAO piraté et a causé la division d'Ethereum et d'Ethereum Classic en deux systèmes concurrents.
+Đ (D barré) est utilisé en ancien anglais, anglais moyen, en islandais et féroïen pour représenter la lettre majuscule « Eth ». Il est utilisé dans les mots comme ĐEV ou Đapp (application décentralisée), où le Đ est la lettre nordique « eth ». L'eth majuscule (Ð) est aussi utilisé pour symboliser la cryptomonnaie Dogecoin. On la trouve souvent dans la littérature plus ancienne sur Ethereum mais elle est moins utilisée aujourd'hui.
 
-<DocLink to="/dao/">
-  Organisation autonome décentralisée (DAO)
-</DocLink>
+### DAG {#DAG}
+
+DAG signifie Graphe Acyclique Dirigé (Directed Acyclic Graph). Il s'agit d'une structure de données composées de nœuds et de liens entre eux. Ethereum utilise un DAG dans son algorithme de [preuve de travail](#proof-of-work), [Ethash](#ethash).
 
 ### DApp {#dapp}
 
-Application décentralisée. Au minimum, il s'agit d'un [contrat intelligent](#smart-contract) et d'une interface utilisateur web. Plus généralement, une dApp est une application web construite sur des services d'infrastructure ouverts, décentralisés et en pair à pair (P2P). Par ailleurs, de nombreuses DApps incluent un stockage décentralisé, une plateforme et/ou un protocole de message.
+Application décentralisée. Au minimum, il s'agit d'un [contrat intelligent](#smart-contract) et d'une interface utilisateur Web. Plus généralement, une dApp est une application web qui est construite sur des services d'infrastructure de pair à pair, décentralisés et ouverts. Par ailleurs, de nombreuses dApps incluent un stockage décentralisé et/ou un protocole et une plateforme de messages.
 
 <DocLink to="/developers/docs/dapps/">
-  Introduction aux DApps
+  Introduction aux dApps
+</DocLink>
+
+### Disponibilité des données {#data-availability}
+
+Propriété permettant à tout noeud connecté au réseau de télécharger n'importe quelle portion de l'état qu'il souhaite.
+
+### Décentralisation {#decentralization}
+
+Concept visant à déplacer le contrôle et l'exécution des processus en dehors d'une entité centrale.
+
+### Organisation autonome décentralisée (DAO) {#dao}
+
+Entreprise ou autre organisation fonctionnant sans gestion hiérarchique. DAO peut également faire référence à un contrat intitulé « The DAO » lancé le 30 avril 2016, qui a ensuite été piraté en juin 2016. Ceci a finalement motivé une [fourche majeure](#hard-fork) (nom de code DAO) au bloc 1 192 000, qui a inversé le contrat DAO piraté et a causé la division d'Ethereum et d'Ethereum Classic en deux systèmes concurrents.
+
+<DocLink to="/dao/">
+  Organisations autonomes décentralisées (DAO)
 </DocLink>
 
 ### Plateforme d'échanges décentralisés (DEX) {#dex}
 
-Type de [DApp](#dapp) qui vous permet d'échanger des jetons avec des pairs sur le réseau. Vous avez besoin d'[ethers](#ether) pour en utiliser une (pour payer les [frais de transaction](#transaction-fee)), mais elles ne sont soumises à aucune restriction géographique comme le sont les plateformes d'échanges centralisés ; n'importe qui peut participer.
+Type de [DApp](#dapp) qui vous permet d'échanger des jetons avec des pairs sur le réseau. Vous avez besoin d'[Ether](#ether) pour en utiliser un (pour payer les [frais de transaction](#transaction-fee)), mais ils ne sont soumis à aucune restriction géographique comme les échanges centralisés. N'importe qui peut participer.
 
 <DocLink to="/get-eth/#dex">
   Échanges décentralisés
@@ -189,9 +256,13 @@ Type de [DApp](#dapp) qui vous permet d'échanger des jetons avec des pairs sur
 
 Voir [jeton non fongible (NFT)](#nft)
 
+### Contrat de dépôt {#deposit-contract}
+
+La passerelle pour la mise en jeu sur Ethereum. Le contrat de dépôt est un contrat intelligent sur Ethereum qui accepte les dépôts d'ETH et gère les soldes de validateur. Un validateur ne peut pas être activé sans le dépôt d'ETH dans ce contrat. Le contrat requiert des ETH et des données sur les intrants. Ces données d'entrée incluent la clé publique du validateur et la clé publique de retrait, signée par la clé privée du validateur. Ces données sont nécessaires pour qu'un validateur soit identifié et approuvé par le réseau de [preuve d'enjeu](#pos).
+
 ### DeFi {#defi}
 
-Abréviation de « Decentralized Finance » (finance décentralisée), une vaste catégorie de [dApps](#dapp) visant à fournir des services financiers à travers la blockchain, sans aucun intermédiaire et de sorte que toute personne avec une connexion Internet puisse participer.
+Abréviation de « Decentralized Finance » (finance décentralisée), une vaste catégorie de [dApps](#dapp) visant à fournir des services financiers à travers la blockchain, sans aucun intermédiaire et de sorte que toute personne ayant une connexion Internet puisse participer.
 
 <DocLink to="/defi/">
   Finance décentralisée (DeFi)
@@ -199,11 +270,11 @@ Abréviation de « Decentralized Finance » (finance décentralisée), une vas
 
 ### Difficulté {#difficulty}
 
-Paramètre à l'échelle du réseau qui contrôle la quantité de calcul requise pour produire une [preuve de travail](#pow).
+Paramètre à l'échelle du réseau qui contrôle la quantité de calcul requise pour produire un nonce valide dans les réseaux à [preuve de travail](#pow).
 
 ### Bombe de difficulté {#difficulty-bomb}
 
-Augmentation exponentielle planifiée du paramètre de [difficulté](#difficulty) de la [preuve de travail](#pow). Elle a été conçue pour inciter à la transition vers la [preuve d'enjeu](#pos), réduisant les possibilités d'une [fourche](#hard-fork).
+Augmentation exponentielle planifiée du paramètre de [difficulté](#difficulty) de la [preuve de travail](#pow) qui a été conçue pour inciter à la transition vers la [preuve d'enjeu](#pos), réduisant les possibilités d'une [fourche](#hard-fork). La bombe de difficulté a été retirée à [La Fusion](/upgrades/merge/).
 
 ### Signature numérique {#digital-signatures}
 
@@ -211,20 +282,44 @@ Courte chaîne de données qu'un utilisateur produit pour un document en utilisa
 
 <Divider />
 
+### Discovery {#discovery}
+
+Le procédé au cours duquel un noeud du réseau Ethereum trouve d'autres nœuds auxquels se connecter.
+
+### Table d'empreintes numériques distribuée (DHT) {#distributed-hash-table}
+
+C'est une structure de données contenant des pairs `(key, value)`, utilisée par les nœuds du réseau Ethereum afin d'identifier les pairs auxquels se connecter et déterminer les protocoles qui seront utilisés sur cette communication.
+
+### Double dépense {#double-spend}
+
+Une fourche délibérée de la blockchain, où un utilisateur avec une quantité suffisamment importante de puissance de minage/mise envoie une transaction déplaçant une monnaie hors chaîne (ex. en le convertissant en argent fiduciaire ou en faisant un achat hors chaîne) puis réorganise la blockchain pour supprimer cette transaction. Une double dépense réussie laisse à l'attaquant ses actifs sur et hors chaîne.
+
 ## E {#section-e}
 
 ### Algorithme de signature numérique à courbe elliptique (ECDSA) {#ecdsa}
 
-Algorithme cryptographique utilisé par Ethereum pour garantir que les fonds ne peuvent être dépensés que par leurs propriétaires. C'est la méthode privilégiée pour créer des clés publiques et privées. Pertinent pour la génération des [adresses](#address) de compte et la vérification des [transactions](#transaction).
+Algorithme cryptographique utilisé par Ethereum pour garantir que les fonds ne peuvent être dépensés que par leurs propriétaires. C'est la méthode privilégiée pour créer des clés publiques et privées. Pertinent pour la génération [d'adresse](#address) de compte et la vérification de la [transaction](#transaction).
+
+### Cryptage {#encryption}
+
+Le cryptage de données est la conversion électronique en une forme illisible exceptée par le détenteur de la clé correspondante de décryptage.
+
+### Entropie {#entropy}
+
+En cryptographie, l'entropie désigne le manque de prévisibilité ou le niveau d'aléa. Lorsqu'ils génèrent des informations secrètes, comme les [clés privées](#private-key), les algorithmes s'appuient généralement sur une source d'entropie élevée pour garantir un résultat imprévisible.
 
 ### Période {#epoch}
 
-Intervalle de 32 [créneaux](#slot) (6,4 minutes) dans le système coordonné de la [chaîne phare](#beacon-chain). Les [comités](#committee) de [validateurs](#validator) sont remaniés lors de chaque période pour des raisons de sécurité. Chaque période représente une opportunité de [finaliser](#finality) la chaîne.
+Une période de 32 [créneaux](#slot) (6,4 minutes). Les [comités](#committee) de [validateurs](#validator) sont remaniés lors de chaque période pour des raisons de sécurité. Chaque période représente une opportunité de [finaliser](#finality) la chaîne.
 
 <DocLink to="/developers/docs/consensus-mechanisms/pos/#how-does-validation-work">
   Preuve d'enjeu
 </DocLink>
 
+### Equivocation (Ambiguïté) {#equivocation}
+
+L'envoi par un validateur de deux messages contradictoires. Un exemple simple pourrait résider dans l'envoi de deux transactions différentes avec les mêmes références. Un autre exemple pourrait consister en la proposition de deux blocs pour le même emplacement (ou pour le même créneau).
+
 ### Eth1 {#eth1}
 
 « Eth1 » est un terme qui faisait référence au réseau principal Ethereum, c'est-à-dire la blockchain actuelle basée sur la preuve de travail. Ce terme a depuis été abandonné au profit de « couche d'exécution ». [En savoir plus sur ce changement de nom](https://blog.ethereum.org/2022/01/24/the-great-eth2-renaming/).
@@ -243,7 +338,7 @@ Intervalle de 32 [créneaux](#slot) (6,4 minutes) dans le système coordonné de
 
 ### Proposition d'amélioration d'Ethereum (EIP) {#eip}
 
-Document de conception visant à informer la communauté Ethereum qui décrit une nouvelle fonctionnalité proposée, ses processus ou son environnement (voir [ERC](#erc)).
+Document de conception qui fournit des informations à la communauté Ethereum, décrivant une nouvelle fonctionnalité proposée, ses processus ou environnements (voir [ERC](#erc)).
 
 <DocLink to="/eips/">
   Introduction aux EIP
@@ -251,17 +346,13 @@ Document de conception visant à informer la communauté Ethereum qui décrit un
 
 ### Ethereum Name Service (ENS) {#ens}
 
-Le registre ENS est un [contrat](#smart-contract) central unique qui fournit une correspondance entre des noms de domaine et des propriétaires et des résolveurs, comme décrit dans l'[EIP](#eip) 137.
+Le registre ENS est un [contrat](#smart-contract) unique qui fournit un mappage des noms de domaine aux propriétaires et aux résolveurs, comme décrit dans l'[EIP](#eip) 137.
 
 [Plus d'infos sur ens.domains](https://ens.domains)
 
-### Entropie {#entropy}
-
-En cryptographie, l'entropie désigne le manque de prévisibilité ou le niveau d'aléa. Lorsqu'ils génèrent des informations secrètes, comme les [clés privées](#private-key), les algorithmes s'appuient généralement sur une source d'entropie élevée pour garantir un résultat imprévisible.
-
 ### Client d'exécution {#execution-client}
 
-Les clients d'exécution (alias « clients Eth1 »), tels que Besu, Erigon, go-ethereum ou Nethermind, sont chargés du traitement et de la diffusion des transactions, ainsi que de la gestion de l'état d'Ethereum. Ils exécutent les calculs pour chaque transaction dans la [machine virtuelle Ethereum](#evm) pour s'assurer que les règles du protocole sont respectées. Aujourd'hui, ils gèrent également le consensus par [preuve de travail](#pow). Après la transition vers la [preuve d'enjeu](#pos), ils le délégueront aux clients de consensus.
+Les clients d'exécution (auparavant appelés « clients Eth1 »), tels que Besu, Erigon, go-ethereum ou Nethermind, sont chargés du traitement et de la diffusion des transactions, ainsi que de la gestion de l'état d'Ethereum. Ils exécutent les calculs pour chaque transaction dans la [machine virtuelle Ethereum](#evm) pour s'assurer que les règles du protocole sont respectées.
 
 ### Couche d'exécution {#execution-layer}
 
@@ -269,11 +360,11 @@ La couche d'exécution d'Ethereum est le réseau des [clients d'exécution](#exe
 
 ### Compte externe (EOA) {#eoa}
 
-Un EOA (de l'anglais « externally owned account ») est un [compte](#account) créé par ou pour des utilisateurs humains du réseau Ethereum.
+Les comptes externes (EOA) sont des [comptes](#account) contrôlés par les utilisateurs qui contrôlent les [clés privées](#private-key) d'un compte, typiquement générées en utilisant une [phrase de récupération](#hd-wallet-seed). Les comptes externes sont des comptes sans aucun code associé. Généralement, ces comptes sont utilisés avec [un portefeuille](#wallet).
 
 ### Demande de commentaires Ethereum (ERC) {#erc}
 
-Libellé donné à certaines [EIP](#eip) qui visent à définir une norme précise d'utilisation d'Ethereum.
+Libellé donné à certaines [EIP](#eip) qui visent à définir une norme spécifique d'utilisation d'Ethereum.
 
 <DocLink to="/eips/">
   Introduction aux EIP
@@ -281,9 +372,9 @@ Libellé donné à certaines [EIP](#eip) qui visent à définir une norme préci
 
 ### Ethash {#ethash}
 
-Algorithme de [preuve de travail](#pow) pour Ethereum 1.0.
+Un algorithme de [preuve de travail](#pow) qui a été utilisé sur Ethereum avant de passer à [preuve d'enjeu](#pos).
 
-[Plus d'infos sur eth.wiki](https://eth.wiki/en/concepts/ethash/ethash)
+[En savoir plus](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash)
 
 ### Ether {#ether}
 
@@ -295,15 +386,15 @@ Cryptomonnaie native utilisée par l'écosystème Ethereum, qui couvre les coût
 
 ### Événements {#events}
 
-Permet d'utiliser les dispositifs de journalisation de l'[EVM](#evm). Les [dApps](#dapp) peuvent être à l'écoute des éventuels événements et les utiliser pour déclencher des rappels JavaScript dans l'interface utilisateur.
+Permet d'utiliser les dispositifs de journalisation de l'[EVM](#evm). Les [DApps](#dapp) peuvent écouter les événements et les utiliser pour déclencher des rappels JavaScript dans l'interface utilisateur.
 
 <DocLink to="/developers/docs/smart-contracts/anatomy/#events-and-logs">
   Événements et journaux
 </DocLink>
 
-### Machine virtuelle Ethereum (EVM) {#evm}
+### Machine Virtuelle Ethereum (EVM) {#evm}
 
-Machine virtuelle basée sur une pile, qui exécute du [bytecode](#bytecode). Dans Ethereum, le modèle d'exécution spécifie comment l'état du système est modifié en fonction d'une série d'instructions bytecode et d'un petit tuple de données environnementales. Ceci est spécifié via un modèle formel de machine d'état virtuelle.
+Machine virtuelle basée sur une pile, qui exécute du [bytecode](#bytecode). Dans Ethereum, le modèle d'exécution spécifie comment l'état du système est modifié, en fonction d'une série d'instructions en bytecode et d'un petit tuple de données environnementales. Ceci est spécifié via un modèle formel de machine d'état virtuelle.
 
 <DocLink to="/developers/docs/evm/">
   Machine virtuelle Ethereum (EVM)
@@ -311,7 +402,7 @@ Machine virtuelle basée sur une pile, qui exécute du [bytecode](#bytecode). Da
 
 ### Langage d'assemblage de l'EVM {#evm-assembly-language}
 
-Forme lisible par l'homme du [bytecode](#bytecode) de l'EVM.
+Forme lisible par l'homme du [bytecode de l'EVM](#bytecode).
 
 <Divider />
 
@@ -323,21 +414,18 @@ Fonction par défaut appelée en l'absence de données ou d'un nom de fonction d
 
 ### Robinet {#faucet}
 
-Service effectué via un [contrat intelligent](#smart-contract), qui distribue des fonds sous la forme d'ethers de test gratuits pouvant être utilisés sur un réseau de test.
+Service effectué via un [contrat intelligent](#smart-contract), qui distribue des fonds sous la forme d'ethers de test gratuits peuvant être utilisés sur un réseau de test.
 
 <DocLink to="/developers/docs/networks/#testnet-faucets">
   Robinets de réseau de test
 </DocLink>
 
-### Finalisation {#finality}
+### Finalité {#finality}
 
-La finalisation garantit qu'un ensemble de transactions réalisées avant un instant donné ne changera pas et ne pourra pas être annulé.
+La finalité est la garantie qu'avant une heure donnée, un ensemble de transactions ne changera pas et ne pourra pas être annulé.
 
-<DocLink to="/developers/docs/consensus-mechanisms/pow/#finality">
-  Finalité de la preuve de travail
-</DocLink>
 <DocLink to="/developers/docs/consensus-mechanisms/pos/#finality">
-  Finalisation de la preuve d'enjeu
+  Finalité de la preuve d'enjeu
 </DocLink>
 
 ### Finney {#finney}
@@ -346,11 +434,11 @@ Unité de l'[ether](#ether). 1 finney = 10<sup>15</sup> [wei](#wei). 10<sup>3</s
 
 ### Fourche {#fork}
 
-Changement de protocole causant la création d'une chaîne alternative ou divergence temporelle dans deux chemins de blocs potentiels pendant le minage.
+Changement de protocole causant la création d'une chaîne alternative ou divergence temporelle en deux chemins de blocs potentiels.
 
 ### Algorithme de sélection de fourche {#fork-choice-algorithm}
 
-L'algorithme utilisé pour identifier la tête de la chaîne phare. Sur la couche d'exécution, la tête de la chaîne est identifiée comme celle qui présente la plus grande difficulté totale. Cela signifie que la véritable tête de la chaîne est celle qui a nécessité le plus de travail pour être minée. Sur la couche de consensus, l'algorithme observe l'accumulation des attestations en provenance des validateurs ([LMD_GHOST](#lmd-ghost)).
+L'algorithme utilisé pour identifier la tête de la blockchain. Sur la couche d'exécution, la tête de la chaîne est identifiée comme celle qui présente la plus grande difficulté totale. Cela signifie que la véritable tête de la chaîne est celle qui a nécessité le plus de travail pour être minée. Sur la couche de consensus, l'algorithme observe l'accumulation des attestations en provenance des validateurs ([LMD_GHOST](#lmd-ghost)).
 
 ### Preuve de fraude {#fraud-proof}
 
@@ -380,13 +468,17 @@ Carburant virtuel utilisé dans Ethereum pour exécuter les contrats intelligent
 
 Montant maximum de [gaz](#gas) qu'une transaction [](#transaction) ou qu'un [bloc](#block) peut consommer.
 
+### Prix du gaz {#gas-price}
+
+Prix en éther d'une unité de gaz spécifiée dans une transaction.
+
 ### Bloc d'origine {#genesis-block}
 
 Premier bloc d'une [blockchain](#blockchain), utilisé pour initialiser un certain réseau et sa cryptomonnaie.
 
 ### Geth {#geth}
 
-Version abrégée de « Go Ethereum ». L'une des implémentations les plus importantes du protocole Ethereum, programmée en Go.
+Go Ethereum. L'une des implémentations les plus importantes du protocole Ethereum, programmée en Go.
 
 [Plus d'infos sur geth.ethereum.org](https://geth.ethereum.org/)
 
@@ -404,7 +496,11 @@ Divergence permanente dans la [blockchain](#blockchain), aussi appelée modifica
 
 ### Empreinte numérique {#hash}
 
-Empreinte de longueur fixe d'entrées de taille variable, produite par une fonction de hachage. (Voir [keccak-256](#keccak-256))
+Empreinte de longueur fixe d'entrées de taille variable, produite par une fonction d'empreinte numérique. (Voir [Keccak-256](#keccak-256)).
+
+### Puissance de hachage {#hash-rate}
+
+C'est le nombre d'empreintes numériques par seconde calculées par les ordinateurs minant sur le réseau.
 
 ### Portefeuille HD {#hd-wallet}
 
@@ -426,7 +522,7 @@ Deuxième phase de développement d'Ethereum, lancée en mars 2016 au bloc 1 150
 
 ### Index {#index}
 
-Une structure réseau destinée à optimiser le requêtage d'informations à travers la [blockchain](#blockchain) en fournissant un chemin efficace vers sa source de stockage.
+Une structure réseau destinée à optimiser la requête d'informations à travers la [blockchain](#blockchain) en fournissant un chemin efficace vers sa source de stockage.
 
 ### Protocole d'échange d'adresses de clients (ICAP) {#icap}
 
@@ -458,6 +554,10 @@ Une fois que le code d'un [contrat](#smart-contract) (ou celui d'une [bibliothè
 
 <Divider />
 
+### Émission
+
+La frappe de nouveaux ethers pour récompenser la proposition de bloc, l'attestation et la dénonciation.
+
 ## K {#section-k}
 
 ### Fonction de dérivation de clé (KDF) {#kdf}
@@ -465,16 +565,16 @@ Une fois que le code d'un [contrat](#smart-contract) (ou celui d'une [bibliothè
 Aussi appelée « algorithme d'étirement de mot de passe », elle est utilisée par les formats [keystore](#keystore-file) pour protéger contre les attaques par force brute, par dictionnaire et de table arc-en-ciel sur le chiffrement des phrases de sécurité, en hachant celles-ci de façon répétée.
 
 <DocLink to="/developers/docs/smart-contracts/security/">
-  Sécurité des contrats intelligents
+  Sécurité de contrat intelligent
 </DocLink>
 
-### Keccak-256 {#keccak-256}
+### Keystore {#keyfile}
 
-Fonction de hachage cryptographique ([empreinte numérique](#hash)) utilisée dans Ethereum. Keccak-256 a été standardisée comme [SHA](#sha)-3.
+La paire clé/adresse privée de chaque compte existe en tant que fichier clé unique dans un client Ethereum. Ce sont des fichiers texte JSON qui contiennent la clé privée chiffrée du compte, qui ne peut être déchiffrée qu'avec le mot de passe entré lors de la création du compte.
 
-### Fichier keystore {#keystore-file}
+### Keccak-256 {#keccak-256}
 
-Fichier encodé en JSON qui contient une seule [clé privée](#private-key) (générée aléatoirement), chiffré par une phrase secrète pour plus de sécurité.
+Fonction de hachage cryptographique ([empreinte numérique](#hash)) utilisée dans Ethereum. Keccak-256 a été standardisée comme [SHA](#sha)-3.
 
 <Divider />
 
@@ -484,7 +584,7 @@ Fichier encodé en JSON qui contient une seule [clé privée](#private-key) (gé
 
 Domaine de développement axé sur des améliorations de couches se situant au-dessus du protocole Ethereum. Ces améliorations sont liées aux vitesses de [transaction](#transaction), à la réduction des [frais de transaction](#transaction-fee) et à la confidentialité des transactions.
 
-<DocLink to="/developers/docs/scaling/#layer-2-scaling">
+<DocLink to="/layer-2/">
   Couche 2
 </DocLink>
 
@@ -500,7 +600,7 @@ Type spécial de [contrat](#smart-contract) qui n'a ni fonction de paiement, ni
   Bibliothèques de contrats intelligents
 </DocLink>
 
-### Client léger {#lightweight-client}
+### Client léger {#light-client}
 
 Client Ethereum qui ne stocke aucune copie locale de la [blockchain](#blockchain) ou qui ne valide aucun bloc ni aucune [transaction](#transaction). Il offre les fonctions d'un [portefeuille](#wallet), et peut créer et diffuser des transactions.
 
@@ -514,11 +614,19 @@ Client Ethereum qui ne stocke aucune copie locale de la [blockchain](#blockchain
 
 ### Réseau principal {#mainnet}
 
-Appelé « mainnet » en anglais (pour « main network »), il s'agit de la [blockchain](#blockchain) principale du réseau public Ethereum. De vrais ETH, une véritable valeur et des conséquences réelles. Également nommé « couche 1 » lors des discussions sur les solutions de mise à l'échelle de [couche 2](#layer-2). (Voir aussi [réseau de test](#testnet))
+Appelé « mainnet » en anglais (pour « main network »), il s'agit de la [blockchain](#blockchain) principale du réseau public Ethereum. De vrais ETH, une véritable valeur et des conséquences réelles. Aussi connu sous le nom de « couche 1 » lors des discussions sur les solutions de misse à l'échelle de [couche 2](#layer-2). (Voir aussi [réseau de test](#testnet))
+
+<DocLink to="/developers/docs/networks/">
+  Réseaux Ethereum
+</DocLink>
+
+### Mémorivore {#memory-hard}
+
+Les fonctions mémorivores sont des processus qui connaissent une diminution drastique de la vitesse ou de la faisabilité lorsque la quantité de mémoire disponible diminue même légèrement. Un exemple est l'algorithme de minage Ethereum [Ethash](#ethash).
 
 ### L'arbre de Merkle Patricia {#merkle-patricia-tree}
 
-Structure de données utilisée dans Ethereum pour stocker efficacement les paires clés-valeurs.
+Structure des données utilisée dans Ethereum pour stocker efficacement les paires clés-valeurs.
 
 ### Message {#message}
 
@@ -532,9 +640,17 @@ L'acte de passer un [message](#message) d'un compte à un autre. Si le compte de
 
 La troisième phase de développement d'Ethereum, lancée en octobre 2017.
 
+### Minage {#mining}
+
+C'est le procédé de vérification des transactions et de l'exécution du contrat sur la blockchain Ethereum en échange d'une récompense en ether avec le minage de chaque bloc. C'est ainsi qu'Ethereum était sécurisé avant de passer à [la preuve d'enjeu](#pos).
+
+### Ferme de minage {#mining-pool}
+
+La mise en commun de ressources par les mineurs de la [preuve de travail](#pow) qui partagent leur puissance de calcul et se partagent les [récompenses de blocs](#block-reward).
+
 ### Mineur {#miner}
 
-[Nœud](#node) du réseau qui trouve une [preuve de travail](#pow) valide pour de nouveaux blocs, par passes de hachage successives (voir [Ethash](#ethash)).
+[Nœud](#node) du réseau qui trouve une [preuve de travail](#pow) valide pour de nouveaux blocs, par passes de hachage successives (voir [Ethash](#ethash)). Les mineurs ne font plus partie de Ethereum - ils ont été remplacés par des validateurs lorsque Ethereum est passé à la [la preuve d'enjeu](#pos).
 
 <DocLink to="/developers/docs/consensus-mechanisms/pow/mining/">
   Minage
@@ -556,12 +672,16 @@ Lorsque cela fait référence au réseau Ethereum, réseau P2P qui propage les t
   Réseaux
 </DocLink>
 
+### Puissance de hachage du réseau {#network-hashrate}
+
+La [puissance de hachage](#hashrate) collective produite par un réseau entier de minage. Le minage sur Ethereum s'est terminé lorsque Ethereum est passé à la [preuve d'enjeu](#pos).
+
 ### Jeton non fongible (NFT) {#nft}
 
 Aussi connu sous le nom de « deed », il s'agit d'une norme de jeton introduite par la proposition ERC-721. Les NFT peuvent être suivis et échangés, mais chaque jeton est unique et distinct. Ils ne sont pas interchangeables comme les [jetons ERC-20](#token-standard). Les NFT peuvent représenter la propriété des actifs numériques ou physiques.
 
 <DocLink to="/nft/">
-  Jeton non fongible (NFT)
+  Jetons non fongibles (NFT)
 </DocLink>
 <DocLink to="/developers/docs/standards/tokens/erc-721/">
   Norme de jeton non fongible ERC-721
@@ -577,15 +697,15 @@ Client logiciel qui participe au réseau.
 
 ### Nonce {#nonce}
 
-En cryptographie, valeur qui ne peut être utilisée qu'une seule fois. Il existe deux types de nonces dans Ethereum : le nonce de compte est un compteur de transactions présent dans chaque compte, qui est utilisé pour prévenir les attaques par rejeu ; et le nonce de [preuve de travail](#pow) est la valeur aléatoire utilisée dans un bloc pour satisfaire la [preuve de travail](#pow).
+En cryptographie, valeur qui ne peut être utilisée qu'une seule fois. Un nonce d'un compte est un compteur de transactions propre à chaque compte, qui est utilisé pour prévenir les attaques par répétition.
 
 <Divider />
 
 ## O {#section-o}
 
-### Bloc oncle (ommer) {#ommer}
+### bloc ommer (oncle) {#ommer}
 
-Quand un [mineur](#miner) trouve un [bloc](#block) valide, un autre mineur peut avoir publié un bloc concurrent, qui est ajouté en premier au sommet de la blockchain. Ce bloc valide, mais obsolète, peut être inclus par des blocs plus récents en tant que _bloc oncle_ et recevoir une récompense partielle. On utilise parfois le terme « ommer », plus neutre, pour parler de fraternité d'un bloc parent.
+Quand un [mineur](#miner) de preuve de travail trouve un [bloc](#block) valide, un autre mineur peut avoir publié un bloc concurrent, qui est ajouté en premier au sommet de la blockchain. Ce bloc valide, mais obsolète, peut être inclus par des blocs plus récents en tant que _bloc oncle_ et recevoir une récompense partielle. On utilise parfois le terme « ommer », plus neutre, pour parler de fraternité d'un bloc parent. Ceci était pertinent pour Ethereum lorsqu'il était un réseau à [preuve de travail](pow), mais les blocs oncle ne sont pas une fonctionnalité de la [preuve d'enjeu](#pos) sur Ethereum, car un seul proposant de bloc est sélectionné à chaque créneau.
 
 ### Rollup optimiste {#optimistic-rollup}
 
@@ -600,20 +720,28 @@ Un [rollup](#rollups) (ou regroupement) de transactions qui utilise les [preuves
 Les oracles sont des ponts entre la [blockchain](#blockchain) et le monde réel. Ils agissent comme des [API](#api) sur la blockchain qui peuvent être interrogés pour des informations et utilisés dans des [contrats intelligents](#smart-contract).
 
 <DocLink to="/developers/docs/oracles/">
-  Oracles
+  Oracle
 </DocLink>
 
 <Divider />
 
 ## P {#section-p}
 
-### Parity {#parity}
+### parity {#parity}
 
 Une des implémentations interopérables les plus importantes du logiciel client Ethereum.
 
+### pair {#peer}
+
+Ordinateurs connectés exécutant le logiciel client Ethereum qui ont des copies identiques de la [blockchain](#blockchain).
+
+### Réseau pair-à-pair {#peer-to-peer-network}
+
+Un réseau d'ordinateurs ([pairs](#peer)) collectivement capables de fonctionner sans s'appuyer sur des services centralisés s'appuyant sur des serveurs.
+
 ### Plasma {#plasma}
 
-Une solution de mise à l'échelle hors chaîne qui se sert de [preuves de fraude](#fraud-proof), comme des [rollups optimistes](#optimistic-rollups). Plasma se limite aux transactions simples comme les échanges et transferts de jetons de base.
+Une solution de mise à l'échelle hors chaîne qui utilise des [preuves de fraude](#fraud-proof), comme les [rollups optimistes](#optimistic-rollups). Plasma se limite aux transactions simples comme les échanges et transferts de jetons simples.
 
 <DocLink to="/developers/docs/scaling/plasma">
   Plasma
@@ -623,6 +751,10 @@ Une solution de mise à l'échelle hors chaîne qui se sert de [preuves de fraud
 
 Nombre secret qui permet aux utilisateurs Ethereum de prouver la propriété d'un compte ou de contrats en produisant une signature numérique (voir [clé publique](#public-key), [adresse](#address), [ECDSA](#ecdsa)).
 
+### Chaîne privée {#private-chain}
+
+Une blockchain est dite privée si on y accède via une permission, par opposition à une blockchain publique. C'est par exemple le cas de blockchain interne à une institution.
+
 ### Preuve d'enjeu (PoS) {#pos}
 
 Méthode par laquelle un protocole de blockchain de cryptomonnaie vise à atteindre un [consensus](#consensus) distribué. La PoS demande aux utilisateurs de prouver qu'ils sont propriétaires d'une certaine quantité de cryptomonnaie (leur « mise » sur le réseau) afin de pouvoir participer à la validation des transactions.
@@ -633,13 +765,13 @@ Méthode par laquelle un protocole de blockchain de cryptomonnaie vise à attein
 
 ### Preuve de travail (PoW) {#pow}
 
-Portion de données (la preuve) qui nécessite des calculs significatifs pour être trouvée. Dans Ethereum, les [mineurs](#miner) doivent trouver une solution numérique à l'algorithme [Ethash](#ethash), qui répond à un objectif de [difficulté](#difficulty) à l'échelle du réseau.
+Un bout de données (la preuve) qui nécessite des calculs significatifs pour être trouvée.
 
 <DocLink to="/developers/docs/consensus-mechanisms/pow/">
   Preuve de travail
 </DocLink>
 
-### Clé publique {#public-key}
+### clé publique {#public-key}
 
 Nombre dérivé depuis une [clé privée](#private-key) via une fonction à sens unique, qui peut être partagé publiquement et utilisé par n'importe qui pour vérifier une signature numérique créée avec la clé privée correspondante.
 
@@ -653,7 +785,7 @@ Données renvoyées par un client Ethereum pour représenter le résultat d'une
 
 ### Attaque par réentrance {#re-entrancy-attack}
 
-Attaque qui consiste en un contrat d'attaquant qui appelle une fonction du contrat de la victime de telle façon que, pendant l'exécution, la victime rappelle le contrat de l'attaquant de façon récursive. Par exemple, en ignorant certaines parties du contrat de la victime qui mettent à jour les soldes ou comptabilisent les montants de retrait, cela peut aboutir à un vol de fonds.
+Attaque qui consiste en un contrat d'attaquant qui appelle une fonction du contrat de la victime de telle façon que, pendant l'exécution, la victime rappelle le contrat de l'attaquant de façon récursive. Cela peut aboutir à voler des fonds, par exemple en faisant en sorte de contourner des parties du contrat de la victime qui mettent à jour les soldes ou qui comptabilisent les montants retirés.
 
 <DocLink to="/developers/docs/smart-contracts/security/#re-entrancy">
   Réentrance
@@ -669,51 +801,67 @@ Une norme d'encodage conçue par les développeurs Ethereum pour encoder et sér
 
 ### Rollups {#rollups}
 
-Type de solution d'évolutivité de [couche 2](#layer-2) qui regroupe plusieurs transactions et les soumet à la [chaîne principale Ethereum](#mainnet) en une seule transaction. Cela permet de réduire les frais de [gaz](#gas) et d'augmenter le débit des [transactions](#transaction). Il existe des rollups optimistes et des rollups ZK qui utilisent différentes méthodes de sécurité pour offrir ces avantages d'évolutivité.
+Type de solution de mise à l'échelle de [couche 2](#layer-2) qui regroupe plusieurs transactions et les soumet à la [chaîne principale Ethereum](#mainnet) en une seule transaction. Cela permet de réduire les frais de [gaz](#gas) et d'augmenter le débit des [transactions](#transaction). Il existe des rollups optimistes et des rollups ZK qui utilisent différentes méthodes de sécurité pour offrir ces avantages d'évolutivité.
 
 <DocLink to="/developers/docs/scaling/#rollups">
-  Rollups
+  rollups
 </DocLink>
 
 <Divider />
 
+### RPC {#rpc}
+
+**Appel de procédure à distance (RPC)** est un protocole qu'un programme utilise pour demander un service à un programme situé sur un autre ordinateur dans un réseau sans avoir à comprendre les détails du réseau.
+
 ## S {#section-s}
 
+### Algorithme de hachage sécurisé (SHA) {#sha}
+
+Famille de fonctions de hachage cryptographique publiées par le National Institute of Standards and Technology (NIST) aux États-Unis.
+
 ### Serenity {#serenity}
 
-L'étape du développement d'Ethereum qui a initié un ensemble de mises à l'échelle et de mises à jour de durabilité, précédemment appelée « Ethereum 2.0 », ou « Eth2 ».
+L'étape du développement d'Ethereum qui a initié un ensemble de mises à jour de mise à l'échelle et de durabilité, précédemment appelées 'Ethereum 2.0', ou 'Eth2'.
 
 <DocLink to="/upgrades/">
   Mises à niveau d'Ethereum
 </DocLink>
 
-### Algorithme de hachage sécurisé (SHA) {#sha}
+### Sérialisation {#serialization}
 
-Famille de fonctions de hachage cryptographique publiées par le National Institute of Standards and Technology (NIST) aux États-Unis.
+Procédé de conversion d'une structure de données en une séquence d'octets.
 
-### Fragment/chaîne de fragments {#shard}
+### Fragment / chaîne de fragments {#shard}
 
-Une chaîne par [preuve d'enjeu](#pos) coordonnée par la [chaîne phare](#beacon-chain) et sécurisée par les [validateurs](#validator). 64 ajouts au réseau seront réalisés dans le cadre de la mise à niveau des chaînes de fragments. Les chaînes de fragments offriront un débit de transaction accru pour Ethereum en fournissant des données supplémentaires aux solutions de [couche 2](#layer-2) comme les [rollups optimistes](#optimistic-rollups) et les [rollups ZK](#zk-rollups).
+Les chaînes de fragments sont des portions de la blockchain complète qui peuvent être sous la responsabilité de sous-ensembles de validateurs. Les chaînes de fragments offriront un débit de transaction accru pour Ethereum et amélioreront la disponibilité des données pour les solutions de [couche 2](#layer-2) comme les [rollups optimistes](#optimistic-rollups) et les [rollups ZK](#zk-rollups).
 
-<DocLink to="/upgrades/sharding">
-  Chaînes de fragments
+<DocLink to="/upgrades/shard-chains">
+  Chaines de fragments
 </DocLink>
 
 ### Chaînes latérales {#sidechain}
 
-Solution d'évolutivité qui utilise une chaîne séparée avec des [règles de consensus](#consensus-rules) différentes et souvent plus rapides. Un pont est nécessaire pour connecter ces chaînes latérales au [réseau principal](#mainnet). Les [rollups](#rollups) utilisent également les chaînes latérales, mais ils fonctionnent en collaboration avec le [réseau principal](#mainnet) à la place.
+Solution de mise à l'échelle qui utilise une chaîne séparée avec des [règles de consensus](#consensus-rules) différentes, souvent plus rapides. Un pont est nécessaire pour connecter ces chaînes latérales au [réseau principal](#mainnet). Les [rollups](#rollups) utilisent également les chaînes latérales, mais ils fonctionnent plutôt en collaboration avec le [réseau principal](#mainnet).
 
 <DocLink to="/developers/docs/scaling/sidechains/">
-  Chaînes latérales
+  Chaines latérales
 </DocLink>
 
+### Signature {#signing}
+
+Démontrer cryptographiquement qu'une transaction a été approuvée par le détenteur d'une clé privée spécifique.
+
 ### Singleton {#singleton}
 
 Terme de programmation informatique qui décrit un objet dont il ne peut exister qu'une seule instance.
 
+### Délesteur {#slasher}
+
+Un délesteur est une entité qui scanne les attestations à la recherche d'offenses sanctionnables. Les sanctions sont diffusées sur le réseau, et le proposant en consigne la preuve dans le prochain bloc. Le proposant reçoit alors une récompense pour avoir sanctionné le validateur malveillant.
+
 ### Créneau {#slot}
 
-Période de temps (12 secondes) pour laquelle un nouveau bloc de [chaîne phare](#beacon-chain) et de [chaîne de fragments](#shard) peuvent être proposés par un [validateur](#validator) dans le système de [preuve d'enjeu](#pos). Un créneau peut être vide. 32 créneaux forment une [période](#epoch).
+Une période de temps (12 secondes) durant laquelle de nouveaux blocs peuvent être proposés par un [validateur](#validator) dans le système de [preuve d'enjeu](#pos). Un créneau peut être vide. 32 créneaux forment une [période](#epoch).
 
 <DocLink to="/developers/docs/consensus-mechanisms/pos/#how-does-validation-work">
   Preuve d'enjeu
@@ -729,15 +877,19 @@ Programme qui s'exécute sur l'infrastructure de calcul Ethereum.
 
 ### SNARK {#snark}
 
-Acronyme pour « argument de connaissance succinct et non interactif » (Succint Non-interactive ARgument of Knowledge), un SNARK est un type de [preuve de connaissance zéro](#zk-proof).
+Acronyme pour « argument de connaissance succinct et non interactif » (Succint Non-interactive Argument of Knowledge), un SNARK est un type de [preuve de connaissance zéro](#zk-proof).
 
 <DocLink to="/developers/docs/scaling/zk-rollups/">
   Rollups ZK
 </DocLink>
 
+### Fourche mineure {#soft-fork}
+
+Une divergence dans une [blockchain](#blockchain) qui se produit lorsque les [règles de consensus](#consensus-rules) deviennent changeantes. Contrairement à une [fourche majeure](#hard-fork), une fourche mineure est rétro-compatible ; les nœuds mis à jour peuvent valider les blocs créés par des nœuds non mis à jour tant qu'ils suivent les nouvelles règles de consensus.
+
 ### Solidity {#solidity}
 
-Langage de programmation procédural (impératif) dont la syntaxe est similaire à JavaScript, C++ ou Java. Il s'agit du langage le plus populaire et le plus fréquemment utilisé pour les [contrats intelligents](#smart-contract) Ethereum. Il a été créé par Dr Gavin Wood.
+Langage de programmation procédural (impératif) dont la syntaxe est similaire à JavaScript, C++ ou Java. Il s'agit du langage le plus populaire et le plus fréquemment utilisé pour les [contrats intelligents](#smart-contract) sur Ethereum. Il a été créé par Dr Gavin Wood.
 
 <DocLink to="/developers/docs/smart-contracts/languages/#solidity">
   Solidity
@@ -745,26 +897,26 @@ Langage de programmation procédural (impératif) dont la syntaxe est similaire
 
 ### Assemblage en ligne Solidity {#solidity-inline-assembly}
 
-Langage d'assemblage de l'[EVM](#evm) dans un programme [Solidity](#solidity). La prise en charge de Solidity pour l'assemblage en ligne facilite l'écriture de certaines opérations.
+Langage d'assemblage de l'[EVM](#evm) que l'on peut utiliser au sein d'un programme [Solidity](#solidity). Cette prise en charge par Solidity de l'assembleur facilite l'écriture de certaines opérations.
 
 ### Spurious Dragon {#spurious-dragon}
 
-[Fourche majeure](#hard-fork) de la blockchain Ethereum, qui s'est produite au bloc 2 675 000 pour traiter plus de vecteurs d'attaque par déni de service et pour effacer l'état (voir [Tangerine Whistle](#tangerine-whistle)). Également un mécanisme de protection contre les attaques par rejeu (voir [nonce](#nonce)).
+[Fourche majeure](#hard-fork) de la blockchain Ethereum, qui s'est produite au bloc 2 675 000 pour traiter plus de vecteurs d'attaque par déni de service et pour effacer l'état (voir [Tangerine Whistle](#tangerine-whistle)). C'est également un mécanisme de protection contre les attaques par rejeu (voir [nonce](#nonce)).
 
 ### Stablecoin {#stablecoin}
 
 [Jeton ERC-20](#token-standard) dont la valeur est liée à celle d'un autre actif. Il existe des stablecoins liés à des monnaies fiduciaires comme le dollar, des métaux précieux comme l'or et d'autres cryptomonnaies comme le Bitcoin.
 
 <DocLink to="/eth/#tokens">
-  ETH n'est pas la seule crypto sur Ethereum
+  L'ETH n'est pas la seule crypto sur Ethereum
 </DocLink>
 
 ### Mettre en jeu {#staking}
 
-Déposer une quantité d'[ethers](#ether) (votre mise) pour devenir validateur et sécuriser le [réseau](#network). Un validateur vérifie les [transactions](#transaction) et propose des [blocs](#block) sous un modèle de consensus de [preuve d'enjeu](#pos). La mise en jeu vous incite économiquement à agir dans le meilleur intérêt du réseau. Vous obtiendrez des récompenses pour avoir mené à bien vos tâches de [validateur](#validator), mais perdrez diverses quantités d'ETH dans le cas contraire.
+Déposer une quantité d'[ethers](#ether) (votre mise) pour devenir validateur et sécuriser le [réseau](#network). Un validateur vérifie les [transactions](#transaction) et propose des [blocs](#block) sous un modèle de consensus par [preuve d'enjeu](#pos). La mise en jeu vous incite économiquement à agir dans le meilleur intérêt du réseau. Vous obtiendrez des récompenses pour avoir mené à bien vos tâches de [validateur](#validator), mais perdrez diverses quantités d'ETH dans le cas contraire.
 
 <DocLink to="/staking/">
-  Mettez en jeu votre ETH pour devenir un validateur Ethereum
+  Misez votre ETH pour devenir un validateur Ethereum
 </DocLink>
 
 ### STARK {#stark}
@@ -775,6 +927,10 @@ Acronyme de « argument de connaissance transparent et évolutif » (Scalable
   Rollups ZK
 </DocLink>
 
+### État {#state}
+
+Une image instantanée de tous les soldes et métadonnées présents à un moment donné sur la blockchain, qui renvoie normalement aux conditions au niveau d'un bloc particulier.
+
 ### Canaux d'état {#state-channels}
 
 Solution de [couche 2](#layer-2) qui implique la mise en place d'un canal entre les participants pour qu'ils puissent effectuer des transactions librement et à moindre coût. Seule une [transaction](#transaction) est envoyée au [réseau principal](#mainnet) pour configurer et fermer le canal. Cela permet un débit de transaction très élevé, mais repose sur la connaissance du nombre de participants au départ et le blocage de fonds.
@@ -785,11 +941,15 @@ Solution de [couche 2](#layer-2) qui implique la mise en place d'un canal entre
 
 ### Supermajorité {#supermajority}
 
-La supermajorité est le terme désignant une quantité supérieure à 2/3 (66 %) de l'ether total mis en jeu sur la [chaîne phare](#beacon-chain). Un vote de la supermajorité est nécessaire pour que les blocs soient [finalisés](#finality) sur la chaîne phare.
+La supermajorité est le terme désignant une quantité supérieure à 2/3 (66 %) de l'ether total mis en jeu pour sécuriser Ethereum. Un vote de la supermajorité est nécessaire pour que les blocs soient [finalisés](#finality) sur la chaîne phare.
+
+### synchronisation {#syncing}
+
+Ce procédé correspond à la transmission à un noeud du réseau de la blockchain, de l'entière et plus actuelle version de la blockchain.
 
 ### Comité de synchronisation {#sync-committee}
 
-Un comité de synchronisation est un groupe de [validateurs](#validator) sélectionnés de manière aléatoire sur la [chaîne phare](#beacon-chain) et qui est actualisé toutes les 27 heures environ. Leur rôle est d'ajouter leurs signatures à des en-têtes de blocs valides. Les comités de synchronisation permettent aux [clients légers](#lightweight-client) de garder une trace de la tête de la blockchain sans avoir à accéder à l'ensemble des validateurs.
+Un comité de synchronisation est un groupe de validateurs sélectionnés aléatoirement qui est actualisé toutes les 27 heures environ. Leur rôle est d'ajouter leurs signatures à des en-têtes de blocs valides. Les comités de synchronisation permettent aux [clients légers](#light-client) de garder une trace de la tête de la blockchain sans nécessiter l'accès à l'ensemble des validateurs.
 
 ### Szabo {#szabo}
 
@@ -803,17 +963,25 @@ Unité de l'[ether](#ether). 1 szabo = 10<sup>12</sup> [wei](#wei), 10<sup>6</su
 
 [Fourche majeure](#hard-fork) de la blockchain Ethereum, qui s'est produite au bloc 2 463 000 pour modifier le calcul du [gaz](#gas) pour certaines opérations intensives en E/S et pour effacer l'état accumulé d'une attaque par déni de service, qui exploitait le faible coût en gaz de ces opérations.
 
+### Difficulté Totale Terminale (TTD) {#terminal-total-difficulty}
+
+La difficulté totale est la somme de la difficulté de minage Ethash pour tous les blocs jusqu'à un point spécifique de la blockchain. La difficulté totale terminale est une valeur spécifique pour la difficulté totale qui a été utilisée comme déclencheur pour les clients d'exécution afin d'éteindre leurs fonctions de minage et permettre au réseau de basculer à la preuve d'enjeu.
+
 ### Réseau de test {#testnet}
 
 Aussi appelé « testnet » (de l'anglais « test network »), il s'agit d'un réseau utilisé pour simuler le comportement du réseau principal Ethereum (voir [réseau principal](#mainnet)).
 
-<DocLink to="/developers/docs/networks/#testnets">
+<DocLink to="/developers/docs/networks/#ethereum-testnets">
   Réseaux de test
 </DocLink>
 
-### Norme de jeton {#token-standard}
+### jeton {#token}
+
+Un bien virtuel négociable défini dans les contrats intelligents sur la blockchain Ethereum.
 
-Introduite par la proposition ERC-20, elle fournit une structure de [contrat intelligent](#smart-contract) standardisée pour les jetons fongibles. Les jetons d'un même contrat peuvent être suivis, négociés, et sont interchangeables, contrairement aux [NFT](#nft).
+### mise aux normes des jetons {#token-standard}
+
+Introduite par la proposition ERC-20, elle fournit une structure de [contrat intelligent](#smart-contract) standardisée pour les jetons fongibles. D'autres standards ERC s'appliquent aux jetons non-fongibles ou [NFT](#nft).
 
 <DocLink to="/developers/docs/standards/tokens/erc-20/">
   Norme de jeton ERC-20
@@ -829,12 +997,16 @@ Données enregistrées dans la blockchain Ethereum signées par un [compte](#acc
 
 ### Frais de transaction {#transaction-fee}
 
-Frais dont il faut s'acquitter à chaque utilisation du réseau Ethereum, comme l'envoi de fonds depuis votre [portefeuille](#wallet) ou l'interaction avec une [DApp](#dapp) (échange de jetons ou achat d'un objet de collection, par ex.). Considérez-les comme des frais de service. Ils évolueront en fonction de l'occupation du réseau. Ceci est dû au fait que les [mineurs](#miner) (les utilisateurs responsables du traitement de votre transaction) sont susceptibles de donner la priorité aux transactions dont les frais sont plus élevés. La congestion du réseau force donc la hausse des prix.
+Frais dont il faut s'acquitter à chaque utilisation du réseau Ethereum. Par exemple, l'envoi de fonds depuis votre [portefeuille](#wallet) ou l'interaction avec une [dApp](#dapp), comme l'échange de jetons ou l'achat d'un objet de collection. Vous pouvez les voir comme des frais de service. Ils évoluent en fonction de l'occupation du réseau. Ceci est dû au fait que les validateurs, les personnes responsables du traitement de votre transaction, sont susceptibles de donner la priorité aux transactions dont les commissions sont plus élevées. La congestion du réseau pousse donc les prix vers le haut.
 
 Au niveau technique, vos frais de transaction se rapportent à la quantité de [gaz](#gas) requise par votre transaction.
 
 La réduction des frais de transaction est actuellement un sujet qui suscite un vif intérêt. Voir [couche 2](#layer-2)
 
+### Sans confiance {#trustlessness}
+
+La capacité d'un réseau à effectuer des transactions sans qu'aucune des parties impliquées n'ait besoin de faire confiance à un tiers
+
 ### Turing-complet {#turing-complete}
 
 Concept nommé d'après le mathématicien et informaticien anglais Alan Turing. Un système de règles de manipulation de données (comme l'ensemble d'instructions d'un ordinateur, un langage de programmation ou un automate cellulaire) est « Turing-complet » ou « universel sur le plan informatique » s'il peut être utilisé pour simuler n'importe quelle machine Turing.
@@ -848,15 +1020,25 @@ Concept nommé d'après le mathématicien et informaticien anglais Alan Turing.
 Dans un système de [preuve d'enjeu](#pos), [nœud](#node) responsable du stockage des données, du traitement des transactions et de l'ajout de nouveaux blocs à la blockchain. Pour activer le logiciel validateur, vous devez pouvoir [mettre en jeu](#staking) 32 ETH.
 
 <DocLink to="/developers/docs/consensus-mechanisms/pos">
-  preuve d'enjeu
+  Preuve d'enjeu
 </DocLink>
 <DocLink to="/staking/">
   Mise en jeu sur Ethereum
 </DocLink>
 
+### Cycle de vie du validateur {#validator-lifecycle}
+
+La séquence des états dans lesquels un validateur peut exister. Elle comprend :
+
+- déposé : Au moins 32 ETH a été déposé sur le [contrat de dépôt](#deposit-contract) par le validateur
+- en attente : le validateur est dans la file d'activation en attente d'être accepté dans le réseau par vote des validateurs existants
+- actif : en train d'attester et de proposer des blocs
+- dénoncé : le validateur s'est mal comporté et a été exclu
+- sortant : le validateur a été marqué pour quitter le réseau, soit volontairement, soit parce qu'il a été éjecté.
+
 ### Preuve de validité {#validity-proof}
 
-Modèle de sécurité pour certaines solutions de [couche 2](#layer-2) dans lequel, pour augmenter la vitesse, les transactions sont regroupées en lots ([rollups](/#rollups)) et soumises à Ethereum en une seule transaction. Le calcul des transactions se fait hors chaîne et est ensuite fourni à la chaîne principale avec une preuve de leur validité. Cette méthode augmente le nombre de transactions possibles tout en maintenant le niveau de sécurité. Certains [rollups](#rollups) utilisent des [preuves de fraude](#fraud-proof).
+Modèle de sécurité pour certaines solutions de [couche 2](#layer-2) dans lequel, pour augmenter la vitesse, les transactions sont regroupées en lots ([rollups](/#rollups)) et soumises à Ethereum en une seule transaction. Le calcul des transactions se fait hors chaîne avant d'être transmis à la chaîne principale avec une preuve de leur validité. Cette méthode augmente le nombre de transactions possibles tout en maintenant le niveau de sécurité. Certains [rollups](#rollups) utilisent plutôt des [preuves de fraude](#fraud-proof).
 
 <DocLink to="/developers/docs/scaling/zk-rollups/">
   Rollups ZK
@@ -892,10 +1074,10 @@ Logiciel qui conserve des [clés privées](#private-key). Il est utilisé pour a
 
 ### Web3 {#web3}
 
-Troisième version du web. D'abord proposé par le Dr Gavin Wood, Web3 représente une nouvelle vision et une nouvelle orientation pour les applications web : des applications gérées et possédées de façon centralisée aux applications construites sur des protocoles décentralisés (voir [dApp](#dapp)).
+Troisième version du web. Terme proposé au départ par le Dr Gavin Wood, Web3 représente une nouvelle vision et une nouvelle orientation pour les applications web : passant d'applications gérées et détenues de façon centralisée à des applications construites sur des protocoles décentralisés (voir [dApp](#dapp)).
 
 <DocLink to="/developers/docs/web2-vs-web3/">
-  Web2 vs Web3
+  Web2 et Web3
 </DocLink>
 
 ### Wei {#wei}
@@ -910,7 +1092,7 @@ Plus petite unité de l'[ether](#ether). 10<sup>18</sup> wei = 1 ether.
 
 Adresse Ethereum spéciale, composée entièrement de zéros et spécifiée comme adresse de destination d'une [transaction de création de contrat](#contract-creation-transaction).
 
-### Preuve de connaissance zéro {#zk-proof}
+### preuve de connaissance zéro {#zk-proof}
 
 Une preuve de connaissance zéro (zero-knowledge proof) est une méthode cryptographique qui permet à un individu de prouver qu'une déclaration est vraie sans transmettre aucune information supplémentaire.
 
diff --git a/src/content/translations/fr/history/index.md b/src/content/translations/fr/history/index.md
index 3fa164488df..69078789345 100644
--- a/src/content/translations/fr/history/index.md
+++ b/src/content/translations/fr/history/index.md
@@ -7,7 +7,7 @@ sidebarDepth: 1
 
 # Historique d'Ethereum {#the-history-of-ethereum}
 
-Chronologie de toutes les avancées, fourches et mises à jour majeures de la blockchain Ethereum.
+Chronologie de tous les jalons, fourches et mises à jour majeures de la blockchain Ethereum.
 
 <ExpandableCard title="En quoi consistent les fourches ?" contentPreview="Changes to the rules of the Ethereum protocol which often include planned technical upgrades.">
 
@@ -23,15 +23,35 @@ Vous cherchez de prochaines mises à jour de protocole ? [En savoir plus sur les
 
 <Divider />
 
+## 2022 {#2022}
+
+### Gray Glacier {#gray-glacier}
+
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Jun-30-2022 10:54:04 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de bloc : <a href="https://etherscan.io/block/15050000">15 050 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 1 069 $ USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20220630094629/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+
+#### Résumé {#gray-glacier-summary}
+
+La mise à niveau Gray Glacier a retardé le déclenchement de la [bombe de difficulté](/glossary/#difficulty-bomb) de trois mois. Il s'agit de la seule modification apportée par cette mise à niveau. En essence, elle est donc très semblable aux mises à niveau [Arrow Glacier](#arrow-glacier) et [Muir Glacier](#muir-glacier). Des changements similaires avaient également été effectués lors des mises à niveau [Byzantium](#byzantium), [Constantinople](#constantinople) et [London](#london).
+
+- [Blog de l'Ethereum Foundation - Annonce de la mise à niveau Gray Glacier](https://blog.ethereum.org/2022/06/16/gray-glacier-announcement/)
+
+<ExpandableCard title="Les EIP de Gray Glacier" contentPreview="Official improvements included in this upgrade.">
+
+- [EIP-5133](https://eips.ethereum.org/EIPS/eip-5133) – _Reporte la bombe de difficulté jusqu'en septembre 2022_
+
+</ExpandableCard>
+
+<Divider />
+
 ## 2021 {#2021}
 
 ### Arrow Glacier {#arrow-glacier}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>9 déc. 2021 07:55:23 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de bloc : <a href="https://etherscan.io/block/13773000">13 773 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 4 111 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211207064430/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Dec-09-2021 07:55:23 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de bloc : <a href="https://etherscan.io/block/13773000">13 773 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 4 111 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211207064430/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#arrow-glacier-summary}
 
-La mise à niveau Arrow Glacier a retardé le déclenchement de la [bombe de difficulté](/glossary/#difficulty-bomb) de plusieurs mois. Il s'agit de la seule modification apportée par cette mise à niveau. En essence, elle est donc très semblable à la mise à niveau [Muir Glacier](#muir-glacier). Des changements similaires avaient également été effectués lors des mises à niveau [Byzantium](#byzantium), [Constantinople](#constantinople) et [London](#london).
+La mise à niveau Arrow Glacier a retardé le déclenchement de la [bombe de difficulté](/glossary/#difficulty-bomb) de plusieurs mois. Il s'agit de la seule modification apportée par cette mise à niveau. En essence, elle est donc très semblable à la mise à jour [Muir Glacier](#muir-glacier). Des changements similaires avaient également été effectués lors des mises à niveau [Byzantium](#byzantium), [Constantinople](#constantinople) et [London](#london).
 
 - [Blog de l'Ethereum Foundation - Annonce de la mise à niveau Arrow Glacier](https://blog.ethereum.org/2021/11/10/arrow-glacier-announcement/)
 - [Ethereum Cat Herders - Mise à niveau Ethereum Arrow Glacier](https://medium.com/ethereum-cat-herders/ethereum-arrow-glacier-upgrade-e8d20fa4c002)
@@ -42,25 +62,21 @@ La mise à niveau Arrow Glacier a retardé le déclenchement de la [bombe de dif
 
 </ExpandableCard>
 
-#### <Emoji text=":police_car_light:" size={1} mr="0.5rem" />Opérateurs de nœud {#arrow-glacier-node-operators}
-
-En raison des variations de durée de production des blocs, veillez à mettre à niveau votre logiciel client en installant la version la plus récente avant le 5 décembre 2021. Cette étape permettra d'éviter que votre client reste synchronisé avec l'ancienne chaîne une fois la nouvelle fourche créée, ce qui vous empêcherait de transférer des fonds ou de vérifier correctement les transactions.
-
 ---
 
 ### Altair {#altair}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>27 oct. 2021 10:56:23 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de période : 74 240<br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 4 024 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211026174951/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Oct-27-2021 10:56:23 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de période : 74,240<br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 4 024 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211026174951/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#altair-summary}
 
-La mise à niveau Altair était la première mise à niveau répertoriée pour la [chaîne phare](/upgrades/beacon-chain). La prise en charge des « comités de synchronisation » a été ajoutée, autorisant d'une part les clients légers et augmentant d'autre part les pénalités d'inactivité et de délestage des validateurs jusqu'au montant total engagé.
+La mise à niveau Altair était la première mise à niveau répertoriée pour la [chaîne phare](/upgrades/beacon-chain). La prise en charge des « comités de synchronisation » a été ajoutée, autorisant d'une part les clients légers et apportant d'autre part l'inactivité du validateur ainsi que la réduction des pénalités jusqu'à leurs pleines valeurs.
 
 - [Lire les informations de mise à niveau Altair](https://github.com/ethereum/consensus-specs/tree/dev/specs/altair)
 
-#### <Emoji text=":tada:" size={1} mr="0.5rem" />Anecdote ! {#altair-fun-fact}
+#### <emoji text=":tada:" size={1} mr="0.5rem" />Anecdote ! {#altair-fun-fact}
 
-Altair a été la première mise à niveau majeure du réseau dont la date de lancement était exacte. Toutes les mises à jour antérieures étaient basées sur un numéro de bloc déclaré sur la chaîne de preuve de travail dans laquelle les temps de bloc varient. La chaîne phare ne nécessite pas de résoudre de preuve de travail, mais fonctionne sur la base d'un système de périodes composées de 32 créneaux de 12 secondes chacun durant lesquels les validateurs peuvent proposer des blocs. C'est pourquoi nous savions exactement quand nous atteindrions l'époque 74 240 et la date de sortie d'Altair !
+Altair a été la première mise à niveau majeure d'un réseau dont la date de déploiement était exacte. Toutes les mises à niveau antérieures étaient basées sur un numéro de bloc déclaré sur la chaîne de preuve de travail dans laquelle les temps de bloc varient. La chaîne phare ne nécessite pas de résolution de preuve de travail mais fonctionne sur la base d'un système d'époques composé de 32 « créneaux » de 12 secondes durant lesquels les validateurs peuvent proposer des blocs. C'est pourquoi nous savions exactement quand nous atteindrions l'époque 74 240 et la date de sortie d'Altaïr !
 
 - [Glossaire Beaconcha.in - Créneaux](https://kb.beaconcha.in/glossary#slots)
 
@@ -68,13 +84,13 @@ Altair a été la première mise à niveau majeure du réseau dont la date de la
 
 ### London {#london}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>5 août 2021 12:33:42 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/12965000">12 965 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 2 621 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210805124609/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Aug-05-2021 12:33:42 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/12 965 000">12,965,000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 2 621 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210805124609/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#london-summary}
 
-La mise à niveau London a introduit l'[EIP 1559](https://eips.ethereum.org/EIPS/eip-1559), qui a réformé le marché des frais de transaction, ainsi que des changements dans la façon dont les remboursements de gaz sont gérés et le calendrier du [Ice Age](/glossary/#ice-age).
+La mise à niveau London a introduit [EIP-1559](https://eips.ethereum.org/EIPS/eip-1559), qui a réformé le marché des frais de transaction, ainsi que les changements dans la façon dont les remboursements de gaz sont gérés et le calendrier [Ice Age](/glossary/#ice-age).
 
-- [Vous êtes un développeur de dApp ? Assurez-vous de mettre à niveau vos bibliothèques et vos outils.](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/london-ecosystem-readiness.md)
+- [Êtes-vous un développeur de dApp ? Assurez-vous de mettre à niveau vos bibliothèques et vos outils.](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/london-ecosystem-readiness.md)
 - [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2021/07/15/london-mainnet-announcement/)
 - [Lire l'explication du site Ethereum Cat Herders](https://medium.com/ethereum-cat-herders/london-upgrade-overview-8eccb0041b41)
 
@@ -82,7 +98,7 @@ La mise à niveau London a introduit l'[EIP 1559](https://eips.ethereum.org/EIP
 
 - [EIP-1559](https://eips.ethereum.org/EIPS/eip-1559) – _Améliore le marché des frais de transaction_
 - [EIP-3198](https://eips.ethereum.org/EIPS/eip-3198) – _Retourne le « BASEFEE » depuis un bloc_
-- [EIP-3529](https://eips.ethereum.org/EIPS/eip-3529) - _Diminue les remboursements de gaz pour les opérations EVM _
+- [EIP-3529](https://eips.ethereum.org/EIPS/eip-3529) - _Diminue les remboursements de gaz pour les opérations EVM_
 - [EIP-3541](https://eips.ethereum.org/EIPS/eip-3541) - _Empêche le déploiement de contrats commençant par « 0xEF »_
 - [EIP-3554](https://eips.ethereum.org/EIPS/eip-3554) - _Reporte le Ice Age jusqu'en décembre 2021_
 
@@ -92,11 +108,11 @@ La mise à niveau London a introduit l'[EIP 1559](https://eips.ethereum.org/EIP
 
 ### Berlin {#berlin}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>15 avril 2021 10:07:03 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/12244000">12 244 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 2 454 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210415093618/https://ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>15-avril-2021 10:07:03 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/12244000">12 244 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 2 454 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210415093618/https://ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#berlin-summary}
 
-La mise à niveau Berlin a optimisé le coût en gaz pour certaines actions EVM et augmenté la prise en charge de plusieurs types de transactions.
+La mise à niveau de Berlin a optimisé le coût du gaz pour certaines actions EVM et augmente la prise en charge de plusieurs types de transactions.
 
 - [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2021/03/08/ethereum-berlin-upgrade-announcement/)
 - [Lire l'explication du site Ethereum Cat Herders](https://medium.com/ethereum-cat-herders/the-berlin-upgrade-overview-2f7ad710eb80)
@@ -116,7 +132,7 @@ La mise à niveau Berlin a optimisé le coût en gaz pour certaines actions EVM
 
 ### Origine de la chaîne phare {#beacon-chain-genesis}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>1er déc. 2020 12:00:35 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc sur la chaîne phare : <a href="https://beaconscan.com/slot/1">1</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 586,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201207184633/https://www.ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>01-Déc-2020 12:00:35 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc sur la chaîne phare : <a href="https://beaconscan.com/slot/1">1</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 586,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201207184633/https://www.ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#beacon-chain-genesis-summary}
 
@@ -132,7 +148,7 @@ La [chaîne phare](/upgrades/beacon-chain/) avait besoin de 16 384 dépôts de
 
 ### Contrat de dépôt de mise en jeu déployé {#staking-deposit-contract}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14 oct. 2020 09:22:52 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/11052984">11 052 984</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 379,04 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201104235727/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14-oct-2020 09:22:52 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/11052984">11 052 984</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 379,04 USD <br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201104235727/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#deposit-contract-summary}
 
@@ -148,18 +164,18 @@ Le contrat de dépôt de mise en jeu a introduit la [mise en jeu](/glossary/#sta
 
 ### Muir Glacier {#muir-glacier}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>2 janv. 2020 08:30:49 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/9200000">9200000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 127,18 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20200103093618/https://ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>02-janv-2020 08:30:49 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/9200000">9200000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 127,18 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20200103093618/https://ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#muir-glacier-summary}
 
-La fourche Muir Glacier a entraîné un report de la [bombe de difficulté](/glossary/#difficulty-bomb). L'augmentation de la difficulté des blocs du mécanisme de consensus de [preuve de travail](/developers/docs/consensus-mechanisms/pow/) menaçait de dégrader l'utilisation d'Ethereum en allongeant les temps d'attente pour l'envoi de transactions et l'utilisation des DApps.
+La fourche Muir Glacier a généré un retard de la [bombe de difficulté](/glossary/#difficulty-bomb). L'augmentation de la difficulté des blocs du mécanisme de consensus de [preuve de travail](/developers/docs/consensus-mechanisms/pow/) menaçait de dégrader l'utilisation d'Ethereum en allongeant les temps d'attente pour l'envoi de transactions et l'utilisation des DApps.
 
 - [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2019/12/23/ethereum-muir-glacier-upgrade-announcement/)
 - [Lire l'explication du site Ethereum Cat Herders](https://medium.com/ethereum-cat-herders/ethereum-muir-glacier-upgrade-89b8cea5a210)
 
-<ExpandableCard title="Les EIP de Muir Glacier" contentPreview="Official improvements included in this fork.">
+<ExpandableCard title="EIP Muir Glacier" contentPreview="Official improvements included in this fork.">
 
-- [EIP-2384](https://eips.ethereum.org/EIPS/eip-2384) - _Report de la bombe de difficulté de 4 000 000 autres blocs, ou environ 611 jours._
+- [EIP-2384](https://eips.ethereum.org/EIPS/eip-2384) - _Retard de la bombe de difficulté pour 4 000 000 autres blocs, ou ~611 jours_
 
 </ExpandableCard>
 
@@ -169,13 +185,13 @@ La fourche Muir Glacier a entraîné un report de la [bombe de difficulté](/glo
 
 ### Istanbul {#istanbul}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>8 déc. 2019 12:25:09 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/9069000">9069000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 151,06 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20191216101254if*/https://ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>08-déc-2019 12:25:09 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/9069000">9 069 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 151,06 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20191216101254if*/https://ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#istanbul-summary}
 
 La fourche Istanbul a :
 
-- optimisé le coût de [carburant](/glossary/#gas) de certaines actions dans l'[EVM](/developers/docs/ethereum-stack/#ethereum-virtual-machine) ;
+- optimisé le coût de [gaz](/glossary/#gas) de certaines actions dans l'[EVM](/developers/docs/ethereum-stack/#ethereum-virtual-machine) ;
 - amélioré la résilience face aux attaques par déni de service ;
 - rendu plus performantes les solutions de [mise à l'échelle de la couche 2](/developers/docs/scaling/#layer-2-scaling) basées sur les SNARK et les STARK ;
 - permis à Ethereum et Zcash d'interagir ;
@@ -183,13 +199,13 @@ La fourche Istanbul a :
 
 [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2019/11/20/ethereum-istanbul-upgrade-announcement/)
 
-<ExpandableCard title="Les EIP d'Istanbul" contentPreview="Official improvements included in this fork.">
+<ExpandableCard title="EIP Istanbul" contentPreview="Official improvements included in this fork.">
 
 - [EIP-152](https://eips.ethereum.org/EIPS/eip-152) – _Permet à Ethereum de travailler avec des monnaies préservant la confidentialité, comme Zcash._
-- [EIP-1108](https://eips.ethereum.org/EIPS/eip-1108) – _Cryptographie moins onéreuse pour améliorer le coût du [gaz](/glossary/#gas)._
+- [EIP-1108](https://eips.ethereum.org/EIPS/eip-1108) – _Cryptographie moins onéreuse pour améliorer le coût du [gas](/glossary/#gas)._
 - [EIP-1344](https://eips.ethereum.org/EIPS/eip-1344) – _Protège Ethereum contre les attaques par rejeu en ajoutant le code d'opération [opcode] « CHAINID » (/developers/docs/ethereum-stack/#ethereum-virtual-machine)._
 - [EIP-1884](https://eips.ethereum.org/EIPS/eip-1884) – _Optimisation du prix du gaz des codes d'opération basés sur la consommation._
-- [EIP-2028](https://eips.ethereum.org/EIPS/eip-2028) – _Réduit le coût des données d'appel afin de pouvoir augmenter la taille des données dans les blocs. Utile pour [l'évolutivité de la couche 2](/developers/docs/scaling/layer-2-rollups/)._
+- [EIP-2028](https://eips.ethereum.org/EIPS/eip-2028) – _Réduit le coût des données d'appel afin de pouvoir augmenter la taille des données dans les blocs. Utile pour [l'évolutivité de la couche 2](/developers/docs/scaling/layer-2-scaling)._
 - [EIP-2200](https://eips.ethereum.org/EIPS/eip-2200) – _Autres altérations du prix du gaz des codes d'opération._
 
 </ExpandableCard>
@@ -198,19 +214,19 @@ La fourche Istanbul a :
 
 ### Constantinople {#constantinople}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>28 févr. 2019 07:52:04 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/7280000">7280000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 136,29 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20190415163751/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>28-fév-2019 07:52:04 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/7280000">7 280 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 136,29 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20190415163751/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#constantinople-summary}
 
 La fourche Constantinople a :
 
 - protégé la blockchain d'un blocage avant l'implémentation de la [preuve d'enjeu](#beacon-chain-genesis) ;
-- optimisé le coût en [gaz](/glossary/#gas) de certaines actions dans l'[EVM](/developers/docs/ethereum-stack/#ethereum-virtual-machine) ;
+- optimisé le coût de [gaz](/glossary/#gas) de certaines actions dans l'[EVM](/developers/docs/ethereum-stack/#ethereum-virtual-machine) ;
 - ajouté de la possibilité d'interagir avec des adresses non encore créées.
 
 [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2019/02/22/ethereum-constantinople-st-petersburg-upgrade-announcement/)
 
-<ExpandableCard title="Les EIP de Constantinople" contentPreview="Official improvements included in this fork.">
+<ExpandableCard title="EIP Constantinople" contentPreview="Official improvements included in this fork.">
 
 - [EIP-145](https://eips.ethereum.org/EIPS/eip-145) - _Optimise le coût de certaines actions sur la chaîne._
 - [EIP-1014](https://eips.ethereum.org/EIPS/eip-1014) - _Vous permet d'interagir avec des adresses non encore créées._
@@ -225,7 +241,7 @@ La fourche Constantinople a :
 
 ### Byzantium {#byzantium}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>16 oct. 2017 05:22:11 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/4370000">4 370 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 334,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20171017201143/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>16-oct-2017 05:22:11 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/4370000">4 370 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 334,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20171017201143/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#byzantium-summary}
 
@@ -238,7 +254,7 @@ La fourche Byzantium a :
 
 [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2017/10/12/byzantium-hf-announcement/)
 
-<ExpandableCard title="Les EIP de Byzantium" contentPreview="Official improvements included in this fork.">
+<ExpandableCard title="EIP Byzantium" contentPreview="Official improvements included in this fork.">
 
 - [EIP-140](https://eips.ethereum.org/EIPS/eip-140) – _Ajoute le code d'opération « REVERT »._
 - [EIP-658](https://eips.ethereum.org/EIPS/eip-658) – _Champ de statut ajouté aux reçus de transaction pour indiquer le succès ou l'échec._
@@ -258,19 +274,19 @@ La fourche Byzantium a :
 
 ### Spurious Dragon {#spurious-dragon}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>22 nov. 2016 04:15:44 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/2675000">2 675 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 9,84 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161127154654/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>22-nov-2016 04:15:44 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/2675000">2 675 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 9,84 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161127154654/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#spurious-dragon-summary}
 
 La fourche Spurious Dragon est la deuxième réponse aux attaques par déni de service (DoS) sur le réseau (septembre/octobre 2016). Elle comprend les opérations suivantes :
 
-- Réglage de la tarification du code d'opération pour éviter de futures attaques sur le réseau
-- « Dégonflage » de l'état de la blockchain
-- Ajout de la protection contre les attaques par rejeu
+- Réglage de la tarification du code d'opération pour éviter de futures attaques sur le réseau ;
+- « Dégonflage » de l'état de la blockchain ;
+- Ajout de la protection contre les attaques par rejeu.
 
 [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2016/11/18/hard-fork-no-4-spurious-dragon/)
 
-<ExpandableCard title="Les EIP de Spurious Dragon" contentPreview="Official improvements included in this fork.">
+<ExpandableCard title="EIP Spurious Dragon" contentPreview="Official improvements included in this fork.">
 
 - [EIP-155](https://eips.ethereum.org/EIPS/eip-155) - _Empêche les transactions d'une chaîne Ethereum d'être rediffusées sur une chaîne alternative, par exemple une transaction du réseau de test rejouée sur la chaîne principale Ethereum._
 - [EIP-160](https://eips.ethereum.org/EIPS/eip-160) - _Règle les prix du code d'opération « EXP ». Rend plus difficile le ralentissement du réseau via des opérations de contrat coûteuses sur le plan du calcul._
@@ -283,19 +299,19 @@ La fourche Spurious Dragon est la deuxième réponse aux attaques par déni de s
 
 ### Tangerine Whistle {#tangerine-whistle}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>18 oct. 2016 01:19:31 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/2463000">2 463 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161030043727/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>18-oct-2016 01:19:31 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/2463000">2 463 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161030043727/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#tangerine-whistle-summary}
 
-La fourche Tangerine Whistle est la première réponse aux attaques par déni de service (DoS) sur le réseau (septembre/octobre 2016). Elle comprend les opérations suivantes :
+La fourche Tangerine Whistle a été la deuxième réponse aux attaques par déni de service (DoS) sur le réseau (septembre/octobre 2016). Elle comprend les opérations suivantes :
 
-- Résolution des problèmes urgents d'intégrité du réseau concernant les codes d'opération sous-évalués
+- Résolution des problèmes urgents d'intégrité du réseau concernant les codes d'opération sous-évalués.
 
 [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2016/10/18/faq-upcoming-ethereum-hard-fork/)
 
-<ExpandableCard title="Les EIP de Tangerine Whistle" contentPreview="Official improvements included in this fork.">
+<ExpandableCard title="EIP Tangerine Whistle" contentPreview="Official improvements included in this fork.">
 
-- [EIP-150](https://eips.ethereum.org/EIPS/eip-150) - _Augmente le coût en gaz des codes d'opération qui peuvent être utilisés dans les attaques par spam._
+- [EIP-150](https://eips.ethereum.org/EIPS/eip-150) - _Augmente le coût en carburant des codes d'opération qui peuvent être utilisés dans les attaques par spam._
 - [EIP-158](https://eips.ethereum.org/EIPS/eip-158) - _Réduit la taille de l'état en supprimant un grand nombre de comptes vides mis dans l'état à très bas prix en raison de failles dans les versions précédentes du protocole Ethereum._
 
 </ExpandableCard>
@@ -304,7 +320,7 @@ La fourche Tangerine Whistle est la première réponse aux attaques par déni de
 
 ### Fourche DAO {#dao-fork}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>20 juill. 2016 01:20:40 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/1920000">1 920 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,54 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160803215306/https://ethereum.org/">ethereum.org on waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>20-juil-2016 01:20:40 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/1920000">1 920 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,54 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160803215306/https://ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#dao-fork-summary}
 
@@ -320,19 +336,19 @@ Certains mineurs ont refusé la fourche car l'incident DAO ne résultait pas d'u
 
 ### Homestead {#homestead}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14 mars 2016 06:49:53 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/1150000">1 150 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160313203843/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14-mars-2016 06:49:53 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/1150000">1 150 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160313203843/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#homestead-summary}
 
-La fourche Homestead était tournée vers l'avenir. Elle comprenait plusieurs changements de protocole et un changement réseau qui a permis à Ethereum de faire d'autres mises à niveau du réseau.
+La fourche Homestead tournée vers l'avenir. Elle comprenait plusieurs changements de protocole et un changement de réseau qui a permis à Ethereum de faire d'autres mises à niveau du réseau.
 
 [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2016/02/29/homestead-release/)
 
-<ExpandableCard title="Les EIP d'Homestead" contentPreview="Official improvements included in this fork.">
+<ExpandableCard title="EIP Homestead" contentPreview="Official improvements included in this fork.">
 
 - [EIP-2](https://eips.ethereum.org/EIPS/eip-2) - _Apporte des modifications au processus de création de contrats._
-- [EIP-7](https://eips.ethereum.org/EIPS/eip-7) - _Ajoute le nouveau code d'opération « DELEGATECALL »._
-- [EIP-8](https://eips.ethereum.org/EIPS/eip-8)- _Introduit des exigences de compatibilité devp2p._
+- [EIP-7](https://eips.ethereum.org/EIPS/eip-7) - _Ajoute le nouveau code d'opération "DELEGATECALL"._
+- [EIP-8](https://eips.ethereum.org/EIPS/eip-8) - _Introduit des exigences de compatibilité devp2p._
 
 </ExpandableCard>
 
@@ -342,23 +358,24 @@ La fourche Homestead était tournée vers l'avenir. Elle comprenait plusieurs ch
 
 ### Frontier Thawing {#frontier-thawing}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>7 sept. 2015 09:33:09 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/200000">200 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 1,24 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150912193811/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>7-sep-2015 09:33:09 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/200000">200 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 1,24 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150912193811/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#frontier-thawing-summary}
 
-La fourche Frontier Thawing a levé la [limite de gaz](/glossary/#gas) de 5 000 par [bloc](/glossary/#block) et défini le prix du gaz par défaut à 51 [Gwei](/glossary/#gwei). Cela a permis de réaliser des transactions. Les transactions nécessitent 21 000 unités de gaz.
+La fourche Frontier Thawing a levé la [limite de gaz](/glossary/#gas) de 5 000 par [bloc](/glossary/#block) et défini le prix du gaz par défaut à 51 [gwei](/glossary/#gwei). Cela a permis de réaliser des transactions. Les transactions nécessitent 21 000 unités de gaz. La [bombe de difficulté](/glossary/#difficulty-bomb) a été introduite pour assurer une future fourche dure vers la [preuve d'enjeu](/glossary/#pos).
 
-[Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2015/08/04/the-thawing-frontier/)
+- [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2015/08/04/the-thawing-frontier/)
+- [Lire la mise à jour du protocole Ethereum 1](https://blog.ethereum.org/2015/08/04/ethereum-protocol-update-1/)
 
 ---
 
 ### Frontier {#frontier}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>30 juill. 2015 03:26:13 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/0">0</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : N/A<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150802035735/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>30-juil-2015 03:26:13 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/0">0</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : N/A<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150802035735/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#frontier-summary}
 
-Frontier était une implémentation vivante, mais sans structure, du projet Ethereum. Elle a fait suite à la phase de tests réussie Olympic. Elle était destinée aux utilisateurs techniques, en particulier aux développeurs. Les [blocs](/glossary/#block) avaient une limite de [gaz](/glossary/#gas) de 5 000. La période « Thawing » a permis aux mineurs de démarrer leurs opérations et aux premiers adoptants d'installer leurs clients sans avoir à « se précipiter ».
+Frontier était une implémentation vivante, mais sans structure, du projet Ethereum. Elle fait suite à la phase de tests réussie Olympic. Elle était destinée aux utilisateurs techniques, en particulier aux développeurs. Les [blocs](/glossary/#block) avaient une limite de [gaz](/glossary/#gas) de 5 000. La période « Thawing » a permis aux mineurs de démarrer leurs opérations et aux premiers adoptants d’installer leurs clients sans avoir à « se précipiter ».
 
 [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2015/07/22/frontier-is-coming-what-to-expect-and-how-to-prepare/)
 
@@ -368,9 +385,9 @@ Frontier était une implémentation vivante, mais sans structure, du projet Ethe
 
 ### Vente d'ETH {#ether-sale}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Du 2 juillet au 22 septembre 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140804235628/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Du 02 au 22 septembre 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140804235628/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
-L'ETH était officiellement en vente pour 42 jours. Il était possible d'en acheter avec des BTC.
+L'ETH est officiellement en vente pour 42 jours. Il était possible d'en acheter avec des BTC.
 
 [Lire l'annonce de l'Ethereum Foundation](https://blog.ethereum.org/2014/07/22/launching-the-ether-sale/)
 
@@ -378,9 +395,9 @@ L'ETH était officiellement en vente pour 42 jours. Il était possible d'en ache
 
 ### Publication du Livre jaune {#yellowpaper}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 1er avril 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140509173418/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 1er avril 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140509173418/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
-Le Livre jaune, rédigé par le Dr Gavin Wood, est une définition technique du protocole Ethereum.
+Le Livre jaune, rédigé par le Dr. Gavin Wood, est une définition technique du protocole Ethereum.
 
 [Voir le Livre jaune](https://github.com/ethereum/yellowpaper)
 
@@ -390,7 +407,7 @@ Le Livre jaune, rédigé par le Dr Gavin Wood, est une définition technique du
 
 ### Publication du Livre blanc {#whitepaper}
 
-<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 27 novembre 2013<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140208030136/http://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 27 novembre 2013<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140208030136/http://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 Document d'introduction publié en 2013 par Vitalik Buterin, le fondateur d'Ethereum, précédant le lancement du projet en 2015.
 
diff --git a/src/content/translations/fr/upgrades/beacon-chain/index.md b/src/content/translations/fr/upgrades/beacon-chain/index.md
index 4c6f677e589..402077b343e 100644
--- a/src/content/translations/fr/upgrades/beacon-chain/index.md
+++ b/src/content/translations/fr/upgrades/beacon-chain/index.md
@@ -4,14 +4,13 @@ description: En savoir plus sur la chaîne phare - la mise à niveau qui a intro
 lang: fr
 template: upgrade
 image: ../../../../../assets/upgrades/core.png
-summaryPoint1: La chaîne phare ne change rien à la manière actuelle d'utiliser Ethereum.
-summaryPoint2: Elle a introduit la preuve d'enjeu dans l'écosystème Ethereum.
-summaryPoint3: Elle a été fusionnée avec la chaîne originale de preuve de travail Ethereum en 2022.
-summaryPoint4: Le protocole de logique de consensus et de bloc des commérages introduits par la chaîne phare sécurisent désormais Ethereum.
+summaryPoint1: La Chaîne phare a introduit la preuve d'enjeu dans l'écosystème Ethereum.
+summaryPoint2: Elle a été fusionnée avec la chaîne originale de preuve de travail Ethereum en septembre 2022.
+summaryPoint3: La Chaîne phare a introduit la logique de consensus et le protocole de commutation de bloc qui sécurise désormais Ethereum.
 ---
 
 <UpgradeStatus isShipped dateKey="page-upgrades-beacon-date">
-  La Chaîne phare a été mise en service le 1er décembre 2020. À l'époque, il s'agissait d'une chaîne séparée du réseau principal Ethereum. Elle utilisait la preuve d'enjeu sans gérer de transactions. La Chaîne phare a été fusionnée avec le réseau principal original Ethereum en 2022 pour reprendre la logique de consensus et la propagation de blocs pour Ethereum. Depuis la fusion, il n'y a eu qu'une seule chaîne Ethereum.
+  La Chaîne phare a été présentée le 1er décembre 2020 et a formalisé la preuve d'enjeu comme mécanisme de consensus d'Ethereum avec La Fusion du 15 septembre 2022.
 </UpgradeStatus>
 
 ## Qu'est-ce que fut la Chaîne phare ? {#what-is-the-beacon-chain}
@@ -72,4 +71,5 @@ La fragmentation ne peut s'ajouter en toute sécurité dans l'écosystème Ether
 
 ## Complément d'information
 
-[En apprendre plus sur les futures mises à niveau d'Ethereum](/upgrades/vision) [En apprendre plus sur la preuve d'enjeu](/develoeprs/docs/consensus-mechanisms/pos)
+- [En savoir plus sur les futures mises à jour d'Ethereum](/upgrades/vision)
+- [En savoir plus sur la preuve d'enjeu](/developers/docs/consensus-mechanisms/pos)
diff --git a/src/content/translations/fr/upgrades/merge/index.md b/src/content/translations/fr/upgrades/merge/index.md
index 5cd87ba2529..83dd4b8f134 100644
--- a/src/content/translations/fr/upgrades/merge/index.md
+++ b/src/content/translations/fr/upgrades/merge/index.md
@@ -5,14 +5,18 @@ lang: fr
 template: upgrade
 image: ../../../../../assets/upgrades/merge.png
 summaryPoint1: Le réseau principal Ethereum utilise la preuve d'enjeu, mais cela n'a pas toujours été le cas.
-summaryPoint2: La transition du mécanisme original de preuve de travail à celui de la preuve d'enjeu s'appelle La Fusion.
-summaryPoint3: La Fusion fait référence au réseau principal original Ethereum qui fait désormais partie d'une chaîne de blocs distincte de preuve d'enjeu appelée la Chaîne phare et qui existe maintenant sous la forme d'une chaîne unique.
+summaryPoint2: La mise à niveau du mécanisme original de preuve de travail à celui de la preuve d'enjeu s'appelle La Fusion.
+summaryPoint3: La Fusion fait référence à la fusion du réseau principal original Ethereum avec une blockchain distincte de preuve d'enjeu appelée la Chaîne phare, qui existe maintenant sous la forme d'une chaîne unique.
 summaryPoint4: La Fusion a réduit la consommation d'énergie d'Ethereum de ~99,95 %.
 ---
 
+<UpgradeStatus dateKey="page-upgrades-beacon-date">
+  La Fusion a été réalisée le 15 septembre 2022. Cette étape a permis à Ethereum de passer à un consensus de preuve d'enjeu, de rendre officiellement obsolète la preuve de travail et de réduire sa consommation d'énergie d'environ 99,95 %.
+</UpgradeStatus>
+
 ## Qu'est-ce que La Fusion ? {#what-is-the-merge}
 
-La Fusion est la réunion de la couche d'exécution originale d'Ethereum (le réseau principal qui existe depuis [genesis](/history/#frontier)) avec sa nouvelle couche de consensus de preuve d'enjeu ; la Chaîne phare. Cela a permis d'éliminer le besoin de minage, gros consommateur énergétique et de sécuriser le réseau via la mise en jeu d'ETH. Ce fut une étape vraiment passionnante dans la réalisation de la vision Ethereum - plus d'évolutivité, de sécurité et de durabilité.
+La Fusion est la réunion de la couche d'exécution originale d'Ethereum (le réseau principal qui existe depuis [genesis](/history/#frontier)) avec sa nouvelle couche de consensus de preuve d'enjeu ; la Chaîne phare. Elle a également permis d'éliminer la nécessité d'un minage gourmand en énergie et de sécuriser le réseau via la mise en jeu d'ETH. Ce fut une étape vraiment passionnante dans la réalisation de la vision Ethereum - plus d'évolutivité, de sécurité et de durabilité.
 
 <MergeInfographic />
 
@@ -42,7 +46,7 @@ Cette transition vers la preuve d'enjeu a modifié la façon dont l'éther est 
 
 _Ceci nécessite d'être répété _: en tant qu'utilisateur ou détenteur d'ETH ou de tout autre actif numérique sur Ethereum, ainsi que pour les stakers qui n'opèrent pas sur les nœuds, **vous n'avez pas besoin de faire quoi que ce soit avec vos fonds ou votre portefeuille pour vous rendre compte de La Fusion.**. L'ETH n'est que l'ETH. Il n'existe rien de tel que « les anciens ETH »/« les nouveaux ETH » ou « ETH1 »/« ETH2 » et les portefeuilles fonctionnent exactement de la même manière après La Fusion qu'auparavant — les personnes vous disant l'inverse sont probablement des escrocs.
 
-Malgré le passage de la preuve de travail vers la preuve d'enjeu, tout l'historique d'Ethereum depuis sa genèse reste intact et inaltéré depuis ladite transition. Tous les fonds détenus dans votre portefeuille avant La Fusion sont toujours accessibles après La Fusion. **Aucune action n'est requise pour mettre à jour de votre côté.**
+Malgré le passage de la preuve de travail vers la preuve d'enjeu, tout l'historique d'Ethereum depuis sa genèse reste intact et inaltéré depuis ladite transition. Tous les fonds détenus dans votre portefeuille avant La Fusion restent accessibles après La Fusion. **Aucune action n'est requise pour mettre à jour de votre côté.**
 
 [En savoir plus sur la sécurité et Ethereum](/security/#eth2-token-scam)
 
diff --git a/src/content/translations/fr/upgrades/sharding/index.md b/src/content/translations/fr/upgrades/sharding/index.md
index c10982c5a34..e1d6d6d7778 100644
--- a/src/content/translations/fr/upgrades/sharding/index.md
+++ b/src/content/translations/fr/upgrades/sharding/index.md
@@ -5,9 +5,9 @@ lang: fr
 template: upgrade
 image: ../../../../../assets/upgrades/newrings.png
 summaryPoint1: La fragmentation est une mise à niveau en plusieurs phases visant à améliorer l'évolutivité et la capacité d'Ethereum.
-summaryPoint2: La fragmentation assure la distribution sécurisée comme exigée en matière de stockage des données, permettant la création de rollups encore moins chers et ainsi de faciliter le fonctionnement des nœuds.
-summaryPoint3: Elles permettent aux solutions de couche 2 de faibles frais de transaction tout en profitant de la sécurité d'Ethereum.
-summaryPoint4: Cette mise à niveau a pris une place plus importante depuis qu'Ethereum est passé à la preuve d'enjeu.
+summaryPoint2: La fragmentation assure une distribution sécurisée des besoins en matière de stockage des données, rendant les rollups encore plus économiques et les nœuds plus faciles à exploiter.
+summaryPoint3: Elles permettent aux solutions de couche 2 de proposer de faibles frais de transaction tout en profitant de la sécurité d'Ethereum.
+summaryPoint4: Cette mise à niveau est devenue plus importante depuis qu'Ethereum est passé à la preuve d'enjeu.
 ---
 
 <UpgradeStatus dateKey="page-upgrades-shards-date">
diff --git a/src/intl/fr/page-about.json b/src/intl/fr/page-about.json
index dbaf993b6be..660d2235d7c 100644
--- a/src/intl/fr/page-about.json
+++ b/src/intl/fr/page-about.json
@@ -17,7 +17,7 @@
   "page-about-p-1": "Depuis le lancement d'ethereum.org, nous nous efforçons d'être transparents sur la façon dont nous fonctionnons. C'est l'une de nos valeurs fondamentales, car nous pensons que la transparence est essentielle au succès d'Ethereum.",
   "page-about-p-2": "Nous utilisons",
   "page-about-p-3": "comme principal outil de gestion de projet. Nous organisons nos tâches en 3 catégories :",
-  "page-about-p-4": "Nous faisons de notre mieux pour que la communauté soit informée du statut d'une tâche spécifique.",
+  "page-about-p-4": "  Nous faisons de notre mieux pour que la communauté soit informée du statut d'une tâche spécifique.",
   "page-about-p-5": "Les tâches en cours d'implémentation.",
   "page-about-p-6": "Les tâches que nous avons mises en file d'attente pour les implémenter plus tard.",
   "page-about-p-7": "Les tâches récemment terminées.",
diff --git a/src/intl/fr/page-assets.json b/src/intl/fr/page-assets.json
index 057395efdc4..2a3c9291299 100644
--- a/src/intl/fr/page-assets.json
+++ b/src/intl/fr/page-assets.json
@@ -25,10 +25,10 @@
   "page-assets-eth-logo-portrait-gray": "Logo ETH portrait (gris)",
   "page-assets-eth-logo-portrait-purple": "Logo ETH portrait (violet)",
   "page-assets-eth-logo-portrait-white": "Logo ETH portrait (blanc)",
-  "page-assets-eth-wordmark-gray": "Mot-symbole ETH (grise)",
+  "page-assets-eth-wordmark-gray": "Mot-symbole ETH (gris)",
   "page-assets-eth-wordmark-purple": "Mot-symbole ETH (violet)",
   "page-assets-eth-wordmark-white": "Mot-symbole ETH (blanc)",
-  "page-assets-ethereum-brand-assets": "Actifs de la marque Ethereum",
+  "page-assets-ethereum-brand-assets": "Actifs de la « marque » Ethereum",
   "page-assets-finance": "Finance",
   "page-assets-future": "Futur",
   "page-assets-h1": "actifs ethereum.org",
@@ -38,6 +38,7 @@
   "page-assets-illustrations": "Illustrations",
   "page-assets-impact": "Impact",
   "page-assets-infrastructure": "Infrastructure",
+  "page-assets-leslie-the-rhino": "Leslie le rhino",
   "page-assets-meta-desc": "Explorez et téléchargez les actifs, illustrations et médias des marques Ethereum et ethereum.org",
   "page-assets-meta-title": "Actifs de la marque Ethereum",
   "page-assets-mainnet": "Réseau principal",
diff --git a/src/intl/fr/page-upgrades-get-involved-bug-bounty.json b/src/intl/fr/page-upgrades-get-involved-bug-bounty.json
index fbef9785f80..0cf5a445efa 100644
--- a/src/intl/fr/page-upgrades-get-involved-bug-bounty.json
+++ b/src/intl/fr/page-upgrades-get-involved-bug-bounty.json
@@ -68,7 +68,7 @@
   "page-upgrades-bug-bounty-type-4": "Incohérences de calcul ou de paramètre",
   "page-upgrades-bug-bounty-types": "Types de bogues",
   "page-upgrades-bug-bounty-validity": "Dans le champ d'application",
-  "page-upgrades-bug-bounty-validity-desc": "Notre programme de traitement des bugs s'intéresse à tous les domaines : de la solidité des protocoles (comme le modèle de consensus de la blockchain, les relations entre les protocoles p2p, la preuve de travail, la preuve d'enjeu, etc.), comme à la conformité des protocoles/implémentations, ou encore la sécurité du réseau et l'intégrité du consensus. La sécurité classique des clients ainsi que la sécurité des cryptographies primitives font également partie du programme. En cas de doute, envoyez un e-mail à bounty@ethereum.org et demandez-nous.",
+  "page-upgrades-bug-bounty-validity-desc": "Notre programme de traitement des bogues s'intéresse à tous les domaines : de la solidité des protocoles (comme le modèle de consensus de la blockchain, les relations entre les protocoles p2p, la preuve de travail, la preuve d'enjeu, etc.), comme à la conformité des protocoles/implémentations, ou encore la sécurité du réseau et l'intégrité du consensus. La sécurité classique des clients ainsi que la sécurité des cryptographies primitives font également partie du programme. En cas de doute, envoyez un e-mail à bounty@ethereum.org et demandez-nous.",
   "page-upgrades-bug-bounty-card-critical": "Critique",
   "page-upgrades-bug-bounty-card-critical-risk": "Soumettre un bogue à risque critique",
   "page-upgrades-bug-bounty-card-h2": "Modéré",
@@ -97,6 +97,6 @@
   "page-upgrades-bug-bounty-card-subheader-2": "Exemple",
   "page-upgrades-bug-bounty-card-text": "Les attaquants peuvent parfois mettre un nœud dans un état qui l'amène à ne pas traiter une attestation sur cent faite par un validateur",
   "page-upgrades-bug-bounty-card-text-1": "L'attaquant peut mener avec succès des attaques éclairs sur des nœuds avec des identifiants de pairs commençant par 4 octets zéros",
-  "page-upgrades-bug-bounty-card-text-2": "Il existe un bogue dans le consensus entre 2 clients, mais c'est difficile ou presque impossible pour un attaquant de le déclencher.",
-  "page-upgrades-bug-bounty-card-text-3": "Il existe une exécution de code à distance pour un client majoritaire, et il est trivial pour un attaquant de déclencher la vulnérabilité."
+  "page-upgrades-bug-bounty-card-text-2": "L'attaquant peut partitionner avec succès de grandes parties du réseau, et il est trivial pour un attaquant de déclencher la vulnérabilité",
+  "page-upgrades-bug-bounty-card-text-3": "L'attaquant peut exécuter du code à distance pour un client majoritaire, et il est trivial pour un attaquant de déclencher la vulnérabilité"
 }
diff --git a/src/intl/fr/page-upgrades-index.json b/src/intl/fr/page-upgrades-index.json
index 583def50f63..3bf394c5f89 100644
--- a/src/intl/fr/page-upgrades-index.json
+++ b/src/intl/fr/page-upgrades-index.json
@@ -9,41 +9,51 @@
   "consensus-client-prysm-logo-alt": "Logo Prysm",
   "consensus-client-teku-logo-alt": "Logo Teku",
   "consensus-client-under-review": "Revue et audit en cours",
-  "page-upgrades-answer-1": "Considérez les changements apportés comme une série de mises à niveau destinées à améliorer l'Ethereum que nous utilisons aujourd'hui. Ces mises à jour comprennent la création d'une nouvelle chaîne appelée Beacon Chain (ou chaîne phare), qui servira bientôt de moteur de consensus pour l'ensemble du réseau.",
-  "page-upgrades-answer-2": "Bien que la Chaîne phare a débuté en tant que chaîne distincte, le réseau principal existant sera « fusionné » avec cette nouvelle couche de consensus de la preuve d'enjeu.",
-  "page-upgrades-answer-4": "En d'autres termes, le réseau Ethereum que nous utilisons aujourd'hui finira par posséder toutes les fonctionnalités que l'on souhaite avoir au sein d'Ethereum.",
-  "page-upgrade-article-title-two-point-oh": "Deux Point Oh : la chaîne phare",
-  "page-upgrade-article-title-beacon-chain-explainer": "Explicatifs que vous devez d'abord lire concernant la chaîne phare d'Ethereum 2.0",
-  "page-upgrade-article-title-sharding-consensus": "Consensus de fragmentation",
+  "page-upgrades-answer-1": "La Chaîne phare a été employée comme outil pour mettre à niveau le réseau principal Ethereum durant La Fusion.",
+  "page-upgrades-answer-2": "La Fusion représente la mise à niveau la plus importante de l'histoire d'Ethereum, en substituant la preuve de travail par une nouvelle couche de consensus basée sur la preuve d'enjeu.",
+  "page-upgrades-answer-4": "La Chaîne phare a été utilisée pour développer le consensus basé sur la preuve d'enjeu qu'Ethereum utilise aujourd'hui. Elle s'exécute en parallèle du réseau principal Ethereum afin de permettre aux développeurs d'observer le mécanisme de consensus de manière isolée avant de l'utiliser pour coordonner une activité réelle.",
+  "page-upgrade-article-author-ethmerge": "Ethmerge",
+  "page-upgrade-article-author-alchemy": "Alchemy",
+  "page-upgrade-article-author-consensys": "Consensys",
+  "page-upgrade-article-author-delphi-digital": "Delphi Digital",
   "page-upgrade-article-author-ethereum-foundation": "Ethereum Foundation",
   "page-upgrade-article-author-vitalik-buterin": "Vitalik Buterin",
   "page-upgrade-article-author-ethos-dev": "Ethos.dev",
-  "page-upgrade-article-author-delphi-digital": "Delphi Digital",
+  "page-upgrade-article-title-two-point-oh": "Deux Point Oh : la chaîne phare",
+  "page-upgrade-article-title-beacon-chain-explainer": "Explicatifs que vous devez d'abord lire concernant la chaîne phare d'Ethereum 2.0",
+  "page-upgrade-article-title-sharding-consensus": "Consensus de fragmentation",
   "page-upgrade-article-title-sharding-is-great": "Pourquoi la fragmentation est une bonne chose : démystification des propriétés technique",
   "page-upgrade-article-title-rollup-roadmap": "Une feuille de route axé sur le regroupement",
   "page-upgrade-article-title-hitchhikers-guide-to-ethereum": "Le Guide des randonneurs sur Ethereum",
+  "page-upgrade-article-title-ethmerge": "Ethmerge",
+  "page-upgrade-article-title-merge-is-coming": "La Fusion arrive",
+  "page-upgrade-article-title-state-of-the-merge": "L'état de La Fusion : mise à jour sur la fusion d'Ethereum vers la preuve d'enjeu en 2022",
+  "page-upgrade-article-title-ropsten-merge-testnet": "Annonce du réseau de test de fusion Ropsten",
+  "page-upgrade-article-title-execution-layer-specs": "Spécifications de la couche d'exécution",
+  "page-upgrade-article-title-consensus-layer-specs": "Spécifications de la couche de consensus",
+  "page-upgrade-article-title-engine-api-specs": "Spécifications de l'API moteur",
   "page-upgrades-beacon-chain-btn": "En savoir plus sur la chaîne phare",
-  "page-upgrades-beacon-chain-date": "La chaîne phare a été mise en service le 1er décembre 2020.",
-  "page-upgrades-beacon-chain-desc": "La Beacon Chain (chaîne phare) a apporté le staking à Ethereum, a posé les bases des futures mises à niveau, et coordonnera bientôt le nouveau système.",
+  "page-upgrades-beacon-chain-date": "La chaîne phare a été lancée le 1er décembre 2020",
+  "page-upgrades-beacon-chain-desc": "La chaîne phare a apporté la mise en jeu à Ethereum, et posé les bases des futures mises à niveau. Elle coordonne la nouvelle preuve d'enjeu d'Ethereum.",
   "page-upgrades-beacon-chain-estimate": "La chaîne phare est active",
   "page-upgrades-beacon-chain-title": "La chaîne phare",
   "page-upgrades-bug-bounty": "Voir le programme de primes au bogue",
   "page-upgrades-clients": "Découvrez les clients de consensus (précédemment appelés clients « d'Eth2 »)",
   "page-staking-deposit-contract-title": "Vérifiez l'adresse du contrat de dépôt",
   "page-upgrades-dive": "Plongez dans la vision",
-  "page-upgrades-dive-desc": "Comment allons-nous rendre Ethereum plus évolutif, plus sûr et plus durable ? Tout en gardant l'éthique de base de la décentralisation d'Ethereum.",
+  "page-upgrades-dive-desc": "De quelle manière rendons-nous Ethereum plus évolutif, plus sûr et plus durable (tout en gardant l'éthique fondamentale de décentralisation d'Ethereum) ?",
   "page-upgrades-docking": "La fusion",
-  "page-upgrades-merge-answer-1": "La Fusion est le moment où le réseau principal commencera à utiliser la chaîne phare pour le consensus, et où la preuve de travail sera désactivée, prochainement.",
+  "page-upgrades-merge-answer-1": "La Fusion a été réalisée lorsque le réseau principal a abandonné la preuve de travail au profit de la preuve d'enjeu le 15 septembre 2022.",
   "page-upgrades-merge-btn": "Plus d'informations sur la fusion",
-  "page-upgrades-merge-desc": "Le réseau principal Ethereum va bientôt « fusionner » avec la chaîne phare de preuve d'enjeu, ce qui marquera la fin de l'activité de minage à forte intensité énergétique.",
-  "page-upgrades-merge-estimate": "Estimation : 2022",
+  "page-upgrades-merge-desc": "Le réseau principal Ethereum a fusionné avec la chaîne phare de preuve d'enjeu, marquant ainsi la fin du minage à forte intensité énergétique.",
+  "page-upgrades-merge-estimate": "La Fusion est en ligne",
   "page-upgrades-merge-mainnet": "Qu'est-ce que le réseau principal ?",
   "page-upgrades-merge-mainnet-eth2": "Fusionnement du réseau principal et de la chaîne phare",
   "page-upgrades-eth-blog": "blog ethereum.org",
   "page-upgrades-explore-btn": "Explorez les améliorations",
   "page-upgrades-get-involved": "Participez à la mise à niveau d'Ethereum",
   "page-upgrades-get-involved-2": "S'impliquer",
-  "page-upgrades-head-to-ethresearch": "Rendez-vous sur ethresear.ch",
+  "page-upgrades-head-to": "Rendez-vous sur",
   "page-upgrades-help": "Souhaitez-vous aider à mettre à niveau Ethereum ?",
   "page-upgrades-help-desc": "Il existe de nombreuses opportunités pour participer aux mises à niveau d'Ethereum, aider à réaliser des tests, et même gagner des récompenses.",
   "page-upgrades-index-staking": "La mise en jeu est ouverte",
@@ -65,8 +75,8 @@
   "page-upgrades-question-1-title": "Quand les mises à niveau seront-elles implémentées ?",
   "page-upgrades-question-1-desc": "Ethereum sera mis à jour progressivement ; les mises à jour s'effectueront séparément.",
   "page-upgrades-question-2-title": "La chaîne phare est-elle une blockchain distincte ?",
-  "page-upgrades-question-2-desc": "Il n'est pas exact de considérer cette mise à niveau comme une blockchain séparée.",
-  "page-upgrades-question-3-answer-2a": "Les spécifications de la Fusion ont été finalisées, et sont conçues pour avoir un impact minimal sur les développeurs de dApps.",
+  "page-upgrades-question-2-desc": "Oui. La Chaîne phare était le nom donné à une blockchain parallèle de preuve d'enjeu utilisée pour mettre à niveau le réseau principal d'Ethereum. Il n'existe désormais qu'une seule blockchain, formée par la fusion de la blockchain originale d'Ethereum et de la Chaîne phare.",
+  "page-upgrades-question-3-answer-2a": "La Fusion a eu un impact minimal pour les développeurs de dApp - ils interagissent toujours avec Ethereum de la même manière.",
   "page-upgrades-question-3-answer-2a-link": "La Fusion et les développeurs de dApps",
   "page-upgrades-question-3-answer-2b": "Les plans de fragmentation sont encore en cours d'élaboration, mais ils seront conçus en tenant compte des rollups de couche 2.",
   "page-upgrades-layer-2-rollups": "En savoir plus sur les rollups de Couche 2",
@@ -74,13 +84,11 @@
   "page-upgrades-question-3-desc": "Vous n'avez rien à faire pour le moment pour vous préparer aux mises à niveau.",
   "page-upgrades-question-3-title": "Comment se préparer pour les mises à niveau ?",
   "page-upgrades-question-4-answer-1": "Aujourd'hui, chaque fois que vous envoyez une transaction ou que vous utilisez un dApp, vous utilisez la couche d'exécution, également connue sous le nom de réseau principal.",
-  "page-upgrades-question-4-answer-2": "Mainnet continuera d'opérer normalement jusqu'à la fusion.",
-  "page-upgrades-question-4-answer-3": "Après la fusion, les validateurs sécuriseront le réseau entier via la preuve d'enjeu.",
+  "page-upgrades-question-4-answer-3": "Depuis La Fusion, les validateurs sécurisent le réseau entier via la preuve d'enjeu.",
   "page-upgrades-question-4-answer-6": "N'importe qui peut devenir validateur en mettant en jeu son ETH.",
   "page-upgrades-question-4-answer-7": "Plus d'infos sur la mise en jeu",
-  "page-upgrades-question-4-answer-8": "Les mises à niveau de la chaîne phare et de la fragmentation ne perturberont pas la couche d'exécution (réseau principal), car elles sont réalisées séparément.",
   "page-upgrades-question-4-title": "Qu'est-ce que la couche d'exécution ?",
-  "page-upgrades-question-4-desc": "Le réseau principal d'Ethereum qui sert actuellement à vos transactions était précédemment nommé « Eth ». Ce terme va être progressivement remplacé par « couche d'exécution ».",
+  "page-upgrades-question-4-desc": "Avant La Fusion, la blockchain d'Ethereum était parfois appelée 'Eth1'. Ce terme a été abandonné au profit de celui de 'couche d'exécution'.",
   "page-upgrades-question-5-answer-1": "Pour devenir un validateur à part entière sur le réseau, vous devrez miser 32 ETH. Si vous n'avez pas assez d'ETH, ou si vous ne voulez pas en mettre autant en jeu, vous pouvez vous joindre à des groupes d'enjeux. Ces groupes vous permettront de miser une fraction de la somme, et donc de gagner une fraction de la récompense totale.",
   "page-upgrades-question-5-desc": "Vous devrez utiliser la plateforme de lancement de mise en jeu ou rejoindre un groupe d'enjeux.",
   "page-upgrades-question-5-title": "Comment puis-je mettre en jeu ?",
@@ -88,10 +96,10 @@
   "page-upgrades-question-6-answer-4": "Ben Edgington de ConsenSys envoie une newsletter hebdomadaire sur les mises à jour d'Ethereum :",
   "page-upgrades-question-6-answer-5": "Vous pouvez également vous joindre à la discussion sur la recherche et le développement Ethereum sur ethresear.ch.",
   "page-upgrades-question-6-title": "Que dois-je faire avec ma dApp ?",
-  "page-upgrades-question-6-desc": "La Fusion a été conçue dans le but de minimiser l'impact sur les développeurs de dApps, mais il y a quelques points à noter.",
-  "page-upgrades-question-6-answer-1": "Quelques changements apportés par la Fusion peuvent avoir un impact sur certains types d'applications. Ces changements concernent la structure et la synchronisation des blocs, quelques modifications des opcodes, les sources d'aléa en chaîne et le concept de finalisation de la période (epoch).",
-  "page-upgrades-question-6-answer-1-link": "Comment la Fusion affecte la couche d'application d'Ethereum",
-  "page-upgrades-question-6-answer-2": "La plupart des applications ne seront pas affectées, mais nous recommandons aux développeurs de se tenir au courant des dernières nouveautés de la Fusion.",
+  "page-upgrades-question-6-desc": "La Fusion a été conçue de façon à n'avoir qu'un impact minimal sur les développeurs de dApp, mais quelques petits changements méritent d'être signalés.",
+  "page-upgrades-question-6-answer-1": "Les développeurs dApp familiers avec la pré-fusion Ethereum devraient être au courant de certaines modifications. Ces changements incluent la structure et la synchronisation des blocs, quelques modifications d'opcodes, les sources d’aléa en chaîne et le concept de finalisation de période.",
+  "page-upgrades-question-6-answer-1-link": "Comment La Fusion affecte la couche d'application d'Ethereum",
+  "page-upgrades-question-6-answer-2": "Les applications n'ont presque pas été affectées.",
   "page-upgrades-question-7-desc": "De nombreuses équipes de toute la communauté travaillent sur les différentes mises à niveau d'Ethereum.",
   "page-upgrades-question-7-lighthouse": "Lighthouse",
   "page-upgrades-question-7-lighthouse-lang": "(Implémentation Rust)",
@@ -108,7 +116,7 @@
   "page-upgrades-question-7-clients": "En savoir plus sur les clients Ethereum",
   "page-upgrades-question-8-answer-1": "Les mises à niveau d'Ethereum aideront Ethereum à évoluer de manière décentralisée, tout en maintenant la sécurité et en augmentant la durabilité.",
   "page-upgrades-question-8-answer-2": "Le problème le plus évident est sûrement le fait qu'Ethereum doive pouvoir gérer plus de 15 à 45 transactions par seconde. Mais les mises à niveau visent également à corriger d'autres problèmes sur Ethereum aujourd'hui.",
-  "page-upgrades-question-8-answer-3": "Le réseau est tellement exigeant qu'il rend l'Ethereum cher à utiliser. Les nœuds du réseau doivent supporter la taille de l'Ethereum et la quantité de données que leurs ordinateurs doivent traiter. L'algorithme sous-jacent qui sous-tend la sécurité et la décentralisation d'Ethereum est gourmand en énergie et doit être plus écologique.",
+  "page-upgrades-question-8-answer-3": "En période de forte demande, le réseau rend Ethereum coûteux à utiliser. Les nœuds du réseau doivent supporter la taille d'Ethereum et la quantité de données que leurs ordinateurs doivent traiter. L'algorithme originel qui sous-tendait la sécurité et la décentralisation d'Ethereum était gourmand en énergie et se devait d'être plus écologique.",
   "page-upgrades-question-8-answer-4": "Beaucoup de changements ont toujours été sur la feuille de route d'Ethereum, même depuis 2015. Mais les conditions actuelles rendent les mises à niveau encore plus nécessaires.",
   "page-upgrades-question-8-answer-6": "Découvrez la vision d'Ethereum",
   "page-upgrades-question-8-desc": "L'Ethereum que nous utilisons aujourd'hui doit offrir une meilleure expérience aux utilisateurs et participants du réseau.",
@@ -128,14 +136,14 @@
   "page-upgrades-question-10-answer-1-link": "Voir les mises à niveau",
   "page-upgrades-question-10-answer-2": "Mais si vous avez suivi les discussions, voici comment les mises à niveau s'intègrent à nos feuilles de route techniques, et comment elles évoluent.",
   "page-upgrades-question-10-answer-3": "La phase 0 décrit les travaux pour rendre la chaîne phare opérationnelle.",
-  "page-upgrades-question-10-answer-5": "La phase 1 se concentrait à l'origine sur la mise en œuvre des chaînes de fragments, mais la priorité a été déplacée vers la « fusion », qui est la prochaine mise à jour planifiée.",
-  "page-upgrades-question-10-answer-6": "La phase 1.5 était initialement prévue pour suivre les implémentations de fragments lorsque le réseau principal serait ajouté comme dernier fragment à la chaîne phare. Cependant, au fur et à mesure que la technologie rollup a progressé, la communauté Ethereum a accéléré la transition vers l'abandon de la preuve de travail. Le réseau principal sera plutôt « fusionné » dans la chaîne phare et restera la couche d'exécution d'Ethereum. Il s'agit d'une étape importante vers un Ethereum plus écologique.",
-  "page-upgrades-question-10-answer-7": "Les plans de la phase 2 ont fait l'objet de recherches et de discussions intenses. La Fusion ayant été planifiée avant la fragmentation et les progrès des solutions de couche 2, les objectifs ont changé pour fournir une forme plus simplifiée de fragmentation des données afin de maximiser l'efficacité des rollups. Les couches 2 actuelles permettent d'échelonner l'exécution des transactions, et la fragmentation permettra de stocker les preuves de ces données sur la couche 1 d'une manière bon marché et évolutive.",
+  "page-upgrades-question-10-answer-5": "La phase 1 se concentrait initialement sur l'implémentation des chaînes de fragments, mais la priorité a été accordée à la Fusion, qui a été mise en œuvre le 15 septembre 2022.",
+  "page-upgrades-question-10-answer-6": "La phase 1.5 était initialement prévue pour suivre les implémentations des chaînes de fragments au moment où le réseau principal aurait été ajouté en tant que dernier fragment à la chaîne phare. Cependant, à mesure que la technologie de rollup progressait, la communauté Ethereum a accéléré la transition en s'écartant plutôt de la preuve de travail.",
+  "page-upgrades-question-10-answer-7": "Les plans autour de la phase 2 ont fait l'objet d'intenses recherches et discussions. La Fusion étant derrière nous et compte tenu des progrès des solutions de couche 2, les objectifs ont changé, afin de fournir une forme plus simplifiée de fragmentation des données et de maximiser l'efficacité du rollup. Les couches 2 actuelles permettent de mettre à l'échelle l'exécution des transactions, et la fragmentation permettra de stocker des preuves pour ces données sur la couche 1 d'une manière économique et évolutive.",
   "page-upgrades-question-10-answer-8": "En savoir plus sur une feuille de route axée sur le regroupement",
   "page-upgrades-question-11-title": "Puis-je acheter de l'Eth2 ?",
-  "page-upgrades-question-11-desc": "Non. Il n'existe pas de jeton Eth2 et vos ETH ne changeront pas après La Fusion.",
-  "page-upgrades-question-11-answer-1": "L'une des principales motivations derrière le changement de nom d'Eth2 était l'idée erronée que les détenteurs d'ETH devraient migrer leurs ETH après « Ethereum 2 ». Cela n'a jamais été vrai. C'est ",
-  "page-upgrades-question-11-answer-2": "une technique courante utilisée par les arnaqueurs.",
+  "page-upgrades-question-11-desc": "Non. Il n'existe pas de jeton Eth2 et vos ETH n'ont pas changé après La Fusion.",
+  "page-upgrades-question-11-answer-1": "L'une des forces motrices derrière le changement de marque vers Eth2 était la fausse idée selon laquelle les détenteurs d'ETH devraient migrer leur ETH vers \"ETH 2.0\" après La Fusion ou toute autre mise à niveau. Cette idée est fausse et n'a jamais été à l'ordre du jour.",
+  "page-upgrades-question-11-answer-2": "Cette confusion est couramment exploitée par les escrocs.",
   "page-upgrades-question-title": "Questions fréquemment posées",
   "page-upgrades-question3-answer-1": "Les détenteurs d'ETH n'ont pas besoin de faire quoi que ce soit. Votre ETH n'aura pas besoin de changer ou de se mettre à niveau. Il est presque certain que des arnaqueurs vous diront le contraire, alors soyez prudent.",
   "page-upgrades-scalable": "Plus évolutif",
@@ -150,11 +158,11 @@
   "page-upgrades-shard-title": "Fragmentation",
   "page-upgrades-stay-up-to-date": "Restez à jour",
   "page-upgrades-stay-up-to-date-desc": "Obtenez les dernières informations des chercheurs et des développeurs travaillant sur les mises à niveau d'Ethereum.",
-  "page-upgrades-sustainable-desc": "L'Ethereum doit être meilleur pour l'environnement. La technologie actuelle nécessite trop d'énergie et d'énergie informatique.",
+  "page-upgrades-sustainable-desc": "Jusqu'à récemment, Ethereum était un gros consommateur d'énergie. La transition vers la preuve d'enjeu a entraîné une réduction de la consommation d'énergie du réseau de plus de 99,9 %.",
   "page-upgrades-take-part": "Participez à la recherche",
   "page-upgrades-take-part-desc": "Les chercheurs et les passioné(e)s d'Ethereum se rencontrent ici pour discuter des efforts de recherche, y compris de tout ce qui touche aux mises à niveau d'Ethereum.",
   "page-upgrades-the-upgrades": "Les mises à niveau d'Ethereum",
-  "page-upgrades-the-upgrades-desc": "Ethereum est un ensemble de mises à niveau qui améliorent l'évolutivité, la sécurité et la durabilité d'Ethereum. Bien que les mises à niveau soient développées en parallèle, elles ont certaines dépendances qui déterminent quand elles seront déployées.",
+  "page-upgrades-the-upgrades-desc": "Les mises à jour Ethereum visent à améliorer l'évolutivité, la sécurité et la durabilité du réseau. Ethereum a récemment subi des mises à niveau majeures en matière de sécurité et de durabilité, et d'autres sont à à venir notamment en ce qui concerne l'évolutivité.",
   "page-upgrades-unofficial-roadmap": "Ce n'est pas la feuille de route officielle. Il s'agit simplement de ce que nous observons sur la base des informations disponibles. Mais il s'agit de technologie, les choses peuvent changer en un instant. Veuillez ne pas considérer ces informations comme une promesse figée dans le marbre.",
   "page-upgrades-upgrade-desc": "L'Ethereum que nous connaissons et aimons, en plus plus évolutif, plus sûr et plus durable...",
   "page-upgrades-upgrades": "Les mises à niveau d'Ethereum",
@@ -170,9 +178,9 @@
   "page-upgrades-vision-desc": "Pour intégrer Ethereum dans le courant général et servir toute l'humanité, nous devons rendre Ethereum plus évolutif, plus sécuritaire et plus durable.",
   "page-upgrades-vision-upper": "La vision d'Ethereum",
   "page-upgrades-what-happened-to-eth2-title": "Qu'est-il arrivé à « Eth2 » ?",
-  "page-upgrades-what-happened-to-eth2-1": "Le terme « Eth2 » est progressivement supprimé en préparation de la fusion.",
+  "page-upgrades-what-happened-to-eth2-1": "Le terme « Eth2 » a été couramment utilisé avant La Fusion mais est progressivement abandonné en faveur d'une terminologie plus précise.",
   "page-upgrades-what-happened-to-eth2-1-more": "En savoir plus sur la fusion.",
-  "page-upgrades-what-happened-to-eth2-2": "Après avoir fusionné « Eth1 » et « Eth2 » en une seule chaîne, il n'y aura plus deux réseaux Ethereum distincts ; il n'y aura qu'Ethereum.",
+  "page-upgrades-what-happened-to-eth2-2": "Depuis La Fusion de « Eth1 » et « Eth2 », il n'y a plus deux blockchains distinctes d'Ethereum ; il n'y a qu'Ethereum.",
   "page-upgrades-what-happened-to-eth2-3": "Pour limiter la confusion, la communauté a mis à jour ces termes :",
   "page-upgrades-what-happened-to-eth2-3-1": "« Eth1 » est maintenant « la couche d'exécution », qui gère les transactions et les exécutions.",
   "page-upgrades-what-happened-to-eth2-3-2": "« Eth2 » est maintenant la « couche de consensus », qui gère le consensus de la preuve d'enjeu.",
diff --git a/src/intl/fr/page-upgrades.json b/src/intl/fr/page-upgrades.json
index 73c87c52ec6..129f7b3c14a 100644
--- a/src/intl/fr/page-upgrades.json
+++ b/src/intl/fr/page-upgrades.json
@@ -2,7 +2,7 @@
   "page-upgrades-merge-infographic-el": "État Ethereum : transactions, applications, contrats, soldes",
   "page-upgrades-merge-infographic-alt-text": "Infographie illustrant comment la Chaîne phare fusionne avec la couche d'exécution d'Ethereum pendant la transition de la preuve de travail à la preuve d'enjeu.",
   "page-upgrades-beacon-date": "Expédié !",
-  "page-upgrades-merge-date": "~T3/T4 2022",
+  "page-upgrades-merge-date": "Septembre 2022",
   "page-upgrades-shards-date": "~2023",
   "page-upgrades-merge-banner-intro": "La Fusion approche et apporte des changements pour Ethereum.",
   "page-upgrades-merge-banner-content-outdated": "Certains contenus de cette page ne sont plus à jour. Les mises à jour sont à venir.",

From 2440b9e8d5a23415ea52d2368471fc413225db88 Mon Sep 17 00:00:00 2001
From: Joe <jmcook1186@gmail.com>
Date: Tue, 22 Nov 2022 14:57:53 +0000
Subject: [PATCH 054/108] various cleanup

---
 src/content/developers/docs/apis/json-rpc/index.md     |  6 ++----
 .../pos/weak-subjectivity/index.md                     |  2 +-
 .../pow/mining-algorithms/dagger-hashimoto/index.md    |  2 +-
 .../docs/consensus-mechanisms/pow/mining/index.md      |  6 ------
 .../docs/data-and-analytics/block-explorers/index.md   |  2 +-
 src/content/developers/docs/intro-to-ethereum/index.md |  2 +-
 .../docs/nodes-and-clients/client-diversity/index.md   |  4 +++-
 src/content/developers/docs/nodes-and-clients/index.md | 10 +++++-----
 .../docs/nodes-and-clients/run-a-node/index.md         |  3 ++-
 src/content/developers/docs/transactions/index.md      |  2 +-
 10 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/content/developers/docs/apis/json-rpc/index.md b/src/content/developers/docs/apis/json-rpc/index.md
index a2b69cda1a2..38e17229152 100755
--- a/src/content/developers/docs/apis/json-rpc/index.md
+++ b/src/content/developers/docs/apis/json-rpc/index.md
@@ -2286,14 +2286,12 @@ contract Multiply7 {
 The first thing to do is make sure the HTTP RPC interface is enabled. This means we supply Geth with the `--http` flag on startup. In this example we use the Geth node on a private development chain. Using this approach we don't need ether on the real network.
 
 ```bash
-
-geth --http --dev --mine --miner.threads 1 --unlock 0 console 2>>geth.log
-
+geth --http --dev console 2>>geth.log
 ```
 
 This will start the HTTP RPC interface on `http://localhost:8545`.
 
-We can verify that the interface is running by retrieving the Coinbase address and balance using [curl](https://curl.haxx.se/download.html). Please note that data in these examples will differ on your local node. If you want to try these commands, replace the request params in the second curl request with the result returned from the first.
+We can verify that the interface is running by retrieving the Coinbase address and balance using [curl](https://curl.se). Please note that data in these examples will differ on your local node. If you want to try these commands, replace the request params in the second curl request with the result returned from the first.
 
 ```bash
 curl --data '{"jsonrpc":"2.0","method":"eth_coinbase", "id":1}' -H "Content-Type: application/json" localhost:8545
diff --git a/src/content/developers/docs/consensus-mechanisms/pos/weak-subjectivity/index.md b/src/content/developers/docs/consensus-mechanisms/pos/weak-subjectivity/index.md
index 0662333a94b..2eba9fe91bb 100644
--- a/src/content/developers/docs/consensus-mechanisms/pos/weak-subjectivity/index.md
+++ b/src/content/developers/docs/consensus-mechanisms/pos/weak-subjectivity/index.md
@@ -36,4 +36,4 @@ Finally, checkpoints can be requested from other nodes; perhaps another Ethereum
 - [Vitalik: How I learned to love weak subjectivity](https://blog.ethereum.org/2014/11/25/proof-stake-learned-love-weak-subjectivity/)
 - [Weak subjectivity (Teku docs)](https://docs.teku.consensys.net/en/latest/Concepts/Weak-Subjectivity/)
 - [Phase-0 Weak subjectivity guide](https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/weak-subjectivity.md)
-- [Analysis n weak subjectivity in Ethereum 2.0](https://github.com/runtimeverification/beacon-chain-verification/blob/master/weak-subjectivity/weak-subjectivity-analysis.pdf)
+- [Analysis of weak subjectivity in Ethereum 2.0](https://github.com/runtimeverification/beacon-chain-verification/blob/master/weak-subjectivity/weak-subjectivity-analysis.pdf)
diff --git a/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md b/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md
index 3669979b258..a7a56246a4e 100644
--- a/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md
+++ b/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md
@@ -4,7 +4,7 @@ description: A detailed look at the Dagger-Hashimoto algorithm.
 lang: en
 ---
 
-Dagger-Hashimoto was the original research implementation and specification for Ethereum's mining algorithm. Dagger-Hashimoto was superseded by [Ethash](#ethash). Mining will be switched off completely after [The Merge](/updates/merge), at which point Ethereum will be secured using a [proof-of-stake](/developers/docs/consensus-mechanisms/pos) mechanism instead.
+Dagger-Hashimoto was the original research implementation and specification for Ethereum's mining algorithm. Dagger-Hashimoto was superseded by [Ethash](#ethash). Mining was switched off completely at [The Merge](/updates/merge) on 15th September 2022. Since then, Ethereum has been secured using a [proof-of-stake](/developers/docs/consensus-mechanisms/pos) mechanism instead. This page is for **historical interest** - the information here is no longer relevant for present-day Ethereum!
 
 ## Prerequisites {#prerequisites}
 
diff --git a/src/content/developers/docs/consensus-mechanisms/pow/mining/index.md b/src/content/developers/docs/consensus-mechanisms/pow/mining/index.md
index eedc8ce46fd..5d2fe00c3d2 100644
--- a/src/content/developers/docs/consensus-mechanisms/pow/mining/index.md
+++ b/src/content/developers/docs/consensus-mechanisms/pow/mining/index.md
@@ -70,12 +70,6 @@ Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/do
 
 - [What does it mean to mine Ethereum?](https://docs.ethhub.io/using-ethereum/mining/) _EthHub_
 
-## Related tools {#related-tools}
-
-- [Top Ethereum miners](https://etherscan.io/stat/miner?range=7&blocktype=blocks)
-- [Etherscan mining calculator](https://etherscan.io/ether-mining-calculator)
-- [Minerstat mining calculator](https://minerstat.com/coin/ETH)
-
 ## Related topics {#related-topics}
 
 - [Gas](/developers/docs/gas/)
diff --git a/src/content/developers/docs/data-and-analytics/block-explorers/index.md b/src/content/developers/docs/data-and-analytics/block-explorers/index.md
index e6c5a8cb08d..fa8cb391cea 100644
--- a/src/content/developers/docs/data-and-analytics/block-explorers/index.md
+++ b/src/content/developers/docs/data-and-analytics/block-explorers/index.md
@@ -226,7 +226,7 @@ The consensus layer top-level data includes the following:
 
 ## Block explorers {#block-explorers}
 
-- [Etherscan](https://etherscan.io/) - a block explorer you can use to fetch data for Ethereum Mainnet, Ropsten Testnet, Kovan Testnet, Rinkeby Testnet, and Goerli Testnet
+- [Etherscan](https://etherscan.io/) - a block explorer you can use to fetch data for Ethereum Mainnet and Goerli Testnet
 - [Etherchain](https://www.etherchain.org/) - a block explorer for the Ethereum Mainnet
 - [Ethplorer](https://ethplorer.io/) - a block explorer with a focus on tokens for the Ethereum Mainnet and the Kovan testnet
 - [Blockchair](https://blockchair.com/ethereum) - the most private Ethereum explorer. Also for sorting and filtering (mempool) data
diff --git a/src/content/developers/docs/intro-to-ethereum/index.md b/src/content/developers/docs/intro-to-ethereum/index.md
index 8f36558ef31..9ca9b5e8494 100644
--- a/src/content/developers/docs/intro-to-ethereum/index.md
+++ b/src/content/developers/docs/intro-to-ethereum/index.md
@@ -107,7 +107,7 @@ A reusable snippet of code (a program) which a developer publishes into EVM stat
 ## Further reading {#further-reading}
 
 - [Ethereum Whitepaper](/whitepaper/)
-- [How does Ethereum work, anyway?](https://www.preethikasireddy.com/post/how-does-ethereum-work-anyway) - _Preethi Kasireddy_
+- [How does Ethereum work, anyway?](https://www.preethikasireddy.com/post/how-does-ethereum-work-anyway) - _Preethi Kasireddy_ (**NB** this resource is still valuable but be aware that it predates [The Merge](/upgrades/merge) and therefore still refers to Ethereum's proof-of-work mechanism - Ethereum is actually now secured using [proof-of-stake](/developers/docs/consensus-mechanisms/pos))
 
 _Know of a community resource that helped you? Edit this page and add it!_
 
diff --git a/src/content/developers/docs/nodes-and-clients/client-diversity/index.md b/src/content/developers/docs/nodes-and-clients/client-diversity/index.md
index 29fcfdd1897..542cdc13a51 100644
--- a/src/content/developers/docs/nodes-and-clients/client-diversity/index.md
+++ b/src/content/developers/docs/nodes-and-clients/client-diversity/index.md
@@ -78,7 +78,9 @@ Addressing client diversity requires more than individual users to choose minori
 
 [Teku](https://consensys.net/knowledge-base/ethereum-2/teku/)
 
-[Lodestar](https://github.com/ChainSafe/lodestar) - _Under review and audit_
+[Lodestar](https://github.com/ChainSafe/lodestar)
+
+[Prysm](https://docs.prylabs.network/docs/getting-started)
 
 Technical users can help accelerate this process by writing more tutorials and documentation for minority clients and encouraging their node-operating peers to migrate away from the dominant clients. Guides for switching to a minority consensus client are available on [clientdiversity.org](https://clientdiversity.org/).
 
diff --git a/src/content/developers/docs/nodes-and-clients/index.md b/src/content/developers/docs/nodes-and-clients/index.md
index 78d8d0c128c..7ecc2fbb647 100644
--- a/src/content/developers/docs/nodes-and-clients/index.md
+++ b/src/content/developers/docs/nodes-and-clients/index.md
@@ -74,12 +74,11 @@ If you want to [run your own node](/developers/docs/nodes-and-clients/run-a-node
 
 Instead of downloading every block, light nodes download block headers. These headers only contain summary information about the contents of the blocks. Any other information required by the light node gets requested from a full node. The light node can then independently verify the data they receive against the state roots in the block headers. Light nodes enable users to participate in the Ethereum network without the powerful hardware or high bandwidth required to run full nodes. Eventually, light nodes might run on mobile phones or embedded devices. The light nodes do not participate in consensus (i.e. they cannot be miners/validators), but they can access the Ethereum blockchain with the same functionality as a full node.
 
-The execution client Geth includes a [light sync](https://github.com/ethereum/devp2p/blob/master/caps/les.md) option. However, a light Geth node relies upon full nodes serving light node data. Few full nodes opt to serve light node data, meaning light nodes often fail to find peers. There are currently no production-ready light clients on the consensus layer; however, several are in development.
+Light nodes are not yet a feature of proof-of-stake Ethereum. There were light clients on the old proof-of-work network but they were rarely used because they relied on altruistic full-nodes opting in to serving them with data. Because not many nodes chose to serve light client data, those that did handled a lot of traffic.
 
+Light clients are an area of active development for Ethereum and we expect to see new light clients for the consensus layer and execution layer soon.
 There are also potential routes to providing light client data over the [gossip network](https://www.ethportal.net/). This is advantageous because the gossip network could support a network of light nodes without requiring full nodes to serve requests.
 
-Ethereum does not support a large population of light nodes yet, but light node support is an area expected to develop rapidly in the near future.
-
 ### Archive node {#archive-node}
 
 - Stores everything kept in the full node and builds an archive of historical states. It is needed if you want to query something like an account balance at block #4,000,000, or simply and reliably test your own transactions set without mining them using tracing.
@@ -145,7 +144,7 @@ This table summarizes the different clients. All of them pass [client tests](htt
 | [Erigon](https://github.com/ledgerwatch/erigon) | Go       | Linux, Windows, macOS | Mainnet, Sepolia, Görli, Rinkeby, Ropsten, and more | Full                               | Archive, Pruned |
 | [Akula](https://akula.app)                      | Rust     | Linux                 | Mainnet, Sepolia, Görli, Rinkeby, Ropsten           | Full                               | Archive, Pruned |
 
-**Note that OpenEthereum [has been deprecated](https://medium.com/openethereum/gnosis-joins-erigon-formerly-turbo-geth-to-release-next-gen-ethereum-client-c6708dd06dd) and is no longer being maintained.** Use it with caution and preferably switch to another client implementation.
+**Note that OpenEthereum [has been deprecated](https://medium.com/openethereum/gnosis-joins-erigon-formerly-turbo-geth-to-release-next-gen-ethereum-client-c6708dd06dd) and is no longer being maintained.** Use another client implementation!
 
 For more on supported networks, read up on [Ethereum networks](/developers/docs/networks/).
 
@@ -257,6 +256,8 @@ Light client mode downloads all block headers, block data, and verifies some ran
 - Gets only the latest state while relying on trust in developers and consensus mechanism.
 - Client ready to use with current network state in a few minutes.
 
+**NB** Light sync does not yet work with proof-of-stake Ethereum - new versions of light sync should ship soon!
+
 [More on Light clients](https://www.parity.io/blog/what-is-a-light-client/)
 
 #### Snap sync {#snap-sync}
@@ -305,5 +306,4 @@ There is a lot of information about Ethereum clients on the internet. Here are f
 
 ## Related tutorials {#related-tutorials}
 
-- [Running a Node with Geth](/developers/tutorials/run-light-node-geth/) _– How to download, install and run Geth. Covering syncmodes, the JavaScript console, and more._
 - [Turn your Raspberry Pi 4 into a validator node just by flashing the MicroSD card – Installation guide](/developers/tutorials/run-node-raspberry-pi/) _– Flash your Raspberry Pi 4, plug in an ethernet cable, connect the SSD disk and power up the device to turn the Raspberry Pi 4 into a full Ethereum node running the execution layer (Mainnet) and / or the consensus layer (Beacon Chain / validator)._
diff --git a/src/content/developers/docs/nodes-and-clients/run-a-node/index.md b/src/content/developers/docs/nodes-and-clients/run-a-node/index.md
index cbac75f8cab..36a66c953ed 100644
--- a/src/content/developers/docs/nodes-and-clients/run-a-node/index.md
+++ b/src/content/developers/docs/nodes-and-clients/run-a-node/index.md
@@ -282,8 +282,9 @@ This example starts Geth on mainnet, stores blockchain data at `/data/ethereum`,
 ```
 geth --mainnet \
     --datadir "/data/ethereum" \
-    --http --http.api="eth,web3,net" \
+    --http --authrpc.addr localhost \
     --authrpc.vhosts="localhost" \
+    --authrpc.port 8551
     --authrpc.jwtsecret=/path/to/jwtsecret
 ```
 
diff --git a/src/content/developers/docs/transactions/index.md b/src/content/developers/docs/transactions/index.md
index 48113b9e705..13d681c2918 100644
--- a/src/content/developers/docs/transactions/index.md
+++ b/src/content/developers/docs/transactions/index.md
@@ -52,7 +52,7 @@ But a transaction object needs to be signed using the sender's private key. This
 
 An Ethereum client like Geth will handle this signing process.
 
-Example [JSON-RPC](https://eth.wiki/json-rpc/API) call:
+Example [JSON-RPC](/developers/docs/apis/json-rpc) call:
 
 ```json
 {

From fe21d2bd0e4951b2f88f2cedee3269c517085aec Mon Sep 17 00:00:00 2001
From: Corwin Smith <cssmittys@gmail.com>
Date: Tue, 22 Nov 2022 08:18:03 -0700
Subject: [PATCH 055/108] Update
 src/content/developers/docs/nodes-and-clients/index.md

Co-authored-by: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
---
 src/content/developers/docs/nodes-and-clients/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/developers/docs/nodes-and-clients/index.md b/src/content/developers/docs/nodes-and-clients/index.md
index 3a2eeb1683e..502da5f51f0 100644
--- a/src/content/developers/docs/nodes-and-clients/index.md
+++ b/src/content/developers/docs/nodes-and-clients/index.md
@@ -7,7 +7,7 @@ sidebarDepth: 2
 
 Ethereum is a distributed network of computers (known as nodes) running software that can verify blocks and transaction data. The software application, known as a client, must be run on your computer to turn it into an Ethereum node.
 
-**Note: it is not possible to run an execution client on its own anymore. After [The Merge](/upgrades/merge), both execution and consensus clients must be run together in order for a user to gain access to the Ethereum network. However, a consensus client can still run independently.**
+**Note: it is not possible to run an execution client on its own anymore. After [The Merge](/upgrades/merge), both execution and consensus clients must be run together in order for a user to gain access to the Ethereum network.**
 
 ## Prerequisites {#prerequisites}
 

From 758f7dde080e7e68465784591d7aa085e956d422 Mon Sep 17 00:00:00 2001
From: Corwin Smith <cssmittys@gmail.com>
Date: Tue, 22 Nov 2022 08:19:07 -0700
Subject: [PATCH 056/108] Update
 src/content/developers/docs/nodes-and-clients/index.md

Co-authored-by: Joshua <62268199+minimalsm@users.noreply.github.com>
---
 src/content/developers/docs/nodes-and-clients/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/developers/docs/nodes-and-clients/index.md b/src/content/developers/docs/nodes-and-clients/index.md
index 502da5f51f0..6890fdcae6e 100644
--- a/src/content/developers/docs/nodes-and-clients/index.md
+++ b/src/content/developers/docs/nodes-and-clients/index.md
@@ -19,7 +19,7 @@ If you're new to the topic of nodes, we recommend first checking out our user-fr
 
 A "node" is any instance of Ethereum client software that is connected to other computers also running Ethereum software, forming a network. A client is an implementation of Ethereum that verifies data against the protocol rules and keeps the network secure.
 
-Post-Merge Ethereum consists of two parts: the **execution layer** and the **consensus layer**. Both layers are run by different client software. On this page, we'll refer to them as the execution client and consensus client.
+Post-Merge Ethereum consists of two parts: the execution layer and the consensus layer. Both layers are run by different client software. On this page, we'll refer to them as the execution client and consensus client.
 
 - The execution client (also known as the Execution Engine, EL client or formerly the Eth1 client) listens to new transactions broadcasted in the network, executes them in EVM, and holds the latest state and database of all current Ethereum data.
 - The consensus client (also known as the Beacon Node, CL client or formerly the Eth2 client) implements the proof-of-stake consensus algorithm, which enables the network to achieve agreement based on validated data from the execution client.

From 49e4015eef3384f7faf5bd329bdff4c2c0c81225 Mon Sep 17 00:00:00 2001
From: Joe <jmcook1186@gmail.com>
Date: Tue, 22 Nov 2022 15:29:58 +0000
Subject: [PATCH 057/108] fix glossary entries

---
 src/content/glossary/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/content/glossary/index.md b/src/content/glossary/index.md
index c8b6d6ad79d..deaa2e47cf5 100644
--- a/src/content/glossary/index.md
+++ b/src/content/glossary/index.md
@@ -205,7 +205,7 @@ An account containing code that executes whenever it receives a [transaction](#t
 
 ### contract creation transaction {#contract-creation-transaction}
 
-A special [transaction](#transaction), with the [zero address](#zero-address) as the recipient, that is used to register a [contract](#contract-account) and record it on the Ethereum blockchain.
+A special [transaction](#transaction) that includes a contract's initiation code. The recipient is set to `null` and the contract is deployed to an address generated from the user address and `nonce`. that is used to register a [contract](#contract-account) and record it on the Ethereum blockchain.
 
 ### cryptoeconomics {#cryptoeconomics}
 
@@ -1095,7 +1095,7 @@ The smallest denomination of [ether](#ether). 10<sup>18</sup> wei = 1 ether.
 
 ### zero address {#zero-address}
 
-A special Ethereum address, composed entirely of zeros, that is specified as the destination address of a [contract creation transaction](#contract-creation-transaction).
+An Ethereum address, composed entirely of zeros, that is frequently used as a burn address for unwated funds.
 
 ### zero-knowledge proof {#zk-proof}
 

From fa3d6172771a0d6c9324d2594a71f45689b847b9 Mon Sep 17 00:00:00 2001
From: Joseph Cook <33655003+jmcook1186@users.noreply.github.com>
Date: Tue, 22 Nov 2022 15:38:48 +0000
Subject: [PATCH 058/108] Update src/content/glossary/index.md

Co-authored-by: Alex Stokes <r.alex.stokes@gmail.com>
---
 src/content/glossary/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/glossary/index.md b/src/content/glossary/index.md
index deaa2e47cf5..210a9c90d4c 100644
--- a/src/content/glossary/index.md
+++ b/src/content/glossary/index.md
@@ -1095,7 +1095,7 @@ The smallest denomination of [ether](#ether). 10<sup>18</sup> wei = 1 ether.
 
 ### zero address {#zero-address}
 
-An Ethereum address, composed entirely of zeros, that is frequently used as a burn address for unwated funds.
+An Ethereum address, composed entirely of zeros, that is frequently used as a burn address for unwanted funds.
 
 ### zero-knowledge proof {#zk-proof}
 

From 212b96a7bd0a809fb5bd2cbdd16ad89c207bac9f Mon Sep 17 00:00:00 2001
From: vdusart <dusartvictor@gmail.com>
Date: Tue, 22 Nov 2022 20:14:42 +0100
Subject: [PATCH 059/108] use shadow

---
 src/components/Tooltip.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
index d60c47b0106..40ed98a449c 100644
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -1,5 +1,5 @@
 import React, { ReactNode, useState } from "react"
-import { Box } from "@chakra-ui/react"
+import { Box, useColorModeValue } from "@chakra-ui/react"
 import * as utils from "../utils/isMobile"
 
 export interface IProps {
@@ -11,6 +11,7 @@ export interface IProps {
 const Tooltip: React.FC<IProps> = ({ content, children }) => {
   const [isVisible, setIsVisible] = useState<boolean>(false)
   const isMobile = utils.isMobile()
+  const shadow = useColorModeValue("tableBox.light", "tableBox.dark")
 
   return (
     <>
@@ -45,7 +46,7 @@ const Tooltip: React.FC<IProps> = ({ content, children }) => {
             w={{ base: "140px", md: "200px" }}
             color="text"
             bg="background"
-            boxShadow="tableBoxShadow"
+            boxShadow={shadow}
             position="absolute"
             zIndex="docked"
             py={4}

From 003d53d4b0128eb1bb9fc400ac3b51100bb031c6 Mon Sep 17 00:00:00 2001
From: vdusart <dusartvictor@gmail.com>
Date: Tue, 22 Nov 2022 20:15:43 +0100
Subject: [PATCH 060/108] use shadow in StablecoinBoxGrid component

---
 src/components/StablecoinBoxGrid.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/StablecoinBoxGrid.tsx b/src/components/StablecoinBoxGrid.tsx
index 9f7a4927890..b513e76d3f5 100644
--- a/src/components/StablecoinBoxGrid.tsx
+++ b/src/components/StablecoinBoxGrid.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react"
-import { Box, Flex, Heading } from "@chakra-ui/react"
+import { Box, Flex, Heading, useColorModeValue } from "@chakra-ui/react"
 import { useIntl } from "react-intl"
 import Link, { navigate } from "./Link"
 import Emoji from "./Emoji"
@@ -147,6 +147,8 @@ const GridItem: React.FC<IPropsGridItem> = ({
   const handleClick = (): void => {
     callback(index)
   }
+  const shadow = useColorModeValue("tableBox.light", "tableBox.dark")
+
   return (
     <Flex
       id={`type-${index}`}
@@ -174,7 +176,7 @@ const GridItem: React.FC<IPropsGridItem> = ({
         background: isOpen ? color : "ednBackground",
         transition: isOpen ? "auto" : "transform 0.5s",
         transform: isOpen ? "auto" : "skewX(-5deg)",
-        boxShadow: "tableBoxShadow",
+        boxShadow: shadow,
       }}
     >
       {isOpen ? (

From 91ebe76fac5922cdfc952f5fd8f5707b2df7d14a Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Tue, 22 Nov 2022 22:41:18 -0300
Subject: [PATCH 061/108] always fetch the default lang in order to fallback to
 it when the translation key is not found

---
 gatsby-node.ts                                        |  4 ++++
 src/pages-conditional/dapps.tsx                       |  4 ++--
 src/pages-conditional/eth.tsx                         |  4 ++--
 src/pages-conditional/wallets.tsx                     |  4 ++--
 src/pages-conditional/what-is-ethereum.tsx            |  4 ++--
 src/pages/404.tsx                                     |  4 ++--
 src/pages/assets.tsx                                  |  4 ++--
 src/pages/bug-bounty.tsx                              |  4 ++--
 src/pages/community.tsx                               |  4 ++--
 .../translation-program/acknowledgements.tsx          |  4 ++--
 .../contributing/translation-program/contributors.tsx |  4 ++--
 src/pages/developers/index.tsx                        |  4 ++--
 src/pages/developers/learning-tools.tsx               |  4 ++--
 src/pages/developers/local-environment.tsx            |  4 ++--
 src/pages/developers/tutorials.tsx                    |  4 ++--
 src/pages/get-eth.tsx                                 |  4 ++--
 src/pages/index.tsx                                   |  4 ++--
 src/pages/languages.tsx                               |  4 ++--
 src/pages/layer-2.tsx                                 |  4 ++--
 src/pages/learn/index.tsx                             |  4 ++--
 src/pages/run-a-node.tsx                              |  4 ++--
 src/pages/stablecoins.tsx                             |  4 ++--
 src/pages/staking/deposit-contract.tsx                |  4 ++--
 src/pages/staking/index.tsx                           |  4 ++--
 src/pages/upgrades/get-involved/index.tsx             | 11 ++++++++++-
 src/pages/upgrades/index.tsx                          |  4 ++--
 src/pages/upgrades/vision.tsx                         | 11 ++++++++++-
 src/pages/wallets/find-wallet.tsx                     |  4 ++--
 src/templates/docs.tsx                                |  4 ++--
 src/templates/staking.tsx                             |  4 ++--
 src/templates/static.tsx                              |  4 ++--
 src/templates/tutorial.tsx                            |  4 ++--
 src/templates/upgrade.tsx                             |  4 ++--
 src/templates/use-cases.tsx                           |  4 ++--
 src/types.ts                                          |  1 +
 35 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/gatsby-node.ts b/gatsby-node.ts
index e1f10ec4f43..30c624de9c1 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -284,6 +284,7 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
             component: path.resolve(`src/templates/${template}.tsx`),
             context: {
               language: lang,
+              languagesToFetch: [lang, defaultLanguage],
               slug: langSlug,
               ignoreTranslationBanner: isLegal,
               isLegal: isLegal,
@@ -311,6 +312,7 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
       component: path.resolve(`src/templates/${template}.tsx`),
       context: {
         language,
+        languagesToFetch: [language, defaultLanguage],
         slug,
         isOutdated: !!node.fields.isOutdated,
         isDefaultLang: language === defaultLanguage,
@@ -360,6 +362,7 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
           component: path.resolve(`src/pages-conditional/${page}.tsx`),
           context: {
             language: lang,
+            languagesToFetch: [lang, defaultLanguage],
             slug,
             isContentEnglish,
             isOutdated,
@@ -413,6 +416,7 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
       ...page,
       context: {
         ...page.context,
+        languagesToFetch: [language, defaultLanguage],
         isOutdated,
         //display TranslationBanner for translation-component pages that are still in English
         isContentEnglish,
diff --git a/src/pages-conditional/dapps.tsx b/src/pages-conditional/dapps.tsx
index bb80dc4636e..9dae2cee735 100644
--- a/src/pages-conditional/dapps.tsx
+++ b/src/pages-conditional/dapps.tsx
@@ -1456,8 +1456,8 @@ export const editorImage = graphql`
 `
 
 export const query = graphql`
-  query DappsPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query DappsPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages-conditional/eth.tsx b/src/pages-conditional/eth.tsx
index f9a2bc4ac48..f520c514a5a 100644
--- a/src/pages-conditional/eth.tsx
+++ b/src/pages-conditional/eth.tsx
@@ -521,8 +521,8 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
 export default EthPage
 
 export const query = graphql`
-  query EthPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query EthPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages-conditional/wallets.tsx b/src/pages-conditional/wallets.tsx
index a5711e8ac44..bfc369a866b 100644
--- a/src/pages-conditional/wallets.tsx
+++ b/src/pages-conditional/wallets.tsx
@@ -478,8 +478,8 @@ export const listImage = graphql`
 `
 
 export const query = graphql`
-  query WalletsPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query WalletsPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages-conditional/what-is-ethereum.tsx b/src/pages-conditional/what-is-ethereum.tsx
index ce902404b96..570aef344a8 100644
--- a/src/pages-conditional/what-is-ethereum.tsx
+++ b/src/pages-conditional/what-is-ethereum.tsx
@@ -959,8 +959,8 @@ export const calloutImage = graphql`
 `
 
 export const query = graphql`
-  query WhatIsEthereum($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query WhatIsEthereum($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index f66ffc1a59f..3d1ed9fe109 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -31,8 +31,8 @@ const NotFoundPage = (props: PageProps) => (
 export default NotFoundPage
 
 export const query = graphql`
-  query NotFoundPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query NotFoundPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/assets.tsx b/src/pages/assets.tsx
index 0488e6d09ae..f0941bb2ab1 100644
--- a/src/pages/assets.tsx
+++ b/src/pages/assets.tsx
@@ -493,8 +493,8 @@ export const assetItem = graphql`
 `
 
 export const query = graphql`
-  query AssetsPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query AssetsPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/bug-bounty.tsx b/src/pages/bug-bounty.tsx
index 76f2bc5f02e..b2cc2bc6f4f 100644
--- a/src/pages/bug-bounty.tsx
+++ b/src/pages/bug-bounty.tsx
@@ -859,8 +859,8 @@ export const ClientLogosSmall = graphql`
 `
 
 export const query = graphql`
-  query BugBountyPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query BugBountyPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/community.tsx b/src/pages/community.tsx
index 1188d936d78..7e152853d27 100644
--- a/src/pages/community.tsx
+++ b/src/pages/community.tsx
@@ -566,8 +566,8 @@ const CommunityPage = ({
 export default CommunityPage
 
 export const query = graphql`
-  query CommunityPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query CommunityPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/contributing/translation-program/acknowledgements.tsx b/src/pages/contributing/translation-program/acknowledgements.tsx
index d886bc1c934..206615aed6b 100644
--- a/src/pages/contributing/translation-program/acknowledgements.tsx
+++ b/src/pages/contributing/translation-program/acknowledgements.tsx
@@ -269,8 +269,8 @@ const TranslatorAcknowledgements = ({
 export default TranslatorAcknowledgements
 
 export const query = graphql`
-  query TranslatorAcknowledgementsPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query TranslatorAcknowledgementsPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/contributing/translation-program/contributors.tsx b/src/pages/contributing/translation-program/contributors.tsx
index 3989974be0d..6b1fd609bdb 100644
--- a/src/pages/contributing/translation-program/contributors.tsx
+++ b/src/pages/contributing/translation-program/contributors.tsx
@@ -150,8 +150,8 @@ const Contributors = ({
 export default Contributors
 
 export const query = graphql`
-  query ContributorsPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query ContributorsPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/developers/index.tsx b/src/pages/developers/index.tsx
index d8d2bc8217a..e126184d05e 100644
--- a/src/pages/developers/index.tsx
+++ b/src/pages/developers/index.tsx
@@ -555,8 +555,8 @@ const DevelopersPage = ({
 export default DevelopersPage
 
 export const query = graphql`
-  query DevelopersIndexPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query DevelopersIndexPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/developers/learning-tools.tsx b/src/pages/developers/learning-tools.tsx
index aabd0d8d63c..6c2e4312553 100644
--- a/src/pages/developers/learning-tools.tsx
+++ b/src/pages/developers/learning-tools.tsx
@@ -313,8 +313,8 @@ export const learningToolImage = graphql`
 `
 
 export const query = graphql`
-  query DevelopersLearningToolsPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query DevelopersLearningToolsPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/developers/local-environment.tsx b/src/pages/developers/local-environment.tsx
index a7f899d6fd1..b4058a8ecab 100644
--- a/src/pages/developers/local-environment.tsx
+++ b/src/pages/developers/local-environment.tsx
@@ -614,8 +614,8 @@ export const devtoolImage = graphql`
 `
 
 export const query = graphql`
-  query DevelopersLocalEnvironmentPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query DevelopersLocalEnvironmentPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/developers/tutorials.tsx b/src/pages/developers/tutorials.tsx
index 9f7389c92ba..4ccc836b0f9 100644
--- a/src/pages/developers/tutorials.tsx
+++ b/src/pages/developers/tutorials.tsx
@@ -466,8 +466,8 @@ const TutorialsPage = ({
 export default TutorialsPage
 
 export const query = graphql`
-  query DevelopersTutorialsPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query DevelopersTutorialsPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/get-eth.tsx b/src/pages/get-eth.tsx
index 9478e028c2f..b41247e9b8b 100644
--- a/src/pages/get-eth.tsx
+++ b/src/pages/get-eth.tsx
@@ -446,8 +446,8 @@ export const listItemImage = graphql`
 `
 
 export const query = graphql`
-  query GetEthPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query GetEthPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 1e738a26126..18521e420c0 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -769,8 +769,8 @@ const HomePage = ({
 export default HomePage
 
 export const query = graphql`
-  query IndexPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query IndexPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/languages.tsx b/src/pages/languages.tsx
index da97291ef61..f08dace4f48 100644
--- a/src/pages/languages.tsx
+++ b/src/pages/languages.tsx
@@ -170,8 +170,8 @@ const LanguagesPage = () => {
 export default LanguagesPage
 
 export const query = graphql`
-  query LanguagesPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query LanguagesPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/layer-2.tsx b/src/pages/layer-2.tsx
index e094b5f490f..65e7e6d264c 100644
--- a/src/pages/layer-2.tsx
+++ b/src/pages/layer-2.tsx
@@ -933,8 +933,8 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
 export default Layer2Page
 
 export const query = graphql`
-  query Layer2Page($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query Layer2Page($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/learn/index.tsx b/src/pages/learn/index.tsx
index ba16c98fb67..9578b76e115 100644
--- a/src/pages/learn/index.tsx
+++ b/src/pages/learn/index.tsx
@@ -871,8 +871,8 @@ export const cardImageFragment = graphql`
 `
 
 export const query = graphql`
-  query LearnPage {
-    locales: allLocale {
+  query LearnPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/run-a-node.tsx b/src/pages/run-a-node.tsx
index 2dcf2bb5fc3..b1edff62b9e 100644
--- a/src/pages/run-a-node.tsx
+++ b/src/pages/run-a-node.tsx
@@ -1002,8 +1002,8 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
 export default RunANodePage
 
 export const query = graphql`
-  query RunANodePage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query RunANodePage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/stablecoins.tsx b/src/pages/stablecoins.tsx
index 3ff54b0c1d8..b2596053117 100644
--- a/src/pages/stablecoins.tsx
+++ b/src/pages/stablecoins.tsx
@@ -829,8 +829,8 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
 export default StablecoinsPage
 
 export const query = graphql`
-  query StablecoinsPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query StablecoinsPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/staking/deposit-contract.tsx b/src/pages/staking/deposit-contract.tsx
index e28790d52f9..5bd9f6916b0 100644
--- a/src/pages/staking/deposit-contract.tsx
+++ b/src/pages/staking/deposit-contract.tsx
@@ -501,8 +501,8 @@ export const sourceImage = graphql`
 `
 
 export const query = graphql`
-  query DepositContractPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query DepositContractPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/staking/index.tsx b/src/pages/staking/index.tsx
index 472c0e9885d..00604b4fbe7 100644
--- a/src/pages/staking/index.tsx
+++ b/src/pages/staking/index.tsx
@@ -724,8 +724,8 @@ const StakingPage = ({
 export default StakingPage
 
 export const query = graphql`
-  query StakingPageIndex($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query StakingPageIndex($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/upgrades/get-involved/index.tsx b/src/pages/upgrades/get-involved/index.tsx
index 948a0ca4521..c55cbe9a84a 100644
--- a/src/pages/upgrades/get-involved/index.tsx
+++ b/src/pages/upgrades/get-involved/index.tsx
@@ -538,7 +538,16 @@ export const Clients = graphql`
 `
 
 export const query = graphql`
-  query GetInvolvedPage {
+  query GetInvolvedPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     bountyHunters: allConsensusBountyHuntersCsv(
       sort: { order: DESC, fields: score }
     ) {
diff --git a/src/pages/upgrades/index.tsx b/src/pages/upgrades/index.tsx
index 312eca5ca3a..1413bf65038 100644
--- a/src/pages/upgrades/index.tsx
+++ b/src/pages/upgrades/index.tsx
@@ -829,8 +829,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
 export default Eth2IndexPage
 
 export const query = graphql`
-  query UpgradesPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query UpgradesPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/pages/upgrades/vision.tsx b/src/pages/upgrades/vision.tsx
index 5bb40ccb982..54a4fc37be0 100644
--- a/src/pages/upgrades/vision.tsx
+++ b/src/pages/upgrades/vision.tsx
@@ -323,7 +323,16 @@ const VisionPage = ({
 export default VisionPage
 
 export const query = graphql`
-  query UpgradesVisionPage {
+  query UpgradesVisionPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
+      edges {
+        node {
+          ns
+          data
+          language
+        }
+      }
+    }
     oldship: file(relativePath: { eq: "upgrades/oldship.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/wallets/find-wallet.tsx b/src/pages/wallets/find-wallet.tsx
index 3b546f1ecaf..dafea060cda 100644
--- a/src/pages/wallets/find-wallet.tsx
+++ b/src/pages/wallets/find-wallet.tsx
@@ -568,8 +568,8 @@ const FindWalletPage = ({ data, location }) => {
 export default FindWalletPage
 
 export const query = graphql`
-  query FindWalletPage($language: String!) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query FindWalletPage($languagesToFetch: [String!]!) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/templates/docs.tsx b/src/templates/docs.tsx
index e5aa01f9c8e..6dafdedc557 100644
--- a/src/templates/docs.tsx
+++ b/src/templates/docs.tsx
@@ -245,8 +245,8 @@ const DocsPage = ({
 }
 
 export const query = graphql`
-  query DocsPage($language: String!, $relativePath: String) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query DocsPage($languagesToFetch: [String!]!, $relativePath: String) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/templates/staking.tsx b/src/templates/staking.tsx
index 03f6662623f..2beb24ca011 100644
--- a/src/templates/staking.tsx
+++ b/src/templates/staking.tsx
@@ -456,8 +456,8 @@ const StakingPage = ({
 }
 
 export const stakingPageQuery = graphql`
-  query StakingPage($language: String!, $relativePath: String) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query StakingPage($languagesToFetch: [String!]!, $relativePath: String) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/templates/static.tsx b/src/templates/static.tsx
index 7db21844b2d..d8d24e20f2c 100644
--- a/src/templates/static.tsx
+++ b/src/templates/static.tsx
@@ -237,8 +237,8 @@ const StaticPage = ({
 }
 
 export const staticPageQuery = graphql`
-  query StaticPage($language: String!, $relativePath: String) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query StaticPage($languagesToFetch: [String!]!, $relativePath: String) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/templates/tutorial.tsx b/src/templates/tutorial.tsx
index 3ca1d0e687a..867d66849a3 100644
--- a/src/templates/tutorial.tsx
+++ b/src/templates/tutorial.tsx
@@ -220,8 +220,8 @@ const TutorialPage = ({
 export default TutorialPage
 
 export const query = graphql`
-  query TutorialPage($language: String!, $relativePath: String) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query TutorialPage($languagesToFetch: [String!]!, $relativePath: String) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/templates/upgrade.tsx b/src/templates/upgrade.tsx
index f463bb98295..cad195d0b6e 100644
--- a/src/templates/upgrade.tsx
+++ b/src/templates/upgrade.tsx
@@ -413,8 +413,8 @@ const UpgradePage = ({
 }
 
 export const upgradePageQuery = graphql`
-  query UpgradePage($language: String!, $relativePath: String) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query UpgradePage($languagesToFetch: [String!]!, $relativePath: String) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/templates/use-cases.tsx b/src/templates/use-cases.tsx
index 35d1b2110d3..6da97b55b17 100644
--- a/src/templates/use-cases.tsx
+++ b/src/templates/use-cases.tsx
@@ -433,8 +433,8 @@ const UseCasePage = ({
 }
 
 export const useCasePageQuery = graphql`
-  query UseCasePage($language: String!, $relativePath: String) {
-    locales: allLocale(filter: { language: { eq: $language } }) {
+  query UseCasePage($languagesToFetch: [String!]!, $relativePath: String) {
+    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
       edges {
         node {
           ns
diff --git a/src/types.ts b/src/types.ts
index ee5cd4c6b6d..a37fd594f4b 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -29,6 +29,7 @@ export type Context = {
   slug: string
   relativePath?: string
   language: Lang
+  languagesToFetch?: Array<Lang>
   ignoreTranslationBanner?: boolean
   isOutdated: boolean
   isLegal?: boolean

From e40efa86686e260a0ea46d95939163f11b3b6fa5 Mon Sep 17 00:00:00 2001
From: Jamie Barrett <timothybarrett@hotmail.co.uk>
Date: Wed, 23 Nov 2022 07:44:38 +0000
Subject: [PATCH 062/108] chore: remove unused dep and replace h3 end tag

---
 src/components/ExpandableCard.tsx | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 2025365f137..963d1ba2126 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -12,7 +12,6 @@ import {
   AccordionItem,
   AccordionPanel,
   Box,
-  Button,
   Heading,
   Text,
 } from "@chakra-ui/react"
@@ -98,12 +97,7 @@ const ExpandableCard: React.FC<IProps> = ({
                   my="4"
                 >
                   {!!Svg && <Svg />}
-                  <Text
-                    fontSize="xl"
-                    fontWeight="semibold"
-                    flex="1"
-                    m="0"
-                  >
+                  <Text fontSize="xl" fontWeight="semibold" flex="1" m="0">
                     {title}
                   </Text>
                 </Box>
@@ -127,23 +121,23 @@ const ExpandableCard: React.FC<IProps> = ({
               </Text>
             </Box>
           </AccordionButton>
-        </h3>
+        </Heading>
         <AccordionPanel
           paddingX="2"
           paddingBottom="2"
           paddingTop="0"
           onClick={onClick}
         >
-            <Box
-              fontSize="md"
-              color="text"
-              marginTop="8"
-              paddingTop="6"
-              borderTop="1px solid"
-              borderColor="border"
-            >
-              {children}
-            </Box>
+          <Box
+            fontSize="md"
+            color="text"
+            marginTop="8"
+            paddingTop="6"
+            borderTop="1px solid"
+            borderColor="border"
+          >
+            {children}
+          </Box>
         </AccordionPanel>
       </AccordionItem>
     </Accordion>

From 2f81f5381dd92c3738793acfa5d8325790d2e3fe Mon Sep 17 00:00:00 2001
From: Jamie Barrett <timothybarrett@hotmail.co.uk>
Date: Wed, 23 Nov 2022 08:00:09 +0000
Subject: [PATCH 063/108] chore: correct panel padding

---
 src/components/ExpandableCard.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 963d1ba2126..196b85b1373 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -57,6 +57,7 @@ const ExpandableCard: React.FC<IProps> = ({
       border="1px solid"
       borderColor="border"
       borderRadius="sm"
+      h3
       display="flex"
       flex-direction="column"
       marginBottom="4"
@@ -123,8 +124,8 @@ const ExpandableCard: React.FC<IProps> = ({
           </AccordionButton>
         </Heading>
         <AccordionPanel
-          paddingX="2"
-          paddingBottom="2"
+          paddingX="6"
+          paddingBottom="6"
           paddingTop="0"
           onClick={onClick}
         >

From 759398c07c87ce288b963f5760c30a4acf7b3e40 Mon Sep 17 00:00:00 2001
From: Luka Kropec <lukakropec1@gmail.com>
Date: Wed, 23 Nov 2022 12:51:35 +0100
Subject: [PATCH 064/108] Fix spelling of Ethereum

---
 src/intl/en/page-upgrades-index.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intl/en/page-upgrades-index.json b/src/intl/en/page-upgrades-index.json
index ddd5d4c389a..670b45f56d4 100644
--- a/src/intl/en/page-upgrades-index.json
+++ b/src/intl/en/page-upgrades-index.json
@@ -76,7 +76,7 @@
   "page-upgrades-question-1-desc": "Ethereum is being upgraded progressively; the upgrades are distinct with different ship dates.",
   "page-upgrades-question-2-title": "Is the Beacon Chain a separate blockchain?",
   "page-upgrades-question-2-desc": "Yes. The Beacon Chain was the name given to a parallel proof-of-stake blockchain used to upgrade Ethereum's Mainnet. There is now only one blockchain, formed by merging the original Ethereum blockchain and the Beacon Chain together.",
-  "page-upgrades-question-3-answer-2a": "The Merge had minimal impact on dapp developers - they still interact with Etheruem in the same ways.",
+  "page-upgrades-question-3-answer-2a": "The Merge had minimal impact on dapp developers - they still interact with Ethereum in the same ways.",
   "page-upgrades-question-3-answer-2a-link": "The Merge and dapp developers",
   "page-upgrades-question-3-answer-2b": "Sharding plans are still being developed, but will be designed with layer 2 rollups in mind.",
   "page-upgrades-layer-2-rollups": "More on layer 2 rollups",

From 45124c8f298818d8b76ae31bd1ffab597c6252e4 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 14 Nov 2022 12:24:52 -0300
Subject: [PATCH 065/108] use htmr to parse html inside json files

---
 package.json                                  |  1 +
 src/components/FeedbackCard.tsx               | 13 ++---
 src/components/Staking/StakingHierarchy.tsx   | 19 ++----
 .../Staking/StakingHowSoloWorks.tsx           | 10 +---
 src/components/Translation.tsx                | 20 ++++++-
 src/pages-conditional/what-is-ethereum.tsx    | 16 ++---
 src/pages/layer-2.tsx                         | 58 ++++++++-----------
 src/pages/run-a-node.tsx                      |  8 +--
 src/pages/staking/index.tsx                   | 18 ++----
 src/pages/upgrades/vision.tsx                 |  8 +--
 yarn.lock                                     | 10 +++-
 11 files changed, 82 insertions(+), 99 deletions(-)

diff --git a/package.json b/package.json
index 04d2f63f72c..2fb86933586 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "gatsby-transformer-json": "^4.11.0",
     "gatsby-transformer-remark": "^3.0.0",
     "gatsby-transformer-sharp": "^4.21.0",
+    "htmr": "^1.0.2",
     "i18next": "^21.9.2",
     "is-relative-url": "^3.0.0",
     "lodash": "^4.17.21",
diff --git a/src/components/FeedbackCard.tsx b/src/components/FeedbackCard.tsx
index 2dda3cfdd68..d0d8d97c63b 100644
--- a/src/components/FeedbackCard.tsx
+++ b/src/components/FeedbackCard.tsx
@@ -1,7 +1,6 @@
 // Library imports
 import React, { ReactNode, useState } from "react"
 import { Flex, FlexProps, Heading, Icon } from "@chakra-ui/react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
 // Component imports
 import Button from "./Button"
 import Translation from "./Translation"
@@ -22,7 +21,6 @@ const FeedbackCard: React.FC<IProps> = ({
   isArticle = false,
   ...props
 }) => {
-  const { t } = useTranslation()
   const [feedbackSubmitted, setFeedbackSubmitted] = useState(false)
   const surveyUrl = useSurvey(feedbackSubmitted)
 
@@ -73,13 +71,10 @@ const FeedbackCard: React.FC<IProps> = ({
           {getTitle(feedbackSubmitted)}
         </Heading>
         {feedbackSubmitted && (
-          <p
-            dangerouslySetInnerHTML={{
-              __html: `${t("feedback-widget-thank-you-subtitle")} ${t(
-                "feedback-widget-thank-you-subtitle-ext"
-              )}`,
-            }}
-          />
+          <p>
+            <Translation id="feedback-widget-thank-you-subtitle" />{" "}
+            <Translation id="feedback-widget-thank-you-subtitle-ext" />
+          </p>
         )}
         <Flex gap={4}>
           {!feedbackSubmitted ? (
diff --git a/src/components/Staking/StakingHierarchy.tsx b/src/components/Staking/StakingHierarchy.tsx
index 01718b12d44..df86fa3572c 100644
--- a/src/components/Staking/StakingHierarchy.tsx
+++ b/src/components/Staking/StakingHierarchy.tsx
@@ -1,7 +1,6 @@
 // Libraries
 import React from "react"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
 
 // Components
 import ButtonLink from "../ButtonLink"
@@ -255,8 +254,6 @@ const Line = styled.aside`
 export interface IProps {}
 
 const StakingHierarchy: React.FC<IProps> = () => {
-  const { t } = useTranslation()
-
   return (
     <Container>
       <Section number={1}>
@@ -290,11 +287,9 @@ const StakingHierarchy: React.FC<IProps> = () => {
           <SoloGlyph />
         </Glyph>
         <Content>
-          <p
-            dangerouslySetInnerHTML={{
-              __html: t("page-staking-hierarchy-solo-p1"),
-            }}
-          />
+          <p>
+            <Translation id="page-staking-hierarchy-solo-p1" />
+          </p>
           <p>
             <Translation id="page-staking-hierarchy-solo-p2" />
           </p>
@@ -446,11 +441,9 @@ const StakingHierarchy: React.FC<IProps> = () => {
           <p>
             <Translation id="page-staking-hierarchy-cex-p2" />
           </p>
-          <p
-            dangerouslySetInnerHTML={{
-              __html: t("page-staking-hierarchy-cex-p3"),
-            }}
-          />
+          <p>
+            <Translation id="page-staking-hierarchy-cex-p3" />
+          </p>
         </Content>
       </Section>
     </Container>
diff --git a/src/components/Staking/StakingHowSoloWorks.tsx b/src/components/Staking/StakingHowSoloWorks.tsx
index 9a137961e03..01f544bb57c 100644
--- a/src/components/Staking/StakingHowSoloWorks.tsx
+++ b/src/components/Staking/StakingHowSoloWorks.tsx
@@ -2,7 +2,6 @@ import React from "react"
 import styled from "@emotion/styled"
 import { graphql, useStaticQuery } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useTranslation } from "gatsby-plugin-react-i18next"
 
 import OrderedList from "../OrderedList"
 import Translation from "../Translation"
@@ -23,7 +22,6 @@ const Image = styled(GatsbyImage)``
 export interface IProps {}
 
 const StakingHowSoloWorks: React.FC<IProps> = () => {
-  const { t } = useTranslation()
   const { image } = useStaticQuery(graphql`
     {
       image: file(relativePath: { eq: "hackathon_transparent.png" }) {
@@ -40,11 +38,9 @@ const StakingHowSoloWorks: React.FC<IProps> = () => {
   `)
 
   const items = [
-    <p
-      dangerouslySetInnerHTML={{
-        __html: t("page-staking-how-solo-works-item-1"),
-      }}
-    />,
+    <p>
+      <Translation id="page-staking-how-solo-works-item-1" />
+    </p>,
     <p>
       <Translation id="page-staking-how-solo-works-item-2" />
     </p>,
diff --git a/src/components/Translation.tsx b/src/components/Translation.tsx
index 9e3a2d9be91..1665af2cc52 100644
--- a/src/components/Translation.tsx
+++ b/src/components/Translation.tsx
@@ -1,12 +1,26 @@
 import React from "react"
-import { Trans } from "gatsby-plugin-react-i18next"
+import { useTranslation } from "gatsby-plugin-react-i18next"
+import htmr from "htmr"
 
-interface Props extends React.ComponentProps<typeof Trans> {
+import Link from "./Link"
+
+interface Props {
   id: string
 }
 
+const transform = {
+  a: Link,
+}
+
 // Wrapper on <FormattedHTMLMessage /> to always fallback to English
 // Use this component for any user-facing string
-const Translation = ({ id, ...rest }: Props) => <Trans i18nKey={id} {...rest} />
+const Translation = ({ id, ...rest }: Props) => {
+  const { t } = useTranslation()
+
+  const translatedText = t(id)
+
+  // @ts-ignore
+  return <>{htmr(translatedText, { transform })}</>
+}
 
 export default Translation
diff --git a/src/pages-conditional/what-is-ethereum.tsx b/src/pages-conditional/what-is-ethereum.tsx
index 570aef344a8..5af68f305f0 100644
--- a/src/pages-conditional/what-is-ethereum.tsx
+++ b/src/pages-conditional/what-is-ethereum.tsx
@@ -649,21 +649,17 @@ const WhatIsEthereumPage = ({
                   <p>
                     <Translation id="page-what-is-ethereum-slide-2-desc-1" />
                   </p>
-                  <p
-                    dangerouslySetInnerHTML={{
-                      __html: t("page-what-is-ethereum-slide-2-desc-2"),
-                    }}
-                  />
+                  <p>
+                    <Translation id="page-what-is-ethereum-slide-2-desc-2" />
+                  </p>
                 </EmblaSlide>
                 <EmblaSlide>
                   <h3>
                     <Translation id="page-what-is-ethereum-slide-3-title" />
                   </h3>
-                  <p
-                    dangerouslySetInnerHTML={{
-                      __html: t("page-what-is-ethereum-slide-3-desc-1"),
-                    }}
-                  />
+                  <p>
+                    <Translation id="page-what-is-ethereum-slide-3-desc-1" />
+                  </p>
                 </EmblaSlide>
                 <EmblaSlide>
                   <h3>
diff --git a/src/pages/layer-2.tsx b/src/pages/layer-2.tsx
index 65e7e6d264c..4a8c94dde24 100644
--- a/src/pages/layer-2.tsx
+++ b/src/pages/layer-2.tsx
@@ -552,16 +552,12 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             <h2>
               <Translation id="layer-2-why-do-we-need-layer-2-title" />
             </h2>
-            <p
-              dangerouslySetInnerHTML={{
-                __html: t("layer-2-why-do-we-need-layer-2-1"),
-              }}
-            />
-            <p
-              dangerouslySetInnerHTML={{
-                __html: t("layer-2-why-do-we-need-layer-2-2"),
-              }}
-            />
+            <p>
+              <Translation id="layer-2-why-do-we-need-layer-2-1" />
+            </p>
+            <p>
+              <Translation id="layer-2-why-do-we-need-layer-2-2" />
+            </p>
 
             <h3>
               <Translation id="layer-2-why-do-we-need-layer-2-scalability" />
@@ -569,11 +565,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             <p>
               <Translation id="layer-2-why-do-we-need-layer-2-scalability-1" />
             </p>
-            <p
-              dangerouslySetInnerHTML={{
-                __html: t("layer-2-why-do-we-need-layer-2-scalability-2"),
-              }}
-            />
+            <p>
+              <Translation id="layer-2-why-do-we-need-layer-2-scalability-2" />
+            </p>
             <Link to="/upgrades/vision/">
               <Translation id="layer-2-why-do-we-need-layer-2-scalability-3" />
             </Link>
@@ -609,7 +603,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             <h3>
               <Translation id="layer-2-rollups-title" />
             </h3>
-            <p dangerouslySetInnerHTML={{ __html: t("layer-2-rollups-1") }} />
+            <p>
+              <Translation id="layer-2-rollups-1" />
+            </p>
             <p>
               <Translation id="layer-2-rollups-2" />
             </p>
@@ -677,9 +673,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
         <p>
           <Translation id="layer-2-use-layer-2-1" />
         </p>
-        <p
-          dangerouslySetInnerHTML={{ __html: t("layer-2-contract-accounts") }}
-        />
+        <p>
+          <Translation id="layer-2-contract-accounts" />
+        </p>
         <h3>
           <Translation id="layer-2-use-layer-2-generalized-title" />
         </h3>
@@ -847,16 +843,12 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
           <p>
             <Translation id="layer-2-faq-question-4-description-1" />
           </p>
-          <p
-            dangerouslySetInnerHTML={{
-              __html: t("layer-2-faq-question-4-description-2"),
-            }}
-          />
-          <p
-            dangerouslySetInnerHTML={{
-              __html: t("layer-2-faq-question-4-description-3"),
-            }}
-          />
+          <p>
+            <Translation id="layer-2-faq-question-4-description-2" />
+          </p>
+          <p>
+            <Translation id="layer-2-faq-question-4-description-3" />
+          </p>
           <p>
             <Link to="/bridges/">
               <Translation id="layer-2-more-on-bridges" />
@@ -870,11 +862,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
               <Translation id="layer-2-faq-question-5-view-listing-policy" />
             </Link>
           </p>
-          <p
-            dangerouslySetInnerHTML={{
-              __html: t("layer-2-faq-question-5-description-2"),
-            }}
-          />
+          <p>
+            <Translation id="layer-2-faq-question-5-description-2" />
+          </p>
         </ExpandableCard>
       </PaddedContent>
 
diff --git a/src/pages/run-a-node.tsx b/src/pages/run-a-node.tsx
index b1edff62b9e..8b2318bee13 100644
--- a/src/pages/run-a-node.tsx
+++ b/src/pages/run-a-node.tsx
@@ -943,11 +943,9 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
           <StyledEmoji text=":cut_of_meat:" size={2} />
           <Translation id="page-run-a-node-staking-plans-title" />
         </h3>
-        <p
-          dangerouslySetInnerHTML={{
-            __html: t("page-run-a-node-staking-plans-description"),
-          }}
-        />
+        <p>
+          <Translation id="page-run-a-node-staking-plans-description" />
+        </p>
         <p>
           <Translation id="page-run-a-node-staking-plans-ethstaker-link-description" />{" "}
           -{" "}
diff --git a/src/pages/staking/index.tsx b/src/pages/staking/index.tsx
index 00604b4fbe7..979228251fe 100644
--- a/src/pages/staking/index.tsx
+++ b/src/pages/staking/index.tsx
@@ -470,13 +470,9 @@ const StakingPage = ({
                   <li>
                     <Translation id="page-staking-section-comparison-solo-requirements-li2" />
                   </li>
-                  <li
-                    dangerouslySetInnerHTML={{
-                      __html: t(
-                        "page-staking-section-comparison-solo-requirements-li3"
-                      ),
-                    }}
-                  />
+                  <li>
+                    <Translation id="page-staking-section-comparison-solo-requirements-li3" />
+                  </li>
                 </ul>
               </div>
               <div style={{ gridArea: "solo-cta" }}>
@@ -632,11 +628,9 @@ const StakingPage = ({
               <p>
                 <Translation id="page-staking-faq-3-answer-p1" />
               </p>
-              <p
-                dangerouslySetInnerHTML={{
-                  __html: t("page-staking-faq-3-answer-p2"),
-                }}
-              />
+              <p>
+                <Translation id="page-staking-faq-3-answer-p2" />
+              </p>
             </ExpandableCard>
           </Content>
           <Content>
diff --git a/src/pages/upgrades/vision.tsx b/src/pages/upgrades/vision.tsx
index 54a4fc37be0..45bb6b22483 100644
--- a/src/pages/upgrades/vision.tsx
+++ b/src/pages/upgrades/vision.tsx
@@ -218,11 +218,9 @@ const VisionPage = ({
           <p>
             <Translation id="page-upgrades-vision-scalability-desc" />
           </p>
-          <p
-            dangerouslySetInnerHTML={{
-              __html: t("page-upgrades-vision-scalability-desc-3"),
-            }}
-          />
+          <p>
+            <Translation id="page-upgrades-vision-scalability-desc-3" />
+          </p>
           <p>
             <Translation id="page-upgrades-vision-scalability-desc-4" />{" "}
             <Link to="/upgrades/sharding/">
diff --git a/yarn.lock b/yarn.lock
index 04caded673e..3628a71af33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10798,7 +10798,7 @@ htmlparser2@^4.1.0:
     domutils "^2.0.0"
     entities "^2.0.0"
 
-htmlparser2@^6.1.0:
+htmlparser2@^6.0.0, htmlparser2@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
   integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
@@ -10808,6 +10808,14 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
+htmr@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/htmr/-/htmr-1.0.2.tgz#6e1feb8e4a62bae69774a95ca00702a32ac96b16"
+  integrity sha512-7T9babEHZwECQ2/ouxNPow1uGcKbj/BcbslPGPRxBKIOLNiIrFKq6ELzor7mc4HiexZzdb3izQQLl16bhPR9jw==
+  dependencies:
+    html-entities "^2.1.0"
+    htmlparser2 "^6.0.0"
+
 http-cache-semantics@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"

From 1becc653b6ef398956c8ebbbffeb25cb3c6bbfe4 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Wed, 23 Nov 2022 12:11:18 -0300
Subject: [PATCH 066/108] update Translation comments

---
 src/components/Translation.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/Translation.tsx b/src/components/Translation.tsx
index 1665af2cc52..3e389f29820 100644
--- a/src/components/Translation.tsx
+++ b/src/components/Translation.tsx
@@ -8,17 +8,20 @@ interface Props {
   id: string
 }
 
+// Custom components mapping to be used by `htmr` when parsing the translation
+// text
 const transform = {
   a: Link,
 }
 
-// Wrapper on <FormattedHTMLMessage /> to always fallback to English
-// Use this component for any user-facing string
-const Translation = ({ id, ...rest }: Props) => {
+// Renders the translation string for the given translation key `id`. It
+// fallback to English if it doesn't find the given key in the current language
+const Translation = ({ id }: Props) => {
   const { t } = useTranslation()
 
   const translatedText = t(id)
 
+  // Use `htmr` to parse html content in the translation text
   // @ts-ignore
   return <>{htmr(translatedText, { transform })}</>
 }

From 3df272f1092320be194c9cd9711f9f40b4481e20 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Wed, 23 Nov 2022 17:26:46 -0300
Subject: [PATCH 067/108] Update src/components/ExpandableCard.tsx

---
 src/components/ExpandableCard.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx
index 196b85b1373..0771d3e658c 100644
--- a/src/components/ExpandableCard.tsx
+++ b/src/components/ExpandableCard.tsx
@@ -132,7 +132,6 @@ const ExpandableCard: React.FC<IProps> = ({
           <Box
             fontSize="md"
             color="text"
-            marginTop="8"
             paddingTop="6"
             borderTop="1px solid"
             borderColor="border"

From 23325b80467672aa647123acb6544a23ca0fd2e0 Mon Sep 17 00:00:00 2001
From: tylerapfledderer <tyler.pfledderer@gmail.com>
Date: Wed, 23 Nov 2022 20:00:23 -0500
Subject: [PATCH 068/108] refactor(leaderboard): apply intl to list aria-label

---
 src/components/Leaderboard.tsx                         | 9 ++++++++-
 src/intl/en/page-upgrades-get-involved-bug-bounty.json | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index d35de15b8cc..153b61c0c8b 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -14,6 +14,8 @@ import Emoji from "./Emoji"
 import Link from "./Link"
 
 import Translation from "./Translation"
+import { translateMessageId } from "../utils/translations"
+import { useIntl } from "react-intl"
 
 const githubUrl = `https://github.com/`
 
@@ -42,13 +44,18 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
     }
   )
 
+  const intl = useIntl()
+
   return (
     <List
       bgColor="background"
       boxShadow={colorModeStyles.listBoxShadow}
       w="100%"
       mb={8}
-      aria-label="Bug hunting leaderboard"
+      aria-label={translateMessageId(
+        "page-upgrades-bug-bounty-leaderboard-list",
+        intl
+      )}
     >
       {content
         .filter((_, idx) => idx < limit)
diff --git a/src/intl/en/page-upgrades-get-involved-bug-bounty.json b/src/intl/en/page-upgrades-get-involved-bug-bounty.json
index 4e4682b691e..b89789c1499 100644
--- a/src/intl/en/page-upgrades-get-involved-bug-bounty.json
+++ b/src/intl/en/page-upgrades-get-involved-bug-bounty.json
@@ -27,6 +27,7 @@
   "page-upgrades-bug-bounty-hunting-li-3": "Employees and contractors of the Ethereum Foundation or client teams in scope of the bounty program may participate in the program only in the accrual of points and will not receive monetary rewards.",
   "page-upgrades-bug-bounty-hunting-li-4": "Ethereum bounty program considers a number of variables in determining rewards. Determinations of eligibility, score and all terms related to an award are at the sole and final discretion of the Ethereum Foundation bug bounty panel.",
   "page-upgrades-bug-bounty-leaderboard": "See full leaderboards",
+  "page-upgrades-bug-bounty-leaderboard-list": "Bug bounty leaderboard",
   "page-upgrades-bug-bounty-leaderboard-points": "points",
   "page-upgrades-bug-bounty-ledger-desc": "The Ethereum Specifications detail the design rationale for the Execution Layer and Consensus Layer.",
   "page-upgrades-bug-bounty-ledger-title": "Specification bugs",

From 2a869eed2d70c50b33be6fe050ed2f0b43291e7b Mon Sep 17 00:00:00 2001
From: tylerapfledderer <tyler.pfledderer@gmail.com>
Date: Wed, 23 Nov 2022 20:01:54 -0500
Subject: [PATCH 069/108] refactor(leaderboard): update hidden sentence in link
 overlay

---
 src/components/Leaderboard.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index 153b61c0c8b..2d655a26921 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -120,7 +120,9 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
                     color="text"
                     hideArrow
                   >
-                    <VisuallyHidden>{`In ${PLACE_WORDS[idx]} place with ${score} points`}</VisuallyHidden>
+                    <VisuallyHidden>{`In place number ${
+                      idx + 1
+                    } with ${score} points`}</VisuallyHidden>
                     {name}{" "}
                     {hasGitHub && (
                       <VisuallyHidden>(See Github Profile)</VisuallyHidden>

From a29b18842dbea19f040ed7825e1ee066e7a67f6e Mon Sep 17 00:00:00 2001
From: Daniel Olshansky <olshansky.daniel@gmail.com>
Date: Wed, 23 Nov 2022 21:29:43 -0800
Subject: [PATCH 070/108] Update
 src/content/developers/docs/nodes-and-clients/index.md

Co-authored-by: Joshua <62268199+minimalsm@users.noreply.github.com>
---
 src/content/developers/docs/nodes-and-clients/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/developers/docs/nodes-and-clients/index.md b/src/content/developers/docs/nodes-and-clients/index.md
index 6890fdcae6e..e345de8298f 100644
--- a/src/content/developers/docs/nodes-and-clients/index.md
+++ b/src/content/developers/docs/nodes-and-clients/index.md
@@ -78,7 +78,7 @@ The execution client Geth includes a [light sync](https://github.com/ethereum/de
 
 There are also potential routes to providing light client data over the [gossip network](https://www.ethportal.net/). This is advantageous because the gossip network could support a network of light nodes without requiring full nodes to serve requests.
 
-Ethereum does not support a large population of light nodes yet, but light node support is an area expected to develop rapidly in the near future. In particular, clients like [Nimbus](https://nimbus.team/), [Helios](https://github.com/a16z/helios) and [LodeStar](https://lodestar.chainsafe.io/) are paving the way at the time of writing.
+Ethereum does not support a large population of light nodes yet, but light node support is an area expected to develop rapidly in the near future. In particular, clients like [Nimbus](https://nimbus.team/), [Helios](https://github.com/a16z/helios), and [LodeStar](https://lodestar.chainsafe.io/) are currently heavily focused on light nodes.
 
 ### Archive node {#archive-node}
 

From a1f1b092f78e678b92ac9ce075ad1addf660c40b Mon Sep 17 00:00:00 2001
From: mossow <mossow@users.noreply.github.com>
Date: Thu, 24 Nov 2022 11:46:23 +0200
Subject: [PATCH 071/108] Added NFTPort to the list

---
 src/content/developers/docs/apis/backend/index.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/content/developers/docs/apis/backend/index.md b/src/content/developers/docs/apis/backend/index.md
index fa4314ef45c..98707676e40 100644
--- a/src/content/developers/docs/apis/backend/index.md
+++ b/src/content/developers/docs/apis/backend/index.md
@@ -52,6 +52,13 @@ These libraries abstract away much of the complexity of interacting directly wit
 - [DataHub](https://www.figment.io/datahub)
 - [Documentation](https://docs.figment.io/introduction/what-is-datahub)
 
+**NFTPort -** **_Ethereum Data and Mint APIs._**
+
+- [nftport.xyz](https://www.nftport.xyz/)
+- [Documentation](https://docs.nftport.xyz/)
+- [GitHub](https://github.com/nftport/)
+- [Discord](https://discord.com/invite/K8nNrEgqhE)
+
 **Nodesmith -** **_JSON-RPC API access to Ethereum Mainnet and testnets._**
 
 - [nodesmith.io](https://nodesmith.io/network/ethereum/)

From 34ee4de1b900e8b280b967d2a16c8f6c4cce5b3c Mon Sep 17 00:00:00 2001
From: amit-ksh <ksamit1110@gmail.com>
Date: Fri, 25 Nov 2022 07:57:49 +0530
Subject: [PATCH 072/108] add new varaint to Tabs

---
 .../gatsby-plugin/components/Tabs.ts          | 32 +++++++++++++++++++
 .../gatsby-plugin/components/index.ts         |  2 ++
 src/components/Tabs.tsx                       | 26 +++------------
 3 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 src/@chakra-ui/gatsby-plugin/components/Tabs.ts

diff --git a/src/@chakra-ui/gatsby-plugin/components/Tabs.ts b/src/@chakra-ui/gatsby-plugin/components/Tabs.ts
new file mode 100644
index 00000000000..f7ae1a8ce8a
--- /dev/null
+++ b/src/@chakra-ui/gatsby-plugin/components/Tabs.ts
@@ -0,0 +1,32 @@
+import type { ComponentStyleConfig } from "@chakra-ui/theme"
+
+export const Tabs: ComponentStyleConfig = {
+  variants: {
+    primary: {
+      tab: {
+        borderTopRadius: "0.3rem",
+        borderBottom: "1px solid",
+        borderBottomColor: "primary",
+        px: 4,
+        py: "0.3rem",
+        _selected: {
+          color: "background",
+          bg: "primary",
+        },
+      },
+      tabpanels: {
+        mt: 4,
+      },
+      tabpanel: {
+        p: 6,
+        bg: "ednBackground",
+        border: "1px solid",
+        borderColor: "lightBorder",
+        borderRadius: "lg",
+      },
+    },
+  },
+  defaultProps: {
+    variant: "primary",
+  },
+}
diff --git a/src/@chakra-ui/gatsby-plugin/components/index.ts b/src/@chakra-ui/gatsby-plugin/components/index.ts
index fd9bcb77d1e..b5f1e3229c1 100644
--- a/src/@chakra-ui/gatsby-plugin/components/index.ts
+++ b/src/@chakra-ui/gatsby-plugin/components/index.ts
@@ -3,6 +3,7 @@ import { Link } from "./Link"
 import { Tag } from "./Tag"
 import { Modal } from "./Modal"
 import { Checkbox } from "./Checkbox"
+import { Tabs } from "./Tabs"
 
 export default {
   Button,
@@ -10,4 +11,5 @@ export default {
   Tag,
   Modal,
   Checkbox,
+  Tabs,
 }
diff --git a/src/components/Tabs.tsx b/src/components/Tabs.tsx
index c162216501e..eddd350e4d9 100644
--- a/src/components/Tabs.tsx
+++ b/src/components/Tabs.tsx
@@ -25,35 +25,17 @@ const Tabs: React.FC<IProps> = ({ tabs, onTabClick }) => {
   }
 
   return (
-    <ChakraTabs as="nav" variant="unstyled">
+    <ChakraTabs as="nav">
       <TabList>
         {tabs.map((tab, index) => (
-          <Tab
-            key={index}
-            px={4}
-            py="0.3rem"
-            borderBottom="1px solid"
-            borderColor="primary"
-            borderTopRadius="0.3rem"
-            _selected={{ color: "background", bg: "primary" }}
-            onClick={() => handleTabClick(index)}
-          >
+          <Tab key={index} onClick={() => handleTabClick(index)}>
             {tab.title}
           </Tab>
         ))}
       </TabList>
-      <TabPanels as="main" mt={4}>
+      <TabPanels as="main">
         {tabs.map((tab, index) => (
-          <TabPanel
-            key={index}
-            p={6}
-            bg="ednBackground"
-            border="1px solid"
-            borderColor="lightBorder"
-            borderRadius="lg"
-          >
-            {tab.content}
-          </TabPanel>
+          <TabPanel key={index}>{tab.content}</TabPanel>
         ))}
       </TabPanels>
     </ChakraTabs>

From c238e6f05d73be2cfa7bc21fa506d2f048282794 Mon Sep 17 00:00:00 2001
From: browny <mahendrabrowny@gmail.com>
Date: Sat, 26 Nov 2022 14:28:11 +0530
Subject: [PATCH 073/108] Update src/components/SkipLink.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/SkipLink.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SkipLink.tsx b/src/components/SkipLink.tsx
index 77b2105cd35..b8a324ca3f9 100644
--- a/src/components/SkipLink.tsx
+++ b/src/components/SkipLink.tsx
@@ -14,7 +14,7 @@ export const SkipLink: React.FC<IProps> = ({ hrefId }) => {
         lineHeight="2rem"
         position="absolute"
         top="-3rem"
-        ml=".5rem"
+        ml="2"
         color="background"
         textDecorationLine="none"
         _hover={{ textDecoration: "none" }}

From 2fd0f031795319f5f07d318bce6d81b56a77bdb5 Mon Sep 17 00:00:00 2001
From: browny <mahendrabrowny@gmail.com>
Date: Sat, 26 Nov 2022 14:28:22 +0530
Subject: [PATCH 074/108] Update src/components/SkipLink.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/SkipLink.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SkipLink.tsx b/src/components/SkipLink.tsx
index b8a324ca3f9..d83956c87e8 100644
--- a/src/components/SkipLink.tsx
+++ b/src/components/SkipLink.tsx
@@ -11,7 +11,7 @@ export const SkipLink: React.FC<IProps> = ({ hrefId }) => {
     <Box bg="primary">
       <Link
         href={hrefId}
-        lineHeight="2rem"
+        lineHeight="taller"
         position="absolute"
         top="-3rem"
         ml="2"

From cc6e9f89200dfea1fd3c1b254b06c2e28865ad74 Mon Sep 17 00:00:00 2001
From: browny <mahendrabrowny@gmail.com>
Date: Sat, 26 Nov 2022 14:28:57 +0530
Subject: [PATCH 075/108] Update src/components/SkipLink.tsx

Co-authored-by: Pablo Pettinari <pettinarip@gmail.com>
---
 src/components/SkipLink.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SkipLink.tsx b/src/components/SkipLink.tsx
index d83956c87e8..13216785642 100644
--- a/src/components/SkipLink.tsx
+++ b/src/components/SkipLink.tsx
@@ -13,7 +13,7 @@ export const SkipLink: React.FC<IProps> = ({ hrefId }) => {
         href={hrefId}
         lineHeight="taller"
         position="absolute"
-        top="-3rem"
+        top="-12"
         ml="2"
         color="background"
         textDecorationLine="none"

From e0c7674ea1c632307c033ac20691e258de48a61f Mon Sep 17 00:00:00 2001
From: browny <mahendrabrowny@gmail.com>
Date: Sat, 26 Nov 2022 14:51:00 +0530
Subject: [PATCH 076/108] Update SkipLink.tsx

---
 src/components/SkipLink.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/SkipLink.tsx b/src/components/SkipLink.tsx
index 13216785642..47ab0bb0a7d 100644
--- a/src/components/SkipLink.tsx
+++ b/src/components/SkipLink.tsx
@@ -1,6 +1,7 @@
 import React from "react"
 import Translation from "./Translation"
-import { Box, Link } from "@chakra-ui/react"
+import { Box } from "@chakra-ui/react"
+import Link from "../components/Link"
 
 export interface IProps {
   hrefId: string

From 951462b705c1d536c68ebb42ea3e393f7204797d Mon Sep 17 00:00:00 2001
From: Roshan R Chandar <43182697+Roshan-R@users.noreply.github.com>
Date: Sat, 26 Nov 2022 21:54:02 +0530
Subject: [PATCH 077/108] fix broken link to eth-docker.net

The old link redirected to https://eth-docker.net/docs/About/Overview/ which does not exist anymore.
Changed to https://eth-docker.net/
---
 .../developers/docs/nodes-and-clients/run-a-node/index.md       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/developers/docs/nodes-and-clients/run-a-node/index.md b/src/content/developers/docs/nodes-and-clients/run-a-node/index.md
index cbac75f8cab..92fb1abb99a 100644
--- a/src/content/developers/docs/nodes-and-clients/run-a-node/index.md
+++ b/src/content/developers/docs/nodes-and-clients/run-a-node/index.md
@@ -134,7 +134,7 @@ Multiple user-friendly projects aim to improve the experience of setting up a cl
 Below are a few projects which can help you install and control clients just with a few clicks:
 
 - [DappNode](https://docs.dappnode.io/get-started/installation/custom-hardware/installation/overview/) - DappNode doesn't come only with a machine from a vendor. The software, the actual node launcher and control center with many features can be used on arbitrary hardware.
-- [eth-docker](https://eth-docker.net/docs/About/Overview/) - Automatized setup using Docker focused on easy and secure staking, requires basic terminal and Docker knowledge, recommended for a bit more advanced users.
+- [eth-docker](https://eth-docker.net/) - Automatized setup using Docker focused on easy and secure staking, requires basic terminal and Docker knowledge, recommended for a bit more advanced users.
 - [Stereum](https://stereum.net/ethereum-node-setup/) - Launcher for installing clients on a remote server via SSH connection with a GUI setup guide, control center, and many other features.
 - [NiceNode](https://www.nicenode.xyz/) - Launcher with a straightforward user experience to run a node on your computer. Just choose clients and start them with a few clicks. Still in development.
 

From 5ed0b975d82fea294fc0a10a8faeac85f576f696 Mon Sep 17 00:00:00 2001
From: Amine E <aelmanaa@users.noreply.github.com>
Date: Mon, 28 Nov 2022 09:31:49 +0100
Subject: [PATCH 078/108] Use systemic rather than systematic

imho, the right terminology is systemic

systematic = methodical  (= there is a plan/structure in place)
systemic = affects every part of an entire system
---
 src/content/developers/docs/bridges/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/developers/docs/bridges/index.md b/src/content/developers/docs/bridges/index.md
index 321fccca2cd..783d84b5ac8 100644
--- a/src/content/developers/docs/bridges/index.md
+++ b/src/content/developers/docs/bridges/index.md
@@ -70,7 +70,7 @@ To evaluate trustless bridges based on other factors, we must break them down in
 Bridges account for the top three [biggest hacks in DeFi](https://rekt.news/leaderboard/) and are still in the early stages of development. Using any bridge carries the following risks:
 
 - **Smart contract risk –** While many bridges have successfully passed audits, all it takes is one flaw in a smart contract for assets to be exposed to hacks (ex: [Solana’s Wormhole Bridge](https://rekt.news/wormhole-rekt/)).
-- **Systematic financial risks** – Many bridges use wrapped assets to mint canonical versions of the original asset on a new chain. This exposes the ecosystem to systematic risk, as we have seen wrapped versions of tokens exploited.
+- **Systemic financial risks** – Many bridges use wrapped assets to mint canonical versions of the original asset on a new chain. This exposes the ecosystem to systemic risk, as we have seen wrapped versions of tokens exploited.
 - **Counterparty risk –** Some bridges utilize a trusted design that requires users to rely on the assumption that validators will not collude to steal user funds. The need for users to trust these third-party actors exposes them to risks such as rug pulls, censorship, and other malicious activities.
 - **Open issues –** Given that bridges are in the nascent stages of development, there are many unanswered questions related to how bridges will perform in different market conditions, like times of network congestion and during unforeseen events such as network-level attacks or state rollbacks. This uncertainty poses certain risks, the degree of which is still unknown.
 

From 6680dc3961f2ecce88d09c1f7574e4e5528fec80 Mon Sep 17 00:00:00 2001
From: Fredrik Svantes <fredrik@ethereum.org>
Date: Mon, 28 Nov 2022 12:11:21 +0100
Subject: [PATCH 079/108] Upped score for Chainsecurity

+500 score for a finding
---
 src/data/execution-bounty-hunters.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/execution-bounty-hunters.csv b/src/data/execution-bounty-hunters.csv
index d1bf2b46153..c266c7fc268 100644
--- a/src/data/execution-bounty-hunters.csv
+++ b/src/data/execution-bounty-hunters.csv
@@ -1,7 +1,7 @@
 username, name, score
 samczsun, "Sam Sun", 35000
 holiman, "Martin Holst Swende", 35500
-chainsecurity, "ChainSecurity", 23000
+chainsecurity, "ChainSecurity", 23500
 junorouse, "Juno Im", 20500
 uknowy, "Yoonho Kim (team Hithereum)", 20000
 johnyangk, "John Youngseok Yang (Software Platform Lab)", 20000

From fd60ffd6bf4fc23dcbea0dffa8559aab2a3004e9 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:13:50 +0000
Subject: [PATCH 080/108] docs: update README.md [skip ci]

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1ad9dc54666..52331e6d56c 100644
--- a/README.md
+++ b/README.md
@@ -1520,6 +1520,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="http://sahilaujla.com"><img src="https://avatars.githubusercontent.com/u/83442423?v=4?s=100" width="100px;" alt="Sahil Aujla"/><br /><sub><b>Sahil Aujla</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=SahilAujla" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/ritave"><img src="https://avatars.githubusercontent.com/u/1614945?v=4?s=100" width="100px;" alt="Olaf Tomalka"/><br /><sub><b>Olaf Tomalka</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ritave" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/armgp"><img src="https://avatars.githubusercontent.com/u/49094298?v=4?s=100" width="100px;" alt="Abhiram G P"/><br /><sub><b>Abhiram G P</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=armgp" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/aelmanaa"><img src="https://avatars.githubusercontent.com/u/4503543?v=4?s=100" width="100px;" alt="Amine E."/><br /><sub><b>Amine E.</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aelmanaa" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

From 684737ec3b4d98bc682911dcbf9ccb4cef768150 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:13:51 +0000
Subject: [PATCH 081/108] docs: update .all-contributorsrc [skip ci]

---
 .all-contributorsrc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 109d866793e..6eab837e148 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -9671,6 +9671,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "aelmanaa",
+      "name": "Amine E.",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4503543?v=4",
+      "profile": "https://github.com/aelmanaa",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

From 2707a35a7591182ca12b56e191d6b01764642a94 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:22:50 +0000
Subject: [PATCH 082/108] docs: update README.md [skip ci]

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 52331e6d56c..4250e65cc66 100644
--- a/README.md
+++ b/README.md
@@ -1521,6 +1521,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/ritave"><img src="https://avatars.githubusercontent.com/u/1614945?v=4?s=100" width="100px;" alt="Olaf Tomalka"/><br /><sub><b>Olaf Tomalka</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ritave" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/armgp"><img src="https://avatars.githubusercontent.com/u/49094298?v=4?s=100" width="100px;" alt="Abhiram G P"/><br /><sub><b>Abhiram G P</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=armgp" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/aelmanaa"><img src="https://avatars.githubusercontent.com/u/4503543?v=4?s=100" width="100px;" alt="Amine E."/><br /><sub><b>Amine E.</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aelmanaa" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://roshan.ml/"><img src="https://avatars.githubusercontent.com/u/43182697?v=4?s=100" width="100px;" alt="Roshan R Chandar"/><br /><sub><b>Roshan R Chandar</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Roshan-R" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

From a35dc46ea2f00e72e16d29c12ca3c8dab0a868fc Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:22:51 +0000
Subject: [PATCH 083/108] docs: update .all-contributorsrc [skip ci]

---
 .all-contributorsrc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 6eab837e148..3ad7c0051dc 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -9680,6 +9680,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Roshan-R",
+      "name": "Roshan R Chandar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43182697?v=4",
+      "profile": "https://roshan.ml/",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

From e3badb0f72b8faea5c1c2701192833750a83cc3d Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:25:46 +0000
Subject: [PATCH 084/108] Fix broken ethdocker link

---
 .../it/developers/docs/nodes-and-clients/run-a-node/index.md    | 2 +-
 .../zh/developers/docs/nodes-and-clients/run-a-node/index.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/content/translations/it/developers/docs/nodes-and-clients/run-a-node/index.md b/src/content/translations/it/developers/docs/nodes-and-clients/run-a-node/index.md
index fca4bfb7967..a98f17c7c24 100644
--- a/src/content/translations/it/developers/docs/nodes-and-clients/run-a-node/index.md
+++ b/src/content/translations/it/developers/docs/nodes-and-clients/run-a-node/index.md
@@ -133,7 +133,7 @@ Diversi progetti intuitivi mirano a migliorare l'esperienza di configurazione di
 Di seguito trovi alcuni progetti che possono aiutarti a installare e controllare i client in pochi click:
 
 - [DappNode](https://docs.dappnode.io/get-started/installation/custom-hardware/installation/overview/) - DappNode non è fornito solo con una macchina da un fornitore. Il software, il launcher del nodo vero e proprio e il centro di controllo con molte funzionalità, sono utilizzabili su hardware arbitrario.
-- [eth-docker](https://eth-docker.net/docs/About/Overview/) - La configurazione automatizzata usando Docker, incentrata sullo staking facile e sicuro, richiede una conoscenza di base del terminale e di Docker, consigliata per gli utenti un po' più avanzati.
+- [eth-docker](https://eth-docker.net/) - La configurazione automatizzata usando Docker, incentrata sullo staking facile e sicuro, richiede una conoscenza di base del terminale e di Docker, consigliata per gli utenti un po' più avanzati.
 - [Stereum](https://stereum.net/ethereum-node-setup/) - Launcher per installare i client su un server remoto tramite connessione SSH con una guida di configurazione con GUI, un centro di controllo e molte altre funzionalità.
 - [NiceNode](https://www.nicenode.xyz/) - Launcher con un'esperienza utente semplice per eseguire un nodo sul tuo computer. Basta scegliere i client e avviarli in pochi clic. Ancora in fase di sviluppo.
 
diff --git a/src/content/translations/zh/developers/docs/nodes-and-clients/run-a-node/index.md b/src/content/translations/zh/developers/docs/nodes-and-clients/run-a-node/index.md
index 6651f0a05c9..37eb8b532da 100644
--- a/src/content/translations/zh/developers/docs/nodes-and-clients/run-a-node/index.md
+++ b/src/content/translations/zh/developers/docs/nodes-and-clients/run-a-node/index.md
@@ -133,7 +133,7 @@ sidebarDepth: 2
 以下是一些可以帮助你安装和控制客户端的项目，只需单击几下即可：
 
 - [DappNode](https://docs.dappnode.io/get-started/installation/custom-hardware/installation/overview/) - DappNode 不仅仅可以在供应商提供的机器上安装。 该软件、实际的节点启动器和具有许多功能的控制中心可以在任意硬件上使用。
-- [eth-docker](https://eth-docker.net/docs/About/Overview/) - 使用 Docker 进行的自动化设置，专注于简便和安全的质押，需要基本的终端和 Docker 知识，向更高级的用户推荐。
+- [eth-docker](https://eth-docker.net/) - 使用 Docker 进行的自动化设置，专注于简便和安全的质押，需要基本的终端和 Docker 知识，向更高级的用户推荐。
 - [Stereum](https://stereum.net/ethereum-node-setup/) - 通过 SSH 连接在远程服务器上安装客户端的启动器，配备 GUI 设置指南、控制中心和许多其他特征。
 - [NiceNode](https://www.nicenode.xyz/) - 提供简便用户体验的启动器，可在你的计算机上运行节点。 只需选择客户端并单击几下即可启动它们。 仍在开发中。
 

From cc9dc7ceae040401d52565e9b6b17fe928960f7e Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:52:35 +0000
Subject: [PATCH 085/108] docs: update README.md [skip ci]

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4250e65cc66..f06ec2a4a82 100644
--- a/README.md
+++ b/README.md
@@ -1522,6 +1522,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/armgp"><img src="https://avatars.githubusercontent.com/u/49094298?v=4?s=100" width="100px;" alt="Abhiram G P"/><br /><sub><b>Abhiram G P</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=armgp" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/aelmanaa"><img src="https://avatars.githubusercontent.com/u/4503543?v=4?s=100" width="100px;" alt="Amine E."/><br /><sub><b>Amine E.</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aelmanaa" title="Documentation">📖</a></td>
       <td align="center"><a href="https://roshan.ml/"><img src="https://avatars.githubusercontent.com/u/43182697?v=4?s=100" width="100px;" alt="Roshan R Chandar"/><br /><sub><b>Roshan R Chandar</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Roshan-R" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/mossow"><img src="https://avatars.githubusercontent.com/u/9072132?v=4?s=100" width="100px;" alt="mossow"/><br /><sub><b>mossow</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mossow" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

From bfe21da19f84b393b4c50e265ef624c59c56f0ea Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:52:36 +0000
Subject: [PATCH 086/108] docs: update .all-contributorsrc [skip ci]

---
 .all-contributorsrc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 3ad7c0051dc..f19926ffb33 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -9689,6 +9689,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "mossow",
+      "name": "mossow",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9072132?v=4",
+      "profile": "https://github.com/mossow",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

From 5611a250ad449dc1145f49fe6971c94a539a5b00 Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:57:45 +0000
Subject: [PATCH 087/108] Update
 src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md

---
 .../pow/mining-algorithms/dagger-hashimoto/index.md             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md b/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md
index a7a56246a4e..6876d7bfbd1 100644
--- a/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md
+++ b/src/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md
@@ -4,7 +4,7 @@ description: A detailed look at the Dagger-Hashimoto algorithm.
 lang: en
 ---
 
-Dagger-Hashimoto was the original research implementation and specification for Ethereum's mining algorithm. Dagger-Hashimoto was superseded by [Ethash](#ethash). Mining was switched off completely at [The Merge](/updates/merge) on 15th September 2022. Since then, Ethereum has been secured using a [proof-of-stake](/developers/docs/consensus-mechanisms/pos) mechanism instead. This page is for **historical interest** - the information here is no longer relevant for present-day Ethereum!
+Dagger-Hashimoto was the original research implementation and specification for Ethereum's mining algorithm. Dagger-Hashimoto was superseded by [Ethash](#ethash). Mining was switched off completely at [The Merge](/updates/merge) on 15th September 2022. Since then, Ethereum has been secured using a [proof-of-stake](/developers/docs/consensus-mechanisms/pos) mechanism instead. This page is for historical interest - the information here is no longer relevant for post-Merge Ethereum.
 
 ## Prerequisites {#prerequisites}
 

From 222417439f96c5fa93232c930478d50e93c235e5 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:02:38 +0000
Subject: [PATCH 088/108] docs: update README.md [skip ci]

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f06ec2a4a82..8c16766a267 100644
--- a/README.md
+++ b/README.md
@@ -1523,6 +1523,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/aelmanaa"><img src="https://avatars.githubusercontent.com/u/4503543?v=4?s=100" width="100px;" alt="Amine E."/><br /><sub><b>Amine E.</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aelmanaa" title="Documentation">📖</a></td>
       <td align="center"><a href="https://roshan.ml/"><img src="https://avatars.githubusercontent.com/u/43182697?v=4?s=100" width="100px;" alt="Roshan R Chandar"/><br /><sub><b>Roshan R Chandar</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Roshan-R" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/mossow"><img src="https://avatars.githubusercontent.com/u/9072132?v=4?s=100" width="100px;" alt="mossow"/><br /><sub><b>mossow</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mossow" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/OpenWJY"><img src="https://avatars.githubusercontent.com/u/29328336?v=4?s=100" width="100px;" alt="yujingwei"/><br /><sub><b>yujingwei</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=OpenWJY" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

From c7b2b39cf6e2f94370e105b1c44226d4c4f8ce48 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:02:39 +0000
Subject: [PATCH 089/108] docs: update .all-contributorsrc [skip ci]

---
 .all-contributorsrc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index f19926ffb33..b4ac9b32c40 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -9698,6 +9698,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "OpenWJY",
+      "name": "yujingwei",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29328336?v=4",
+      "profile": "https://github.com/OpenWJY",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

From 33ccf6b24f9c5d2333fd0f191db58f07137e619b Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:05:22 +0000
Subject: [PATCH 090/108] docs: update README.md [skip ci]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8c16766a267..5924942874b 100644
--- a/README.md
+++ b/README.md
@@ -1190,7 +1190,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/1337-ishaan"><img src="https://avatars.githubusercontent.com/u/64636222?v=4?s=100" width="100px;" alt="Ishaan Parmar"/><br /><sub><b>Ishaan Parmar</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=1337-ishaan" title="Code">💻</a> <a href="#design-1337-ishaan" title="Design">🎨</a> <a href="#ideas-1337-ishaan" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center"><a href="http://tarunbatra.com"><img src="https://avatars.githubusercontent.com/u/5329230?v=4?s=100" width="100px;" alt="Tarun Batra"/><br /><sub><b>Tarun Batra</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=tarunbatra" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Atarunbatra" title="Bug reports">🐛</a></td>
       <td align="center"><a href="https://github.com/max-donger"><img src="https://avatars.githubusercontent.com/u/56192627?v=4?s=100" width="100px;" alt="Max"/><br /><sub><b>Max</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=max-donger" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amax-donger" title="Bug reports">🐛</a></td>
-      <td align="center"><a href="https://github.com/LuozhuZhang"><img src="https://avatars.githubusercontent.com/u/70309026?v=4?s=100" width="100px;" alt="Luozhu"/><br /><sub><b>Luozhu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LuozhuZhang" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/LuozhuZhang"><img src="https://avatars.githubusercontent.com/u/70309026?v=4?s=100" width="100px;" alt="Luozhu"/><br /><sub><b>Luozhu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LuozhuZhang" title="Documentation">📖</a> <a href="#ideas-LuozhuZhang" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
     <tr>
       <td align="center"><a href="http://www.linkedin.com/in/sharma-yash"><img src="https://avatars.githubusercontent.com/u/44340561?v=4?s=100" width="100px;" alt="Yash Sharma "/><br /><sub><b>Yash Sharma </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=yash-sharma1" title="Documentation">📖</a></td>

From 4216d04f01f58caa51fcb0f79e5e2ce56c53febf Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:05:23 +0000
Subject: [PATCH 091/108] docs: update .all-contributorsrc [skip ci]

---
 .all-contributorsrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index b4ac9b32c40..cd24b1c5013 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -7313,7 +7313,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/70309026?v=4",
       "profile": "https://github.com/LuozhuZhang",
       "contributions": [
-        "doc"
+        "doc",
+        "ideas"
       ]
     },
     {

From 22bb85f1189133fa34e213593de6209234fc11f9 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 28 Nov 2022 12:06:12 -0300
Subject: [PATCH 092/108] update docs

---
 docs/best-practices.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/best-practices.md b/docs/best-practices.md
index 5403119f937..fd7d073c8c3 100644
--- a/docs/best-practices.md
+++ b/docs/best-practices.md
@@ -52,7 +52,7 @@ Markdown will be translated as whole pages of content, so no specific action is
 
   - _tl;dr Each individual JSON entry should be a complete phrase by itself_
 
-- This is done using the `Translation` component. However there is an alternative method for regular JS: `gatsby-theme-i18n` with `/src/utils/translations.ts`
+- This is done using the `Translation` component. However there is an alternative method for regular JS: using the `t` function from `gatsby-plugin-react-i18next`
 
   - **Method one: `<Translation />` component (preferred if only needed in JSX)**
 
@@ -63,19 +63,18 @@ Markdown will be translated as whole pages of content, so no specific action is
     ;<Translation id="language-json-key" />
     ```
 
-  - **Method two: `translateMessageId()`**
+  - **Method two: `t()`**
 
     ```tsx
-    import { useIntl } from "react-intl"
-    import { translateMessageId } from "src/utils/translations"
+    import { useTranslation } from "gatsby-plugin-react-i18next"
 
     // Utilize anywhere in JS using
-    const intl = useIntl()
-    translateMessageId("language-json-key", intl)
+    const { t } = useTranslation()
+    t("language-json-key")
     ```
 
     ```tsx
-    const siteTitle = translateMessageId("site-title", intl)
+    const siteTitle = t("site-title")
     ```
 
 ## React Hooks

From bd730d968312d2008c9257ad486af35db9bc4962 Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:18:55 +0000
Subject: [PATCH 093/108] Update
 src/content/developers/docs/nodes-and-clients/index.md

---
 src/content/developers/docs/nodes-and-clients/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/developers/docs/nodes-and-clients/index.md b/src/content/developers/docs/nodes-and-clients/index.md
index e345de8298f..4f45c52a9c2 100644
--- a/src/content/developers/docs/nodes-and-clients/index.md
+++ b/src/content/developers/docs/nodes-and-clients/index.md
@@ -125,7 +125,7 @@ If you're more of a technical user, dive into more details and options on how to
 
 ## Alternatives {#alternatives}
 
-Setting up your own node can cost you time and resources but you don’t always need to run your own instance. In this case, you can use a third party API provider like [Infura](https://infura.io), [Alchemy](https://alchemyapi.io), [Chainstack](https://chainstack.com), [Pocket](https://pokt.network/) or [QuikNode](https://www.quiknode.io). Alternatively, [ArchiveNode](https://archivenode.io/) is a community-funded Archive node that hopes to bring archive data on the Ethereum blockchain to independent developers who otherwise couldn't afford it. For an overview of using these services, check out [nodes as a service](/developers/docs/nodes-and-clients/nodes-as-a-service/).
+Setting up your own node can cost you time and resources but you don’t always need to run your own instance. In this case, you can use a third party API provider like [Infura](https://infura.io), [Alchemy](https://alchemyapi.io), [Chainstack](https://chainstack.com), or [QuikNode](https://www.quiknode.io). Alternatively, [ArchiveNode](https://archivenode.io/) is a community-funded Archive node that hopes to bring archive data on the Ethereum blockchain to independent developers who otherwise couldn't afford it. For an overview of using these services, check out [nodes as a service](/developers/docs/nodes-and-clients/nodes-as-a-service/).
 
 If somebody runs an Ethereum node with a public API in your community, you can point your light wallets (like MetaMask) to a community node [via Custom RPC](https://metamask.zendesk.com/hc/en-us/articles/360015290012-Using-a-Local-Node) and gain more privacy than with some random trusted third party.
 

From 7646fd8854e050a76eee7848a0c6fedeed20a095 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:20:09 +0000
Subject: [PATCH 094/108] docs: update README.md [skip ci]

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 5924942874b..7debfb4e64c 100644
--- a/README.md
+++ b/README.md
@@ -1525,6 +1525,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/mossow"><img src="https://avatars.githubusercontent.com/u/9072132?v=4?s=100" width="100px;" alt="mossow"/><br /><sub><b>mossow</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mossow" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/OpenWJY"><img src="https://avatars.githubusercontent.com/u/29328336?v=4?s=100" width="100px;" alt="yujingwei"/><br /><sub><b>yujingwei</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=OpenWJY" title="Documentation">📖</a></td>
     </tr>
+    <tr>
+      <td align="center"><a href="http://olshansky.info"><img src="https://avatars.githubusercontent.com/u/1892194?v=4?s=100" width="100px;" alt="Daniel Olshansky"/><br /><sub><b>Daniel Olshansky</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Olshansk" title="Documentation">📖</a> <a href="#ideas-Olshansk" title="Ideas, Planning, & Feedback">🤔</a></td>
+    </tr>
   </tbody>
 </table>
 

From c8a36c0f998d9f2e9010dd552c9f28c283be9285 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:20:10 +0000
Subject: [PATCH 095/108] docs: update .all-contributorsrc [skip ci]

---
 .all-contributorsrc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index cd24b1c5013..7f77a3594fb 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -9708,6 +9708,16 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Olshansk",
+      "name": "Daniel Olshansky",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1892194?v=4",
+      "profile": "http://olshansky.info",
+      "contributions": [
+        "doc",
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,

From 3e8fc0820d2cfd450b6a4671631a4793414eda0f Mon Sep 17 00:00:00 2001
From: Joe <jmcook1186@gmail.com>
Date: Mon, 28 Nov 2022 16:39:59 +0000
Subject: [PATCH 096/108] fix unit in energy chart

---
 src/intl/en/page-what-is-ethereum.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intl/en/page-what-is-ethereum.json b/src/intl/en/page-what-is-ethereum.json
index 6b1473dd0fd..ccafea1bc56 100644
--- a/src/intl/en/page-what-is-ethereum.json
+++ b/src/intl/en/page-what-is-ethereum.json
@@ -87,7 +87,7 @@
   "page-what-is-ethereum-energy-desc-1": "On September 15, 2022, Ethereum went through The Merge upgrade which transitioned Ethereum from proof-of-work to proof-of-stake.",
   "page-what-is-ethereum-energy-desc-2": "The Merge was Ethereum's biggest uprade and reduced the energy consumption required to secure Ethereum by <b>99.95%</b>, creating a <b>more secure network for a much smaller carbon cost</b>. Ethereum is now a low-carbon blockchain while boosting its security and scalability.",
   "page-what-is-ethereum-more-on-energy-consumption": "More on energy consumption",
-  "page-what-is-ethereum-energy-consumption-chart-legend": "Annual Energy Consumption in TW/yr",
+  "page-what-is-ethereum-energy-consumption-chart-legend": "Annual Energy Consumption in TWh/yr",
   "page-what-is-ethereum-the-merge-update": "The Merge update",
   "page-what-is-ethereum-additional-reading": "Additional reading",
   "page-what-is-ethereum-week-in-ethereum": "Week in Ethereum News",

From 49bd54c8d3a86abb8f2d69939d9ee3b26bf33c41 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 28 Nov 2022 14:23:14 -0300
Subject: [PATCH 097/108] fix import order

---
 src/components/SkipLink.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/SkipLink.tsx b/src/components/SkipLink.tsx
index 47ab0bb0a7d..8a7dca751ba 100644
--- a/src/components/SkipLink.tsx
+++ b/src/components/SkipLink.tsx
@@ -1,6 +1,7 @@
 import React from "react"
-import Translation from "./Translation"
 import { Box } from "@chakra-ui/react"
+
+import Translation from "./Translation"
 import Link from "../components/Link"
 
 export interface IProps {

From cfcf55908cadb05d219340212c82ca43c381d5c5 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 28 Nov 2022 15:08:13 -0300
Subject: [PATCH 098/108] fixes

---
 src/components/Breadcrumbs.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx
index 470f9a83542..b37cdcbee24 100644
--- a/src/components/Breadcrumbs.tsx
+++ b/src/components/Breadcrumbs.tsx
@@ -1,10 +1,10 @@
 import React from "react"
 import { useIntl } from "react-intl"
+import { Box, UnorderedList, ListItem } from "@chakra-ui/react"
 
 import Link from "./Link"
-import { isLang, supportedLanguages } from "../utils/languages"
+import { isLang } from "../utils/languages"
 import { isTranslationKey, translateMessageId } from "../utils/translations"
-import { Box, UnorderedList, ListItem } from "@chakra-ui/react"
 
 export interface IProps {
   slug: string
@@ -75,7 +75,6 @@ const Breadcrumbs: React.FC<IProps> = ({
             letterSpacing="wider"
           >
             <Link
-              as={Link}
               to={crumb.fullPath}
               isPartiallyActive={slug === crumb.fullPath}
               textDecoration="none"

From 8c7c1ec5988b8b0b56992e003470d62053cf5ce1 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 28 Nov 2022 16:19:44 -0300
Subject: [PATCH 099/108] update translation functions

---
 src/components/Leaderboard.tsx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index 2d655a26921..09afa8dc490 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -10,12 +10,11 @@ import {
   List,
   ListItem,
 } from "@chakra-ui/react"
+import { useTranslation } from "gatsby-plugin-react-i18next"
+
 import Emoji from "./Emoji"
 import Link from "./Link"
-
 import Translation from "./Translation"
-import { translateMessageId } from "../utils/translations"
-import { useIntl } from "react-intl"
 
 const githubUrl = `https://github.com/`
 
@@ -44,7 +43,7 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
     }
   )
 
-  const intl = useIntl()
+  const { t } = useTranslation()
 
   return (
     <List
@@ -52,10 +51,7 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
       boxShadow={colorModeStyles.listBoxShadow}
       w="100%"
       mb={8}
-      aria-label={translateMessageId(
-        "page-upgrades-bug-bounty-leaderboard-list",
-        intl
-      )}
+      aria-label={t("page-upgrades-bug-bounty-leaderboard-list")}
     >
       {content
         .filter((_, idx) => idx < limit)

From 4f01fe25327e7725f43ec81b472e575aca0a72df Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Mon, 28 Nov 2022 16:27:31 -0300
Subject: [PATCH 100/108] remove margins

---
 src/components/Leaderboard.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index 09afa8dc490..d359ef465a0 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -51,6 +51,7 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
       boxShadow={colorModeStyles.listBoxShadow}
       w="100%"
       mb={8}
+      ml={0}
       aria-label={t("page-upgrades-bug-bounty-leaderboard-list")}
     >
       {content
@@ -80,7 +81,7 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
             "fifth",
           ] as const
           return (
-            <ListItem>
+            <ListItem mb={0}>
               <LinkBox
                 key={idx}
                 display="flex"

From 7320eb77f79398b3c4aca77124bb8f34933f14a1 Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:30:05 +0000
Subject: [PATCH 101/108] Apply suggestions from code review

---
 src/content/translations/fr/enterprise/index.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/content/translations/fr/enterprise/index.md b/src/content/translations/fr/enterprise/index.md
index 999e949bc0e..48a66148b7a 100644
--- a/src/content/translations/fr/enterprise/index.md
+++ b/src/content/translations/fr/enterprise/index.md
@@ -24,7 +24,7 @@ De nombreuses entreprises et consortiums ont déployé des blockchains privées
 ### Différences principales {#key-differences}
 
 - Sécurité/Immuabilité de la blockchain - La résistance d'une blockchain à la falsification est déterminée par son algorithme de consensus. Le réseau principal Ethereum est sécurisé par l’interaction de milliers de nœuds indépendants gérés par des individus et des mineurs du monde entier. Les chaînes privées possèdent généralement un petit nombre de nœuds, contrôlés par une ou quelques organisations. Ces nœuds peuvent être étroitement contrôlés, mais il suffit d'en compromettre quelques-uns pour réécrire la chaîne ou effectuer des transactions frauduleuses.
-- Performances - Les chaînes d'entreprise privées Ethereum ayant la possibilité d'utiliser des nœuds hautes performances avec des exigences matérielles spéciales ainsi que différents algorithmes de consensus comme la preuve d'autorité, elles peuvent atteindre un débit de transaction plus élevé sur la couche de base (couche 1). Sur le réseau principal Ethereum, un débit élevé peut être atteint en utilisant des [ solutions de mise à l'échelle par la couche 2](/developers/docs/scaling/#layer-2-scaling).
+- Performances - Les chaînes d'entreprise privées Ethereum ayant la possibilité d'utiliser des nœuds hautes performances avec des exigences matérielles spéciales ainsi que différents algorithmes de consensus comme la preuve d'autorité, elles peuvent atteindre un débit de transaction plus élevé sur la couche de base (couche 1). Sur le réseau principal Ethereum, un débit élevé peut être atteint en utilisant des [solutions de mise à l'échelle par la couche 2](/developers/docs/scaling/#layer-2-scaling).
 - Coût - Le coût d'exploitation d'une chaîne privée se reflète principalement dans le travail nécessaire pour la configurer et la gérer, et les serveurs pour l'exécuter. Si se connecter au réseau principal d'Ethereum ne coûte rien, il faut payer pour chaque transaction des frais de gaz en ETH, ce qui représente un coût. Des relais de transactions (c'est-à-dire des stations de gaz) sont en cours de développement afin d'éliminer la nécessité, pour les utilisateurs finaux et les entreprises, d'utiliser directement l'ether dans leurs transactions. Certaines [analyses](https://github.com/EYBlockchain/fundamental-cost-of-ownership/blob/master/EY%20Total%20Cost%20of%20Ownership%20for%20Blockchain%20Solutions.pdf) ont montré que le coût total d'exploitation d'une application peut être inférieur sur le réseau principal par rapport à une chaîne privée.
 - Autorisation des nœuds - Seuls les nœuds autorisés peuvent rejoindre les chaînes privées. N'importe qui peut configurer un nœud sur le réseau principal Ethereum.
 - Confidentialité - L'accès aux données écrites sur les chaînes privées peut être contrôlé en limitant l'accès au réseau, et de façon plus précise avec des contrôles d'accès et des transactions privées. L'ensemble des données écrites sur la couche 1 du réseau principal sont visibles par tous, de sorte que les informations sensibles doivent être stockées et transmises hors chaîne, ou chiffrées. Des modèles de conception facilitant ceci émergent (par ex., Baseline, Aztec), ainsi que des solutions de couche 2, qui permettent de garder les données compartimentées et hors de la couche 1.
@@ -33,7 +33,7 @@ De nombreuses entreprises et consortiums ont déployé des blockchains privées
 
 Les entreprises expérimentent la technologie blockchain depuis 2016, lorsque les projets Hyperledger, Quorum et Corda ont été lancés. L'accent était principalement mis sur les blockchains d'entreprise privées avec autorisations, mais à partir de 2019, un changement s'est opéré dans la réflexion sur les blockchains publiques par rapport aux privées pour les applications métiers. Une [enquête](https://assets.ey.com/content/dam/ey-sites/ey-com/en_gl/topics/blockchain/ey-public-blockchain-opportunity-snapshot.pdf) menée par Forrester a révélé que "Les participants à l'enquête ... voient ce potentiel, 75 % d'entre eux déclarant qu’ils sont susceptibles de tirer parti des blockchains publiques à l’avenir, et près d’un tiers assurant qu'ils y sont très favorables”. Chez EY, [Paul Brody explique](https://www.youtube.com/watch?v=-ycu5vGDdZw&feature=youtu.be&t=3668) les avantages de construire sur la blockchain publique, qui (en fonction de l'application) peut offrir une meilleure sécurité/immuabilité, plus de transparence, une réduction du coût total de propriété et la possibilité d'interagir avec toutes les autres applications du réseau principal (effets réseau). Le partage d'un cadre de référence commun entre les entreprises évite la création inutile de nombreux silos isolés qui ne peuvent pas communiquer, partager ni synchroniser les informations.
 
-Une autre avancée qui renforce l'intérêt pour les blockchains publiques est la [couche 2](/developers/docs/scaling/#layer-2-scaling). La couche 2 est avant tout une catégorie de technologie d’évolutivité qui rend possible les applications à haut débit sur les chaînes publiques. Mais les solutions de la couche 2 peuvent aussi [résoudre certains problèmes qui ont poussé les développeurs en entreprise à choisir des chaînes privées dans le passé](https://entethalliance.org/how-ethereum-layer-2-scaling-solutions-address-barriers-to-enterprises-building-on-mainnet/).
+Une autre avancée qui renforce l'intérêt pour les blockchains publiques est la [couche 2](/developers/docs/scaling/layer-2/). La couche 2 est avant tout une catégorie de technologie d’évolutivité qui rend possible les applications à haut débit sur les chaînes publiques. Mais les solutions de la couche 2 peuvent aussi [résoudre certains problèmes qui ont poussé les développeurs en entreprise à choisir des chaînes privées dans le passé](https://entethalliance.org/how-ethereum-layer-2-scaling-solutions-address-barriers-to-enterprises-building-on-mainnet/).
 
 Le Baseline Protocol est un projet clé qui définit un protocole permettant une collaboration confidentielle et complexe entre les entreprises sans laisser de données sensibles sur la chaîne. Il a pris une [ampleur importante](https://www.oasis-open.org/2020/08/26/baseline-protocol-achieves-key-milestone-with-release-of-v0-1-implementation-for-enterprise/) en 2020.
 
@@ -67,7 +67,7 @@ Différentes organisations sont à l'origine d'initiatives collaboratives afin d
 - [Epirus](https://www.web3labs.com/epirus) _- Plateforme Web3 Labs pour développer, déployer et surveiller les applications blockchain_
 - [Ernst & Young Nightfall](https://github.com/EYBlockchain/nightfall) _- Boîte à outils pour les transactions privées_
 - [EthSigner](https://github.com/ConsenSys/ethsigner) _- Application de signature de transactions à utiliser avec un prestataire Web3_
-- [Tenderly](https://tenderly.co/) _ - Plateforme de données fournissant des analyses en temps réel, des alertes et une surveillance avec support pour les réseaux privés_
+- [Tenderly](https://tenderly.co/) _- Plateforme de données fournissant des analyses en temps réel, des alertes et une surveillance avec support pour les réseaux privés_
 - [Truffle Suite](https://trufflesuite.com) _- Suite de développement de blockchain (Truffle, Ganache, Drizzle)_
 
 ### Solutions d'évolutivité {#scalability-solutions}

From 956887aa6b0189a0c021ed04a58a394c126f71c2 Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:30:29 +0000
Subject: [PATCH 102/108] Update src/content/translations/fr/glossary/index.md

---
 src/content/translations/fr/glossary/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/translations/fr/glossary/index.md b/src/content/translations/fr/glossary/index.md
index 1e5ce462b9f..acdb574f4f2 100644
--- a/src/content/translations/fr/glossary/index.md
+++ b/src/content/translations/fr/glossary/index.md
@@ -55,7 +55,7 @@ Dans [Solidity](#solidity), `assert(false)` compile en `0xfe`, un code d'opérat
 
 ### Attestation {#attestation}
 
-Un validateur vote pour un [ bloc](#block). Les validateurs doivent attester de la conformité des blocs, signalant qu'ils sont d'accord avec l'état proposé par le bloc.
+Un validateur vote pour un [bloc](#block). Les validateurs doivent attester de la conformité des blocs, signalant qu'ils sont d'accord avec l'état proposé par le bloc.
 
 <DocLink to="/developers/docs/consensus-mechanisms/pos/attestations/">
   Attestations

From c3b13219ecfdc1c65a08f98bd32286ef1a43a1ef Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:30:36 +0000
Subject: [PATCH 103/108] Update
 src/content/translations/fr/enterprise/private-ethereum/index.md

---
 .../translations/fr/enterprise/private-ethereum/index.md        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/translations/fr/enterprise/private-ethereum/index.md b/src/content/translations/fr/enterprise/private-ethereum/index.md
index 781b54ff319..597dcb396eb 100644
--- a/src/content/translations/fr/enterprise/private-ethereum/index.md
+++ b/src/content/translations/fr/enterprise/private-ethereum/index.md
@@ -19,7 +19,7 @@ Différentes organisations sont à l'origine d'initiatives collaboratives afin d
 
 ### Protocole et infrastructure {#protocol-and-infrastructure}
 
-- [Chainstack](https://chainstack.com/) _ - Plateforme multicloud et multiprotocole en tant que service permettant aux entreprises de construire, déployer et gérer rapidement des réseaux et des services décentralisés_
+- [Chainstack](https://chainstack.com/) _- Plateforme multicloud et multiprotocole en tant que service permettant aux entreprises de construire, déployer et gérer rapidement des réseaux et des services décentralisés_
 - [Clearmatics Autonity](https://www.clearmatics.com/about/) _- Suite de protocoles qui implémente les protocoles P2P et fournit le logiciel client et l'infrastructure_
 - [Hyperledger Besu](https://www.hyperledger.org/use/besu) _- Client Ethereum open source développé sous Apache 2 et rédigé en Java, qui comprend plusieurs algorithmes de consensus, y compris PoW, et PoA (IBFT, IBFT 2.0, Etherhash et Clique). Ses systèmes d'autorisation complets sont conçus spécifiquement pour être utilisés dans un environnement de consortium._
 - [Hyperledger Burrow](https://www.hyperledger.org/projects/hyperledger-burrow) _ - Client de blockchain modulaire avec interprète de contrats intelligents autorisé, partiellement développé pour la spécification de la machine virtuelle Ethereum (EVM)_

From 50cef124f09a131859caaf2f2d9906e03021e7c5 Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:32:25 +0000
Subject: [PATCH 104/108] Fix broken Emoji component

---
 src/content/translations/de/history/index.md | 42 ++++++++++----------
 src/content/translations/fr/history/index.md | 42 ++++++++++----------
 src/content/translations/it/history/index.md | 42 ++++++++++----------
 3 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/content/translations/de/history/index.md b/src/content/translations/de/history/index.md
index d9fc5260366..1df5314c7f5 100644
--- a/src/content/translations/de/history/index.md
+++ b/src/content/translations/de/history/index.md
@@ -27,7 +27,7 @@ Suchst du nach weiteren Protokoll Verbesserungen? [Erfahre etwas über bevorsteh
 
 ### Gray Glacier {#gray-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>30. Juni 2022 10:54:04 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Blocknummer: <a href="https://etherscan.io/block/15050000">15.050.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />ETH Preis: 1.069 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20220630094629/https://ethereum.org/en/">ethereum.org auf waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>30. Juni 2022 10:54:04 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Blocknummer: <a href="https://etherscan.io/block/15050000">15.050.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />ETH Preis: 1.069 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20220630094629/https://ethereum.org/en/">ethereum.org auf waybackmachine</a>
 
 #### Zusammenfassung {#gray-glacier-summary}
 
@@ -47,7 +47,7 @@ Das Gray Glacier Netzwerk-Upgrade hat die [Schwierigkeitsbombe](/glossary/#diffi
 
 ### Arrow Glacier {#arrow-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>9. Dezember 2021 19:55:23 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Blocknummer: <a href="https://etherscan.io/block/13773000">13.773.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />ETH-Preis: 4.111 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211207064430/https://ethereum.org/en/">ethereum.org auf waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>9. Dezember 2021 19:55:23 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Blocknummer: <a href="https://etherscan.io/block/13773000">13.773.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />ETH-Preis: 4.111 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211207064430/https://ethereum.org/en/">ethereum.org auf waybackmachine</a>
 
 #### Zusammenfassung {#arrow-glacier-summary}
 
@@ -66,7 +66,7 @@ Das Arrow Glacier Netzwerk-Upgrade hat die [Schwierigkeitsbombe](/glossary/#diff
 
 ### Altair {#altair}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>27. Oktober 2021 10:56:23 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Epoche-Nummer: 74.240<br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />ETH-Preis: 4.024 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211026174951/https://ethereum.org/en/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>27. Oktober 2021 10:56:23 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Epoche-Nummer: 74.240<br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />ETH-Preis: 4.024 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211026174951/https://ethereum.org/en/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#altair-summary}
 
@@ -74,7 +74,7 @@ Das Altair-Upgrade war das erste geplante Upgrade für die [Beacon Chain](/upgra
 
 - [Lesen Sie die Altair-Upgrade-Spezifikation](https://github.com/ethereum/consensus-specs/tree/dev/specs/altair)
 
-#### <emoji text=":tada:" size={1} mr="0.5rem" />Fun Fact! {#altair-fun-fact}
+#### <Emoji text=":tada:" size={1} mr="0.5rem" />Fun Fact! {#altair-fun-fact}
 
 Altair war das erste große Netzwerk-Upgrade, für das es einen genauen Einführungszeitpunkt gab. Jedes vorherige Upgrade basierte auf einer angegebenen Blocknummer auf der Proof-of-Work-Kette, bei der die Blockzeiten variieren. Die Beacon Chain erfordert kein Lösen von Proof-of-Work und arbeitet stattdessen mit einem zeitbasierten Epochensystem, das aus 32 zwölfsekündigen „Slots" besteht, in denen Validatoren Blöcke vorschlagen können. Deshalb wussten wir genau, wann wir Epoche 74.240 erreichen würden und Altair live gehen würde!
 
@@ -84,7 +84,7 @@ Altair war das erste große Netzwerk-Upgrade, für das es einen genauen Einführ
 
 ### London {#london}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>5. August 2021 12:33:42 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/12965000">12.965.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 2.621 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210805124609/https://ethereum.org/en/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>5. August 2021 12:33:42 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/12965000">12.965.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 2.621 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210805124609/https://ethereum.org/en/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#london-summary}
 
@@ -108,7 +108,7 @@ Das London-Upgrade führte die [EIP-1559](https://eips.ethereum.org/EIPS/eip-155
 
 ### Berlin {#berlin}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>15. April 2021 10:07:03 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/12244000">12.244.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 2.454 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210415093618/https://ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>15. April 2021 10:07:03 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/12244000">12.244.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 2.454 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210415093618/https://ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#berlin-summary}
 
@@ -132,7 +132,7 @@ Mit dem Berliner Upgrade wurden die Gaskosten für bestimmte EVM-Aktionen optimi
 
 ### Entstehungsgeschichte der Beacon Chain {#beacon-chain-genesis}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>1. Dezember 2020 12:00:35 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Beacon Chain Blocknummer: <a href="https://beaconscan.com/slot/1">1</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 586,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201207184633/https://www.ethereum.org/en/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>1. Dezember 2020 12:00:35 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Beacon Chain Blocknummer: <a href="https://beaconscan.com/slot/1">1</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 586,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201207184633/https://www.ethereum.org/en/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#beacon-chain-genesis-summary}
 
@@ -148,7 +148,7 @@ Die [Beacon Chain](/upgrades/beacon-chain/) benötigte zum sicheren Betrieb 16.3
 
 ### Staking Einzahlungsvertrag auf Ethereum hochgeladen {#staking-deposit-contract}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14. Oktober 2020 09:22:52 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/11052984">11.052.984</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 379,04 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201104235727/https://ethereum.org/en/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14. Oktober 2020 09:22:52 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/11052984">11.052.984</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 379,04 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201104235727/https://ethereum.org/en/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#deposit-contract-summary}
 
@@ -164,7 +164,7 @@ Mit dem Stakingeinzahlungsvertrag wurde [Staking](/glossary/#staking) im Ökosys
 
 ### Muir Glacier {#muir-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>2. Januar 2020 08:30:49 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/9200000">9.200.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 127,18 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20200103093618/https://ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>2. Januar 2020 08:30:49 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/9200000">9.200.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 127,18 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20200103093618/https://ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#muir-glacier-summary}
 
@@ -185,7 +185,7 @@ Die Muir-Glacier-Abspaltung führte eine Verzögerung in die [Schwierigkeitsbomb
 
 ### Istanbul {#istanbul}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>8. Dezember 2019 12:25:09 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/9069000">9.069.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 151,06 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20191216101254if*/https://ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>8. Dezember 2019 12:25:09 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/9069000">9.069.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 151,06 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20191216101254if*/https://ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#istanbul-summary}
 
@@ -214,7 +214,7 @@ Die Istanbul-Abspaltung:
 
 ### Konstantinopel {#constantinople}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>28. Februar 2019 07:52:04 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/7280000">7.280.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 136,29 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20190415163751/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>28. Februar 2019 07:52:04 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/7280000">7.280.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 136,29 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20190415163751/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#constantinople-summary}
 
@@ -241,7 +241,7 @@ Die Konstantinopel-Fork:
 
 ### Byzantium {#byzantium}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>16. Oktober 2017 05:22:11 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/4370000">4.370.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 334,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20171017201143/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>16. Oktober 2017 05:22:11 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/4370000">4.370.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 334,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20171017201143/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#byzantium-summary}
 
@@ -274,7 +274,7 @@ Die Byzantium-Fork:
 
 ### Spurious Dragon {#spurious-dragon}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>22. November 2016 04:15:44 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/2675000">2.675.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 9,84 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161127154654/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>22. November 2016 04:15:44 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/2675000">2.675.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 9,84 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161127154654/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#spurious-dragon-summary}
 
@@ -299,7 +299,7 @@ Die Spurious-Dragon-Fork war die zweite Reaktion auf die Denial-of-Service (DoS)
 
 ### Tangerine Whistle {#tangerine-whistle}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>18. Oktober 2016 01:19:31 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/2463000">2.463.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161030043727/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>18. Oktober 2016 01:19:31 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/2463000">2.463.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161030043727/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#tangerine-whistle-summary}
 
@@ -320,7 +320,7 @@ Die Tangerine-Whistle-Fork war die erste Reaktion auf die Denial-of-Service (DoS
 
 ### DAO-Fork {#dao-fork}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>20. Juli 2016 01:20:40 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/1920000">1.920.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 12,54 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160803215306/https://ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>20. Juli 2016 01:20:40 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/1920000">1.920.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 12,54 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160803215306/https://ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#dao-fork-summary}
 
@@ -336,7 +336,7 @@ Einige Miner weigerten sich, die Abspaltung mitzutragen, da der Vorfall des DAO
 
 ### Homestead {#homestead}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14. März 2016 18:49:53 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/1150000">1.150.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160313203843/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14. März 2016 18:49:53 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/1150000">1.150.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160313203843/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#homestead-summary}
 
@@ -358,7 +358,7 @@ Die Homestead-Abspaltung, die in die Zukunft schaute. Sie enthielt mehrere Proto
 
 ### Frontier Thawing {#frontier-thawing}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>7. September 2015 09:33:09 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/200000">200.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 1,24 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150912193811/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>7. September 2015 09:33:09 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/200000">200.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: 1,24 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150912193811/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#frontier-thawing-summary}
 
@@ -371,7 +371,7 @@ Die Frontier-Thawing-Abspaltung hob das 5.000 [Gas](/glossary/#gas)-Limit pro [B
 
 ### Frontier {#frontier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>30. Juli 2015 03:26:13 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/0">0</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: N/A<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150802035735/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>30. Juli 2015 03:26:13 Uhr +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Blocknummer: <a href="https://etherscan.io/block/0">0</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> ETH-Preis: N/A<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150802035735/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 #### Zusammenfassung {#frontier-summary}
 
@@ -385,7 +385,7 @@ Frontier war live, aber soweit nur die Implementierung eines grundsätzlichen Ra
 
 ### Ether-Verkauf {#ether-sale}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 22. Juli - 2. September 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140804235628/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 22. Juli - 2. September 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140804235628/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 Ether ging offiziell 42 Tage lang in den Verkauf. Man konnte es mit BTC kaufen.
 
@@ -395,7 +395,7 @@ Ether ging offiziell 42 Tage lang in den Verkauf. Man konnte es mit BTC kaufen.
 
 ### Yellowpaper veröffentlicht {#yellowpaper}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 1. April 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140509173418/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 1. April 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140509173418/https://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 Das Yellowpaper, verfasst von Dr. Gavin Wood, ist eine technische Definition des Ethereum-Protokolls.
 
@@ -407,7 +407,7 @@ Das Yellowpaper, verfasst von Dr. Gavin Wood, ist eine technische Definition des
 
 ### Whitepaper veröffentlicht {#whitepaper}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 27. November 2013<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140208030136/http://www.ethereum.org/">ethereum.org in waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 27. November 2013<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140208030136/http://www.ethereum.org/">ethereum.org in waybackmachine</a>
 
 Dieses einleitende Papier wurde ursprünglich 2013 von Vitalik Buterin, dem Gründer von Ethereum, vor dem Projektstart im Jahr 2015 veröffentlicht.
 
diff --git a/src/content/translations/fr/history/index.md b/src/content/translations/fr/history/index.md
index 69078789345..63a3324fd0b 100644
--- a/src/content/translations/fr/history/index.md
+++ b/src/content/translations/fr/history/index.md
@@ -27,7 +27,7 @@ Vous cherchez de prochaines mises à jour de protocole ? [En savoir plus sur les
 
 ### Gray Glacier {#gray-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Jun-30-2022 10:54:04 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de bloc : <a href="https://etherscan.io/block/15050000">15 050 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 1 069 $ USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20220630094629/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Jun-30-2022 10:54:04 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de bloc : <a href="https://etherscan.io/block/15050000">15 050 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 1 069 $ USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20220630094629/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#gray-glacier-summary}
 
@@ -47,7 +47,7 @@ La mise à niveau Gray Glacier a retardé le déclenchement de la [bombe de diff
 
 ### Arrow Glacier {#arrow-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Dec-09-2021 07:55:23 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de bloc : <a href="https://etherscan.io/block/13773000">13 773 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 4 111 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211207064430/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Dec-09-2021 07:55:23 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de bloc : <a href="https://etherscan.io/block/13773000">13 773 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 4 111 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211207064430/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#arrow-glacier-summary}
 
@@ -66,7 +66,7 @@ La mise à niveau Arrow Glacier a retardé le déclenchement de la [bombe de dif
 
 ### Altair {#altair}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Oct-27-2021 10:56:23 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de période : 74,240<br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 4 024 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211026174951/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Oct-27-2021 10:56:23 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numéro de période : 74,240<br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : 4 024 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211026174951/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#altair-summary}
 
@@ -74,7 +74,7 @@ La mise à niveau Altair était la première mise à niveau répertoriée pour l
 
 - [Lire les informations de mise à niveau Altair](https://github.com/ethereum/consensus-specs/tree/dev/specs/altair)
 
-#### <emoji text=":tada:" size={1} mr="0.5rem" />Anecdote ! {#altair-fun-fact}
+#### <Emoji text=":tada:" size={1} mr="0.5rem" />Anecdote ! {#altair-fun-fact}
 
 Altair a été la première mise à niveau majeure d'un réseau dont la date de déploiement était exacte. Toutes les mises à niveau antérieures étaient basées sur un numéro de bloc déclaré sur la chaîne de preuve de travail dans laquelle les temps de bloc varient. La chaîne phare ne nécessite pas de résolution de preuve de travail mais fonctionne sur la base d'un système d'époques composé de 32 « créneaux » de 12 secondes durant lesquels les validateurs peuvent proposer des blocs. C'est pourquoi nous savions exactement quand nous atteindrions l'époque 74 240 et la date de sortie d'Altaïr !
 
@@ -84,7 +84,7 @@ Altair a été la première mise à niveau majeure d'un réseau dont la date de
 
 ### London {#london}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Aug-05-2021 12:33:42 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/12 965 000">12,965,000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 2 621 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210805124609/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Aug-05-2021 12:33:42 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/12 965 000">12,965,000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 2 621 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210805124609/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#london-summary}
 
@@ -108,7 +108,7 @@ La mise à niveau London a introduit [EIP-1559](https://eips.ethereum.org/EIPS/e
 
 ### Berlin {#berlin}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>15-avril-2021 10:07:03 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/12244000">12 244 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 2 454 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210415093618/https://ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>15-avril-2021 10:07:03 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/12244000">12 244 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 2 454 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210415093618/https://ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#berlin-summary}
 
@@ -132,7 +132,7 @@ La mise à niveau de Berlin a optimisé le coût du gaz pour certaines actions E
 
 ### Origine de la chaîne phare {#beacon-chain-genesis}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>01-Déc-2020 12:00:35 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc sur la chaîne phare : <a href="https://beaconscan.com/slot/1">1</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 586,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201207184633/https://www.ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>01-Déc-2020 12:00:35 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc sur la chaîne phare : <a href="https://beaconscan.com/slot/1">1</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 586,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201207184633/https://www.ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#beacon-chain-genesis-summary}
 
@@ -148,7 +148,7 @@ La [chaîne phare](/upgrades/beacon-chain/) avait besoin de 16 384 dépôts de
 
 ### Contrat de dépôt de mise en jeu déployé {#staking-deposit-contract}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14-oct-2020 09:22:52 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/11052984">11 052 984</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 379,04 USD <br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201104235727/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14-oct-2020 09:22:52 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/11052984">11 052 984</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 379,04 USD <br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201104235727/https://ethereum.org/en/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#deposit-contract-summary}
 
@@ -164,7 +164,7 @@ Le contrat de dépôt de mise en jeu a introduit la [mise en jeu](/glossary/#sta
 
 ### Muir Glacier {#muir-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>02-janv-2020 08:30:49 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/9200000">9200000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 127,18 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20200103093618/https://ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>02-janv-2020 08:30:49 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/9200000">9200000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 127,18 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20200103093618/https://ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#muir-glacier-summary}
 
@@ -185,7 +185,7 @@ La fourche Muir Glacier a généré un retard de la [bombe de difficulté](/glos
 
 ### Istanbul {#istanbul}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>08-déc-2019 12:25:09 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/9069000">9 069 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 151,06 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20191216101254if*/https://ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>08-déc-2019 12:25:09 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/9069000">9 069 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 151,06 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20191216101254if*/https://ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#istanbul-summary}
 
@@ -214,7 +214,7 @@ La fourche Istanbul a :
 
 ### Constantinople {#constantinople}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>28-fév-2019 07:52:04 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/7280000">7 280 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 136,29 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20190415163751/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>28-fév-2019 07:52:04 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/7280000">7 280 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 136,29 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20190415163751/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#constantinople-summary}
 
@@ -241,7 +241,7 @@ La fourche Constantinople a :
 
 ### Byzantium {#byzantium}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>16-oct-2017 05:22:11 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/4370000">4 370 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 334,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20171017201143/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>16-oct-2017 05:22:11 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/4370000">4 370 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 334,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20171017201143/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#byzantium-summary}
 
@@ -274,7 +274,7 @@ La fourche Byzantium a :
 
 ### Spurious Dragon {#spurious-dragon}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>22-nov-2016 04:15:44 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/2675000">2 675 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 9,84 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161127154654/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>22-nov-2016 04:15:44 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/2675000">2 675 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 9,84 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161127154654/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#spurious-dragon-summary}
 
@@ -299,7 +299,7 @@ La fourche Spurious Dragon est la deuxième réponse aux attaques par déni de s
 
 ### Tangerine Whistle {#tangerine-whistle}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>18-oct-2016 01:19:31 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/2463000">2 463 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161030043727/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>18-oct-2016 01:19:31 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/2463000">2 463 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161030043727/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#tangerine-whistle-summary}
 
@@ -320,7 +320,7 @@ La fourche Tangerine Whistle a été la deuxième réponse aux attaques par dén
 
 ### Fourche DAO {#dao-fork}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>20-juil-2016 01:20:40 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/1920000">1 920 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,54 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160803215306/https://ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>20-juil-2016 01:20:40 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/1920000">1 920 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,54 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160803215306/https://ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#dao-fork-summary}
 
@@ -336,7 +336,7 @@ Certains mineurs ont refusé la fourche car l'incident DAO ne résultait pas d'u
 
 ### Homestead {#homestead}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14-mars-2016 06:49:53 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/1150000">1 150 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160313203843/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>14-mars-2016 06:49:53 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/1150000">1 150 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160313203843/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#homestead-summary}
 
@@ -358,7 +358,7 @@ La fourche Homestead tournée vers l'avenir. Elle comprenait plusieurs changemen
 
 ### Frontier Thawing {#frontier-thawing}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>7-sep-2015 09:33:09 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/200000">200 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 1,24 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150912193811/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>7-sep-2015 09:33:09 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro du bloc : <a href="https://etherscan.io/block/200000">200 000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Cours ETH : 1,24 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150912193811/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#frontier-thawing-summary}
 
@@ -371,7 +371,7 @@ La fourche Frontier Thawing a levé la [limite de gaz](/glossary/#gas) de 5 000
 
 ### Frontier {#frontier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>30-juil-2015 03:26:13 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/0">0</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : N/A<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150802035735/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>30-juil-2015 03:26:13 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numéro de bloc : <a href="https://etherscan.io/block/0">0</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Cours ETH : N/A<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150802035735/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 #### Résumé {#frontier-summary}
 
@@ -385,7 +385,7 @@ Frontier était une implémentation vivante, mais sans structure, du projet Ethe
 
 ### Vente d'ETH {#ether-sale}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Du 02 au 22 septembre 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140804235628/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Du 02 au 22 septembre 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140804235628/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 L'ETH est officiellement en vente pour 42 jours. Il était possible d'en acheter avec des BTC.
 
@@ -395,7 +395,7 @@ L'ETH est officiellement en vente pour 42 jours. Il était possible d'en acheter
 
 ### Publication du Livre jaune {#yellowpaper}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 1er avril 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140509173418/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 1er avril 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140509173418/https://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 Le Livre jaune, rédigé par le Dr. Gavin Wood, est une définition technique du protocole Ethereum.
 
@@ -407,7 +407,7 @@ Le Livre jaune, rédigé par le Dr. Gavin Wood, est une définition technique du
 
 ### Publication du Livre blanc {#whitepaper}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 27 novembre 2013<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140208030136/http://www.ethereum.org/">ethereum.org sur waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 27 novembre 2013<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140208030136/http://www.ethereum.org/">ethereum.org sur waybackmachine</a>
 
 Document d'introduction publié en 2013 par Vitalik Buterin, le fondateur d'Ethereum, précédant le lancement du projet en 2015.
 
diff --git a/src/content/translations/it/history/index.md b/src/content/translations/it/history/index.md
index fc63b91d675..3891e4986b6 100644
--- a/src/content/translations/it/history/index.md
+++ b/src/content/translations/it/history/index.md
@@ -27,7 +27,7 @@ Cerchi i prossimi aggiornamenti di protocollo? [Maggiori informazioni sui prossi
 
 ### Gray Glacier {#gray-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Jun-30-2022 10:54:04 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numero del blocco: <a href="https://etherscan.io/block/15050000">15,050,000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Prezzo ETH: $1,069 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20220630094629/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Jun-30-2022 10:54:04 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numero del blocco: <a href="https://etherscan.io/block/15050000">15,050,000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Prezzo ETH: $1,069 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20220630094629/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#gray-glacier-summary}
 
@@ -47,7 +47,7 @@ L'aggiornamento della rete di Gray Glacier ha rimandato di tre mesi la [bomba di
 
 ### Arrow Glacier {#arrow-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Dec-09-2021 07:55:23 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numero del blocco: <a href="https://etherscan.io/block/13773000">13.773.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Prezzo ETH: $4.111 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211207064430/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Dec-09-2021 07:55:23 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numero del blocco: <a href="https://etherscan.io/block/13773000">13.773.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Prezzo ETH: $4.111 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211207064430/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#arrow-glacier-summary}
 
@@ -66,7 +66,7 @@ L'aggiornamento di rete Arrow Glacier ha rimandato la [bomba di difficoltà](/gl
 
 ### Altair {#altair}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Oct-27-2021 10:56:23 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numero dell'epoch: 74.240<br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Prezzo ETH: $4.024 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211026174951/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /><code>Oct-27-2021 10:56:23 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Numero dell'epoch: 74.240<br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} />Prezzo ETH: $4.024 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20211026174951/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#altair-summary}
 
@@ -74,7 +74,7 @@ L'aggiornamento Altair è stato il primo aggiornamento pianificato per la [Beaco
 
 - [Leggi le specifiche dell'aggiornamento di Altair](https://github.com/ethereum/consensus-specs/tree/dev/specs/altair)
 
-#### <emoji text=":tada:" size={1} mr="0.5rem" />Curiosità! {#altair-fun-fact}
+#### <Emoji text=":tada:" size={1} mr="0.5rem" />Curiosità! {#altair-fun-fact}
 
 Altair è stato il primo importante aggiornamento di rete che ha avuto un tempo di rollout esatto. Tutti gli aggiornamenti precedenti erano basati su un numero di blocco dichiarato su una catena Proof of Work, dove i tempi dei blocco variavano. La beacon chain non richiede la risoluzione del Proof of Work e funziona invece su un sistema di epoche basato sul tempo che consiste in 32 "slot" di dodici secondi in cui i validatori possono proporre blocchi. Questo è il motivo per cui sapevamo esattamente quando avremmo raggiunto l'epoca 74.240 e Altair sarebbe diventato operativo!
 
@@ -84,7 +84,7 @@ Altair è stato il primo importante aggiornamento di rete che ha avuto un tempo
 
 ### London {#london}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>05-Ago-2021 12:33:42 +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/12965000">12,965,000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $2621 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210805124609/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>05-Ago-2021 12:33:42 +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/12965000">12,965,000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $2621 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210805124609/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#london-summary}
 
@@ -108,7 +108,7 @@ L'aggiornamento di Londra ha introdotto l'[EIP-1559](https://eips.ethereum.org/E
 
 ### Berlin {#berlin}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>15 Apr 2021 10:07:03 +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/12244000">12.244.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $2454 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210415093618/https://ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>15 Apr 2021 10:07:03 +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/12244000">12.244.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $2454 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20210415093618/https://ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#berlin-summary}
 
@@ -132,7 +132,7 @@ L'aggiornamento di Berlino ha ottimizzato i costi del gas per certe azioni dell'
 
 ### Genesi della beacon chain {#beacon-chain-genesis}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Dec-01-2020 12:00:35 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero di blocco della Beacon Chain: <a href="https://beaconscan.com/slot/1">1</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $586,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201207184633/https://www.ethereum.org/en/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Dec-01-2020 12:00:35 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero di blocco della Beacon Chain: <a href="https://beaconscan.com/slot/1">1</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $586,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201207184633/https://www.ethereum.org/en/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#beacon-chain-genesis-summary}
 
@@ -148,7 +148,7 @@ La [Beacon Chain](/upgrades/beacon-chain/) necessita di 16.384 depositi da 32 ET
 
 ### Distribuzione del contratto di deposito in staking {#staking-deposit-contract}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Oct-14-2020 09:22:52 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/11052984">11.052.984</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $379,04 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201104235727/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Oct-14-2020 09:22:52 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/11052984">11.052.984</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $379,04 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20201104235727/https://ethereum.org/en/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#deposit-contract-summary}
 
@@ -164,7 +164,7 @@ Il contratto di deposito in staking ha introdotto lo [staking](/glossary/#stakin
 
 ### Muir Glacier {#muir-glacier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Jan-02-2020 08:30:49 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/9200000">9.200.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $127,18 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20200103093618/https://ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Jan-02-2020 08:30:49 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/9200000">9.200.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $127,18 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20200103093618/https://ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#muir-glacier-summary}
 
@@ -185,7 +185,7 @@ La diramazione di Muir Glacier ha introdotto un ritardo nella [bomba di difficol
 
 ### Istanbul {#istanbul}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Dec-08-2019 12:25:09 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/9069000">9.069.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $151,06 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20191216101254if*/https://ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Dec-08-2019 12:25:09 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/9069000">9.069.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $151,06 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20191216101254if*/https://ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#istanbul-summary}
 
@@ -214,7 +214,7 @@ La diramazione Instanbul:
 
 ### Constantinople {#constantinople}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Feb-28-2019 07:52:04 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/7280000">7.280.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $136,29 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20190415163751/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Feb-28-2019 07:52:04 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/7280000">7.280.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $136,29 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20190415163751/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#constantinople-summary}
 
@@ -241,7 +241,7 @@ La diramazione Constantinople:
 
 ### Byzantium {#byzantium}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Oct-16-2017 05:22:11 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/4370000">4.370.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $334,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20171017201143/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Oct-16-2017 05:22:11 AM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/4370000">4.370.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $334,23 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20171017201143/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#byzantium-summary}
 
@@ -274,7 +274,7 @@ La diramazione Byzantium:
 
 ### Spurious Dragon {#spurious-dragon}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Nov-22-2016 04:15:44 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/2675000">2.675.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $9,84 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161127154654/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Nov-22-2016 04:15:44 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/2675000">2.675.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $9,84 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161127154654/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#spurious-dragon-summary}
 
@@ -299,7 +299,7 @@ La diramazione Spurious Dragon è stata la seconda risposta agli attacchi denial
 
 ### Tangerine Whistle {#tangerine-whistle}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Oct-18-2016 01:19:31 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/2463000">2.463.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161030043727/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Oct-18-2016 01:19:31 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/2463000">2.463.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20161030043727/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#tangerine-whistle-summary}
 
@@ -320,7 +320,7 @@ La diramazione Tangerine Whistle è stata la prima risposta agli attacchi denial
 
 ### Diramazione DAO {#dao-fork}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Jul-20-2016 01:20:40 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/1920000">1.920.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $12,54 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160803215306/https://ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Jul-20-2016 01:20:40 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/1920000">1.920.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $12,54 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160803215306/https://ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#dao-fork-summary}
 
@@ -336,7 +336,7 @@ Alcuni miner rifiutarono di creare la diramazione perché l'incidente DAO non er
 
 ### Homestead {#homestead}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Mar-14-2016 06:49:53 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/1150000">1.150.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160313203843/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Mar-14-2016 06:49:53 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/1150000">1.150.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $12,50 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20160313203843/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#homestead-summary}
 
@@ -358,7 +358,7 @@ La diramazione Homestead guardava al futuro. Includeva diverse modifiche al prot
 
 ### Frontier thawing {#frontier-thawing}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Sep-07-2015 09:33:09 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/200000">200.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $1,24 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150912193811/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Sep-07-2015 09:33:09 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero del blocco: <a href="https://etherscan.io/block/200000">200.000</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: $1,24 USD<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150912193811/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#frontier-thawing-summary}
 
@@ -371,7 +371,7 @@ La biforcazione disgelo di frontiera ha innalzato il limite di 5.000 [gas](/glos
 
 ### Frontier {#frontier}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Jul-30-2015 03:26:13 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero edl blocco: <a href="https://etherscan.io/block/0">0</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: N/A<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150802035735/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <code>Jul-30-2015 03:26:13 PM +UTC</code><br /> <Emoji text=":bricks:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Numero edl blocco: <a href="https://etherscan.io/block/0">0</a><br /> <Emoji text=":money_bag:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> Prezzo ETH: N/A<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20150802035735/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 #### Riepilogo {#frontier-summary}
 
@@ -385,7 +385,7 @@ Frontier è stata un'implementazione operativa ma rudimentale del progetto Ether
 
 ### Vendita di ether {#ether-sale}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 22 luglio 22 - 2 settembre 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140804235628/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 22 luglio 22 - 2 settembre 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140804235628/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 Ether è stato ufficialmente messo in vendita per 42 giorni. Era acquistabile con BTC.
 
@@ -395,7 +395,7 @@ Ether è stato ufficialmente messo in vendita per 42 giorni. Era acquistabile co
 
 ### Pubblicazione dello yellowpaper {#yellowpaper}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 1 aprile 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140509173418/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 1 aprile 2014<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140509173418/https://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 Lo yellowpaper, redatto dal dott. Gavin Wood, è una definizione tecnica del protocollo Ethereum.
 
@@ -407,7 +407,7 @@ Lo yellowpaper, redatto dal dott. Gavin Wood, è una definizione tecnica del pro
 
 ### Pubblicazione del whitepaper {#whitepaper}
 
-<emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 27 novembre 2013<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140208030136/http://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
+<Emoji text=":calendar:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> 27 novembre 2013<br /> <Emoji text=":desktop_computer:" size={1} mr={"0.5rem"} mb={"0.5rem"} /> <a href="https://web.archive.org/web/20140208030136/http://www.ethereum.org/">ethereum.org sulla waybackmachine</a>
 
 Documento introduttivo, pubblicato nel 2013 da Vitalik Buterin, il fondatore di Ethereum, prima del lancio del progetto nel 2015.
 

From 449943246cb57ec9f744546fe7d6ec84cb619aa2 Mon Sep 17 00:00:00 2001
From: Corwin Smith <cssmittys@gmail.com>
Date: Mon, 28 Nov 2022 15:44:34 -0700
Subject: [PATCH 105/108] v6.11.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa46eba9d6d..2388e117789 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "6.10.2",
+  "version": "6.11.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",

From ca8546dc8dc3daea3ef30288d46d45e065f742af Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Tue, 29 Nov 2022 12:09:44 -0300
Subject: [PATCH 106/108] revert i18n PR

---
 .gitignore                                    |   1 -
 gatsby-browser.tsx                            |  51 ++
 gatsby-config.ts                              |  68 +-
 gatsby-node.ts                                | 129 ++--
 gatsby-ssr.tsx                                |  31 +
 package.json                                  |   8 +-
 src/components/BeaconChainActions.tsx         |  40 +-
 src/components/Breadcrumbs.tsx                |  12 +-
 src/components/ButtonDropdown.tsx             |   8 +-
 src/components/EthExchanges.tsx               |  33 +-
 src/components/FeedbackWidget.tsx             |  16 +-
 src/components/FileContributors.tsx           |   6 +-
 src/components/Footer.tsx                     |   9 +-
 src/components/Layer2/Layer2Onboard.tsx       |  34 +-
 src/components/Layer2ProductCard.tsx          |  17 +-
 src/components/Layout.tsx                     |  90 +--
 src/components/LearningToolsCardGrid.tsx      |   8 +-
 src/components/Link.tsx                       |   9 +-
 src/components/Logo.tsx                       |  10 +-
 src/components/MergeArticleList.tsx           |  83 ++-
 src/components/MergeInfographic.tsx           |  14 +-
 src/components/Nav/Dropdown.tsx               |  11 +-
 src/components/Nav/Menu.tsx                   |   6 +-
 src/components/Nav/Mobile.tsx                 |  14 +-
 src/components/Nav/index.tsx                  |  11 +-
 src/components/PageMetadata.tsx               |  12 +-
 src/components/Quiz/QuizSummary.tsx           |  10 +-
 src/components/Roadmap.tsx                    |  15 +-
 src/components/Search/Input.tsx               |   7 +-
 src/components/Search/index.tsx               |   6 +-
 src/components/ShardChainsList.tsx            |  83 ++-
 src/components/SideNav.tsx                    |   7 +-
 src/components/StablecoinAccordion.tsx        |  71 +-
 src/components/StablecoinBoxGrid.tsx          |   7 +-
 .../Staking/StakingCommunityCallout.tsx       |   7 +-
 .../Staking/StakingLaunchpadWidget.tsx        |  15 +-
 src/components/Staking/StakingStatsBox.tsx    |  10 +-
 src/components/StatsBoxGrid.tsx               |  54 +-
 src/components/Translation.tsx                |  34 +-
 src/components/Trilemma.tsx                   |  13 +-
 src/components/TutorialMetadata.tsx           |   6 +-
 src/pages-conditional/dapps.tsx               | 641 +++++++++++++-----
 src/pages-conditional/eth.tsx                 |  38 +-
 src/pages-conditional/wallets.tsx             |  65 +-
 src/pages-conditional/what-is-ethereum.tsx    |  91 ++-
 src/pages/404.tsx                             |  16 +-
 src/pages/assets.tsx                          | 278 +++++---
 src/pages/bug-bounty.tsx                      |  65 +-
 src/pages/community.tsx                       | 115 ++--
 .../translation-program/acknowledgements.tsx  |  41 +-
 .../translation-program/contributors.tsx      |  26 +-
 src/pages/developers/index.tsx                |  29 +-
 src/pages/developers/learning-tools.tsx       |  24 +-
 src/pages/developers/local-environment.tsx    |  31 +-
 src/pages/developers/tutorials.tsx            |  30 +-
 src/pages/get-eth.tsx                         |  59 +-
 src/pages/index.tsx                           | 147 ++--
 src/pages/languages.tsx                       |  34 +-
 src/pages/layer-2.tsx                         | 149 ++--
 src/pages/learn/index.tsx                     | 202 ++++--
 src/pages/run-a-node.tsx                      |  55 +-
 src/pages/stablecoins.tsx                     | 187 +++--
 src/pages/staking/deposit-contract.tsx        |  38 +-
 src/pages/staking/index.tsx                   |  69 +-
 src/pages/upgrades/get-involved/index.tsx     |  28 +-
 src/pages/upgrades/index.tsx                  | 127 ++--
 src/pages/upgrades/vision.tsx                 |  28 +-
 src/pages/wallets/find-wallet.tsx             |  23 +-
 src/scripts/mergeTranslations.ts              |   6 +-
 src/templates/docs.tsx                        |  11 +-
 src/templates/staking.tsx                     |  11 +-
 src/templates/static.tsx                      |  19 +-
 src/templates/tutorial.tsx                    |  11 +-
 src/templates/upgrade.tsx                     |  17 +-
 src/templates/use-cases.tsx                   |  13 +-
 src/types.ts                                  |  19 +-
 src/utils/translations.ts                     |  47 +-
 yarn.lock                                     | 174 +++--
 78 files changed, 2426 insertions(+), 1614 deletions(-)

diff --git a/.gitignore b/.gitignore
index 779cf0195b2..3920d43afc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,6 @@ yarn-error.log
 src/data/contributors.json
 # These files are generated by `yarn merge-translations` command
 src/intl/*.json
-i18n/locales
 # Auto generated code when gatsby build the site
 src/gatsby-types.d.ts
 
diff --git a/gatsby-browser.tsx b/gatsby-browser.tsx
index bfb9a18f2c4..709de7493a1 100644
--- a/gatsby-browser.tsx
+++ b/gatsby-browser.tsx
@@ -4,6 +4,10 @@
  * See: https://www.gatsbyjs.org/docs/browser-apis/
  */
 
+import React from "react"
+import browserLang from "browser-lang"
+import { withPrefix, GatsbyBrowser } from "gatsby"
+
 import Prism from "prism-react-renderer/prism"
 ;(typeof global !== "undefined" ? global : window).Prism = Prism
 
@@ -12,6 +16,53 @@ import "@formatjs/intl-locale/polyfill"
 import "@formatjs/intl-numberformat/polyfill"
 import "@formatjs/intl-numberformat/locale-data/en"
 
+import Layout from "./src/components/Layout"
+import {
+  supportedLanguages,
+  defaultLanguage,
+  isLang,
+} from "./src/utils/languages"
+import { IS_DEV } from "./src/utils/env"
+import { Context } from "./src/types"
+
 // Default languages included:
 // https://github.com/FormidableLabs/prism-react-renderer/blob/master/src/vendor/prism/includeLangs.js
 require("prismjs/components/prism-solidity")
+
+// Prevents <Layout/> from unmounting on page transitions
+// https://www.gatsbyjs.com/docs/layout-components/#how-to-prevent-layout-components-from-unmounting
+// @ts-ignore: returning `null` is not accepted by the `GatsbyBrowser` type def.
+export const wrapPageElement: GatsbyBrowser<
+  any,
+  Context
+>["wrapPageElement"] = ({ element, props }) => {
+  const { location, pageContext } = props
+  const { pathname, search } = location
+  const { originalPath } = pageContext
+
+  const [, pathLocale] = pathname.split("/")
+
+  // client side redirect on paths that don't have a locale in them. Most useful
+  // on dev env where we don't have server redirects
+  if (IS_DEV && !isLang(pathLocale)) {
+    let detected =
+      window.localStorage.getItem("eth-org-language") ||
+      browserLang({
+        languages: supportedLanguages,
+        fallback: defaultLanguage,
+      })
+
+    if (!isLang(detected)) {
+      detected = defaultLanguage
+    }
+
+    const queryParams = search || ""
+    const newUrl = withPrefix(`/${detected}${originalPath}${queryParams}`)
+    window.localStorage.setItem("eth-org-language", detected)
+    window.location.replace(newUrl)
+
+    return null
+  }
+
+  return <Layout {...props}>{element}</Layout>
+}
diff --git a/gatsby-config.ts b/gatsby-config.ts
index 6f2e358d13a..5869b08be3f 100644
--- a/gatsby-config.ts
+++ b/gatsby-config.ts
@@ -35,6 +35,24 @@ const config: GatsbyConfig = {
     editContentUrl: `https://github.com/ethereum/ethereum-org-website/tree/dev/`,
   },
   plugins: [
+    // i18n support
+    {
+      resolve: `gatsby-theme-i18n`,
+      options: {
+        defaultLang: defaultLanguage,
+        prefixDefault: true,
+        locales: supportedLanguages.length
+          ? supportedLanguages.join(" ")
+          : null,
+        configPath: path.resolve(`./i18n/config.json`),
+      },
+    },
+    {
+      resolve: `gatsby-theme-i18n-react-intl`,
+      options: {
+        defaultLocale: `./src/intl/en.json`,
+      },
+    },
     // Web app manifest
     {
       resolve: `gatsby-plugin-manifest`,
@@ -247,56 +265,6 @@ const config: GatsbyConfig = {
         generateMatchPathRewrites: false,
       },
     },
-    // i18n support
-    {
-      resolve: `gatsby-source-filesystem`,
-      options: {
-        path: path.resolve(`./i18n/locales`),
-        name: `locale`,
-      },
-    },
-    // Wraps the entire page with a custom layout component
-    // Note: keep this before the i18n plugin declaration in order to have the
-    // i18n provider wrapping the layout component
-    {
-      resolve: `gatsby-plugin-layout`,
-      options: {
-        component: path.resolve(`./src/components/Layout`),
-      },
-    },
-    {
-      resolve: `gatsby-plugin-react-i18next`,
-      options: {
-        localeJsonSourceName: `locale`, // name given to `gatsby-source-filesystem` plugin.
-        languages: supportedLanguages,
-        defaultLanguage: defaultLanguage,
-        generateDefaultLanguagePage: true,
-        redirect: false,
-        siteUrl,
-        trailingSlash: "always",
-        // i18next options
-        i18nextOptions: {
-          fallbackLng: defaultLanguage,
-          interpolation: {
-            escapeValue: false,
-          },
-          react: {
-            transSupportBasicHtmlNodes: true,
-            transKeepBasicHtmlNodesFor: [
-              "br",
-              "strong",
-              "i",
-              "bold",
-              "b",
-              "em",
-              "sup",
-            ],
-          },
-          keySeparator: false,
-          nsSeparator: false,
-        },
-      },
-    },
   ],
   // https://www.gatsbyjs.com/docs/reference/release-notes/v2.28/#feature-flags-in-gatsby-configjs
   flags: {
diff --git a/gatsby-node.ts b/gatsby-node.ts
index 30c624de9c1..ef5f9af66ab 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -284,23 +284,17 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
             component: path.resolve(`src/templates/${template}.tsx`),
             context: {
               language: lang,
-              languagesToFetch: [lang, defaultLanguage],
               slug: langSlug,
               ignoreTranslationBanner: isLegal,
               isLegal: isLegal,
               isOutdated: false,
               isContentEnglish: true,
               relativePath, // Use English path for template MDX query
-              // gatsby i18n plugin
-              i18n: {
-                language: lang,
-                languages: supportedLanguages,
-                defaultLanguage: defaultLanguage,
-                generateDefaultLanguagePage: false,
-                routed: true,
-                originalPath: langSlug.slice(3),
-                path: langSlug,
-              },
+              // gatsby i18n theme context
+              locale: lang,
+              hrefLang: lang,
+              originalPath: langSlug.slice(3),
+              dateFormat: "MM/DD/YYYY",
             },
           })
         }
@@ -312,21 +306,15 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
       component: path.resolve(`src/templates/${template}.tsx`),
       context: {
         language,
-        languagesToFetch: [language, defaultLanguage],
         slug,
         isOutdated: !!node.fields.isOutdated,
         isDefaultLang: language === defaultLanguage,
         relativePath,
-        // gatsby i18n plugin
-        i18n: {
-          language,
-          languages: supportedLanguages,
-          defaultLanguage: defaultLanguage,
-          generateDefaultLanguagePage: false,
-          routed: true,
-          originalPath: slug.slice(3),
-          path: slug,
-        },
+        // gatsby i18n theme context
+        locale: language,
+        hrefLang: language,
+        originalPath: slug.slice(3),
+        dateFormat: "MM/DD/YYYY",
       },
     })
   })
@@ -356,26 +344,22 @@ export const createPages: GatsbyNode<any, Context>["createPages"] = async ({
           page,
           lang
         )
+
         const slug = `/${lang}${originalPath}`
+
         createPage<Context>({
           path: slug,
           component: path.resolve(`src/pages-conditional/${page}.tsx`),
           context: {
             language: lang,
-            languagesToFetch: [lang, defaultLanguage],
             slug,
             isContentEnglish,
             isOutdated,
-            // gatsby i18n plugin
-            i18n: {
-              language: lang,
-              languages: supportedLanguages,
-              defaultLanguage: defaultLanguage,
-              generateDefaultLanguagePage: false,
-              routed: true,
-              originalPath,
-              path: slug,
-            },
+            // gatsby i18n theme context
+            locale: lang,
+            hrefLang: lang,
+            originalPath,
+            dateFormat: "MM/DD/YYYY",
           },
         })
       }
@@ -392,68 +376,51 @@ export const onCreatePage: GatsbyNode<any, Context>["onCreatePage"] = async ({
 }) => {
   const { createPage, deletePage, createRedirect } = actions
 
+  const isDefaultLang = page.path.startsWith(`/${defaultLanguage}`)
+
+  if (isDefaultLang) {
+    const path = page.path.slice(3)
+
+    if (IS_DEV) {
+      // create routes without the lang prefix e.g. `/{path}` as our i18n plugin
+      // only creates `/{lang}/{path}` routes. This is useful on dev env to avoid
+      // getting a 404 since we don't have server side redirects
+      createPage({ ...page, path })
+    }
+
+    if (!IS_DEV && !path.match(/^\/404(\/|.html)$/)) {
+      // on prod, indicate our servers to redirect the root paths to the
+      // `/{defaultLang}/{path}`
+      createRedirect({
+        ...commonRedirectProps,
+        fromPath: path,
+        toPath: page.path,
+      })
+    }
+  }
+
   if (!page.context) {
     return
   }
 
-  // these are the native Gatsby pages (those living under `/pages`)
-  // which do not pass through the `createPages` hook thus they don't have our
-  // custom context in them
-  const isPageWithoutCustomContext = page.context.isOutdated === undefined
-
-  if (isPageWithoutCustomContext) {
-    const { language, i18n } = page.context
-    const isDefaultLang = language === defaultLanguage
+  const isTranslated = page.context.locale !== defaultLanguage
+  const hasNoContext = page.context.isOutdated === undefined
 
-    // as we don't have our custom context for this page, we calculate & add it
-    // later to them
+  if (isTranslated && hasNoContext) {
     const { isOutdated, isContentEnglish } = await checkIsPageOutdated(
-      i18n.originalPath,
-      language
+      page.context.originalPath,
+      page.context.locale
     )
-
-    let newPage = {
+    deletePage(page)
+    createPage<Context>({
       ...page,
       context: {
         ...page.context,
-        languagesToFetch: [language, defaultLanguage],
         isOutdated,
         //display TranslationBanner for translation-component pages that are still in English
         isContentEnglish,
       },
-    }
-
-    // there seems to be a bug in the i18n plugin where 404 pages get a
-    // duplicated `/lang` in their `matchPath`s
-    if (newPage.matchPath?.includes(`/${language}/${language}/*`)) {
-      newPage = { ...newPage, matchPath: `/${language}/*` }
-    }
-
-    // on dev, we will have 2 pages for the default lang
-    // - 1 for the ones with the prefix `/{defaultLang}/learn/`
-    // - 1 for the ones without the prefix `/learn/`
-    //   we do this to avoid having a 404 on those without the prefix since in
-    //   dev we don't have the redirects from the server
-    deletePage(page)
-
-    if (IS_DEV) {
-      createPage<Context>(newPage)
-    }
-
-    // `routed` means that the page have the lang prefix on the url
-    // e.g. `/en/learn` or `/en`
-    if (!IS_DEV && i18n.routed) {
-      createPage<Context>(newPage)
-
-      const rootPath = page.path.slice(3)
-      if (isDefaultLang && !rootPath.match(/^\/404(\/|.html)$/)) {
-        createRedirect({
-          ...commonRedirectProps,
-          fromPath: rootPath,
-          toPath: page.path,
-        })
-      }
-    }
+    })
   }
 }
 
diff --git a/gatsby-ssr.tsx b/gatsby-ssr.tsx
index 22ddf1ee242..e0925d5ceb6 100644
--- a/gatsby-ssr.tsx
+++ b/gatsby-ssr.tsx
@@ -3,3 +3,34 @@
  *
  * See: https://www.gatsbyjs.org/docs/ssr-apis/
  */
+
+import React from "react"
+
+import type { GatsbySSR } from "gatsby"
+
+import Layout from "./src/components/Layout"
+
+import { Context } from "./src/types"
+import { IS_DEV } from "./src/utils/env"
+import { isLang } from "./src/utils/languages"
+
+// Prevents <Layout/> from unmounting on page transitions
+// https://www.gatsbyjs.com/docs/layout-components/#how-to-prevent-layout-components-from-unmounting
+// @ts-ignore: returning `null` is not accepted by the `GatsbySSR` type def.
+export const wrapPageElement: GatsbySSR<any, Context>["wrapPageElement"] = ({
+  element,
+  props,
+}) => {
+  const { location } = props
+  const { pathname } = location
+
+  const [, pathLocale] = pathname.split("/")
+
+  // this is to avoid having hydration issues on dev mode. Check the logic
+  // inside gatsby-browser.tsx
+  if (IS_DEV && !isLang(pathLocale)) {
+    return null
+  }
+
+  return <Layout {...props}>{element}</Layout>
+}
diff --git a/package.json b/package.json
index 2388e117789..45d823efde5 100644
--- a/package.json
+++ b/package.json
@@ -32,14 +32,12 @@
     "gatsby-plugin-emotion": "^7.19.0",
     "gatsby-plugin-gatsby-cloud": "^4.20.0",
     "gatsby-plugin-image": "^2.21.0",
-    "gatsby-plugin-layout": "^3.24.0",
     "gatsby-plugin-manifest": "^4.21.0",
     "gatsby-plugin-matomo": "^0.9.0",
     "gatsby-plugin-mdx": "^3.0.0",
     "gatsby-plugin-netlify": "^5.0.1",
     "gatsby-plugin-react-helmet": "^5.0.0",
     "gatsby-plugin-react-helmet-canonical-urls": "^1.4.0",
-    "gatsby-plugin-react-i18next": "^2.0.4",
     "gatsby-plugin-react-svg": "^3.1.0",
     "gatsby-plugin-robots-txt": "^1.7.1",
     "gatsby-plugin-sharp": "^4.21.0",
@@ -49,13 +47,13 @@
     "gatsby-remark-images": "^6.21.0",
     "gatsby-remark-reading-time": "^1.1.0",
     "gatsby-source-filesystem": "^4.21.1",
+    "gatsby-theme-i18n": "^3.0.0",
+    "gatsby-theme-i18n-react-intl": "^3.0.0",
     "gatsby-transformer-csv": "^4.0.0",
     "gatsby-transformer-gitinfo": "^1.1.0",
     "gatsby-transformer-json": "^4.11.0",
     "gatsby-transformer-remark": "^3.0.0",
     "gatsby-transformer-sharp": "^4.21.0",
-    "htmr": "^1.0.2",
-    "i18next": "^21.9.2",
     "is-relative-url": "^3.0.0",
     "lodash": "^4.17.21",
     "luxon": "^1.24.1",
@@ -68,9 +66,9 @@
     "react-dom": "^18.0.0",
     "react-emoji-render": "^1.2.4",
     "react-helmet": "^6.1.0",
-    "react-i18next": "^11.18.6",
     "react-icons": "^4.3.1",
     "react-instantsearch-dom": "^6.32.0",
+    "react-intl": "^3.12.1",
     "react-select": "^4.3.0",
     "recharts": "^2.1.9",
     "styled-system": "^5.1.5",
diff --git a/src/components/BeaconChainActions.tsx b/src/components/BeaconChainActions.tsx
index 29f7eaa0a66..3725fcf9664 100644
--- a/src/components/BeaconChainActions.tsx
+++ b/src/components/BeaconChainActions.tsx
@@ -1,8 +1,9 @@
 import React from "react"
 import { useStaticQuery, graphql } from "gatsby"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
+import { translateMessageId } from "../utils/translations"
 import { getImage, ImageDataLike } from "../utils/image"
 
 import CardList from "./CardList"
@@ -87,7 +88,7 @@ type BeaconQueryTypes = {
 }
 
 const BeaconChainActions: React.FC = () => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const data = useStaticQuery<BeaconQueryTypes>(BeaconStaticQuery)
 
   const datapoints: Array<CardListItem> = [
@@ -96,32 +97,44 @@ const BeaconChainActions: React.FC = () => {
       image: getImage(data.beaconscan)!,
       alt: "",
       link: "https://beaconscan.com",
-      description: t("consensus-beaconscan-desc"),
+      description: translateMessageId("consensus-beaconscan-desc", intl),
     },
     {
       title: "beaconcha.in",
       image: getImage(data.beaconchain)!,
       alt: "",
       link: "https://beaconcha.in",
-      description: t("consensus-beaconcha-in-desc"),
+      description: translateMessageId("consensus-beaconcha-in-desc", intl),
     },
   ]
 
   //TODO: we should refactor the naming here instead of using authors into the description field
   const reads: Array<CardListItem> = [
     {
-      title: t("page-upgrade-article-title-two-point-oh"),
+      title: translateMessageId(
+        "page-upgrade-article-title-two-point-oh",
+        intl
+      ),
       description: "Status",
       link: "https://our.status.im/two-point-oh-the-beacon-chain/",
     },
     {
-      title: t("page-upgrade-article-title-beacon-chain-explainer"),
+      title: translateMessageId(
+        "page-upgrade-article-title-beacon-chain-explainer",
+        intl
+      ),
       description: "Ethos.dev",
       link: "https://ethos.dev/beacon-chain/",
     },
     {
-      title: t("page-upgrade-article-title-sharding-consensus"),
-      description: t("page-upgrade-article-author-ethereum-foundation"),
+      title: translateMessageId(
+        "page-upgrade-article-title-sharding-consensus",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-ethereum-foundation",
+        intl
+      ),
       link: "https://blog.ethereum.org/2020/03/27/sharding-consensus/",
     },
   ]
@@ -131,8 +144,8 @@ const BeaconChainActions: React.FC = () => {
       <StyledCardContainer>
         <StyledCardLeft
           emoji=":money_with_wings:"
-          title={t("consensus-become-staker")}
-          description={t("consensus-become-staker-desc")}
+          title={translateMessageId("consensus-become-staker", intl)}
+          description={translateMessageId("consensus-become-staker-desc", intl)}
         >
           <StyledButtonLink to="https://launchpad.ethereum.org">
             <Translation id="get-started" />
@@ -143,8 +156,11 @@ const BeaconChainActions: React.FC = () => {
         </StyledCardLeft>
         <StyledCardRight
           emoji=":computer:"
-          title={t("consensus-run-beacon-chain")}
-          description={t("consensus-run-beacon-chain-desc")}
+          title={translateMessageId("consensus-run-beacon-chain", intl)}
+          description={translateMessageId(
+            "consensus-run-beacon-chain-desc",
+            intl
+          )}
         >
           <ButtonLink variant="outline" to="/upgrades/get-involved/">
             <Translation id="consensus-run-beacon-chain" />
diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx
index 64bb41fc850..405e85b6c9e 100644
--- a/src/components/Breadcrumbs.tsx
+++ b/src/components/Breadcrumbs.tsx
@@ -1,10 +1,10 @@
 import React from "react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
 import { Box, UnorderedList, ListItem } from "@chakra-ui/react"
+import { useIntl } from "react-intl"
 
 import Link from "./Link"
-import { isLang } from "../utils/languages"
-import { isTranslationKey } from "../utils/translations"
+import { isLang, supportedLanguages } from "../utils/languages"
+import { isTranslationKey, translateMessageId } from "../utils/translations"
 
 export interface IProps {
   slug: string
@@ -29,7 +29,7 @@ const Breadcrumbs: React.FC<IProps> = ({
   startDepth = 0,
   ...restProps
 }) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const slugChunk = slug.split("/")
   const sliced = slugChunk.filter((item) => !!item).slice(startDepth)
@@ -37,9 +37,9 @@ const Breadcrumbs: React.FC<IProps> = ({
   const crumbs = sliced.map((path, idx) => {
     // If homepage (e.g. "en"), set text to "home" translation
     const text = isLang(path)
-      ? t("page-index-meta-title")
+      ? translateMessageId("page-index-meta-title", intl)
       : isTranslationKey(path)
-      ? t(path)
+      ? translateMessageId(path, intl)
       : ""
 
     return {
diff --git a/src/components/ButtonDropdown.tsx b/src/components/ButtonDropdown.tsx
index cdbb6f74fe3..501bcc139cb 100644
--- a/src/components/ButtonDropdown.tsx
+++ b/src/components/ButtonDropdown.tsx
@@ -1,7 +1,7 @@
 // Libraries
 import React, { useState, createRef } from "react"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { motion } from "framer-motion"
 import { MdMenu } from "react-icons/md"
 
@@ -12,7 +12,7 @@ import Translation from "./Translation"
 
 // Utils
 import { useOnClickOutside } from "../hooks/useOnClickOutside"
-import { TranslationKey } from "../utils/translations"
+import { translateMessageId, TranslationKey } from "../utils/translations"
 import { trackCustomEvent } from "../utils/matomo"
 
 const Container = styled.div`
@@ -120,7 +120,7 @@ export interface IProps {
 
 const ButtonDropdown: React.FC<IProps> = ({ list, className }) => {
   const [isOpen, setIsOpen] = useState<boolean>(false)
-  const { t } = useTranslation()
+  const intl = useIntl()
   const ref = createRef<HTMLInputElement>()
 
   useOnClickOutside(ref, () => setIsOpen(false))
@@ -136,7 +136,7 @@ const ButtonDropdown: React.FC<IProps> = ({ list, className }) => {
     <Container
       className={className}
       ref={ref}
-      aria-label={`Select ${t(list.text)}`}
+      aria-label={`Select ${translateMessageId(list.text, intl)}`}
     >
       <Button
         variant="outline"
diff --git a/src/components/EthExchanges.tsx b/src/components/EthExchanges.tsx
index f7e5118671f..2075085354a 100644
--- a/src/components/EthExchanges.tsx
+++ b/src/components/EthExchanges.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react"
 import { useStaticQuery, graphql } from "gatsby"
 import { IGatsbyImageData } from "gatsby-plugin-image"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 
 import CardList from "./CardList"
@@ -12,6 +12,7 @@ import { StyledSelect as Select } from "./SharedStyledComponents"
 
 import { getLocaleTimestamp } from "../utils/time"
 import { trackCustomEvent } from "../utils/matomo"
+import { translateMessageId } from "../utils/translations"
 import { getImage, ImageDataLike } from "../utils/image"
 import { Lang } from "../utils/languages"
 
@@ -211,11 +212,13 @@ interface State {
 
 // TODO move component into get-eth.js page?
 const EthExchanges = () => {
-  const { language } = useI18next()
-  const { t } = useTranslation()
+  const intl = useIntl()
   const [state, setState] = useState<State>()
 
-  const placeholderString = t("page-get-eth-exchanges-search")
+  const placeholderString = translateMessageId(
+    "page-get-eth-exchanges-search",
+    intl
+  )
   const data = useStaticQuery(graphql`
     query EthExchanges {
       exchangesByCountry: allExchangesByCountryCsv {
@@ -572,7 +575,7 @@ const EthExchanges = () => {
   }
 
   const lastUpdated = getLocaleTimestamp(
-    language as Lang,
+    intl.locale as Lang,
     data.timestamp.parent.fields.gitLogLatestDate
   )
 
@@ -618,11 +621,15 @@ const EthExchanges = () => {
       .map((exchange) => {
         // Add state exceptions if Country is USA
         let description: string | null = null
-        if (state?.selectedCountry?.value === t("page-get-eth-exchanges-usa")) {
+        if (
+          state?.selectedCountry?.value ===
+          translateMessageId("page-get-eth-exchanges-usa", intl)
+        ) {
           const exceptions = exchanges[exchange].usaExceptions
           if (exceptions.length > 0) {
-            description = `${t(
-              "page-get-eth-exchanges-except"
+            description = `${translateMessageId(
+              "page-get-eth-exchanges-except",
+              intl
             )} ${exceptions.join(", ")}`
           }
         }
@@ -654,12 +661,14 @@ const EthExchanges = () => {
             // Add state exceptions if Country is USA
             let description: string | null = null
             if (
-              state?.selectedCountry?.value === t("page-get-eth-exchanges-usa")
+              state?.selectedCountry?.value ===
+              translateMessageId("page-get-eth-exchanges-usa", intl)
             ) {
               const exceptions = walletProviders[currentProvider].usaExceptions
               if (exceptions.length > 0) {
-                description = `${t(
-                  "page-get-eth-exchanges-except"
+                description = `${translateMessageId(
+                  "page-get-eth-exchanges-except",
+                  intl
                 )} ${exceptions.join(", ")}`
               }
               // Filter out wallets that only service USA
@@ -694,7 +703,7 @@ const EthExchanges = () => {
         <Translation id="page-get-eth-exchanges-intro" />
       </Intro>
       <StyledSelect
-        aria-label={t("page-get-eth-exchanges-header")}
+        aria-label={translateMessageId("page-get-eth-exchanges-header", intl)}
         className="react-select-container"
         classNamePrefix="react-select"
         options={exchangesByCountry}
diff --git a/src/components/FeedbackWidget.tsx b/src/components/FeedbackWidget.tsx
index 0405ccc0606..d32fd34cc92 100644
--- a/src/components/FeedbackWidget.tsx
+++ b/src/components/FeedbackWidget.tsx
@@ -9,7 +9,7 @@ import {
   Text,
   ScaleFade,
 } from "@chakra-ui/react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { MdClose } from "react-icons/md"
 import FocusTrap from "focus-trap-react"
 // Component imports
@@ -18,6 +18,7 @@ import Translation from "./Translation"
 import FeedbackGlyph from "../assets/feedback-glyph.svg"
 // Utility imports
 import { trackCustomEvent } from "../utils/matomo"
+import { translateMessageId } from "../utils/translations"
 // Hook imports
 import { useOnClickOutside } from "../hooks/useOnClickOutside"
 import { useKeyPress } from "../hooks/useKeyPress"
@@ -69,7 +70,7 @@ interface FeedbackWidgetProps {
   location: string
 }
 const FeedbackWidget: React.FC<FeedbackWidgetProps> = ({ location = "" }) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const containerRef = useRef<HTMLInputElement>(null)
   useOnClickOutside(containerRef, () => handleClose(), [`mousedown`])
   const [isOpen, setIsOpen] = useState<boolean>(false)
@@ -217,7 +218,7 @@ const FeedbackWidget: React.FC<FeedbackWidgetProps> = ({ location = "" }) => {
               <Button
                 variant="ghost"
                 onClick={handleClose}
-                aria-label={t("close")}
+                aria-label={translateMessageId("close", intl)}
                 position="absolute"
                 insetEnd={2}
                 top={2}
@@ -262,7 +263,10 @@ const FeedbackWidget: React.FC<FeedbackWidgetProps> = ({ location = "" }) => {
                 {feedbackSubmitted ? (
                   <Button
                     onClick={handleSurveyOpen}
-                    aria-label={t("feedback-widget-thank-you-cta")}
+                    aria-label={translateMessageId(
+                      "feedback-widget-thank-you-cta",
+                      intl
+                    )}
                     flex={1}
                   >
                     <Translation id="feedback-widget-thank-you-cta" />
@@ -272,7 +276,7 @@ const FeedbackWidget: React.FC<FeedbackWidgetProps> = ({ location = "" }) => {
                     <Button
                       variant="solid"
                       onClick={() => handleSubmit(true)}
-                      aria-label={t("yes")}
+                      aria-label={translateMessageId("yes", intl)}
                       flex={1}
                     >
                       <Translation id="yes" />
@@ -280,7 +284,7 @@ const FeedbackWidget: React.FC<FeedbackWidgetProps> = ({ location = "" }) => {
                     <Button
                       variant="solid"
                       onClick={() => handleSubmit(false)}
-                      aria-label={t("no")}
+                      aria-label={translateMessageId("no", intl)}
                       flex={1}
                     >
                       <Translation id="no" />
diff --git a/src/components/FileContributors.tsx b/src/components/FileContributors.tsx
index 57fddb7b889..8ea5765552a 100644
--- a/src/components/FileContributors.tsx
+++ b/src/components/FileContributors.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { css, Theme } from "@emotion/react"
 import styled from "@emotion/styled"
 import { useQuery, gql } from "@apollo/client"
@@ -259,7 +259,7 @@ const FileContributors: React.FC<IProps> = ({
   editPath,
 }) => {
   const [isModalOpen, setModalOpen] = useState(false)
-  const { language } = useI18next()
+  const intl = useIntl()
 
   const { loading, error, data } = useQuery(COMMIT_HISTORY, {
     variables: { relativePath },
@@ -332,7 +332,7 @@ const FileContributors: React.FC<IProps> = ({
               </Link>
             )}
             {!lastContributor.user && <span>{lastContributor.name}</span>},{" "}
-            {getLocaleTimestamp(language as Lang, lastCommit.committedDate)}
+            {getLocaleTimestamp(intl.locale as Lang, lastCommit.committedDate)}
           </Info>
         </LeftContent>
         <ButtonContainer>
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 11d84abf5d5..79b0c759ac7 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -11,8 +11,7 @@ import {
 import { graphql, StaticQuery } from "gatsby"
 import React from "react"
 import { FaGithub, FaTwitter, FaYoutube, FaDiscord } from "react-icons/fa"
-import { useI18next } from "gatsby-plugin-react-i18next"
-
+import { useIntl } from "react-intl"
 import { Lang } from "../utils/languages"
 import { getLocaleTimestamp } from "../utils/time"
 import { isLangRightToLeft, TranslationKey } from "../utils/translations"
@@ -54,9 +53,9 @@ export interface LinkSection {
 export interface IProps {}
 
 const Footer: React.FC<IProps> = () => {
-  const { language } = useI18next()
+  const intl = useIntl()
 
-  const isPageRightToLeft = isLangRightToLeft(language as Lang)
+  const isPageRightToLeft = isLangRightToLeft(intl.locale as Lang)
 
   const [medBp] = useToken("breakpoints", ["md"])
 
@@ -302,7 +301,7 @@ const Footer: React.FC<IProps> = () => {
             <Box color="text200">
               <Translation id="website-last-updated" />:{" "}
               {getLocaleTimestamp(
-                language as Lang,
+                intl.locale as Lang,
                 data.allSiteBuildMetadata.edges[0].node.buildTime
               )}
             </Box>
diff --git a/src/components/Layer2/Layer2Onboard.tsx b/src/components/Layer2/Layer2Onboard.tsx
index a75c28f8b93..f96d850307a 100644
--- a/src/components/Layer2/Layer2Onboard.tsx
+++ b/src/components/Layer2/Layer2Onboard.tsx
@@ -2,7 +2,7 @@
 import { GatsbyImage, IGatsbyImageData } from "gatsby-plugin-image"
 import React, { useState } from "react"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 // Components
 import ButtonLink from "../ButtonLink"
@@ -15,6 +15,7 @@ import cexSupport from "../../data/layer-2/cex-layer-2-support.json"
 
 //Utils
 import { trackCustomEvent } from "../../utils/matomo"
+import { translateMessageId } from "../../utils/translations"
 
 // Styles
 const Content = styled.div`
@@ -200,7 +201,7 @@ const Layer2Onboard: React.FC<IProps> = ({
   ethIcon,
   ethIconAlt,
 }) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const [selectedExchange, setSelectedExchange] = useState<Exchange>()
   const [selectedL2, setSelectedL2] = useState<Layer2>()
@@ -261,20 +262,30 @@ const Layer2Onboard: React.FC<IProps> = ({
               })
               setSelectedL2(selectedOption.l2)
             }}
-            placeholder={t("layer-2-onboard-wallet-input-placeholder")}
+            placeholder={translateMessageId(
+              "layer-2-onboard-wallet-input-placeholder",
+              intl
+            )}
           />
         </LeftSelect>
         {selectedL2 && (
           <LeftSelected>
             <SelectedContainer>
               <p>
-                <b>{`${t("layer-2-onboard-wallet-selected-1")} ${
-                  selectedL2.name
-                } ${t("layer-2-onboard-wallet-selected-2")}`}</b>
+                <b>{`${translateMessageId(
+                  "layer-2-onboard-wallet-selected-1",
+                  intl
+                )} ${selectedL2.name} ${translateMessageId(
+                  "layer-2-onboard-wallet-selected-2",
+                  intl
+                )}`}</b>
               </p>
               <p>{selectedL2.bridgeWallets.join(", ")}</p>
               <ButtonLinkMargin to={selectedL2.bridge}>
-                {`${selectedL2.name} ${t("layer-2-bridge")}`}
+                {`${selectedL2.name} ${translateMessageId(
+                  "layer-2-bridge",
+                  intl
+                )}`}
               </ButtonLinkMargin>
             </SelectedContainer>
           </LeftSelected>
@@ -307,7 +318,10 @@ const Layer2Onboard: React.FC<IProps> = ({
               })
               setSelectedExchange(selectedOption.cex)
             }}
-            placeholder={t("layer-2-onboard-exchange-input-placeholder")}
+            placeholder={translateMessageId(
+              "layer-2-onboard-exchange-input-placeholder",
+              intl
+            )}
           />
         </RightSelect>
         <EthLogo>
@@ -339,7 +353,9 @@ const Layer2Onboard: React.FC<IProps> = ({
                 </Flex50>
               </TwoColumnContent>
               <ButtonLink to={selectedExchange.url}>
-                {`${t("layer-2-go-to")} ${selectedExchange.name}`}
+                {`${translateMessageId("layer-2-go-to", intl)} ${
+                  selectedExchange.name
+                }`}
               </ButtonLink>
             </SelectedContainer>
           </RightSelected>
diff --git a/src/components/Layer2ProductCard.tsx b/src/components/Layer2ProductCard.tsx
index d598c27b71f..5113ca7035d 100644
--- a/src/components/Layer2ProductCard.tsx
+++ b/src/components/Layer2ProductCard.tsx
@@ -1,13 +1,16 @@
 // Libraries
 import React from "react"
 import { GatsbyImage, IGatsbyImageData } from "gatsby-plugin-image"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { Box, Center, Flex, Heading, Image, Text } from "@chakra-ui/react"
 
 // Components
 import ButtonLink from "./ButtonLink"
 import Link from "./Link"
 
+// Utils
+import { translateMessageId } from "../utils/translations"
+
 export interface IProps {
   children?: React.ReactNode
   url?: string
@@ -35,7 +38,7 @@ const Layer2ProductCard: React.FC<IProps> = ({
   tokenLists,
   ecosystemPortal,
 }) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   return (
     <Flex
@@ -80,29 +83,29 @@ const Layer2ProductCard: React.FC<IProps> = ({
           </Text>
           {note.length > 0 && (
             <Text opacity="0.8" fontSize="sm" mb={2} lineHeight="140%">
-              {t("layer-2-note")} {note}
+              {translateMessageId("layer-2-note", intl)} {note}
             </Text>
           )}
         </Box>
         {bridge && (
           <Link to={bridge}>
-            {name} {t("layer-2-bridge")}
+            {name} {translateMessageId("layer-2-bridge", intl)}
           </Link>
         )}
         {ecosystemPortal && (
           <Link to={ecosystemPortal}>
-            {name} {t("layer-2-ecosystem-portal")}
+            {name} {translateMessageId("layer-2-ecosystem-portal", intl)}
           </Link>
         )}
         {tokenLists && (
           <Link to={tokenLists}>
-            {name} {t("layer-2-token-lists")}
+            {name} {translateMessageId("layer-2-token-lists", intl)}
           </Link>
         )}
       </Flex>
       <Box>
         <ButtonLink m={2} to={url} display="flex">
-          {t("layer-2-explore")} {name}
+          {translateMessageId("layer-2-explore", intl)} {name}
         </ButtonLink>
       </Box>
     </Flex>
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 50035c2e60e..f5e0716bb08 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -3,6 +3,8 @@ import { ApolloProvider } from "@apollo/client"
 import { useColorModeValue } from "@chakra-ui/react"
 import { ThemeProvider } from "@emotion/react"
 import styled from "@emotion/styled"
+import { IntlProvider } from "react-intl"
+import { LocaleProvider } from "gatsby-theme-i18n"
 
 import { lightTheme, darkTheme } from "../theme"
 
@@ -90,6 +92,8 @@ const Layout: React.FC<IProps> = ({
 
   const [isZenMode, setIsZenMode] = useState<boolean>(false)
   const [shouldShowSideNav, setShouldShowSideNav] = useState<boolean>(false)
+  const locale = pageContext.locale
+  const messages = require(`../intl/${locale}.json`)
 
   // Exit Zen Mode on 'esc' click
   useKeyPress(`Escape`, () => handleZenModeChange(false))
@@ -137,50 +141,52 @@ const Layout: React.FC<IProps> = ({
     !isTranslationBannerIgnored
 
   return (
-    <ApolloProvider client={client}>
-      <ThemeProvider theme={theme}>
-        <ZenModeContext.Provider value={{ isZenMode, handleZenModeChange }}>
-          <SkipLink hrefId="#main-content" />
-          <TranslationBanner
-            shouldShow={shouldShowTranslationBanner}
-            isPageContentEnglish={isPageContentEnglish}
-            isPageRightToLeft={isPageRightToLeft}
-            originalPagePath={pageContext.i18n.originalPath || ""}
-          />
-          <TranslationBannerLegal
-            shouldShow={isLegal}
-            isPageRightToLeft={isPageRightToLeft}
-            originalPagePath={pageContext.i18n.originalPath || ""}
-          />
-          <ContentContainer>
-            <ZenMode>
-              <Nav path={path} />
-              {shouldShowSideNav && <SideNavMobile path={path} />}
-            </ZenMode>
-            <SkipLinkAnchor id="main-content" />
-            <MainContainer>
-              {shouldShowSideNav && (
+    <LocaleProvider pageContext={pageContext}>
+      {/* our current react-intl types does not support react 18 */}
+      {/* TODO: once we upgrade react-intl to v6, remove this ts-ignore */}
+      {/* @ts-ignore */}
+      <IntlProvider locale={locale!} key={locale} messages={messages}>
+        <ApolloProvider client={client}>
+          <ThemeProvider theme={theme}>
+            <ZenModeContext.Provider value={{ isZenMode, handleZenModeChange }}>
+              <SkipLink hrefId="#main-content" />
+              <TranslationBanner
+                shouldShow={shouldShowTranslationBanner}
+                isPageContentEnglish={isPageContentEnglish}
+                isPageRightToLeft={isPageRightToLeft}
+                originalPagePath={pageContext.originalPath!}
+              />
+              <TranslationBannerLegal
+                shouldShow={isLegal}
+                isPageRightToLeft={isPageRightToLeft}
+                originalPagePath={pageContext.originalPath!}
+              />
+              <ContentContainer>
                 <ZenMode>
-                  <SideNav path={path} />
+                  <Nav path={path} />
+                  {shouldShowSideNav && <SideNavMobile path={path} />}
                 </ZenMode>
-              )}
-              <MainContent>
-                <ZenModeContext.Provider
-                  value={{ isZenMode, handleZenModeChange }}
-                >
-                  <Main>{children}</Main>
-                </ZenModeContext.Provider>
-              </MainContent>
-            </MainContainer>
-            <ZenMode>
-              <Footer />
-            </ZenMode>
-            <FeedbackWidget location={path} />
-          </ContentContainer>
-        </ZenModeContext.Provider>
-        ?
-      </ThemeProvider>
-    </ApolloProvider>
+                <SkipLinkAnchor id="main-content" />
+                <MainContainer>
+                  {shouldShowSideNav && (
+                    <ZenMode>
+                      <SideNav path={path} />
+                    </ZenMode>
+                  )}
+                  <MainContent>
+                    <Main>{children}</Main>
+                  </MainContent>
+                </MainContainer>
+                <ZenMode>
+                  <Footer />
+                </ZenMode>
+                <FeedbackWidget location={path} />
+              </ContentContainer>
+            </ZenModeContext.Provider>
+          </ThemeProvider>
+        </ApolloProvider>
+      </IntlProvider>
+    </LocaleProvider>
   )
 }
 
diff --git a/src/components/LearningToolsCardGrid.tsx b/src/components/LearningToolsCardGrid.tsx
index 0aced4d5c53..164d53d91b5 100644
--- a/src/components/LearningToolsCardGrid.tsx
+++ b/src/components/LearningToolsCardGrid.tsx
@@ -1,10 +1,12 @@
 // Library imports
 import React from "react"
 import { Grid } from "@chakra-ui/react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 // Component imports
 import ProductCard from "./ProductCard"
 import Translation from "./Translation"
+// Util imports
+import { translateMessageId } from "../utils/translations"
 // Type imports
 import { LearningToolsCardGridProps } from "../types"
 
@@ -12,7 +14,7 @@ import { LearningToolsCardGridProps } from "../types"
 const LearningToolsCardGrid: React.FC<LearningToolsCardGridProps> = ({
   category,
 }) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   return (
     <Grid
       templateColumns="repeat(auto-fill, minmax(min(100%, 280px), 1fr))"
@@ -26,7 +28,7 @@ const LearningToolsCardGrid: React.FC<LearningToolsCardGridProps> = ({
             key={name}
             background={background}
             url={url}
-            alt={t(alt)}
+            alt={translateMessageId(alt, intl)}
             image={image}
             name={name}
             subjects={subjects}
diff --git a/src/components/Link.tsx b/src/components/Link.tsx
index e1703607e4f..46c56eb9d13 100644
--- a/src/components/Link.tsx
+++ b/src/components/Link.tsx
@@ -1,8 +1,9 @@
 import React from "react"
 import { Icon, Link as ChakraLink, LinkProps, useTheme } from "@chakra-ui/react"
 import { navigate as gatsbyNavigate } from "gatsby"
-import { Link as IntlLink } from "gatsby-plugin-react-i18next"
+import { LocalizedLink as IntlLink } from "gatsby-theme-i18n"
 import { NavigateOptions } from "@reach/router"
+import { IntlShape } from "react-intl"
 
 import { BsQuestionSquareFill } from "react-icons/bs"
 
@@ -54,7 +55,7 @@ const Link: React.FC<IProps> = ({
 
   // TODO: in the next PR we are going to deprecate the `to` prop and just use `href`
   // this is to support the ButtonLink component which uses the `to` prop
-  const to = (toProp ?? href)!
+  const to = (toProp || href)!
 
   const isExternal = url.isExternal(to)
   const isHash = url.isHash(to)
@@ -144,14 +145,14 @@ const Link: React.FC<IProps> = ({
 
 export function navigate(
   to: string,
-  language: Lang,
+  intl: IntlShape,
   options?: NavigateOptions<{}>
 ) {
   if (typeof window === "undefined") {
     return
   }
 
-  const link = `/${language}${to}`
+  const link = `/${intl.locale as Lang}${to}`
   gatsbyNavigate(link, options)
 }
 
diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx
index 6d69b468946..7f25bc8474c 100644
--- a/src/components/Logo.tsx
+++ b/src/components/Logo.tsx
@@ -2,14 +2,15 @@ import React from "react"
 import { useStaticQuery, graphql } from "gatsby"
 import { useColorMode } from "@chakra-ui/react"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
+import { translateMessageId } from "../utils/translations"
 import { getImage } from "../utils/image"
 
 export interface IProps {}
 
 const Logo: React.FC<IProps> = () => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const { colorMode } = useColorMode()
   const isDarkTheme = colorMode === "dark"
   const data = useStaticQuery(graphql`
@@ -39,7 +40,10 @@ const Logo: React.FC<IProps> = () => {
 
   const image = isDarkTheme ? data.light : data.dark
   return (
-    <GatsbyImage image={getImage(image)!} alt={t("ethereum-foundation-logo")} />
+    <GatsbyImage
+      image={getImage(image)!}
+      alt={translateMessageId("ethereum-foundation-logo", intl)}
+    />
   )
 }
 
diff --git a/src/components/MergeArticleList.tsx b/src/components/MergeArticleList.tsx
index 3ac0084ba4a..520079ff75c 100644
--- a/src/components/MergeArticleList.tsx
+++ b/src/components/MergeArticleList.tsx
@@ -1,7 +1,9 @@
 import React from "react"
 import styled from "@emotion/styled"
 import CardList, { CardListItem } from "./CardList"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
+
+import { translateMessageId } from "../utils/translations"
 
 const Container = styled.div`
   margin-bottom: 4rem;
@@ -10,46 +12,91 @@ const Container = styled.div`
 export interface IProps {}
 
 const MergeArticleList: React.FC<IProps> = () => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const reads: Array<CardListItem> = [
     {
-      title: t("page-upgrade-article-title-ethmerge"),
-      description: t("page-upgrade-article-author-ethmerge"),
+      title: translateMessageId("page-upgrade-article-title-ethmerge", intl),
+      description: translateMessageId(
+        "page-upgrade-article-author-ethmerge",
+        intl
+      ),
       link: "https://ethmerge.com/",
     },
     {
-      title: t("page-upgrade-article-title-merge-is-coming"),
-      description: t("page-upgrade-article-author-alchemy"),
+      title: translateMessageId(
+        "page-upgrade-article-title-merge-is-coming",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-alchemy",
+        intl
+      ),
       link: "https://www.alchemy.com/the-merge",
     },
     {
-      title: t("page-upgrade-article-title-state-of-the-merge"),
-      description: t("page-upgrade-article-author-consensys"),
+      title: translateMessageId(
+        "page-upgrade-article-title-state-of-the-merge",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-consensys",
+        intl
+      ),
       link: "https://consensys.net/blog/news/the-state-of-the-merge-an-update-on-ethereums-merge-to-proof-of-stake-in-2022/",
     },
     {
-      title: t("page-upgrade-article-title-ropsten-merge-testnet"),
-      description: t("page-upgrade-article-author-ethereum-foundation"),
+      title: translateMessageId(
+        "page-upgrade-article-title-ropsten-merge-testnet",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-ethereum-foundation",
+        intl
+      ),
       link: "https://blog.ethereum.org/2022/05/30/ropsten-merge-announcement/",
     },
     {
-      title: t("page-upgrade-article-title-execution-layer-specs"),
-      description: t("page-upgrade-article-author-ethereum-foundation"),
+      title: translateMessageId(
+        "page-upgrade-article-title-execution-layer-specs",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-ethereum-foundation",
+        intl
+      ),
       link: "https://github.com/ethereum/execution-specs/",
     },
     {
-      title: t("page-upgrade-article-title-consensus-layer-specs"),
-      description: t("page-upgrade-article-author-ethereum-foundation"),
+      title: translateMessageId(
+        "page-upgrade-article-title-consensus-layer-specs",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-ethereum-foundation",
+        intl
+      ),
       link: "https://github.com/ethereum/consensus-specs/tree/dev/specs/bellatrix",
     },
     {
-      title: t("page-upgrade-article-title-engine-api-specs"),
-      description: t("page-upgrade-article-author-ethereum-foundation"),
+      title: translateMessageId(
+        "page-upgrade-article-title-engine-api-specs",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-ethereum-foundation",
+        intl
+      ),
       link: "https://github.com/ethereum/execution-apis/tree/main/src/engine",
     },
     {
-      title: t("page-upgrade-article-title-hitchhikers-guide-to-ethereum"),
-      description: t("page-upgrade-article-author-delphi-digital"),
+      title: translateMessageId(
+        "page-upgrade-article-title-hitchhikers-guide-to-ethereum",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-delphi-digital",
+        intl
+      ),
       link: "https://members.delphidigital.io/reports/the-hitchhikers-guide-to-ethereum",
     },
   ]
diff --git a/src/components/MergeInfographic.tsx b/src/components/MergeInfographic.tsx
index d0e2c4fbda1..c01769b30a7 100644
--- a/src/components/MergeInfographic.tsx
+++ b/src/components/MergeInfographic.tsx
@@ -1,11 +1,11 @@
 // Library imports
 import React from "react"
 import { AspectRatio, Box, chakra, Icon } from "@chakra-ui/react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 // Component imports
 import Translation from "./Translation"
 // Utility imports
-import { TranslationKey } from "../utils/translations"
+import { translateMessageId, TranslationKey } from "../utils/translations"
 // SVG imports
 import InfographicBg from "../assets/upgrades/merge-infographic-bg.svg"
 
@@ -61,14 +61,18 @@ export interface IProps {
 }
 
 const MergeInfographic: React.FC<IProps> = ({ className }) => {
-  const { t } = useTranslation()
-  const getString: StringGetter = (id: TranslationKey) => t(id)
+  const intl = useIntl()
+  const getString: StringGetter = (id: TranslationKey) =>
+    translateMessageId(id, intl)
 
   return (
     <AspectRatio
       className={className}
       role="img"
-      aria-label={t("page-upgrades-merge-infographic-alt-text")}
+      aria-label={translateMessageId(
+        "page-upgrades-merge-infographic-alt-text",
+        intl
+      )}
       position="relative"
       width="100%"
       ratio={25 / 11}
diff --git a/src/components/Nav/Dropdown.tsx b/src/components/Nav/Dropdown.tsx
index f15d49a0d38..4339987487a 100644
--- a/src/components/Nav/Dropdown.tsx
+++ b/src/components/Nav/Dropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState, createRef, useContext } from "react"
 import styled from "@emotion/styled"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { motion } from "framer-motion"
 
 import Translation from "../Translation"
@@ -8,7 +8,7 @@ import Icon from "../Icon"
 import Link from "../Link"
 
 import { useOnClickOutside } from "../../hooks/useOnClickOutside"
-import { getDirection } from "../../utils/translations"
+import { getDirection, translateMessageId } from "../../utils/translations"
 import { Lang } from "../../utils/languages"
 
 import { ISection } from "./types"
@@ -140,11 +140,10 @@ const NavDropdown: React.FC<IProps> & {
   Title: typeof Title
 } = ({ children, section, hasSubNav }) => {
   const [isOpen, setIsOpen] = useState(false)
-  const { t } = useTranslation()
-  const { language } = useI18next()
+  const intl = useIntl()
   const ref = createRef<HTMLLIElement>()
 
-  const direction = getDirection(language as Lang)
+  const direction = getDirection(intl.locale as Lang)
 
   const toggle = () => setIsOpen((isOpen) => !isOpen)
   const close = () => setIsOpen(false)
@@ -175,7 +174,7 @@ const NavDropdown: React.FC<IProps> & {
     <DropdownContext.Provider
       value={{ isOpen, toggle, close, tabInteractionHandler }}
     >
-      <NavListItem ref={ref} aria-label={t(ariaLabel)}>
+      <NavListItem ref={ref} aria-label={translateMessageId(ariaLabel, intl)}>
         <DropdownTitle
           dir={direction}
           onClick={() => toggle()}
diff --git a/src/components/Nav/Menu.tsx b/src/components/Nav/Menu.tsx
index b47bb4f7e6c..73b03b910f1 100644
--- a/src/components/Nav/Menu.tsx
+++ b/src/components/Nav/Menu.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import NavDropdown from "./Dropdown"
 import Translation from "../Translation"
@@ -21,8 +21,8 @@ export interface IProps {
 }
 
 const Menu: React.FC<IProps> = ({ path, sections }) => {
-  const { language } = useI18next()
-  const direction = getDirection(language as Lang)
+  const intl = useIntl()
+  const direction = getDirection(intl.locale as Lang)
   const shouldShowSubNav = path.includes("/developers/")
 
   const { useEthereum, learn, ...restSections } = sections
diff --git a/src/components/Nav/Mobile.tsx b/src/components/Nav/Mobile.tsx
index ea9fd7c5e31..a8e1338b43f 100644
--- a/src/components/Nav/Mobile.tsx
+++ b/src/components/Nav/Mobile.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { motion } from "framer-motion"
 
 import Emoji from "../OldEmoji"
@@ -10,6 +10,7 @@ import NakedButton from "../NakedButton"
 import Search from "../Search"
 import Translation from "../Translation"
 import { NavLink } from "../SharedStyledComponents"
+import { translateMessageId } from "../../utils/translations"
 
 import { ISections } from "./types"
 
@@ -278,7 +279,7 @@ const MobileNavMenu: React.FC<IProps> = ({
   toggleTheme,
   linkSections,
 }) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const isOpen = isMenuOpen || isSearchOpen
 
@@ -290,13 +291,13 @@ const MobileNavMenu: React.FC<IProps> = ({
     <Container>
       <MenuButton
         onClick={() => toggleMenu("search")}
-        aria-label={t("aria-toggle-search-button")}
+        aria-label={translateMessageId("aria-toggle-search-button", intl)}
       >
         <OtherIcon name="search" />
       </MenuButton>
       <MenuButton
         onClick={() => toggleMenu("menu")}
-        aria-label={t("aria-toggle-menu-button")}
+        aria-label={translateMessageId("aria-toggle-menu-button", intl)}
       >
         <GlyphButton viewBox="0 0 24 40">
           <motion.path
@@ -322,7 +323,10 @@ const MobileNavMenu: React.FC<IProps> = ({
           {Object.keys(linkSections).map((sectionKey, idx) => {
             const section = linkSections[sectionKey]
             return section.items ? (
-              <NavListItem key={idx} aria-label={`Select ${t(section.text)}`}>
+              <NavListItem
+                key={idx}
+                aria-label={`Select ${translateMessageId(section.text, intl)}`}
+              >
                 <SectionTitle>
                   <Translation id={section.text} />
                 </SectionTitle>
diff --git a/src/components/Nav/index.tsx b/src/components/Nav/index.tsx
index bace199ebdf..e98acbb10ba 100644
--- a/src/components/Nav/index.tsx
+++ b/src/components/Nav/index.tsx
@@ -3,7 +3,7 @@ import { Flex, Icon, IconButton, Text, useColorMode } from "@chakra-ui/react"
 import { MdWbSunny, MdBrightness2, MdLanguage } from "react-icons/md"
 import styled from "@emotion/styled"
 import { cloneDeep } from "lodash"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Menu from "./Menu"
 import MobileNavMenu from "./Mobile"
@@ -13,6 +13,7 @@ import Link from "../Link"
 import Search from "../Search"
 import Translation from "../Translation"
 import { NavLink } from "../SharedStyledComponents"
+import { translateMessageId } from "../../utils/translations"
 import HomeIcon from "../../assets/eth-home-icon.svg"
 import { IItem, ISections } from "./types"
 
@@ -124,7 +125,7 @@ const Nav: React.FC<IProps> = ({ path }) => {
   const { colorMode, toggleColorMode } = useColorMode()
   const [isMenuOpen, setIsMenuOpen] = useState(false)
   const [isSearchOpen, setIsSearchOpen] = useState(false)
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const isDarkTheme = colorMode === "dark"
 
@@ -402,9 +403,9 @@ const Nav: React.FC<IProps> = ({ path }) => {
 
   return (
     <NavContainer>
-      <StyledNav aria-label={t("nav-primary")}>
+      <StyledNav aria-label={translateMessageId("nav-primary", intl)}>
         <NavContent>
-          <HomeLogoNavLink to="/" aria-label={t("home")}>
+          <HomeLogoNavLink to="/" aria-label={translateMessageId("home", intl)}>
             <HomeLogo />
           </HomeLogoNavLink>
           {/* Desktop */}
@@ -448,7 +449,7 @@ const Nav: React.FC<IProps> = ({ path }) => {
         </NavContent>
       </StyledNav>
       {shouldShowSubNav && (
-        <SubNav aria-label={t("nav-developers")}>
+        <SubNav aria-label={translateMessageId("nav-developers", intl)}>
           {ednLinks.map((link, idx) => (
             <NavLink
               key={idx}
diff --git a/src/components/PageMetadata.tsx b/src/components/PageMetadata.tsx
index cc4887c7901..329f7f28682 100644
--- a/src/components/PageMetadata.tsx
+++ b/src/components/PageMetadata.tsx
@@ -2,11 +2,12 @@ import React from "react"
 import PropTypes from "prop-types"
 import { Helmet } from "react-helmet"
 import { useStaticQuery, graphql } from "gatsby"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { useLocation } from "@reach/router"
 import { getSrc } from "gatsby-plugin-image"
 
 import { isLang } from "../utils/languages"
+import { translateMessageId } from "../utils/translations"
 
 type NameMeta = {
   name: string
@@ -99,12 +100,11 @@ const PageMetadata: React.FC<IProps> = ({
 
   const location = useLocation()
 
-  const { t } = useTranslation()
-  const { language } = useI18next()
+  const intl = useIntl()
 
-  const desc = description || t("site-description")
+  const desc = description || translateMessageId("site-description", intl)
 
-  const siteTitle = t("site-title")
+  const siteTitle = translateMessageId("site-title", intl)
 
   /* Set canonical URL w/ language path to avoid duplicate content */
   /* e.g. set ethereum.org/about/ to ethereum.org/en/about/ */
@@ -135,7 +135,7 @@ const PageMetadata: React.FC<IProps> = ({
 
   return (
     <Helmet
-      htmlAttributes={{ lang: language }}
+      htmlAttributes={{ lang: intl.locale }}
       title={title}
       titleTemplate={`%s | ${siteTitle}`}
       link={[{ rel: "canonical", key: canonical, href: canonical }]}
diff --git a/src/components/Quiz/QuizSummary.tsx b/src/components/Quiz/QuizSummary.tsx
index 486c31dd443..2b3ac94eaec 100644
--- a/src/components/Quiz/QuizSummary.tsx
+++ b/src/components/Quiz/QuizSummary.tsx
@@ -1,7 +1,7 @@
 // Import libraries
-import React from "react"
+import React, { useMemo } from "react"
 import { Box, Flex, Text, useMediaQuery } from "@chakra-ui/react"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 // Import utilities
 import { numberToPercent } from "../../utils/numberToPercent"
@@ -21,7 +21,7 @@ const QuizSummary: React.FC<IProps> = ({
   questionCount,
   ratioCorrect,
 }) => {
-  const { language } = useI18next()
+  const { locale } = useIntl()
   const [largerThanMobile] = useMediaQuery("(min-width: 30em)")
 
   const valueStyles = { fontWeight: "700", mb: 2 }
@@ -54,9 +54,7 @@ const QuizSummary: React.FC<IProps> = ({
         overflowX="hidden"
       >
         <Flex>
-          <Text {...valueStyles}>
-            {numberToPercent(ratioCorrect, language)}
-          </Text>
+          <Text {...valueStyles}>{numberToPercent(ratioCorrect, locale)}</Text>
           <Text {...labelStyles}>Score</Text>
         </Flex>
         <Flex>
diff --git a/src/components/Roadmap.tsx b/src/components/Roadmap.tsx
index 384b75f347c..4a3f109b01a 100644
--- a/src/components/Roadmap.tsx
+++ b/src/components/Roadmap.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 import axios from "axios"
 
@@ -7,6 +7,8 @@ import Translation from "./Translation"
 import Link from "./Link"
 import { FakeLinkExternal, CardItem as Item } from "./SharedStyledComponents"
 
+import { translateMessageId } from "../utils/translations"
+
 import { GATSBY_FUNCTIONS_PATH } from "../constants"
 
 const Section = styled.div`
@@ -66,10 +68,9 @@ const IssueSection: React.FC<IPropsIssueSection> = ({ issues }) => {
 export interface IProps {}
 
 const Roadmap: React.FC<IProps> = () => {
-  const { t } = useTranslation()
-  const { language } = useI18next()
+  const intl = useIntl()
   const issue: Issue = {
-    title: t("loading"),
+    title: translateMessageId("loading", intl),
     labels: [],
   }
   const blankIssues: Array<Issue> = Array(6).fill(issue)
@@ -143,8 +144,8 @@ const Roadmap: React.FC<IProps> = () => {
       .catch((error) => {
         console.error(error)
         const errorIssue: Issue = {
-          title: t("loading-error"),
-          errorMsg: t("refresh"),
+          title: translateMessageId("loading-error", intl),
+          errorMsg: translateMessageId("refresh", intl),
           labels: [],
         }
         const errorIssues: Array<Issue> = Array(3).fill(errorIssue)
@@ -154,7 +155,7 @@ const Roadmap: React.FC<IProps> = () => {
           implemented: errorIssues,
         })
       })
-  }, [language])
+  }, [intl])
 
   return (
     <div>
diff --git a/src/components/Search/Input.tsx b/src/components/Search/Input.tsx
index 47b9806a33e..9657e3e4f7d 100644
--- a/src/components/Search/Input.tsx
+++ b/src/components/Search/Input.tsx
@@ -1,9 +1,10 @@
 import React, { ChangeEvent, FormEvent } from "react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 import { connectSearchBox } from "react-instantsearch-dom"
 
 import Icon from "../Icon"
+import { translateMessageId } from "../../utils/translations"
 
 const Form = styled.form`
   margin: 0;
@@ -71,8 +72,8 @@ const Input: React.FC<IInputProps> = ({
   inputRef,
   ...rest
 }) => {
-  const { t } = useTranslation()
-  const searchString = t("search")
+  const intl = useIntl()
+  const searchString = translateMessageId("search", intl)
 
   const handleInputChange = (event: ChangeEvent<HTMLInputElement>): void => {
     const value = event.target.value
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index c0de8e920f3..a77b03ec74b 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef, MouseEventHandler } from "react"
 import { Link as GatsbyLink } from "gatsby"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import {
   Configure,
   InstantSearch,
@@ -217,7 +217,7 @@ const Search: React.FC<ISearchProps> = ({
   handleSearchSelect,
   useKeyboardShortcut = false,
 }) => {
-  const { language } = useI18next()
+  const intl = useIntl()
   const containerRef = useRef<HTMLDivElement>(null)
   const inputRef = useRef<HTMLInputElement>(null)
   const [query, setQuery] = useState(``)
@@ -275,7 +275,7 @@ const Search: React.FC<ISearchProps> = ({
         indexName={indices[0].name}
         onSearchStateChange={({ query }) => setQuery(query)}
       >
-        <Configure filters={`lang:${language}`} hitsPerPage={8} />
+        <Configure filters={`lang:${intl.locale}`} hitsPerPage={8} />
         <Input
           inputRef={inputRef}
           query={query}
diff --git a/src/components/ShardChainsList.tsx b/src/components/ShardChainsList.tsx
index 90ed55a1cb6..32652c7feb4 100644
--- a/src/components/ShardChainsList.tsx
+++ b/src/components/ShardChainsList.tsx
@@ -1,7 +1,9 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
 import CardList, { CardListItem } from "./CardList"
+import { useIntl } from "react-intl"
+
+import { translateMessageId } from "../utils/translations"
 
 const Container = styled.div`
   margin-bottom: 4rem;
@@ -10,46 +12,91 @@ const Container = styled.div`
 export interface IProps {}
 
 const ShardChainsList: React.FC<IProps> = () => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const reads: Array<CardListItem> = [
     {
-      title: t("page-upgrade-article-title-sharding-is-great"),
-      description: t("page-upgrade-article-author-vitalik-buterin"),
+      title: translateMessageId(
+        "page-upgrade-article-title-sharding-is-great",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-vitalik-buterin",
+        intl
+      ),
       link: "https://vitalik.ca/general/2021/04/07/sharding.html",
     },
     {
-      title: t("page-upgrade-article-title-rollup-roadmap"),
-      description: t("page-upgrade-article-author-vitalik-buterin"),
+      title: translateMessageId(
+        "page-upgrade-article-title-rollup-roadmap",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-vitalik-buterin",
+        intl
+      ),
       link: "https://ethereum-magicians.org/t/a-rollup-centric-ethereum-roadmap/4698",
     },
     {
-      title: t("page-upgrade-article-title-two-point-oh"),
-      description: t("page-upgrade-article-author-ethos-dev"),
+      title: translateMessageId(
+        "page-upgrade-article-title-two-point-oh",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-ethos-dev",
+        intl
+      ),
       link: "https://ethos.dev/beacon-chain/",
     },
     {
-      title: t("page-upgrade-article-title-sharding-consensus"),
-      description: t("page-upgrade-article-author-ethereum-foundation"),
+      title: translateMessageId(
+        "page-upgrade-article-title-sharding-consensus",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-ethereum-foundation",
+        intl
+      ),
       link: "https://blog.ethereum.org/2020/03/27/sharding-consensus/",
     },
     {
-      title: t("page-upgrade-article-title-hitchhikers-guide-to-ethereum"),
-      description: t("page-upgrade-article-author-delphi-digital"),
+      title: translateMessageId(
+        "page-upgrade-article-title-hitchhikers-guide-to-ethereum",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-delphi-digital",
+        intl
+      ),
       link: "https://members.delphidigital.io/reports/the-hitchhikers-guide-to-ethereum",
     },
     {
-      title: t("page-upgrade-article-title-eip-4844"),
-      description: t("page-upgrade-article-author-eip-4844"),
+      title: translateMessageId("page-upgrade-article-title-eip-4844", intl),
+      description: translateMessageId(
+        "page-upgrade-article-author-eip-4844",
+        intl
+      ),
       link: "https://eips.ethereum.org/EIPS/eip-4844",
     },
     {
-      title: t("page-upgrade-article-title-proto-danksharding-faq"),
-      description: t("page-upgrade-article-author-vitalik-buterin"),
+      title: translateMessageId(
+        "page-upgrade-article-title-proto-danksharding-faq",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-vitalik-buterin",
+        intl
+      ),
       link: "https://notes.ethereum.org/@vbuterin/proto_danksharding_faq",
     },
     {
-      title: t("page-upgrade-article-title-sharding-das"),
-      description: t("page-upgrade-article-author-vitalik-buterin"),
+      title: translateMessageId(
+        "page-upgrade-article-title-sharding-das",
+        intl
+      ),
+      description: translateMessageId(
+        "page-upgrade-article-author-vitalik-buterin",
+        intl
+      ),
       link: "https://hackmd.io/@vbuterin/sharding_proposal",
     },
   ]
diff --git a/src/components/SideNav.tsx b/src/components/SideNav.tsx
index e8394842e73..836c6664d11 100644
--- a/src/components/SideNav.tsx
+++ b/src/components/SideNav.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react"
 import styled from "@emotion/styled"
 import { motion } from "framer-motion"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Icon from "./Icon"
 import Link from "./Link"
@@ -9,6 +9,7 @@ import Translation from "./Translation"
 import { dropdownIconContainerVariant } from "./SharedStyledComponents"
 
 import docLinks from "../data/developer-docs-links.yaml"
+import { translateMessageId } from "../utils/translations"
 import { DeveloperDocsLink } from "../types"
 
 const IconContainer = styled(motion.div)`
@@ -153,10 +154,10 @@ export interface IProps {
 // 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: React.FC<IProps> = ({ path }) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   return (
-    <Nav aria-label={t("nav-developers-docs")}>
+    <Nav aria-label={translateMessageId("nav-developers-docs", intl)}>
       {docLinks.map((item, idx) => (
         <NavLink item={item} path={path} key={idx} />
       ))}
diff --git a/src/components/StablecoinAccordion.tsx b/src/components/StablecoinAccordion.tsx
index e52493c9b3f..dd67c00df72 100644
--- a/src/components/StablecoinAccordion.tsx
+++ b/src/components/StablecoinAccordion.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react"
 import { useStaticQuery, graphql } from "gatsby"
 import { getImage } from "gatsby-plugin-image"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 // TODO add motion animation
 // import { motion } from "framer-motion"
@@ -20,8 +20,8 @@ import {
   RightColumn,
 } from "./SharedStyledComponents"
 
+import { translateMessageId } from "../utils/translations"
 import { isMobile } from "../utils/isMobile"
-import { Lang } from "../utils/languages"
 
 const Card = styled.div`
   border-radius: 2px;
@@ -219,8 +219,7 @@ export interface IProps {}
 
 const StablecoinAccordion: React.FC<IProps> = () => {
   const [openSection, setOpenSection] = useState<string>("") // default to all closed
-  const { language } = useI18next()
-  const { t } = useTranslation()
+  const intl = useIntl()
   const data = useStaticQuery(graphql`
     {
       uniswap: file(relativePath: { eq: "dapps/uni.png" }) {
@@ -391,25 +390,25 @@ const StablecoinAccordion: React.FC<IProps> = () => {
       title: "Uniswap",
       image: getImage(data.uniswap)!,
       link: "https://uniswap.org",
-      alt: t("uniswap-logo")!,
+      alt: translateMessageId("uniswap-logo", intl),
     },
     {
       title: "Loopring",
       image: getImage(data.loopring)!,
       link: "https://loopring.org",
-      alt: t("loopring-logo")!,
+      alt: translateMessageId("loopring-logo", intl),
     },
     {
       title: "1inch",
       image: getImage(data.oneinch)!,
       link: "https://app.1inch.io",
-      alt: t("1inch-logo")!,
+      alt: translateMessageId("1inch-logo", intl),
     },
     {
       title: "Matcha",
       image: getImage(data.matcha)!,
       link: "https://matcha.xyz",
-      alt: t("matcha-logo")!,
+      alt: translateMessageId("matcha-logo", intl),
     },
   ]
 
@@ -418,43 +417,61 @@ const StablecoinAccordion: React.FC<IProps> = () => {
       title: "Compound",
       image: getImage(data.compound)!,
       link: "https://compound.finance",
-      alt: t("compound-logo")!,
+      alt: translateMessageId("compound-logo", intl),
     },
     {
       title: "Aave",
       image: getImage(data.aave)!,
       link: "https://aave.com",
-      alt: t("aave-logo")!,
+      alt: translateMessageId("aave-logo", intl),
     },
     {
       title: "Oasis",
       image: getImage(data.oasis)!,
       link: "https://oasis.app",
-      alt: t("oasis-logo")!,
+      alt: translateMessageId("oasis-logo", intl),
     },
   ]
 
   const earn: Array<CardListItem> = [
     {
-      title: t("page-stablecoins-accordion-earn-project-bounties")!,
+      title: translateMessageId(
+        "page-stablecoins-accordion-earn-project-bounties",
+        intl
+      ),
       image: getImage(data.gitcoin)!,
       link: "https://gitcoin.co/explorer",
-      description: t("page-stablecoins-accordion-earn-project-1-description")!,
-      alt: t("gitcoin-logo")!,
+      description: translateMessageId(
+        "page-stablecoins-accordion-earn-project-1-description",
+        intl
+      ),
+      alt: translateMessageId("gitcoin-logo", intl),
     },
     {
-      title: t("page-stablecoins-accordion-earn-project-community")!,
+      title: translateMessageId(
+        "page-stablecoins-accordion-earn-project-community",
+        intl
+      ),
       image: getImage(data.maker)!,
       link: "https://makerdao.world/en/resources/",
-      description: t("page-stablecoins-accordion-earn-project-2-description")!,
-      alt: t("makerdao-logo")!,
+      description: translateMessageId(
+        "page-stablecoins-accordion-earn-project-2-description",
+        intl
+      ),
+      alt: translateMessageId("makerdao-logo", intl),
     },
     {
-      title: t("page-stablecoins-accordion-earn-project-bug-bounties")!,
+      title: translateMessageId(
+        "page-stablecoins-accordion-earn-project-bug-bounties",
+        intl
+      ),
       image: getImage(data.eth)!,
       link: "/bug-bounty/",
-      description: t("page-stablecoins-accordion-earn-project-3-description")!,
-      alt: t("ethereum-logo")!,
+      description: translateMessageId(
+        "page-stablecoins-accordion-earn-project-3-description",
+        intl
+      ),
+      alt: translateMessageId("ethereum-logo", intl),
     },
   ]
 
@@ -463,37 +480,37 @@ const StablecoinAccordion: React.FC<IProps> = () => {
       title: "Coinbase",
       image: getImage(data.coinbase)!,
       link: "https://coinbase.com",
-      alt: t("coinbase-logo")!,
+      alt: translateMessageId("coinbase-logo", intl),
     },
     {
       title: "Gemini",
       image: getImage(data.gemini)!,
       link: "https://gemini.com",
-      alt: t("gemini-logo")!,
+      alt: translateMessageId("gemini-logo", intl),
     },
     {
       title: "Kraken",
       image: getImage(data.kraken)!,
       link: "https://kraken.com",
-      alt: t("kraken-logo")!,
+      alt: translateMessageId("kraken-logo", intl),
     },
     {
       title: "Coinmama",
       image: getImage(data.coinmama)!,
       link: "https://coinmama.com",
-      alt: t("coinmama-logo")!,
+      alt: translateMessageId("coinmama-logo", intl),
     },
     {
       title: "Bittrex",
       image: getImage(data.bittrex)!,
       link: "https://global.bittrex.com",
-      alt: t("bittrex-logo")!,
+      alt: translateMessageId("bittrex-logo", intl),
     },
     {
       title: "Binance",
       image: getImage(data.binance)!,
       link: "https://binance.com",
-      alt: t("binance-logo")!,
+      alt: translateMessageId("binance-logo", intl),
     },
   ]
 
@@ -506,7 +523,7 @@ const StablecoinAccordion: React.FC<IProps> = () => {
       setOpenSection(selectedSection)
     }
     if (isMobile()) {
-      navigate(`/stablecoins/#${selectedSection}`, language as Lang)
+      navigate(`/stablecoins/#${selectedSection}`, intl)
     }
   }
 
diff --git a/src/components/StablecoinBoxGrid.tsx b/src/components/StablecoinBoxGrid.tsx
index 64e534c8816..b513e76d3f5 100644
--- a/src/components/StablecoinBoxGrid.tsx
+++ b/src/components/StablecoinBoxGrid.tsx
@@ -1,11 +1,10 @@
 import React, { useState } from "react"
 import { Box, Flex, Heading, useColorModeValue } from "@chakra-ui/react"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import Link, { navigate } from "./Link"
 import Emoji from "./Emoji"
 import Translation from "./Translation"
 import { isMobile } from "../utils/isMobile"
-import { Lang } from "../utils/languages"
 
 // Represent string as 32-bit integer
 const hashCode = (string: string): number => {
@@ -268,14 +267,14 @@ export interface IProps {
 }
 
 const StablecoinBoxGrid: React.FC<IProps> = ({ items }) => {
-  const { language } = useI18next()
+  const intl = useIntl()
   const [indexOpen, setOpenIndex] = useState<number>(0)
 
   // TODO generalize
   const handleSelect = (idx: number): void => {
     setOpenIndex(idx)
     if (isMobile()) {
-      navigate(`/stablecoins/#type-${idx}`, language as Lang)
+      navigate(`/stablecoins/#type-${idx}`, intl)
     }
   }
 
diff --git a/src/components/Staking/StakingCommunityCallout.tsx b/src/components/Staking/StakingCommunityCallout.tsx
index 675f20c5f2c..9febc132b9b 100644
--- a/src/components/Staking/StakingCommunityCallout.tsx
+++ b/src/components/Staking/StakingCommunityCallout.tsx
@@ -1,5 +1,5 @@
 import React from "react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 import { graphql, useStaticQuery } from "gatsby"
 
@@ -7,6 +7,7 @@ import ButtonLink from "../ButtonLink"
 import CalloutBanner from "../CalloutBanner"
 import Translation from "../Translation"
 
+import { translateMessageId } from "../../utils/translations"
 import { trackCustomEvent } from "../../utils/matomo"
 import { getImage } from "../../utils/image"
 
@@ -33,7 +34,7 @@ export interface IProps {
 }
 
 const StakingCommunityCallout: React.FC<IProps> = (props) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const { image } = useStaticQuery(graphql`
     {
       image: file(relativePath: { eq: "enterprise-eth.png" }) {
@@ -53,7 +54,7 @@ const StakingCommunityCallout: React.FC<IProps> = (props) => {
     <StyledCallout
       {...props}
       image={getImage(image)!}
-      alt={t("page-staking-image-alt")}
+      alt={translateMessageId("page-staking-image-alt", intl)}
       titleKey={"page-staking-join-community"}
       descriptionKey={"page-staking-join-community-desc"}
     >
diff --git a/src/components/Staking/StakingLaunchpadWidget.tsx b/src/components/Staking/StakingLaunchpadWidget.tsx
index 947f42cfa92..1857e030fa9 100644
--- a/src/components/Staking/StakingLaunchpadWidget.tsx
+++ b/src/components/Staking/StakingLaunchpadWidget.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from "react"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import { StyledSelect as Select } from "../SharedStyledComponents"
 import ButtonLink from "../ButtonLink"
@@ -8,6 +8,7 @@ import Emoji from "../OldEmoji"
 import Translation from "../Translation"
 
 import { trackCustomEvent } from "../../utils/matomo"
+import { translateMessageId } from "../../utils/translations"
 
 const Container = styled.div`
   display: flex;
@@ -47,7 +48,7 @@ const ButtonContainer = styled.div`
 export interface IProps {}
 
 const StakingLaunchpadWidget: React.FC<IProps> = () => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const [selection, setSelection] = useState("testnet")
 
   const handleChange = (e) => {
@@ -100,8 +101,14 @@ const StakingLaunchpadWidget: React.FC<IProps> = () => {
         <ButtonContainer style={{ marginBottom: "1rem" }}>
           <ButtonLink to={data[selection].url}>
             {selection === "mainnet"
-              ? t("page-staking-launchpad-widget-mainnet-start")
-              : t("page-staking-launchpad-widget-testnet-start")}
+              ? translateMessageId(
+                  "page-staking-launchpad-widget-mainnet-start",
+                  intl
+                )
+              : translateMessageId(
+                  "page-staking-launchpad-widget-testnet-start",
+                  intl
+                )}
           </ButtonLink>
         </ButtonContainer>
         <p>
diff --git a/src/components/Staking/StakingStatsBox.tsx b/src/components/Staking/StakingStatsBox.tsx
index 8cc4d97af90..7032c664b45 100644
--- a/src/components/Staking/StakingStatsBox.tsx
+++ b/src/components/Staking/StakingStatsBox.tsx
@@ -1,7 +1,7 @@
 // Import libraries
 import React, { useState, useEffect } from "react"
 import styled from "@emotion/styled"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { Spinner } from "@chakra-ui/react"
 // Import components
 import Translation from "../Translation"
@@ -96,7 +96,7 @@ export interface IProps {}
 
 // StatsBox component
 const StakingStatsBox: React.FC<IProps> = () => {
-  const { language } = useI18next()
+  const intl = useIntl()
   /**
    * State variables:
    * - ZERO is default string, "0", representing loading state
@@ -107,7 +107,9 @@ const StakingStatsBox: React.FC<IProps> = () => {
   const [currentApr, setCurrentApr] = useState<string | null>(ZERO)
 
   useEffect(() => {
-    const localeForStatsBoxNumbers = getLocaleForNumberFormat(language as Lang)
+    const localeForStatsBoxNumbers = getLocaleForNumberFormat(
+      intl.locale as Lang
+    )
 
     // Helper functions
     const formatInteger = (amount: number): string =>
@@ -143,7 +145,7 @@ const StakingStatsBox: React.FC<IProps> = () => {
         setTotalValidators(null)
       }
     })()
-  }, [language])
+  }, [intl.locale])
 
   return (
     <Container>
diff --git a/src/components/StatsBoxGrid.tsx b/src/components/StatsBoxGrid.tsx
index 5888535e8e8..c9f8be6f672 100644
--- a/src/components/StatsBoxGrid.tsx
+++ b/src/components/StatsBoxGrid.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react"
 import styled from "@emotion/styled"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import axios from "axios"
 import { kebabCase } from "lodash"
 import { AreaChart, ResponsiveContainer, Area, XAxis } from "recharts"
@@ -14,6 +14,7 @@ import StatLoadingMessage from "./StatLoadingMessage"
 
 import {
   isLangRightToLeft,
+  translateMessageId,
   getLocaleForNumberFormat,
 } from "../utils/translations"
 import { getData } from "../utils/cache"
@@ -298,8 +299,7 @@ interface IFetchTxResponse {
 export interface IProps {}
 
 const StatsBoxGrid: React.FC<IProps> = () => {
-  const { t } = useTranslation()
-  const { language } = useI18next()
+  const intl = useIntl()
 
   const [ethPrices, setEthPrices] = useState<State>({
     data: [],
@@ -331,7 +331,9 @@ const StatsBoxGrid: React.FC<IProps> = () => {
   const [selectedRangeTxs, setSelectedRangeTxs] = useState<string>(ranges[0])
 
   useEffect(() => {
-    const localeForStatsBoxNumbers = getLocaleForNumberFormat(language as Lang)
+    const localeForStatsBoxNumbers = getLocaleForNumberFormat(
+      intl.locale as Lang
+    )
 
     const formatPrice = (price: number): string => {
       return new Intl.NumberFormat(localeForStatsBoxNumbers, {
@@ -475,14 +477,20 @@ const StatsBoxGrid: React.FC<IProps> = () => {
       }
     }
     fetchTxCount()
-  }, [language])
+  }, [intl.locale])
 
   const metrics: Array<Metric> = [
     {
       apiProvider: "CoinGecko",
       apiUrl: "https://www.coingecko.com/en/coins/ethereum",
-      title: t("page-index-network-stats-eth-price-description"),
-      description: t("page-index-network-stats-eth-price-explainer"),
+      title: translateMessageId(
+        "page-index-network-stats-eth-price-description",
+        intl
+      ),
+      description: translateMessageId(
+        "page-index-network-stats-eth-price-explainer",
+        intl
+      ),
       buttonContainer: (
         <RangeSelector
           state={selectedRangePrice}
@@ -495,8 +503,14 @@ const StatsBoxGrid: React.FC<IProps> = () => {
     {
       apiProvider: "Etherscan",
       apiUrl: "https://etherscan.io/",
-      title: t("page-index-network-stats-tx-day-description"),
-      description: t("page-index-network-stats-tx-day-explainer"),
+      title: translateMessageId(
+        "page-index-network-stats-tx-day-description",
+        intl
+      ),
+      description: translateMessageId(
+        "page-index-network-stats-tx-day-explainer",
+        intl
+      ),
       buttonContainer: (
         <RangeSelector
           state={selectedRangeTxs}
@@ -509,8 +523,14 @@ const StatsBoxGrid: React.FC<IProps> = () => {
     {
       apiProvider: "DeFi Llama",
       apiUrl: "https://defillama.com/",
-      title: t("page-index-network-stats-value-defi-description"),
-      description: t("page-index-network-stats-value-defi-explainer"),
+      title: translateMessageId(
+        "page-index-network-stats-value-defi-description",
+        intl
+      ),
+      description: translateMessageId(
+        "page-index-network-stats-value-defi-explainer",
+        intl
+      ),
       buttonContainer: (
         <RangeSelector
           state={selectedRangeTvl}
@@ -523,8 +543,14 @@ const StatsBoxGrid: React.FC<IProps> = () => {
     {
       apiProvider: "Etherscan",
       apiUrl: "https://etherscan.io/nodetracker",
-      title: t("page-index-network-stats-nodes-description"),
-      description: t("page-index-network-stats-nodes-explainer"),
+      title: translateMessageId(
+        "page-index-network-stats-nodes-description",
+        intl
+      ),
+      description: translateMessageId(
+        "page-index-network-stats-nodes-explainer",
+        intl
+      ),
       buttonContainer: (
         <RangeSelector
           state={selectedRangeNodes}
@@ -535,7 +561,7 @@ const StatsBoxGrid: React.FC<IProps> = () => {
       range: selectedRangeNodes,
     },
   ]
-  const dir = isLangRightToLeft(language as Lang) ? "rtl" : "ltr"
+  const dir = isLangRightToLeft(intl.locale as Lang) ? "rtl" : "ltr"
   return (
     <Grid>
       {metrics.map((metric, idx) => (
diff --git a/src/components/Translation.tsx b/src/components/Translation.tsx
index 3e389f29820..16f4cba390f 100644
--- a/src/components/Translation.tsx
+++ b/src/components/Translation.tsx
@@ -1,29 +1,11 @@
 import React from "react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
-import htmr from "htmr"
-
-import Link from "./Link"
-
-interface Props {
-  id: string
-}
-
-// Custom components mapping to be used by `htmr` when parsing the translation
-// text
-const transform = {
-  a: Link,
-}
-
-// Renders the translation string for the given translation key `id`. It
-// fallback to English if it doesn't find the given key in the current language
-const Translation = ({ id }: Props) => {
-  const { t } = useTranslation()
-
-  const translatedText = t(id)
-
-  // Use `htmr` to parse html content in the translation text
-  // @ts-ignore
-  return <>{htmr(translatedText, { transform })}</>
-}
+import { FormattedHTMLMessage } from "react-intl"
+import { getDefaultMessage, TranslationKey } from "../utils/translations"
+
+// Wrapper on <FormattedHTMLMessage /> to always fallback to English
+// Use this component for any user-facing string
+const Translation = ({ id }: { id: TranslationKey }) => (
+  <FormattedHTMLMessage id={id} defaultMessage={getDefaultMessage(id)} />
+)
 
 export default Translation
diff --git a/src/components/Trilemma.tsx b/src/components/Trilemma.tsx
index 3e1dfde358f..8efe64fae2a 100644
--- a/src/components/Trilemma.tsx
+++ b/src/components/Trilemma.tsx
@@ -1,8 +1,9 @@
 import React, { useState } from "react"
 import styled from "@emotion/styled"
 import { motion } from "framer-motion"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
+import { translateMessageId } from "../utils/translations"
 import Translation from "./Translation"
 import Icon from "./Icon"
 import Card from "./Card"
@@ -181,7 +182,7 @@ const CloseIconContainer = styled.span`
 export interface IProps {}
 
 const Trilemma: React.FC<IProps> = () => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const [state, setState] = useState({
     isDecentralizedAndSecure: false,
@@ -384,16 +385,16 @@ const Trilemma: React.FC<IProps> = () => {
           />
         </CircleSelect>
         <Text x="400" y="540" isActive={isEthereum}>
-          {t("ethereum")}
+          {translateMessageId("ethereum", intl)}
         </Text>
         <Text x="460" y="150" isActive={isDecentralized}>
-          {t("page-upgrades-vision-trilemma-text-1")}
+          {translateMessageId("page-upgrades-vision-trilemma-text-1", intl)}
         </Text>
         <Text x="-24" y="486" isActive={isSecure}>
-          {t("page-upgrades-vision-trilemma-text-2")}
+          {translateMessageId("page-upgrades-vision-trilemma-text-2", intl)}
         </Text>
         <Text x="540" y="835" isActive={isScalable}>
-          {t("page-upgrades-vision-trilemma-text-3")}
+          {translateMessageId("page-upgrades-vision-trilemma-text-3", intl)}
         </Text>
       </Triangle>
     </Container>
diff --git a/src/components/TutorialMetadata.tsx b/src/components/TutorialMetadata.tsx
index 1ae93fd2666..f84e27c2842 100644
--- a/src/components/TutorialMetadata.tsx
+++ b/src/components/TutorialMetadata.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import CopyToClipboard from "./CopyToClipboard"
 import Pill from "./Pill"
 import Link from "./Link"
@@ -95,7 +95,7 @@ export const getSkillTranslationId = (skill: Skill): TranslationKey =>
   `page-tutorial-${Skill[skill.toUpperCase() as keyof typeof Skill]}`
 
 const TutorialMetadata: React.FC<IProps> = ({ tutorial }) => {
-  const { language } = useI18next()
+  const intl = useIntl()
 
   const frontmatter = tutorial.frontmatter
   const hasSource = frontmatter.source && frontmatter.sourceUrl
@@ -129,7 +129,7 @@ const TutorialMetadata: React.FC<IProps> = ({ tutorial }) => {
         {published && (
           <DataContainer>
             <Emoji size={1} mr={`0.5em`} text=":calendar:" />
-            {getLocaleTimestamp(language as Lang, published)}
+            {getLocaleTimestamp(intl.locale as Lang, published)}
           </DataContainer>
         )}
         <DataContainer>
diff --git a/src/pages-conditional/dapps.tsx b/src/pages-conditional/dapps.tsx
index 9dae2cee735..c5fbdcd11c5 100644
--- a/src/pages-conditional/dapps.tsx
+++ b/src/pages-conditional/dapps.tsx
@@ -2,7 +2,7 @@ import React, { useRef, useState, useEffect } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Translation from "../components/Translation"
 import Pill from "../components/Pill"
@@ -34,6 +34,7 @@ import {
 } from "../components/SharedStyledComponents"
 import FeedbackCard from "../components/FeedbackCard"
 
+import { translateMessageId } from "../utils/translations"
 import { getImage, getSrc } from "../utils/image"
 import { Context } from "../types"
 
@@ -346,8 +347,7 @@ const DappsPage = ({
   data,
   location,
 }: PageProps<Queries.DappsPageQuery, Context>) => {
-  const { t } = useTranslation()
-  const { language } = useI18next()
+  const intl = useIntl()
   const [selectedCategory, setCategory] = useState<CategoryType>(
     CategoryType.FINANCE
   )
@@ -392,7 +392,7 @@ const DappsPage = ({
     } else {
       // If within `window` and not in the bottom mobile selection...
       if (window) {
-        newPath = `/${language}${newPath}`
+        newPath = `/${intl.locale}${newPath}`
         // Apply new path without page refresh
         window.history.pushState(null, "", newPath)
       }
@@ -409,124 +409,220 @@ const DappsPage = ({
 
   const features = [
     {
-      title: t("page-dapps-features-1-title"),
-      description: t("page-dapps-features-1-description"),
+      title: translateMessageId("page-dapps-features-1-title", intl),
+      description: translateMessageId(
+        "page-dapps-features-1-description",
+        intl
+      ),
       emoji: ":bust_in_silhouette:",
     },
     {
-      title: t("page-dapps-features-2-title"),
-      description: t("page-dapps-features-2-description"),
+      title: translateMessageId("page-dapps-features-2-title", intl),
+      description: translateMessageId(
+        "page-dapps-features-2-description",
+        intl
+      ),
       emoji: ":megaphone:",
     },
     {
-      title: t("page-dapps-features-3-title"),
-      description: t("page-dapps-features-3-description"),
+      title: translateMessageId("page-dapps-features-3-title", intl),
+      description: translateMessageId(
+        "page-dapps-features-3-description",
+        intl
+      ),
       emoji: ":money-mouth_face:",
     },
     {
-      title: t("page-dapps-features-4-title"),
-      description: t("page-dapps-features-4-description"),
+      title: translateMessageId("page-dapps-features-4-title", intl),
+      description: translateMessageId(
+        "page-dapps-features-4-description",
+        intl
+      ),
       emoji: ":electric_plug:",
     },
     {
-      title: t("page-dapps-features-5-title"),
-      description: t("page-dapps-features-5-description"),
+      title: translateMessageId("page-dapps-features-5-title", intl),
+      description: translateMessageId(
+        "page-dapps-features-5-description",
+        intl
+      ),
       emoji: ":detective:",
     },
     {
-      title: t("page-dapps-features-6-title"),
-      description: t("page-dapps-features-6-description"),
+      title: translateMessageId("page-dapps-features-6-title", intl),
+      description: translateMessageId(
+        "page-dapps-features-6-description",
+        intl
+      ),
       emoji: ":key:",
     },
     {
-      title: t("page-dapps-features-7-title"),
-      description: t("page-dapps-features-7-description"),
+      title: translateMessageId("page-dapps-features-7-title", intl),
+      description: translateMessageId(
+        "page-dapps-features-7-description",
+        intl
+      ),
       emoji: ":antenna_with_bars:",
     },
   ]
 
   const categories: Categories = {
     [CategoryType.FINANCE]: {
-      title: t("page-dapps-finance-button"),
+      title: translateMessageId("page-dapps-finance-button", intl),
       emoji: ":money_with_wings:",
-      benefitsTitle: t("page-dapps-finance-benefits-title"),
-      benefitsDescription: t("page-dapps-finance-benefits-description"),
+      benefitsTitle: translateMessageId(
+        "page-dapps-finance-benefits-title",
+        intl
+      ),
+      benefitsDescription: translateMessageId(
+        "page-dapps-finance-benefits-description",
+        intl
+      ),
       benefits: [
         {
           emoji: ":open_lock:",
-          title: t("page-dapps-finance-benefits-1-title"),
-          description: t("page-dapps-finance-benefits-1-description"),
+          title: translateMessageId(
+            "page-dapps-finance-benefits-1-title",
+            intl
+          ),
+          description: translateMessageId(
+            "page-dapps-finance-benefits-1-description",
+            intl
+          ),
         },
         {
           emoji: ":bank:",
-          title: t("page-dapps-finance-benefits-2-title"),
-          description: t("page-dapps-finance-benefits-2-description"),
+          title: translateMessageId(
+            "page-dapps-finance-benefits-2-title",
+            intl
+          ),
+          description: translateMessageId(
+            "page-dapps-finance-benefits-2-description",
+            intl
+          ),
         },
         {
           emoji: ":scales:",
-          title: t("page-dapps-finance-benefits-3-title"),
-          description: t("page-dapps-finance-benefits-3-description"),
+          title: translateMessageId(
+            "page-dapps-finance-benefits-3-title",
+            intl
+          ),
+          description: translateMessageId(
+            "page-dapps-finance-benefits-3-description",
+            intl
+          ),
         },
         {
           emoji: ":chains:",
-          title: t("page-dapps-finance-benefits-4-title"),
-          description: t("page-dapps-finance-benefits-4-description"),
+          title: translateMessageId(
+            "page-dapps-finance-benefits-4-title",
+            intl
+          ),
+          description: translateMessageId(
+            "page-dapps-finance-benefits-4-description",
+            intl
+          ),
         },
       ],
     },
     [CategoryType.COLLECTIBLES]: {
-      title: t("page-dapps-collectibles-button"),
+      title: translateMessageId("page-dapps-collectibles-button", intl),
       emoji: ":frame_with_picture:",
-      benefitsTitle: t("page-dapps-collectibles-benefits-title"),
-      benefitsDescription: t("page-dapps-collectibles-benefits-description"),
+      benefitsTitle: translateMessageId(
+        "page-dapps-collectibles-benefits-title",
+        intl
+      ),
+      benefitsDescription: translateMessageId(
+        "page-dapps-collectibles-benefits-description",
+        intl
+      ),
       benefits: [
         {
           emoji: ":white_check_mark:",
-          title: t("page-dapps-collectibles-benefits-1-title"),
-          description: t("page-dapps-collectibles-benefits-1-description"),
+          title: translateMessageId(
+            "page-dapps-collectibles-benefits-1-title",
+            intl
+          ),
+          description: translateMessageId(
+            "page-dapps-collectibles-benefits-1-description",
+            intl
+          ),
         },
         {
           emoji: ":man_singer:",
-          title: t("page-dapps-collectibles-benefits-2-title"),
-          description: t("page-dapps-collectibles-benefits-2-description"),
+          title: translateMessageId(
+            "page-dapps-collectibles-benefits-2-title",
+            intl
+          ),
+          description: translateMessageId(
+            "page-dapps-collectibles-benefits-2-description",
+            intl
+          ),
         },
         {
           emoji: ":shopping_bags:",
-          title: t("page-dapps-collectibles-benefits-3-title"),
-          description: t("page-dapps-collectibles-benefits-3-description"),
+          title: translateMessageId(
+            "page-dapps-collectibles-benefits-3-title",
+            intl
+          ),
+          description: translateMessageId(
+            "page-dapps-collectibles-benefits-3-description",
+            intl
+          ),
         },
         {
           emoji: ":department_store:",
-          title: t("page-dapps-collectibles-benefits-4-title"),
-          description: t("page-dapps-collectibles-benefits-4-description"),
+          title: translateMessageId(
+            "page-dapps-collectibles-benefits-4-title",
+            intl
+          ),
+          description: translateMessageId(
+            "page-dapps-collectibles-benefits-4-description",
+            intl
+          ),
         },
       ],
     },
     [CategoryType.GAMING]: {
-      title: t("page-dapps-gaming-button"),
+      title: translateMessageId("page-dapps-gaming-button", intl),
       emoji: ":video_game:",
-      benefitsTitle: t("page-dapps-gaming-benefits-title"),
-      benefitsDescription: t("page-dapps-gaming-benefits-description"),
+      benefitsTitle: translateMessageId(
+        "page-dapps-gaming-benefits-title",
+        intl
+      ),
+      benefitsDescription: translateMessageId(
+        "page-dapps-gaming-benefits-description",
+        intl
+      ),
       benefits: [
         {
           emoji: ":crossed_swords:",
-          title: t("page-dapps-gaming-benefits-1-title"),
-          description: t("page-dapps-gaming-benefits-1-description"),
+          title: translateMessageId("page-dapps-gaming-benefits-1-title", intl),
+          description: translateMessageId(
+            "page-dapps-gaming-benefits-1-description",
+            intl
+          ),
         },
         {
           emoji: ":european_castle:",
-          title: t("page-dapps-gaming-benefits-2-title"),
-          description: t("page-dapps-gaming-benefits-2-description"),
+          title: translateMessageId("page-dapps-gaming-benefits-2-title", intl),
+          description: translateMessageId(
+            "page-dapps-gaming-benefits-2-description",
+            intl
+          ),
         },
         {
           emoji: ":handshake:",
-          title: t("page-dapps-gaming-benefits-3-title"),
-          description: t("page-dapps-gaming-benefits-3-description"),
+          title: translateMessageId("page-dapps-gaming-benefits-3-title", intl),
+          description: translateMessageId(
+            "page-dapps-gaming-benefits-3-description",
+            intl
+          ),
         },
       ],
     },
     [CategoryType.TECHNOLOGY]: {
-      title: t("page-dapps-technology-button"),
+      title: translateMessageId("page-dapps-technology-button", intl),
       emoji: ":keyboard:",
     },
   }
@@ -536,399 +632,531 @@ const DappsPage = ({
   const lending = [
     {
       title: "Aave",
-      description: t("page-dapps-dapp-description-aave"),
+      description: translateMessageId("page-dapps-dapp-description-aave", intl),
       link: "https://aave.com/",
       image: getImage(data.aave),
-      alt: t("page-dapps-aave-logo-alt"),
+      alt: translateMessageId("page-dapps-aave-logo-alt", intl),
     },
     {
       title: "Compound",
-      description: t("page-dapps-dapp-description-compound"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-compound",
+        intl
+      ),
       link: "https://compound.finance/",
       image: getImage(data.compound),
-      alt: t("page-dapps-compound-logo-alt"),
+      alt: translateMessageId("page-dapps-compound-logo-alt", intl),
     },
     {
       title: "Oasis",
-      description: t("page-dapps-dapp-description-oasis"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-oasis",
+        intl
+      ),
       link: "https://oasis.app/",
       image: getImage(data.dai),
-      alt: t("page-dapps-oasis-logo-alt"),
+      alt: translateMessageId("page-dapps-oasis-logo-alt", intl),
     },
     {
       title: "PWN",
-      description: t("page-dapps-dapp-description-pwn"),
+      description: translateMessageId("page-dapps-dapp-description-pwn", intl),
       link: "https://pwn.xyz",
       image: getImage(data.pwn),
-      alt: t("page-dapps-pwn-image-alt"),
+      alt: translateMessageId("page-dapps-pwn-image-alt", intl),
     },
   ]
 
   const dex = [
     {
       title: "Uniswap",
-      description: t("page-dapps-dapp-description-uniswap"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-uniswap",
+        intl
+      ),
       link: "https://uniswap.org/",
       image: getImage(data.uniswap),
-      alt: t("page-dapps-uniswap-logo-alt"),
+      alt: translateMessageId("page-dapps-uniswap-logo-alt", intl),
     },
     {
       title: "Matcha",
-      description: t("page-dapps-dapp-description-matcha"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-matcha",
+        intl
+      ),
       link: "https://matcha.xyz",
       image: getImage(data.matcha),
-      alt: t("page-dapps-matcha-logo-alt"),
+      alt: translateMessageId("page-dapps-matcha-logo-alt", intl),
     },
     {
       title: "1inch",
-      description: t("page-dapps-dapp-description-1inch"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-1inch",
+        intl
+      ),
       link: "https://1inch.exchange/",
       image: getImage(data.oneinch),
-      alt: t("page-dapps-1inch-logo-alt"),
+      alt: translateMessageId("page-dapps-1inch-logo-alt", intl),
     },
   ]
 
   const trading = [
     {
       title: "Polymarket",
-      description: t("page-dapps-dapp-description-polymarket"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-polymarket",
+        intl
+      ),
       link: "https://polymarket.com",
       image: getImage(data.polymarket),
-      alt: t("page-dapps-polymarket-logo-alt"),
+      alt: translateMessageId("page-dapps-polymarket-logo-alt", intl),
     },
     {
       title: "Augur",
-      description: t("page-dapps-dapp-description-augur"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-augur",
+        intl
+      ),
       link: "https://augur.net",
       image: getImage(data.augur),
-      alt: t("page-dapps-augur-logo-alt"),
+      alt: translateMessageId("page-dapps-augur-logo-alt", intl),
     },
     {
       title: "Loopring",
-      description: t("page-dapps-dapp-description-loopring"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-loopring",
+        intl
+      ),
       link: "https://loopring.org/#/",
       image: getImage(data.loopring),
-      alt: t("page-dapps-loopring-logo-alt"),
+      alt: translateMessageId("page-dapps-loopring-logo-alt", intl),
     },
   ]
 
   const lottery = [
     {
       title: "Gitcoin Grants",
-      description: t("page-dapps-dapp-description-gitcoin-grants"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-gitcoin-grants",
+        intl
+      ),
       link: "https://gitcoin.co/grants/?",
       image: getImage(data.gitcoin),
-      alt: t("page-dapps-gitcoin-grants-logo-alt"),
+      alt: translateMessageId("page-dapps-gitcoin-grants-logo-alt", intl),
     },
   ]
 
   const payments = [
     {
       title: "Tornado cash",
-      description: t("page-dapps-dapp-description-tornado-cash"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-tornado-cash",
+        intl
+      ),
       link: "https://tornado.cash/",
       image: getImage(data.tornado),
-      alt: t("page-dapps-tornado-cash-logo-alt"),
+      alt: translateMessageId("page-dapps-tornado-cash-logo-alt", intl),
     },
     {
       title: "Sablier",
-      description: t("page-dapps-dapp-description-sablier"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-sablier",
+        intl
+      ),
       link: "https://pay.sablier.finance/",
       image: getImage(data.sablier),
-      alt: t("page-dapps-sablier-logo-alt"),
+      alt: translateMessageId("page-dapps-sablier-logo-alt", intl),
     },
   ]
 
   const investments = [
     {
       title: "Token Sets",
-      description: t("page-dapps-dapp-description-token-sets"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-token-sets",
+        intl
+      ),
       link: "https://www.tokensets.com/",
       image: getImage(data.set),
-      alt: t("page-dapps-token-sets-logo-alt"),
+      alt: translateMessageId("page-dapps-token-sets-logo-alt", intl),
     },
     {
       title: "PoolTogether",
-      description: t("page-dapps-dapp-description-pooltogether"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-pooltogether",
+        intl
+      ),
       link: "https://pooltogether.com/",
       image: getImage(data.pooltogether),
-      alt: t("page-dapps-pooltogether-logo-alt"),
+      alt: translateMessageId("page-dapps-pooltogether-logo-alt", intl),
     },
     {
       title: "Index Coop",
-      description: t("page-dapps-dapp-description-index-coop"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-index-coop",
+        intl
+      ),
       link: "https://www.indexcoop.com/",
       image: getImage(data.index),
-      alt: t("page-dapps-index-coop-logo-alt"),
+      alt: translateMessageId("page-dapps-index-coop-logo-alt", intl),
     },
     {
       title: "Balancer",
-      description: t("page-dapps-dapp-description-balancer"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-balancer",
+        intl
+      ),
       link: "https://balancer.fi/",
       image: getImage(data.balancer),
-      alt: t("page-dapps-balancer-logo-alt"),
+      alt: translateMessageId("page-dapps-balancer-logo-alt", intl),
     },
   ]
 
   const insurance = [
     {
       title: "Nexus Mutual",
-      description: t("page-dapps-dapp-description-nexus-mutual"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-nexus-mutual",
+        intl
+      ),
       link: "https://nexusmutual.io/",
       image: getImage(data.nexus),
-      alt: t("page-dapps-nexus-mutual-logo-alt"),
+      alt: translateMessageId("page-dapps-nexus-mutual-logo-alt", intl),
     },
     {
       title: "Etherisc",
-      description: t("page-dapps-dapp-description-etherisc"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-etherisc",
+        intl
+      ),
       link: "https://etherisc.com/",
       image: getImage(data.etherisc),
-      alt: t("page-dapps-etherisc-logo-alt"),
+      alt: translateMessageId("page-dapps-etherisc-logo-alt", intl),
     },
   ]
 
   const portfolios = [
     {
       title: "Zapper",
-      description: t("page-dapps-dapp-description-zapper"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-zapper",
+        intl
+      ),
       link: "https://zapper.fi/",
       image: getImage(data.zapper),
-      alt: t("page-dapps-zapper-logo-alt"),
+      alt: translateMessageId("page-dapps-zapper-logo-alt", intl),
     },
     {
       title: "Zerion",
-      description: t("page-dapps-dapp-description-zerion"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-zerion",
+        intl
+      ),
       link: "https://app.zerion.io/",
       image: getImage(data.zerion),
-      alt: t("page-dapps-zerion-logo-alt"),
+      alt: translateMessageId("page-dapps-zerion-logo-alt", intl),
     },
     {
       title: "Rotki",
-      description: t("page-dapps-dapp-description-rotki"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-rotki",
+        intl
+      ),
       link: "https://rotki.com/",
       image: getImage(data.rotki),
-      alt: t("page-dapps-rotki-logo-alt"),
+      alt: translateMessageId("page-dapps-rotki-logo-alt", intl),
     },
     {
       title: "Krystal",
-      description: t("page-dapps-dapp-description-krystal"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-krystal",
+        intl
+      ),
       link: "https://defi.krystal.app/",
       image: getImage(data.krystal),
-      alt: t("page-dapps-krystal-logo-alt"),
+      alt: translateMessageId("page-dapps-krystal-logo-alt", intl),
     },
   ]
 
   const computing = [
     {
       title: "Golem",
-      description: t("page-dapps-dapp-description-golem"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-golem",
+        intl
+      ),
       link: "https://golem.network/",
       image: getImage(data.golem),
-      alt: t("page-dapps-golem-logo-alt"),
+      alt: translateMessageId("page-dapps-golem-logo-alt", intl),
     },
     {
       title: "radicle.xyz",
-      description: t("page-dapps-dapp-description-radicle"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-radicle",
+        intl
+      ),
       link: "https://radicle.xyz/",
       image: getImage(data.radicle),
-      alt: t("page-dapps-radicle-logo-alt"),
+      alt: translateMessageId("page-dapps-radicle-logo-alt", intl),
     },
   ]
 
   const marketplaces = [
     {
       title: "Gitcoin",
-      description: t("page-dapps-dapp-description-gitcoin"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-gitcoin",
+        intl
+      ),
       link: "https://gitcoin.co/",
       image: getImage(data.gitcoin),
-      alt: t("page-dapps-gitcoin-logo-alt"),
+      alt: translateMessageId("page-dapps-gitcoin-logo-alt", intl),
     },
   ]
 
   const utilities = [
     {
       title: "Ethereum Name Service (ENS)",
-      description: t("page-dapps-dapp-description-ens"),
+      description: translateMessageId("page-dapps-dapp-description-ens", intl),
       link: "http://ens.domains/",
       image: getImage(data.ens),
-      alt: t("page-dapps-ens-logo-alt"),
+      alt: translateMessageId("page-dapps-ens-logo-alt", intl),
     },
   ]
 
   const browsers = [
     {
       title: "Brave",
-      description: t("page-dapps-dapp-description-brave"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-brave",
+        intl
+      ),
       link: "https://brave.com/",
       image: getImage(data.brave),
-      alt: t("page-dapps-brave-logo-alt"),
+      alt: translateMessageId("page-dapps-brave-logo-alt", intl),
     },
     {
       title: "Opera",
-      description: t("page-dapps-dapp-description-opera"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-opera",
+        intl
+      ),
       link: "https://www.opera.com/crypto",
       image: getImage(data.opera),
-      alt: t("page-dapps-opera-logo-alt"),
+      alt: translateMessageId("page-dapps-opera-logo-alt", intl),
     },
   ]
 
   const arts = [
     {
       title: "Foundation",
-      description: t("page-dapps-dapp-description-foundation"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-foundation",
+        intl
+      ),
       link: "https://foundation.app/",
       image: getImage(data.foundation),
-      alt: t("page-dapps-foundation-logo-alt"),
+      alt: translateMessageId("page-dapps-foundation-logo-alt", intl),
     },
     {
       title: "SuperRare",
-      description: t("page-dapps-dapp-description-superrare"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-superrare",
+        intl
+      ),
       link: "https://www.superrare.co",
       image: getImage(data.superrare),
-      alt: t("page-dapps-superrare-logo-alt"),
+      alt: translateMessageId("page-dapps-superrare-logo-alt", intl),
     },
     {
       title: "Nifty Gateway",
-      description: t("page-dapps-dapp-description-nifty-gateway"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-nifty-gateway",
+        intl
+      ),
       link: "https://niftygateway.com/",
       image: getImage(data.nifty),
-      alt: t("page-dapps-nifty-gateway-logo-alt"),
+      alt: translateMessageId("page-dapps-nifty-gateway-logo-alt", intl),
     },
     {
       title: "Async Art",
-      description: t("page-dapps-dapp-description-async-art"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-async-art",
+        intl
+      ),
       link: "https://async.art/",
       image: getImage(data.asyncart),
-      alt: t("page-dapps-async-logo-alt"),
+      alt: translateMessageId("page-dapps-async-logo-alt", intl),
     },
   ]
 
   const music = [
     {
       title: "Audius",
-      description: t("page-dapps-dapp-description-audius"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-audius",
+        intl
+      ),
       link: "https://audius.co/",
       image: getImage(data.audius),
-      alt: t("page-dapps-audius-logo-alt"),
+      alt: translateMessageId("page-dapps-audius-logo-alt", intl),
     },
   ]
 
   const collectibles = [
     {
       title: "OpenSea",
-      description: t("page-dapps-dapp-description-opensea"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-opensea",
+        intl
+      ),
       link: "https://opensea.io/",
       image: getImage(data.opensea),
-      alt: t("page-dapps-opensea-logo-alt"),
+      alt: translateMessageId("page-dapps-opensea-logo-alt", intl),
     },
     {
       title: "marble.cards",
-      description: t("page-dapps-dapp-description-marble-cards"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-marble-cards",
+        intl
+      ),
       link: "https://marble.cards/",
       image: getImage(data.marble),
-      alt: t("page-dapps-marble-cards-logo-alt"),
+      alt: translateMessageId("page-dapps-marble-cards-logo-alt", intl),
     },
     {
       title: "Rarible",
-      description: t("page-dapps-dapp-description-rarible"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-rarible",
+        intl
+      ),
       link: "https://rarible.com/",
       image: getImage(data.rarible),
-      alt: t("page-dapps-rarible-logo-alt"),
+      alt: translateMessageId("page-dapps-rarible-logo-alt", intl),
     },
     {
       title: "CryptoPunks",
-      description: t("page-dapps-dapp-description-cryptopunks"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-cryptopunks",
+        intl
+      ),
       link: "https://www.larvalabs.com/cryptopunks",
       image: getImage(data.cryptopunks),
-      alt: t("page-dapps-cryptopunks-logo-alt"),
+      alt: translateMessageId("page-dapps-cryptopunks-logo-alt", intl),
     },
     {
       title: "POAP - Proof of Attendance Protocol",
-      description: t("page-dapps-dapp-description-poap"),
+      description: translateMessageId("page-dapps-dapp-description-poap", intl),
       link: "https://poap.xyz",
       image: getImage(data.poap),
-      alt: t("page-dapps-poap-logo-alt"),
+      alt: translateMessageId("page-dapps-poap-logo-alt", intl),
     },
   ]
 
   const worlds = [
     {
       title: "Cryptovoxels",
-      description: t("page-dapps-dapp-description-cryptovoxels"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-cryptovoxels",
+        intl
+      ),
       link: "https://www.cryptovoxels.com/",
       image: getImage(data.cryptovoxels),
-      alt: t("page-dapps-cryptovoxels-logo-alt"),
+      alt: translateMessageId("page-dapps-cryptovoxels-logo-alt", intl),
     },
     {
       title: "Decentraland",
-      description: t("page-dapps-dapp-description-decentraland"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-decentraland",
+        intl
+      ),
       link: "https://decentraland.org/",
       image: getImage(data.decentraland),
-      alt: t("page-dapps-decentraland-logo-alt"),
+      alt: translateMessageId("page-dapps-decentraland-logo-alt", intl),
     },
   ]
 
   const competitive = [
     {
       title: "Axie Infinity",
-      description: t("page-dapps-dapp-description-axie-infinity"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-axie-infinity",
+        intl
+      ),
       link: "https://axieinfinity.com/",
       image: getImage(data.axie),
-      alt: t("page-dapps-axie-infinity-logo-alt"),
+      alt: translateMessageId("page-dapps-axie-infinity-logo-alt", intl),
     },
     {
       title: "Gods Unchained",
-      description: t("page-dapps-dapp-description-gods-unchained"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-gods-unchained",
+        intl
+      ),
       link: "https://godsunchained.com/",
       image: getImage(data.gods),
-      alt: t("page-dapps-gods-unchained-logo-alt"),
+      alt: translateMessageId("page-dapps-gods-unchained-logo-alt", intl),
     },
     {
       title: "Dark Forest",
-      description: t("page-dapps-dapp-description-dark-forest"),
+      description: translateMessageId(
+        "page-dapps-dapp-description-dark-forest",
+        intl
+      ),
       link: "https://zkga.me/",
       image: getImage(data.darkforest),
-      alt: t("page-dapps-dark-forest-logo-alt"),
+      alt: translateMessageId("page-dapps-dark-forest-logo-alt", intl),
     },
   ]
 
   const editorChoices = [
     {
       name: "Uniswap",
-      description: t("page-dapps-editors-choice-uniswap"),
+      description: translateMessageId(
+        "page-dapps-editors-choice-uniswap",
+        intl
+      ),
       url: "https://uniswap.exchange/swap",
       image: getImage(data.uniswapec),
-      alt: t("page-dapps-uniswap-logo-alt"),
+      alt: translateMessageId("page-dapps-uniswap-logo-alt", intl),
       background: "#212f46",
       type: CategoryType.FINANCE,
       pillColor: "tagMint",
     },
     {
       name: "Dark Forest",
-      description: t("page-dapps-editors-choice-dark-forest"),
+      description: translateMessageId(
+        "page-dapps-editors-choice-dark-forest",
+        intl
+      ),
       url: "https://zkga.me",
       image: getImage(data.darkforestec),
-      alt: t("page-dapps-dark-forest-logo-alt"),
+      alt: translateMessageId("page-dapps-dark-forest-logo-alt", intl),
       background: "#080808",
       type: CategoryType.GAMING,
       pillColor: "tagOrange",
     },
     {
       name: "Foundation",
-      description: t("page-dapps-editors-choice-foundation"),
+      description: translateMessageId(
+        "page-dapps-editors-choice-foundation",
+        intl
+      ),
       url: "https://foundation.app",
       image: getImage(data.foundationec),
-      alt: t("page-dapps-foundation-logo-alt"),
+      alt: translateMessageId("page-dapps-foundation-logo-alt", intl),
       background: "#ffffff",
       type: CategoryType.COLLECTIBLES,
       pillColor: "tagBlue",
     },
     {
       name: "PoolTogether",
-      description: t("page-dapps-editors-choice-pooltogether"),
+      description: translateMessageId(
+        "page-dapps-editors-choice-pooltogether",
+        intl
+      ),
       url: "https://pooltogether.com",
       image: getImage(data.pooltogetherec),
-      alt: t("page-dapps-pooltogether-logo-alt"),
+      alt: translateMessageId("page-dapps-pooltogether-logo-alt", intl),
       background: "#7e4cf2",
       type: CategoryType.FINANCE,
       pillColor: "tagMint",
@@ -936,18 +1164,18 @@ const DappsPage = ({
   ]
 
   const heroContent = {
-    title: t("decentralized-applications-dapps"),
-    header: t("page-dapps-hero-header"),
-    subtitle: t("page-dapps-hero-subtitle"),
+    title: translateMessageId("decentralized-applications-dapps", intl),
+    header: translateMessageId("page-dapps-hero-header", intl),
+    subtitle: translateMessageId("page-dapps-hero-subtitle", intl),
     image: getImage(data.doge)!,
-    alt: t("page-dapps-doge-img-alt"),
+    alt: translateMessageId("page-dapps-doge-img-alt", intl),
     buttons: [
       {
-        content: t("page-dapps-explore-dapps-title"),
+        content: translateMessageId("page-dapps-explore-dapps-title", intl),
         to: "#explore",
       },
       {
-        content: t("page-dapps-what-are-dapps"),
+        content: translateMessageId("page-dapps-what-are-dapps", intl),
         to: "#what-are-dapps",
         variant: "outline",
       },
@@ -956,8 +1184,8 @@ const DappsPage = ({
   return (
     <Page>
       <PageMetadata
-        title={t("decentralized-applications-dapps")}
-        description={t("page-dapps-desc")}
+        title={translateMessageId("decentralized-applications-dapps", intl)}
+        description={translateMessageId("page-dapps-desc", intl)}
         image={getSrc(data.ogImage)}
       />
       <PageHero content={heroContent} />
@@ -1087,13 +1315,16 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={t("page-dapps-category-lending")}
+                  category={translateMessageId(
+                    "page-dapps-category-lending",
+                    intl
+                  )}
                   content={lending}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={t("page-dapps-category-dex")}
+                  category={translateMessageId("page-dapps-category-dex", intl)}
                   content={dex}
                 />
               </RightColumn>
@@ -1101,13 +1332,19 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={t("page-dapps-category-trading")}
+                  category={translateMessageId(
+                    "page-dapps-category-trading",
+                    intl
+                  )}
                   content={trading}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={t("page-dapps-category-investments")}
+                  category={translateMessageId(
+                    "page-dapps-category-investments",
+                    intl
+                  )}
                   content={investments}
                 />
               </RightColumn>
@@ -1115,13 +1352,19 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={t("page-dapps-category-payments")}
+                  category={translateMessageId(
+                    "page-dapps-category-payments",
+                    intl
+                  )}
                   content={payments}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={t("page-dapps-category-lottery")}
+                  category={translateMessageId(
+                    "page-dapps-category-lottery",
+                    intl
+                  )}
                   content={lottery}
                 />
               </RightColumn>
@@ -1129,13 +1372,19 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={t("page-dapps-category-insurance")}
+                  category={translateMessageId(
+                    "page-dapps-category-insurance",
+                    intl
+                  )}
                   content={insurance}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={t("page-dapps-category-portfolios")}
+                  category={translateMessageId(
+                    "page-dapps-category-portfolios",
+                    intl
+                  )}
                   content={portfolios}
                 />
               </RightColumn>
@@ -1145,7 +1394,10 @@ const DappsPage = ({
               descriptionKey={"page-dapps-wallet-callout-description"}
               image={getImage(data.wallet)!}
               maxImageWidth={300}
-              alt={t("page-dapps-wallet-callout-image-alt")}
+              alt={translateMessageId(
+                "page-dapps-wallet-callout-image-alt",
+                intl
+              )}
             >
               <div>
                 <ButtonLink to="/wallets/find-wallet/">
@@ -1177,13 +1429,19 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={t("page-dapps-category-worlds")}
+                  category={translateMessageId(
+                    "page-dapps-category-worlds",
+                    intl
+                  )}
                   content={worlds}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={t("page-dapps-category-competitive")}
+                  category={translateMessageId(
+                    "page-dapps-category-competitive",
+                    intl
+                  )}
                   content={competitive}
                 />
               </RightColumn>
@@ -1212,13 +1470,19 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={t("page-dapps-category-utilities")}
+                  category={translateMessageId(
+                    "page-dapps-category-utilities",
+                    intl
+                  )}
                   content={utilities}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={t("page-dapps-category-marketplaces")}
+                  category={translateMessageId(
+                    "page-dapps-category-marketplaces",
+                    intl
+                  )}
                   content={marketplaces}
                 />
               </RightColumn>
@@ -1226,13 +1490,19 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={t("page-dapps-category-computing")}
+                  category={translateMessageId(
+                    "page-dapps-category-computing",
+                    intl
+                  )}
                   content={computing}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={t("page-dapps-category-browsers")}
+                  category={translateMessageId(
+                    "page-dapps-category-browsers",
+                    intl
+                  )}
                   content={browsers}
                 />
               </RightColumn>
@@ -1261,18 +1531,27 @@ const DappsPage = ({
             <TwoColumnContent>
               <LeftColumn>
                 <ProductList
-                  category={t("page-dapps-category-arts")}
+                  category={translateMessageId(
+                    "page-dapps-category-arts",
+                    intl
+                  )}
                   content={arts}
                 />
 
                 <ProductList
-                  category={t("page-dapps-category-music")}
+                  category={translateMessageId(
+                    "page-dapps-category-music",
+                    intl
+                  )}
                   content={music}
                 />
               </LeftColumn>
               <RightColumn>
                 <ProductList
-                  category={t("page-dapps-category-collectibles")}
+                  category={translateMessageId(
+                    "page-dapps-category-collectibles",
+                    intl
+                  )}
                   content={collectibles}
                 />
               </RightColumn>
@@ -1368,7 +1647,7 @@ const DappsPage = ({
           <StyledGhostCard>
             <MagiciansImage
               image={getImage(data.magicians)!}
-              alt={t("page-dapps-magician-img-alt")}
+              alt={translateMessageId("page-dapps-magician-img-alt", intl)}
             />
           </StyledGhostCard>
         </ImageContainer>
@@ -1410,7 +1689,10 @@ const DappsPage = ({
               titleKey="page-dapps-learn-callout-title"
               descriptionKey="page-dapps-learn-callout-description"
               image={getImage(data.developers)}
-              alt={t("page-dapps-learn-callout-image-alt")}
+              alt={translateMessageId(
+                "page-dapps-learn-callout-image-alt",
+                intl
+              )}
             >
               <div>
                 <ButtonLink to="/developers/">
@@ -1456,16 +1738,7 @@ export const editorImage = graphql`
 `
 
 export const query = graphql`
-  query DappsPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query DappsPage {
     doge: file(relativePath: { eq: "doge-computer.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages-conditional/eth.tsx b/src/pages-conditional/eth.tsx
index f520c514a5a..1edb521b9f6 100644
--- a/src/pages-conditional/eth.tsx
+++ b/src/pages-conditional/eth.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import { Center } from "@chakra-ui/react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { graphql, PageProps } from "gatsby"
 
 import Translation from "../components/Translation"
@@ -31,6 +31,7 @@ import {
 import FeedbackCard from "../components/FeedbackCard"
 import QuizWidget from "../components/Quiz/QuizWidget"
 
+import { translateMessageId } from "../utils/translations"
 import { getImage, getSrc } from "../utils/image"
 import { Context } from "../types"
 
@@ -273,13 +274,13 @@ const cardListContent = [
 ]
 
 const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const data = props.data
   return (
     <Page>
       <PageMetadata
-        title={t("page-eth-whats-eth-meta-title")}
-        description={t("page-eth-whats-eth-meta-desc")}
+        title={translateMessageId("page-eth-whats-eth-meta-title", intl)}
+        description={translateMessageId("page-eth-whats-eth-meta-desc", intl)}
         image={getSrc(data.ogImage)}
       />
       <Content>
@@ -304,7 +305,7 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
           </Header>
           <Hero
             image={getImage(data.eth)!}
-            alt={t("page-eth-whats-eth-hero-alt")}
+            alt={translateMessageId("page-eth-whats-eth-hero-alt", intl)}
             loading="eager"
           />
         </HeroContainer>
@@ -373,8 +374,11 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
           </div>
           <CentralActionCard
             to="/what-is-ethereum/"
-            title={t("page-eth-whats-ethereum")}
-            description={t("page-eth-whats-ethereum-desc")}
+            title={translateMessageId("page-eth-whats-ethereum", intl)}
+            description={translateMessageId(
+              "page-eth-whats-ethereum-desc",
+              intl
+            )}
             image={getImage(data.ethereum)!}
           />
           <TextDivider />
@@ -390,8 +394,11 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
             </p>
             <CentralActionCard
               to="/defi/"
-              title={t("page-eth-whats-defi")}
-              description={t("page-eth-whats-defi-description")}
+              title={translateMessageId("page-eth-whats-defi", intl)}
+              description={translateMessageId(
+                "page-eth-whats-defi-description",
+                intl
+              )}
               image={getImage(data.defi)!}
             />
           </div>
@@ -439,7 +446,7 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
           titleKey={"page-eth-where-to-buy"}
           descriptionKey={"page-eth-where-to-buy-desc"}
           image={getImage(data.ethCat)!}
-          alt={t("page-eth-cat-img-alt")}
+          alt={translateMessageId("page-eth-cat-img-alt", intl)}
           maxImageWidth={300}
         >
           <div>
@@ -521,16 +528,7 @@ const EthPage = (props: PageProps<Queries.EthPageQuery, Context>) => {
 export default EthPage
 
 export const query = graphql`
-  query EthPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query EthPage {
     eth: file(relativePath: { eq: "eth.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages-conditional/wallets.tsx b/src/pages-conditional/wallets.tsx
index bfc369a866b..154981f42e8 100644
--- a/src/pages-conditional/wallets.tsx
+++ b/src/pages-conditional/wallets.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import { Center } from "@chakra-ui/react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { graphql, PageProps } from "gatsby"
 
 import PageHero from "../components/PageHero"
@@ -25,6 +25,7 @@ import {
 import FeedbackCard from "../components/FeedbackCard"
 import QuizWidget from "../components/Quiz/QuizWidget"
 
+import { translateMessageId } from "../utils/translations"
 import { getImage, getSrc } from "../utils/image"
 import { Context } from "../types"
 
@@ -220,18 +221,18 @@ const articles = [
 const WalletsPage = ({
   data,
 }: PageProps<Queries.WalletsPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const heroContent = {
-    title: t("page-wallets-title"),
-    header: t("page-wallets-slogan"),
-    subtitle: t("page-wallets-subtitle"),
+    title: translateMessageId("page-wallets-title", intl),
+    header: translateMessageId("page-wallets-slogan", intl),
+    subtitle: translateMessageId("page-wallets-subtitle", intl),
     image: getImage(data.hero)!,
-    alt: t("page-wallets-alt"),
+    alt: translateMessageId("page-wallets-alt", intl),
     buttons: [
       {
         to: "/wallets/find-wallet/",
-        content: t("page-wallets-find-wallet-link"),
+        content: translateMessageId("page-wallets-find-wallet-link", intl),
       },
     ],
   }
@@ -239,8 +240,8 @@ const WalletsPage = ({
   return (
     <Page>
       <PageMetadata
-        title={t("page-wallets-meta-title")}
-        description={t("page-wallets-meta-description")}
+        title={translateMessageId("page-wallets-meta-title", intl)}
+        description={translateMessageId("page-wallets-meta-description", intl)}
         image={getSrc(data.ogImage)}
       />
       <PageHero content={heroContent} isReverse />
@@ -360,14 +361,23 @@ const WalletsPage = ({
             <ChecklistItem
               key="0"
               emoji=":white_check_mark:"
-              title={t("page-wallets-take-responsibility")}
-              description={t("page-wallets-take-responsibility-desc")}
+              title={translateMessageId(
+                "page-wallets-take-responsibility",
+                intl
+              )}
+              description={translateMessageId(
+                "page-wallets-take-responsibility-desc",
+                intl
+              )}
             />
             <ChecklistItem
               key="1"
               emoji=":white_check_mark:"
-              title={t("page-wallets-seed-phrase")}
-              description={t("page-wallets-seed-phrase-desc")}
+              title={translateMessageId("page-wallets-seed-phrase", intl)}
+              description={translateMessageId(
+                "page-wallets-seed-phrase-desc",
+                intl
+              )}
             >
               <p>
                 <Translation id="page-wallets-seed-phrase-example" />
@@ -384,14 +394,20 @@ const WalletsPage = ({
             <ChecklistItem
               key="2"
               emoji=":white_check_mark:"
-              title={t("page-wallets-bookmarking")}
-              description={t("page-wallets-bookmarking-desc")}
+              title={translateMessageId("page-wallets-bookmarking", intl)}
+              description={translateMessageId(
+                "page-wallets-bookmarking-desc",
+                intl
+              )}
             />
             <ChecklistItem
               key="3"
               emoji=":white_check_mark:"
-              title={t("page-wallets-triple-check")}
-              description={t("page-wallets-triple-check-desc")}
+              title={translateMessageId("page-wallets-triple-check", intl)}
+              description={translateMessageId(
+                "page-wallets-triple-check-desc",
+                intl
+              )}
             />
           </div>
         </LeftColumn>
@@ -414,7 +430,7 @@ const WalletsPage = ({
           <StyledCallout
             image={getImage(data.eth)}
             titleKey="page-wallets-get-some"
-            alt={t("page-wallets-get-some-alt")}
+            alt={translateMessageId("page-wallets-get-some-alt", intl)}
             descriptionKey="page-wallets-get-some-desc"
           >
             <div>
@@ -426,7 +442,7 @@ const WalletsPage = ({
           <StyledCallout
             image={getImage(data.dapps)}
             titleKey="page-wallets-try-dapps"
-            alt={t("page-wallets-try-dapps-alt")}
+            alt={translateMessageId("page-wallets-try-dapps-alt", intl)}
             descriptionKey="page-wallets-try-dapps-desc"
           >
             <div>
@@ -478,16 +494,7 @@ export const listImage = graphql`
 `
 
 export const query = graphql`
-  query WalletsPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query WalletsPage {
     hero: file(relativePath: { eq: "wallet.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/pages-conditional/what-is-ethereum.tsx b/src/pages-conditional/what-is-ethereum.tsx
index 5af68f305f0..c3adf2c05cd 100644
--- a/src/pages-conditional/what-is-ethereum.tsx
+++ b/src/pages-conditional/what-is-ethereum.tsx
@@ -3,7 +3,7 @@ import styled from "@emotion/styled"
 import { useTheme } from "@emotion/react"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Translation from "../components/Translation"
 import Callout from "../components/Callout"
@@ -37,7 +37,10 @@ import Slider, { EmblaSlide } from "../components/Slider"
 import FeedbackCard from "../components/FeedbackCard"
 import QuizWidget from "../components/Quiz/QuizWidget"
 
-import { getLocaleForNumberFormat } from "../utils/translations"
+import {
+  getLocaleForNumberFormat,
+  translateMessageId,
+} from "../utils/translations"
 import { Lang } from "../utils/languages"
 import { trackCustomEvent } from "../utils/matomo"
 import { getImage, getSrc } from "../utils/image"
@@ -238,11 +241,10 @@ const Stat: React.FC<{ stat: IFetchStat }> = ({ stat }) => {
 const WhatIsEthereumPage = ({
   data,
 }: PageProps<Queries.WhatIsEthereumQuery, Context>) => {
-  const { t } = useTranslation()
-  const { language } = useI18next()
+  const intl = useIntl()
   const theme = useTheme()
 
-  const localeForStatsBoxNumbers = getLocaleForNumberFormat(language as Lang)
+  const localeForStatsBoxNumbers = getLocaleForNumberFormat(intl.locale as Lang)
 
   const txCount = useFetchStat<
     Array<{ unixTimeStamp: string; transactionCount: number }>
@@ -262,40 +264,61 @@ const WhatIsEthereumPage = ({
   const cards = [
     {
       emoji: ":bank:",
-      title: t("page-what-is-ethereum-banking-card"),
-      description: t("page-what-is-ethereum-banking-card-desc"),
+      title: translateMessageId("page-what-is-ethereum-banking-card", intl),
+      description: translateMessageId(
+        "page-what-is-ethereum-banking-card-desc",
+        intl
+      ),
     },
 
     {
       emoji: ":detective:",
-      title: t("page-what-is-ethereum-internet-card"),
-      description: t("page-what-is-ethereum-internet-card-desc"),
+      title: translateMessageId("page-what-is-ethereum-internet-card", intl),
+      description: translateMessageId(
+        "page-what-is-ethereum-internet-card-desc",
+        intl
+      ),
     },
     {
       emoji: ":busts_in_silhouette:",
-      title: t("page-what-is-ethereum-p2p-card"),
-      description: t("page-what-is-ethereum-p2p-card-desc"),
+      title: translateMessageId("page-what-is-ethereum-p2p-card", intl),
+      description: translateMessageId(
+        "page-what-is-ethereum-p2p-card-desc",
+        intl
+      ),
     },
     {
       emoji: ":shield:",
-      title: t("page-what-is-ethereum-censorless-card"),
-      description: t("page-what-is-ethereum-censorless-card-desc"),
+      title: translateMessageId("page-what-is-ethereum-censorless-card", intl),
+      description: translateMessageId(
+        "page-what-is-ethereum-censorless-card-desc",
+        intl
+      ),
     },
     {
       emoji: ":shopping_bags:",
-      title: t("page-what-is-ethereum-commerce-card"),
-      description: t("page-what-is-ethereum-commerce-card-desc"),
+      title: translateMessageId("page-what-is-ethereum-commerce-card", intl),
+      description: translateMessageId(
+        "page-what-is-ethereum-commerce-card-desc",
+        intl
+      ),
     },
     {
       emoji: ":handshake:",
-      title: t("page-what-is-ethereum-composable-card"),
-      description: t("page-what-is-ethereum-composable-card-desc"),
+      title: translateMessageId("page-what-is-ethereum-composable-card", intl),
+      description: translateMessageId(
+        "page-what-is-ethereum-composable-card-desc",
+        intl
+      ),
     },
   ]
 
   const tabs = [
     {
-      title: t("page-what-is-ethereum-blockchain-tab-title"),
+      title: translateMessageId(
+        "page-what-is-ethereum-blockchain-tab-title",
+        intl
+      ),
       eventName: "Blockchain tab",
       content: (
         <TabContent>
@@ -304,7 +327,10 @@ const WhatIsEthereumPage = ({
       ),
     },
     {
-      title: t("page-what-is-ethereum-cryptocurrency-tab-title"),
+      title: translateMessageId(
+        "page-what-is-ethereum-cryptocurrency-tab-title",
+        intl
+      ),
       eventName: "Cryptocurrency tab",
       content: (
         <TabContent>
@@ -341,8 +367,11 @@ const WhatIsEthereumPage = ({
   return (
     <Page>
       <PageMetadata
-        title={t("page-what-is-ethereum-meta-title")}
-        description={t("page-what-is-ethereum-meta-description")}
+        title={translateMessageId("page-what-is-ethereum-meta-title", intl)}
+        description={translateMessageId(
+          "page-what-is-ethereum-meta-description",
+          intl
+        )}
         image={getSrc(data.ogImage)}
       />
       <Content>
@@ -365,7 +394,10 @@ const WhatIsEthereumPage = ({
           </Header>
           <Hero
             image={getImage(data.hero)!}
-            alt={t("page-what-is-ethereum-alt-img-bazaar")}
+            alt={translateMessageId(
+              "page-what-is-ethereum-alt-img-bazaar",
+              intl
+            )}
             loading="eager"
           />
         </HeroContainer>
@@ -889,7 +921,7 @@ const WhatIsEthereumPage = ({
           <StyledCallout
             image={getImage(data.developers)!}
             titleKey="page-what-is-ethereum-build"
-            alt={t("page-what-is-ethereum-alt-img-lego")}
+            alt={translateMessageId("page-what-is-ethereum-alt-img-lego", intl)}
             descriptionKey="page-what-is-ethereum-build-desc"
           >
             <div>
@@ -901,7 +933,7 @@ const WhatIsEthereumPage = ({
           <StyledCallout
             image={getImage(data.community)!}
             titleKey="page-what-is-ethereum-community"
-            alt={t("page-what-is-ethereum-alt-img-comm")}
+            alt={translateMessageId("page-what-is-ethereum-alt-img-comm", intl)}
             descriptionKey="page-what-is-ethereum-comm-desc"
           >
             <div>
@@ -955,16 +987,7 @@ export const calloutImage = graphql`
 `
 
 export const query = graphql`
-  query WhatIsEthereum($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query WhatIsEthereum {
     hero: file(relativePath: { eq: "what-is-ethereum.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index 3d1ed9fe109..d428b840456 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -1,11 +1,11 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { graphql, PageProps } from "gatsby"
 
 import Link from "../components/Link"
 import Translation from "../components/Translation"
 
 import { Page, Content } from "../components/SharedStyledComponents"
+import { PageProps } from "gatsby"
 
 const StyledPage = styled(Page)`
   margin-top: 4rem;
@@ -29,17 +29,3 @@ const NotFoundPage = (props: PageProps) => (
 )
 
 export default NotFoundPage
-
-export const query = graphql`
-  query NotFoundPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
-  }
-`
diff --git a/src/pages/assets.tsx b/src/pages/assets.tsx
index f0941bb2ab1..701d48fbb49 100644
--- a/src/pages/assets.tsx
+++ b/src/pages/assets.tsx
@@ -1,6 +1,6 @@
 // Libraries
 import React from "react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { useTheme } from "@emotion/react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
@@ -22,6 +22,7 @@ import FeedbackCard from "../components/FeedbackCard"
 import { Context } from "../types"
 
 // Utils
+import { translateMessageId } from "../utils/translations"
 import { getImage } from "../utils/image"
 
 const Image = styled(GatsbyImage)`
@@ -85,7 +86,7 @@ const Header = styled.header`
 `
 
 const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const theme = useTheme()
   const isDarkTheme = theme.isDark
   const assetPageHeroImage = isDarkTheme
@@ -94,15 +95,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
   return (
     <Page>
       <PageMetadata
-        title={t("page-assets-meta-title")}
-        description={t("page-assets-meta-desc")}
+        title={translateMessageId("page-assets-meta-title", intl)}
+        description={translateMessageId("page-assets-meta-desc", intl)}
       />
       <Content>
         <HeroContainer>
           <Header>
             <Image
               image={getImage(assetPageHeroImage)!}
-              alt={t("page-assets-eth-diamond-gray")}
+              alt={translateMessageId("page-assets-eth-diamond-gray", intl)}
             />
             <h1>
               <Translation id="page-assets-h1" />
@@ -124,8 +125,8 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-hero")}
-            alt={t("page-assets-hero")}
+            title={translateMessageId("page-assets-hero", intl)}
+            alt={translateMessageId("page-assets-hero", intl)}
             image={data.hero}
             artistName="Liam Cobb"
             artistUrl="https://liamcobb.com/"
@@ -133,40 +134,40 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
         </Row>
         <Row>
           <AssetDownload
-            title={t("page-assets-hero-panda")}
-            alt={t("page-assets-hero-panda")}
+            title={translateMessageId("page-assets-hero-panda", intl)}
+            alt={translateMessageId("page-assets-hero-panda", intl)}
             image={data.heroPanda}
           />
           <AssetDownload
-            title={t("page-assets-merge-panda")}
-            alt={t("page-assets-merge-panda")}
+            title={translateMessageId("page-assets-merge-panda", intl)}
+            alt={translateMessageId("page-assets-merge-panda", intl)}
             image={data.mergePanda}
           />
           <AssetDownload
-            title={t("page-assets-merge-panda-svg")}
-            alt={t("page-assets-merge-panda-svg")}
+            title={translateMessageId("page-assets-merge-panda-svg", intl)}
+            alt={translateMessageId("page-assets-merge-panda-svg", intl)}
             svg={MergePandaSvg}
           />
         </Row>
 
         <Row>
           <AssetDownload
-            title={t("page-assets-doge")}
-            alt={t("page-assets-doge")}
+            title={translateMessageId("page-assets-doge", intl)}
+            alt={translateMessageId("page-assets-doge", intl)}
             image={data.doge}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={t("page-assets-blocks")}
-            alt={t("page-assets-blocks")}
+            title={translateMessageId("page-assets-blocks", intl)}
+            alt={translateMessageId("page-assets-blocks", intl)}
             image={data.developers}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={t("page-assets-enterprise")}
-            alt={t("page-assets-enterprise")}
+            title={translateMessageId("page-assets-enterprise", intl)}
+            alt={translateMessageId("page-assets-enterprise", intl)}
             image={data.enterprise}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
@@ -175,22 +176,22 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-infrastructure")}
-            alt={t("page-assets-infrastructure")}
+            title={translateMessageId("page-assets-infrastructure", intl)}
+            alt={translateMessageId("page-assets-infrastructure", intl)}
             image={data.infrastructure}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={t("page-assets-finance")}
-            alt={t("page-assets-finance")}
+            title={translateMessageId("page-assets-finance", intl)}
+            alt={translateMessageId("page-assets-finance", intl)}
             image={data.finance}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={t("page-assets-impact")}
-            alt={t("page-assets-impact")}
+            title={translateMessageId("page-assets-impact", intl)}
+            alt={translateMessageId("page-assets-impact", intl)}
             image={data.impact}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
@@ -199,15 +200,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-future")}
-            alt={t("page-assets-future")}
+            title={translateMessageId("page-assets-future", intl)}
+            alt={translateMessageId("page-assets-future", intl)}
             image={data.future}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={t("page-assets-hackathon")}
-            alt={t("page-assets-hackathon")}
+            title={translateMessageId("page-assets-hackathon", intl)}
+            alt={translateMessageId("page-assets-hackathon", intl)}
             image={data.hackathon}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
@@ -216,15 +217,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-robot")}
-            alt={t("page-assets-robot")}
+            title={translateMessageId("page-assets-robot", intl)}
+            alt={translateMessageId("page-assets-robot", intl)}
             image={data.wallet}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
           />
           <AssetDownload
-            title={t("page-assets-robot")}
-            alt={t("page-assets-robot")}
+            title={translateMessageId("page-assets-robot", intl)}
+            alt={translateMessageId("page-assets-robot", intl)}
             image={data.wallet}
             artistName="William Tempest"
             artistUrl="https://cargocollective.com/willtempest"
@@ -234,15 +235,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-bazaar")}
-            alt={t("page-assets-bazaar")}
+            title={translateMessageId("page-assets-bazaar", intl)}
+            alt={translateMessageId("page-assets-bazaar", intl)}
             image={data.whatIsEthereum}
             artistName="Viktor Hachmang"
             artistUrl="http://viktorhachmang.nl/"
           />
           <AssetDownload
-            title={t("page-assets-eth")}
-            alt={t("page-assets-eth")}
+            title={translateMessageId("page-assets-eth", intl)}
+            alt={translateMessageId("page-assets-eth", intl)}
             image={data.eth}
             artistName="Viktor Hachmang"
             artistUrl="http://viktorhachmang.nl/"
@@ -251,15 +252,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-mainnet")}
-            alt={t("page-assets-mainnet")}
+            title={translateMessageId("page-assets-mainnet", intl)}
+            alt={translateMessageId("page-assets-mainnet", intl)}
             image={data.oldShip}
             artistName="Viktor Hachmang"
             artistUrl="https://viktorhachmang.nl"
           />
           <AssetDownload
-            title={t("page-assets-merge")}
-            alt={t("page-assets-merge")}
+            title={translateMessageId("page-assets-merge", intl)}
+            alt={translateMessageId("page-assets-merge", intl)}
             image={data.merge}
             artistName="Viktor Hachmang"
             artistUrl="https://viktorhachmang.nl"
@@ -268,15 +269,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-beacon-chain")}
-            alt={t("page-assets-beacon-chain")}
+            title={translateMessageId("page-assets-beacon-chain", intl)}
+            alt={translateMessageId("page-assets-beacon-chain", intl)}
             image={data.beaconChain}
             artistName="Viktor Hachmang"
             artistUrl="http://viktorhachmang.nl/"
           />
           <AssetDownload
-            title={t("page-assets-sharding")}
-            alt={t("page-assets-sharding")}
+            title={translateMessageId("page-assets-sharding", intl)}
+            alt={translateMessageId("page-assets-sharding", intl)}
             image={data.newRings}
             artistName="Viktor Hachmang"
             artistUrl="https://viktorhachmang.nl"
@@ -285,15 +286,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-defi")}
-            alt={t("page-assets-defi")}
+            title={translateMessageId("page-assets-defi", intl)}
+            alt={translateMessageId("page-assets-defi", intl)}
             image={data.defi}
             artistName="Patrick Atkins"
             artistUrl="https://www.patrickatkins.co.uk/"
           />
           <AssetDownload
-            title={t("page-assets-dao")}
-            alt={t("page-assets-dao")}
+            title={translateMessageId("page-assets-dao", intl)}
+            alt={translateMessageId("page-assets-dao", intl)}
             image={data.dao}
             artistName="Patrick Atkins"
             artistUrl="https://www.patrickatkins.co.uk/"
@@ -302,15 +303,15 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-leslie-the-rhino")}
-            alt={t("page-assets-leslie-the-rhino")}
+            title={translateMessageId("page-assets-leslie-the-rhino", intl)}
+            alt={translateMessageId("page-assets-leslie-the-rhino", intl)}
             artistName="Tomo Saito"
             artistUrl="https://tomosaito.com/"
             image={data.leslieTheRhino}
           />
           <AssetDownload
-            title={t("page-assets-leslie-the-rhino")}
-            alt={t("page-assets-leslie-the-rhino")}
+            title={translateMessageId("page-assets-leslie-the-rhino", intl)}
+            alt={translateMessageId("page-assets-leslie-the-rhino", intl)}
             artistName="Tomo Saito"
             artistUrl="https://tomosaito.com/"
             image={data.leslieTheRhino}
@@ -332,69 +333,96 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-eth-diamond-glyph")}
-            alt={t("page-assets-eth-diamond-glyph")}
+            title={translateMessageId("page-assets-eth-diamond-glyph", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-glyph", intl)}
             image={data.ethDiamondGlyph}
           />
           <AssetDownload
-            title={t("page-assets-eth-diamond-gray")}
-            alt={t("page-assets-eth-diamond-gray")}
+            title={translateMessageId("page-assets-eth-diamond-gray", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-gray", intl)}
             image={data.ethDiamondBlack}
           />
           <AssetDownload
-            title={t("page-assets-eth-diamond-color")}
-            alt={t("page-assets-eth-diamond-color")}
+            title={translateMessageId("page-assets-eth-diamond-color", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-color", intl)}
             image={data.ethDiamondColor}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={t("page-assets-eth-diamond-purple")}
-            alt={t("page-assets-eth-diamond-purple")}
+            title={translateMessageId("page-assets-eth-diamond-purple", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-purple", intl)}
             image={data.ethDiamondPurple}
           />
           <AssetDownload
-            title={t("page-assets-eth-diamond-colored")}
-            alt={t("page-assets-eth-diamond-colored")}
+            title={translateMessageId("page-assets-eth-diamond-colored", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-colored", intl)}
             image={data.ethGlyphColored}
           />
           <AssetDownload
-            title={t("page-assets-eth-diamond-colored-svg")}
-            alt={t("page-assets-eth-diamond-colored-svg")}
+            title={translateMessageId(
+              "page-assets-eth-diamond-colored-svg",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-diamond-colored-svg",
+              intl
+            )}
             svg={EthGlyphColoredSvg}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={t("page-assets-eth-logo-portrait-gray")}
-            alt={t("page-assets-eth-logo-portrait-gray")}
+            title={translateMessageId(
+              "page-assets-eth-logo-portrait-gray",
+              intl
+            )}
+            alt={translateMessageId("page-assets-eth-logo-portrait-gray", intl)}
             image={data.ethPortraitBlack}
           />
           <AssetDownload
-            title={t("page-assets-eth-logo-landscape-gray")}
-            alt={t("page-assets-eth-logo-landscape-gray")}
+            title={translateMessageId(
+              "page-assets-eth-logo-landscape-gray",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-logo-landscape-gray",
+              intl
+            )}
             image={data.ethLandscapeBlack}
           />
           <AssetDownload
-            title={t("page-assets-eth-wordmark-gray")}
-            alt={t("page-assets-eth-wordmark-gray")}
+            title={translateMessageId("page-assets-eth-wordmark-gray", intl)}
+            alt={translateMessageId("page-assets-eth-wordmark-gray", intl)}
             image={data.ethWordmarkBlack}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={t("page-assets-eth-logo-portrait-purple")}
-            alt={t("page-assets-eth-logo-portrait-purple")}
+            title={translateMessageId(
+              "page-assets-eth-logo-portrait-purple",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-logo-portrait-purple",
+              intl
+            )}
             image={data.ethPortraitPurple}
           />
           <AssetDownload
-            title={t("page-assets-eth-logo-landscape-purple")}
-            alt={t("page-assets-eth-logo-landscape-purple")}
+            title={translateMessageId(
+              "page-assets-eth-logo-landscape-purple",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-logo-landscape-purple",
+              intl
+            )}
             image={data.ethLandscapePurple}
           />
           <AssetDownload
-            title={t("page-assets-eth-wordmark-purple")}
-            alt={t("page-assets-eth-wordmark-purple")}
+            title={translateMessageId("page-assets-eth-wordmark-purple", intl)}
+            alt={translateMessageId("page-assets-eth-wordmark-purple", intl)}
             image={data.ethWordmarkPurple}
           />
         </Row>
@@ -405,74 +433,107 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
 
         <Row>
           <AssetDownload
-            title={t("page-assets-eth-diamond-white")}
-            alt={t("page-assets-eth-diamond-white")}
+            title={translateMessageId("page-assets-eth-diamond-white", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-white", intl)}
             image={data.ethDiamondBlackWhite}
           />
           <AssetDownload
-            title={t("page-assets-eth-diamond-gray")}
-            alt={t("page-assets-eth-diamond-gray")}
+            title={translateMessageId("page-assets-eth-diamond-gray", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-gray", intl)}
             image={data.ethDiamondBlackGray}
           />
           <AssetDownload
-            title={t("page-assets-eth-diamond-purple")}
-            alt={t("page-assets-eth-diamond-purple")}
+            title={translateMessageId("page-assets-eth-diamond-purple", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-purple", intl)}
             image={data.ethDiamondPurplePurple}
           />
           <AssetDownload
-            title={t("page-assets-eth-diamond-white")}
-            alt={t("page-assets-eth-diamond-white")}
+            title={translateMessageId("page-assets-eth-diamond-white", intl)}
+            alt={translateMessageId("page-assets-eth-diamond-white", intl)}
             image={data.ethDiamondPurpleWhite}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={t("page-assets-eth-logo-portrait-gray")}
-            alt={t("page-assets-eth-logo-portrait-gray")}
+            title={translateMessageId(
+              "page-assets-eth-logo-portrait-gray",
+              intl
+            )}
+            alt={translateMessageId("page-assets-eth-logo-portrait-gray", intl)}
             image={data.ethPortraitBlackGray}
           />
           <AssetDownload
-            title={t("page-assets-eth-logo-landscape-gray")}
-            alt={t("page-assets-eth-logo-landscape-gray")}
+            title={translateMessageId(
+              "page-assets-eth-logo-landscape-gray",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-logo-landscape-gray",
+              intl
+            )}
             image={data.ethLandscapeBlackGray}
           />
           <AssetDownload
-            title={t("page-assets-eth-wordmark-gray")}
-            alt={t("page-assets-eth-wordmark-gray")}
+            title={translateMessageId("page-assets-eth-wordmark-gray", intl)}
+            alt={translateMessageId("page-assets-eth-wordmark-gray", intl)}
             image={data.ethWordmarkBlackGray}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={t("page-assets-eth-logo-portrait-purple")}
-            alt={t("page-assets-eth-logo-portrait-purple")}
+            title={translateMessageId(
+              "page-assets-eth-logo-portrait-purple",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-logo-portrait-purple",
+              intl
+            )}
             image={data.ethPortraitPurplePurple}
           />
           <AssetDownload
-            title={t("page-assets-eth-logo-landscape-purple")}
-            alt={t("page-assets-eth-logo-landscape-purple")}
+            title={translateMessageId(
+              "page-assets-eth-logo-landscape-purple",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-logo-landscape-purple",
+              intl
+            )}
             image={data.ethLandscapePurplePurple}
           />
           <AssetDownload
-            title={t("page-assets-eth-wordmark-purple")}
-            alt={t("page-assets-eth-wordmark-purple")}
+            title={translateMessageId("page-assets-eth-wordmark-purple", intl)}
+            alt={translateMessageId("page-assets-eth-wordmark-purple", intl)}
             image={data.ethWordmarkPurplePurple}
           />
         </Row>
         <Row>
           <AssetDownload
-            title={t("page-assets-eth-logo-portrait-white")}
-            alt={t("page-assets-eth-logo-portrait-white")}
+            title={translateMessageId(
+              "page-assets-eth-logo-portrait-white",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-logo-portrait-white",
+              intl
+            )}
             image={data.ethPortraitPurpleWhite}
           />
           <AssetDownload
-            title={t("page-assets-eth-logo-landscape-white")}
-            alt={t("page-assets-eth-logo-landscape-white")}
+            title={translateMessageId(
+              "page-assets-eth-logo-landscape-white",
+              intl
+            )}
+            alt={translateMessageId(
+              "page-assets-eth-logo-landscape-white",
+              intl
+            )}
             image={data.ethLandscapePurpleWhite}
           />
           <AssetDownload
-            title={t("page-assets-eth-wordmark-white")}
-            alt={t("page-assets-eth-wordmark-white")}
+            title={translateMessageId("page-assets-eth-wordmark-white", intl)}
+            alt={translateMessageId("page-assets-eth-wordmark-white", intl)}
             image={data.ethWordmarkPurpleWhite}
           />
         </Row>
@@ -493,16 +554,7 @@ export const assetItem = graphql`
 `
 
 export const query = graphql`
-  query AssetsPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query AssetsPage {
     ethDiamondBlackHero: file(
       relativePath: { eq: "assets/eth-diamond-black.png" }
     ) {
diff --git a/src/pages/bug-bounty.tsx b/src/pages/bug-bounty.tsx
index b2cc2bc6f4f..fc14a7e184d 100644
--- a/src/pages/bug-bounty.tsx
+++ b/src/pages/bug-bounty.tsx
@@ -1,10 +1,11 @@
-import React, { ReactNode } from "react"
+import React, { ReactNode, useContext } from "react"
 import { useTheme } from "@emotion/react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
+import { translateMessageId } from "../utils/translations"
 import Translation from "../components/Translation"
 import Card from "../components/Card"
 import Leaderboard from "../components/Leaderboard"
@@ -263,7 +264,7 @@ const BugBountiesPage = ({
   data,
   location,
 }: PageProps<Queries.BugBountyPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const theme = useTheme()
   const isDarkTheme = theme.isDark
 
@@ -391,8 +392,11 @@ const BugBountiesPage = ({
   return (
     <Page>
       <PageMetadata
-        title={t("page-upgrades-bug-bounty-meta-title")}
-        description={t("page-upgrades-bug-bounty-meta-description")}
+        title={translateMessageId("page-upgrades-bug-bounty-meta-title", intl)}
+        description={translateMessageId(
+          "page-upgrades-bug-bounty-meta-description",
+          intl
+        )}
       />
       <Content>
         <HeroCard>
@@ -455,8 +459,14 @@ const BugBountiesPage = ({
           <StyledCardContainer>
             <StyledCard
               emoji=":ledger:"
-              title={t("page-upgrades-bug-bounty-ledger-title")}
-              description={t("page-upgrades-bug-bounty-ledger-desc")}
+              title={translateMessageId(
+                "page-upgrades-bug-bounty-ledger-title",
+                intl
+              )}
+              description={translateMessageId(
+                "page-upgrades-bug-bounty-ledger-desc",
+                intl
+              )}
             >
               <Link to="https://github.com/ethereum/consensus-specs">
                 <Translation id="page-upgrades-bug-bounty-specs" />
@@ -513,8 +523,14 @@ const BugBountiesPage = ({
             </StyledCard>
             <StyledCard
               emoji=":computer:"
-              title={t("page-upgrades-bug-bounty-client-bugs")}
-              description={t("page-upgrades-bug-bounty-client-bugs-desc")}
+              title={translateMessageId(
+                "page-upgrades-bug-bounty-client-bugs",
+                intl
+              )}
+              description={translateMessageId(
+                "page-upgrades-bug-bounty-client-bugs-desc",
+                intl
+              )}
             >
               <div>
                 <p>
@@ -545,8 +561,14 @@ const BugBountiesPage = ({
             </StyledCard>
             <StyledCard
               emoji=":book:"
-              title={t("page-upgrades-bug-bounty-misc-bugs")}
-              description={t("page-upgrades-bug-bounty-misc-bugs-desc")}
+              title={translateMessageId(
+                "page-upgrades-bug-bounty-misc-bugs",
+                intl
+              )}
+              description={translateMessageId(
+                "page-upgrades-bug-bounty-misc-bugs-desc",
+                intl
+              )}
             >
               <div>
                 <p>
@@ -564,8 +586,14 @@ const BugBountiesPage = ({
             </StyledCard>
             <StyledCard
               emoji=":scroll:"
-              title={t("page-upgrades-bug-bounty-deposit-bugs")}
-              description={t("page-upgrades-bug-bounty-deposit-bugs-desc")}
+              title={translateMessageId(
+                "page-upgrades-bug-bounty-deposit-bugs",
+                intl
+              )}
+              description={translateMessageId(
+                "page-upgrades-bug-bounty-deposit-bugs-desc",
+                intl
+              )}
             >
               <div>
                 <h4>
@@ -859,16 +887,7 @@ export const ClientLogosSmall = graphql`
 `
 
 export const query = graphql`
-  query BugBountyPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query BugBountyPage {
     consensusBountyHunters: allConsensusBountyHuntersCsv(
       sort: { order: DESC, fields: score }
     ) {
diff --git a/src/pages/community.tsx b/src/pages/community.tsx
index 7e152853d27..98a5023a3f5 100644
--- a/src/pages/community.tsx
+++ b/src/pages/community.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import ActionCard from "../components/ActionCard"
 import Callout from "../components/Callout"
@@ -20,6 +20,7 @@ import {
   GrayContainer,
   Page,
 } from "../components/SharedStyledComponents"
+import { translateMessageId } from "../utils/translations"
 import { getImage } from "../utils/image"
 import { Context } from "../types"
 
@@ -324,43 +325,55 @@ interface IGetInvolvedCard {
 const CommunityPage = ({
   data,
 }: PageProps<Queries.CommunityPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const heroContent = {
-    title: t("page-community-hero-title"),
-    header: t("page-community-hero-header"),
-    subtitle: t("page-community-hero-subtitle"),
+    title: translateMessageId("page-community-hero-title", intl),
+    header: translateMessageId("page-community-hero-header", intl),
+    subtitle: translateMessageId("page-community-hero-subtitle", intl),
     image: getImage(data.enterprise)!,
-    alt: t("page-community-hero-alt"),
+    alt: translateMessageId("page-community-hero-alt", intl),
   }
 
   const cards: Array<ICard> = [
     {
       image: getImage(data.docking),
-      title: t("page-community-card-1-title"),
-      description: t("page-community-card-1-description"),
-      alt: t("page-index-get-started-wallet-image-alt"),
+      title: translateMessageId("page-community-card-1-title", intl),
+      description: translateMessageId(
+        "page-community-card-1-description",
+        intl
+      ),
+      alt: translateMessageId("page-index-get-started-wallet-image-alt", intl),
       to: "/community/online/",
     },
     {
       image: getImage(data.eth),
-      title: t("page-community-card-2-title"),
-      description: t("page-community-card-2-description"),
-      alt: t("page-index-get-started-eth-image-alt"),
+      title: translateMessageId("page-community-card-2-title", intl),
+      description: translateMessageId(
+        "page-community-card-2-description",
+        intl
+      ),
+      alt: translateMessageId("page-index-get-started-eth-image-alt", intl),
       to: "/community/events/",
     },
     {
       image: getImage(data.doge),
-      title: t("page-community-card-3-title"),
-      description: t("page-community-card-3-description"),
-      alt: t("page-index-get-started-dapps-image-alt"),
+      title: translateMessageId("page-community-card-3-title", intl),
+      description: translateMessageId(
+        "page-community-card-3-description",
+        intl
+      ),
+      alt: translateMessageId("page-index-get-started-dapps-image-alt", intl),
       to: "/community/get-involved/",
     },
     {
       image: getImage(data.future),
-      title: t("page-community-card-4-title"),
-      description: t("page-community-card-4-description"),
-      alt: t("page-index-get-started-dapps-image-alt"),
+      title: translateMessageId("page-community-card-4-title", intl),
+      description: translateMessageId(
+        "page-community-card-4-description",
+        intl
+      ),
+      alt: translateMessageId("page-index-get-started-dapps-image-alt", intl),
       to: "/community/grants/",
     },
   ]
@@ -368,26 +381,47 @@ const CommunityPage = ({
   const whyGetInvolvedCards: Array<IGetInvolvedCard> = [
     {
       emoji: ":mage:",
-      title: t("page-community-why-get-involved-card-1-title"),
-      description: t("page-community-why-get-involved-card-1-description"),
+      title: translateMessageId(
+        "page-community-why-get-involved-card-1-title",
+        intl
+      ),
+      description: translateMessageId(
+        "page-community-why-get-involved-card-1-description",
+        intl
+      ),
     },
     {
       emoji: ":dollar:",
-      title: t("page-community-why-get-involved-card-2-title"),
-      description: t("page-community-why-get-involved-card-2-description"),
+      title: translateMessageId(
+        "page-community-why-get-involved-card-2-title",
+        intl
+      ),
+      description: translateMessageId(
+        "page-community-why-get-involved-card-2-description",
+        intl
+      ),
     },
     {
       emoji: ":collision:",
-      title: t("page-community-why-get-involved-card-3-title"),
-      description: t("page-community-why-get-involved-card-3-description"),
+      title: translateMessageId(
+        "page-community-why-get-involved-card-3-title",
+        intl
+      ),
+      description: translateMessageId(
+        "page-community-why-get-involved-card-3-description",
+        intl
+      ),
     },
   ]
 
   return (
     <Page>
       <PageMetadata
-        title={t("page-community-meta-title")}
-        description={t("page-community-meta-description")}
+        title={translateMessageId("page-community-meta-title", intl)}
+        description={translateMessageId(
+          "page-community-meta-description",
+          intl
+        )}
       />
       <PageHero isReverse content={heroContent} />
       <Divider />
@@ -424,7 +458,10 @@ const CommunityPage = ({
             <ImageContainer>
               <IntroImage
                 image={getImage(data.developerBlocks)!}
-                alt={t("page-community-get-involved-image-alt")}
+                alt={translateMessageId(
+                  "page-community-get-involved-image-alt",
+                  intl
+                )}
               />
             </ImageContainer>
           </IntroRow>
@@ -463,7 +500,10 @@ const CommunityPage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.ethereum)!}
-              alt={t("page-community-open-source-image-alt")}
+              alt={translateMessageId(
+                "page-community-open-source-image-alt",
+                intl
+              )}
             />
           </ImageContainer>
         </RowReverse>
@@ -494,7 +534,7 @@ const CommunityPage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.finance)!}
-              alt={t("page-index-internet-image-alt")}
+              alt={translateMessageId("page-index-internet-image-alt", intl)}
             />
           </ImageContainer>
         </Row>
@@ -517,7 +557,7 @@ const CommunityPage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.hackathon)!}
-              alt={t("page-community-support-alt")}
+              alt={translateMessageId("page-community-support-alt", intl)}
             />
           </ImageContainer>
         </RowReverse>
@@ -535,7 +575,7 @@ const CommunityPage = ({
           <StyledCallout
             image={getImage(data.eth)}
             titleKey="page-community-get-eth-title"
-            alt={t("page-community-get-eth-alt")}
+            alt={translateMessageId("page-community-get-eth-alt", intl)}
             descriptionKey="page-community-get-eth-description"
           >
             <div>
@@ -547,7 +587,7 @@ const CommunityPage = ({
           <StyledCallout
             image={getImage(data.doge)}
             titleKey="page-community-explore-dapps-title"
-            alt={t("page-community-explore-dapps-alt")}
+            alt={translateMessageId("page-community-explore-dapps-alt", intl)}
             descriptionKey="page-community-explore-dapps-description"
           >
             <div>
@@ -566,16 +606,7 @@ const CommunityPage = ({
 export default CommunityPage
 
 export const query = graphql`
-  query CommunityPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query CommunityPage {
     enterprise: file(relativePath: { eq: "enterprise-eth.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/contributing/translation-program/acknowledgements.tsx b/src/pages/contributing/translation-program/acknowledgements.tsx
index 206615aed6b..975c46920d1 100644
--- a/src/pages/contributing/translation-program/acknowledgements.tsx
+++ b/src/pages/contributing/translation-program/acknowledgements.tsx
@@ -2,7 +2,7 @@
 import React from "react"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 import { useTheme } from "@emotion/react"
 import type { Context } from "../../../types"
@@ -18,6 +18,7 @@ import { Content, Page } from "../../../components/SharedStyledComponents"
 import FeedbackCard from "../../../components/FeedbackCard"
 
 // Utils
+import { translateMessageId } from "../../../utils/translations"
 import { getImage } from "../../../utils/image"
 
 // Styles
@@ -109,7 +110,7 @@ const TranslatorAcknowledgements = ({
   data,
   location,
 }: PageProps<Queries.TranslatorAcknowledgementsPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const theme = useTheme()
   const isDarkTheme = theme.isDark
   const themedCertificateImage = isDarkTheme
@@ -119,11 +120,13 @@ const TranslatorAcknowledgements = ({
   return (
     <Page>
       <PageMetadata
-        title={t(
-          "page-contributing-translation-program-acknowledgements-meta-title"
+        title={translateMessageId(
+          "page-contributing-translation-program-acknowledgements-meta-title",
+          intl
         )}
-        description={t(
-          "page-contributing-translation-program-acknowledgements-meta-description"
+        description={translateMessageId(
+          "page-contributing-translation-program-acknowledgements-meta-description",
+          intl
         )}
       />
 
@@ -158,8 +161,9 @@ const TranslatorAcknowledgements = ({
           <RightColumn>
             <Image
               image={getImage(data.dogeComputer)!}
-              alt={t(
-                "page-contributing-translation-program-acknowledgements-hero-image-alt"
+              alt={translateMessageId(
+                "page-contributing-translation-program-acknowledgements-hero-image-alt",
+                intl
               )}
               objectFit="contain"
             />
@@ -190,11 +194,13 @@ const TranslatorAcknowledgements = ({
         </p>
         <CentralActionCard
           to="/contributing/translation-program/contributors/"
-          title={t(
-            "page-contributing-translation-program-acknowledgements-our-translators-view-all"
+          title={translateMessageId(
+            "page-contributing-translation-program-acknowledgements-our-translators-view-all",
+            intl
           )}
-          description={t(
-            "page-contributing-translation-program-acknowledgements-our-translators-cta"
+          description={translateMessageId(
+            "page-contributing-translation-program-acknowledgements-our-translators-cta",
+            intl
           )}
           image={getImage(data.ethereum)!}
         />
@@ -269,16 +275,7 @@ const TranslatorAcknowledgements = ({
 export default TranslatorAcknowledgements
 
 export const query = graphql`
-  query TranslatorAcknowledgementsPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query TranslatorAcknowledgementsPage {
     dogeComputer: file(relativePath: { eq: "doge-computer.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/contributing/translation-program/contributors.tsx b/src/pages/contributing/translation-program/contributors.tsx
index 6b1fd609bdb..d72c66cda6a 100644
--- a/src/pages/contributing/translation-program/contributors.tsx
+++ b/src/pages/contributing/translation-program/contributors.tsx
@@ -1,7 +1,7 @@
 // Libraries
 import React from "react"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { graphql, PageProps } from "gatsby"
 import type { Context } from "../../../types"
 
@@ -17,6 +17,7 @@ import {
 } from "../../../components/SharedStyledComponents"
 
 // Utils
+import { translateMessageId } from "../../../utils/translations"
 import FeedbackCard from "../../../components/FeedbackCard"
 
 // Styles
@@ -45,7 +46,7 @@ const Contributors = ({
   data,
   location,
 }: PageProps<Queries.ContributorsPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   // TODO: Remove specific user checks once Acolad has updated their usernames
   const translatorData =
     data.allTimeData?.data?.flatMap(
@@ -84,11 +85,13 @@ const Contributors = ({
   return (
     <Page>
       <PageMetadata
-        title={t(
-          "page-contributing-translation-program-contributors-meta-title"
+        title={translateMessageId(
+          "page-contributing-translation-program-contributors-meta-title",
+          intl
         )}
-        description={t(
-          "page-contributing-translation-program-contributors-meta-description"
+        description={translateMessageId(
+          "page-contributing-translation-program-contributors-meta-description",
+          intl
         )}
       />
 
@@ -150,16 +153,7 @@ const Contributors = ({
 export default Contributors
 
 export const query = graphql`
-  query ContributorsPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query ContributorsPage {
     allTimeData: alltimeJson {
       data {
         user {
diff --git a/src/pages/developers/index.tsx b/src/pages/developers/index.tsx
index e126184d05e..ffbd5facbda 100644
--- a/src/pages/developers/index.tsx
+++ b/src/pages/developers/index.tsx
@@ -2,7 +2,7 @@ import React, { ReactNode } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Card from "../../components/Card"
 import Callout from "../../components/Callout"
@@ -18,6 +18,7 @@ import {
 } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 
+import { translateMessageId } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 import { Context } from "../../types"
@@ -241,13 +242,13 @@ const paths: Array<IDevelopersPath> = [
 const DevelopersPage = ({
   data,
 }: PageProps<Queries.DevelopersIndexPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   return (
     <Page>
       <PageMetadata
-        title={t("page-developer-meta-title")}
-        description={t("page-developers-meta-desc")}
+        title={translateMessageId("page-developer-meta-title", intl)}
+        description={translateMessageId("page-developers-meta-desc", intl)}
       />
       <Content>
         <HeroContainer>
@@ -268,7 +269,7 @@ const DevelopersPage = ({
           </HeroCopyContainer>
           <Hero
             image={getImage(data.ednHero)!}
-            alt={t("alt-eth-blocks")}
+            alt={translateMessageId("alt-eth-blocks", intl)}
             loading="eager"
           />
         </HeroContainer>
@@ -309,7 +310,7 @@ const DevelopersPage = ({
             image={getImage(data.developers)}
             titleKey="page-developers-improve-ethereum"
             descriptionKey="page-developers-improve-ethereum-desc"
-            alt={t("alt-eth-blocks")}
+            alt={translateMessageId("alt-eth-blocks", intl)}
           >
             <div>
               <ButtonLink to="https://github.com/ethereum/ethereum-org-website">
@@ -373,7 +374,10 @@ const DevelopersPage = ({
               <Translation id="page-developers-language-desc" />
             </p>
             <ImageContainer>
-              <Image image={getImage(data.doge)!} alt={t("page-assets-doge")} />
+              <Image
+                image={getImage(data.doge)!}
+                alt={translateMessageId("page-assets-doge", intl)}
+              />
             </ImageContainer>
           </Column>
           <Column>
@@ -555,16 +559,7 @@ const DevelopersPage = ({
 export default DevelopersPage
 
 export const query = graphql`
-  query DevelopersIndexPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query DevelopersIndexPage {
     ednHero: file(relativePath: { eq: "enterprise-eth.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/developers/learning-tools.tsx b/src/pages/developers/learning-tools.tsx
index 6c2e4312553..5df453ec317 100644
--- a/src/pages/developers/learning-tools.tsx
+++ b/src/pages/developers/learning-tools.tsx
@@ -2,7 +2,7 @@
 import React, { useEffect, useState } from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { shuffle } from "lodash"
 // Component imports
 import PageMetadata from "../../components/PageMetadata"
@@ -14,6 +14,7 @@ import { Content, Page } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 import LearningToolsCardGrid from "../../components/LearningToolsCardGrid"
 // Util imports
+import { translateMessageId } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 // Type imports
 import { Context, LearningTool } from "../../types"
@@ -78,7 +79,7 @@ const StackContainer = styled(Content)`
 const LearningToolsPage = ({
   data,
 }: PageProps<Queries.DevelopersLearningToolsPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const [randomizedSandboxes, setRandomizedSandboxes] = useState<
     Array<LearningTool>
   >([])
@@ -215,7 +216,7 @@ const LearningToolsPage = ({
       name: "Platzi",
       description: "page-learning-tools-platzi-description",
       url: "https://platzi.com/escuela/escuela-blockchain/",
-      image: getImage(data.platzi)!,
+      image: getImage(data.platzi),
       alt: "page-learning-tools-platzi-logo-alt",
       background: "#121f3d",
       subjects: ["Solidity", "web3"],
@@ -235,8 +236,8 @@ const LearningToolsPage = ({
   return (
     <StyledPage>
       <PageMetadata
-        title={t("page-learning-tools-meta-title")}
-        description={t("page-learning-tools-meta-desc")}
+        title={translateMessageId("page-learning-tools-meta-title", intl)}
+        description={translateMessageId("page-learning-tools-meta-desc", intl)}
       />
       <Header>
         <H1>
@@ -279,7 +280,7 @@ const LearningToolsPage = ({
       <Content>
         <CalloutBanner
           image={getImage(data.learn)!}
-          alt={t("page-index-tout-enterprise-image-alt")}
+          alt={translateMessageId("page-index-tout-enterprise-image-alt", intl)}
           titleKey={"page-learning-tools-documentation"}
           descriptionKey={"page-learning-tools-documentation-desc"}
         >
@@ -313,16 +314,7 @@ export const learningToolImage = graphql`
 `
 
 export const query = graphql`
-  query DevelopersLearningToolsPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query DevelopersLearningToolsPage {
     captureTheEther: file(
       relativePath: { eq: "dev-tools/capturetheether.png" }
     ) {
diff --git a/src/pages/developers/local-environment.tsx b/src/pages/developers/local-environment.tsx
index b4058a8ecab..eb33227556f 100644
--- a/src/pages/developers/local-environment.tsx
+++ b/src/pages/developers/local-environment.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage, IGatsbyImageData } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { shuffle } from "lodash"
 
 // import ActionCard from "../../components/ActionCard"
@@ -23,7 +23,7 @@ import {
 } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 
-import { TranslationKey } from "../../utils/translations"
+import { translateMessageId, TranslationKey } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 import { Context } from "../../types"
@@ -382,7 +382,7 @@ const frameworksList: Array<IFramework> = [
 const ChooseStackPage = ({
   data,
 }: PageProps<Queries.DevelopersLocalEnvironmentPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const [frameworks, setFrameworks] = useState<Array<IFramework>>([])
 
   useEffect(() => {
@@ -399,8 +399,14 @@ const ChooseStackPage = ({
   return (
     <StyledPage>
       <PageMetadata
-        title={t("page-local-environment-setup-meta-title")}
-        description={t("page-local-environment-setup-meta-desc")}
+        title={translateMessageId(
+          "page-local-environment-setup-meta-title",
+          intl
+        )}
+        description={translateMessageId(
+          "page-local-environment-setup-meta-desc",
+          intl
+        )}
       />
       <HeroContent>
         <Slogan>
@@ -445,7 +451,7 @@ const ChooseStackPage = ({
           <Column>
             <Hero
               image={getImage(data.hero)!}
-              alt={t("alt-eth-blocks")}
+              alt={translateMessageId("alt-eth-blocks", intl)}
               loading="eager"
             />
           </Column>
@@ -460,7 +466,7 @@ const ChooseStackPage = ({
               name={framework.name}
               githubUrl={framework.githubUrl}
               repoLangCount={2}
-              alt={t(framework.alt)}
+              alt={translateMessageId(framework.alt, intl)}
             >
               <Translation id={framework.description} />
             </ProductCard>
@@ -614,16 +620,7 @@ export const devtoolImage = graphql`
 `
 
 export const query = graphql`
-  query DevelopersLocalEnvironmentPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query DevelopersLocalEnvironmentPage {
     hero: file(relativePath: { eq: "developers-eth-blocks.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/developers/tutorials.tsx b/src/pages/developers/tutorials.tsx
index 4ccc836b0f9..aa76b64c090 100644
--- a/src/pages/developers/tutorials.tsx
+++ b/src/pages/developers/tutorials.tsx
@@ -1,9 +1,10 @@
 import React, { useEffect, useMemo, useState } from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Translation from "../../components/Translation"
+import { translateMessageId } from "../../utils/translations"
 import Icon from "../../components/Icon"
 import ButtonLink from "../../components/ButtonLink"
 import Link from "../../components/Link"
@@ -260,9 +261,9 @@ const TutorialsPage = ({
       filterTutorialsByLang(
         data.allTutorials.nodes,
         externalTutorials,
-        pageContext.language
+        pageContext.locale
       ),
-    [pageContext.language]
+    [pageContext.locale]
   )
 
   const allTags = useMemo(
@@ -270,8 +271,7 @@ const TutorialsPage = ({
     [filteredTutorialsByLang]
   )
 
-  const { t } = useTranslation()
-  const { language } = useI18next()
+  const intl = useIntl()
   const [isModalOpen, setModalOpen] = useState(false)
   const [filteredTutorials, setFilteredTutorials] = useState(
     filteredTutorialsByLang
@@ -306,8 +306,11 @@ const TutorialsPage = ({
   return (
     <StyledPage>
       <PageMetadata
-        title={t("page-tutorials-meta-title")}
-        description={t("page-tutorials-meta-description")}
+        title={translateMessageId("page-tutorials-meta-title", intl)}
+        description={translateMessageId(
+          "page-tutorials-meta-description",
+          intl
+        )}
       />
       <PageTitle>
         <Translation id="page-tutorial-title" />
@@ -426,7 +429,7 @@ const TutorialsPage = ({
                 {/* TODO: Refactor each tutorial tag as a component */}
                 <Emoji text=":writing_hand:" size={1} mr={`0.5em`} />
                 {tutorial.author} •
-                {published(language, tutorial.published ?? "")}
+                {published(intl.locale, tutorial.published ?? "")}
                 {tutorial.timeToRead && (
                   <>
                     {" "}
@@ -466,16 +469,7 @@ const TutorialsPage = ({
 export default TutorialsPage
 
 export const query = graphql`
-  query DevelopersTutorialsPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query DevelopersTutorialsPage {
     allTutorials: allMdx(
       filter: { slug: { regex: "/tutorials/" } }
       sort: { fields: frontmatter___published, order: DESC }
diff --git a/src/pages/get-eth.tsx b/src/pages/get-eth.tsx
index b41247e9b8b..42d261bb646 100644
--- a/src/pages/get-eth.tsx
+++ b/src/pages/get-eth.tsx
@@ -1,9 +1,10 @@
 import React from "react"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
 
+import { translateMessageId, TranslationKey } from "../utils/translations"
 import Translation from "../components/Translation"
 import CardList from "../components/CardList"
 import EthExchanges from "../components/EthExchanges"
@@ -175,7 +176,7 @@ const StyledInfoBanner = styled(InfoBanner)<{
 `
 
 const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const decentralizedExchanges: Array<CardListItem> = [
     {
       title: "Localcryptos.com",
@@ -220,17 +221,26 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
 
   const safetyArticles: Array<CardListItem> = [
     {
-      title: t("page-get-eth-article-protecting-yourself"),
+      title: translateMessageId(
+        "page-get-eth-article-protecting-yourself",
+        intl
+      ),
       link: "https://support.mycrypto.com/staying-safe/protecting-yourself-and-your-funds",
       description: "MyCrypto",
     },
     {
-      title: t("page-get-eth-article-keeping-crypto-safe"),
-      link: "https://blog.coinbase.com/the-keys-to-keeping-your-crypto-safe-96d497cce6cf",
+      title: translateMessageId(
+        "page-get-eth-article-keeping-crypto-safe",
+        intl
+      ),
+      link: "https://web.archive.org/web/20190716160333/https://blog.coinbase.com/the-keys-to-keeping-your-crypto-safe-96d497cce6cf?gi=548619266f28",
       description: "Coinbase",
     },
     {
-      title: t("page-get-eth-article-store-digital-assets"),
+      title: translateMessageId(
+        "page-get-eth-article-store-digital-assets",
+        intl
+      ),
       link: "https://media.consensys.net/how-to-store-digital-assets-on-ethereum-a2bfdcf66bd0",
       description: "ConsenSys",
     },
@@ -239,14 +249,14 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
   return (
     <Page>
       <PageMetadata
-        title={t("page-get-eth-meta-title")}
-        description={t("page-get-eth-meta-description")}
+        title={translateMessageId("page-get-eth-meta-title", intl)}
+        description={translateMessageId("page-get-eth-meta-description", intl)}
       />
 
       <HeroContainer>
         <Hero
           image={getImage(data.hero)!}
-          alt={t("page-get-eth-hero-image-alt")}
+          alt={translateMessageId("page-get-eth-hero-image-alt", intl)}
           loading="eager"
         />
         <Header>
@@ -268,13 +278,13 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
       <CardContainer>
         <StyledCard
           emoji=":office_building:"
-          title={t("page-get-eth-cex")}
-          description={t("page-get-eth-cex-desc")}
+          title={translateMessageId("page-get-eth-cex", intl)}
+          description={translateMessageId("page-get-eth-cex-desc", intl)}
         />
         <StyledCard
           emoji=":busts_in_silhouette:"
-          title={t("page-get-eth-dex")}
-          description={t("page-get-eth-dex-desc")}
+          title={translateMessageId("page-get-eth-dex", intl)}
+          description={translateMessageId("page-get-eth-dex-desc", intl)}
         >
           <Link to="#dex">
             <Translation id="page-get-eth-try-dex" />
@@ -282,8 +292,11 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
         </StyledCard>
         <StyledCard
           emoji=":robot:"
-          title={t("page-get-eth-wallets")}
-          description={t("page-get-eth-wallets-purchasing")}
+          title={translateMessageId("page-get-eth-wallets", intl)}
+          description={translateMessageId(
+            "page-get-eth-wallets-purchasing",
+            intl
+          )}
         >
           <Link to="/wallets/">
             <Translation id="page-get-eth-wallets-link" />
@@ -416,7 +429,10 @@ const GetETHPage = ({ data }: PageProps<Queries.GetEthPageQuery>) => {
         titleKey="page-get-eth-use-your-eth"
         descriptionKey="page-get-eth-use-your-eth-dapps"
         image={getImage(data.dapps)!}
-        alt={t("page-index-sections-individuals-image-alt")}
+        alt={translateMessageId(
+          "page-index-sections-individuals-image-alt" as TranslationKey,
+          intl
+        )}
         maxImageWidth={600}
       >
         <div>
@@ -446,16 +462,7 @@ export const listItemImage = graphql`
 `
 
 export const query = graphql`
-  query GetEthPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query GetEthPage {
     hero: file(relativePath: { eq: "get-eth.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 18521e420c0..2232ca719bd 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
 import styled from "@emotion/styled"
@@ -23,7 +23,7 @@ import {
   GrayContainer,
   LeftColumn,
 } from "../components/SharedStyledComponents"
-import { isLangRightToLeft } from "../utils/translations"
+import { translateMessageId, isLangRightToLeft } from "../utils/translations"
 import { getImage } from "../utils/image"
 
 import SimpleWalletContent from "!!raw-loader!../data/SimpleWallet.sol"
@@ -414,7 +414,7 @@ const HomePage = ({
   data,
   pageContext: { language = "en" },
 }: PageProps<Queries.IndexPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const [isModalOpen, setModalOpen] = useState(false)
   const [activeCode, setActiveCode] = useState(0)
   const dir = isLangRightToLeft(language) ? "rtl" : "ltr"
@@ -429,30 +429,42 @@ const HomePage = ({
   const cards = [
     {
       image: getImage(data.robotfixed),
-      title: t("page-index-get-started-wallet-title"),
-      description: t("page-index-get-started-wallet-description"),
-      alt: t("page-index-get-started-wallet-image-alt"),
+      title: translateMessageId("page-index-get-started-wallet-title", intl),
+      description: translateMessageId(
+        "page-index-get-started-wallet-description",
+        intl
+      ),
+      alt: translateMessageId("page-index-get-started-wallet-image-alt", intl),
       to: "/wallets/find-wallet/",
     },
     {
       image: getImage(data.ethfixed),
-      title: t("page-index-get-started-eth-title"),
-      description: t("page-index-get-started-eth-description"),
-      alt: t("page-index-get-started-eth-image-alt"),
+      title: translateMessageId("page-index-get-started-eth-title", intl),
+      description: translateMessageId(
+        "page-index-get-started-eth-description",
+        intl
+      ),
+      alt: translateMessageId("page-index-get-started-eth-image-alt", intl),
       to: "/get-eth/",
     },
     {
       image: getImage(data.dogefixed),
-      title: t("page-index-get-started-dapps-title"),
-      description: t("page-index-get-started-dapps-description"),
-      alt: t("page-index-get-started-dapps-image-alt"),
+      title: translateMessageId("page-index-get-started-dapps-title", intl),
+      description: translateMessageId(
+        "page-index-get-started-dapps-description",
+        intl
+      ),
+      alt: translateMessageId("page-index-get-started-dapps-image-alt", intl),
       to: "/dapps/",
     },
     {
       image: getImage(data.devfixed),
-      title: t("page-index-get-started-devs-title"),
-      description: t("page-index-get-started-devs-description"),
-      alt: t("page-index-get-started-devs-image-alt"),
+      title: translateMessageId("page-index-get-started-devs-title", intl),
+      description: translateMessageId(
+        "page-index-get-started-devs-description",
+        intl
+      ),
+      alt: translateMessageId("page-index-get-started-devs-image-alt", intl),
       to: "/developers/",
     },
   ]
@@ -460,23 +472,32 @@ const HomePage = ({
   const touts = [
     {
       image: getImage(data.merge),
-      alt: t("page-index-tout-upgrades-image-alt"),
-      title: t("page-index-tout-upgrades-title"),
-      description: t("page-index-tout-upgrades-description"),
+      alt: translateMessageId("page-index-tout-upgrades-image-alt", intl),
+      title: translateMessageId("page-index-tout-upgrades-title", intl),
+      description: translateMessageId(
+        "page-index-tout-upgrades-description",
+        intl
+      ),
       to: "/upgrades/",
     },
     {
       image: getImage(data.infrastructurefixed),
-      alt: t("page-index-tout-enterprise-image-alt"),
-      title: t("page-index-tout-enterprise-title"),
-      description: t("page-index-tout-enterprise-description"),
+      alt: translateMessageId("page-index-tout-enterprise-image-alt", intl),
+      title: translateMessageId("page-index-tout-enterprise-title", intl),
+      description: translateMessageId(
+        "page-index-tout-enterprise-description",
+        intl
+      ),
       to: "/enterprise/",
     },
     {
       image: getImage(data.enterprise),
-      alt: t("page-index-tout-community-image-alt"),
-      title: t("page-index-tout-community-title"),
-      description: t("page-index-tout-community-description"),
+      alt: translateMessageId("page-index-tout-community-image-alt", intl),
+      title: translateMessageId("page-index-tout-community-title", intl),
+      description: translateMessageId(
+        "page-index-tout-community-description",
+        intl
+      ),
       to: "/community/",
     },
   ]
@@ -488,26 +509,50 @@ const HomePage = ({
 
   const codeExamples: Array<CodeExample> = [
     {
-      title: t("page-index-developers-code-example-title-0"),
-      description: t("page-index-developers-code-example-description-0"),
+      title: translateMessageId(
+        "page-index-developers-code-example-title-0",
+        intl
+      ),
+      description: translateMessageId(
+        "page-index-developers-code-example-description-0",
+        intl
+      ),
       codeLanguage: "language-solidity",
       code: SimpleWalletContent,
     },
     {
-      title: t("page-index-developers-code-example-title-1"),
-      description: t("page-index-developers-code-example-description-1"),
+      title: translateMessageId(
+        "page-index-developers-code-example-title-1",
+        intl
+      ),
+      description: translateMessageId(
+        "page-index-developers-code-example-description-1",
+        intl
+      ),
       codeLanguage: "language-solidity",
       code: SimpleTokenContent,
     },
     {
-      title: t("page-index-developers-code-example-title-2"),
-      description: t("page-index-developers-code-example-description-2"),
+      title: translateMessageId(
+        "page-index-developers-code-example-title-2",
+        intl
+      ),
+      description: translateMessageId(
+        "page-index-developers-code-example-description-2",
+        intl
+      ),
       codeLanguage: "language-javascript",
       code: CreateWalletContent,
     },
     {
-      title: t("page-index-developers-code-example-title-3"),
-      description: t("page-index-developers-code-example-description-3"),
+      title: translateMessageId(
+        "page-index-developers-code-example-title-3",
+        intl
+      ),
+      description: translateMessageId(
+        "page-index-developers-code-example-description-3",
+        intl
+      ),
       codeLanguage: "language-solidity",
       code: SimpleDomainRegistryContent,
     },
@@ -516,12 +561,12 @@ const HomePage = ({
   return (
     <Page dir={dir}>
       <PageMetadata
-        title={t("page-index-meta-title")}
-        description={t("page-index-meta-description")}
+        title={translateMessageId("page-index-meta-title", intl)}
+        description={translateMessageId("page-index-meta-description", intl)}
       />
       <Hero
         image={getImage(data.hero)!}
-        alt={t("page-index-hero-image-alt")}
+        alt={translateMessageId("page-index-hero-image-alt", intl)}
         loading="eager"
       />
       <Morpher />
@@ -550,7 +595,10 @@ const HomePage = ({
             <ImageContainer>
               <IntroImage
                 image={getImage(data.hackathon)!}
-                alt={t("page-index-get-started-image-alt")}
+                alt={translateMessageId(
+                  "page-index-get-started-image-alt",
+                  intl
+                )}
               />
             </ImageContainer>
           </IntroRow>
@@ -589,7 +637,10 @@ const HomePage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.ethereum)!}
-              alt={t("page-index-what-is-ethereum-image-alt")}
+              alt={translateMessageId(
+                "page-index-what-is-ethereum-image-alt",
+                intl
+              )}
             />
           </ImageContainer>
         </RowReverse>
@@ -614,7 +665,7 @@ const HomePage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.impact)!}
-              alt={t("page-index-defi-image-alt")}
+              alt={translateMessageId("page-index-defi-image-alt", intl)}
             />
           </ImageContainer>
         </Row>
@@ -624,7 +675,7 @@ const HomePage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.infrastructure)!}
-              alt={t("page-index-nft-alt")}
+              alt={translateMessageId("page-index-nft-alt", intl)}
             />
           </ImageContainer>
           <FeatureContent>
@@ -667,7 +718,7 @@ const HomePage = ({
           <ImageContainer>
             <FeatureImage
               image={getImage(data.future)!}
-              alt={t("page-index-internet-image-alt")}
+              alt={translateMessageId("page-index-internet-image-alt", intl)}
             />
           </ImageContainer>
         </Row>
@@ -747,7 +798,10 @@ const HomePage = ({
           descriptionKey={"page-index-contribution-banner-description"}
           image={getImage(data.finance)!}
           maxImageWidth={600}
-          alt={t("page-index-contribution-banner-image-alt")}
+          alt={translateMessageId(
+            "page-index-contribution-banner-image-alt",
+            intl
+          )}
         >
           <ButtonRow>
             <ButtonLink to="/contributing/">
@@ -769,16 +823,7 @@ const HomePage = ({
 export default HomePage
 
 export const query = graphql`
-  query IndexPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query IndexPage {
     hero: file(relativePath: { eq: "home/hero.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/pages/languages.tsx b/src/pages/languages.tsx
index f08dace4f48..15572e2bc17 100644
--- a/src/pages/languages.tsx
+++ b/src/pages/languages.tsx
@@ -1,15 +1,14 @@
 import React, { useState } from "react"
-import { graphql } from "gatsby"
 import styled from "@emotion/styled"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import PageMetadata from "../components/PageMetadata"
 import Translation from "../components/Translation"
 import Link from "../components/Link"
 import { Page, Content } from "../components/SharedStyledComponents"
 
-import { Language, languageMetadata } from "../utils/languages"
-import { TranslationKey } from "../utils/translations"
+import { Lang, Language, languageMetadata } from "../utils/languages"
+import { translateMessageId, TranslationKey } from "../utils/translations"
 import { CardItem as LangItem } from "../components/SharedStyledComponents"
 import Icon from "../components/Icon"
 import NakedButton from "../components/NakedButton"
@@ -74,19 +73,22 @@ interface TranslatedLanguage extends Language {
 }
 
 const LanguagesPage = () => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const [keyword, setKeyword] = useState<string>("")
   const resetKeyword = (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault()
     setKeyword("")
   }
-  const searchString = t("page-languages-filter-placeholder")
+  const searchString = translateMessageId(
+    "page-languages-filter-placeholder",
+    intl
+  )
   let translationsCompleted: Array<TranslatedLanguage> = []
   for (const lang in languageMetadata) {
     const langMetadata = {
       ...languageMetadata[lang],
       path: "/",
-      name: t(`language-${lang}` as TranslationKey),
+      name: translateMessageId(`language-${lang}` as TranslationKey, intl),
     }
 
     const nativeLangTitle = langMetadata.localName
@@ -103,8 +105,8 @@ const LanguagesPage = () => {
   return (
     <StyledPage>
       <PageMetadata
-        title={t("page-languages-meta-title")}
-        description={t("page-languages-meta-desc")}
+        title={translateMessageId("page-languages-meta-title", intl)}
+        description={translateMessageId("page-languages-meta-desc", intl)}
       />
       <Content>
         <ContentContainer>
@@ -168,17 +170,3 @@ const LanguagesPage = () => {
 }
 
 export default LanguagesPage
-
-export const query = graphql`
-  query LanguagesPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
-  }
-`
diff --git a/src/pages/layer-2.tsx b/src/pages/layer-2.tsx
index 4a8c94dde24..55d70378f98 100644
--- a/src/pages/layer-2.tsx
+++ b/src/pages/layer-2.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
 import styled from "@emotion/styled"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 // Data
 import layer2Data from "../data/layer-2/layer-2.json"
@@ -30,7 +30,11 @@ import { CardGrid, Content, Page } from "../components/SharedStyledComponents"
 
 // Utils
 import { getData } from "../utils/cache"
-import { getLocaleForNumberFormat, TranslationKey } from "../utils/translations"
+import {
+  translateMessageId,
+  getLocaleForNumberFormat,
+  TranslationKey,
+} from "../utils/translations"
 import { Lang } from "../utils/languages"
 import { getImage } from "../utils/image"
 
@@ -199,14 +203,15 @@ interface FeeDataResponse {
 }
 
 const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
-  const { t } = useTranslation()
-  const { language } = useI18next()
+  const intl = useIntl()
   const [tvl, setTVL] = useState("loading...")
   const [percentChangeL2, setL2PercentChange] = useState("loading...")
   const [averageFee, setAverageFee] = useState("loading...")
 
   useEffect(() => {
-    const localeForStatsBoxNumbers = getLocaleForNumberFormat(language as Lang)
+    const localeForStatsBoxNumbers = getLocaleForNumberFormat(
+      intl.locale as Lang
+    )
 
     const fetchL2Beat = async (): Promise<void> => {
       try {
@@ -275,26 +280,26 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
       }
     }
     fetchCryptoStats()
-  }, [language])
+  }, [intl.locale])
 
   const heroContent = {
-    title: t("layer-2-hero-title"),
-    header: t("layer-2-hero-header"),
-    subtitle: t("layer-2-hero-subtitle"),
+    title: translateMessageId("layer-2-hero-title", intl),
+    header: translateMessageId("layer-2-hero-header", intl),
+    subtitle: translateMessageId("layer-2-hero-subtitle", intl),
     image: getImage(data.heroImage)!,
-    alt: t("layer-2-hero-alt-text"),
+    alt: translateMessageId("layer-2-hero-alt-text", intl),
     buttons: [
       {
-        content: t("layer-2-hero-button-1"),
+        content: translateMessageId("layer-2-hero-button-1", intl),
         toId: "what-is-layer-2",
       },
       {
-        content: t("layer-2-hero-button-2"),
+        content: translateMessageId("layer-2-hero-button-2", intl),
         toId: "use-layer-2",
         variant: "outline",
       },
       {
-        content: t("layer-2-hero-button-3"),
+        content: translateMessageId("layer-2-hero-button-3", intl),
         toId: "how-to-get-onto-layer-2",
         variant: "outline",
       },
@@ -304,34 +309,49 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
   const layer2Cards = [
     {
       emoji: ":money_with_wings:",
-      title: t("layer-2-lower-fees-title"),
-      description: t("layer-2-lower-fees-description"),
+      title: translateMessageId("layer-2-lower-fees-title", intl),
+      description: translateMessageId("layer-2-lower-fees-description", intl),
     },
     {
       emoji: ":closed_lock_with_key:",
-      title: t("layer-2-maintain-security-title"),
-      description: t("layer-2-maintain-security-description"),
+      title: translateMessageId("layer-2-maintain-security-title", intl),
+      description: translateMessageId(
+        "layer-2-maintain-security-description",
+        intl
+      ),
     },
     {
       emoji: ":hammer_and_wrench:",
-      title: t("layer-2-expand-use-cases-title"),
-      description: t("layer-2-expand-use-cases-description"),
+      title: translateMessageId("layer-2-expand-use-cases-title", intl),
+      description: translateMessageId(
+        "layer-2-expand-use-cases-description",
+        intl
+      ),
     },
   ]
 
   const rollupCards = [
     {
       image: getImage(data.optimisticRollup),
-      title: t("layer-2-optimistic-rollups-title"),
-      description: t("layer-2-optimistic-rollups-description"),
-      childSentence: t("layer-2-optimistic-rollups-childSentance"),
+      title: translateMessageId("layer-2-optimistic-rollups-title", intl),
+      description: translateMessageId(
+        "layer-2-optimistic-rollups-description",
+        intl
+      ),
+      childSentence: translateMessageId(
+        "layer-2-optimistic-rollups-childSentance",
+        intl
+      ),
       childLink: "/developers/docs/scaling/optimistic-rollups/",
     },
     {
       image: getImage(data.zkRollup),
-      title: t("layer-2-zk-rollups-title"),
-      description: t("layer-2-zk-rollups-description"),
-      childSentence: t("layer-2-zk-rollups-childSentance"),
+      title: translateMessageId("layer-2-zk-rollups-title", intl),
+      description: translateMessageId("layer-2-zk-rollups-description", intl),
+      childSentence: translateMessageId(
+        "layer-2-zk-rollups-childSentance",
+        intl
+      ),
       childLink: "/developers/docs/scaling/zk-rollups/",
     },
   ]
@@ -340,21 +360,30 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
     information: [
       {
         title: "L2BEAT",
-        description: t("layer-2-tools-l2beat-description"),
+        description: translateMessageId(
+          "layer-2-tools-l2beat-description",
+          intl
+        ),
         link: "https://l2beat.com",
         image: getImage(data.l2beat),
         alt: "L2BEAT",
       },
       {
         title: "L2 Fees",
-        description: t("layer-2-tools-l2fees-description"),
+        description: translateMessageId(
+          "layer-2-tools-l2fees-description",
+          intl
+        ),
         link: "https://l2fees.info",
         image: getImage(data.doge),
         alt: "L2 Fees",
       },
       {
         title: "Chainlist",
-        description: t("layer-2-tools-chainlist-description"),
+        description: translateMessageId(
+          "layer-2-tools-chainlist-description",
+          intl
+        ),
         link: "https://chainlist.org",
         image: getImage(data.doge),
         alt: "Chainlist",
@@ -363,21 +392,30 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
     walletManagers: [
       {
         title: "Zapper",
-        description: t("layer-2-tools-zapper-description"),
+        description: translateMessageId(
+          "layer-2-tools-zapper-description",
+          intl
+        ),
         link: "https://zapper.fi/",
         image: getImage(data.zapper),
         alt: "Zapper",
       },
       {
         title: "Zerion",
-        description: t("layer-2-tools-zerion-description"),
+        description: translateMessageId(
+          "layer-2-tools-zerion-description",
+          intl
+        ),
         link: "https://zerion.io",
         image: getImage(data.zerion),
         alt: "Zerion",
       },
       {
         title: "DeBank",
-        description: t("layer-2-tools-debank-description"),
+        description: translateMessageId(
+          "layer-2-tools-debank-description",
+          intl
+        ),
         link: "https://debank.com",
         image: getImage(data.debank),
         alt: "DeBank",
@@ -691,9 +729,12 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
                   key={idx}
                   background={l2.background}
                   image={getImage(data[l2.imageKey])!}
-                  description={t(l2.descriptionKey as TranslationKey)}
+                  description={translateMessageId(
+                    l2.descriptionKey as TranslationKey,
+                    intl
+                  )}
                   url={l2.website}
-                  note={t(l2.noteKey as TranslationKey)}
+                  note={translateMessageId(l2.noteKey as TranslationKey, intl)}
                   name={l2.name}
                   bridge={l2.bridge}
                   ecosystemPortal={l2.ecosystemPortal}
@@ -720,9 +761,12 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
                   key={idx}
                   background={l2.background}
                   image={getImage(data[l2.imageKey])!}
-                  description={t(l2.descriptionKey as TranslationKey)}
+                  description={translateMessageId(
+                    l2.descriptionKey as TranslationKey,
+                    intl
+                  )}
                   url={l2.website}
-                  note={t(l2.noteKey as TranslationKey)}
+                  note={translateMessageId(l2.noteKey as TranslationKey, intl)}
                   name={l2.name}
                   bridge={l2.bridge}
                   ecosystemPortal={l2.ecosystemPortal}
@@ -775,7 +819,7 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
         <Layer2Onboard
           layer2DataCombined={layer2DataCombined}
           ethIcon={getImage(data.ethHome)!}
-          ethIconAlt={t("ethereum-logo")}
+          ethIconAlt={translateMessageId("ethereum-logo", intl)}
         />
       </PaddedContent>
 
@@ -803,12 +847,16 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
         <h2>
           <Translation id="layer-2-faq-title" />
         </h2>
-        <ExpandableCard title={`${t("layer-2-faq-question-1-title")}`}>
+        <ExpandableCard
+          title={`${translateMessageId("layer-2-faq-question-1-title", intl)}`}
+        >
           <p>
             <Translation id="layer-2-faq-question-1-description-1" />
           </p>
         </ExpandableCard>
-        <ExpandableCard title={`${t("layer-2-faq-question-2-title")}`}>
+        <ExpandableCard
+          title={`${translateMessageId("layer-2-faq-question-2-title", intl)}`}
+        >
           <p>
             <Translation id="layer-2-faq-question-2-description-1" />
           </p>
@@ -829,7 +877,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             </Link>
           </p>
         </ExpandableCard>
-        <ExpandableCard title={`${t("layer-2-faq-question-3-title")}`}>
+        <ExpandableCard
+          title={`${translateMessageId("layer-2-faq-question-3-title", intl)}`}
+        >
           <p>
             <Translation id="layer-2-faq-question-3-description-1" />{" "}
           </p>
@@ -839,7 +889,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             </Link>
           </p>
         </ExpandableCard>
-        <ExpandableCard title={`${t("layer-2-faq-question-4-title")}`}>
+        <ExpandableCard
+          title={`${translateMessageId("layer-2-faq-question-4-title", intl)}`}
+        >
           <p>
             <Translation id="layer-2-faq-question-4-description-1" />
           </p>
@@ -847,7 +899,7 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             <Translation id="layer-2-faq-question-4-description-2" />
           </p>
           <p>
-            <Translation id="layer-2-faq-question-4-description-3" />
+            <Translation id="layer-2-faq-question-4-description-3" />{" "}
           </p>
           <p>
             <Link to="/bridges/">
@@ -855,7 +907,9 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
             </Link>
           </p>
         </ExpandableCard>
-        <ExpandableCard title={`${t("layer-2-faq-question-5-title")}`}>
+        <ExpandableCard
+          title={`${translateMessageId("layer-2-faq-question-5-title", intl)}`}
+        >
           <p>
             <Translation id="layer-2-faq-question-5-description-1" />{" "}
             <Link to="/contributing/adding-layer-2s/">
@@ -923,16 +977,7 @@ const Layer2Page = ({ data }: PageProps<Queries.Layer2PageQuery>) => {
 export default Layer2Page
 
 export const query = graphql`
-  query Layer2Page($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query Layer2Page {
     dao: file(relativePath: { eq: "use-cases/dao-2.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/learn/index.tsx b/src/pages/learn/index.tsx
index 9578b76e115..30d8fe924e3 100644
--- a/src/pages/learn/index.tsx
+++ b/src/pages/learn/index.tsx
@@ -3,7 +3,7 @@ import React from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 // Components
 import { CardGrid as OriginalCardGrid } from "../../components/SharedStyledComponents"
@@ -19,7 +19,7 @@ import Translation from "../../components/Translation"
 
 // Utils
 import { Lang } from "../../utils/languages"
-import { isLangRightToLeft } from "../../utils/translations"
+import { translateMessageId, isLangRightToLeft } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 // Types
@@ -190,50 +190,49 @@ const CardGrid = styled(OriginalCardGrid)`
 `
 
 const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
-  const { t } = useTranslation()
-  const { language } = useI18next()
-  const isRightToLeft = isLangRightToLeft(language as Lang)
+  const intl = useIntl()
+  const isRightToLeft = isLangRightToLeft(intl.locale as Lang)
 
   const tocItems = [
     {
       id: "what-is-crypto-ethereum",
-      title: t("toc-what-is-crypto-ethereum"),
+      title: translateMessageId("toc-what-is-crypto-ethereum", intl),
     },
     {
       id: "how-do-i-use-ethereum",
-      title: t("toc-how-do-i-use-ethereum"),
+      title: translateMessageId("toc-how-do-i-use-ethereum", intl),
     },
     {
       id: "what-is-ethereum-used-for",
-      title: t("toc-what-is-ethereum-used-for"),
+      title: translateMessageId("toc-what-is-ethereum-used-for", intl),
     },
     {
       id: "strengthen-the-ethereum-network",
-      title: t("toc-strengthen-the-ethereum-network"),
+      title: translateMessageId("toc-strengthen-the-ethereum-network", intl),
     },
     {
       id: "learn-about-the-ethereum-protocol",
-      title: t("toc-learn-about-the-ethereum-protocol"),
+      title: translateMessageId("toc-learn-about-the-ethereum-protocol", intl),
     },
     {
       id: "learn-about-the-ethereum-community",
-      title: t("toc-learn-about-the-ethereum-community"),
+      title: translateMessageId("toc-learn-about-the-ethereum-community", intl),
     },
     {
       id: "books-and-podcasts",
-      title: t("toc-books-and-podcasts"),
+      title: translateMessageId("toc-books-and-podcasts", intl),
     },
   ]
 
   const heroContent = {
-    title: t("hero-title"),
-    header: t("hero-header"),
-    subtitle: t("hero-subtitle"),
+    title: translateMessageId("hero-title", intl),
+    header: translateMessageId("hero-header", intl),
+    subtitle: translateMessageId("hero-subtitle", intl),
     image: getImage(data.heroImage)!,
     alt: "",
     buttons: [
       {
-        content: t("hero-button-lets-get-started"),
+        content: translateMessageId("hero-button-lets-get-started", intl),
         toId: tocItems[0].id,
       },
     ],
@@ -241,7 +240,10 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
 
   return (
     <Container>
-      <PageMetadata title={t("hero-title")} description={""} />
+      <PageMetadata
+        title={translateMessageId("hero-title", intl)}
+        description={""}
+      />
 
       <HeroBackground>
         <HeroContainer>
@@ -271,14 +273,20 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={t("what-is-ethereum-card-title")}
-                description={t("what-is-ethereum-card-description")}
+                title={translateMessageId("what-is-ethereum-card-title", intl)}
+                description={translateMessageId(
+                  "what-is-ethereum-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
                     <GatsbyImage
                       image={getImage(data.whatIsEth)!}
-                      alt={t("what-is-ethereum-card-image-alt")}
+                      alt={translateMessageId(
+                        "what-is-ethereum-card-image-alt",
+                        intl
+                      )}
                     />
                   </CardImage>
                   <ButtonLink to="/what-is-ethereum/">
@@ -287,8 +295,11 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("what-is-eth-card-title")}
-                description={t("what-is-eth-description")}
+                title={translateMessageId("what-is-eth-card-title", intl)}
+                description={translateMessageId(
+                  "what-is-eth-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -300,8 +311,14 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("where-can-i-get-eth-card-title")}
-                description={t("where-can-i-get-eth-card-description")}
+                title={translateMessageId(
+                  "where-can-i-get-eth-card-title",
+                  intl
+                )}
+                description={translateMessageId(
+                  "where-can-i-get-eth-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -343,14 +360,20 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={t("what-is-a-wallet-card-title")}
-                description={t("what-is-a-wallet-card-description")}
+                title={translateMessageId("what-is-a-wallet-card-title", intl)}
+                description={translateMessageId(
+                  "what-is-a-wallet-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
                     <GatsbyImage
                       image={getImage(data.wallet)!}
-                      alt={t("what-is-a-wallet-card-alt")}
+                      alt={translateMessageId(
+                        "what-is-a-wallet-card-alt",
+                        intl
+                      )}
                     />
                   </CardImage>
                   <ButtonLink to="/wallets/">
@@ -359,8 +382,11 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("find-a-wallet-card-title")}
-                description={t("find-a-wallet-card-description")}
+                title={translateMessageId("find-a-wallet-card-title", intl)}
+                description={translateMessageId(
+                  "find-a-wallet-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -375,8 +401,14 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("crypto-security-basics-card-title")}
-                description={t("crypto-security-basics-card-description")}
+                title={translateMessageId(
+                  "crypto-security-basics-card-title",
+                  intl
+                )}
+                description={translateMessageId(
+                  "crypto-security-basics-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -432,8 +464,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={t("defi-card-title")}
-                description={t("defi-card-description")}
+                title={translateMessageId("defi-card-title", intl)}
+                description={translateMessageId("defi-card-description", intl)}
               >
                 <>
                   <CardImage>
@@ -448,8 +480,11 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("stablecoins-card-title")}
-                description={t("stablecoins-card-description")}
+                title={translateMessageId("stablecoins-card-title", intl)}
+                description={translateMessageId(
+                  "stablecoins-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -461,8 +496,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("nft-card-title")}
-                description={t("nft-card-description")}
+                title={translateMessageId("nft-card-title", intl)}
+                description={translateMessageId("nft-card-description", intl)}
               >
                 <>
                   <CardImage>
@@ -477,8 +512,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("dao-card-title")}
-                description={t("dao-card-description")}
+                title={translateMessageId("dao-card-title", intl)}
+                description={translateMessageId("dao-card-description", intl)}
               >
                 <>
                   <CardImage>
@@ -490,8 +525,8 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("dapp-card-title")}
-                description={t("dapp-card-description")}
+                title={translateMessageId("dapp-card-title", intl)}
+                description={translateMessageId("dapp-card-description", intl)}
               >
                 <>
                   <CardImage>
@@ -506,8 +541,11 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <CardGradient
-                title={t("emerging-use-cases-title")}
-                description={t("emerging-use-cases-description")}
+                title={translateMessageId("emerging-use-cases-title", intl)}
+                description={translateMessageId(
+                  "emerging-use-cases-description",
+                  intl
+                )}
               >
                 <ul>
                   <li>
@@ -564,8 +602,11 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={t("staking-ethereum-card-title")}
-                description={t("staking-ethereum-card-description")}
+                title={translateMessageId("staking-ethereum-card-title", intl)}
+                description={translateMessageId(
+                  "staking-ethereum-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -577,8 +618,11 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("run-a-node-card-title")}
-                description={t("run-a-node-card-description")}
+                title={translateMessageId("run-a-node-card-title", intl)}
+                description={translateMessageId(
+                  "run-a-node-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -602,8 +646,14 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={t("energy-consumption-card-title")}
-                description={t("energy-consumption-card-description")}
+                title={translateMessageId(
+                  "energy-consumption-card-title",
+                  intl
+                )}
+                description={translateMessageId(
+                  "energy-consumption-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -615,8 +665,11 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("ethereum-upgrades-card-title")}
-                description={t("ethereum-upgrades-card-description")}
+                title={translateMessageId("ethereum-upgrades-card-title", intl)}
+                description={translateMessageId(
+                  "ethereum-upgrades-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -628,8 +681,14 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("ethereum-whitepaper-card-title")}
-                description={t("ethereum-whitepaper-card-description")}
+                title={translateMessageId(
+                  "ethereum-whitepaper-card-title",
+                  intl
+                )}
+                description={translateMessageId(
+                  "ethereum-whitepaper-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -677,14 +736,17 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
             </p>
             <CardGrid>
               <Card
-                title={t("community-hub-card-title")}
-                description={t("community-hub-card-description")}
+                title={translateMessageId("community-hub-card-title", intl)}
+                description={translateMessageId(
+                  "community-hub-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
                     <GatsbyImage
                       image={getImage(data.enterprise)!}
-                      alt={t("community-hub-card-alt")}
+                      alt={translateMessageId("community-hub-card-alt", intl)}
                     />
                   </CardImage>
                   <ButtonLink to="/community/">
@@ -693,8 +755,11 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("get-involved-card-title")}
-                description={t("get-involved-card-description")}
+                title={translateMessageId("get-involved-card-title", intl)}
+                description={translateMessageId(
+                  "get-involved-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -706,8 +771,14 @@ const LearnPage = ({ data }: PageProps<Queries.LearnPageQuery, Context>) => {
                 </>
               </Card>
               <Card
-                title={t("online-communities-card-title")}
-                description={t("online-communities-card-description")}
+                title={translateMessageId(
+                  "online-communities-card-title",
+                  intl
+                )}
+                description={translateMessageId(
+                  "online-communities-card-description",
+                  intl
+                )}
               >
                 <>
                   <CardImage>
@@ -871,16 +942,7 @@ export const cardImageFragment = graphql`
 `
 
 export const query = graphql`
-  query LearnPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query LearnPage {
     heroImage: file(relativePath: { eq: "eth.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/run-a-node.tsx b/src/pages/run-a-node.tsx
index 8b2318bee13..232edd5dfd2 100644
--- a/src/pages/run-a-node.tsx
+++ b/src/pages/run-a-node.tsx
@@ -2,7 +2,7 @@
 import React, { ComponentType, SVGProps } from "react"
 import { graphql, PageProps } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 
 // Assets
@@ -40,7 +40,7 @@ import Icon from "../components/Icon"
 import NakedButton from "../components/NakedButton"
 
 // Utils
-import { TranslationKey } from "../utils/translations"
+import { translateMessageId, TranslationKey } from "../utils/translations"
 import { scrollIntoView } from "../utils/scrollIntoView"
 import { getImage } from "../utils/image"
 
@@ -404,13 +404,13 @@ interface RunANodeCard {
 }
 
 const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const heroContent = {
     title: <Translation id="page-run-a-node-title" />,
     header: <Translation id="page-run-a-node-hero-header" />,
     subtitle: <Translation id="page-run-a-node-hero-subtitle" />,
     image: getImage(data.ethereumInside)!,
-    alt: t("page-run-a-node-hero-alt"),
+    alt: translateMessageId("page-run-a-node-hero-alt", intl),
     buttons: [
       {
         content: <Translation id="page-run-a-node-hero-cta-1" />,
@@ -485,8 +485,11 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
   return (
     <GappedPage>
       <PageMetadata
-        title={t("page-run-a-node-title")}
-        description={t("page-run-a-node-meta-description")}
+        title={translateMessageId("page-run-a-node-title", intl)}
+        description={translateMessageId(
+          "page-run-a-node-meta-description",
+          intl
+        )}
       />
       <HeroContainer>
         <Hero content={heroContent} isReverse />
@@ -558,10 +561,10 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
             return (
               <ExpandableCard
                 contentPreview={<Translation id={preview} />}
-                title={t(title)}
+                title={translateMessageId(title, intl)}
                 // TODO: make a11y svgs (using <title>)
                 // @ts-ignore
-                alt={t(alt)}
+                alt={translateMessageId(alt, intl)}
                 svg={image}
                 key={idx}
               >
@@ -600,7 +603,10 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
               <Terminal
                 // TODO: make a11y svgs (using <title>)
                 // @ts-ignore
-                alt={t("page-run-a-node-glyph-alt-terminal")}
+                alt={translateMessageId(
+                  "page-run-a-node-glyph-alt-terminal",
+                  intl
+                )}
               />
             </ColumnNarrow>
           </SoftwareHighlight>
@@ -615,7 +621,10 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
               <Dappnode
                 // TODO: make a11y svgs (using <title>)
                 // @ts-ignore
-                alt={t("page-run-a-node-glyph-alt-dappnode")}
+                alt={translateMessageId(
+                  "page-run-a-node-glyph-alt-dappnode",
+                  intl
+                )}
               />
             </ColumnNarrow>
           </SoftwareHighlight>
@@ -633,7 +642,10 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
               <Dapptap
                 // TODO: make a11y svgs (using <title>)
                 // @ts-ignore
-                alt={t("page-run-a-node-glyph-alt-phone")}
+                alt={translateMessageId(
+                  "page-run-a-node-glyph-alt-phone",
+                  intl
+                )}
               />
             </ColumnNarrow>
           </SoftwareHighlight>
@@ -724,7 +736,10 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
             <HardwareGlyph
               // TODO: make a11y svgs (using <title>)
               // @ts-ignore
-              alt={t("page-run-a-node-glyph-alt-hardware")}
+              alt={translateMessageId(
+                "page-run-a-node-glyph-alt-hardware",
+                intl
+              )}
             />
             <h3>
               <Translation id="page-run-a-node-build-your-own-hardware-title" />
@@ -808,7 +823,10 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
             <DownloadGlyph
               // TODO: make a11y svgs (using <title>)
               // @ts-ignore
-              alt={t("page-run-a-node-glyph-alt-software")}
+              alt={translateMessageId(
+                "page-run-a-node-glyph-alt-software",
+                intl
+              )}
             />
             <h3>
               <Translation id="page-run-a-node-build-your-own-software" />
@@ -1000,16 +1018,7 @@ const RunANodePage = ({ data }: PageProps<Queries.RunANodePageQuery>) => {
 export default RunANodePage
 
 export const query = graphql`
-  query RunANodePage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query RunANodePage {
     ethereumInside: file(
       relativePath: { eq: "run-a-node/ethereum-inside.png" }
     ) {
diff --git a/src/pages/stablecoins.tsx b/src/pages/stablecoins.tsx
index b2596053117..bec854dc489 100644
--- a/src/pages/stablecoins.tsx
+++ b/src/pages/stablecoins.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState, useMemo } from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import ButtonLink from "../components/ButtonLink"
 import CalloutBanner from "../components/CalloutBanner"
@@ -31,6 +31,7 @@ import Tooltip from "../components/Tooltip"
 import Translation from "../components/Translation"
 
 import { getData } from "../utils/cache"
+import { translateMessageId } from "../utils/translations"
 import { getImage } from "../utils/image"
 
 const StyledContent = styled(Content)`
@@ -310,15 +311,22 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
     markets: [],
     marketsHasError: false,
   })
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   // Stablecoin types
-  const FIAT = t("page-stablecoins-stablecoins-table-type-fiat-backed")
-  const CRYPTO = t("page-stablecoins-stablecoins-table-type-crypto-backed")
-  const ASSET = t(
-    "page-stablecoins-stablecoins-table-type-precious-metals-backed"
+  const FIAT = translateMessageId(
+    "page-stablecoins-stablecoins-table-type-fiat-backed",
+    intl
   )
-  const ALGORITHMIC = t("page-stablecoins-algorithmic")
+  const CRYPTO = translateMessageId(
+    "page-stablecoins-stablecoins-table-type-crypto-backed",
+    intl
+  )
+  const ASSET = translateMessageId(
+    "page-stablecoins-stablecoins-table-type-precious-metals-backed",
+    intl
+  )
+  const ALGORITHMIC = translateMessageId("page-stablecoins-algorithmic", intl)
 
   const stablecoins = useMemo(
     () => ({
@@ -403,16 +411,19 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
 
   const features = [
     {
-      title: t("page-stablecoins-fiat-backed"),
-      description: t("page-stablecoins-fiat-backed-description"),
+      title: translateMessageId("page-stablecoins-fiat-backed", intl),
+      description: translateMessageId(
+        "page-stablecoins-fiat-backed-description",
+        intl
+      ),
       emoji: ":dollar:",
       pros: [
-        t("page-stablecoins-fiat-backed-pro-1"),
-        t("page-stablecoins-fiat-backed-pro-2"),
+        translateMessageId("page-stablecoins-fiat-backed-pro-1", intl),
+        translateMessageId("page-stablecoins-fiat-backed-pro-2", intl),
       ],
       cons: [
-        t("page-stablecoins-fiat-backed-con-1"),
-        t("page-stablecoins-fiat-backed-con-2"),
+        translateMessageId("page-stablecoins-fiat-backed-con-1", intl),
+        translateMessageId("page-stablecoins-fiat-backed-con-2", intl),
       ],
       links: [
         { text: "USDC", url: "https://www.coinbase.com/usdc" },
@@ -420,42 +431,53 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
       ],
     },
     {
-      title: t("page-stablecoins-crypto-backed"),
-      description: t("page-stablecoins-crypto-backed-description"),
+      title: translateMessageId("page-stablecoins-crypto-backed", intl),
+      description: translateMessageId(
+        "page-stablecoins-crypto-backed-description",
+        intl
+      ),
       emoji: ":unicorn:",
       pros: [
-        t("page-stablecoins-crypto-backed-pro-1"),
-        t("page-stablecoins-crypto-backed-pro-2"),
-        t("page-stablecoins-crypto-backed-pro-3"),
+        translateMessageId("page-stablecoins-crypto-backed-pro-1", intl),
+        translateMessageId("page-stablecoins-crypto-backed-pro-2", intl),
+        translateMessageId("page-stablecoins-crypto-backed-pro-3", intl),
       ],
       cons: [
-        t("page-stablecoins-crypto-backed-con-1"),
-        t("page-stablecoins-crypto-backed-con-2"),
+        translateMessageId("page-stablecoins-crypto-backed-con-1", intl),
+        translateMessageId("page-stablecoins-crypto-backed-con-2", intl),
       ],
       links: [{ text: "Dai", url: "https://makerdao.com/en/" }],
     },
     {
-      title: t("page-stablecoins-precious-metals"),
-      description: t("page-stablecoins-precious-metals-description"),
+      title: translateMessageId("page-stablecoins-precious-metals", intl),
+      description: translateMessageId(
+        "page-stablecoins-precious-metals-description",
+        intl
+      ),
       emoji: ":gem_stone:",
-      pros: [t("page-stablecoins-precious-metals-pro-1")],
+      pros: [
+        translateMessageId("page-stablecoins-precious-metals-pro-1", intl),
+      ],
       cons: [
-        t("page-stablecoins-precious-metals-con-1"),
-        t("page-stablecoins-precious-metals-con-2"),
+        translateMessageId("page-stablecoins-precious-metals-con-1", intl),
+        translateMessageId("page-stablecoins-precious-metals-con-2", intl),
       ],
       links: [{ text: "Pax Gold", url: "https://paxos.com/paxgold/" }],
     },
     {
-      title: t("page-stablecoins-algorithmic"),
-      description: t("page-stablecoins-algorithmic-description"),
+      title: translateMessageId("page-stablecoins-algorithmic", intl),
+      description: translateMessageId(
+        "page-stablecoins-algorithmic-description",
+        intl
+      ),
       emoji: ":chart_with_downwards_trend:",
       pros: [
-        t("page-stablecoins-algorithmic-pro-1"),
-        t("page-stablecoins-algorithmic-pro-2"),
+        translateMessageId("page-stablecoins-algorithmic-pro-1", intl),
+        translateMessageId("page-stablecoins-algorithmic-pro-2", intl),
       ],
       cons: [
-        t("page-stablecoins-algorithmic-con-1"),
-        t("page-stablecoins-algorithmic-con-2"),
+        translateMessageId("page-stablecoins-algorithmic-con-1", intl),
+        translateMessageId("page-stablecoins-algorithmic-con-2", intl),
       ],
       links: [{ text: "Ampleforth", url: "https://www.ampleforth.org/" }],
     },
@@ -464,19 +486,31 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
   const tokens = [
     {
       emoji: ":globe_showing_americas:",
-      description: t("page-stablecoins-stablecoins-feature-1"),
+      description: translateMessageId(
+        "page-stablecoins-stablecoins-feature-1",
+        intl
+      ),
     },
     {
       emoji: ":chart_with_upwards_trend:",
-      description: t("page-stablecoins-stablecoins-feature-2"),
+      description: translateMessageId(
+        "page-stablecoins-stablecoins-feature-2",
+        intl
+      ),
     },
     {
       emoji: ":handshake:",
-      description: t("page-stablecoins-stablecoins-feature-3"),
+      description: translateMessageId(
+        "page-stablecoins-stablecoins-feature-3",
+        intl
+      ),
     },
     {
       emoji: ":key:",
-      description: t("page-stablecoins-stablecoins-feature-4"),
+      description: translateMessageId(
+        "page-stablecoins-stablecoins-feature-4",
+        intl
+      ),
     },
   ]
 
@@ -484,48 +518,69 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
     {
       background: "linear-gradient(225deg, #aa589b 0%, #5cb8c4 100%)",
       url: "https://aave.com",
-      alt: t("aave-logo"),
+      alt: translateMessageId("aave-logo", intl),
       image: getImage(data.aave),
       name: "Aave",
-      description: t("page-stablecoins-stablecoins-dapp-description-1"),
+      description: translateMessageId(
+        "page-stablecoins-stablecoins-dapp-description-1",
+        intl
+      ),
     },
     {
       background: "#f9fafb",
       url: "https://compound.finance",
-      alt: t("compound-logo"),
+      alt: translateMessageId("compound-logo", intl),
       image: getImage(data.compound),
       name: "Compound",
-      description: t("page-stablecoins-stablecoins-dapp-description-2"),
+      description: translateMessageId(
+        "page-stablecoins-stablecoins-dapp-description-2",
+        intl
+      ),
     },
     {
       background: "linear-gradient(135deg, #c7efe6 0%, #eeeac7 100%)",
       url: "https://oasis.app",
-      alt: t("oasis-logo"),
+      alt: translateMessageId("oasis-logo", intl),
       image: getImage(data.oasis),
       name: "Oasis",
-      description: t("page-stablecoins-stablecoins-dapp-description-4"),
+      description: translateMessageId(
+        "page-stablecoins-stablecoins-dapp-description-4",
+        intl
+      ),
     },
   ]
 
   const tableColumns = [
-    t("page-stablecoins-stablecoins-table-header-column-1"),
-    t("page-stablecoins-stablecoins-table-header-column-2"),
-    t("page-stablecoins-stablecoins-table-header-column-3"),
+    translateMessageId(
+      "page-stablecoins-stablecoins-table-header-column-1",
+      intl
+    ),
+    translateMessageId(
+      "page-stablecoins-stablecoins-table-header-column-2",
+      intl
+    ),
+    translateMessageId(
+      "page-stablecoins-stablecoins-table-header-column-3",
+      intl
+    ),
   ]
 
   const heroContent = {
-    title: t("page-stablecoins-title"),
-    header: t("page-stablecoins-hero-header"),
-    subtitle: t("page-stablecoins-hero-subtitle"),
+    title: translateMessageId("page-stablecoins-title", intl),
+    header: translateMessageId("page-stablecoins-hero-header", intl),
+    subtitle: translateMessageId("page-stablecoins-hero-subtitle", intl),
     image: getImage(data.stablecoins)!,
-    alt: t("page-stablecoins-hero-alt"),
+    alt: translateMessageId("page-stablecoins-hero-alt", intl),
     buttons: [
       {
-        content: t("page-stablecoins-hero-button"),
+        content: translateMessageId("page-stablecoins-hero-button", intl),
         toId: "explore",
       },
       {
-        content: t("page-stablecoins-how-they-work-button"),
+        content: translateMessageId(
+          "page-stablecoins-how-they-work-button",
+          intl
+        ),
         toId: "how",
         variant: "outline",
       },
@@ -535,7 +590,10 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
   const toolsData = [
     {
       title: "Stablecoins.wtf",
-      description: t("page-stablecoins-tools-stablecoinswtf-description"),
+      description: translateMessageId(
+        "page-stablecoins-tools-stablecoinswtf-description",
+        intl
+      ),
       link: "https://stablecoins.wtf",
       image: getImage(data.stablecoinswtf),
       alt: "Stablecoins.wtf",
@@ -545,8 +603,11 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
   return (
     <Page>
       <PageMetadata
-        title={t("page-stablecoins-title")}
-        description={t("page-stablecoins-meta-description")}
+        title={translateMessageId("page-stablecoins-title", intl)}
+        description={translateMessageId(
+          "page-stablecoins-meta-description",
+          intl
+        )}
       />
       <PageHero isReverse content={heroContent} />
       {/* <HeroSectionContent>
@@ -663,7 +724,7 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
               </StyledLeftColumn>
               <Image
                 image={getImage(data.dailarge)!}
-                alt={t("page-stablecoins-dai-logo")}
+                alt={translateMessageId("page-stablecoins-dai-logo", intl)}
               />
             </StyledDaiBanner>
             <USDCBanner>
@@ -698,7 +759,7 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
               </StyledLeftColumn>
               <Image
                 image={getImage(data.usdclarge)!}
-                alt={t("page-stablecoins-usdc-logo")}
+                alt={translateMessageId("page-stablecoins-usdc-logo", intl)}
               />
             </USDCBanner>
           </Row>
@@ -738,7 +799,10 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
           }
           image={getImage(data.doge)!}
           maxImageWidth={600}
-          alt={t("page-stablecoins-stablecoins-dapp-callout-image-alt")}
+          alt={translateMessageId(
+            "page-stablecoins-stablecoins-dapp-callout-image-alt",
+            intl
+          )}
         >
           <ButtonLinkContainer>
             <ButtonLink to="/dapps/">
@@ -829,16 +893,7 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
 export default StablecoinsPage
 
 export const query = graphql`
-  query StablecoinsPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query StablecoinsPage {
     stablecoins: file(relativePath: { eq: "stablecoins/hero.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/staking/deposit-contract.tsx b/src/pages/staking/deposit-contract.tsx
index 5bd9f6916b0..922ad571c8d 100644
--- a/src/pages/staking/deposit-contract.tsx
+++ b/src/pages/staking/deposit-contract.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
 import makeBlockie from "ethereum-blockies-base64"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Breadcrumbs from "../../components/Breadcrumbs"
 import ButtonLink from "../../components/ButtonLink"
@@ -21,7 +21,7 @@ import {
   FakeLink,
 } from "../../components/SharedStyledComponents"
 import { DEPOSIT_CONTRACT_ADDRESS } from "../../data/addresses"
-import { TranslationKey } from "../../utils/translations"
+import { translateMessageId, TranslationKey } from "../../utils/translations"
 import type { Context } from "../../types"
 import FeedbackCard from "../../components/FeedbackCard"
 import { getImage } from "../../utils/image"
@@ -192,7 +192,7 @@ const DepositContractPage = ({
   data,
   location,
 }: PageProps<Queries.DepositContractPageQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const [state, setState] = useState<{
     browserHasTextToSpeechSupport: boolean
@@ -302,8 +302,8 @@ const DepositContractPage = ({
     state.userWillCheckOtherSources
 
   const textToSpeechText = state.isSpeechActive
-    ? t("page-staking-deposit-contract-stop-reading")
-    : t("page-staking-deposit-contract-read-aloud")
+    ? translateMessageId("page-staking-deposit-contract-stop-reading", intl)
+    : translateMessageId("page-staking-deposit-contract-read-aloud", intl)
   const textToSpeechEmoji = state.isSpeechActive
     ? ":speaker_high_volume:"
     : ":speaker:"
@@ -311,8 +311,14 @@ const DepositContractPage = ({
     <Page>
       <Flex>
         <PageMetadata
-          title={t("page-staking-deposit-contract-meta-title")}
-          description={t("page-staking-deposit-contract-meta-desc")}
+          title={translateMessageId(
+            "page-staking-deposit-contract-meta-title",
+            intl
+          )}
+          description={translateMessageId(
+            "page-staking-deposit-contract-meta-desc",
+            intl
+          )}
         />
         <LeftColumn>
           <Breadcrumbs slug={location.pathname} startDepth={1} />
@@ -439,7 +445,12 @@ const DepositContractPage = ({
                       <Emoji text={textToSpeechEmoji} size={1} />
                     </TextToSpeech>
                   )}
-                  <Tooltip content={t("page-staking-deposit-contract-warning")}>
+                  <Tooltip
+                    content={translateMessageId(
+                      "page-staking-deposit-contract-warning",
+                      intl
+                    )}
+                  >
                     <Address>{CHUNKED_ADDRESS}</Address>
                   </Tooltip>
                   <ButtonRow>
@@ -501,16 +512,7 @@ export const sourceImage = graphql`
 `
 
 export const query = graphql`
-  query DepositContractPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query DepositContractPage {
     consensys: file(relativePath: { eq: "projects/consensys.png" }) {
       ...sourceImage
     }
diff --git a/src/pages/staking/index.tsx b/src/pages/staking/index.tsx
index 979228251fe..40c09ca7769 100644
--- a/src/pages/staking/index.tsx
+++ b/src/pages/staking/index.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 
 import ButtonDropdown, {
@@ -24,7 +24,7 @@ import StakingHierarchy from "../../components/Staking/StakingHierarchy"
 import StakingHomeTableOfContents from "../../components/Staking/StakingHomeTableOfContents"
 import StakingCommunityCallout from "../../components/Staking/StakingCommunityCallout"
 
-import { TranslationKey } from "../../utils/translations"
+import { translateMessageId, TranslationKey } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 import type { Context } from "../../types"
 
@@ -249,14 +249,14 @@ const benefits: Array<BenefitsType> = [
 const StakingPage = ({
   data,
 }: PageProps<Queries.StakingPageIndexQuery, Context>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const heroContent = {
-    title: t("page-staking-hero-title"),
-    header: t("page-staking-hero-header"),
-    subtitle: t("page-staking-hero-subtitle"),
+    title: translateMessageId("page-staking-hero-title", intl),
+    header: translateMessageId("page-staking-hero-header", intl),
+    subtitle: translateMessageId("page-staking-hero-subtitle", intl),
     image: getImage(data.rhino)!,
-    alt: t("page-staking-image-alt"),
+    alt: translateMessageId("page-staking-image-alt", intl),
     buttons: [],
   }
 
@@ -303,35 +303,35 @@ const StakingPage = ({
     ],
   }
 
-  // TODO: use t() for these strings
+  // TODO: use translateMessageId() for these strings
   const tocItems = {
     whatIsStaking: {
       id: "what-is-staking",
-      title: t("page-staking-section-what-title"),
+      title: translateMessageId("page-staking-section-what-title", intl),
     },
     whyStakeYourEth: {
       id: "why-stake-your-eth",
-      title: t("page-staking-section-why-title"),
+      title: translateMessageId("page-staking-section-why-title", intl),
     },
     howToStakeYourEth: {
       id: "how-to-stake-your-eth",
-      title: t("page-staking-toc-how-to-stake-your-eth"),
+      title: translateMessageId("page-staking-toc-how-to-stake-your-eth", intl),
     },
     comparisonOfOptions: {
       id: "comparison-of-options",
-      title: t("page-staking-toc-comparison-of-options"),
+      title: translateMessageId("page-staking-toc-comparison-of-options", intl),
     },
     joinTheCommunity: {
       id: "join-the-community",
-      title: t("page-staking-join-community"),
+      title: translateMessageId("page-staking-join-community", intl),
     },
     faq: {
       id: "faq",
-      title: t("page-staking-toc-faq"),
+      title: translateMessageId("page-staking-toc-faq", intl),
     },
     further: {
       id: "further",
-      title: t("page-staking-toc-further"),
+      title: translateMessageId("page-staking-toc-further", intl),
     },
   }
 
@@ -340,8 +340,8 @@ const StakingPage = ({
   return (
     <PageContainer>
       <PageMetadata
-        title={t("page-staking-meta-title")}
-        description={t("page-staking-meta-description")}
+        title={translateMessageId("page-staking-meta-title", intl)}
+        description={translateMessageId("page-staking-meta-description", intl)}
       />
       <HeroStatsWrapper>
         <PageHero content={heroContent} />
@@ -377,12 +377,14 @@ const StakingPage = ({
               {benefits.map(
                 ({ title, description, emoji, linkText, to }, idx) => (
                   <StyledCard
-                    title={t(title)}
+                    title={translateMessageId(title, intl)}
                     emoji={emoji}
                     key={idx}
-                    description={t(description)}
+                    description={translateMessageId(description, intl)}
                   >
-                    {to && linkText && <Link to={to}>{t(linkText)}</Link>}
+                    {to && linkText && (
+                      <Link to={to}>{translateMessageId(linkText, intl)}</Link>
+                    )}
                   </StyledCard>
                 )
               )}
@@ -607,7 +609,9 @@ const StakingPage = ({
           <StakingCommunityCallout id={tocItems.joinTheCommunity.id} />
           <Content>
             <h2 id={tocItems.faq.id}>{tocItems.faq.title}</h2>
-            <ExpandableCard title={t("page-staking-faq-4-question")}>
+            <ExpandableCard
+              title={translateMessageId("page-staking-faq-4-question", intl)}
+            >
               <p>
                 <Translation id="page-staking-faq-4-answer-p1" />
               </p>
@@ -618,13 +622,19 @@ const StakingPage = ({
                 <Translation id="page-upgrades-merge-btn" />
               </ButtonLink>
             </ExpandableCard>
-            <ExpandableCard title={t("page-staking-faq-1-question")}>
+            <ExpandableCard
+              title={translateMessageId("page-staking-faq-1-question", intl)}
+            >
               <Translation id="page-staking-faq-1-answer" />
             </ExpandableCard>
-            <ExpandableCard title={t("page-staking-faq-2-question")}>
+            <ExpandableCard
+              title={translateMessageId("page-staking-faq-2-question", intl)}
+            >
               <Translation id="page-staking-faq-2-answer" />
             </ExpandableCard>
-            <ExpandableCard title={t("page-staking-faq-3-question")}>
+            <ExpandableCard
+              title={translateMessageId("page-staking-faq-3-question", intl)}
+            >
               <p>
                 <Translation id="page-staking-faq-3-answer-p1" />
               </p>
@@ -718,16 +728,7 @@ const StakingPage = ({
 export default StakingPage
 
 export const query = graphql`
-  query StakingPageIndex($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query StakingPageIndex {
     rhino: file(relativePath: { eq: "upgrades/upgrade_rhino.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/upgrades/get-involved/index.tsx b/src/pages/upgrades/get-involved/index.tsx
index c55cbe9a84a..5d13b100940 100644
--- a/src/pages/upgrades/get-involved/index.tsx
+++ b/src/pages/upgrades/get-involved/index.tsx
@@ -2,9 +2,9 @@ import React, { useState, useEffect, ReactNode } from "react"
 import { useTheme } from "@emotion/react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { shuffle } from "lodash"
-import { TranslationKey } from "../../../utils/translations"
+import { translateMessageId, TranslationKey } from "../../../utils/translations"
 import Card from "../../../components/Card"
 import Leaderboard, { Person } from "../../../components/Leaderboard"
 import CalloutBanner from "../../../components/CalloutBanner"
@@ -185,7 +185,7 @@ const GetInvolvedPage = ({
   data,
   location,
 }: PageProps<Queries.GetInvolvedPageQuery>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const theme = useTheme()
   const isDarkTheme = theme.isDark
 
@@ -376,7 +376,7 @@ const GetInvolvedPage = ({
             image={getImage(client.image(isDarkTheme))!}
             name={client.name}
             description={client.description}
-            alt={t(client.alt)}
+            alt={translateMessageId(client.alt, intl)}
             githubUrl={client.githubUrl}
             hideStars={true}
           >
@@ -390,8 +390,11 @@ const GetInvolvedPage = ({
   return (
     <Page>
       <PageMetadata
-        title={t("page-upgrades-get-involved")}
-        description={t("page-upgrades-get-involved-meta-description")}
+        title={translateMessageId("page-upgrades-get-involved", intl)}
+        description={translateMessageId(
+          "page-upgrades-get-involved-meta-description",
+          intl
+        )}
       />
       <Content>
         <HeroCard>
@@ -454,7 +457,7 @@ const GetInvolvedPage = ({
       <Staking>
         <StyledCalloutBanner
           image={getImage(data.rhino)!}
-          alt={t("page-staking-image-alt")}
+          alt={translateMessageId("page-staking-image-alt", intl)}
           titleKey={"page-upgrades-get-involved-stake"}
           descriptionKey={"page-upgrades-get-involved-stake-desc"}
         >
@@ -538,16 +541,7 @@ export const Clients = graphql`
 `
 
 export const query = graphql`
-  query GetInvolvedPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query GetInvolvedPage {
     bountyHunters: allConsensusBountyHuntersCsv(
       sort: { order: DESC, fields: score }
     ) {
diff --git a/src/pages/upgrades/index.tsx b/src/pages/upgrades/index.tsx
index 1413bf65038..a47f8102b91 100644
--- a/src/pages/upgrades/index.tsx
+++ b/src/pages/upgrades/index.tsx
@@ -2,7 +2,7 @@ import React from "react"
 import styled from "@emotion/styled"
 import { GatsbyImage } from "gatsby-plugin-image"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import ButtonLink from "../../components/ButtonLink"
 import Card from "../../components/Card"
@@ -27,6 +27,7 @@ import {
 } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 
+import { translateMessageId } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 const Row = styled.div`
@@ -225,21 +226,21 @@ const paths = [
 ]
 
 const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const heroContent: IPageHeroContent = {
-    title: t("page-upgrades-upgrades"),
-    header: t("page-upgrades-upgrading"),
-    subtitle: t("page-upgrades-upgrade-desc"),
+    title: translateMessageId("page-upgrades-upgrades", intl),
+    header: translateMessageId("page-upgrades-upgrading", intl),
+    subtitle: translateMessageId("page-upgrades-upgrade-desc", intl),
     image: getImage(data.merge)!,
-    alt: t("page-dapps-doge-img-alt"),
+    alt: translateMessageId("page-dapps-doge-img-alt", intl),
     buttons: [
       {
-        content: t("page-upgrades-explore-btn"),
+        content: translateMessageId("page-upgrades-explore-btn", intl),
         to: "/upgrades/beacon-chain/",
       },
       {
-        content: t("page-upgrades-whats-ethereum"),
+        content: translateMessageId("page-upgrades-whats-ethereum", intl),
         to: "/what-is-ethereum/",
         variant: "outline",
       },
@@ -273,8 +274,8 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
   return (
     <Page>
       <PageMetadata
-        title={t("page-upgrades-meta-title")}
-        description={t("page-upgrades-meta-desc")}
+        title={translateMessageId("page-upgrades-meta-title", intl)}
+        description={translateMessageId("page-upgrades-meta-desc", intl)}
       />
       <PageHero content={heroContent} />
       <Divider />
@@ -321,7 +322,7 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
       </Content>
       <StyledCallout
         image={getImage(data.oldship)!}
-        alt={t("page-eth-whats-eth-hero-alt")}
+        alt={translateMessageId("page-eth-whats-eth-hero-alt", intl)}
         titleKey={"page-upgrades-dive"}
         descriptionKey={"page-upgrades-dive-desc"}
       >
@@ -465,8 +466,14 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
           <StakingRightColumn>
             <StakingCard
               emoji=":money_with_wings:"
-              title={t("page-upgrades-index-staking-learn")}
-              description={t("page-upgrades-index-staking-learn-desc")}
+              title={translateMessageId(
+                "page-upgrades-index-staking-learn",
+                intl
+              )}
+              description={translateMessageId(
+                "page-upgrades-index-staking-learn-desc",
+                intl
+              )}
             >
               <ButtonLink to="/staking/">
                 <Translation id="page-staking-deposit-contract-staking-more-link" />
@@ -484,8 +491,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
         <Faq>
           <LeftColumn>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-1-desc")}
-              title={t("page-upgrades-question-1-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-1-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-1-title", intl)}
             >
               <Link to="/upgrades/beacon-chain/">
                 <Translation id="page-upgrades-beacon-chain-title" />
@@ -507,8 +517,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-2-desc")}
-              title={t("page-upgrades-question-2-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-2-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-2-title", intl)}
             >
               <p>
                 <Translation id="page-upgrades-answer-1" />{" "}
@@ -527,8 +540,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-3-desc")}
-              title={t("page-upgrades-question-3-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-3-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-3-title", intl)}
             >
               <p>
                 <Translation id="page-upgrades-question3-answer-1" />{" "}
@@ -568,8 +584,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </ul>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-4-desc")}
-              title={t("page-upgrades-question-4-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-4-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-4-title", intl)}
             >
               <p>
                 <Translation id="page-upgrades-question-4-answer-1" />{" "}
@@ -591,8 +610,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-5-desc")}
-              title={t("page-upgrades-question-5-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-5-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-5-title", intl)}
             >
               <p>
                 <Translation id="page-upgrades-question-5-answer-1" />
@@ -604,8 +626,14 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-11-desc")}
-              title={t("page-upgrades-question-11-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-11-desc",
+                intl
+              )}
+              title={translateMessageId(
+                "page-upgrades-question-11-title",
+                intl
+              )}
             >
               <p>
                 <Translation id="page-upgrades-question-11-answer-1" />
@@ -617,8 +645,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
           </LeftColumn>
           <RightColumn>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-6-desc")}
-              title={t("page-upgrades-question-6-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-6-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-6-title", intl)}
             >
               <p>
                 <Translation id="page-upgrades-question-6-answer-1" />
@@ -658,8 +689,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-7-desc")}
-              title={t("page-upgrades-question-7-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-7-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-7-title", intl)}
             >
               <p>
                 <Translation id="page-upgrades-question-7-teams" />
@@ -703,8 +737,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-8-desc")}
-              title={t("page-upgrades-question-8-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-8-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-8-title", intl)}
             >
               <p>
                 <Translation id="page-upgrades-question-8-answer-1" />
@@ -728,8 +765,11 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-9-desc")}
-              title={t("page-upgrades-question-9-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-9-desc",
+                intl
+              )}
+              title={translateMessageId("page-upgrades-question-9-title", intl)}
             >
               <p>
                 <Translation id="page-upgrades-question-9-answer-1" />{" "}
@@ -762,8 +802,14 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
               </p>
             </ExpandableCard>
             <ExpandableCard
-              contentPreview={t("page-upgrades-question-10-desc")}
-              title={t("page-upgrades-question-10-title")}
+              contentPreview={translateMessageId(
+                "page-upgrades-question-10-desc",
+                intl
+              )}
+              title={translateMessageId(
+                "page-upgrades-question-10-title",
+                intl
+              )}
             >
               <p>
                 <Translation id="page-upgrades-question-10-answer-0" />
@@ -829,16 +875,7 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
 export default Eth2IndexPage
 
 export const query = graphql`
-  query UpgradesPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query UpgradesPage {
     oldship: file(relativePath: { eq: "upgrades/oldship.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/upgrades/vision.tsx b/src/pages/upgrades/vision.tsx
index 45bb6b22483..a6e7c569501 100644
--- a/src/pages/upgrades/vision.tsx
+++ b/src/pages/upgrades/vision.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import styled from "@emotion/styled"
 import { graphql, PageProps } from "gatsby"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Translation from "../../components/Translation"
 import Card from "../../components/Card"
@@ -24,6 +24,7 @@ import {
 } from "../../components/SharedStyledComponents"
 import FeedbackCard from "../../components/FeedbackCard"
 
+import { translateMessageId } from "../../utils/translations"
 import { getImage } from "../../utils/image"
 
 const ProblemCardContainer = styled(CardContainer)`
@@ -93,14 +94,14 @@ const VisionPage = ({
   data,
   location,
 }: PageProps<Queries.UpgradesVisionPageQuery>) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   const heroContent: IPageHeroContent = {
-    title: t("page-upgrades-vision-title"),
-    header: t("page-upgrades-vision-future"),
-    subtitle: t("page-upgrades-vision-subtitle"),
+    title: translateMessageId("page-upgrades-vision-title", intl),
+    header: translateMessageId("page-upgrades-vision-future", intl),
+    subtitle: translateMessageId("page-upgrades-vision-subtitle", intl),
     image: getImage(data.oldship)!,
-    alt: t("page-eth-whats-eth-hero-alt"),
+    alt: translateMessageId("page-eth-whats-eth-hero-alt", intl),
   }
 
   const upgrades = [
@@ -131,8 +132,8 @@ const VisionPage = ({
   return (
     <Page>
       <PageMetadata
-        title={t("page-upgrades-vision-meta-title")}
-        description={t("page-upgrades-vision-meta-desc")}
+        title={translateMessageId("page-upgrades-vision-meta-title", intl)}
+        description={translateMessageId("page-upgrades-vision-meta-desc", intl)}
       />
       <PageHero content={heroContent} />
       <Divider />
@@ -321,16 +322,7 @@ const VisionPage = ({
 export default VisionPage
 
 export const query = graphql`
-  query UpgradesVisionPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query UpgradesVisionPage {
     oldship: file(relativePath: { eq: "upgrades/oldship.png" }) {
       childImageSharp {
         gatsbyImageData(
diff --git a/src/pages/wallets/find-wallet.tsx b/src/pages/wallets/find-wallet.tsx
index dafea060cda..d941a00a8c7 100644
--- a/src/pages/wallets/find-wallet.tsx
+++ b/src/pages/wallets/find-wallet.tsx
@@ -2,7 +2,7 @@
 import React, { useState, useRef } from "react"
 import { graphql } from "gatsby"
 import { GatsbyImage } from "gatsby-plugin-image"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import styled from "@emotion/styled"
 import { shuffle } from "lodash"
 
@@ -24,6 +24,7 @@ import walletData from "../../data/wallets/wallet-data"
 import FilterBurger from "../../assets/wallets/filter_burger.svg"
 
 // Utils
+import { translateMessageId } from "../../utils/translations"
 import { trackCustomEvent } from "../../utils/matomo"
 import { getImage } from "../../utils/image"
 import { useOnClickOutside } from "../../hooks/useOnClickOutside"
@@ -359,7 +360,7 @@ const filterDefault = {
 const randomizedWalletData = shuffle(walletData)
 
 const FindWalletPage = ({ data, location }) => {
-  const { t } = useTranslation()
+  const intl = useIntl()
   const resetWalletFilter = React.useRef(() => {})
   const wrapperRef = useRef<HTMLDivElement>(null)
 
@@ -394,8 +395,11 @@ const FindWalletPage = ({ data, location }) => {
   return (
     <PageStyled showMobileSidebar={showMobileSidebar}>
       <PageMetadata
-        title={t("page-find-wallet-meta-title")}
-        description={t("page-find-wallet-meta-description")}
+        title={translateMessageId("page-find-wallet-meta-title", intl)}
+        description={translateMessageId(
+          "page-find-wallet-meta-description",
+          intl
+        )}
       />
 
       <HeroContainer>
@@ -568,16 +572,7 @@ const FindWalletPage = ({ data, location }) => {
 export default FindWalletPage
 
 export const query = graphql`
-  query FindWalletPage($languagesToFetch: [String!]!) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  {
     hero: file(relativePath: { eq: "wallets/find-wallet-hero.png" }) {
       childImageSharp {
         gatsbyImageData(layout: FULL_WIDTH, placeholder: BLURRED, quality: 100)
diff --git a/src/scripts/mergeTranslations.ts b/src/scripts/mergeTranslations.ts
index e027055ba40..758de264507 100644
--- a/src/scripts/mergeTranslations.ts
+++ b/src/scripts/mergeTranslations.ts
@@ -27,12 +27,8 @@ const mergeTranslations = (): void => {
         mergeObjects(result, obj)
       })
 
-      const dir = `./i18n/locales/${currentTranslation}`
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true })
-      }
+      const outputFilename = `src/intl/${currentTranslation}.json`
 
-      const outputFilename = `${dir}/index.json`
       fs.writeFileSync(
         outputFilename,
         JSON.stringify(result, null, 2).concat("\n")
diff --git a/src/templates/docs.tsx b/src/templates/docs.tsx
index 6dafdedc557..c84e48e8ef7 100644
--- a/src/templates/docs.tsx
+++ b/src/templates/docs.tsx
@@ -245,16 +245,7 @@ const DocsPage = ({
 }
 
 export const query = graphql`
-  query DocsPage($languagesToFetch: [String!]!, $relativePath: String) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query DocsPage($relativePath: String) {
     siteData: site {
       siteMetadata {
         editContentUrl
diff --git a/src/templates/staking.tsx b/src/templates/staking.tsx
index 2beb24ca011..5ca2e2f7a37 100644
--- a/src/templates/staking.tsx
+++ b/src/templates/staking.tsx
@@ -456,16 +456,7 @@ const StakingPage = ({
 }
 
 export const stakingPageQuery = graphql`
-  query StakingPage($languagesToFetch: [String!]!, $relativePath: String) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query StakingPage($relativePath: String) {
     pageData: mdx(fields: { relativePath: { eq: $relativePath } }) {
       fields {
         slug
diff --git a/src/templates/static.tsx b/src/templates/static.tsx
index d8d24e20f2c..9f6d4b02974 100644
--- a/src/templates/static.tsx
+++ b/src/templates/static.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { graphql, PageProps } from "gatsby"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { MDXProvider } from "@mdx-js/react"
 import { MDXRenderer } from "gatsby-plugin-mdx"
 import styled from "@emotion/styled"
@@ -162,7 +162,7 @@ const StaticPage = ({
   data: { siteData, pageData: mdx },
   pageContext: { relativePath },
 }: PageProps<Queries.StaticPageQuery, Context>) => {
-  const { language } = useI18next()
+  const intl = useIntl()
 
   if (!siteData || !mdx?.frontmatter || !mdx.parent)
     throw new Error(
@@ -206,10 +206,10 @@ const StaticPage = ({
         <ContentContainer>
           <Breadcrumbs slug={slug} />
           <LastUpdated
-            dir={isLangRightToLeft(language as Lang) ? "rtl" : "ltr"}
+            dir={isLangRightToLeft(intl.locale as Lang) ? "rtl" : "ltr"}
           >
             <Translation id="page-last-updated" />:{" "}
-            {getLocaleTimestamp(language as Lang, lastUpdatedDate)}
+            {getLocaleTimestamp(intl.locale as Lang, lastUpdatedDate)}
           </LastUpdated>
           <MobileTableOfContents
             editPath={absoluteEditPath}
@@ -237,16 +237,7 @@ const StaticPage = ({
 }
 
 export const staticPageQuery = graphql`
-  query StaticPage($languagesToFetch: [String!]!, $relativePath: String) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query StaticPage($relativePath: String) {
     siteData: site {
       siteMetadata {
         editContentUrl
diff --git a/src/templates/tutorial.tsx b/src/templates/tutorial.tsx
index 867d66849a3..c564c4d2059 100644
--- a/src/templates/tutorial.tsx
+++ b/src/templates/tutorial.tsx
@@ -220,16 +220,7 @@ const TutorialPage = ({
 export default TutorialPage
 
 export const query = graphql`
-  query TutorialPage($languagesToFetch: [String!]!, $relativePath: String) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query TutorialPage($relativePath: String) {
     siteData: site {
       siteMetadata {
         editContentUrl
diff --git a/src/templates/upgrade.tsx b/src/templates/upgrade.tsx
index cad195d0b6e..ebe523cf3d7 100644
--- a/src/templates/upgrade.tsx
+++ b/src/templates/upgrade.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { graphql, PageProps } from "gatsby"
-import { useI18next } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 import { MDXProvider } from "@mdx-js/react"
 import { MDXRenderer } from "gatsby-plugin-mdx"
 import styled from "@emotion/styled"
@@ -334,7 +334,7 @@ const dropdownLinks: ButtonDropdownList = {
 const UpgradePage = ({
   data: { mdx },
 }: PageProps<Queries.UpgradePageQuery, Context>) => {
-  const { language } = useI18next()
+  const intl = useIntl()
 
   if (!mdx?.frontmatter || !mdx.parent)
     throw new Error(
@@ -373,7 +373,7 @@ const UpgradePage = ({
           </SummaryBox>
           <LastUpdated>
             <Translation id="page-last-updated" />:{" "}
-            {getLocaleTimestamp(language as Lang, lastUpdatedDate)}
+            {getLocaleTimestamp(intl.locale as Lang, lastUpdatedDate)}
           </LastUpdated>
         </TitleCard>
         <Image image={getImage(mdx.frontmatter.image)!} alt="" />
@@ -413,16 +413,7 @@ const UpgradePage = ({
 }
 
 export const upgradePageQuery = graphql`
-  query UpgradePage($languagesToFetch: [String!]!, $relativePath: String) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query UpgradePage($relativePath: String) {
     mdx(fields: { relativePath: { eq: $relativePath } }) {
       fields {
         slug
diff --git a/src/templates/use-cases.tsx b/src/templates/use-cases.tsx
index 6da97b55b17..cf45e4f8cb1 100644
--- a/src/templates/use-cases.tsx
+++ b/src/templates/use-cases.tsx
@@ -1,4 +1,5 @@
 import React from "react"
+import { useIntl } from "react-intl"
 import { graphql, PageProps } from "gatsby"
 import { MDXProvider } from "@mdx-js/react"
 import { MDXRenderer } from "gatsby-plugin-mdx"
@@ -307,6 +308,7 @@ const UseCasePage = ({
   data: { siteData, pageData: mdx },
   pageContext,
 }: PageProps<Queries.UseCasePageQuery, Context>) => {
+  const intl = useIntl()
   if (!siteData || !mdx?.frontmatter)
     throw new Error(
       "UseCases page template query does not return expected values"
@@ -433,16 +435,7 @@ const UseCasePage = ({
 }
 
 export const useCasePageQuery = graphql`
-  query UseCasePage($languagesToFetch: [String!]!, $relativePath: String) {
-    locales: allLocale(filter: { language: { in: $languagesToFetch } }) {
-      edges {
-        node {
-          ns
-          data
-          language
-        }
-      }
-    }
+  query UseCasePage($relativePath: String) {
     siteData: site {
       siteMetadata {
         editContentUrl
diff --git a/src/types.ts b/src/types.ts
index a37fd594f4b..3222c05334e 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -14,28 +14,21 @@ export type Intl = {
   redirect: boolean
 }
 
-export type I18NextContext = {
-  language: string
-  routed: boolean
-  languages: string[]
-  defaultLanguage: string
-  generateDefaultLanguagePage: boolean
-  originalPath: string
-  path: string
-  siteUrl?: string
-}
-
 export type Context = {
   slug: string
   relativePath?: string
   language: Lang
-  languagesToFetch?: Array<Lang>
   ignoreTranslationBanner?: boolean
   isOutdated: boolean
   isLegal?: boolean
   isDefaultLang?: boolean
   isContentEnglish?: boolean
-  i18n: I18NextContext
+
+  // gatsby i18n theme context
+  locale: Lang
+  hrefLang: string
+  originalPath: string
+  dateFormat: string
 }
 
 export interface DeveloperDocsLink {
diff --git a/src/utils/translations.ts b/src/utils/translations.ts
index d1073711d1b..ca4e31dda08 100644
--- a/src/utils/translations.ts
+++ b/src/utils/translations.ts
@@ -1,13 +1,33 @@
+import { IntlShape } from "react-intl"
+
 import type { Lang } from "./languages"
 import type { Direction } from "../types"
 
-import defaultStrings from "../../i18n/locales/en/index.json"
+import defaultStrings from "../intl/en.json"
 
 export type TranslationKey = keyof typeof defaultStrings
 
 export const isTranslationKey = (key: string): key is TranslationKey =>
   Object.keys(defaultStrings).includes(key as TranslationKey)
 
+const consoleError = (message: string): void => {
+  const { NODE_ENV } = process.env
+  if (NODE_ENV === "development") {
+    console.error(message)
+  }
+}
+
+// Returns the en.json value
+export const getDefaultMessage = (key: TranslationKey): string => {
+  const defaultMessage = defaultStrings[key]
+  if (defaultMessage === undefined) {
+    consoleError(
+      `No key "${key}" in en.json. Cannot provide a default message.`
+    )
+  }
+  return defaultMessage || ""
+}
+
 export const isLangRightToLeft = (lang: Lang): boolean => {
   return lang === "ar" || lang === "fa"
 }
@@ -20,6 +40,31 @@ export const getDirection = (lang?: Lang): Direction => {
   return isLangRightToLeft(lang) ? "rtl" : "ltr"
 }
 
+export const translateMessageId = (
+  id: TranslationKey,
+  intl: IntlShape
+): string => {
+  if (!id) {
+    consoleError(`No id provided for translation.`)
+    return ""
+  }
+  if (!intl || !intl.formatMessage) {
+    consoleError(`Invalid/no intl provided for translation id ${id}`)
+    return ""
+  }
+  const translation = intl.formatMessage({
+    id,
+    defaultMessage: getDefaultMessage(id),
+  })
+  if (translation === id) {
+    consoleError(
+      `Intl ID string "${id}" has no match. Default message of "" returned.`
+    )
+    return ""
+  }
+  return translation
+}
+
 // Overwrites the default Persian numbering of the Farsi language to use Hindu-Arabic numerals (0-9)
 // Context: https://github.com/ethereum/ethereum-org-website/pull/5490#pullrequestreview-892596553
 export const getLocaleForNumberFormat = (locale: Lang): Lang => {
diff --git a/yarn.lock b/yarn.lock
index 3628a71af33..c7190e0114c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1835,13 +1835,6 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.14.5", "@babel/runtime@^7.17.2":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
-  integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
 "@babel/template@^7.12.7", "@babel/template@^7.18.6":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
@@ -2913,6 +2906,13 @@
   dependencies:
     tslib "^2.1.0"
 
+"@formatjs/intl-displaynames@^1.2.0":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-1.2.10.tgz#bb9625cca90b099978cd967c6a98aaf4e23fc878"
+  integrity sha512-GROA2RP6+7Ouu0WnHFF78O5XIU7pBfI19WM1qm93l6MFWibUk67nCfVCK3VAYJkLy8L8ZxjkYT11VIAfvSz8wg==
+  dependencies:
+    "@formatjs/intl-utils" "^2.3.0"
+
 "@formatjs/intl-getcanonicallocales@1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.8.0.tgz#2987a879f399b2fdf2812e76431f1db8a5b02a64"
@@ -2920,6 +2920,13 @@
   dependencies:
     tslib "^2.1.0"
 
+"@formatjs/intl-listformat@^1.4.1":
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-1.4.8.tgz#70b81005e7dcf74329cb5b314a940ce5fce36cd0"
+  integrity sha512-WNMQlEg0e50VZrGIkgD5n7+DAMGt3boKi1GJALfhFMymslJb5i+5WzWxyj/3a929Z6MAFsmzRIJjKuv+BxKAOQ==
+  dependencies:
+    "@formatjs/intl-utils" "^2.3.0"
+
 "@formatjs/intl-locale@^2.4.14":
   version "2.4.41"
   resolved "https://registry.yarnpkg.com/@formatjs/intl-locale/-/intl-locale-2.4.41.tgz#c2597392b130a7589299e7c76b0731b62829680d"
@@ -2944,6 +2951,25 @@
     "@formatjs/ecma402-abstract" "1.7.1"
     tslib "^2.1.0"
 
+"@formatjs/intl-relativetimeformat@^4.5.9":
+  version "4.5.16"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-4.5.16.tgz#7449cef3213dd66d25924ca41f125f87b58df95a"
+  integrity sha512-IQ0haY97oHAH5OYUdykNiepdyEWj3SAT+Fp9ZpR85ov2JNiFx+12WWlxlVS8ehdyncC2ZMt/SwFIy2huK2+6/A==
+  dependencies:
+    "@formatjs/intl-utils" "^2.3.0"
+
+"@formatjs/intl-unified-numberformat@^3.2.0":
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.7.tgz#9995a24568908188e716d81a1de5b702b2ee00e2"
+  integrity sha512-KnWgLRHzCAgT9eyt3OS34RHoyD7dPDYhRcuKn+/6Kv2knDF8Im43J6vlSW6Hm1w63fNq3ZIT1cFk7RuVO3Psag==
+  dependencies:
+    "@formatjs/intl-utils" "^2.3.0"
+
+"@formatjs/intl-utils@^2.2.0", "@formatjs/intl-utils@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz#2dc8c57044de0340eb53a7ba602e59abf80dc799"
+  integrity sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ==
+
 "@gatsbyjs/parcel-namer-relative-to-cwd@^1.6.0":
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/@gatsbyjs/parcel-namer-relative-to-cwd/-/parcel-namer-relative-to-cwd-1.6.0.tgz#d1db17b7dbd52a7c1ee913ff7892b82976e5984d"
@@ -4585,6 +4611,14 @@
   dependencies:
     "@types/unist" "*"
 
+"@types/hoist-non-react-statics@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
+  integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
+  dependencies:
+    "@types/react" "*"
+    hoist-non-react-statics "^3.3.0"
+
 "@types/http-cache-semantics@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
@@ -4597,6 +4631,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/invariant@^2.2.31":
+  version "2.2.35"
+  resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.35.tgz#cd3ebf581a6557452735688d8daba6cf0bd5a3be"
+  integrity sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg==
+
 "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
@@ -9505,13 +9544,6 @@ gatsby-plugin-image@^2.21.0:
     objectFitPolyfill "^2.3.5"
     prop-types "^15.8.1"
 
-gatsby-plugin-layout@^3.24.0:
-  version "3.24.0"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-layout/-/gatsby-plugin-layout-3.24.0.tgz#2c3a046187e7c749f93eedb10101e7c806498c5e"
-  integrity sha512-h0cFnHKPF30swrpcWt1d8EbSr3yXX5gE7WUhIrg15uszFIsFFK0gveXWVUs71Y+FrZHIPd4ASvGnHheL47VWnQ==
-  dependencies:
-    "@babel/runtime" "^7.15.4"
-
 gatsby-plugin-manifest@^4.21.0:
   version "4.21.0"
   resolved "https://registry.yarnpkg.com/gatsby-plugin-manifest/-/gatsby-plugin-manifest-4.21.0.tgz#15f0c6905be2604e22f2f7dddf239411393ab8f4"
@@ -9616,18 +9648,6 @@ gatsby-plugin-react-helmet@^5.0.0:
   dependencies:
     "@babel/runtime" "^7.15.4"
 
-gatsby-plugin-react-i18next@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-react-i18next/-/gatsby-plugin-react-i18next-2.0.4.tgz#30578f114ee3b365671ab025b85672d9cb5ee933"
-  integrity sha512-B1SXBpFxuhTL1FVhLXmeVLEx6F+40xfJt3Puj3vU2N6E/3ZV0Arq8guhmOUHNHpNYjL/A+/nfxZD2V/HOfa+Vw==
-  dependencies:
-    bluebird "^3.7.2"
-    browser-lang "^0.1.0"
-    outdent "^0.8.0"
-    path-to-regexp "^6.2.0"
-  optionalDependencies:
-    react-helmet "^6.1.0"
-
 gatsby-plugin-react-svg@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/gatsby-plugin-react-svg/-/gatsby-plugin-react-svg-3.1.0.tgz#00269f182793f1f624bbfb9817608f6ee26f7b70"
@@ -9813,6 +9833,16 @@ gatsby-telemetry@^3.21.0:
     lodash "^4.17.21"
     node-fetch "^2.6.7"
 
+gatsby-theme-i18n-react-intl@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/gatsby-theme-i18n-react-intl/-/gatsby-theme-i18n-react-intl-3.0.0.tgz#2a6711b5f37d2386547c801fe407aca3da6bd94d"
+  integrity sha512-FORodw1fbI5favqgY1cqoqE4N0gNxNEt1/nibGG7phWJwWlw0rFgMQnXBIn5UKzDGiX9FVihevqUn14Eo3PTqA==
+
+gatsby-theme-i18n@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/gatsby-theme-i18n/-/gatsby-theme-i18n-3.0.0.tgz#dd4482f0f4842d3142a0d992f29afb6ecd1a62a4"
+  integrity sha512-M8r498/x0IwAQIbt8CQ3G7I9D2bUTBv4dvxD9EPgOGCW9qTVjH5al31vTkxSQ9ialn9BewMQugWQ7AEWwIDrhQ==
+
 gatsby-transformer-csv@^4.0.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/gatsby-transformer-csv/-/gatsby-transformer-csv-4.4.0.tgz#a9e0ff54042ae69b97342114726ba664c67f02e4"
@@ -10735,7 +10765,7 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -10764,13 +10794,6 @@ html-entities@^2.1.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
   integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
-html-parse-stringify@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
-  integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==
-  dependencies:
-    void-elements "3.1.0"
-
 html-void-elements@^1.0.0, html-void-elements@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
@@ -10798,7 +10821,7 @@ htmlparser2@^4.1.0:
     domutils "^2.0.0"
     entities "^2.0.0"
 
-htmlparser2@^6.0.0, htmlparser2@^6.1.0:
+htmlparser2@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
   integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
@@ -10808,14 +10831,6 @@ htmlparser2@^6.0.0, htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
-htmr@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/htmr/-/htmr-1.0.2.tgz#6e1feb8e4a62bae69774a95ca00702a32ac96b16"
-  integrity sha512-7T9babEHZwECQ2/ouxNPow1uGcKbj/BcbslPGPRxBKIOLNiIrFKq6ELzor7mc4HiexZzdb3izQQLl16bhPR9jw==
-  dependencies:
-    html-entities "^2.1.0"
-    htmlparser2 "^6.0.0"
-
 http-cache-semantics@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
@@ -10915,13 +10930,6 @@ husky@^4.2.5:
     slash "^3.0.0"
     which-pm-runs "^1.0.0"
 
-i18next@^21.9.2:
-  version "21.9.2"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.2.tgz#3f7c5594393eb27117c1db4c38f5ec766e68de0e"
-  integrity sha512-00fVrLQOwy45nm3OtC9l1WiLK3nJlIYSljgCt0qzTaAy65aciMdRy9GsuW+a2AtKtdg9/njUGfRH30LRupV7ZQ==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -11092,6 +11100,26 @@ internmap@^1.0.0:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
+intl-format-cache@^4.2.21:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-4.3.1.tgz#484d31a9872161e6c02139349b259a6229ade377"
+  integrity sha512-OEUYNA7D06agqPOYhbTkl0T8HA3QKSuwWh1HiClEnpd9vw7N+3XsQt5iZ0GUEchp5CW1fQk/tary+NsbF3yQ1Q==
+
+intl-messageformat-parser@^3.6.4:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-3.6.4.tgz#5199d106d816c3dda26ee0694362a9cf823978fb"
+  integrity sha512-RgPGwue0mJtoX2Ax8EmMzJzttxjnva7gx0Q7mKJ4oALrTZvtmCeAw5Msz2PcjW4dtCh/h7vN/8GJCxZO1uv+OA==
+  dependencies:
+    "@formatjs/intl-unified-numberformat" "^3.2.0"
+
+intl-messageformat@^7.8.4:
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-7.8.4.tgz#c29146a06b9cd26662978a4d95fff2b133e3642f"
+  integrity sha512-yS0cLESCKCYjseCOGXuV4pxJm/buTfyCJ1nzQjryHmSehlptbZbn9fnlk1I9peLopZGGbjj46yHHiTAEZ1qOTA==
+  dependencies:
+    intl-format-cache "^4.2.21"
+    intl-messageformat-parser "^3.6.4"
+
 invariant@^2.2.1, invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -13352,11 +13380,6 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
-outdent@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/outdent/-/outdent-0.8.0.tgz#2ebc3e77bf49912543f1008100ff8e7f44428eb0"
-  integrity sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==
-
 p-cancelable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
@@ -13758,11 +13781,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
-path-to-regexp@^6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.1.tgz#d54934d6798eb9e5ef14e7af7962c945906918e5"
-  integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -14641,14 +14659,6 @@ react-helmet@^6.1.0:
     react-fast-compare "^3.1.1"
     react-side-effect "^2.1.0"
 
-react-i18next@^11.18.6:
-  version "11.18.6"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887"
-  integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==
-  dependencies:
-    "@babel/runtime" "^7.14.5"
-    html-parse-stringify "^3.0.1"
-
 react-icons@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.3.1.tgz#2fa92aebbbc71f43d2db2ed1aed07361124e91ca"
@@ -14683,6 +14693,24 @@ react-instantsearch-dom@^6.32.0:
     react-fast-compare "^3.0.0"
     react-instantsearch-core "6.32.0"
 
+react-intl@^3.12.1:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-3.12.1.tgz#e9a783ea20302e9da25e4eda59e5593a43d2ec80"
+  integrity sha512-cgumW29mwROIqyp8NXStYsoIm27+8FqnxykiLSawWjOxGIBeLuN/+p2srei5SRIumcJefOkOIHP+NDck05RgHg==
+  dependencies:
+    "@formatjs/intl-displaynames" "^1.2.0"
+    "@formatjs/intl-listformat" "^1.4.1"
+    "@formatjs/intl-relativetimeformat" "^4.5.9"
+    "@formatjs/intl-unified-numberformat" "^3.2.0"
+    "@formatjs/intl-utils" "^2.2.0"
+    "@types/hoist-non-react-statics" "^3.3.1"
+    "@types/invariant" "^2.2.31"
+    hoist-non-react-statics "^3.3.2"
+    intl-format-cache "^4.2.21"
+    intl-messageformat "^7.8.4"
+    intl-messageformat-parser "^3.6.4"
+    shallow-equal "^1.2.1"
+
 react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -15606,6 +15634,11 @@ shallow-compare@^1.2.2:
   resolved "https://registry.yarnpkg.com/shallow-compare/-/shallow-compare-1.2.2.tgz#fa4794627bf455a47c4f56881d8a6132d581ffdb"
   integrity sha512-LUMFi+RppPlrHzbqmFnINTrazo0lPNwhcgzuAXVVcfy/mqPDrQmHAyz5bvV0gDAuRFrk804V0HpQ6u9sZ0tBeg==
 
+shallow-equal@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
+  integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==
+
 sharp@^0.30.7:
   version "0.30.7"
   resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.7.tgz#7862bda98804fdd1f0d5659c85e3324b90d94c7c"
@@ -17521,11 +17554,6 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-void-elements@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
-  integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==
-
 watchpack-chokidar2@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"

From 9a1e129a384818b48e16a03bd71c597c500c0eb6 Mon Sep 17 00:00:00 2001
From: Pablo Pettinari <pettinarip@gmail.com>
Date: Tue, 29 Nov 2022 12:19:24 -0300
Subject: [PATCH 107/108] fixes after revert

---
 src/components/Leaderboard.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/Leaderboard.tsx b/src/components/Leaderboard.tsx
index d359ef465a0..fa1f71eb467 100644
--- a/src/components/Leaderboard.tsx
+++ b/src/components/Leaderboard.tsx
@@ -10,11 +10,12 @@ import {
   List,
   ListItem,
 } from "@chakra-ui/react"
-import { useTranslation } from "gatsby-plugin-react-i18next"
+import { useIntl } from "react-intl"
 
 import Emoji from "./Emoji"
 import Link from "./Link"
 import Translation from "./Translation"
+import { translateMessageId } from "../utils/translations"
 
 const githubUrl = `https://github.com/`
 
@@ -43,7 +44,7 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
     }
   )
 
-  const { t } = useTranslation()
+  const intl = useIntl()
 
   return (
     <List
@@ -52,7 +53,10 @@ const Leaderboard: React.FC<IProps> = ({ content, limit = 100 }) => {
       w="100%"
       mb={8}
       ml={0}
-      aria-label={t("page-upgrades-bug-bounty-leaderboard-list")}
+      aria-label={translateMessageId(
+        "page-upgrades-bug-bounty-leaderboard-list",
+        intl
+      )}
     >
       {content
         .filter((_, idx) => idx < limit)

From 7774957d97c6baab136ce6b8fe83a02dcfbfcb9b Mon Sep 17 00:00:00 2001
From: Joshua <62268199+minimalsm@users.noreply.github.com>
Date: Tue, 29 Nov 2022 20:30:31 +0000
Subject: [PATCH 108/108] v6.12.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 45d823efde5..087367ff455 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",