Merge pull request #212 from reservoirprotocol/pedro/relay-5441-upgra…

…de-to-requests-api-v2-in-sdk-and-client Upgrade to requests api v2 in sdk and client
reservoirprotocol · Aug 7, 2024 · 38f6b06 · 38f6b06
2 parents e487aa1 + b9db008
commit 38f6b06
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/.changeset/thirty-beds-fold.md b/.changeset/thirty-beds-fold.md
@@ -0,0 +1,6 @@
+---
+'@reservoir0x/relay-kit-hooks': minor
+'@reservoir0x/relay-kit-ui': minor
+---
+
+Upgrade /requests api to /requests/v2
diff --git a/packages/hooks/src/hooks/useRequests.ts b/packages/hooks/src/hooks/useRequests.ts
@@ -13,10 +13,10 @@ import {
 import fetcher from '../fetcher.js'
 
 export type UserTransactionQuery =
-  paths['/requests']['get']['parameters']['query'] & { id?: string }
+  paths['/requests/v2']['get']['parameters']['query'] & { id?: string }
 
 export type UserTransactionsResponse =
-  paths['/requests']['get']['responses']['200']['content']['application/json']
+  paths['/requests/v2']['get']['responses']['200']['content']['application/json']
 
 type InfiniteQueryType = typeof useInfiniteQuery<
   UserTransactionsResponse,
@@ -33,7 +33,7 @@ export const queryRequests = function (
   pageParam?: string | null
 ): Promise<UserTransactionsResponse> {
   const baseUrl = typeof window !== 'undefined' ? window.location.origin : ''
-  const url = new URL(`${baseApiUrl}/requests`, baseUrl)
+  const url = new URL(`${baseApiUrl}/requests/v2`, baseUrl)
 
   let query: UserTransactionQuery = { ...options }
 

diff --git a/packages/ui/src/types/RelayTransaction.ts b/packages/ui/src/types/RelayTransaction.ts
@@ -1,7 +1,7 @@
 import type { paths } from '@reservoir0x/relay-sdk'
 
 export type UserTransactionsResponse =
-  paths['/requests']['get']['responses']['200']['content']['application/json']
+  paths['/requests/v2']['get']['responses']['200']['content']['application/json']
 
 export type RelayTransaction = NonNullable<
   NonNullable<UserTransactionsResponse>['requests']

diff --git a/packages/ui/src/utils/relayTransaction.ts b/packages/ui/src/utils/relayTransaction.ts
@@ -21,7 +21,11 @@ export const extractToChain = (
 export const calculateFillTime = (transaction?: RelayTransaction | null) => {
   let fillTime = '-'
   let seconds = 0
-  if (transaction?.status !== 'pending' && transaction?.status !== 'received') {
+  if (
+    transaction?.status !== 'pending' &&
+    transaction?.status !== 'waiting' &&
+    transaction?.status !== 'delayed'
+  ) {
     const inTxTimestamps =
       transaction?.data?.inTxs?.map((tx) => tx.timestamp as number) ?? null
     const txStartTimestamp = inTxTimestamps ? Math.min(...inTxTimestamps) : null
@@ -57,7 +61,11 @@ export const calculateExecutionTime = (
 ) => {
   let fillTime = '-'
   let seconds = 0
-  if (transaction?.status !== 'pending' && transaction?.status !== 'received') {
+  if (
+    transaction?.status !== 'pending' &&
+    transaction?.status !== 'waiting' &&
+    transaction?.status !== 'delayed'
+  ) {
     const inTxTimestamps =
       transaction?.data?.inTxs?.map((tx) => tx.timestamp as number) ?? null
     const outTxTimestamps =