Merge pull request #83 from aave/fix/missing-currency-and-timeWindow

fix: adds missing currency and timeWindow params

Author: cesarenaldi

packages/client/src/actions/user.ts

@@ -24,7 +24,7 @@ import {
   type UserSuppliesRequest,
   type UserSupplyItem,
 } from '@aave/graphql-next';
-import type { ResultAsync } from '@aave/types-next';
+import type { Prettify, ResultAsync } from '@aave/types-next';
 import type { AaveClient } from '../AaveClient';
 import {
   type CurrencyQueryOptions,
@@ -88,6 +88,10 @@ export function userBorrows(
   return client.query(UserBorrowsQuery, { request, ...options });
 }
 
+export type UserSummaryQueryOptions = Prettify<
+  CurrencyQueryOptions & TimeWindowQueryOptions
+>;
+
 /**
  * Fetches a user's summary across all positions.
  *
@@ -108,11 +112,15 @@ export function userBorrows(
 export function userSummary(
   client: AaveClient,
   request: UserSummaryRequest,
-  options: Required<TimeWindowQueryOptions> = DEFAULT_QUERY_OPTIONS,
+  {
+    currency = DEFAULT_QUERY_OPTIONS.currency,
+    timeWindow = DEFAULT_QUERY_OPTIONS.timeWindow,
+  }: UserSummaryQueryOptions = DEFAULT_QUERY_OPTIONS,
 ): ResultAsync<UserSummary, UnexpectedError> {
   return client.query(UserSummaryQuery, {
     request,
-    timeWindow: options.timeWindow,
+    currency,
+    timeWindow,
   });
 }
 
@@ -138,9 +146,12 @@ export type UserPositionQueryOptions = CurrencyQueryOptions &
 export function userPositions(
   client: AaveClient,
   request: UserPositionsRequest,
-  options: Required<UserPositionQueryOptions> = DEFAULT_QUERY_OPTIONS,
+  {
+    currency = DEFAULT_QUERY_OPTIONS.currency,
+    timeWindow = DEFAULT_QUERY_OPTIONS.timeWindow,
+  }: UserPositionQueryOptions = DEFAULT_QUERY_OPTIONS,
 ): ResultAsync<UserPosition[], UnexpectedError> {
-  return client.query(UserPositionsQuery, { request, ...options });
+  return client.query(UserPositionsQuery, { request, currency, timeWindow });
 }
 
 /**
@@ -160,9 +171,12 @@ export function userPositions(
 export function userPosition(
   client: AaveClient,
   request: UserPositionRequest,
-  options: Required<UserPositionQueryOptions> = DEFAULT_QUERY_OPTIONS,
+  {
+    currency = DEFAULT_QUERY_OPTIONS.currency,
+    timeWindow = DEFAULT_QUERY_OPTIONS.timeWindow,
+  }: UserPositionQueryOptions = DEFAULT_QUERY_OPTIONS,
 ): ResultAsync<UserPosition | null, UnexpectedError> {
-  return client.query(UserPositionQuery, { request, ...options });
+  return client.query(UserPositionQuery, { request, currency, timeWindow });
 }
 
 /**

packages/graphql/src/fragments/user.ts

@@ -59,16 +59,16 @@ export const UserSummaryFragment = graphql(
   `fragment UserSummary on UserSummary {
     __typename
     totalPositions
-    netBalance {
+    netBalance(currency: $currency) {
       ...FiatAmountWithChange
     }
-    totalCollateral {
+    totalCollateral(currency: $currency) {
       ...FiatAmount
     }
-    totalSupplied {
+    totalSupplied(currency: $currency) {
       ...FiatAmount
     }
-    totalDebt {
+    totalDebt(currency: $currency) {
       ...FiatAmount
     }
     netApy {

packages/graphql/src/user.ts

@@ -39,7 +39,7 @@ export type UserBorrowsRequest = RequestOf<typeof UserBorrowsQuery>;
  * @internal
  */
 export const UserSummaryQuery = graphql(
-  `query UserSummary($request: UserSummaryRequest!, $timeWindow: TimeWindow!) {
+  `query UserSummary($request: UserSummaryRequest!, $currency: Currency!, $timeWindow: TimeWindow!) {
     value: userSummary(request: $request) {
       ...UserSummary
     }

packages/react/src/user.ts

@@ -163,7 +163,7 @@ export function useUserBorrows({
 }
 
 export type UseUserSummaryArgs = Prettify<
-  UserSummaryRequest & TimeWindowQueryOptions
+  UserSummaryRequest & TimeWindowQueryOptions & CurrencyQueryOptions
 >;
 
 /**
@@ -203,6 +203,7 @@ export function useUserSummary(
 
 export function useUserSummary({
   suspense = false,
+  currency = DEFAULT_QUERY_OPTIONS.currency,
   timeWindow = DEFAULT_QUERY_OPTIONS.timeWindow,
   ...request
 }: UseUserSummaryArgs & {
@@ -212,6 +213,7 @@ export function useUserSummary({
     document: UserSummaryQuery,
     variables: {
       request,
+      currency,
       timeWindow,
     },
     suspense,