From 784e8adc3e2c4aa919bee4793a79cb3b5580d1e1 Mon Sep 17 00:00:00 2001
From: smithrashell <rashellssmith@gmail.com>
Date: Wed, 14 May 2025 05:12:10 -0400
Subject: [PATCH 1/3] Fix go to top [Fixes #15412]

---
 src/components/Footer.tsx  | 2 +-
 src/layouts/BaseLayout.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 27de15dea0b..7e803d4e51d 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -320,7 +320,7 @@ const Footer = ({ lastDeployLocaleTimestamp }: FooterProps) => {
         <Button
           variant="outline"
           isSecondary
-          onClick={() => scrollIntoView("__next")}
+          onClick={() => scrollIntoView("top")}
         >
           <IoChevronUpSharp /> Go to top
         </Button>
diff --git a/src/layouts/BaseLayout.tsx b/src/layouts/BaseLayout.tsx
index 59d9d55208a..ece404c579f 100644
--- a/src/layouts/BaseLayout.tsx
+++ b/src/layouts/BaseLayout.tsx
@@ -51,7 +51,7 @@ export const BaseLayout = ({
        * layout on initial load.
        */}
       <SkipLink />
-      <div className="mx-auto max-w-screen-2xl">
+      <div className="mx-auto max-w-screen-2xl" id="top">
         <Nav />
 
         {/* TODO: FIX TRANSLATION BANNER LOGIC FOR https://github.com/ethereum/ethereum-org-website/issues/11305 */}

From 46c17007fb3a427dff7197f42b805a73441913e9 Mon Sep 17 00:00:00 2001
From: smithrashell <rashellssmith@gmail.com>
Date: Fri, 16 May 2025 12:50:35 -0400
Subject: [PATCH 2/3] fix: apply feedback on Go to top button [Fixes #15412]

---
 src/components/Footer.tsx            | 2 +-
 src/components/ui/buttons/Button.tsx | 2 +-
 src/layouts/BaseLayout.tsx           | 2 +-
 src/lib/utils/scrollIntoView.ts      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 7e803d4e51d..461e385bde1 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -320,7 +320,7 @@ const Footer = ({ lastDeployLocaleTimestamp }: FooterProps) => {
         <Button
           variant="outline"
           isSecondary
-          onClick={() => scrollIntoView("top")}
+          onClick={() => scrollIntoView("div.mx-auto")}
         >
           <IoChevronUpSharp /> Go to top
         </Button>
diff --git a/src/components/ui/buttons/Button.tsx b/src/components/ui/buttons/Button.tsx
index 400eb6fc2de..a9faf4289b0 100644
--- a/src/components/ui/buttons/Button.tsx
+++ b/src/components/ui/buttons/Button.tsx
@@ -105,7 +105,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
     ref
   ) => {
     const handleOnClick = (e: React.MouseEvent<HTMLButtonElement>) => {
-      toId && scrollIntoView(toId)
+      toId && scrollIntoView("#" + toId)
       customEventOptions && trackCustomEvent(customEventOptions)
 
       onClick?.(e)
diff --git a/src/layouts/BaseLayout.tsx b/src/layouts/BaseLayout.tsx
index ece404c579f..59d9d55208a 100644
--- a/src/layouts/BaseLayout.tsx
+++ b/src/layouts/BaseLayout.tsx
@@ -51,7 +51,7 @@ export const BaseLayout = ({
        * layout on initial load.
        */}
       <SkipLink />
-      <div className="mx-auto max-w-screen-2xl" id="top">
+      <div className="mx-auto max-w-screen-2xl">
         <Nav />
 
         {/* TODO: FIX TRANSLATION BANNER LOGIC FOR https://github.com/ethereum/ethereum-org-website/issues/11305 */}
diff --git a/src/lib/utils/scrollIntoView.ts b/src/lib/utils/scrollIntoView.ts
index 879e3252f04..b7e448c3fb3 100644
--- a/src/lib/utils/scrollIntoView.ts
+++ b/src/lib/utils/scrollIntoView.ts
@@ -1,8 +1,8 @@
 export const scrollIntoView = (
-  toId: string,
+  selector: string,
   options: ScrollIntoViewOptions = { behavior: "smooth", block: "start" }
 ): void => {
-  const element = document.getElementById(toId)
+  const element = document.querySelector(selector)
 
   if (!element) return
 

From aafe223aab16fd9f80ffe9188bf907387bba7a2f Mon Sep 17 00:00:00 2001
From: wackerow <54227730+wackerow@users.noreply.github.com>
Date: Sat, 17 May 2025 10:58:46 -0700
Subject: [PATCH 3/3] refactor: use `body` selector for scroll to top

---
 src/components/Footer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 461e385bde1..bb5d643e93d 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -320,7 +320,7 @@ const Footer = ({ lastDeployLocaleTimestamp }: FooterProps) => {
         <Button
           variant="outline"
           isSecondary
-          onClick={() => scrollIntoView("div.mx-auto")}
+          onClick={() => scrollIntoView("body")}
         >
           <IoChevronUpSharp /> Go to top
         </Button>