fix interval logic

spectrum-finance · Oct 1, 2023 · 12ab670 · 12ab670
1 parent b5fdcbd
commit 12ab670
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/src/pages/Rewards/RewardsBugFixing/RewardsBugFixing.tsx b/src/pages/Rewards/RewardsBugFixing/RewardsBugFixing.tsx
@@ -21,10 +21,16 @@ export const RewardsBugFixing: FC = () => {
     return () => clearInterval(intervalId);
   }, []);
 
-  const r = Interval.fromDateTimes(now, CLAIMS_OPEN_DATETIME).end.diff(
-    now.toUTC(),
-    ['days', 'hours', 'minutes', 'seconds', 'milliseconds'],
-  );
+  const isRewardClaimable = now.toUTC().toLocal() >= CLAIMS_OPEN_DATETIME;
+  const r = isRewardClaimable
+    ? undefined
+    : Interval.fromDateTimes(now, CLAIMS_OPEN_DATETIME).end.diff(now.toUTC(), [
+        'days',
+        'hours',
+        'minutes',
+        'seconds',
+        'milliseconds',
+      ]);
 
   return (
     <Flex col align="center">
@@ -41,12 +47,14 @@ export const RewardsBugFixing: FC = () => {
       <Flex.Item marginBottom={4} width="100%">
         <Divider type="horizontal" />
       </Flex.Item>
-      <Flex.Item>
-        <Typography.Body size="small" secondary>
-          Claims will be opened in{' '}
-          {`${r.days} days ${r.hours} hours ${r.minutes} minutes`}
-        </Typography.Body>
-      </Flex.Item>
+      {r && (
+        <Flex.Item>
+          <Typography.Body size="small" secondary>
+            Claims will be opened in{' '}
+            {`${r.days} days ${r.hours} hours ${r.minutes} minutes`}
+          </Typography.Body>
+        </Flex.Item>
+      )}
       <Flex.Item>
         <Typography.Body size="small" secondary>
           Need help? Join{' '}

diff --git a/src/pages/Rewards/RewardsDashboard/ClaimRewardsButton/ClaimRewardsButton.tsx b/src/pages/Rewards/RewardsDashboard/ClaimRewardsButton/ClaimRewardsButton.tsx
@@ -42,10 +42,15 @@ export const ClaimRewardsButton: FC<{ rewardsData: RewardsData }> = ({
   }, []);
 
   const isRewardClaimable = now.toUTC().toLocal() >= CLAIMS_OPEN_DATETIME;
-  const r = Interval.fromDateTimes(now, CLAIMS_OPEN_DATETIME).end.diff(
-    now.toUTC(),
-    ['days', 'hours', 'minutes', 'seconds', 'milliseconds'],
-  );
+  const r = isRewardClaimable
+    ? undefined
+    : Interval.fromDateTimes(now, CLAIMS_OPEN_DATETIME).end.diff(now.toUTC(), [
+        'days',
+        'hours',
+        'minutes',
+        'seconds',
+        'milliseconds',
+      ]);
 
   return (
     <Flex col align="center">
@@ -128,7 +133,7 @@ export const ClaimRewardsButton: FC<{ rewardsData: RewardsData }> = ({
             t`Loading`}
         </Button>
       </Flex.Item>
-      {!isRewardClaimable && (
+      {!isRewardClaimable && r && (
         <Flex.Item marginTop={2} display="flex" col align="center">
           <Typography.Body size="small" secondary>
             Claims will be opened on{' '}