Merge pull request #11770 from ethereum/dev

Release candidate 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

@@ -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>

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

@@ -1,5 +1,7 @@
 import React from "react"
-import { AspectRatio } from "@chakra-ui/react"
+import { Box } from "@chakra-ui/react"
+import LiteYouTubeEmbed from "react-lite-youtube-embed"
+import "react-lite-youtube-embed/dist/LiteYouTubeEmbed.css"
 
 /**
  * @param {id} ID of the YouTube video
@@ -11,32 +13,26 @@ import { AspectRatio } from "@chakra-ui/react"
  * @returns Embedded YouTube video component
  */
 
-export interface IProps {
+type YouTubeProps = {
   id: string
   start?: string
   title?: string
 }
 
-const YouTube: React.FC<IProps> = ({ id, start = "0", title = "YouTube" }) => {
-  const startQuery = parseInt(start) > 0 ? `?start=${start}` : ""
-  const baseUrl = "https://www.youtube.com/embed/"
-  const src = baseUrl + id + startQuery
+const YouTube = ({ id, start = "0", title = "YouTube" }: YouTubeProps) => {
+  const params = new URLSearchParams()
+  ;+start > 0 && params.set("start", start)
   return (
-    <AspectRatio as="figure" maxW="560px" ratio={16 / 9} my={8}>
-      <iframe
-        src={src}
-        frameBorder="0"
+    <Box as="figure" maxW={560} my={8}>
+      <LiteYouTubeEmbed
+        aspectHeight={9}
+        aspectWidth={16}
+        id={id}
         title={title}
-        allow="
-      accelerometer;
-      autoplay;
-      clipboard-write;
-      encrypted-media;
-      gyroscope;
-      picture-in-picture"
-        allowFullScreen
+        params={params.toString()}
+        noCookie
       />
-    </AspectRatio>
+    </Box>
   )
 }
 

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

@@ -30,7 +30,7 @@ Having trouble with your wallet? Most wallets have dedicated support teams that
 - [Argent](https://support.argent.xyz/hc/)
 - [MyEtherWallet](https://help.myetherwallet.com/)
 
-_This is not an exhaustive list. Need help finding support for a specific wallet? Join the [ethereum.org discord](https://discord.gg/rZz26QWfCg) and we'll try to help._
+_This is not an exhaustive list. Need help finding support for a specific wallet? Join the [ethereum.org discord](https://discord.gg/ethereum-org) and we'll try to help._
 
 Looking for an Ethereum wallet? [Explore our full list of Ethereum wallets](/wallets/find-wallet/).