chore: add claimed for 8, 9 round (#10615)

* chore: add claimed for 8, 9 round

* chore: lint fix

* Update app/assets/v2/js/grants/ready_claim.js

Author: thelostone-mc

app/assets/v2/js/grants/matching_funds.js

@@ -244,12 +244,19 @@ Vue.mixin({
       container.scrollIntoView(true);
     },
     hasHistoricalMatches(grant) {
-      return grant.clr_matches.length && grant.clr_matches.filter(a => a.claim_tx).length;
+      return grant.clr_matches.length &&
+      (
+        grant.clr_matches.filter(a => a.claim_tx).length ||
+        grant.clr_matches.filter(a => [ 8, 9 ].includes(a.round_number)).length
+      );
     },
     canClaimMatch(grant) {
-      return grant.clr_matches.length && grant.clr_matches.filter(
-        a => a.claim_tx === null &&
-        a.grant_payout).length;
+      return grant.clr_matches.length &&
+        grant.clr_matches.filter(a =>
+          a.claim_tx === null &&
+          a.grant_payout &&
+          [ 'ready', 'pending' ].includes(a.grant_payout.status)
+        ).length;
     },
     filterPendingClaims(matches) {
       return this.filterMatchingPayout(matches).filter(

app/assets/v2/js/grants/ready_claim.js

@@ -18,7 +18,7 @@ Vue.component('matching-claim', {
       return this.status === 'pending';
     },
     isKYCPending() {
-      return !this.match.ready_for_payout;
+      return !this.match.ready_for_payout && this.match.grant_payout.status == 'ready';
     },
     claimStartDate() {
       return this.match.grant_payout.grant_clrs[0].claim_start_date;

app/grants/templates/grants/components/historical_claim.html

@@ -23,10 +23,17 @@ <h4 class="d-lg-block d-none font-weight-bold font-bigger-1 gc-font-base">[[ mat
       <span class="font-body text-grey-500">[[ match.claim_date ]]</span>
     </b-col>
     <b-col v-else-if="match.grant_payout.status === 'funding_withdrawn'" lg="4" sm="12" class="pt-2 pt-lg-0">
-      <p class="text-grey-400 font-weight-bold returned_text">
-        Returned to matching pool
+
+      <p v-if="match.round_number in ['8', '9']" class="text-highlight-green font-weight-bold claimed_text">
+        <i class="far fa-check mr-2"></i>Claimed
       </p>
-      <span class="font-body text-grey-500">[[ match.funding_withdrawal_date ]]</span>
+
+      <template v-else>
+        <p class="text-grey-400 font-weight-bold returned_text">
+          Returned to matching pool
+        </p>
+        <span class="font-body text-grey-500">[[ match.funding_withdrawal_date ]]</span>
+      </template>
     </b-col>
     <b-col class="text-lg-right mt-2 mt-lg-0">
       <a v-if="match.claim_tx && match.claim_tx != 'NA' "

app/grants/templates/grants/components/ready_claim.html

@@ -24,14 +24,10 @@ <h4 class="d-lg-block d-none font-weight-bold font-bigger-1 gc-font-base text-gr
             </template>
           </span>
         </template>
-        <template v-else="isKYCPending">
+        <template v-else-if="isKYCPending">
           <h4 class="d-lg-block d-none font-weight-bold font-bigger-1 text-grey-400 gc-font-base">Complete KYC to claim</h4>
           <span class="d-lg-none d-block font-weight-bold font-subheader text-grey-400">Complete KYC to claim</span>
         </template>
-        <template v-else>
-          <h4 class="d-lg-block d-none font-weight-bold font-bigger-1 text-grey-400 gc-font-base">No Action</h4>
-          <span class="d-lg-none d-block font-weight-bold font-subheader text-grey-400">No Action</span>
-        </template>
       </b-col>
 
       <b-col class="text-lg-right mt-3 mt-lg-0">