From d4676918c3e65cb83f4661603c375192578bbf98 Mon Sep 17 00:00:00 2001
From: Vee <vee@chorus.one>
Date: Fri, 1 Sep 2023 20:07:27 +0900
Subject: [PATCH 1/2] utils: Helpers: Support non-expiring grants

Fixes: #692
---
 src/utils/Helpers.mjs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/utils/Helpers.mjs b/src/utils/Helpers.mjs
index 6790d290..08d56ebe 100644
--- a/src/utils/Helpers.mjs
+++ b/src/utils/Helpers.mjs
@@ -72,7 +72,15 @@ export function parseGrants(grants, grantee, granter) {
       el.authorization.msg ===
       "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward")
     ) {
-      return Date.parse(el.expiration) > new Date();
+      if (el.expiration === null) {
+        timeStamp("claimGrant does NOT expire!")
+        return true;
+      } else if (Date.parse(el.expiration) > new Date()) {
+        return true;
+      } else {
+        timeStamp("claimGrant expired!")
+        return false;
+      }
     } else {
       return false;
     }
@@ -90,7 +98,15 @@ export function parseGrants(grants, grantee, granter) {
         "/cosmos.staking.v1beta1.MsgDelegate"
       ))
     ) {
-      return Date.parse(el.expiration) > new Date();
+      if (el.expiration === null) {
+        timeStamp("stakeGrant does NOT expire!")
+        return true;
+      } else if (Date.parse(el.expiration) > new Date()) {
+        return true;
+      } else {
+        timeStamp("stakeGrant expired!")
+        return false;
+      }
     } else {
       return false;
     }

From 25f7a56b7072aecc01c3d2b746b0dab4f390a089 Mon Sep 17 00:00:00 2001
From: Tom Beynon <tom@tombeynon.co.uk>
Date: Tue, 24 Oct 2023 22:01:00 +0100
Subject: [PATCH 2/2] Remove unused code and unclear logs

---
 src/utils/Helpers.mjs | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/utils/Helpers.mjs b/src/utils/Helpers.mjs
index 08d56ebe..182de39d 100644
--- a/src/utils/Helpers.mjs
+++ b/src/utils/Helpers.mjs
@@ -62,29 +62,6 @@ export function buildExecableMessage(type, typeUrl, value, shouldExec){
 }
 
 export function parseGrants(grants, grantee, granter) {
-  // claimGrant is removed but we track for now to allow revoke
-  const claimGrant = grants.find((el) => {
-    if (
-      (!el.grantee || el.grantee === grantee) &&
-      (!el.granter || el.granter === granter) &&
-      (el.authorization["@type"] ===
-      "/cosmos.authz.v1beta1.GenericAuthorization" &&
-      el.authorization.msg ===
-      "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward")
-    ) {
-      if (el.expiration === null) {
-        timeStamp("claimGrant does NOT expire!")
-        return true;
-      } else if (Date.parse(el.expiration) > new Date()) {
-        return true;
-      } else {
-        timeStamp("claimGrant expired!")
-        return false;
-      }
-    } else {
-      return false;
-    }
-  });
   const stakeGrant = grants.find((el) => {
     if (
       (!el.grantee || el.grantee === grantee) &&
@@ -99,12 +76,10 @@ export function parseGrants(grants, grantee, granter) {
       ))
     ) {
       if (el.expiration === null) {
-        timeStamp("stakeGrant does NOT expire!")
         return true;
       } else if (Date.parse(el.expiration) > new Date()) {
         return true;
       } else {
-        timeStamp("stakeGrant expired!")
         return false;
       }
     } else {
@@ -112,8 +87,7 @@ export function parseGrants(grants, grantee, granter) {
     }
   })
   return {
-    claimGrant,
-    stakeGrant,
+    stakeGrant
   };
 }