fix: lint warnings in countdown container

newrelic · Sep 2, 2020 · ca14b49 · ca14b49
1 parent 9c600d7
commit ca14b49
Showing 1 changed file with 26 additions and 30 deletions.
diff --git a/src/components/Countdown/CountdownContainer.js b/src/components/Countdown/CountdownContainer.js
@@ -3,60 +3,56 @@ import Countdown from './Countdown';
 import PropTypes from 'prop-types';
 import styles from './CountdownContainer.module.scss';
 
+const getRemainingTime = (targetDate) => {
+  const countDownDate = new Date(targetDate).getTime();
+  const now = new Date().getTime();
+
+  const milliseconds = countDownDate - now;
+
+  const days = Math.floor(milliseconds / (1000 * 60 * 60 * 24));
+  const hours = Math.floor(
+    (milliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)
+  );
+  const minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60));
+  const seconds = Math.floor((milliseconds % (1000 * 60)) / 1000);
+
+  return { days, hours, minutes, seconds, milliseconds };
+};
+
 const CountdownContainer = ({ targetDate, inactiveMessage }) => {
-  const [countdown, setCountdown] = React.useState(() => getRemainingTime());
-  let active = countdown.milliseconds > 0;
+  const [countdown, setCountdown] = React.useState(() =>
+    getRemainingTime(targetDate)
+  );
+  const active = countdown.milliseconds > 0;
 
   useEffect(() => {
     const hasRemainingTime = () => {
-      const { milliseconds } = getRemainingTime();
+      const { milliseconds } = getRemainingTime(targetDate);
       return milliseconds > 0;
     };
 
     if (!hasRemainingTime()) {
-      active = false;
       return;
     }
 
     const interval = setInterval(() => {
-      const {
-        days,
-        hours,
-        minutes,
-        seconds,
-        milliseconds,
-      } = getRemainingTime();
+      const { days, hours, minutes, seconds, milliseconds } = getRemainingTime(
+        targetDate
+      );
 
       if (milliseconds < 0) {
-        active = false;
         clearInterval(interval);
       } else {
         setCountdown({ days, hours, minutes, seconds, milliseconds });
       }
     }, 1000);
 
     return () => clearInterval(interval);
-  }, []);
-
-  function getRemainingTime() {
-    const countDownDate = new Date(targetDate).getTime();
-    const now = new Date().getTime();
-
-    const milliseconds = countDownDate - now;
-
-    const days = Math.floor(milliseconds / (1000 * 60 * 60 * 24));
-    const hours = Math.floor(
-      (milliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)
-    );
-    const minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60));
-    const seconds = Math.floor((milliseconds % (1000 * 60)) / 1000);
-
-    return { days, hours, minutes, seconds, milliseconds };
-  }
+  }, [targetDate]);
 
   return (
     <div className={styles.container}>
-      {active === true ? (
+      {active ? (
         <div className={styles.countdownContainer}>
           <Countdown countdown={countdown} />
         </div>