Fix bug with flickering pop-up (#58539)

* fix loading issue * deleted consolelogs * fixed tests
code-dot-org · May 13, 2024 · 1c0bff5 · 1c0bff5
1 parent eae4a14
commit 1c0bff5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/apps/src/templates/sectionProgressV2/InviteToV2ProgressModal.jsx b/apps/src/templates/sectionProgressV2/InviteToV2ProgressModal.jsx
@@ -36,6 +36,14 @@ function InviteToV2ProgressModal({
   const [invitationOpen, setInvitationOpen] = React.useState(false);
 
   React.useEffect(() => {
+    if (
+      dateProgressTableInvitationDelayed === undefined ||
+      hasSeenProgressTableInvite === undefined
+    ) {
+      // Do not proceed if data has not been fully loaded.
+      return;
+    }
+
     const numDaysSinceInvitationLastDelayed = () => {
       const startingDate = new Date(dateProgressTableInvitationDelayed);
       const today = new Date();

diff --git a/apps/test/unit/templates/sectionProgressV2/InviteToV2ProgressModalTest.jsx b/apps/test/unit/templates/sectionProgressV2/InviteToV2ProgressModalTest.jsx
@@ -35,7 +35,10 @@ describe('UnconnectedInviteToV2ProgressModal', () => {
   }
 
   it('renders the dialog with required elements', () => {
-    renderDefault();
+    renderDefault({
+      hasSeenProgressTableInvite: false,
+      dateProgressTableInvitationDelayed: null,
+    });
 
     screen.getByText(i18n.progressTrackingAnnouncement());
     screen.getByText(i18n.tryItNow());
@@ -50,6 +53,8 @@ describe('UnconnectedInviteToV2ProgressModal', () => {
     renderDefault({
       setShowProgressTableV2: setShowProgressTableV2Stub,
       setHasSeenProgressTableInvite: setHasSeenProgressTableInviteStub,
+      hasSeenProgressTableInvite: false,
+      dateProgressTableInvitationDelayed: null,
     });
 
     screen.getByText(i18n.progressTrackingAnnouncement());
@@ -75,6 +80,8 @@ describe('UnconnectedInviteToV2ProgressModal', () => {
 
     renderDefault({
       setHasSeenProgressTableInvite: setHasSeenProgressTableInviteStub,
+      hasSeenProgressTableInvite: false,
+      dateProgressTableInvitationDelayed: null,
     });
 
     const xButton = screen.getByLabelText(i18n.closeDialog());
@@ -93,7 +100,10 @@ describe('UnconnectedInviteToV2ProgressModal', () => {
   });
 
   it('allows user to delay the invitation', () => {
-    renderDefault();
+    renderDefault({
+      hasSeenProgressTableInvite: false,
+      dateProgressTableInvitationDelayed: null,
+    });
 
     const delayButton = screen.getByText(i18n.remindMeLater());
     fireEvent.click(delayButton);
@@ -133,6 +143,7 @@ describe('UnconnectedInviteToV2ProgressModal', () => {
     renderDefault({
       dateProgressTableInvitationDelayed:
         'Wed May 01 2024 14:22:23 GMT-0500 (Central Daylight Time)',
+      hasSeenProgressTableInvite: false,
     });
 
     screen.getByText(i18n.progressTrackingAnnouncement());
@@ -148,6 +159,7 @@ describe('UnconnectedInviteToV2ProgressModal', () => {
     yesterday.setDate(yesterday.getDate() - 1);
     renderDefault({
       dateProgressTableInvitationDelayed: yesterday,
+      hasSeenProgressTableInvite: false,
     });
 
     expect(screen.queryByText(i18n.tryItNow())).to.be.null;

diff --git a/apps/test/unit/templates/sectionProgressV2/SectionProgressSelectorTest.jsx b/apps/test/unit/templates/sectionProgressV2/SectionProgressSelectorTest.jsx
@@ -141,8 +141,6 @@ describe('SectionProgressSelector', () => {
   it('sets user preference when link clicked', () => {
     renderDefault();
 
-    const remindLaterLink = screen.getByText('Remind me later');
-    fireEvent.click(remindLaterLink);
     const link = screen.getByText(V1_PAGE_LINK_TEXT);
     fireEvent.click(link);