Merge pull request #10675 from ethereum/staging

Deploy v7.17.0

Author: corwintines

.all-contributorsrc

@@ -8756,7 +8756,8 @@
       "profile": "https://github.com/MahendraBishnoi29",
       "contributions": [
         "ideas",
-        "code"
+        "code",
+        "bug"
       ]
     },
     {
@@ -10210,6 +10211,80 @@
         "content",
         "code"
       ]
+    },
+    {
+      "login": "maxime216-pro",
+      "name": "Maxime Dessez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66296351?v=4",
+      "profile": "http://maximedessez.fr",
+      "contributions": [
+        "bug",
+        "translation"
+      ]
+    },
+    {
+      "login": "Tyler-233",
+      "name": "Tyler-233",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44740396?v=4",
+      "profile": "https://github.com/Tyler-233",
+      "contributions": [
+        "translation",
+        "content"
+      ]
+    },
+    {
+      "login": "neodaoist",
+      "name": "neodaoist",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3170590?v=4",
+      "profile": "http://neodaoist.xyz",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "atharvadeosthale",
+      "name": "Atharva Deosthale",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11805367?v=4",
+      "profile": "https://links.atharva.codes",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "ckartik",
+      "name": "Kartik Chopra",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13803371?v=4",
+      "profile": "https://github.com/ckartik",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "BBashh",
+      "name": "Bibash Tandon",
+      "avatar_url": "https://avatars.githubusercontent.com/u/125178349?v=4",
+      "profile": "https://github.com/BBashh",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "vaibhavtevatia",
+      "name": "Vaibhav Tevatia",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86671961?v=4",
+      "profile": "https://github.com/vaibhavtevatia",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cnn-rnn",
+      "name": "cnn-rnn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44789658?v=4",
+      "profile": "https://github.com/cnn-rnn",
+      "contributions": [
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/get-crowdin-contributors.yml

@@ -0,0 +1,63 @@
+name: Update Crowdin Contributors
+
+on:
+  schedule:
+    - cron: "0 0 * * SUN" # Runs every Sunday at midnight
+  workflow_dispatch:
+
+jobs:
+  create_pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Install ts-node
+        run: yarn global add ts-node
+         
+      - name: Set up git
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "GitHub Action"
+
+      - name: Generate timestamp and readable date
+        id: date
+        run: |
+          echo "TIMESTAMP=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
+          echo "READABLE_DATE=$(date +'%B %-d')" >> $GITHUB_ENV
+
+      - name: Fetch latest dev and create new branch
+        run: |
+          git fetch origin dev
+          git checkout -b "automated-update-${{ env.TIMESTAMP }}" origin/dev
+
+      - name: Run script
+        run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/getCrowdinContributors.ts
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+
+      - name: Commit and push
+        run: |
+          git add -A
+          git commit -m "Update Crowdin contributors"
+          git push origin "automated-update-${{ env.TIMESTAMP }}"
+
+      - name: Create PR body
+        run: |
+          echo "This PR was automatically created to update Crowdin contributors." > pr_body.txt
+          echo "This workflows runs every Sunday at 00:00 (UTC)." >> pr_body.txt
+          echo "" >> pr_body.txt
+          echo "Thank you to everyone contributing to translate ethereum.org ❤️" >> pr_body.txt
+
+      - name: Create Pull Request
+        run: |
+          gh auth login --with-token <<< ${{ secrets.GITHUB_TOKEN }}
+          gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation contributors from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

README.md

@@ -1392,7 +1392,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://carllippert.com"><img src="https://avatars.githubusercontent.com/u/16457876?v=4?s=100" width="100px;" alt="Carl Lippert"/><br /><sub><b>Carl Lippert</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=carllippert" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/tymtam2"><img src="https://avatars.githubusercontent.com/u/1097613?v=4?s=100" width="100px;" alt="Tymek Majewski"/><br /><sub><b>Tymek Majewski</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=tymtam2" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://cryptolibertarian.id"><img src="https://avatars.githubusercontent.com/u/108990005?v=4?s=100" width="100px;" alt="Cryptolibertarian.id"/><br /><sub><b>Cryptolibertarian.id</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Cryptolibertarian-id" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MahendraBishnoi29"><img src="https://avatars.githubusercontent.com/u/74294202?v=4?s=100" width="100px;" alt="browny"/><br /><sub><b>browny</b></sub></a><br /><a href="#ideas-MahendraBishnoi29" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=MahendraBishnoi29" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MahendraBishnoi29"><img src="https://avatars.githubusercontent.com/u/74294202?v=4?s=100" width="100px;" alt="browny"/><br /><sub><b>browny</b></sub></a><br /><a href="#ideas-MahendraBishnoi29" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=MahendraBishnoi29" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AMahendraBishnoi29" title="Bug reports">🐛</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/sandakersmann"><img src="https://avatars.githubusercontent.com/u/6118832?v=4?s=100" width="100px;" alt="Marius Kjærstad"/><br /><sub><b>Marius Kjærstad</b></sub></a><br /><a href="#ideas-sandakersmann" title="Ideas, Planning, & Feedback">🤔</a></td>
@@ -1599,6 +1599,16 @@ 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/stephenfire"><img src="https://avatars.githubusercontent.com/u/17247036?v=4?s=100" width="100px;" alt="Stephen Guo"/><br /><sub><b>Stephen Guo</b></sub></a><br /><a href="#translation-stephenfire" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://aumson.org/gene"><img src="https://avatars.githubusercontent.com/u/7883777?v=4?s=100" width="100px;" alt="F. Eugene Aumson"/><br /><sub><b>F. Eugene Aumson</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AfeuGeneA" title="Bug reports">🐛</a> <a href="#content-feuGeneA" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/rpalakkal"><img src="https://avatars.githubusercontent.com/u/19766713?v=4?s=100" width="100px;" alt="Roshan"/><br /><sub><b>Roshan</b></sub></a><br /><a href="#content-rpalakkal" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=rpalakkal" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://maximedessez.fr"><img src="https://avatars.githubusercontent.com/u/66296351?v=4?s=100" width="100px;" alt="Maxime Dessez"/><br /><sub><b>Maxime Dessez</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amaxime216-pro" title="Bug reports">🐛</a> <a href="#translation-maxime216-pro" title="Translation">🌍</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tyler-233"><img src="https://avatars.githubusercontent.com/u/44740396?v=4?s=100" width="100px;" alt="Tyler-233"/><br /><sub><b>Tyler-233</b></sub></a><br /><a href="#translation-Tyler-233" title="Translation">🌍</a> <a href="#content-Tyler-233" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://neodaoist.xyz"><img src="https://avatars.githubusercontent.com/u/3170590?v=4?s=100" width="100px;" alt="neodaoist"/><br /><sub><b>neodaoist</b></sub></a><br /><a href="#content-neodaoist" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://links.atharva.codes"><img src="https://avatars.githubusercontent.com/u/11805367?v=4?s=100" width="100px;" alt="Atharva Deosthale"/><br /><sub><b>Atharva Deosthale</b></sub></a><br /><a href="#content-atharvadeosthale" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ckartik"><img src="https://avatars.githubusercontent.com/u/13803371?v=4?s=100" width="100px;" alt="Kartik Chopra"/><br /><sub><b>Kartik Chopra</b></sub></a><br /><a href="#content-ckartik" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BBashh"><img src="https://avatars.githubusercontent.com/u/125178349?v=4?s=100" width="100px;" alt="Bibash Tandon"/><br /><sub><b>Bibash Tandon</b></sub></a><br /><a href="#content-BBashh" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vaibhavtevatia"><img src="https://avatars.githubusercontent.com/u/86671961?v=4?s=100" width="100px;" alt="Vaibhav Tevatia"/><br /><sub><b>Vaibhav Tevatia</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vaibhavtevatia" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cnn-rnn"><img src="https://avatars.githubusercontent.com/u/44789658?v=4?s=100" width="100px;" alt="cnn-rnn"/><br /><sub><b>cnn-rnn</b></sub></a><br /><a href="#ideas-cnn-rnn" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",
@@ -11,6 +11,7 @@
     "@apollo/client": "^3.3.13",
     "@chakra-ui/gatsby-plugin": "^3.1.3",
     "@chakra-ui/react": "2.6.1",
+    "@crowdin/crowdin-api-client": "^1.23.2",
     "@docsearch/react": "^3.3.3",
     "@emotion/react": "^11.9.3",
     "@emotion/styled": "^11.9.3",
@@ -131,6 +132,7 @@
     "generate-heading-ids": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/generateHeadingIds.ts",
     "unused-translations": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/unusedTranslations.ts",
     "reorg-intl": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/reorgIntlFiles.ts",
+    "crowdin-contributors": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/getCrowdinContributors.ts",
     "start": "gatsby develop",
     "start:lambda": "netlify-lambda serve src/lambda",
     "start:static": "gatsby build && gatsby serve",

src/assets/dapps/convex.png

@@ -1,4 +1,5 @@
 import { useState } from "react"
+import { shuffle } from "lodash"
 import { useStaticQuery, graphql } from "gatsby"
 import { IGatsbyImageData } from "gatsby-plugin-image"
 import { useI18next, useTranslation } from "gatsby-plugin-react-i18next"
@@ -516,31 +517,34 @@ export const useEthExchanges = () => {
   const hasSelectedCountry = !!state?.selectedCountry?.value
   if (hasSelectedCountry) {
     // Filter to exchanges that serve selected Country
-    filteredExchanges = exchangesArray
-      .filter(
-        (exchange) => state?.selectedCountry?.exchanges[exchange] === "TRUE"
-      )
-      // Format array for <CardList/>
-      .map((exchange) => {
-        // Add state exceptions if Country is USA
-        let description: string | null = null
-        if (state?.selectedCountry?.value === t("page-get-eth-exchanges-usa")) {
-          const exceptions = exchanges[exchange].usaExceptions
-          if (exceptions.length > 0) {
-            description = `${t(
-              "page-get-eth-exchanges-except"
-            )} ${exceptions.join(", ")}`
+    filteredExchanges = shuffle(
+      exchangesArray
+        .filter(
+          (exchange) => state?.selectedCountry?.exchanges[exchange] === "TRUE"
+        )
+        // Format array for <CardList/>
+        .map((exchange) => {
+          // Add state exceptions if Country is USA
+          let description: string | null = null
+          if (
+            state?.selectedCountry?.value === t("page-get-eth-exchanges-usa")
+          ) {
+            const exceptions = exchanges[exchange].usaExceptions
+            if (exceptions.length > 0) {
+              description = `${t(
+                "page-get-eth-exchanges-except"
+              )} ${exceptions.join(", ")}`
+            }
           }
-        }
-        return {
-          title: exchanges[exchange].name,
-          description,
-          link: exchanges[exchange].url,
-          image: getImage(exchanges[exchange].image)!,
-          alt: "",
-        }
-      })
-      .sort((a, b) => a.title.localeCompare(b.title))
+          return {
+            title: exchanges[exchange].name,
+            description,
+            link: exchanges[exchange].url,
+            image: getImage(exchanges[exchange].image)!,
+            alt: "",
+          }
+        })
+    )
 
     // Filter to wallet providers that serve selected Country
     filteredWalletProviders = walletProvidersArray.filter(
@@ -549,43 +553,48 @@ export const useEthExchanges = () => {
   }
   if (filteredWalletProviders.length) {
     // Construct wallets based on the provider
-    filteredWallets = filteredWalletProviders
-      .reduce<Array<FilteredData>>((res, currentProvider) => {
-        const wallets = Object.keys(walletProviders[currentProvider].wallets)
+    filteredWallets = shuffle(
+      filteredWalletProviders.reduce<Array<FilteredData>>(
+        (res, currentProvider) => {
+          const wallets = Object.keys(walletProviders[currentProvider].wallets)
 
-        const flattenWallets = wallets.reduce<Array<FilteredData>>(
-          (result, currentWallet) => {
-            const walletObject =
-              walletProviders[currentProvider].wallets[currentWallet]
-            // Add state exceptions if Country is USA
-            let description: string | null = null
-            if (
-              state?.selectedCountry?.value === t("page-get-eth-exchanges-usa")
-            ) {
-              const exceptions = walletProviders[currentProvider].usaExceptions
-              if (exceptions.length > 0) {
-                description = `${t(
-                  "page-get-eth-exchanges-except"
-                )} ${exceptions.join(", ")}`
+          const flattenWallets = wallets.reduce<Array<FilteredData>>(
+            (result, currentWallet) => {
+              const walletObject =
+                walletProviders[currentProvider].wallets[currentWallet]
+              // Add state exceptions if Country is USA
+              let description: string | null = null
+              if (
+                state?.selectedCountry?.value ===
+                t("page-get-eth-exchanges-usa")
+              ) {
+                const exceptions =
+                  walletProviders[currentProvider].usaExceptions
+                if (exceptions.length > 0) {
+                  description = `${t(
+                    "page-get-eth-exchanges-except"
+                  )} ${exceptions.join(", ")}`
+                }
+                // Filter out wallets that only service USA
+              } else if (walletObject.isUsaOnly) {
+                return result
               }
-              // Filter out wallets that only service USA
-            } else if (walletObject.isUsaOnly) {
-              return result
-            }
-            return result.concat({
-              title: currentWallet,
-              description,
-              link: walletObject.url,
-              image: getImage(walletObject.image)!,
-              alt: "",
-            })
-          },
-          []
-        )
-        // Flatten data into single array for <CardList/>
-        return res.concat(flattenWallets)
-      }, [])
-      .sort((a, b) => a.title.localeCompare(b.title))
+              return result.concat({
+                title: currentWallet,
+                description,
+                link: walletObject.url,
+                image: getImage(walletObject.image)!,
+                alt: "",
+              })
+            },
+            []
+          )
+          // Flatten data into single array for <CardList/>
+          return res.concat(flattenWallets)
+        },
+        []
+      )
+    )
   }
 
   const hasExchangeResults = filteredExchanges.length > 0