Merge pull request #16063 from ethereum/dev

Release candidate v10.10.0

Author: corwintines

.all-contributorsrc

@@ -2748,7 +2748,9 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/2653167?v=4",
       "profile": "http://austingriffith.com",
       "contributions": [
-        "content"
+        "content",
+        "tool",
+        "maintenance"
       ]
     },
     {
@@ -12365,7 +12367,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/82784104?v=4",
       "profile": "https://github.com/JoshDavisLight",
       "contributions": [
-        "content"
+        "content",
+        "maintenance"
       ]
     },
     {
@@ -12672,7 +12675,9 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/171761102?v=4",
       "profile": "https://github.com/JoeChenJ",
       "contributions": [
-        "content"
+        "content",
+        "bug",
+        "code"
       ]
     },
     {
@@ -12857,6 +12862,15 @@
         "content"
       ]
     },
+    {
+      "login": "Tri-stone",
+      "name": "Tri-stone",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17921243?v=4",
+      "profile": "https://github.com/Tri-stone",
+      "contributions": [
+        "maintenance"
+      ]
+    },
     {
       "login": "deca12x",
       "name": "deca",
@@ -13047,6 +13061,60 @@
       "contributions": [
         "maintenance"
       ]
+    },
+    {
+      "login": "Co1nB3e",
+      "name": "Co1nB3e",
+      "avatar_url": "https://avatars.githubusercontent.com/u/91367832?v=4",
+      "profile": "https://github.com/Co1nB3e",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "Verestra",
+      "name": "Revo Arya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44845508?v=4",
+      "profile": "https://github.com/Verestra",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "teniolafatunmbi",
+      "name": "Teniola Fatunmbi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/70762806?v=4",
+      "profile": "http://teniolafatunmbi.com",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "dinitheth",
+      "name": "Dinith",
+      "avatar_url": "https://avatars.githubusercontent.com/u/170238361?v=4",
+      "profile": "https://github.com/dinitheth",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "julio4",
+      "name": "Julio",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30329843?v=4",
+      "profile": "https://github.com/julio4",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "abeldotam",
+      "name": "Abel Derderian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5216201?v=4",
+      "profile": "http://abel.fr",
+      "contributions": [
+        "maintenance"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -22,6 +22,7 @@
 # Google API key and Calendar ID (required to fetch Calendar events)
 # GOOGLE_API_KEY=
 # GOOGLE_CALENDAR_ID=
+# GOOGLE_SHEET_ID_DAPPS=
 
 # Dune Analytics API key (required for total eth staked)
 # DUNE_API_KEY=

README.md

@@ -1,129 +1,75 @@
-"use client"
-
-import { useMemo, useState } from "react"
-
 import { Alert, AlertContent, AlertTitle } from "@/components/ui/alert"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
 
 import { cn } from "@/lib/utils/cn"
 
-import CountDown from "../CountDown"
-
-import Connection from "./Connection"
-import GasFeeInformation from "./GasFeeInformation"
-
 import Curved10YearsText from "@/public/images/10-year-anniversary/10y-curved-heading.svg"
 
 interface NFTMintCardProps {
   className?: string
 }
 
-const endTimestamp = process.env.NEXT_PUBLIC_MINT_TIMESTAMP_END
-
-if (!endTimestamp) {
-  throw new Error("NEXT_PUBLIC_MINT_TIMESTAMP_END is not set")
-}
-
 const NFTMintCard = ({ className }: NFTMintCardProps) => {
-  const endDateTime = useMemo(() => {
-    return new Date(Number(endTimestamp) * 1000).toISOString()
-  }, [])
-
-  const [isExpired, setIsExpired] = useState(false)
-
-  const handleExpired = () => {
-    setIsExpired(true)
-  }
-
   return (
-    <>
-      <Card
-        className={cn(
-          "w-full overflow-hidden rounded-3xl bg-gradient-to-b from-[#A66BFF20] to-[#EED9FE16] shadow-lg",
-          className
-        )}
-      >
-        <CardHeader className="gap-4 pb-0">
-          <div className="relative">
-            {/* Torch/flame video */}
-            <div className="flex items-center justify-center pt-12">
-              <div className="relative max-h-[200px] max-w-[200px] overflow-hidden rounded-full border-4 border-white bg-white">
-                <video
-                  className="pointer-events-none h-full w-full select-none rounded-full object-cover"
-                  src="/videos/10y-video.mp4"
-                  aria-label="10th anniversary video"
-                  autoPlay
-                  loop
-                  muted
-                  poster="/images/10-year-anniversary/10y-cover.png"
-                  controlsList="nodownload"
-                  disablePictureInPicture
-                  playsInline
-                />
-              </div>
+    <Card
+      className={cn(
+        "w-full overflow-hidden rounded-3xl bg-gradient-to-b from-[#A66BFF20] to-[#EED9FE16] shadow-lg",
+        className
+      )}
+    >
+      <CardHeader className="gap-4 pb-0">
+        <div className="relative">
+          {/* Torch/flame video */}
+          <div className="flex items-center justify-center pt-12">
+            <div className="relative max-h-[200px] max-w-[200px] overflow-hidden rounded-full border-4 border-white bg-white">
+              <video
+                className="pointer-events-none h-full w-full select-none rounded-full object-cover"
+                src="/videos/10y-video.mp4"
+                aria-label="10th anniversary video"
+                autoPlay
+                loop
+                muted
+                poster="/images/10-year-anniversary/10y-cover.png"
+                controlsList="nodownload"
+                disablePictureInPicture
+                playsInline
+              />
             </div>
-
-            {/* Curved text */}
-            <Curved10YearsText
-              viewBox="0 0 313 186"
-              className="absolute left-1/2 top-0 h-min w-full max-w-[300px] -translate-x-1/2 fill-primary"
-              width="100%"
-              height="auto"
-            />
           </div>
 
-          <CardTitle className="text-center">Mint the moment</CardTitle>
-        </CardHeader>
-
-        <CardContent className="space-y-6 p-6 text-center">
-          <p className="text-body-medium">
-            Celebrate a decade of decentralization with a free, limited-time
-            10th anniversary NFT. Mint yours before time runs out.
-          </p>
-
-          {isExpired ? (
-            <Alert
-              variant="update"
-              className="w-full rounded-none border-none text-center"
-            >
-              <AlertContent>
-                <AlertTitle className="!text-primary">
-                  The claim period has ended
-                </AlertTitle>
-                <p className="text-primary">
-                  Thank you all for joining the celebration
-                </p>
-              </AlertContent>
-            </Alert>
-          ) : (
-            <>
-              <div className="space-y-2">
-                <CountDown
-                  className="text-primary"
-                  dateTime={endDateTime}
-                  onExpired={handleExpired}
-                  hideZeroUnits
-                  timeLeftLabels={{
-                    days: { singular: "day", plural: "days" },
-                    hours: { singular: "hour", plural: "hours" },
-                    minutes: { singular: "minute", plural: "minutes" },
-                    seconds: { singular: "second", plural: "seconds" },
-                  }}
-                  expiredLabel="Minting has ended"
-                />
-                <p className="text-sm text-body-medium">
-                  Time remaining to mint
-                </p>
-              </div>
-
-              <GasFeeInformation />
-
-              <Connection />
-            </>
-          )}
-        </CardContent>
-      </Card>
-    </>
+          {/* Curved text */}
+          <Curved10YearsText
+            viewBox="0 0 313 186"
+            className="absolute left-1/2 top-0 h-min w-full max-w-[300px] -translate-x-1/2 fill-primary"
+            width="100%"
+            height="auto"
+          />
+        </div>
+
+        <CardTitle className="text-center">Mint the moment</CardTitle>
+      </CardHeader>
+
+      <CardContent className="space-y-6 p-6 text-center">
+        <p className="text-body-medium">
+          Celebrate a decade of decentralization with a free, limited-time 10th
+          anniversary NFT. Mint yours before time runs out.
+        </p>
+
+        <Alert
+          variant="update"
+          className="w-full rounded-none border-none text-center"
+        >
+          <AlertContent>
+            <AlertTitle className="!text-primary">
+              The claim period has ended
+            </AlertTitle>
+            <p className="text-primary">
+              Thank you all for joining the celebration
+            </p>
+          </AlertContent>
+        </Alert>
+      </CardContent>
+    </Card>
   )
 }
 

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

@@ -2,22 +2,15 @@
 
 import { useState } from "react"
 
+import { Story } from "@/lib/types"
+
 import Twitter from "@/components/icons/twitter.svg"
 import { Button, ButtonLink } from "@/components/ui/buttons/Button"
 
 import { cn } from "@/lib/utils/cn"
 
 import { useTranslation } from "@/hooks/useTranslation"
 
-type Story = {
-  name: string
-  storyEnglish: string
-  storyOriginal: string | null
-  twitter?: string
-  country: string
-  date: string
-}
-
 type StoriesProps = {
   stories: Story[]
 }