Merge branch 'ethereum:dev' into dev

Author: UNOFFICIALbgd

.all-contributorsrc

@@ -12398,6 +12398,105 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "yannggg",
+      "name": "Yann Gerardi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29145014?v=4",
+      "profile": "https://www.mtpelerin.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "panditdhamdhere",
+      "name": "Pandit Dhamdhere",
+      "avatar_url": "https://avatars.githubusercontent.com/u/85685981?v=4",
+      "profile": "https://github.com/panditdhamdhere",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ferreiramarcelo",
+      "name": "M@rC3L0",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11818521?v=4",
+      "profile": "http://linkedin.com/in/fmarcelo",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Refdeveloper",
+      "name": "DevOFtoken",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87125773?v=4",
+      "profile": "https://github.com/Refdeveloper",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "vvvvvv1vvvvvv",
+      "name": "vvvvvv1vvvvvv",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86296331?v=4",
+      "profile": "https://github.com/vvvvvv1vvvvvv",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "abraj",
+      "name": "Abhishek Raj",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8170980?v=4",
+      "profile": "https://raj.me",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "p1kalys",
+      "name": "Pavan Emani",
+      "avatar_url": "https://avatars.githubusercontent.com/u/85685112?v=4",
+      "profile": "https://github.com/p1kalys",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "makoshan",
+      "name": "Mako Shan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7024451?v=4",
+      "profile": "https://v2eth.com/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "cratiu222",
+      "name": "Christina",
+      "avatar_url": "https://avatars.githubusercontent.com/u/156356273?v=4",
+      "profile": "https://github.com/cratiu222",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "nipunh",
+      "name": "Nipun Hedaoo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26524611?v=4",
+      "profile": "https://github.com/nipunh",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "chenjiali-april",
+      "name": "april",
+      "avatar_url": "https://avatars.githubusercontent.com/u/132745538?v=4",
+      "profile": "https://github.com/chenjiali-april",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -35,9 +35,5 @@ BUILD_LOCALES=
 # fixed number of CPUs (e.g. 2) to limit the demand during build time
 LIMIT_CPUS=
 
-# Sentry auth token required for error tracking
-SENTRY_AUTH_TOKEN=
-NEXT_PUBLIC_SENTRY_DSN=
-
 # Enables the bundle analyzer
 ANALYZE=false

.eslintrc.json

@@ -42,7 +42,7 @@
           // Other relative imports. Put same-folder imports and `.` last.
           ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
           // Style imports.
-          ["^.+s?css$"],
+          ["^.+\\.s?css$"],
           // Side effect imports.
           ["^\\u0000"]
         ]

.github/workflows/wallets-check.yml

@@ -0,0 +1,32 @@
+name: Check Wallet Data for new_to_crypto
+
+on:
+  pull_request:
+    paths:
+      - "src/data/wallets/wallet-data.ts"
+
+jobs:
+  check_new_to_crypto:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Check for new_to_crypto
+        id: check_new_to_crypto
+        run: |
+          if git diff --name-only HEAD^ | grep -q "data/wallets/wallet-data.ts"; then
+            if git diff -U0 HEAD^ HEAD data/wallets/wallet-data.ts | grep -q "+.*new_to_crypto: true"; then
+              echo "New wallet added with 'new_to_crypto: true'"
+              echo "new_to_crypto_found=true" >> $GITHUB_OUTPUT
+            else
+              echo "new_to_crypto_found=false" >> $GITHUB_OUTPUT
+            fi
+          fi
+
+      - name: Comment on PR if new_to_crypto is added
+        if: steps.check_new_to_crypto.outputs.new_to_crypto_found == 'true'
+        uses: actions-ecosystem/action-add-comment@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          body: "A wallet has been added with 'new_to_crypto: true'. Please ensure this meets our guidelines."

.storybook/i18next.ts

@@ -22,6 +22,7 @@ export const ns = [
   "page-developers-index",
   "page-what-is-ethereum",
   "page-upgrades-index",
+  "page-developers-docs",
 ] as const
 const supportedLngs = Object.keys(baseLocales)
 

.storybook/modes.ts

@@ -1,3 +1,5 @@
+import pickBy from "lodash/pickBy"
+
 import { baseLocales } from "./i18next"
 import { breakpointSet } from "./preview"
 
@@ -12,7 +14,9 @@ export const viewportModes = breakpointSet.reduce<{
   }
 }, {})
 
