From d954aa4679c7c6670ed0e52f82118c7934e0a801 Mon Sep 17 00:00:00 2001
From: swimdrew <andrew@kvasium.com>
Date: Mon, 24 Oct 2022 16:46:27 -0400
Subject: [PATCH] chore: Remove ethereum merge related code

---
 .../molecules/EthereumMergeWarning.tsx        |  16 --
 apps/ui/src/pages/PoolPage.tsx                | 179 +++++++++---------
 apps/ui/src/pages/PoolsPage.tsx               |   7 +-
 apps/ui/src/pages/SwapPage/SwapPage.tsx       |   5 +-
 4 files changed, 89 insertions(+), 118 deletions(-)
 delete mode 100644 apps/ui/src/components/molecules/EthereumMergeWarning.tsx

diff --git a/apps/ui/src/components/molecules/EthereumMergeWarning.tsx b/apps/ui/src/components/molecules/EthereumMergeWarning.tsx
deleted file mode 100644
index 179c211ed..000000000
--- a/apps/ui/src/components/molecules/EthereumMergeWarning.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { EuiCallOut, EuiText } from "@elastic/eui";
-import type { ReactElement } from "react";
-
-export const EthereumMergeWarning = (): ReactElement => (
-  <>
-    <EuiCallOut title={"Ethereum Merge"} color="warning">
-      <EuiText>
-        <p>
-          {
-            "Please note that as a precaution we have temporarily disabled our pools while the Ethereum merge takes place."
-          }
-        </p>
-      </EuiText>
-    </EuiCallOut>
-  </>
-);
diff --git a/apps/ui/src/pages/PoolPage.tsx b/apps/ui/src/pages/PoolPage.tsx
index e79b0b49f..d7716d9ef 100644
--- a/apps/ui/src/pages/PoolPage.tsx
+++ b/apps/ui/src/pages/PoolPage.tsx
@@ -34,7 +34,6 @@ import { RemoveForm } from "../components/RemoveForm";
 import { SlippageButton } from "../components/SlippageButton";
 import { StatList } from "../components/StatList";
 import { TokenConfigIcon, TokenIcon } from "../components/TokenIcon";
-import { EthereumMergeWarning } from "../components/molecules/EthereumMergeWarning";
 import type { PoolSpec } from "../config";
 import { getSolanaTokenDetails, getTokenDetailsForEcosystem } from "../config";
 import { selectConfig } from "../core/selectors";
