From 2a07d85baf0aaf97cea64b838f4caf8b1919c85d Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Sun, 22 Feb 2026 07:34:49 +0000
Subject: [PATCH] refactor: clean up onboarding scroll, props, and magic values

- Move scroll-to-active logic into OnboardingSection via useRef + useEffect (self-contained)
- Remove stepId prop, data-step attribute, and querySelector pattern from parent
- Extract SCROLL_DELAY_MS and DEFAULT_ICON_SIZE named constants
- Remove unused onContinue prop from BeforeLogin
- Rename 'triggered' to 'autoSignInCompleted' for clarity

Co-Authored-By: yujonglee <yujonglee.dev@gmail.com>
---
 .../components/main/body/onboarding/index.tsx | 23 ++--------------
 .../onboarding/account/before-login.tsx       | 14 ++++------
 .../components/onboarding/account/index.tsx   |  2 +-
 .../src/components/onboarding/final.tsx       | 27 ++++++++++---------
 .../src/components/onboarding/shared.tsx      | 20 ++++++++++----
 5 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/apps/desktop/src/components/main/body/onboarding/index.tsx b/apps/desktop/src/components/main/body/onboarding/index.tsx
index 1659b4d93b..bffbb36690 100644
--- a/apps/desktop/src/components/main/body/onboarding/index.tsx
+++ b/apps/desktop/src/components/main/body/onboarding/index.tsx
@@ -1,7 +1,7 @@
 import { useQueryClient } from "@tanstack/react-query";
 import { platform } from "@tauri-apps/plugin-os";
 import { Volume2Icon, VolumeXIcon } from "lucide-react";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 
 import { commands as analyticsCommands } from "@hypr/plugin-analytics";
 import { commands as sfxCommands } from "@hypr/plugin-sfx";
@@ -115,20 +115,6 @@ export function TabContentOnboarding({
     }
   }, [close, currentTab, queryClient]);
 
