diff --git a/app/api/conversations/[id]/presence/route.ts b/app/api/conversations/[id]/presence/route.ts
index 45cf90a..8259408 100644
--- a/app/api/conversations/[id]/presence/route.ts
+++ b/app/api/conversations/[id]/presence/route.ts
@@ -12,16 +12,15 @@ export async function PATCH(
   }
 
   const { id: conversationId } = await params;
-  const body = await req.json().catch(() => ({}));
-  const { markRead } = body as { markRead?: boolean };
+  const { mark_read } = await req.json();
 
   const timestamp = new Date();
 
-  const data: { lastSeenAt: Date; lastReadAt?: Date } = {
-    lastSeenAt: timestamp,
+  const data: { last_seen_at: Date; last_read_at?: Date } = {
+    last_seen_at: timestamp,
   };
-  if (markRead) {
-    data.lastReadAt = timestamp;
+  if (mark_read) {
+    data.last_read_at = timestamp;
   }
 
   await prisma.conversationParticipant.updateMany({
diff --git a/app/api/conversations/route.ts b/app/api/conversations/route.ts
index c541544..ca8395a 100644
--- a/app/api/conversations/route.ts
+++ b/app/api/conversations/route.ts
@@ -47,11 +47,11 @@ export async function POST(req: Request) {
     return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
   }
 
-  const { otherUserId, otherUserEmail } = await req.json();
+  const { other_user_id, other_user_email } = await req.json();
 
-  if (!otherUserId) {
+  if (!other_user_id) {
     return NextResponse.json(
-      { error: "otherUserId is required." },
+      { error: "other_user_id is required." },
       { status: 400 },
     );
   }
@@ -71,8 +71,8 @@ export async function POST(req: Request) {
             last_read_at: timestamp,
           },
           {
-            user_id: otherUserId,
-            email: otherUserEmail ?? "",
+            user_id: other_user_id,
+            email: other_user_email ?? "",
             last_seen_at: EPOCH,
             last_read_at: EPOCH,
           },
diff --git a/app/api/messages/route.ts b/app/api/messages/route.ts
index 360bbae..66b3955 100644
--- a/app/api/messages/route.ts
+++ b/app/api/messages/route.ts
@@ -58,10 +58,10 @@ export async function POST(req: Request) {
     return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
   }
 
-  const { conversationId, text, attachments } = await req.json();
+  const { conversation_id, text, attachments } = await req.json();
 
   if (
-    !conversationId ||
+    !conversation_id ||
     (!text?.trim() && (!attachments || attachments.length === 0))
   ) {
     return NextResponse.json(
@@ -73,7 +73,7 @@ export async function POST(req: Request) {
   const participant = await prisma.conversationParticipant.findUnique({
     where: {
       conversation_id_user_id: {
-        conversation_id: conversationId,
+        conversation_id,
         user_id: session.user.id,
       },
     },
@@ -85,7 +85,7 @@ export async function POST(req: Request) {
 
   const message = await prisma.message.create({
     data: {
-      conversation_id: conversationId,
+      conversation_id,
       sender_id: session.user.id,
       text: text?.trim() ?? "",
       attachments: attachments ?? [],
@@ -101,11 +101,11 @@ export async function POST(req: Request) {
     created_at: message.created_at.toISOString(),
   };
 
-  emitter.emit(`chat:${conversationId}`, { type: "message", data: payload });
+  emitter.emit(`chat:${conversation_id}`, { type: "message", data: payload });
 
   const participants = await prisma.conversationParticipant.findMany({
     where: {
-      conversation_id: conversationId,
+      conversation_id,
       user_id: { not: session.user.id },
     },
     select: { user_id: true },
@@ -114,7 +114,7 @@ export async function POST(req: Request) {
   for (const p of participants) {
     emitter.emit(`user:${p.user_id}`, {
       type: "new_message",
-      data: { conversation_id: conversationId, sender_id: session.user.id },
+      data: { conversation_id, sender_id: session.user.id },
     });
   }
 
diff --git a/app/api/wakatime/sync/route.ts b/app/api/wakatime/sync/route.ts
index b284c44..87f6299 100644
--- a/app/api/wakatime/sync/route.ts
+++ b/app/api/wakatime/sync/route.ts
@@ -1,30 +1,55 @@
 import { NextResponse } from "next/server";
-import { getCurrentUser } from "@/app/lib/auth/user";
 import {
   saveWakatimeApiKey,
   syncWakatimeData,
   validateWakatimeApiKey,
 } from "@/app/lib/wakatime/sync";
+import { auth } from "@/app/lib/auth";
 
-export async function GET(request: Request) {
-  const { user } = await getCurrentUser();
-  const { searchParams } = new URL(request.url);
-  const apiKey = searchParams.get("apiKey") || "";
-  const saveOnly =
-    searchParams.get("saveOnly") === "1" ||
-    searchParams.get("saveOnly") === "true";
+export async function GET(req: Request) {
+  const session = await auth();
+  if (!session?.user?.id) {
+    return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+  }
 
-  const validationError = validateWakatimeApiKey(apiKey);
-  if (validationError) {
-    return NextResponse.json({ error: validationError }, { status: 400 });
+  const result = await syncWakatimeData({
+    userId: session.user.id,
+    incomingApiKey: "",
+    storedApiKey: session.user.wakatime_api_key ?? undefined,
+  });
+
+  if (!result.success && result.status !== 200) {
+    return NextResponse.json(
+      { error: result.error },
+      { status: result.status },
+    );
   }
 
-  if (!user) {
+  return NextResponse.json({
+    success: result.success,
+    data: result.data,
+    error: result.error,
+  });
+}
+
+export async function POST(req: Request) {
+  const session = await auth();
+  if (!session?.user?.id) {
     return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
   }
 
-  if (saveOnly) {
-    const result = await saveWakatimeApiKey({ userId: user.id, apiKey });
+  const { api_key, save_only } = await req.json();
+
+  const validationError = validateWakatimeApiKey(api_key);
+  if (validationError) {
+    return NextResponse.json({ error: validationError }, { status: 400 });
+  }
+
+  if (save_only) {
+    const result = await saveWakatimeApiKey({
+      userId: session.user.id,
+      apiKey: api_key,
+    });
 
     if (!result.success) {
       return NextResponse.json(
@@ -37,9 +62,9 @@ export async function GET(request: Request) {
   }
 
   const result = await syncWakatimeData({
-    userId: user.id,
-    incomingApiKey: apiKey,
-    storedApiKey: user.wakatime_api_key,
+    userId: session.user.id,
+    incomingApiKey: api_key,
+    storedApiKey: session.user.wakatime_api_key,
   });
 
   if (!result.success && result.status !== 200) {
diff --git a/app/components/Chat.tsx b/app/components/Chat.tsx
index 168d7a3..3062001 100644
--- a/app/components/Chat.tsx
+++ b/app/components/Chat.tsx
@@ -302,19 +302,18 @@ export default function Chat({ user }: { user: ChatUserShape }) {
     : undefined;
 
   const activeLabel = isGlobalActive
-    ? "Global Chat"
+    ? "Global"
     : activeOtherUser?.email?.split("@")[0] || "Unknown";
 
   const activeSublabel = isGlobalActive
-    ? "Public Channel"
+    ? "Worldwide"
     : activeOtherUserOnline
       ? "Online"
       : "Offline";
 
-  const activeSublabelClass =
-    activeOtherUserOnline || isGlobalActive
-      ? "text-emerald-600"
-      : "text-gray-500";
+  const activeSublabelClass = activeOtherUserOnline
+    ? "text-emerald-600"
+    : "text-gray-500";
 
   const typingIndicatorText = activeTypingState
     ? isGlobalActive
@@ -355,15 +354,15 @@ export default function Chat({ user }: { user: ChatUserShape }) {
         attachments={allMediaAttachments}
         onChange={setMediaViewer}
       />
-      <div className="flex h-screen w-full bg-transparent text-gray-900 overflow-hidden relative">
+      <div className="flex h-220 sm:h-screen w-full bg-transparent text-gray-900 overflow-hidden relative">
         {/* Left Sidebar */}
         <div
-          className={`w-full md:w-[300px] flex-shrink-0 border-r border-gray-200 flex flex-col bg-white md:bg-transparent z-20 absolute md:relative h-full transition-transform duration-300 ${conversationId ? "-translate-x-full md:translate-x-0" : "translate-x-0"}`}
+          className={`w-full md:w-[300px] flex-shrink-0 border-r border-gray-200 flex flex-col bg-white z-20 absolute md:relative h-full transition-transform duration-300 ${conversationId ? "-translate-x-full md:translate-x-0" : "translate-x-0"}`}
         >
           <div className="p-5 border-b border-gray-200">
             <div className="flex items-center justify-between mb-4">
               <h2 className="text-lg font-bold text-gray-700 tracking-tight">
-                Message category
+                Messages
               </h2>
               <button
                 onClick={() => setShowModal(true)}
@@ -492,7 +491,7 @@ export default function Chat({ user }: { user: ChatUserShape }) {
           {conversationId ? (
             <>
               {/* Header */}
-              <div className="h-[72px] flex items-center justify-between px-4 sm:px-6 border-b border-gray-200 bg-white/[0.01] z-10 flex-shrink-0">
+              <div className="h-[72px] flex items-center justify-between px-4 sm:px-6 border-b border-gray-200 bg-white z-10 flex-shrink-0">
                 <div className="flex items-center gap-2 sm:gap-3.5">
                   <button
                     onClick={() => setConversationId(null)}
@@ -503,16 +502,6 @@ export default function Chat({ user }: { user: ChatUserShape }) {
                       className="w-3.5 h-3.5"
                     />
                   </button>
-                  <div className="relative">
-                    <div
-                      className={`flex justify-center items-center w-11 h-11 rounded-full text-[16px] font-bold shadow-sm ${isGlobalActive ? "bg-blue-500/15 text-blue-600 border border-blue-500/30" : "bg-neutral-800 text-gray-700 border border-gray-200"}`}
-                    >
-                      {activeInitials}
-                    </div>
-                    {!isGlobalActive && activeOtherUserOnline && (
-                      <div className="absolute bottom-0.5 right-0.5 w-3 h-3 bg-emerald-400 border-[2px] border-transparent rounded-full"></div>
-                    )}
-                  </div>
                   <div>
                     <h2 className="text-[16px] font-bold text-gray-700 leading-tight">
                       {activeLabel}
@@ -682,7 +671,7 @@ export default function Chat({ user }: { user: ChatUserShape }) {
         {/* Right Sidebar */}
         {conversationId && (
           <div
-            className={`w-full sm:w-[320px] flex-shrink-0 border-l border-gray-200 flex flex-col absolute right-0 top-0 bottom-0 h-full z-40 bg-white md:bg-white xl:bg-transparent xl:relative xl:transform-none transition-transform duration-300 ${showRightSidebar ? "translate-x-0" : "translate-x-full xl:translate-x-0 xl:hidden"}`}
+            className={`w-full sm:w-[320px] flex-shrink-0 border-l border-gray-200 flex flex-col absolute right-0 top-0 bottom-0 h-full z-40 bg-white xl:bg-transparent xl:relative xl:transform-none transition-transform duration-300 ${showRightSidebar ? "translate-x-0" : "translate-x-full xl:translate-x-0 xl:hidden"}`}
           >
             <div className="absolute top-4 right-4 xl:hidden">
               <button
@@ -839,9 +828,11 @@ export default function Chat({ user }: { user: ChatUserShape }) {
         )}
 
         {showModal && (
-          <div className="fixed inset-0 flex items-center justify-center bg-black/70 z-50 backdrop-blur-sm">
-            <div className="glass-card w-[400px] p-6">
-              <h3 className="text-lg font-bold text-gray-900 mb-4">New Message</h3>
+          <div className="fixed p-5 inset-0 flex items-center justify-center bg-black/70 z-50 backdrop-blur-sm">
+            <div className="glass-card p-8">
+              <h3 className="text-lg font-bold text-gray-900 mb-4">
+                New Message
+              </h3>
               <input
                 value={search}
                 onChange={(e) => setSearch(e.target.value)}
diff --git a/app/components/auth/VerifyWakatime.tsx b/app/components/auth/VerifyWakatime.tsx
index e3818c8..8aafc2f 100644
--- a/app/components/auth/VerifyWakatime.tsx
+++ b/app/components/auth/VerifyWakatime.tsx
@@ -43,9 +43,11 @@ export default function VerifyWakatime() {
 
     const verifyWakatimePromise = new Promise<void>(async (resolve, reject) => {
       try {
-        const wakatimeSyncResponse = await fetch(
-          `/api/wakatime/sync?apiKey=${encodeURIComponent(apiKey)}`,
-        );
+        const wakatimeSyncResponse = await fetch(`/api/wakatime/sync`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ api_key: apiKey, save_only: true }),
+        });
         if (!wakatimeSyncResponse.ok)
           throw new Error("Failed to sync Wakatime.");
 
@@ -86,7 +88,12 @@ export default function VerifyWakatime() {
             href="/"
             className="flex items-center gap-3 w-fit hover:opacity-80 transition"
           >
-            <Image src="/apple-touch-icon.png" alt="Devpulse Logo" width={40} height={40} />
+            <Image
+              src="/apple-touch-icon.png"
+              alt="Devpulse Logo"
+              width={40}
+              height={40}
+            />
             <span className="text-2xl font-bold tracking-tight text-white">
               Devpulse
             </span>
@@ -152,7 +159,12 @@ export default function VerifyWakatime() {
             href="/"
             className="lg:hidden flex items-center justify-center gap-3 mb-10"
           >
-            <Image src="/apple-touch-icon.png" alt="Devpulse Logo" width={40} height={40} />
+            <Image
+              src="/apple-touch-icon.png"
+              alt="Devpulse Logo"
+              width={40}
+              height={40}
+            />
             <h2 className="text-3xl font-bold text-gray-900">Devpulse</h2>
           </Link>
 
diff --git a/app/components/chat/Conversations.tsx b/app/components/chat/Conversations.tsx
index 59034d7..f085b1d 100644
--- a/app/components/chat/Conversations.tsx
+++ b/app/components/chat/Conversations.tsx
@@ -46,20 +46,14 @@ export default function Conversations({
             key={idx}
             type="button"
             onClick={() => setConversationId(conv.id)}
-            className={`w-full flex items-center gap-3.5 p-3 rounded-xl transition-all text-left ${
+            className={`w-full flex items-center bg-gray-100 gap-3.5 p-3 rounded-xl transition-all text-left ${
               isActive
-                ? "bg-gray-100 border border-gray-200 shadow-sm"
+                ? "bg-gray-100 border border-gray-300"
                 : "hover:bg-gray-100 border border-transparent opacity-80 hover:opacity-100"
             }`}
           >
             <div className="relative flex-shrink-0">
-              <div
-                className={`flex justify-center items-center w-[38px] h-[38px] rounded-full text-[14px] font-bold transition-all border ${
-                  isGlobal
-                    ? "bg-blue-500/15 text-blue-600 border-blue-500/30"
-                    : "bg-neutral-800 text-gray-700 border-gray-200 shadow-sm"
-                }`}
-              >
+              <div className="flex justify-center items-center w-[38px] h-[38px] rounded-full text-[14px] font-bold transition-all border bg-white-800 text-gray-500 border-gray-200">
                 {initials}
               </div>
               {!isGlobal && isOnline && (
diff --git a/app/components/chat/Messages.tsx b/app/components/chat/Messages.tsx
index b95a8fe..b8f3b0e 100644
--- a/app/components/chat/Messages.tsx
+++ b/app/components/chat/Messages.tsx
@@ -225,8 +225,8 @@ export default function Messages({
                   <div
                     className={`px-5 py-3 text-[14px] leading-relaxed break-words break-all overflow-x-hidden ${
                       isSelf
-                        ? "bg-blue-600 border border-blue-500/50 text-gray-900 rounded-2xl rounded-br-sm shadow-sm"
-                        : "bg-[rgba(15,15,40,0.6)] border border-blue-200 text-gray-700 rounded-2xl rounded-bl-sm"
+                        ? "bg-blue-500 text-white rounded-2xl rounded-br-sm shadow-sm"
+                        : "bg-white border border-gray-200 text-gray-500 rounded-2xl rounded-bl-sm"
                     }`}
                   >
                     <div className="prose prose-invert prose-sm max-w-none break-words break-all whitespace-pre-wrap leading-[1.6]">
diff --git a/app/components/chat/hooks/useChatConversationActions.ts b/app/components/chat/hooks/useChatConversationActions.ts
index 8d3540f..4f4deca 100644
--- a/app/components/chat/hooks/useChatConversationActions.ts
+++ b/app/components/chat/hooks/useChatConversationActions.ts
@@ -71,8 +71,8 @@ export function useChatConversationActions({
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({
-            otheruser_id: otherUser.user_id,
-            otherUserEmail: otherUser.email,
+            other_user_id: otherUser.user_id,
+            other_user_email: otherUser.email,
           }),
         });
 
diff --git a/app/components/chat/hooks/useChatMessageComposer.ts b/app/components/chat/hooks/useChatMessageComposer.ts
index 26f2ebd..b30a335 100644
--- a/app/components/chat/hooks/useChatMessageComposer.ts
+++ b/app/components/chat/hooks/useChatMessageComposer.ts
@@ -86,7 +86,7 @@ export function useChatMessageComposer({
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
-          conversationId: targetConversationId,
+          conversation_id: targetConversationId,
           text: outgoingText,
           attachments: [],
         }),
diff --git a/app/components/chat/hooks/useChatPresence.ts b/app/components/chat/hooks/useChatPresence.ts
index eea2cee..13d2b2d 100644
--- a/app/components/chat/hooks/useChatPresence.ts
+++ b/app/components/chat/hooks/useChatPresence.ts
@@ -101,7 +101,7 @@ export function useChatPresence({
       await fetch(`/api/conversations/${targetConversationId}/presence`, {
         method: "PATCH",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ markRead: true }),
+        body: JSON.stringify({ mark_read: true }),
       }).catch(() => {});
     },
     [
diff --git a/app/components/dashboard/Settings/WakaTimeKey.tsx b/app/components/dashboard/Settings/WakaTimeKey.tsx
index 4e1be67..5f98e97 100644
--- a/app/components/dashboard/Settings/WakaTimeKey.tsx
+++ b/app/components/dashboard/Settings/WakaTimeKey.tsx
@@ -42,16 +42,13 @@ export default function WakaTimeKey({
 
     const updateKey = new Promise<void>(async (resolve, reject) => {
       try {
-        const response = await fetch(
-          `/api/wakatime/sync?apiKey=${encodeURIComponent(nextKey)}&saveOnly=1`,
-        );
-        const payload = (await response.json()) as { error?: string };
-
-        if (!response.ok) {
-          return reject(
-            new Error(payload.error || "Failed to update API key."),
-          );
-        }
+        const wakatimeSyncResponse = await fetch(`/api/wakatime/sync`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ api_key: key, save_only: true }),
+        });
+        if (!wakatimeSyncResponse.ok)
+          throw new Error("Failed to sync Wakatime.");
 
         resolve();
       } catch (error) {
diff --git a/app/layout.tsx b/app/layout.tsx
index 96c67f9..6e68104 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -105,7 +105,7 @@ export default function RootLayout({
     >
       <head>
         <meta charSet="utf-8" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
         <meta name="hostname" content="devpulse.hallofcodes.org" />
 
         <link
diff --git a/app/lib/proxy/rate-limiter.ts b/app/lib/proxy/rate-limiter.ts
index 25a6fa3..9c117e2 100644
--- a/app/lib/proxy/rate-limiter.ts
+++ b/app/lib/proxy/rate-limiter.ts
@@ -1,6 +1,23 @@
 import { NextRequest, NextResponse } from "next/server";
 import { checkRateLimit } from "../../utils/rate-limit";
 
+/*
+ * Gets the rate limit for a given route based on pathname and method.
+ *
+ * @param pathname The pathname of the request.
+ * @param method The HTTP method of the request.
+ * @returns An object containing the maximum number of requests and the window duration in milliseconds.
+ */
+function getLimitsForRoute(pathname: string, method: string) {
+  const isAuthEndpoint = /api\/(login|signup)/.test(pathname);
+  if (isAuthEndpoint) return { max: 10, windowMs: 60 * 60 * 1000 }; // thats 1 hour for 10 requests
+
+  const isMutating = ["POST", "PUT", "PATCH", "DELETE"].includes(method);
+  if (isMutating) return { max: 20, windowMs: 5 * 60 * 1000 }; // thats 5 minutes for 20 requests
+
+  return { max: 100, windowMs: 5 * 60 * 1000 }; // thats 5 minutes for 100 requests
+}
+
 export default function RateLimiter(
   request: NextRequest,
 ): NextResponse | undefined {
@@ -27,11 +44,11 @@ export default function RateLimiter(
     );
   }
 
-  const isAuthEndpoint = /api\/(login|signup)/.test(request.nextUrl.pathname);
-  const maxRequests = isAuthEndpoint ? 5 : 10;
-  const windowMs = isAuthEndpoint ? 60 * 60 * 1000 : 5 * 60 * 1000;
-
-  const withinLimit = checkRateLimit(ip, maxRequests, windowMs);
+  const { max, windowMs } = getLimitsForRoute(
+    request.nextUrl.pathname,
+    request.method,
+  );
+  const withinLimit = checkRateLimit(ip, max, windowMs);
 
   if (!withinLimit) {
     return NextResponse.json({ error: "Too many requests" }, { status: 429 });
diff --git a/app/lib/wakatime/sync.ts b/app/lib/wakatime/sync.ts
index fc59469..7d7a95c 100644
--- a/app/lib/wakatime/sync.ts
+++ b/app/lib/wakatime/sync.ts
@@ -179,17 +179,39 @@ export async function syncWakatimeData({
         Date.now() - lastFetch < SIX_HOURS_MS &&
         (existingDailyStats as unknown[]).length >= CONSISTENCY_DAYS
       ) {
-        return {
-          status: 200,
-          success: true,
-          data: serializeBigInts(existing),
-        };
+        return { status: 200, success: true, data: serializeBigInts(existing) };
       }
     }
   }
 
   const { startStr, endStr } = getWindowRange();
-  const waka = await fetchWakatimeData(resolvedApiKey, startStr, endStr);
+
+  const keyUpdatePromise = normalizedIncomingApiKey
+    ? updateProfileWakatimeApiKey(userId, normalizedIncomingApiKey).then(
+        () => ({ ok: true as const }),
+        (err) => ({ ok: false as const, err }),
+      )
+    : Promise.resolve({ ok: true as const });
+
+  const [waka, keyUpdateResult] = await Promise.all([
+    fetchWakatimeData(resolvedApiKey, startStr, endStr),
+    keyUpdatePromise,
+  ]);
+
+  if (!keyUpdateResult.ok) {
+    const err = keyUpdateResult.err;
+    if (
+      err instanceof Prisma.PrismaClientKnownRequestError &&
+      err.code === "P2002"
+    ) {
+      return {
+        status: 400,
+        success: false,
+        error: "This WakaTime API key is already in use.",
+      };
+    }
+    return { status: 500, success: false, error: "Failed to update API key" };
+  }
 
   if (!waka.ok || !waka.stats || !waka.summaries) {
     return {
@@ -199,24 +221,6 @@ export async function syncWakatimeData({
     };
   }
 
-  if (normalizedIncomingApiKey) {
-    try {
-      await updateProfileWakatimeApiKey(userId, normalizedIncomingApiKey);
-    } catch (err) {
-      if (
-        err instanceof Prisma.PrismaClientKnownRequestError &&
-        err.code === "P2002"
-      ) {
-        return {
-          status: 400,
-          success: false,
-          error: "This WakaTime API key is already in use.",
-        };
-      }
-      return { status: 500, success: false, error: "Failed to update API key" };
-    }
-  }
-
   const dailyStats = waka.summaries.map((day) => ({
     date: toDateKey(day.range.date),
     total_seconds: Math.floor(day.grand_total.total_seconds || 0),
@@ -251,15 +255,7 @@ export async function syncWakatimeData({
       projects: (waka.stats.projects || []) as Prisma.InputJsonValue,
       last_fetched_at: new Date(nowIso),
     }),
-  ]);
-
-  const mergedResult = {
-    ...statsResult,
-    projects: projectsResult?.projects || [],
-  };
-
-  try {
-    await upsertUserDashboardSnapshot({
+    upsertUserDashboardSnapshot({
       user_id: userId,
       snapshot_date: new Date(endStr),
       total_seconds_7d: BigInt(snapshotMetrics.totalSeconds7d),
@@ -277,10 +273,16 @@ export async function syncWakatimeData({
           ? new Prisma.Decimal(topLanguage.percent.toFixed(2))
           : null,
       updated_at: new Date(nowIso),
-    });
-  } catch (err) {
-    console.error("Failed to upsert user dashboard snapshot", err);
-  }
+    }).catch((err) => {
+      console.error("Failed to upsert user dashboard snapshot", err);
+      return null;
+    }),
+  ]);
+
+  const mergedResult = {
+    ...statsResult,
+    projects: projectsResult?.projects || [],
+  };
 
   return {
     status: 200,
diff --git a/app/utils/time.ts b/app/utils/time.ts
index 477706a..360eafa 100644
--- a/app/utils/time.ts
+++ b/app/utils/time.ts
@@ -28,31 +28,33 @@ export function formatHours(seconds: string | number) {
  * @param timestamp The timestamp to compare against the current time.
  * @returns A human-readable string representing the time elapsed since the given timestamp, or `null` if the timestamp is invalid.
  */
-export function timeAgo(timestamp: string) {
+export function timeAgo(timestamp: string | null | undefined) {
   if (!timestamp) return null;
 
-  const timestampDate = Number(timestamp);
-  const now = Date.now();
-  const diffSeconds = Math.floor(now / 1000 - timestampDate);
+  // support both ISO strings and unix-seconds strings
+  const isNumeric = /^\d+$/.test(timestamp.trim());
+  const timestampMs = isNumeric
+    ? Number(timestamp) * 1000
+    : new Date(timestamp).getTime();
+
+  if (Number.isNaN(timestampMs)) return null;
+
+  const diffSeconds = Math.floor((Date.now() - timestampMs) / 1000);
+  if (diffSeconds < 0) return "just now"; // guard against clock skew
 
   if (diffSeconds < 60)
     return `${diffSeconds} second${diffSeconds !== 1 ? "s" : ""} ago`;
-
   const diffMinutes = Math.floor(diffSeconds / 60);
   if (diffMinutes < 60)
     return `${diffMinutes} minute${diffMinutes !== 1 ? "s" : ""} ago`;
-
   const diffHours = Math.floor(diffMinutes / 60);
   if (diffHours < 24)
     return `${diffHours} hour${diffHours !== 1 ? "s" : ""} ago`;
-
   const diffDays = Math.floor(diffHours / 24);
   if (diffDays < 30) return `${diffDays} day${diffDays !== 1 ? "s" : ""} ago`;
-
   const diffMonths = Math.floor(diffDays / 30);
   if (diffMonths < 12)
     return `${diffMonths} month${diffMonths !== 1 ? "s" : ""} ago`;
-
   const diffYears = Math.floor(diffMonths / 12);
   return `${diffYears} year${diffYears !== 1 ? "s" : ""} ago`;
 }