Merge pull request #11030 from hassnian/issue-11028

kodadot · Oct 7, 2024 · f58cda2 · f58cda2
2 parents 6dcd66d + d3432b0
commit f58cda2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/components/offer/OfferOverviewModal.vue b/components/offer/OfferOverviewModal.vue
@@ -58,7 +58,10 @@
                   {{ $t('expiration') }}
                 </span>
 
-                <span>
+                <span v-if="offer.status === 'EXPIRED'">
+                  {{ $t('expired') }}
+                </span>
+                <span v-else>
                   {{ offer.expirationDate ? formatToNow(offer.expirationDate, false) : '' }}
                 </span>
               </div>

diff --git a/components/offer/OwnerButton.vue b/components/offer/OwnerButton.vue
@@ -20,6 +20,15 @@ const { isOwnerOfNft, isOwnerOfOffer } = useIsOffer(computed(() => props.offer),
 const onClick = () => emit('click', props.offer)
 
 const buttonConfig = computed<ButtonConfig | null>(() => {
+  if (props.offer.status === 'EXPIRED') {
+    return isOwnerOfOffer.value
+      ? {
+          label: $i18n.t('offer.withdrawAmount'),
+          onClick,
+        }
+      : null
+  }
+
   if (isOwnerOfOffer.value) {
     return {
       label: $i18n.t('transaction.offerWithdraw'),

diff --git a/components/profile/activityTab/OfferRow.vue b/components/profile/activityTab/OfferRow.vue
@@ -74,10 +74,15 @@
 
     <div class="flex-1">
       <div class="h-[50px] flex items-center">
-        <div v-if="offer.expirationDate">
-          <span> {{ format(offer.expirationDate, EXPIRATION_FORMAT) }}</span>
-          <span class="text-k-grey ml-3"> ({{ formatToNow(offer.expirationDate, isExpired) }})</span>
-        </div>
+        <template v-if="offer.expirationDate">
+          <div v-if="isExpired">
+            <span>{{ $t('expired') }}</span>
+          </div>
+          <div v-else>
+            <span>{{ format(offer.expirationDate, EXPIRATION_FORMAT) }}</span>
+            <span class="text-k-grey ml-3">({{ formatToNow(offer.expirationDate, isExpired) }})</span>
+          </div>
+        </template>
         <span v-else>
           {{ blank }}
         </span>
@@ -139,10 +144,15 @@
       <div v-else>
         {{ blank }}
       </div>
-      <div v-if="offer.expirationDate">
-        <span> {{ format(offer.expirationDate, EXPIRATION_FORMAT) }}</span>
-        <span class="text-k-grey ml-3"> ({{ formatToNow(offer.expirationDate, isExpired) }})</span>
-      </div>
+      <template v-if="offer.expirationDate">
+        <div v-if="isExpired">
+          <span>{{ $t('expired') }}</span>
+        </div>
+        <div v-else>
+          <span>{{ format(offer.expirationDate, EXPIRATION_FORMAT) }}</span>
+          <span class="text-k-grey ml-3">({{ formatToNow(offer.expirationDate, isExpired) }})</span>
+        </div>
+      </template>
       <span v-else>
         {{ blank }}
       </span>

diff --git a/components/profile/activityTab/Offers.vue b/components/profile/activityTab/Offers.vue
@@ -49,7 +49,7 @@
             <span> {{ $t(`activity.event.${tabTarget}`) }} </span>
           </div>
           <div class="flex-1">
-            <span>{{ $t('activity.event.time') }}</span>
+            <span>{{ $t('expiration') }}</span>
           </div>
           <div class="flex-1">
             <span />

diff --git a/locales/en.json b/locales/en.json
@@ -562,6 +562,7 @@
     }
   },
   "expiration": "Expiration",
+  "expired": "Expired",
   "explore": "Explore",
   "exploreCollections": "Explore Collections on",
   "exploreItems": "Explore Items on",
@@ -1489,6 +1490,7 @@
     "offerFees": "Offer Fee",
     "offerWithdrawl": "Offer Cancelation",
     "typeOffer": "Type An Offer",
+    "withdrawAmount": "Withdraw Amount",
     "yourOffer": "Your Offer",
     "yourOfferAmount": "Your Offer Amount"
   },