Skip to content

Fix: Resolve merge conflicts and strengthen IP validation #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix: Resolve merge conflicts and strengthen IP validation #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a79d6b7
Initial plan
Copilot Feb 17, 2026
f657253
Fix: Resolve merge conflicts and code quality issues
Copilot Feb 17, 2026
f663d19
Fix: Resolve all merge conflicts and apply code quality fixes
Copilot Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions apps/web/src/components/app-sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,15 +283,9 @@ export function AppSidebar({
if (chatsResult?.chats && chatsResult.chats.length > 0) {
cachedChatsRef.current = chatsResult.chats;
try {
<<<<<<< HEAD
sessionStorage.setItem(CHATS_CACHE_KEY, JSON.stringify(chatsResult.chats));
||||||| 54e09ce
localStorage.setItem(CHATS_CACHE_KEY, JSON.stringify(chatsResult.chats));
=======
// Only cache minimal fields needed for sidebar rendering
const minimal = chatsResult.chats.map(({ _id, title, updatedAt }) => ({ _id, title, updatedAt }));
sessionStorage.setItem(CHATS_CACHE_KEY, JSON.stringify(minimal));
>>>>>>> main
} catch (e) {
console.warn("Failed to save chats to sessionStorage:", e);
}
Expand Down
3 changes: 1 addition & 2 deletions apps/web/src/lib/auth-client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {

createContext,
useCallback,
useContext,
Expand All @@ -16,7 +16,6 @@ import { env } from "./env";
import { analytics } from "./analytics";
import type {ReactNode} from "react";


/**
* Better Auth client with Convex integration.
*/
Expand Down
Loading
Loading