From 8481ada3fea6be36c69f0536b5cac4a168493d04 Mon Sep 17 00:00:00 2001 From: zzq0826 <770166635@qq.com> Date: Sat, 9 Mar 2024 09:00:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Auto=20squash=20#1002=20=E2=80=89[bot]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f433ab0a..5d6e48334 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scroll.io", - "version": "5.0.78", + "version": "5.0.79", "private": false, "license": "MIT", "scripts": { From 383c5d4fc1653e66de5c34760e96f794e275b091 Mon Sep 17 00:00:00 2001 From: zzq0826 <770166635@qq.com> Date: Wed, 13 Mar 2024 15:27:47 +0800 Subject: [PATCH 2/2] Close origin nft (#1006) * close origin nft * adjust logic --- src/constants/nft.ts | 2 + .../developer-nft/mint/home/ReadyToMint.tsx | 54 ++++++++++++------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/constants/nft.ts b/src/constants/nft.ts index 31045c316..cf7cc47d2 100644 --- a/src/constants/nft.ts +++ b/src/constants/nft.ts @@ -17,6 +17,8 @@ export const EndDate = dayjs("2023-12-09T23:00:00Z").subtract(1, "ms") export const MintableDate = dayjs("2023-12-14T23:00:00Z") // 1702594800 +export const MintableEndDate = dayjs("2024-03-29T23:59:59Z") + export const ContractReleaseDate = dayjs("2023-12-14T11:30:42Z") export const NFT_RARITY_MAP = { diff --git a/src/pages/developer-nft/mint/home/ReadyToMint.tsx b/src/pages/developer-nft/mint/home/ReadyToMint.tsx index 66b77ee14..e64b836b9 100644 --- a/src/pages/developer-nft/mint/home/ReadyToMint.tsx +++ b/src/pages/developer-nft/mint/home/ReadyToMint.tsx @@ -1,4 +1,5 @@ import { useState } from "react" +import Countdown, { zeroPad } from "react-countdown" import ReactGA from "react-ga4" import { Box, Stack, Typography } from "@mui/material" @@ -10,7 +11,7 @@ import Button from "@/components/Button" import Link from "@/components/Link" import RequestWarning from "@/components/RequestWarning" import { ANNOUNCING_SCROLL_ORIGINS_NFT, ContractReleaseDate, DESIGNING_SCROLL_ORIGINS } from "@/constants" -import { CHAIN_ID, L2_NAME, SCROLL_ORIGINS_NFT } from "@/constants" +import { CHAIN_ID, L2_NAME, MintableEndDate, SCROLL_ORIGINS_NFT } from "@/constants" import { useRainbowContext } from "@/contexts/RainbowProvider" import useCheckViewport from "@/hooks/useCheckViewport" import useNFTStore from "@/stores/nftStore" @@ -65,8 +66,15 @@ const MintHome = props => { }) } - const renderAction = () => { + const renderAction = (end = false) => { if (chainId === CHAIN_ID.L2) { + if (end) { + return ( + + ) + } return (