Post-merge cleanup

package.json

@@ -69,7 +69,6 @@
     "react-icons": "^4.3.1",
     "react-instantsearch-dom": "^6.32.0",
     "react-intl": "^3.12.1",
-    "react-rewards": "^2.0.4",
     "react-select": "^4.3.0",
     "recharts": "^2.1.9",
     "styled-system": "^5.1.5",

src/components/Layout.tsx

@@ -8,9 +8,6 @@ import { LocaleProvider } from "gatsby-theme-i18n"
 
 import { lightTheme, darkTheme } from "../theme"
 
-import BannerNotification from "./BannerNotification"
-import Link from "./Link"
-import Translation from "./Translation"
 import Footer from "./Footer"
 import VisuallyHidden from "./VisuallyHidden"
 import Nav from "./Nav"
@@ -24,7 +21,6 @@ import { SkipLink, SkipLinkAnchor } from "./SkipLink"
 import { ZenModeContext } from "../contexts/ZenModeContext"
 
 import { useKeyPress } from "../hooks/useKeyPress"
-import { useConfetti } from "../hooks/useConfetti"
 
 import { isLangRightToLeft } from "../utils/translations"
 import { scrollIntoView } from "../utils/scrollIntoView"
@@ -68,11 +64,6 @@ const Main = styled.main`
   flex-grow: 1;
 `
 
