fix

sdk/dapp-kit/src/hooks/useResolveSuiNSNames.ts

@@ -9,12 +9,11 @@ import { useSuiClientQuery } from './useSuiClientQuery.js';
 export function useResolveSuiNSName(
 	address?: string | null,
 	options?: Omit<
-		UseQueryOptions<ResolvedNameServiceNames, Error, ResolvedNameServiceNames, unknown[]>,
+		UseQueryOptions<ResolvedNameServiceNames, Error, string | null, unknown[]>,
 		'queryFn' | 'queryKey'
 	>,
-	// TODO: Fix return type:
-): any {
-	const { data, ...rest } = useSuiClientQuery(
+) {
+	return useSuiClientQuery(
 		'resolveNameServiceNames',
 		{
 			address: address!,
@@ -24,9 +23,8 @@ export function useResolveSuiNSName(
 			...options,
 			refetchOnWindowFocus: false,
 			retry: false,
+			select: (data) => (data.data.length > 0 ? data.data[0] : null),
 			enabled: !!address && options?.enabled !== false,
 		},
 	);
-
-	return { data: data?.data?.[0] ?? null, ...rest };
 }

sdk/dapp-kit/src/hooks/useSuiClientQuery.ts

@@ -30,23 +30,23 @@ export type SuiRpcMethods = {
 		: never;
 };
 
-export type UseSuiClientQueryOptions<T extends keyof SuiRpcMethods> = PartialBy<
-	Omit<
-		UseQueryOptions<SuiRpcMethods[T]['result'], Error, SuiRpcMethods[T]['result'], unknown[]>,
-		'queryFn'
-	>,
+export type UseSuiClientQueryOptions<
+	T extends keyof SuiRpcMethods,
+	TData = SuiRpcMethods[T]['result'],
+> = PartialBy<
+	Omit<UseQueryOptions<SuiRpcMethods[T]['result'], Error, TData, unknown[]>, 'queryFn'>,
 	'queryKey'
 >;
 
-export function useSuiClientQuery<T extends keyof SuiRpcMethods>(
+export function useSuiClientQuery<T extends keyof SuiRpcMethods, TData>(
 	...args: undefined extends SuiRpcMethods[T]['params']
-		? [method: T, params?: SuiRpcMethods[T]['params'], options?: UseSuiClientQueryOptions<T>]
-		: [method: T, params: SuiRpcMethods[T]['params'], options?: UseSuiClientQueryOptions<T>]
+		? [method: T, params?: SuiRpcMethods[T]['params'], options?: UseSuiClientQueryOptions<T, TData>]
+		: [method: T, params: SuiRpcMethods[T]['params'], options?: UseSuiClientQueryOptions<T, TData>]
 ) {
 	const [method, params, { queryKey = [], ...options } = {}] = args as [
 		method: T,
 		params?: SuiRpcMethods[T]['params'],
-		options?: UseSuiClientQueryOptions<T>,
+		options?: UseSuiClientQueryOptions<T, TData>,
 	];
 
 	const suiContext = useSuiClientContext();