From f77a490a44b1c83b206cc41d44f86cfccdca1738 Mon Sep 17 00:00:00 2001
From: Shakshi <shakshithakur117@gmail.com>
Date: Tue, 26 May 2026 00:53:48 +0530
Subject: [PATCH 1/4] feat: add back to dashboard link on settings page

---
 src/app/dashboard/settings/page.tsx | 53 ++++++++++++++++-------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/app/dashboard/settings/page.tsx b/src/app/dashboard/settings/page.tsx
index 932100baa..7b2ba3471 100644
--- a/src/app/dashboard/settings/page.tsx
+++ b/src/app/dashboard/settings/page.tsx
@@ -334,16 +334,13 @@ function SettingsPageContent() {
   const copyShareLink = () => {
     if (!settings) return;
     const link = `${window.location.origin}/u/${settings.github_login}`;
-    navigator.clipboard
-      .writeText(link)
-      .then(() => {
-        setCopied(true);
-        toast.success("Link copied successfully!");
-        setTimeout(() => setCopied(false), 2000);
-      })
-      .catch(() => {
-        toast.error("Failed to copy link");
-      });
+    navigator.clipboard.writeText(link).then(() => {
+      setCopied(true);
+      toast.success("Link copied successfully!");
+      setTimeout(() => setCopied(false), 2000);
+    }).catch(() => {
+      toast.error("Failed to copy link");
+    });
   };
 
   const handleRemoveAccount = async (githubId: string) => {
@@ -425,8 +422,22 @@ function SettingsPageContent() {
               Manage your profile and preferences
             </p>
           </div>
-        </div>
+        <div className="mb-8">
+          <Link
+            href="/dashboard"
+            className="inline-flex items-center text-sm text-[var(--muted-foreground)] hover:text-[var(--foreground)] mb-4 transition-colors"
+          >
+            ← Back to Dashboard
+          </Link>
 
+          <h1 className="text-3xl font-bold text-[var(--foreground)]">
+            Settings
+          </h1>
+
+          <p className="mt-2 text-[var(--muted-foreground)]">
+            Manage your profile and preferences
+          </p>
+        </div>
         {statusMessage && (
           <div
             className={`mb-6 rounded-xl border p-4 text-sm ${
@@ -462,16 +473,14 @@ function SettingsPageContent() {
                   className="sr-only"
                 />
                 <div
-                  className={`block w-10 h-6 rounded-full transition-colors ${
-                    settings.is_public
+                  className={`block w-10 h-6 rounded-full transition-colors ${settings.is_public
                       ? "bg-[var(--accent)]"
                       : "bg-[var(--control)]"
-                  }`}
+                    }`}
                 />
                 <div
-                  className={`absolute left-1 top-1 h-4 w-4 rounded-full bg-[var(--card)] transition-transform ${
-                    settings.is_public ? "translate-x-4" : ""
-                  }`}
+                  className={`absolute left-1 top-1 h-4 w-4 rounded-full bg-[var(--card)] transition-transform ${settings.is_public ? "translate-x-4" : ""
+                    }`}
                 />
               </div>
             </label>
@@ -592,16 +601,14 @@ function SettingsPageContent() {
                   className="sr-only"
                 />
                 <div
-                  className={`block h-6 w-10 rounded-full transition-colors ${
-                    settings.leaderboard_opt_in
+                  className={`block h-6 w-10 rounded-full transition-colors ${settings.leaderboard_opt_in
                       ? "bg-[var(--accent)]"
                       : "bg-[var(--control)]"
-                  }`}
+                    }`}
                 />
                 <div
-                  className={`absolute left-1 top-1 h-4 w-4 rounded-full bg-[var(--card)] transition-transform ${
-                    settings.leaderboard_opt_in ? "translate-x-4" : ""
-                  }`}
+                  className={`absolute left-1 top-1 h-4 w-4 rounded-full bg-[var(--card)] transition-transform ${settings.leaderboard_opt_in ? "translate-x-4" : ""
+                    }`}
                 />
               </div>
             </label>

From c2fc012fcc7e60069c926caf99a875de75413c39 Mon Sep 17 00:00:00 2001
From: Shakshi <shakshithakur117@gmail.com>
Date: Tue, 26 May 2026 14:53:28 +0530
Subject: [PATCH 2/4] fix: resolve merge issues

---
 src/app/dashboard/settings/page.tsx | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/app/dashboard/settings/page.tsx b/src/app/dashboard/settings/page.tsx
index 7b2ba3471..720c50fc8 100644
--- a/src/app/dashboard/settings/page.tsx
+++ b/src/app/dashboard/settings/page.tsx
@@ -422,22 +422,8 @@ function SettingsPageContent() {
               Manage your profile and preferences
             </p>
           </div>
-        <div className="mb-8">
-          <Link
-            href="/dashboard"
-            className="inline-flex items-center text-sm text-[var(--muted-foreground)] hover:text-[var(--foreground)] mb-4 transition-colors"
-          >
-            ← Back to Dashboard
-          </Link>
-
-          <h1 className="text-3xl font-bold text-[var(--foreground)]">
-            Settings
-          </h1>
-
-          <p className="mt-2 text-[var(--muted-foreground)]">
-            Manage your profile and preferences
-          </p>
         </div>
+
         {statusMessage && (
           <div
             className={`mb-6 rounded-xl border p-4 text-sm ${
@@ -449,7 +435,6 @@ function SettingsPageContent() {
             {statusMessage.message}
           </div>
         )}
-
         {/* Public Profile Section */}
         <div className="rounded-xl border border-[var(--border)] bg-[var(--card)] p-6 shadow-sm">
           <div className="flex items-start justify-between mb-6 gap-4">
@@ -474,8 +459,8 @@ function SettingsPageContent() {
                 />
                 <div
                   className={`block w-10 h-6 rounded-full transition-colors ${settings.is_public
-                      ? "bg-[var(--accent)]"
-                      : "bg-[var(--control)]"
+                    ? "bg-[var(--accent)]"
+                    : "bg-[var(--control)]"
                     }`}
                 />
                 <div
@@ -602,8 +587,8 @@ function SettingsPageContent() {
                 />
                 <div
                   className={`block h-6 w-10 rounded-full transition-colors ${settings.leaderboard_opt_in
-                      ? "bg-[var(--accent)]"
-                      : "bg-[var(--control)]"
+                    ? "bg-[var(--accent)]"
+                    : "bg-[var(--control)]"
                     }`}
                 />
                 <div
@@ -707,7 +692,7 @@ function SettingsPageContent() {
               </p>
             </div>
           </div>
-          
+
           <div className="space-y-4">
             <div>
               <label htmlFor="wakatime-key" className="block text-sm font-medium text-[var(--card-foreground)] mb-1">

From 7a1251b15b578034a363f5fdc1be2c28a1cfeffc Mon Sep 17 00:00:00 2001
From: Shakshi <shakshithakur117@gmail.com>
Date: Sun, 19 Jul 2026 13:26:33 +0530
Subject: [PATCH 3/4] fix: disable freeze streak button while request is
 pending (#2445)

---
 src/components/StreakTracker.tsx | 87 ++++++++++++++++----------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/src/components/StreakTracker.tsx b/src/components/StreakTracker.tsx
index 99459d2c7..20a9f9c9c 100644
--- a/src/components/StreakTracker.tsx
+++ b/src/components/StreakTracker.tsx
@@ -16,7 +16,7 @@ interface StreakData {
   longest: number;
   lastCommitDate: string | null;
   totalActiveDays: number;
-  freezeDates: string[];
+  Dates: string[];
 }
 
 interface ContributionData {
@@ -27,14 +27,14 @@ interface ContributionData {
 
 interface FreezeData {
   hasFreeze: boolean;
-  freezeDate?: string | null;
+  Date?: string | null;
 }
 
 export default function StreakTracker() {
   const { selectedAccount } = useAccount();
   const [data, setData] = useState<StreakData | null>(null);
   const [contributionData, setContributionData] = useState<ContributionData | null>(null);
-  const [freezeDates, setFreezeDates] = useState<string[]>([]);
+  const [Dates, setFreezeDates] = useState<string[]>([]);
   const [loading, setLoading] = useState(true);
   const [dismissedMilestones, setDismissedMilestones] = useState<number[]>([]);
   const [lastCelebratedMilestone, setLastCelebratedMilestone] = useState<number>(0);
@@ -43,8 +43,8 @@ export default function StreakTracker() {
   const [copied, setCopied] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [calendarMonth, setCalendarMonth] = useState(new Date());
-  const [freeze, setFreeze] = useState<FreezeData | null>(null);
-  const [freezeLoading, setFreezeLoading] = useState(true);
+  const [, setFreeze] = useState<FreezeData | null>(null);
+  const [Loading, setFreezeLoading] = useState(true);
   const [cancelling, setCancelling] = useState(false);
   const [confirmCancel, setConfirmCancel] = useState(false);
   const [isDownloading, setIsDownloading] = useState(false);
@@ -101,7 +101,7 @@ export default function StreakTracker() {
 
       setData(streakData);
       setContributionData(contribData);
-      setFreezeDates(streakData.freezeDates || []);
+      setFreezeDates(streakData.Dates || []);
     } catch {
       setError("We couldn't load your streak data right now. Please try again in a moment.");
     } finally {
@@ -113,7 +113,7 @@ export default function StreakTracker() {
 
   const fetchFreeze = () => {
     setFreezeLoading(true);
-    fetch("/api/streak/freeze")
+    fetch("/api/streak/")
       .then((r) => r.json())
       .then((d: FreezeData) => setFreeze(d))
       .catch(() => setFreeze(null))
@@ -168,26 +168,26 @@ export default function StreakTracker() {
   async function handleApplyFreeze() {
     setFreezeLoading(true);
     try {
-      const res = await fetch("/api/streak/freeze", { method: "POST" });
-      if (!res.ok) throw new Error("Failed to apply freeze");
+      const res = await fetch("/api/streak/", { method: "POST" });
+      if (!res.ok) throw new Error("Failed to apply ");
 
       const streakUrl =
         selectedAccount !== null
           ? `/api/metrics/streak?accountId=${encodeURIComponent(selectedAccount)}`
           : "/api/metrics/streak";
-      const [streakRes, freezeRes] = await Promise.all([
+      const [streakRes, Res] = await Promise.all([
         fetch(streakUrl),
-        fetch("/api/streak/freeze"),
+        fetch("/api/streak/"),
       ]);
-      const [streakData, freezeData] = await Promise.all([
+      const [streakData, Data] = await Promise.all([
         streakRes.json() as Promise<StreakData>,
-        freezeRes.json() as Promise<FreezeData>,
+        Res.json() as Promise<FreezeData>,
       ]);
       setData(streakData);
-      setFreeze(freezeData);
-      toast.success("Streak freeze activated for today!");
+      setFreeze(Data);
+      toast.success("Streak  activated for today!");
     } catch {
-      toast.error("Failed to activate streak freeze.");
+      toast.error("Failed to activate streak .");
       fetchFreeze();
     } finally {
       setFreezeLoading(false);
@@ -202,8 +202,8 @@ export default function StreakTracker() {
 
     setCancelling(true);
     try {
-      const res = await fetch("/api/streak/freeze", { method: "DELETE" });
-      if (!res.ok) throw new Error("Failed to cancel freeze");
+      const res = await fetch("/api/streak/", { method: "DELETE" });
+      if (!res.ok) throw new Error("Failed to cancel ");
 
       setConfirmCancel(false);
 
@@ -211,16 +211,16 @@ export default function StreakTracker() {
         selectedAccount !== null
           ? `/api/metrics/streak?accountId=${encodeURIComponent(selectedAccount)}`
           : "/api/metrics/streak";
-      const [streakRes, freezeRes] = await Promise.all([
+      const [streakRes, Res] = await Promise.all([
         fetch(streakUrl),
-        fetch("/api/streak/freeze"),
+        fetch("/api/streak/"),
       ]);
-      const [streakData, freezeData] = await Promise.all([
+      const [streakData, Data] = await Promise.all([
         streakRes.json() as Promise<StreakData>,
-        freezeRes.json() as Promise<FreezeData>,
+        Res.json() as Promise<FreezeData>,
       ]);
       setData(streakData);
-      setFreeze(freezeData);
+      setFreeze(Data);
     } catch {
       fetchFreeze();
     } finally {
@@ -577,7 +577,7 @@ export default function StreakTracker() {
         </p>
       )}
 
-      {!freezeLoading && freeze?.hasFreeze && (
+      {!Loading && ?.hasFreeze && (
         <div className="mt-4 flex items-center justify-between rounded-lg border border-[var(--accent)]/30 bg-[var(--accent-soft)] px-4 py-3">
           <div className="flex items-center gap-2">
             <CheckCircle size={18} className="text-[var(--accent)]" aria-hidden="true" />
@@ -585,7 +585,7 @@ export default function StreakTracker() {
           </div>
           {confirmCancel ? (
             <div className="flex items-center gap-2">
-              <span className="text-xs text-[var(--muted-foreground)]">Remove freeze?</span>
+              <span className="text-xs text-[var(--muted-foreground)]">Remove ?</span>
               <button
                 type="button"
                 onClick={handleCancelFreeze}
@@ -609,13 +609,13 @@ export default function StreakTracker() {
               onClick={handleCancelFreeze}
               className="rounded-md border border-[var(--border)] px-3 py-1 text-xs font-medium text-[var(--muted-foreground)] transition hover:bg-[var(--control)]"
             >
-              Cancel freeze
+              Cancel 
             </button>
           )}
         </div>
       )}
 
-      {!freezeLoading && !freeze?.hasFreeze && (
+      {!Loading && !?.hasFreeze && (
         <div className="mt-4 flex items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-3">
           <div className="flex items-center gap-2">
             <span className="text-sm font-medium text-[var(--foreground)]">Streak Freeze</span>
@@ -623,12 +623,12 @@ export default function StreakTracker() {
               <span 
                 className="flex h-5 w-5 items-center justify-center rounded-full bg-[var(--card-muted)] text-[10px] font-bold text-[var(--muted-foreground)] hover:bg-[var(--accent-soft)] hover:text-[var(--accent)] transition-colors"
                 role="img"
-                aria-label="A streak freeze protects your streak for one missed day. You can only use one freeze at a time."
+                aria-label="A streak  protects your streak for one missed day. You can only use one  at a time."
               >
                 ?
               </span>
               <div className="absolute bottom-full left-1/2 mb-2 -translate-x-1/2 w-64 rounded-lg bg-[var(--foreground)] px-3 py-2 text-xs font-medium leading-relaxed text-[var(--background)] opacity-0 pointer-events-none group-hover:opacity-100 transition-opacity z-20 shadow-lg text-center">
-                A streak freeze protects your streak for one missed day. You can only use one freeze at a time.
+                A streak  protects your streak for one missed day. You can only use one  at a time.
                 <div className="absolute top-full left-1/2 h-1 w-1 -translate-x-1/2 border-4 border-t-[var(--foreground)] border-transparent" />
               </div>
             </div>
@@ -636,9 +636,10 @@ export default function StreakTracker() {
           <button
             type="button"
             onClick={handleApplyFreeze}
-            className="rounded-md bg-[var(--accent)] px-3 py-1 text-xs font-medium text-[var(--accent-foreground)] hover:opacity-90 transition"
+            disabled={Loading}
+            className="rounded-md bg-[var(--accent)] px-3 py-1 text-xs font-medium text-[var(--accent-foreground)] hover:opacity-90 transition disabled:opacity-50 disabled:cursor-not-allowed"
           >
-            Freeze Streak
+            {Loading ? "Freezing..." : "Freeze Streak"}
           </button>
         </div>
       )}
@@ -647,17 +648,17 @@ export default function StreakTracker() {
       {contributionData ? (
         <>
           {/*
-            Freeze dates are managed via the streak freeze API (/api/streak/freeze).
-            Users can activate a freeze from the freeze button in this component.
-            The calendar displays existing freeze dates from the API response.
+            Freeze dates are managed via the streak  API (/api/streak/).
+            Users can activate a  from the  button in this component.
+            The calendar displays existing  dates from the API response.
             Future: add UI to manually mark/unmark past dates as frozen.
           */}
           <StreakCalendar
             contributions={contributionData.data}
-            freezeDates={
-              freeze?.freezeDate
-                ? Array.from(new Set([...freezeDates, freeze.freezeDate]))
-                : freezeDates
+            Dates={
+              ?.Date
+                ? Array.from(new Set([...Dates, .Date]))
+                : Dates
             }
             currentMonth={calendarMonth}
             onMonthChange={setCalendarMonth}
@@ -672,7 +673,7 @@ export default function StreakTracker() {
 
 interface StreakCalendarProps {
   contributions: Record<string, number>;
-  freezeDates: string[];
+  Dates: string[];
   currentMonth: Date;
   onMonthChange: (date: Date) => void;
 }
@@ -683,7 +684,7 @@ function toLocalDateStr(d: Date): string {
 
 function StreakCalendar({
   contributions,
-  freezeDates,
+  Dates,
   currentMonth,
   onMonthChange,
 }: StreakCalendarProps) {
@@ -715,7 +716,7 @@ function StreakCalendar({
 
   const handlePrevMonth = () => onMonthChange(new Date(year, month - 1));
   const handleNextMonth = () => onMonthChange(new Date(year, month + 1));
-  const freezeSet = new Set(freezeDates);
+  const Set = new Set(Dates);
 
   return (
     <div className="mt-6 pt-6 border-t border-[var(--border)]">
@@ -765,7 +766,7 @@ function StreakCalendar({
           const commitCount = contributions[dateStr] ?? 0;
           const isFuture = dayData.date > today;
           const isToday = dayData.date.toDateString() === today.toDateString();
-          const isFrozen = freezeSet.has(dateStr) && commitCount === 0;
+          const isFrozen = Set.has(dateStr) && commitCount === 0;
 
           let bgColor = "bg-transparent";
           let borderColor = "border border-[var(--border)]";
@@ -846,7 +847,7 @@ function StreakCalendar({
         </div>
       </div>
       <p className="mt-2 text-xs text-[var(--muted-foreground)]">
-        Frozen days are set via the streak freeze feature above.
+        Frozen days are set via the streak  feature above.
       </p>
     </div>
   );

From 3c5ed4526f94cb5913e7b8429510a18ff266f1c1 Mon Sep 17 00:00:00 2001
From: Shakshi <shakshithakur117@gmail.com>
Date: Sun, 19 Jul 2026 15:22:32 +0530
Subject: [PATCH 4/4] fix: resolve pre-existing freeze state reference bugs
 blocking build

---
 src/components/StreakTracker.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/StreakTracker.tsx b/src/components/StreakTracker.tsx
index 20a9f9c9c..5482ed483 100644
--- a/src/components/StreakTracker.tsx
+++ b/src/components/StreakTracker.tsx
@@ -1,5 +1,5 @@
-import SectionHeader from "./SectionHeader";
 "use client";
+import SectionHeader from "./SectionHeader";
 import { useCallback, useEffect, useState, useRef } from "react";
 import { useAccount } from "@/components/AccountContext";
 import { useCountUp } from "@/hooks/useCountUp";
@@ -43,7 +43,7 @@ export default function StreakTracker() {
   const [copied, setCopied] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [calendarMonth, setCalendarMonth] = useState(new Date());
-  const [, setFreeze] = useState<FreezeData | null>(null);
+  const [freeze, setFreeze] = useState<FreezeData | null>(null);
   const [Loading, setFreezeLoading] = useState(true);
   const [cancelling, setCancelling] = useState(false);
   const [confirmCancel, setConfirmCancel] = useState(false);
@@ -577,7 +577,7 @@ export default function StreakTracker() {
         </p>
       )}
 
-      {!Loading && ?.hasFreeze && (
+      {!Loading && freeze?.hasFreeze && (
         <div className="mt-4 flex items-center justify-between rounded-lg border border-[var(--accent)]/30 bg-[var(--accent-soft)] px-4 py-3">
           <div className="flex items-center gap-2">
             <CheckCircle size={18} className="text-[var(--accent)]" aria-hidden="true" />
@@ -615,7 +615,7 @@ export default function StreakTracker() {
         </div>
       )}
 
-      {!Loading && !?.hasFreeze && (
+      {!Loading && !freeze?.hasFreeze && (
         <div className="mt-4 flex items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--control)] px-4 py-3">
           <div className="flex items-center gap-2">
             <span className="text-sm font-medium text-[var(--foreground)]">Streak Freeze</span>
@@ -655,11 +655,11 @@ export default function StreakTracker() {
           */}
           <StreakCalendar
             contributions={contributionData.data}
-            Dates={
-              ?.Date
-                ? Array.from(new Set([...Dates, .Date]))
-                : Dates
-            }
+              Dates={
+                  freeze?.Date
+                    ? Array.from(new Set([...Dates, freeze.Date]))
+                    : Dates
+              }
             currentMonth={calendarMonth}
             onMonthChange={setCalendarMonth}
           />