Merge branch 'dev' into staging-update

Author: corwintines

.all-contributorsrc

@@ -12497,6 +12497,33 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "r4f4ss",
+      "name": "rafaelss",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5679073?v=4",
+      "profile": "https://github.com/r4f4ss",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "preetjdp",
+      "name": "Preet Parekh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/27439197?v=4",
+      "profile": "https://preetjdp.dev/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "ludamad",
+      "name": "ludamad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/163993?v=4",
+      "profile": "https://www.linkedin.com/in/adamdomurad/",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.json

@@ -65,6 +65,17 @@
         "varsIgnorePattern": "^_$"
       }
     ],
-    "unused-imports/no-unused-imports-ts": "warn"
+    "unused-imports/no-unused-imports-ts": "warn",
+    "no-restricted-imports": [
+      "warn",
+      {
+        "paths": [
+          {
+            "name": "react-i18next",
+            "message": "Please use next-i18next instead of react-i18next."
+          }
+        ]
+      }
+    ]
   }
 }

.storybook/i18next.ts

@@ -1,4 +1,5 @@
 import i18n, { Resource } from "i18next"
+// eslint-disable-next-line no-restricted-imports
 import { initReactI18next } from "react-i18next"
 
 export const baseLocales = {

.storybook/utils.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-imports
 import { getI18n } from "react-i18next"
 
 import { ns as exposedNs } from "./i18next"

README.md

@@ -1910,6 +1910,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cratiu222"><img src="https://avatars.githubusercontent.com/u/156356273?v=4?s=100" width="100px;" alt="Christina"/><br /><sub><b>Christina</b></sub></a><br /><a href="#content-cratiu222" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nipunh"><img src="https://avatars.githubusercontent.com/u/26524611?v=4?s=100" width="100px;" alt="Nipun Hedaoo"/><br /><sub><b>Nipun Hedaoo</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nipunh" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/chenjiali-april"><img src="https://avatars.githubusercontent.com/u/132745538?v=4?s=100" width="100px;" alt="april"/><br /><sub><b>april</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=chenjiali-april" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/r4f4ss"><img src="https://avatars.githubusercontent.com/u/5679073?v=4?s=100" width="100px;" alt="rafaelss"/><br /><sub><b>rafaelss</b></sub></a><br /><a href="#content-r4f4ss" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://preetjdp.dev/"><img src="https://avatars.githubusercontent.com/u/27439197?v=4?s=100" width="100px;" alt="Preet Parekh"/><br /><sub><b>Preet Parekh</b></sub></a><br /><a href="#content-preetjdp" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/adamdomurad/"><img src="https://avatars.githubusercontent.com/u/163993?v=4?s=100" width="100px;" alt="ludamad"/><br /><sub><b>ludamad</b></sub></a><br /><a href="#content-ludamad" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

public/content/developers/docs/networking-layer/portal-network/index.md

@@ -76,7 +76,7 @@ The Portal Network clients are:
 - [Trin](https://github.com/ethereum/trin): written in Rust
 - [Fluffy](https://nimbus.team/docs/fluffy.html): written in Nim
 - [Ultralight](https://github.com/ethereumjs/ultralight): written in Typescript
-- [Shisui](https://github.com/GrapeBaBa/shisui): written in Go
+- [Shisui](https://github.com/optimism-java/shisui): written in Go
 
 Having multiple independent client implementations enhances the resilience and decentralization of the Ethereum network.
 

public/content/developers/docs/nodes-and-clients/bootnodes/index.md

@@ -8,7 +8,7 @@ When a new node joins the Ethereum network it needs to connect to nodes that are
 
 ## Connect to a bootnode {#connect-to-a-bootnode}
 
-Most clients have a list of bootnodes build in, but you might also want to run your own bootnode, or use one that is not part of the client's hardcoded list. In this case, you can specify them when starting your client, as follows (example is for Geth, please check your client's documentation):
+Most clients have a list of bootnodes builtin, but you might also want to run your own bootnode, or use one that is not part of the client's hardcoded list. In this case, you can specify them when starting your client, as follows (example is for Geth, please check your client's documentation):
 
 ```
 geth --bootnodes "enode://<node ID>@<IP address>:<port>"

public/content/translations/ca/roadmap/beacon-chain/index.md

@@ -62,7 +62,3 @@ Les cadenes de fragments només poden entrar de forma segura a l'ecosistema Ethe
 </ButtonLink>
 
 <Divider />
-
-## Interactuar amb la cadena de balisa {#interact-with-beacon-chain}
-
-<BeaconChainActions />

public/content/translations/nl/roadmap/beacon-chain/index.md

@@ -62,7 +62,3 @@ Shardketens kunnen alleen op een veilige manier in het Ethereum-netwerk komen al
 </ButtonLink>
 
 <Divider />
-
-## Heb interactie met de Beacon Chain {#interact-with-beacon-chain}
-
-<BeaconChainActions />

public/content/translations/sw/roadmap/beacon-chain/index.md

@@ -62,7 +62,3 @@ Minyororo ya Vigae itakua salama kuingia katika ikolojia ya Ethereum pale tu uta
 </ButtonLink>
 
 <Divider />
-
-## Ingiliana na Mnyororo Kioleza {#interact-with-beacon-chain}
-
-<BeaconChainActions />