From e7b91b550f23e789540f79a8d1c65f9619801217 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Tue, 23 Mar 2021 16:02:20 +0530
Subject: [PATCH] ensure bounty time left shows expired when bounty has expired

---
 app/assets/v2/js/pages/bounty_details2.js    | 6 ++++++
 app/dashboard/templates/bounty/details2.html | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/v2/js/pages/bounty_details2.js b/app/assets/v2/js/pages/bounty_details2.js
index 808023b9312..098ebd09316 100644
--- a/app/assets/v2/js/pages/bounty_details2.js
+++ b/app/assets/v2/js/pages/bounty_details2.js
@@ -785,6 +785,12 @@ Vue.mixin({
         });
       }
       return activities;
+    },
+    isExpired: function() {
+      return moment(document.result['expires_date']).isBefore();
+    },
+    expiresAfterAYear: function() {
+      return moment().diff(document.result['expires_date'], 'years') < -1;
     }
   }
 });
diff --git a/app/dashboard/templates/bounty/details2.html b/app/dashboard/templates/bounty/details2.html
index 639d1e763e8..76636e4aa3e 100644
--- a/app/dashboard/templates/bounty/details2.html
+++ b/app/dashboard/templates/bounty/details2.html
@@ -101,7 +101,10 @@ <h4 id="title" class="font-title p-0 text-center text-lg-left" v-html="bounty.ti
             <div id="bounty-info-row" class="row font-body bounty-info">
               <div class="col-12 col-sm-6 col-md-4 d-flex justify-content-between">
                 <span class="bounty-info-heading timeleft">{% trans "Time left" %} </span>
-                <time class="bounty-info-text pr-sm-3 pr-md-5" :datetime="bounty.expires_date" :title="bounty.expires_date | momentFormat" id="expires_date">
+
+                <span v-if="isExpired" class="bounty-info-text pr-sm-3 pr-md-5">Expired</span>
+                <span v-else-if="expiresAfterAYear" class="bounty-info-text pr-sm-3 pr-md-5">More than a year</span>
+                <time v-else class="bounty-info-text pr-sm-3 pr-md-5" :datetime="bounty.expires_date" :title="bounty.expires_date | momentFormat" id="expires_date">
                   [[ bounty.expires_date | moment ]]
                 </time>
               </div>