diff --git a/package.json b/package.json
index 7cc37bdcc1a..b58871451c2 100644
--- a/package.json
+++ b/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",
diff --git a/src/assets/home/default_hero.png b/src/assets/home/default_hero.png
deleted file mode 100644
index ae5670ad9ef..00000000000
Binary files a/src/assets/home/default_hero.png and /dev/null differ
diff --git a/src/assets/home/hero-panda.png b/src/assets/home/hero-panda.png
new file mode 100644
index 00000000000..df2adb14963
Binary files /dev/null and b/src/assets/home/hero-panda.png differ
diff --git a/src/assets/home/hero.png b/src/assets/home/hero.png
index df2adb14963..ae5670ad9ef 100644
Binary files a/src/assets/home/hero.png and b/src/assets/home/hero.png differ
diff --git a/src/assets/home/merge-panda.png b/src/assets/home/merge-panda.png
new file mode 100644
index 00000000000..4742649da14
Binary files /dev/null and b/src/assets/home/merge-panda.png differ
diff --git a/src/assets/home/merge-panda.svg b/src/assets/home/merge-panda.svg
new file mode 100644
index 00000000000..44fe6ed235c
--- /dev/null
+++ b/src/assets/home/merge-panda.svg
@@ -0,0 +1,714 @@
+
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index ab508771838..73fd604fd44 100644
--- a/src/components/Layout.tsx
+++ b/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 = ({
const [isZenMode, setIsZenMode] = useState(false)
const [shouldShowSideNav, setShouldShowSideNav] = useState(false)
- const [isHomepage, setIsHomepage] = useState(false)
- const [isMergePage, setIsMergePage] = useState(false)
const locale = pageContext.locale
const messages = require(`../intl/${locale}.json`)
@@ -126,12 +115,8 @@ const Layout: React.FC = ({
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 = ({
{shouldShowSideNav && }
-
-
-
-
-
-
-
-
-
- {isMergePage && }
{shouldShowSideNav && (
diff --git a/src/hooks/useConfetti.ts b/src/hooks/useConfetti.ts
deleted file mode 100644
index 5975a8254f5..00000000000
--- a/src/hooks/useConfetti.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useEffect } from "react"
-import { useReward } from "react-rewards"
-
-export const useConfetti = (elementId: string): void => {
- const { reward: confetti } = useReward(elementId, "confetti", {
- spread: 360,
- elementCount: 42,
- position: "absolute",
- zIndex: 10,
- lifetime: 420,
- })
- useEffect(() => {
- confetti()
- })
-}
diff --git a/src/intl/el/common.json b/src/intl/el/common.json
index 086b07a9908..a4a470522b3 100644
--- a/src/intl/el/common.json
+++ b/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": "Αρχάριοι",
diff --git a/src/intl/en/common.json b/src/intl/en/common.json
index aa9a891494a..a83c932bed6 100644
--- a/src/intl/en/common.json
+++ b/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",
diff --git a/src/intl/en/page-assets.json b/src/intl/en/page-assets.json
index 9fbcf8efd41..f8fe30d912d 100644
--- a/src/intl/en/page-assets.json
+++ b/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",
diff --git a/src/intl/fr/common.json b/src/intl/fr/common.json
index eee33b88379..caac283e37c 100644
--- a/src/intl/fr/common.json
+++ b/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",
diff --git a/src/intl/hi/common.json b/src/intl/hi/common.json
index 24c27c2e295..46139134ad2 100644
--- a/src/intl/hi/common.json
+++ b/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": "नई शुरुआत",
diff --git a/src/intl/id/common.json b/src/intl/id/common.json
index 0a2059f6d03..f269a8b7401 100644
--- a/src/intl/id/common.json
+++ b/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",
diff --git a/src/intl/ja/common.json b/src/intl/ja/common.json
index cf3d6509b57..e16ca21e056 100644
--- a/src/intl/ja/common.json
+++ b/src/intl/ja/common.json
@@ -184,7 +184,6 @@
"matcha-logo": "Matcha ロゴ",
"medalla-data-challenge": "Medallaデータチャレンジ",
"merge": "マージ",
- "merge-complete": "マージ完了! より環境に優しくなったイーサリアムへようこそ。",
"more": "もっと見る",
"more-info": "詳細",
"nav-beginners": "初心者",
diff --git a/src/intl/nl/common.json b/src/intl/nl/common.json
index 2ff8e6d4576..fcc7b44c8b0 100644
--- a/src/intl/nl/common.json
+++ b/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",
diff --git a/src/intl/pl/common.json b/src/intl/pl/common.json
index 4fec2ef4d51..b5ca3ec7be2 100644
--- a/src/intl/pl/common.json
+++ b/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",
diff --git a/src/intl/pt-br/common.json b/src/intl/pt-br/common.json
index d3b7c8635bc..9d25a6460d7 100644
--- a/src/intl/pt-br/common.json
+++ b/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",
diff --git a/src/intl/pt/common.json b/src/intl/pt/common.json
index ecd28b837a6..ae098a0e92e 100644
--- a/src/intl/pt/common.json
+++ b/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",
diff --git a/src/intl/ru/common.json b/src/intl/ru/common.json
index 0293d1cc756..46f67cbcc10 100644
--- a/src/intl/ru/common.json
+++ b/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": "Начинающим",
diff --git a/src/intl/sw/common.json b/src/intl/sw/common.json
index 5c7c05b9b4c..8d27709a7f9 100644
--- a/src/intl/sw/common.json
+++ b/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",
diff --git a/src/intl/vi/common.json b/src/intl/vi/common.json
index 9d343240437..cdf0a59d7a1 100644
--- a/src/intl/vi/common.json
+++ b/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",
diff --git a/src/intl/zh/common.json b/src/intl/zh/common.json
index 2e3fa187381..4a23384dca6 100644
--- a/src/intl/zh/common.json
+++ b/src/intl/zh/common.json
@@ -184,7 +184,6 @@
"matcha-logo": "Matcha徽标",
"medalla-data-challenge": "Medalla 数据挑战赛",
"merge": "合并",
- "merge-complete": "大合并业已完成!欢迎进入一个崭新的、更加绿色环保的以太坊",
"more": "更多",
"more-info": "更多信息",
"nav-beginners": "初学者",
diff --git a/src/pages/assets.tsx b/src/pages/assets.tsx
index 7866d830e90..701d48fbb49 100644
--- a/src/pages/assets.tsx
+++ b/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) => {
artistUrl="https://liamcobb.com/"
/>
+
+
+
+
+