-const Centered = styled.div`
-  display: flex;
-  justify-content: center;
-`
-
 export interface IProps {
   children?: React.ReactNode
   data?: {
@@ -101,8 +92,6 @@ const Layout: React.FC<IProps> = ({
 
   const [isZenMode, setIsZenMode] = useState<boolean>(false)
   const [shouldShowSideNav, setShouldShowSideNav] = useState<boolean>(false)
-  const [isHomepage, setIsHomepage] = useState<boolean>(false)
-  const [isMergePage, setIsMergePage] = useState<boolean>(false)
   const locale = pageContext.locale
   const messages = require(`../intl/${locale}.json`)
 
@@ -126,12 +115,8 @@ const Layout: React.FC<IProps> = ({
       const idTag = location.hash.split("#")
       scrollIntoView(idTag[1])
     }
-    setIsHomepage(path === `/${locale}/`)
-    setIsMergePage(path === `/${locale}/upgrades/merge/`)
   }, [path, location])
 
-  useConfetti("confetti-easter-egg")
-
   const handleZenModeChange = (val?: boolean): void => {
     // Use 'val' param if provided. Otherwise toggle
     const newVal = val !== undefined ? val : !isZenMode
@@ -180,22 +165,7 @@ const Layout: React.FC<IProps> = ({
                 <Nav path={path} />
                 {shouldShowSideNav && <SideNavMobile path={path} />}
               </VisuallyHidden>
-              <BannerNotification
-                shouldShow={isHomepage}
-                justify="center"
-                zIndex="1"
-                textAlign="center"
-              >
-                <div>
-                  <Translation id="merge-complete" />
-                  &nbsp;
-                  <Link to="/upgrades/merge">
-                    <Translation id="learn-more" />
-                  </Link>
-                </div>
-              </BannerNotification>
               <SkipLinkAnchor id="main-content" />
-              {isMergePage && <Centered id="confetti-easter-egg" />}
               <MainContainer>
                 {shouldShowSideNav && (
                   <VisuallyHidden isHidden={isZenMode}>

src/intl/el/common.json

@@ -166,7 +166,6 @@
   "matcha-logo": "Λογότυπο Matcha",
   "medalla-data-challenge": "Πρόκληση δεδομένων Medalla",
   "merge": "Συγχώνευση",
-  "merge-complete": "Η Συγχώνευση ολοκληρώθηκε! Καλωσήρθατε σε ένα πιο πράσινο Ethereum.",
   "more": "Περισσότερα",
   "more-info": "Περισσότερες πληροφορίες",
   "nav-beginners": "Αρχάριοι",

src/intl/en/common.json

@@ -191,7 +191,6 @@
   "matcha-logo": "Matcha logo",
   "medalla-data-challenge": "Medalla data challenge",
   "merge": "Merge",
-  "merge-complete": "The Merge is complete! Welcome to a new greener Ethereum.",
   "mission-and-vision": "Mission and vision",
   "more": "More",
   "more-info": "More info",

src/intl/en/page-assets.json

@@ -33,6 +33,9 @@
   "page-assets-future": "Future",
   "page-assets-h1": "ethereum.org assets",
   "page-assets-hero": "ethereum.org hero",
+  "page-assets-hero-panda": "ethereum.org hero with merge panda",
+  "page-assets-merge-panda": "Merge panda",
+  "page-assets-merge-panda-svg": "Merge panda SVG",
   "page-assets-hero-particles": "ETH particles image",
   "page-assets-historical-artwork": "Historical artwork",
   "page-assets-illustrations": "Illustrations",

src/intl/fr/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Logo Matcha",
   "medalla-data-challenge": "Défi de données Medalla",
   "merge": "Fusionner",
-  "merge-complete": "La fusion s'est produite ! Bienvenue dans un Ethereum plus vert.",
   "more": "Plus",
   "more-info": "Plus d'infos",
   "nav-beginners": "Débutants",

src/intl/hi/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Matcha लोगो",
   "medalla-data-challenge": "Medalla डेटा चुनौती",
   "merge": "मर्ज करें",
-  "merge-complete": "मर्ज पूरा हो गया है! एक नए हरित Ethereum में आपका स्वागत है।",
   "more": "अधिक",
   "more-info": "अधिक जानकारी",
   "nav-beginners": "नई शुरुआत",

src/intl/id/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Logo Matcha",
   "medalla-data-challenge": "Tantangan data Medalla",
   "merge": "Gabungkan",
-  "merge-complete": "Penggabungan telah selesai!  Selamat datang di Ethereum baru yang lebih hijau.",
   "more": "Lebih Banyak",
   "more-info": "Info lebih lanjut",
   "nav-beginners": "Pemula",

src/intl/ja/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Matcha ロゴ",
   "medalla-data-challenge": "Medallaデータチャレンジ",
   "merge": "マージ",
-  "merge-complete": "マージ完了! より環境に優しくなったイーサリアムへようこそ。",
   "more": "もっと見る",
   "more-info": "詳細",
   "nav-beginners": "初心者",

src/intl/nl/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Matcha-logo",
   "medalla-data-challenge": "Medalla-gegevensuitdaging",
   "merge": "Samenvoegen",
-  "merge-complete": "De Merge is compleet! Welkom bij een nieuw groener Ethereum.",
   "more": "Meer",
   "more-info": "Meer info",
   "nav-beginners": "Beginners",

src/intl/pl/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Logo Matcha",
   "medalla-data-challenge": "Wyzwanie z danymi Medalla",
   "merge": "Połącz",
-  "merge-complete": "Merge jest gotowy! Witajcie w nowym, bardziej zielonym Ethereum.",
   "more": "Więcej",
   "more-info": "Więcej informacji",
   "nav-beginners": "Początkujący",

src/intl/pt-br/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Logotipo da Matcha",
   "medalla-data-challenge": "Desafio de dados Medalla",
   "merge": "Integração",
-  "merge-complete": "A Fusão está completa! Bem-vindo a uma nova Ethereum mais verde.",
   "more": "Mais",
   "more-info": "Mais informações",
   "nav-beginners": "Principiantes",

src/intl/pt/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Logótipo da Matcha",
   "medalla-data-challenge": "Desafio de dados Medalla",
   "merge": "Fundir",
-  "merge-complete": "A fusão está completa! Bem-vindo a um novo Ethereum mais verde.",
   "more": "Mais",
   "more-info": "Mais informação",
   "nav-beginners": "Principiantes",

src/intl/ru/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Логотип Matcha",
   "medalla-data-challenge": "Конкурс данных Medalla",
   "merge": "Объединение",
-  "merge-complete": "Слияние завершено! Добро пожаловать в новый экологичный Ethereum.",
   "more": "Больше",
   "more-info": "Подробнее",
   "nav-beginners": "Начинающим",

src/intl/sw/common.json

@@ -172,7 +172,6 @@
   "matcha-logo": "Nembo ya Matcha",
   "medalla-data-challenge": "Changamoto ya data ya Medella",
   "merge": "Unganisha",
-  "merge-complete": "Muungano umekamilika! Karibu kwenye Ethereum inayojali mazingira.",
   "more": "Zaidi",
   "more-info": "Habari zaidi",
   "nav-beginners": "Wanaoanza",

src/intl/vi/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Logo Matcha",
   "medalla-data-challenge": "Thử thách dữ liệu Medalla",
   "merge": "Gộp",
-  "merge-complete": "Hợp nhất đã hoàn tất! Chào mừng bạn đến với kỷ nguyên xanh mới của Ethereum.",
   "more": "Xem thêm",
   "more-info": "Thông tin chi tiết",
   "nav-beginners": "Người mới bắt đầu",

src/intl/zh/common.json

@@ -184,7 +184,6 @@
   "matcha-logo": "Matcha徽标",
   "medalla-data-challenge": "Medalla 数据挑战赛",
   "merge": "合并",
-  "merge-complete": "大合并业已完成！欢迎进入一个崭新的、更加绿色环保的以太坊",
   "more": "更多",
   "more-info": "更多信息",
   "nav-beginners": "初学者",

src/pages/assets.tsx

@@ -8,6 +8,7 @@ import { graphql, PageProps } from "gatsby"
 
 // Assets
 import EthGlyphColoredSvg from "../assets/assets/eth-glyph-colored.svg"
+import MergePandaSvg from "../assets/home/merge-panda.svg"
 
 // Components
 import AssetDownload from "../components/AssetDownload"
@@ -131,6 +132,23 @@ const AssetsPage = ({ data }: PageProps<Queries.AssetsPageQuery, Context>) => {
             artistUrl="https://liamcobb.com/"
           />
         </Row>
+        <Row>
+          <AssetDownload
+            title={translateMessageId("page-assets-hero-panda", intl)}
+            alt={translateMessageId("page-assets-hero-panda", intl)}
+            image={data.heroPanda}
+          />
+          <AssetDownload
+            title={translateMessageId("page-assets-merge-panda", intl)}
+            alt={translateMessageId("page-assets-merge-panda", intl)}
+            image={data.mergePanda}
+          />
+          <AssetDownload
+            title={translateMessageId("page-assets-merge-panda-svg", intl)}
+            alt={translateMessageId("page-assets-merge-panda-svg", intl)}
+            svg={MergePandaSvg}
+          />
+        </Row>
 
         <Row>
           <AssetDownload
@@ -564,6 +582,12 @@ export const query = graphql`
     hero: file(relativePath: { eq: "home/hero.png" }) {
       ...assetItem
     }
+    heroPanda: file(relativePath: { eq: "home/hero-panda.png" }) {
+      ...assetItem
+    }
+    mergePanda: file(relativePath: { eq: "home/merge-panda.png" }) {
+      ...assetItem
+    }
     doge: file(relativePath: { eq: "doge-computer.png" }) {
       ...assetItem
     }

yarn.lock

@@ -14806,11 +14806,6 @@ react-resize-detector@^7.1.2:
   dependencies:
     lodash "^4.17.21"
 
-react-rewards@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/react-rewards/-/react-rewards-2.0.4.tgz#617f6c1bb591f74bb0e0455cc6ff355ee6d36665"
-  integrity sha512-Lw7gIhD8yPDzC6boaVmcXwuTHRLSLAdqB3kZc+29YWvdHWsuc3fdAZlxI8Cm8fvD8fhP+3JkZBtzX224czw15w==
-
 react-select@^4.3.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"