Merge pull request #10415 from ethereum/staging

Staging -> dev

Author: corwintines

src/components/Link.tsx

@@ -17,6 +17,7 @@ import { Lang } from "../utils/languages"
 import { trackCustomEvent, MatomoEventOptions } from "../utils/matomo"
 import * as url from "../utils/url"
 import { Direction } from "../types"
+import { SITE_URL, DISCORD_PATH } from "../constants"
 
 export interface IBaseProps {
   to?: string
@@ -63,8 +64,10 @@ const Link: React.FC<IProps> = ({
 
   // TODO: in the next PR we are going to deprecate the `to` prop and just use `href`
   // this is to support the ButtonLink component which uses the `to` prop
-  const to = (toProp ?? href)!
+  let to = (toProp ?? href)!
 
+  const isDiscordInvite = url.isDiscordInvite(to)
+  if (isDiscordInvite) to = new URL(DISCORD_PATH, SITE_URL).href
   const isExternal = url.isExternal(to)
   const isHash = url.isHash(to)
   const isGlossary = url.isGlossary(to)

src/constants.ts

@@ -1,3 +1,5 @@
+export const SITE_URL = "https://ethereum.org" as const
+export const DISCORD_PATH = "/discord/" as const
 export const GATSBY_FUNCTIONS_PATH = process.env.GATSBY_FUNCTIONS_PATH || "/api"
 
 // Quiz Hub

src/data/quizzes/index.ts

@@ -12,27 +12,27 @@ const quizzes: RawQuizzes = {
     questions: ["b001", "b002", "b003", "b004"],
   },
   web3: {
-    title: "what-is-web3",
+    title: "web3",
     questions: ["c001", "c002", "c003", "c004", "c005"],
   },
   wallets: {
-    title: "what-is-a-wallet",
+    title: "wallets",
     questions: ["d001", "d002", "d003", "d004"],
   },
   security: {
-    title: "security",
+    title: "ethereum-security",
     questions: ["e001", "e002", "e003", "e004", "d003"],
   },
   nfts: {
-    title: "what-are-nfts",
+    title: "nft-page",
     questions: ["f001", "f002", "f003", "f004", "f005"],
   },
   "layer-2": {
-    title: "using-layer-2",
+    title: "layer-2",
     questions: ["g001", "g002", "g003", "g004"],
   },
   merge: {
-    title: "what-is-the-merge",
+    title: "page-assets-merge",
     questions: ["h001", "h002", "h003", "h004", "h005"],
   },
 }

src/intl/en/common.json

@@ -138,6 +138,7 @@
   "page-developers-aria-label": "Developers' Menu",
   "page-index-meta-title": "Home",
   "page-last-updated": "Page last updated",
+  "page-what-is-ethereum-what-is-ether": "What is ether?",
   "pbs": "Proposer-builder separation",
   "pools": "Pooled staking",
   "privacy-policy": "Privacy policy",

src/intl/en/learn-quizzes.json

@@ -10,28 +10,22 @@
   "explanation": "Explanation",
   "next-question": "Next question",
   "next-quiz": "Next quiz",
-  "page-what-is-ethereum-what-is-ether": "What is ether?",
+  "page-assets-merge": "The Merge",
   "passed": "You passed the quiz!",
   "questions": "Questions",
   "questions-answered": "Questions answered:",
   "quizzes-subtitle": "Find out how well you understand Ethereum and cryptocurrencies. Are you ready to become an expert?",
   "retry": "Retry rate:",
   "score": "Score",
   "see-results": "See results",
-  "security": "Security",
   "share-results": "Share results",
   "start": "Start",
   "submit-answer": "Check answer",
   "test-your-knowledge": "Test your Ethereum knowledge",
   "try-again": "Try again",
   "using-ethereum": "Using Ethereum",
   "using-ethereum-description": "Delve into the real-world applications of Ethereum and uncover how this revolutionary blockchain platform is reshaping industries. This is a great way to make sure you understand things well enough before you start using cryptocurrencies actively.",
-  "using-layer-2": "Using layer 2",
-  "what-are-nfts": "What are NFTs?",
   "want-more-quizzes": "Want to see more quizzes here?",
-  "what-is-a-wallet": "What is a wallet?",
-  "what-is-the-merge": "What is the Merge?",
-  "what-is-web3": "What is Web3?",
   "your-results": "Your results",
   "your-total": "Your total points",
   "a001-prompt": "The biggest difference between Ethereum and Bitcoin is:",

src/utils/url.ts

@@ -1,6 +1,11 @@
+import { DISCORD_PATH } from "../constants"
+
 const HASH_PATTERN = /^#.*/
 const isHashLink = (href: string): boolean => HASH_PATTERN.test(href)
 
+export const isDiscordInvite = (href: string): boolean =>
+  href.includes(DISCORD_PATH) && !href.includes("http")
+
 export const isExternal = (href: string): boolean =>
   href.includes("http") || href.includes("mailto:") || href.includes("ipfs")