Small fixes to timer

aehrc · Sep 4, 2023 · 56c8035 · 56c8035
1 parent e5aa6fe
commit 56c8035
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/apps/smart-forms-app/src/features/tokenTimer/components/AutoSaveDialog.tsx b/apps/smart-forms-app/src/features/tokenTimer/components/AutoSaveDialog.tsx
@@ -77,9 +77,7 @@ function AutoSaveDialog(props: AutoSaveDialogProps) {
 
   return (
     <Dialog open={true}>
-      <DialogTitle variant="h5" sx={{ m: 2 }}>
-        Autosaving...
-      </DialogTitle>
+      <DialogTitle sx={{ m: 2 }}>Autosaving...</DialogTitle>
     </Dialog>
   );
 }

diff --git a/apps/smart-forms-app/src/features/tokenTimer/components/TokenTimer.tsx b/apps/smart-forms-app/src/features/tokenTimer/components/TokenTimer.tsx
@@ -50,8 +50,8 @@ const TokenTimer = memo(function TokenTimer() {
 
   function checkRemainingTime() {
     const remaining = calculateRemainingTime(tokenReceivedTimestamp, tokenExpirationTimeInSeconds);
-    if (!remaining) {
-      return null;
+    if (remaining === null) {
+      return;
     }
 
     if (remaining <= reminderTime) {

diff --git a/apps/smart-forms-app/src/features/tokenTimer/components/TokenTimerDialog.tsx b/apps/smart-forms-app/src/features/tokenTimer/components/TokenTimerDialog.tsx
@@ -118,13 +118,16 @@ function TokenTimerDialog(props: TokenTimerDialogProps) {
 
   return (
     <Dialog open={open}>
-      <DialogTitle variant="h5">Heads up, you have 15 minutes left</DialogTitle>
+      <DialogTitle variant="h5">Session expiring soon</DialogTitle>
       <DialogContent>
         <DialogContentText variant="body1">
           {
             'You have 15 minutes left in your session. Do you want to save your progress so far as a draft? You would be unable to save your progress after the session expires.'
           }
         </DialogContentText>
+        <DialogContentText variant="body1">
+          You would be unable to save your progress after the session expires.
+        </DialogContentText>
       </DialogContent>
       <DialogActions>
         <Button onClick={handleClose}>Cancel</Button>

diff --git a/apps/smart-forms-app/src/features/tokenTimer/components/TokenTimerIndicator.tsx b/apps/smart-forms-app/src/features/tokenTimer/components/TokenTimerIndicator.tsx
@@ -30,7 +30,7 @@ function TokenTimerIndicator(props: TokenTimerIndicatorProps) {
 
   const isDesktop = useResponsive('up', 'lg');
 
-  if (!showRemainingTime || !timeLeft) {
+  if (!showRemainingTime || timeLeft === null) {
     return null;
   }
 
@@ -50,7 +50,7 @@ function getIndicatorText(isAutoSaving: boolean, timeLeft: number) {
     return 'Autosaving...';
   }
 
-  if (timeLeft < 0) {
+  if (timeLeft <= 0) {
     return 'Session ended';
   }