diff --git a/packages/app/features/account/screen.test.tsx b/packages/app/features/account/screen.test.tsx index 324df1da9..e52740303 100644 --- a/packages/app/features/account/screen.test.tsx +++ b/packages/app/features/account/screen.test.tsx @@ -14,7 +14,7 @@ jest.mock('app/routers/params', () => ({ })) jest.mock('app/utils/useUserReferralsCount', () => ({ - useUserReferralsCount: jest.fn().mockReturnValue({ referralsCount: 10 }), + useUserReferralsCount: jest.fn().mockReturnValue({ data: 10 }), })) describe('AccountScreen', () => { diff --git a/packages/app/features/account/screen.tsx b/packages/app/features/account/screen.tsx index 3af79bac0..b4aac8bbb 100644 --- a/packages/app/features/account/screen.tsx +++ b/packages/app/features/account/screen.tsx @@ -36,7 +36,7 @@ export function AccountScreen() { const media = useMedia() const toast = useToastController() const { profile } = useUser() - const { referralsCount } = useUserReferralsCount() + const { data: referralsCount } = useUserReferralsCount() const name = profile?.name const send_id = profile?.send_id diff --git a/packages/app/features/home/screen.test.tsx b/packages/app/features/home/screen.test.tsx index 55671631d..74553e842 100644 --- a/packages/app/features/home/screen.test.tsx +++ b/packages/app/features/home/screen.test.tsx @@ -30,7 +30,7 @@ jest.mock('solito', () => { }) jest.mock('app/utils/useUserReferralsCount', () => ({ - useUserReferralsCount: jest.fn().mockReturnValue(123), + useUserReferralsCount: jest.fn().mockReturnValue({ data: 123 }), })) jest.mock('app/utils/useSendAccountBalances', () => ({ diff --git a/packages/app/features/referrals/screen.test.tsx b/packages/app/features/referrals/screen.test.tsx index f92457b09..1dd875e05 100644 --- a/packages/app/features/referrals/screen.test.tsx +++ b/packages/app/features/referrals/screen.test.tsx @@ -4,7 +4,7 @@ import { render, act, screen } from '@testing-library/react-native' import { ReferralsScreen } from './screen' jest.mock('app/utils/useUserReferralsCount', () => ({ - useUserReferralsCount: jest.fn().mockReturnValue({ referralsCount: 123, error: null }), + useUserReferralsCount: jest.fn().mockReturnValue({ data: 123, error: null }), })) test('ReferralScreen', async () => { diff --git a/packages/app/features/referrals/screen.tsx b/packages/app/features/referrals/screen.tsx index 17abe3317..37c132f49 100644 --- a/packages/app/features/referrals/screen.tsx +++ b/packages/app/features/referrals/screen.tsx @@ -45,7 +45,7 @@ const RewardsHistoryHeader = () => ( ) const StatsCards = () => { - const { referralsCount, error: referralsCountError } = useUserReferralsCount() + const { data: referralsCount, error: referralsCountError } = useUserReferralsCount() return ( diff --git a/packages/app/utils/useUserReferralsCount.ts b/packages/app/utils/useUserReferralsCount.ts index 4ef230568..448644cf2 100644 --- a/packages/app/utils/useUserReferralsCount.ts +++ b/packages/app/utils/useUserReferralsCount.ts @@ -1,20 +1,14 @@ -import { useQuery } from '@tanstack/react-query' +import type { Functions } from '@my/supabase/database.types' +import type { PostgrestError } from '@supabase/postgrest-js' +import { useQuery, type UseQueryResult } from '@tanstack/react-query' import { useSupabase } from 'app/utils/supabase/useSupabase' -export type UserReferralsCount = { - referralsCount: number | undefined - error: Error | null - isLoading: boolean - refetch: () => void -} -export const useUserReferralsCount = () => { +export const useUserReferralsCount = (): UseQueryResult< + Functions<'user_referrals_count'>, + PostgrestError +> => { const supabase = useSupabase() - const { - data: referralsCount, - isLoading, - refetch, - error, - } = useQuery({ + return useQuery({ queryKey: ['user_referrals_count'], queryFn: async () => { const { data, error } = await supabase.rpc('user_referrals_count').select('*') @@ -28,11 +22,4 @@ export const useUserReferralsCount = () => { return data }, }) - - return { - referralsCount, - isLoading, - error, - refetch, - } as UserReferralsCount }