Merge pull request #16182 from ethereum/staging

Release v10.12.0

Author: pettinarip

app/[locale]/10years/_components/NFTMintCard/index.tsx

@@ -2,11 +2,14 @@ import { useTranslations } from "next-intl"
 
 import { Alert, AlertContent, AlertTitle } from "@/components/ui/alert"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import Link from "@/components/ui/Link"
 
 import { cn } from "@/lib/utils/cn"
 
 import Curved10YearsText from "@/public/images/10-year-anniversary/10y-curved-heading.svg"
 
+const TORCH_CONTRACT_ADDRESS = "0x26d85a13212433fe6a8381969c2b0db390a0b0ae"
+
 interface NFTMintCardProps {
   className?: string
 }
@@ -71,6 +74,12 @@ const NFTMintCard = ({ className }: NFTMintCardProps) => {
             <p className="text-primary">
               {t("page-10-year-mint-card-ended-description")}
             </p>
+            <Link
+              href={`https://opensea.io/item/ethereum/${TORCH_CONTRACT_ADDRESS}`}
+              title={TORCH_CONTRACT_ADDRESS}
+            >
+              {t("page-10-year-nft-link-label")}
+            </Link>
           </AlertContent>
         </Alert>
       </CardContent>

app/[locale]/developers/learning-tools/_components/learning-tools.tsx

@@ -28,10 +28,8 @@ import DappWorldImage from "@/public/images/dev-tools/dapp-world.png"
 import EthDotBuildImage from "@/public/images/dev-tools/eth-dot-build.png"
 import LearnWeb3Image from "@/public/images/dev-tools/learnweb3.png"
 import MetaschoolImage from "@/public/images/dev-tools/metaschool.png"
-import NFTSchoolImage from "@/public/images/dev-tools/nftschool.png"
 import NodeGuardiansImage from "@/public/images/dev-tools/node-guardians.jpg"
 import EthernautImage from "@/public/images/dev-tools/oz.png"
-import PlatziImage from "@/public/images/dev-tools/platzi.png"
 import QuestbookImage from "@/public/images/dev-tools/questbook.png"
 import RemixImage from "@/public/images/dev-tools/remix.png"
 import ReplitImage from "@/public/images/dev-tools/replit.png"
@@ -317,33 +315,6 @@ const LearningToolsPage = () => {
       background: "#f6f7f9",
       subjects: ["Solidity", "web3"],
     },
-    {
-      name: "NFT School",
-      description: t(
-        "page-developers-learning-tools:page-learning-tools-nftschool-description"
-      ),
-      url: "https://nftschool.dev/",
-      image: NFTSchoolImage,
-      alt: t(
-        "page-developers-learning-tools:page-learning-tools-nftschool-logo-alt"
-      ),
-      background: "#111f29",
-      subjects: ["Solidity", "web3"],
-    },
-    {
-      name: "Platzi",
-      description: t(
-        "page-developers-learning-tools:page-learning-tools-platzi-description"
-      ),
-      url: "https://platzi.com/escuela/escuela-blockchain/",
-      image: PlatziImage,
-      alt: t(
-        "page-developers-learning-tools:page-learning-tools-platzi-logo-alt"
-      ),
-      background: "#121f3d",
-      subjects: ["Solidity", "web3"],
-      locales: ["es"],
-    },
     {
       name: "Speed Run Ethereum",
       description: t(

app/[locale]/developers/page.tsx

@@ -1,5 +1,4 @@
 import { Fragment } from "react"
-import { Check } from "lucide-react"
 import { getTranslations } from "next-intl/server"
 
 import type { Lang } from "@/lib/types"
@@ -10,6 +9,7 @@ import BigNumber from "@/components/BigNumber"
 import { CopyButton } from "@/components/CopyToClipboard"
 import FeedbackCard from "@/components/FeedbackCard"
 import HubHero from "@/components/Hero/HubHero"
+import { CheckCircle } from "@/components/icons/CheckCircle"
 import { Image } from "@/components/Image"
 import MainArticle from "@/components/MainArticle"
 import { ButtonLink } from "@/components/ui/buttons/Button"
@@ -99,13 +99,7 @@ const WhyGrid = () => {
     >
       {items.map(({ heading, description }) => (
         <div className="flex gap-1.5" key={heading}>
-          <div className="my-1 grid h-fit place-items-center rounded-full bg-success/20 p-1">
-            <Check
-              className="size-3 stroke-[4] text-success"
-              strokeLinecap="square"
-              strokeLinejoin="miter"
-            />
-          </div>
+          <CheckCircle />
           <div className="space-y-1">
             <h3 className="text-lg">{heading}</h3>
             <p className="text-body-medium">{description}</p>