-export const langModes = Object.keys(baseLocales).reduce<{
+const localesToTest = ["en", "fa"]
+const locales = pickBy(baseLocales, (_, key) => localesToTest.includes(key))
+export const langModes = Object.keys(locales).reduce<{
   [locale: string]: { locale: string }
 }>((arr, curr) => {
   return {

.storybook/preview.tsx

@@ -1,17 +1,19 @@
 import isChromatic from "chromatic/isChromatic"
 import { MotionGlobalConfig } from "framer-motion"
-import { withThemeByDataAttribute } from "@storybook/addon-themes"
 import type { Preview } from "@storybook/react"
 
 import ThemeProvider from "@/components/ThemeProvider"
+import { TooltipProvider } from "@/components/ui/tooltip"
 
 import i18n, { baseLocales } from "./i18next"
+import { withNextThemes } from "./withNextThemes"
 
-import "@docsearch/css"
 import "../src/styles/global.css"
 import "../src/styles/fonts.css"
 import "../src/styles/docsearch.css"
 
+import "@docsearch/css"
+
 MotionGlobalConfig.skipAnimations = isChromatic()
 
 export const breakpointSet: [token: string, value: string][] = [
@@ -29,7 +31,7 @@ const preview: Preview = {
     locales: baseLocales,
   },
   decorators: [
-    withThemeByDataAttribute({
+    withNextThemes({
       themes: {
         light: "light",
         dark: "dark",
@@ -38,7 +40,9 @@ const preview: Preview = {
     }),
     (Story) => (
       <ThemeProvider>
-        <Story />
+        <TooltipProvider>
+          <Story />
+        </TooltipProvider>
       </ThemeProvider>
     ),
   ],

.storybook/withNextThemes.ts

@@ -0,0 +1,28 @@
+import { useEffect } from "react"
+import { useTheme } from "next-themes"
+import {
+  type DataAttributeStrategyConfiguration,
+  DecoratorHelpers,
+} from "@storybook/addon-themes"
+import type { Decorator } from "@storybook/react/*"
+
+const { initializeThemeState, pluckThemeFromContext } = DecoratorHelpers
+
+export const withNextThemes = ({
+  themes,
+  defaultTheme,
+}: DataAttributeStrategyConfiguration): Decorator => {
+  initializeThemeState(Object.keys(themes), defaultTheme)
+
+  return (getStory, context) => {
+    const selectedTheme = pluckThemeFromContext(context)
+    const selected = selectedTheme || defaultTheme
+    const { setTheme } = useTheme()
+
+    useEffect(() => {
+      setTheme(selected)
+    }, [selected, setTheme])
+
+    return getStory(context)
+  }
+}

README.md

@@ -1,7 +1,7 @@
 [![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/ethereum-org)
-[![Twitter Follow](https://img.shields.io/twitter/follow/ethdotorg.svg?style=social)](https://twitter.com/ethdotorg)
+[![Twitter Follow](https://img.shields.io/twitter/follow/ethdotorg.svg?style=social)](https://x.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)
 
@@ -119,7 +119,7 @@ git push
 - In your PR description, reference the issue it resolves (see [linking a pull request to an issue using a keyword](https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
   - ex. `Updates out of date content [Fixes #1234]`
 - Netlify (our hosting service for build previews) deploys all PRs to a publicly accessible preview URL, e.g.: ![Netlify deploy preview](public/images/preview-deploy.png)
-- _Confirm your Netlify preview deploy looks & functions as expected_
+- _Confirm that your Netlify preview deploy looks and functions as expected_
 - Why not say hi and draw attention to your PR in [our discord server](https://discord.gg/ethereum-org)?
 
 ### 6. Wait for review
@@ -1896,6 +1896,21 @@ 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/sanjanaynvsdl"><img src="https://avatars.githubusercontent.com/u/142678317?v=4?s=100" width="100px;" alt="Sanjana"/><br /><sub><b>Sanjana</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asanjanaynvsdl" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.zaryabs.com/"><img src="https://avatars.githubusercontent.com/u/42082608?v=4?s=100" width="100px;" alt="Zaryab"/><br /><sub><b>Zaryab</b></sub></a><br /><a href="#content-zaryab2000" title="Content">🖋</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.mtpelerin.com"><img src="https://avatars.githubusercontent.com/u/29145014?v=4?s=100" width="100px;" alt="Yann Gerardi"/><br /><sub><b>Yann Gerardi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=yannggg" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/panditdhamdhere"><img src="https://avatars.githubusercontent.com/u/85685981?v=4?s=100" width="100px;" alt="Pandit Dhamdhere"/><br /><sub><b>Pandit Dhamdhere</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=panditdhamdhere" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://linkedin.com/in/fmarcelo"><img src="https://avatars.githubusercontent.com/u/11818521?v=4?s=100" width="100px;" alt="M@rC3L0"/><br /><sub><b>M@rC3L0</b></sub></a><br /><a href="#ideas-ferreiramarcelo" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Refdeveloper"><img src="https://avatars.githubusercontent.com/u/87125773?v=4?s=100" width="100px;" alt="DevOFtoken"/><br /><sub><b>DevOFtoken</b></sub></a><br /><a href="#ideas-Refdeveloper" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vvvvvv1vvvvvv"><img src="https://avatars.githubusercontent.com/u/86296331?v=4?s=100" width="100px;" alt="vvvvvv1vvvvvv"/><br /><sub><b>vvvvvv1vvvvvv</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vvvvvv1vvvvvv" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://raj.me"><img src="https://avatars.githubusercontent.com/u/8170980?v=4?s=100" width="100px;" alt="Abhishek Raj"/><br /><sub><b>Abhishek Raj</b></sub></a><br /><a href="#content-abraj" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/p1kalys"><img src="https://avatars.githubusercontent.com/u/85685112?v=4?s=100" width="100px;" alt="Pavan Emani"/><br /><sub><b>Pavan Emani</b></sub></a><br /><a href="#content-p1kalys" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://v2eth.com/"><img src="https://avatars.githubusercontent.com/u/7024451?v=4?s=100" width="100px;" alt="Mako Shan"/><br /><sub><b>Mako Shan</b></sub></a><br /><a href="#content-makoshan" title="Content">🖋</a></td>
+      <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>
+    </tr>
   </tbody>
 </table>