@@ -239,97 +238,93 @@ export const PoolPageInner = ({
 
       <EuiSpacer size="m" />
 
-      {process.env.REACT_APP_ETHEREUM_MERGE === "true" ? (
-        <EthereumMergeWarning />
-      ) : (
-        <EuiFlexGroup justifyContent="spaceAround" gutterSize="xl">
-          <EuiFlexItem style={{ minWidth: "50%" }}>
-            <EuiTabbedContent
-              expand={true}
-              size="m"
-              tabs={[
-                {
-                  id: "add",
-                  name: poolSpec.isStakingPool
-                    ? t("glossary.stake_tokens")
-                    : t("general.add_tokens_to_pool"),
-                  content: (
-                    <AddForm
-                      poolSpec={poolSpec}
-                      maxSlippageFraction={slippageFraction}
-                    />
-                  ),
-                },
-                {
-                  id: "remove",
-                  name: poolSpec.isStakingPool
-                    ? t("glossary.unstake_tokens")
-                    : t("general.remove_tokens_from_pool"),
-                  content: (
-                    <RemoveForm
-                      poolSpec={poolSpec}
-                      maxSlippageFraction={slippageFraction}
-                    />
-                  ),
-                },
-              ]}
-            />
-          </EuiFlexItem>
-          <EuiFlexItem grow={false} className="statList">
-            <EuiTitle size="xxs">
-              <h4>
-                {t("pool_page.pool_balance", { count: reserveStats.length })}
-              </h4>
-            </EuiTitle>
-            <EuiSpacer size="s" />
-            <StatList listItems={reserveStats} />
-            <EuiSpacer />
-            <EuiTitle size="xxs">
-              <h4>
-                {t("pool_page.user_balance", { count: userLpStats.length })}
-              </h4>
-            </EuiTitle>
-            <EuiSpacer size="s" />
-            <StatList listItems={userLpStats} />
-            <EuiSpacer />
-            {!poolSpec.isStakingPool && (
-              <>
-                <EuiTitle size="xxs">
-                  <h4>{t("pool_page.pool_info")}</h4>
-                </EuiTitle>
-                <EuiSpacer size="s" />
-                <StatList listItems={poolInfoStats} />
-              </>
-            )}
-            {getTokenDetailsForEcosystem(lpToken, EvmEcosystemId.Ethereum) !==
-              null && (
-              <EuiButtonEmpty
-                flush="left"
-                style={{ width: "fit-content" }}
-                onClick={() => {
-                  showRegisterEthereumTokenPrompt(lpToken).catch(console.error);
-                }}
-                iconType={ETHEREUM_SVG}
-              >
-                {t("pool_page.add_lp_token_to_metamask")}
-              </EuiButtonEmpty>
-            )}
-            {getTokenDetailsForEcosystem(lpToken, EvmEcosystemId.Bnb) !==
-              null && (
-              <EuiButtonEmpty
-                flush="left"
-                style={{ width: "fit-content" }}
-                onClick={() => {
-                  showRegisterBnbTokenPrompt(lpToken).catch(console.error);
-                }}
-                iconType={BNB_SVG}
-              >
-                {t("pool_page.add_lp_token_to_metamask")}
-              </EuiButtonEmpty>
-            )}
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      )}
+      <EuiFlexGroup justifyContent="spaceAround" gutterSize="xl">
+        <EuiFlexItem style={{ minWidth: "50%" }}>
+          <EuiTabbedContent
+            expand={true}
+            size="m"
+            tabs={[
+              {
+                id: "add",
+                name: poolSpec.isStakingPool
+                  ? t("glossary.stake_tokens")
+                  : t("general.add_tokens_to_pool"),
+                content: (
+                  <AddForm
+                    poolSpec={poolSpec}
+                    maxSlippageFraction={slippageFraction}
+                  />
+                ),
+              },
+              {
+                id: "remove",
+                name: poolSpec.isStakingPool
+                  ? t("glossary.unstake_tokens")
+                  : t("general.remove_tokens_from_pool"),
+                content: (
+                  <RemoveForm
+                    poolSpec={poolSpec}
+                    maxSlippageFraction={slippageFraction}
+                  />
+                ),
+              },
+            ]}
+          />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false} className="statList">
+          <EuiTitle size="xxs">
+            <h4>
+              {t("pool_page.pool_balance", { count: reserveStats.length })}
+            </h4>
+          </EuiTitle>
+          <EuiSpacer size="s" />
+          <StatList listItems={reserveStats} />
+          <EuiSpacer />
+          <EuiTitle size="xxs">
+            <h4>
+              {t("pool_page.user_balance", { count: userLpStats.length })}
+            </h4>
+          </EuiTitle>
+          <EuiSpacer size="s" />
+          <StatList listItems={userLpStats} />
+          <EuiSpacer />
+          {!poolSpec.isStakingPool && (
+            <>
+              <EuiTitle size="xxs">
+                <h4>{t("pool_page.pool_info")}</h4>
+              </EuiTitle>
+              <EuiSpacer size="s" />
+              <StatList listItems={poolInfoStats} />
+            </>
+          )}
+          {getTokenDetailsForEcosystem(lpToken, EvmEcosystemId.Ethereum) !==
+            null && (
+            <EuiButtonEmpty
+              flush="left"
+              style={{ width: "fit-content" }}
+              onClick={() => {
+                showRegisterEthereumTokenPrompt(lpToken).catch(console.error);
+              }}
+              iconType={ETHEREUM_SVG}
+            >
+              {t("pool_page.add_lp_token_to_metamask")}
+            </EuiButtonEmpty>
+          )}
+          {getTokenDetailsForEcosystem(lpToken, EvmEcosystemId.Bnb) !==
+            null && (
+            <EuiButtonEmpty
+              flush="left"
+              style={{ width: "fit-content" }}
+              onClick={() => {
+                showRegisterBnbTokenPrompt(lpToken).catch(console.error);
+              }}
+              iconType={BNB_SVG}
+            >
+              {t("pool_page.add_lp_token_to_metamask")}
+            </EuiButtonEmpty>
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
       <EuiSpacer />
     </>
   );
diff --git a/apps/ui/src/pages/PoolsPage.tsx b/apps/ui/src/pages/PoolsPage.tsx
index b3a122c93..d46f1128d 100644
--- a/apps/ui/src/pages/PoolsPage.tsx
+++ b/apps/ui/src/pages/PoolsPage.tsx
@@ -28,7 +28,6 @@ import shallow from "zustand/shallow.js";
 
 import { atomicToTvlString } from "../amounts";
 import { PoolListItem } from "../components/PoolListItem";
-import { EthereumMergeWarning } from "../components/molecules/EthereumMergeWarning";
 import {
   getPoolTokenEcosystems,
   hasTokenEcosystem,
@@ -364,11 +363,7 @@ const PoolsPage = (): ReactElement => {
             </EuiShowFor>
 
             <EuiSpacer />
-            {process.env.REACT_APP_ETHEREUM_MERGE === "true" ? (
-              <EthereumMergeWarning />
-            ) : (
-              content
-            )}
+            {content}
           </EuiPageContentBody>
         </EuiPageContent>
       </EuiPageBody>
diff --git a/apps/ui/src/pages/SwapPage/SwapPage.tsx b/apps/ui/src/pages/SwapPage/SwapPage.tsx
index 2fe46d2ea..2b69c4ea7 100644
--- a/apps/ui/src/pages/SwapPage/SwapPage.tsx
+++ b/apps/ui/src/pages/SwapPage/SwapPage.tsx
@@ -21,7 +21,6 @@ import { MultiConnectButton } from "../../components/ConnectButton";
 import { RecentInteractions } from "../../components/RecentInteractions";
 import { SlippageButton } from "../../components/SlippageButton";
 import { SwapForm } from "../../components/SwapForm";
-import { EthereumMergeWarning } from "../../components/molecules/EthereumMergeWarning";
 import { ECOSYSTEMS } from "../../config";
 import { selectConfig } from "../../core/selectors";
 import { useEnvironment } from "../../core/store";
@@ -80,9 +79,7 @@ const SwapPage = (): ReactElement => {
               </EuiFlexItem>
             </EuiFlexGroup>
             <EuiSpacer />
-            {process.env.REACT_APP_ETHEREUM_MERGE === "true" ? (
-              <EthereumMergeWarning />
-            ) : nonStakingPools.length > 0 ? (
+            {nonStakingPools.length > 0 ? (
               <SwapForm maxSlippageFraction={slippageFraction} />
             ) : (
               <EuiEmptyPrompt