Merge pull request #61 from eco-stake/handle-expired-grants

Properly handle expired grants
WhisperNode · Nov 15, 2023 · 60a405c · 60a405c
2 parents 7a927a1 + bf9e37d
commit 60a405c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/components/Grants.js b/src/components/Grants.js
@@ -138,6 +138,7 @@ function Grants(props) {
     const validator = filter.group === 'granter' && validatorForGrantAddress(grant.grantee)
     const favourite = props.favouriteAddresses && props.favouriteAddresses.find(el => el.address === (filter.group === 'granter' ? grantee : granter))
     const grantId = `${granter}-${grantee}-${authorization['@type']}-${authorization.msg}`
+    const expired = expiration && Date.parse(expiration) < Date.now()
     return (
       <tr key={grantId}>
         <td className="text-break">
@@ -156,7 +157,7 @@ function Grants(props) {
         <td className="d-none d-lg-table-cell">
           {renderGrantData(grant)}
         </td>
-        <td className="d-none d-md-table-cell">
+        <td className={`d-none d-md-table-cell ${expired && 'text-danger'}`}>
           <Moment format="LLL">
             {expiration}
           </Moment>

diff --git a/src/utils/Wallet.mjs b/src/utils/Wallet.mjs
@@ -38,6 +38,7 @@ class Wallet {
     message = message || action
     return this.grants.some(grant => {
       return grant.granter === address &&
+        (!grant.expiration || Date.parse(grant.expiration) > Date.now()) &&
         grant.authorization["@type"] === "/cosmos.authz.v1beta1.GenericAuthorization" &&
         grant.authorization.msg === message
     })