Show the popup if the existing users has not accepted the toc and mar… (

#301)
airtai · Apr 8, 2024 · 0f2aab4 · 0f2aab4
1 parent df80d1f
commit 0f2aab4
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/app/src/client/App.tsx b/app/src/client/App.tsx
@@ -57,19 +57,26 @@ export default function App({ children }: { children: ReactNode }) {
   useEffect(() => {
     if (user) {
       if (!user.isSignUpComplete) {
-        const hasAcceptedTos =
-          localStorage.getItem('hasAcceptedTos') === 'true';
-        const hasSubscribedToMarketingEmails =
-          localStorage.getItem('hasSubscribedToMarketingEmails') === 'true';
-        if (!hasAcceptedTos || !hasSubscribedToMarketingEmails) {
-          setShowTosAndMarketingEmailsModal(true);
-        } else {
+        if (user.hasAcceptedTos && user.hasSubscribedToMarketingEmails) {
           updateCurrentUser({
             isSignUpComplete: true,
-            hasAcceptedTos: true,
-            hasSubscribedToMarketingEmails: true,
           });
           setShowTosAndMarketingEmailsModal(false);
+        } else {
+          const hasAcceptedTos =
+            localStorage.getItem('hasAcceptedTos') === 'true';
+          const hasSubscribedToMarketingEmails =
+            localStorage.getItem('hasSubscribedToMarketingEmails') === 'true';
+          if (!hasAcceptedTos || !hasSubscribedToMarketingEmails) {
+            setShowTosAndMarketingEmailsModal(true);
+          } else {
+            updateCurrentUser({
+              isSignUpComplete: true,
+              hasAcceptedTos: true,
+              hasSubscribedToMarketingEmails: true,
+            });
+            setShowTosAndMarketingEmailsModal(false);
+          }
         }
       } else {
         setShowTosAndMarketingEmailsModal(false);