-  const scrollRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    const timeout = setTimeout(() => {
-      const el = scrollRef.current?.querySelector(
-        `[data-step="${currentStep}"]`,
-      );
-      if (el) {
-        el.scrollIntoView({ behavior: "smooth", block: "start" });
-      }
-    }, 350);
-    return () => clearTimeout(timeout);
-  }, [currentStep]);
-
   return (
     <StandardTabWrapper>
       <div className="relative flex h-full flex-col">
@@ -149,10 +135,9 @@ export function TabContentOnboarding({
           </button>
         </div>
 
-        <div ref={scrollRef} className="flex-1 overflow-y-auto">
+        <div className="flex-1 overflow-y-auto">
           <div className="flex flex-col px-6 pb-16 gap-3">
             <OnboardingSection
-              stepId="permissions"
               title="Permissions"
               completedTitle="Permissions granted"
               description="Required for best experience"
@@ -164,7 +149,6 @@ export function TabContentOnboarding({
             </OnboardingSection>
 
             <OnboardingSection
-              stepId="login"
               title="Account"
               description="Sign in to unlock Pro features"
               completedTitle="Signed up"
@@ -176,7 +160,6 @@ export function TabContentOnboarding({
             </OnboardingSection>
 
             <OnboardingSection
-              stepId="calendar"
               title="Calendar"
               description="Select calendars to sync"
               completedTitle="Calendar connected"
@@ -188,7 +171,6 @@ export function TabContentOnboarding({
             </OnboardingSection>
 
             <OnboardingSection
-              stepId="folder-location"
               title="Storage"
               description="Where your notes and recordings are stored"
               completedTitle="Storage configured"
@@ -200,7 +182,6 @@ export function TabContentOnboarding({
             </OnboardingSection>
 
             <OnboardingSection
-              stepId="final"
               title="Ready to go"
               status={getStepStatus("final", currentStep)}
               onBack={goBack}
diff --git a/apps/desktop/src/components/onboarding/account/before-login.tsx b/apps/desktop/src/components/onboarding/account/before-login.tsx
index 9555707f1f..4a4cf2ba71 100644
--- a/apps/desktop/src/components/onboarding/account/before-login.tsx
+++ b/apps/desktop/src/components/onboarding/account/before-login.tsx
@@ -2,13 +2,9 @@ import { useEffect, useState } from "react";
 
 import { useAuth } from "../../../auth";
 
-export function BeforeLogin({
-  onContinue: _onContinue,
-}: {
-  onContinue: () => void;
-}) {
+export function BeforeLogin() {
   const auth = useAuth();
-  const triggered = useAutoTriggerSignin();
+  const autoSignInCompleted = useAutoTriggerSignin();
   const [showCallbackUrlInput, setShowCallbackUrlInput] = useState(false);
 
   return (
@@ -16,14 +12,14 @@ export function BeforeLogin({
       <div className="flex items-center gap-3">
         <button
           onClick={() => auth?.signIn()}
-          disabled={!triggered}
+          disabled={!autoSignInCompleted}
           className="px-5 py-2.5 rounded-full bg-stone-600 text-white text-sm font-medium duration-150 hover:scale-[1.01] active:scale-[0.99] w-fit"
         >
-          {triggered
+          {autoSignInCompleted
             ? "Click here to Sign in"
             : "Signing in on your browser..."}
         </button>
-        {triggered && (
+        {autoSignInCompleted && (
           <button
             className="text-sm text-neutral-500 hover:text-neutral-600 underline"
             onClick={() => setShowCallbackUrlInput(true)}
diff --git a/apps/desktop/src/components/onboarding/account/index.tsx b/apps/desktop/src/components/onboarding/account/index.tsx
index cc19f24a2b..8d7b8aa468 100644
--- a/apps/desktop/src/components/onboarding/account/index.tsx
+++ b/apps/desktop/src/components/onboarding/account/index.tsx
@@ -9,5 +9,5 @@ export function LoginSection({ onContinue }: { onContinue: () => void }) {
     return <AfterLogin onContinue={onContinue} />;
   }
 
-  return <BeforeLogin onContinue={onContinue} />;
+  return <BeforeLogin />;
 }
diff --git a/apps/desktop/src/components/onboarding/final.tsx b/apps/desktop/src/components/onboarding/final.tsx
index 432990bf78..23aee0dd21 100644
--- a/apps/desktop/src/components/onboarding/final.tsx
+++ b/apps/desktop/src/components/onboarding/final.tsx
@@ -7,17 +7,17 @@ import { commands as sfxCommands } from "@hypr/plugin-sfx";
 import { commands } from "../../types/tauri.gen";
 import { OnboardingButton } from "./shared";
 
+const DEFAULT_ICON_SIZE = 14;
+
 const SOCIALS = [
   {
     label: "Discord",
     icon: "simple-icons:discord",
-    size: 14,
     url: "https://discord.gg/CX8gTH2tj9",
   },
   {
     label: "GitHub",
     icon: "simple-icons:github",
-    size: 14,
     url: "https://github.com/fastrepl/hyprnote",
   },
   {
@@ -33,16 +33,19 @@ export function FinalSection({ onContinue }: { onContinue: () => void }) {
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-1.5 text-sm text-neutral-500">
         <span>Join our community and stay updated:</span>
-        {SOCIALS.map(({ label, icon, size, url }) => (
-          <button
-            key={label}
-            onClick={() => void openerCommands.openUrl(url, null)}
-            className="inline-flex items-center justify-center size-6 rounded-md text-neutral-400 transition-colors duration-150 hover:text-neutral-700"
-            aria-label={label}
-          >
-            <Icon icon={icon} width={size} height={size} />
-          </button>
-        ))}
+        {SOCIALS.map(({ label, icon, url, ...rest }) => {
+          const size = "size" in rest ? rest.size : DEFAULT_ICON_SIZE;
+          return (
+            <button
+              key={label}
+              onClick={() => void openerCommands.openUrl(url, null)}
+              className="inline-flex items-center justify-center size-6 rounded-md text-neutral-400 transition-colors duration-150 hover:text-neutral-700"
+              aria-label={label}
+            >
+              <Icon icon={icon} width={size} height={size} />
+            </button>
+          );
+        })}
       </div>
 
       <OnboardingButton onClick={() => void finishOnboarding(onContinue)}>
diff --git a/apps/desktop/src/components/onboarding/shared.tsx b/apps/desktop/src/components/onboarding/shared.tsx
index c2fe2be4b2..e064571dbc 100644
--- a/apps/desktop/src/components/onboarding/shared.tsx
+++ b/apps/desktop/src/components/onboarding/shared.tsx
@@ -7,14 +7,15 @@ import {
   XCircleIcon,
 } from "lucide-react";
 import { AnimatePresence, motion } from "motion/react";
-import type { ReactNode } from "react";
+import { type ReactNode, useEffect, useRef } from "react";
 
 import { cn } from "@hypr/utils";
 
+const SCROLL_DELAY_MS = 350;
+
 export type SectionStatus = "completed" | "active" | "upcoming";
 
 export function OnboardingSection({
-  stepId,
   title,
   completedTitle,
   description,
@@ -23,7 +24,6 @@ export function OnboardingSection({
   onNext,
   children,
 }: {
-  stepId: string;
   title: string;
   completedTitle?: string;
   description?: string;
@@ -32,13 +32,23 @@ export function OnboardingSection({
   onNext?: () => void;
   children: ReactNode;
 }) {
-  if (!status || status === "upcoming") return null;
+  const sectionRef = useRef<HTMLElement>(null);
 
   const isActive = status === "active";
   const isCompleted = status === "completed";
 
+  useEffect(() => {
+    if (!isActive) return;
+    const timeout = setTimeout(() => {
+      sectionRef.current?.scrollIntoView({ behavior: "smooth", block: "start" });
+    }, SCROLL_DELAY_MS);
+    return () => clearTimeout(timeout);
+  }, [isActive]);
+
+  if (!status || status === "upcoming") return null;
+
   return (
-    <section data-step={stepId}>
+    <section ref={sectionRef}>
       <div
         className={cn([
           "flex items-center gap-2 transition-all duration-300",