Merge remote-tracking branch 'origin/dev' into feat/hero-new-ds

.storybook/i18next.ts

@@ -1,6 +1,5 @@
 import i18n, { Resource } from "i18next"
 import { initReactI18next } from "gatsby-plugin-react-i18next"
-import fs from "fs"
 
 export const baseLocales = {
   en: { title: "English", left: "En" },
@@ -14,8 +13,8 @@ const ns = [
   "common",
   "glossary",
   "page-about",
-  "page-learn",
   "page-index",
+  "page-learn",
   "page-upgrades",
   "page-developers-index",
 ]
@@ -27,22 +26,23 @@ const supportedLngs = Object.keys(baseLocales)
  */
 const resources: Resource = ns.reduce((acc, n) => {
   supportedLngs.forEach((lng) => {
-    let langFile: object
-
+    if (!acc[lng]) acc[lng] = {}
     try {
-      langFile = require(`../src/intl/${lng}/${n}.json`)
-    } catch {
-      // If the search file is not found
-      return acc
-    }
+      acc[lng] = {
+        translation: {
+          ...acc[lng].translation,
 
-    if (!acc[lng]) acc[lng] = {}
+          ...require(`../src/intl/${lng}/${n}.json`),
+        },
+      }
+    } catch {
+      acc[lng] = {
+        translation: {
+          ...acc[lng].translation,
 
-    acc[lng] = {
-      translation: {
-        ...acc[lng].translation,
-        ...langFile,
-      },
+          ...require(`../src/intl/en/${n}.json`),
+        },
+      }
     }
   })
   return acc

docs/ds-implementation.md

@@ -17,10 +17,10 @@ Follow the new component directory structure:
 ```markdown
 src/
 └── components/
-    └── ComponentA/
-        ├── index.tsx
-        ├── ComponentA.stories.tsx
-        └── // Any other files as applicable (utils, child components, useHook, etc.)
+└── ComponentA/
+├── index.tsx
+├── ComponentA.stories.tsx
+└── // Any other files as applicable (utils, child components, useHook, etc.)
 ```
 
 ## Components creation/modification from the DS

src/data/community-events.json

@@ -1,5 +1,5 @@
 [
-   {
+  {
     "title": "Road to Devcon（Shenzhen）",
     "to": "https://ethsz.openbuild.xyz/",
     "sponsor": null,