From fbb5d746b84c3595d97ffcfa46141c4396631741 Mon Sep 17 00:00:00 2001
From: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date: Wed, 28 Sep 2022 14:02:29 -0700
Subject: [PATCH] remove: merge-complete string and comments

---
 src/components/Layout.tsx  | 15 ---------------
 src/intl/el/common.json    |  1 -
 src/intl/en/common.json    |  1 -
 src/intl/fr/common.json    |  1 -
 src/intl/hi/common.json    |  1 -
 src/intl/id/common.json    |  1 -
 src/intl/ja/common.json    |  1 -
 src/intl/nl/common.json    |  1 -
 src/intl/pl/common.json    |  1 -
 src/intl/pt-br/common.json |  1 -
 src/intl/pt/common.json    |  1 -
 src/intl/ru/common.json    |  1 -
 src/intl/sw/common.json    |  1 -
 src/intl/vi/common.json    |  1 -
 src/intl/zh/common.json    |  1 -
 15 files changed, 29 deletions(-)

diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 64858de417d..73fd604fd44 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -165,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}>
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/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": "初学者",