fix validation check

subvisual · May 10, 2024 · d390a25 · d390a25
1 parent cea2f2f
commit d390a25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/packages/web-app/app/_lib/hooks.tsx b/packages/web-app/app/_lib/hooks.tsx
@@ -9,7 +9,7 @@ import {
   useTotalInvestedUsdcCtznd,
 } from './queries';
 import { useKyc } from '../_providers/kyc/context';
-import { compareAddresses, isValidGrant } from './utils';
+import { compareAddresses } from './utils';
 import { TProjectInfoArgs } from '../_server/info';
 import {
   ctzndSaleAddress,
@@ -91,10 +91,7 @@ export const useHasCitizendGrant = () => {
   const hasGrant = useMemo(() => {
     if (!citizendGrants?.length || !shares) return false;
 
-    return citizendGrants.some(
-      (grant) =>
-        shares.includes(grant.dataId) && isValidGrant(grant.lockedUntil),
-    );
+    return citizendGrants.some((grant) => shares.includes(grant.dataId));
   }, [citizendGrants, shares]);
 
   return useMemo(() => {
@@ -132,10 +129,7 @@ export const useMyProjects = () => {
       );
       if (!projectGrants?.length) return false;
 
-      return projectGrants.some(
-        (grant) =>
-          shares.includes(grant.dataId) && isValidGrant(grant.lockedUntil),
-      );
+      return projectGrants.some((grant) => shares.includes(grant.dataId));
     });
   }, [saleDetails, shares, grants]);
 
@@ -177,10 +171,7 @@ export const useHasProjectGrant = (projectId: string) => {
   const hasGrant = useMemo(() => {
     if (!projectGrants?.length || !shares) return false;
 
-    return projectGrants.some(
-      (grant) =>
-        shares.includes(grant.dataId) && isValidGrant(grant.lockedUntil),
-    );
+    return projectGrants.some((grant) => shares.includes(grant.dataId));
   }, [projectGrants, shares]);
 
   return useMemo(() => {

diff --git a/packages/web-app/app/_server/idos/index.ts b/packages/web-app/app/_server/idos/index.ts
@@ -1,7 +1,6 @@
 import { ServerPublicInfo } from '../types';
 import { getGrants, getProjectApplicants } from './grants';
 import { addressesListSchema, grantsSchema } from '../../_types/schemas';
-import { isValidGrant } from '@/app/_lib/utils';
 import { blockedCountries } from '../blocked-countries';
 import { idOSGrantee } from './idos-grantee';
 import {
@@ -21,9 +20,7 @@ const userFilter = async (grantee: idOSGrantee, userAddress: string) => {
       owner: userAddress,
       grantee: evmGrantee.address,
     });
-    const grants = grantsSchema
-      .parse(grantsResult)
-      ?.filter((grant) => isValidGrant(grant.lockedUntil));
+    const grants = grantsSchema.parse(grantsResult);
 
     if (!grants.length) return null;