Merge pull request #7545 from newraina/offer-showing-as-expired

fix: offer showing as expired on incoming offers page
kodadot · Oct 10, 2023 · 2b69820 · 2b69820
2 parents fab5d87 + 8f55aa8
commit 2b69820
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/components/bsx/Offer/MyOffer.vue b/components/bsx/Offer/MyOffer.vue
@@ -95,6 +95,7 @@ import { notificationTypes, showNotification } from '@/utils/notification'
 import { tokenIdToRoute } from '@/components/unique/utils'
 import { timeAgo } from '@/components/collection/utils/timeAgo'
 import { formatBsxBalanceToNumber } from '@/utils/format/balance'
+import { formatSecondsToDuration } from '@/utils/format/time'
 import { AllOfferStatusType } from '@/utils/offerStatus'
 
 import acceptableOfferByCurrentOwner from '@/queries/subsquid/bsx/acceptableOfferByCurrentOwner.graphql'
@@ -217,11 +218,12 @@ const displayOffers = (offers: Offer[]) => {
   }))
 }
 
-const currentBlock = ref(async () => {
+const currentBlock = ref(0)
+onMounted(async () => {
   const { apiInstance } = useApi()
   const api = await apiInstance.value
   const block = await api.rpc.chain.getHeader()
-  return block.number.toNumber()
+  currentBlock.value = block.number.toNumber()
 })
 
 const calcSecondsToBlock = (block: number): number => {

diff --git a/components/bsx/Offer/OfferTable.vue b/components/bsx/Offer/OfferTable.vue
@@ -192,11 +192,12 @@ watch(currentPage, (val) => {
   replaceUrl({ page: String(val) })
 })
 
-const currentBlock = ref(async () => {
+const currentBlock = ref(0)
+onMounted(async () => {
   const { apiInstance } = useApi()
   const api = await apiInstance.value
   const block = await api.rpc.chain.getHeader()
-  return block.number.toNumber()
+  currentBlock.value = block.number.toNumber()
 })
 
 const getUniqType = (offers: Offer[]) => {

diff --git a/components/bsx/Offer/OffersUserTable.vue b/components/bsx/Offer/OffersUserTable.vue
@@ -84,6 +84,7 @@ import { tokenIdToRoute } from '@/components/unique/utils'
 import { formatBsxBalanceToNumber } from '@/utils/format/balance'
 import { notificationTypes, showNotification } from '@/utils/notification'
 import { AllOfferStatusType } from '@/utils/offerStatus'
+import { formatSecondsToDuration } from '@/utils/format/time'
 
 import { formatDistanceToNow } from 'date-fns'
 import { Offer } from './types'
@@ -172,13 +173,19 @@ const getUniqType = () => {
   return [{ type: AllOfferStatusType.ALL, value: 'All' }, ...singleEventList]
 }
 
-const currentBlock = ref(async () => {
+const currentBlock = ref(0)
+onMounted(async () => {
   const { apiInstance } = useApi()
   const api = await apiInstance.value
   const block = await api.rpc.chain.getHeader()
-  return block.number.toNumber()
+  currentBlock.value = block.number.toNumber()
 })
 
+const calcSecondsToBlock = (block: number): number => {
+  const secondsForEachBlock = 12
+  return secondsForEachBlock * (block - currentBlock.value)
+}
+
 const calcExpirationTime = (expirationBlock: number): string => {
   if (currentBlock.value === 0) {
     return 'computing'