Renamed query hooks. Fixed conversion bugs.

src/app/(main)/teams/[teamId]/TeamProvider.tsx

@@ -1,13 +1,13 @@
 'use client';
 import { createContext, ReactNode, useEffect } from 'react';
-import { useTeam, useModified } from '@/components/hooks';
+import { useTeamQuery, useModified } from '@/components/hooks';
 import { Loading } from '@umami/react-zen';
 
 export const TeamContext = createContext(null);
 
 export function TeamProvider({ teamId, children }: { teamId?: string; children: ReactNode }) {
   const { modified } = useModified(`teams`);
-  const { data: team, isLoading, isFetching, refetch } = useTeam(teamId);
+  const { data: team, isLoading, isFetching, refetch } = useTeamQuery(teamId);
 
   useEffect(() => {
     if (teamId && modified) {

src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx

@@ -1,11 +1,11 @@
 'use client';
 import { ReactNode } from 'react';
-import { useMessages, useTeamUrl } from '@/components/hooks';
+import { useMessages, useNavigation } from '@/components/hooks';
 import { MenuLayout } from '@/components/layout/MenuLayout';
 
 export function TeamSettingsLayout({ children }: { children: ReactNode }) {
   const { formatMessage, labels } = useMessages();
-  const { teamId } = useTeamUrl();
+  const { teamId } = useNavigation();
 
   const items = [
     {

src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsx

@@ -1,6 +1,6 @@
 import { DataGrid } from '@/components/common/DataGrid';
 import { TeamMembersTable } from './TeamMembersTable';
-import { useTeamMembers } from '@/components/hooks';
+import { useTeamMembersQuery } from '@/components/hooks';
 
 export function TeamMembersDataTable({
   teamId,
@@ -9,7 +9,7 @@ export function TeamMembersDataTable({
   teamId: string;
   allowEdit?: boolean;
 }) {
-  const queryResult = useTeamMembers(teamId);
+  const queryResult = useTeamMembersQuery(teamId);
 
   return (
     <DataGrid queryResult={queryResult}>

src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx

@@ -2,13 +2,13 @@
 import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider';
 import { TeamMembersDataTable } from './TeamMembersDataTable';
 import { PageHeader } from '@/components/layout/PageHeader';
-import { useLogin, useMessages } from '@/components/hooks';
+import { useLoginQuery, useMessages } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';
 import { useContext } from 'react';
 
 export function TeamMembersPage({ teamId }: { teamId: string }) {
   const team = useContext(TeamContext);
-  const { user } = useLogin();
+  const { user } = useLoginQuery();
   const { formatMessage, labels } = useMessages();
 
   const canEdit =

src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx

@@ -1,5 +1,5 @@
 import { DataColumn, DataTable } from '@umami/react-zen';
-import { useMessages, useLogin } from '@/components/hooks';
+import { useMessages, useLoginQuery } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';
 import { TeamMemberRemoveButton } from './TeamMemberRemoveButton';
 import { TeamMemberEditButton } from './TeamMemberEditButton';
@@ -14,7 +14,7 @@ export function TeamMembersTable({
   allowEdit: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { user } = useLogin();
+  const { user } = useLoginQuery();
 
   const roles = {
     [ROLES.teamOwner]: formatMessage(labels.teamOwner),

src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx

@@ -1,5 +1,5 @@
 import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider';
-import { useLogin, useMessages } from '@/components/hooks';
+import { useLoginQuery, useMessages } from '@/components/hooks';
 import { Icons } from '@/components/icons';
 import { PageHeader } from '@/components/layout/PageHeader';
 import { ROLES } from '@/lib/constants';
@@ -13,7 +13,7 @@ import { Panel } from '@/components/layout/Panel';
 export function TeamDetails({ teamId }: { teamId: string }) {
   const team = useContext(TeamContext);
   const { formatMessage, labels } = useMessages();
-  const { user } = useLogin();
+  const { user } = useLoginQuery();
   const [tab, setTab] = useState('details');
 
   const isTeamOwner =

src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsx

@@ -1,5 +1,5 @@
 import { DataGrid } from '@/components/common/DataGrid';
-import { useTeamWebsites } from '@/components/hooks';
+import { useTeamWebsitesQuery } from '@/components/hooks';
 import { TeamWebsitesTable } from './TeamWebsitesTable';
 
 export function TeamWebsitesDataTable({
@@ -9,7 +9,7 @@ export function TeamWebsitesDataTable({
   teamId: string;
   allowEdit?: boolean;
 }) {
-  const queryResult = useTeamWebsites(teamId);
+  const queryResult = useTeamWebsitesQuery(teamId);
 
   return (
     <DataGrid queryResult={queryResult}>

src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx

@@ -1,7 +1,7 @@
 'use client';
 import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider';
 import { WebsiteAddButton } from '@/app/(main)/settings/websites/WebsiteAddButton';
-import { useLogin, useMessages } from '@/components/hooks';
+import { useLoginQuery, useMessages } from '@/components/hooks';
 import { PageHeader } from '@/components/layout/PageHeader';
 import { TeamWebsitesDataTable } from './TeamWebsitesDataTable';
 import { ROLES } from '@/lib/constants';
@@ -10,7 +10,7 @@ import { useContext } from 'react';
 export function TeamWebsitesPage({ teamId }: { teamId: string }) {
   const team = useContext(TeamContext);
   const { formatMessage, labels } = useMessages();
-  const { user } = useLogin();
+  const { user } = useLoginQuery();
 
   const canEdit =
     !!team?.teamUser?.find(

src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx

@@ -1,5 +1,5 @@
 import { DataColumn, DataTable, Icon, Text } from '@umami/react-zen';
-import { useLogin, useMessages } from '@/components/hooks';
+import { useLoginQuery, useMessages } from '@/components/hooks';
 import { Icons } from '@/components/icons';
 import { LinkButton } from '@/components/common/LinkButton';
 
@@ -12,7 +12,7 @@ export function TeamWebsitesTable({
   data: any[];
   allowEdit?: boolean;
 }) {
-  const { user } = useLogin();
+  const { user } = useLoginQuery();
   const { formatMessage, labels } = useMessages();
 
   return (