Streamline the flow of rendering Modal for DRYness

WordPress · Jun 9, 2023 · 1d193fb · 1d193fb
1 parent ac7d3b5
commit 1d193fb
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/settings/src/script.js b/settings/src/script.js
@@ -170,26 +170,22 @@ function Main( { userId } ) {
 				<CardBody className={ 'wporg-2fa__' + screen }>{ currentScreen }</CardBody>
 			</Card>
 		);
-	} else if (
+	}
+
+	const isRevalidationExpired =
 		twoFactorRequiredScreens.includes( screen ) &&
 		hasPrimaryProvider &&
-		record[ '2fa_revalidation' ]?.expires_at <= new Date().getTime() / 1000
-	) {
-		screenContent = (
-			<>
-				{ currentScreen }
-				<RevalidateModal />
-			</>
-		);
-	}
+		record[ '2fa_revalidation' ]?.expires_at <= new Date().getTime() / 1000;
+
+	const shouldRevalidate = 'revalidation_required' === error.code || isRevalidationExpired;
 
 	return (
 		<GlobalContext.Provider
 			value={ { navigateToScreen, user, setGlobalNotice, setError, error } }
 		>
 			<GlobalNotice notice={ globalNotice } setNotice={ setGlobalNotice } />
 			{ screenContent }
-			{ 'revalidation_required' === error.code && <RevalidateModal /> }
+			{ shouldRevalidate && <RevalidateModal /> }
 		</GlobalContext.Provider>
 	);
 }