changed requests' pagination to use cursors

Author: andrewlee348

packages/hooks/README.md

@@ -122,7 +122,6 @@ const { data, isLoading, error } = useGetTransactionHistory({
   chainId: 1, // optional
   page: { // optional
     pageSize: 10,
-    page: 1
   },
   {
     // options param is optional and default values are below
@@ -189,8 +188,7 @@ const { data, isLoading, error } = useGetTokenBalancesSummary(
     omitMetadata: false, // optional
     page: {
       // optional
-      pageSize: 10,
-      page: 1
+      pageSize: 10
     }
   },
   {
@@ -222,8 +220,7 @@ const { data, isLoading, error } = useGetTokenBalancesDetails(
     omitMetadata: false, // optional
     page: {
       // optional
-      pageSize: 10,
-      page: 1
+      pageSize: 10
     }
   },
   {
@@ -255,8 +252,7 @@ const { data, isLoading, error } = useGetTokenBalancesByContract(
     omitMetadata: false, // optional
     page: {
       // optional
-      pageSize: 10,
-      page: 1
+      pageSize: 10
     }
   },
   {

packages/hooks/src/hooks/Indexer/useGetTransactionHistory.ts

@@ -28,7 +28,7 @@ interface GetTransactionHistoryArgs {
  *     - transfers: Optional array of transaction transfers
  *     - timestamp: Transaction timestamp
  *   - page: Pagination information:
- *     - page: Next page number
+ *     - after: Next page cursor
  *     - more: Whether more results exist in the next page
  *     - pageSize: Number of results per page
  * @property everything else that react query returns {@link UseInfiniteQueryResult}
@@ -127,18 +127,14 @@ export const useGetTransactionHistory = (
     queryFn: ({ pageParam }) => {
       return getTransactionHistory(indexerClient, {
         ...args,
-        page: { page: pageParam }
+        page: pageParam
       })
     },
     getNextPageParam: ({ page }) => {
       // Note: must return undefined instead of null to stop the infinite scroll
-      if (!page.more) {
-        return undefined
-      }
-
-      return page?.page || 1
+      return page?.more ? page : undefined
     },
-    initialPageParam: 1,
+    initialPageParam: { pageSize: args.page?.pageSize } as Page,
     retry: options?.retry ?? true,
     staleTime: time.oneSecond * 30,
     enabled: !!args.chainId && !!args.accountAddress && !options?.disabled

packages/hooks/src/tests/handlers.ts

@@ -28,9 +28,6 @@ export const handlers = [
 
     return HttpResponse.json(
       {
-        page: {
-          page: 1
-        },
         balances: [
           {
             chainId: 1,
@@ -86,9 +83,6 @@ export const handlers = [
 
     return HttpResponse.json(
       {
-        page: {
-          page: 1
-        },
         balances: [
           {
             chainId: 1,
@@ -132,9 +126,6 @@ export const handlers = [
 
     return HttpResponse.json(
       {
-        page: {
-          page: 1
-        },
         balances: [
           {
             chainId: 1,
@@ -165,9 +156,6 @@ export const handlers = [
 
     return HttpResponse.json(
       {
-        page: {
-          page: 1
-        },
         tokenMetadata: [
           {
             contractType: 'ERC721',
@@ -224,7 +212,6 @@ export const handlers = [
   http.post('*/GetTransactionHistory', async () => {
     return HttpResponse.json(
       {
-        page: { page: 1 },
         transactions: [
           {
             txnHash: '0x0000000000000000000000000000000000000000000000000000000000000000',