feat: activity page pagination

InjectiveLabs · Jul 13, 2022 · 79e85b9 · 79e85b9
1 parent 1da66fc
commit 79e85b9
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 16 deletions.
diff --git a/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcAccountApi.ts b/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcAccountApi.ts
@@ -121,20 +121,30 @@ export class ExchangeGrpcAccountApi extends BaseConsumer {
     }
   }
 
-  async fetchSubaccountHistory({
-    subaccountId,
-    denom,
-    transferTypes = [],
-    pagination,
-  }: {
+  async fetchSubaccountHistory(params?: {
     subaccountId: string
     denom?: string
     transferTypes?: string[]
-    pagination?: PaginationOption
+    pagination?: PaginationOption,
+    skip?: number
+    limit?: number
+    endTime?: number
   }) {
+    const {
+      subaccountId,
+      denom,
+      transferTypes = [],
+      pagination,
+      skip,
+      limit,
+      endTime
+    } = params || {}
+
     const request = new SubaccountHistoryRequest()
 
-    request.setSubaccountId(subaccountId)
+    if (subaccountId) {
+      request.setSubaccountId(subaccountId)
+    }
 
     if (denom) {
       request.setDenom(denom)
@@ -154,6 +164,18 @@ export class ExchangeGrpcAccountApi extends BaseConsumer {
       }
     }
 
+    if (skip !== undefined) {
+      request.setSkip(skip)
+    }
+
+    if (limit !== undefined) {
+      request.setLimit(limit)
+    }
+
+    if (endTime !== undefined) {
+      request.setEndTime(endTime)
+    }
+
     try {
       const response = await this.request<
         SubaccountHistoryRequest,

diff --git a/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcSpotApi.ts b/packages/sdk-ts/src/client/exchange/grpc/ExchangeGrpcSpotApi.ts
@@ -163,6 +163,7 @@ export class ExchangeGrpcSpotApi extends BaseConsumer {
       limit,
       endTime,
     } = params || {}
+
     const request = new TradesRequest()
 
     if (marketId) {

diff --git a/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcAccountTransformer.ts b/packages/sdk-ts/src/client/exchange/transformers/ExchangeGrpcAccountTransformer.ts
@@ -22,6 +22,7 @@ import {
   TradingReward,
   GrpcTradingReward,
 } from '../types/account'
+import { grpcPagingToPaging } from '../../../utils/pagination'
 
 export class ExchangeGrpcAccountTransformer {
   static accountPortfolioResponseToAccountPortfolio(
@@ -173,14 +174,14 @@ export class ExchangeGrpcAccountTransformer {
 
   static transferHistoryResponseToTransferHistory(
     response: SubaccountHistoryResponse,
-  ): SubaccountTransfer[] {
-    return response
-      .getTransfersList()
-      .map((transfer) =>
-        ExchangeGrpcAccountTransformer.grpcTransferHistoryEntryToTransferHistoryEntry(
-          transfer,
-        ),
-      )
+  ) {
+    const transfers = response.getTransfersList()
+    const paging = response.getPaging()
+
+    return {
+      transfers: transfers.map((transfer) => ExchangeGrpcAccountTransformer.grpcTransferHistoryEntryToTransferHistoryEntry(transfer)),
+      paging: grpcPagingToPaging(paging)
+    }
   }
 
   static grpcTransferHistoryToTransferHistory(