From 65f6e83f11c82b0ec762e11f3392a80e614ee69a Mon Sep 17 00:00:00 2001
From: Mohamed Bassem <me@mbassem.com>
Date: Sun, 1 Feb 2026 12:29:54 +0000
Subject: refactor: migrate trpc to the new react query integration mode
 (#2438)

* refactor: migrate trpc to the new react query integration mode

* more fixes

* more migrations

* upgrade trpc client
---
 apps/browser-extension/src/components/BookmarkLists.tsx |  8 ++++++--
 apps/browser-extension/src/components/ListsSelector.tsx | 12 ++++++++----
 apps/browser-extension/src/components/TagsSelector.tsx  |  6 ++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'apps/browser-extension/src/components')

diff --git a/apps/browser-extension/src/components/BookmarkLists.tsx b/apps/browser-extension/src/components/BookmarkLists.tsx
index 1d70d257..8debef5c 100644
--- a/apps/browser-extension/src/components/BookmarkLists.tsx
+++ b/apps/browser-extension/src/components/BookmarkLists.tsx
@@ -1,3 +1,4 @@
+import { useQuery } from "@tanstack/react-query";
 import { X } from "lucide-react";
 
 import {
@@ -5,15 +6,18 @@ import {
   useRemoveBookmarkFromList,
 } from "@karakeep/shared-react/hooks/lists";
 
-import { api } from "../utils/trpc";
+import { useTRPC } from "../utils/trpc";
 import { Button } from "./ui/button";
 
 export default function BookmarkLists({ bookmarkId }: { bookmarkId: string }) {
+  const api = useTRPC();
   const { data: allLists } = useBookmarkLists();
 
   const { mutate: deleteFromList } = useRemoveBookmarkFromList();
 
-  const { data: lists } = api.lists.getListsOfBookmark.useQuery({ bookmarkId });
+  const { data: lists } = useQuery(
+    api.lists.getListsOfBookmark.queryOptions({ bookmarkId }),
+  );
   if (!lists || !allLists) {
     return null;
   }
diff --git a/apps/browser-extension/src/components/ListsSelector.tsx b/apps/browser-extension/src/components/ListsSelector.tsx
index 86c151d1..b27e866a 100644
--- a/apps/browser-extension/src/components/ListsSelector.tsx
+++ b/apps/browser-extension/src/components/ListsSelector.tsx
@@ -1,4 +1,5 @@
 import * as React from "react";
+import { useQuery } from "@tanstack/react-query";
 import { useSet } from "@uidotdev/usehooks";
 import { Check, ChevronsUpDown } from "lucide-react";
 
@@ -9,7 +10,7 @@ import {
 } from "@karakeep/shared-react/hooks/lists";
 
 import { cn } from "../utils/css";
-import { api } from "../utils/trpc";
+import { useTRPC } from "../utils/trpc";
 import { Button } from "./ui/button";
 import {
   Command,
@@ -23,14 +24,17 @@ import { DynamicPopoverContent } from "./ui/dynamic-popover";
 import { Popover, PopoverTrigger } from "./ui/popover";
 
 export function ListsSelector({ bookmarkId }: { bookmarkId: string }) {
+  const api = useTRPC();
   const currentlyUpdating = useSet<string>();
   const [open, setOpen] = React.useState(false);
 
   const { mutate: addToList } = useAddBookmarkToList();
   const { mutate: removeFromList } = useRemoveBookmarkFromList();
-  const { data: existingLists } = api.lists.getListsOfBookmark.useQuery({
-    bookmarkId,
-  });
+  const { data: existingLists } = useQuery(
+    api.lists.getListsOfBookmark.queryOptions({
+      bookmarkId,
+    }),
+  );
 
   const { data: allLists } = useBookmarkLists();
 
diff --git a/apps/browser-extension/src/components/TagsSelector.tsx b/apps/browser-extension/src/components/TagsSelector.tsx
index ce404ac8..30cdcafc 100644
--- a/apps/browser-extension/src/components/TagsSelector.tsx
+++ b/apps/browser-extension/src/components/TagsSelector.tsx
@@ -1,4 +1,5 @@
 import * as React from "react";
+import { useQuery } from "@tanstack/react-query";
 import { useSet } from "@uidotdev/usehooks";
 import { Check, ChevronsUpDown, Plus } from "lucide-react";
 
@@ -8,7 +9,7 @@ import {
 } from "@karakeep/shared-react/hooks/bookmarks";
 
 import { cn } from "../utils/css";
-import { api } from "../utils/trpc";
+import { useTRPC } from "../utils/trpc";
 import { Button } from "./ui/button";
 import {
   Command,
@@ -22,7 +23,8 @@ import { DynamicPopoverContent } from "./ui/dynamic-popover";
 import { Popover, PopoverTrigger } from "./ui/popover";
 
 export function TagsSelector({ bookmarkId }: { bookmarkId: string }) {
-  const { data: allTags } = api.tags.list.useQuery({});
+  const api = useTRPC();
+  const { data: allTags } = useQuery(api.tags.list.queryOptions({}));
   const { data: bookmark } = useAutoRefreshingBookmarkQuery({ bookmarkId });
 
   const existingTagIds = new Set(bookmark?.tags.map((t) => t.id) ?? []);
-- 
cgit v1.2.3-70-g09d2