Merge pull request #11771 from ethereum/staging

Deploy v7.24.3

Author: corwintines

.all-contributorsrc

@@ -10866,6 +10866,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "xiaolou86",
+      "name": "xiaolou86",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20718693?v=4",
+      "profile": "https://github.com/xiaolou86",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "aztecEagle22",
+      "name": "aztecEagle22",
+      "avatar_url": "https://avatars.githubusercontent.com/u/152518936?v=4",
+      "profile": "https://github.com/aztecEagle22",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Messi-Q",
+      "name": "QIAN",
+      "avatar_url": "https://avatars.githubusercontent.com/u/21357985?v=4",
+      "profile": "https://github.com/Messi-Q",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1,6 +1,6 @@
 [![Netlify Status](https://api.netlify.com/api/v1/badges/e8f2e766-888b-4954-8500-1b647d84db99/deploy-status)](https://app.netlify.com/sites/ethereumorg/deploys)
 [![All Contributors](https://img.shields.io/github/all-contributors/ethereum/ethereum-org-website?color=orange&style=flat-square)](#contributors-)
-[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=ethereum.org%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.gg/CetY6Y4)
+[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=ethereum.org%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.gg/ethereum-org)
 [![Twitter Follow](https://img.shields.io/twitter/follow/ethdotorg.svg?style=social)](https://twitter.com/ethdotorg)
 [![Crowdin](https://badges.crowdin.net/ethereum-org/localized.svg)](https://crowdin.com/project/ethereum-org)
 [![gitpoap badge](https://public-api.gitpoap.io/v1/repo/ethereum/ethereum-org-website/badge)](https://www.gitpoap.io/gh/ethereum/ethereum-org-website)
@@ -136,7 +136,7 @@ In case you want to test them as if you were in a Netlify env, you can install t
 - Gatsby Cloud (our hosting service for build previews) deploys all PRs to a publicly accessible preview URL, e.g.:
   ![Gatsby Cloud deploy preview](./GC-preview-deploy.png)
 - _Confirm your GC preview deploy looks & functions as expected_
-- Why not say hi and draw attention to your PR in [our discord server](https://discord.gg/CetY6Y4)?
+- Why not say hi and draw attention to your PR in [our discord server](https://discord.gg/ethereum-org)?
 
 ### 7. Wait for review
 
@@ -167,7 +167,7 @@ Learn more about how we review pull requests [here](docs/review-process.md).
 - If you have committed any changes in 2022 so far that were merged into our repo, you have a POAP waiting!
 - This includes our dedicated translators on Crowdin
 
-  [![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Claim%20Your%20POAP!%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat)](https://discord.gg/CetY6Y4)
+  [![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Claim%20Your%20POAP!%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat)](https://discord.gg/ethereum-org)
 
 - 👆 To claim your Contributor POAP, join our Discord server and paste a link to your contribution in the `#🥇 | poaps` [channel](https://discord.com/channels/714888181740339261/804005643211898911)
 
@@ -1698,6 +1698,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/fuzheng1998"><img src="https://avatars.githubusercontent.com/u/24203166?v=4?s=100" width="100px;" alt="Zheng Fu"/><br /><sub><b>Zheng Fu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=fuzheng1998" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaolou86"><img src="https://avatars.githubusercontent.com/u/20718693?v=4?s=100" width="100px;" alt="xiaolou86"/><br /><sub><b>xiaolou86</b></sub></a><br /><a href="#content-xiaolou86" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/aztecEagle22"><img src="https://avatars.githubusercontent.com/u/152518936?v=4?s=100" width="100px;" alt="aztecEagle22"/><br /><sub><b>aztecEagle22</b></sub></a><br /><a href="#content-aztecEagle22" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Messi-Q"><img src="https://avatars.githubusercontent.com/u/21357985?v=4?s=100" width="100px;" alt="QIAN"/><br /><sub><b>QIAN</b></sub></a><br /><a href="#content-Messi-Q" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>
@@ -1711,4 +1714,4 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 
 ### Join our Discord server
 
-We have a space to discuss all things ethereum.org – share your ideas or just say hi over [on Discord](https://discord.gg/CetY6Y4).
+We have a space to discuss all things ethereum.org – share your ideas or just say hi over [on Discord](https://discord.gg/ethereum-org).

package.json

@@ -69,6 +69,7 @@
     "react-i18next": "^12.1.4",
     "react-icons": "^4.3.1",
     "react-instantsearch-dom": "^6.32.0",
+    "react-lite-youtube-embed": "^2.4.0",
     "react-select": "^4.3.0",
     "recharts": "^2.1.9",
     "styled-system": "^5.1.5",

redirects.json

@@ -1,11 +1,11 @@
 [
   {
     "fromPath": "/discord",
-    "toPath": "https://discord.gg/rZz26QWfCg"
+    "toPath": "https://discord.gg/ethereum-org"
   },
   {
     "fromPath": "/*/discord",
-    "toPath": "https://discord.gg/rZz26QWfCg"
+    "toPath": "https://discord.gg/ethereum-org"
   },
   {
     "fromPath": "/pdfs/*",

src/assets/heroes/layer-2-hub-hero.jpg

@@ -96,7 +96,7 @@ const CallToContribute: React.FC<IProps> = ({ editPath }) => {
         </DescriptionParagraph>
         <DescriptionParagraph>
           <Translation id="page-calltocontribute-desc-4" />{" "}
-          <InlineLink to="https://discord.gg/CetY6Y4">
+          <InlineLink to="https://discord.gg/ethereum-org">
             <Translation id="page-calltocontribute-link-2" />
           </InlineLink>{" "}
         </DescriptionParagraph>

src/assets/translation-program/pageviews-dark.png

@@ -34,7 +34,7 @@ const socialLinks = [
   },
   {
     icon: FaDiscord,
-    to: "https://discord.gg/CetY6Y4",
+    to: "https://discord.gg/ethereum-org",
     ariaLabel: "Discord",
     color: "#7289da",
   },