From f5032ad355a022d86839208191c8da6e086bf9da Mon Sep 17 00:00:00 2001
From: Chris Brown <1731074+ccbrown@users.noreply.github.com>
Date: Sat, 26 Apr 2025 22:44:56 -0400
Subject: [PATCH] small onboarding improvements

---
 .../register/RegistrationForm.tsx             |  4 +-
 .../app/(user-area)/teams/[teamId]/page.tsx   | 38 +++++++++++++++----
 .../[teamId]/settings/integrations/page.tsx   |  2 +-
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/(public-area)/register/RegistrationForm.tsx b/frontend/src/app/(public-area)/register/RegistrationForm.tsx
index 0903980a..d45b0429 100644
--- a/frontend/src/app/(public-area)/register/RegistrationForm.tsx
+++ b/frontend/src/app/(public-area)/register/RegistrationForm.tsx
@@ -52,8 +52,8 @@ export const RegistrationForm = () => {
     ) : (
         <>
             <p>
-                Provide your email address and agree to let us do stuff, and we&apos;ll send you a verification email to
-                create your account and get started. 🚀
+                Provide your email address and we&apos;ll send you a verification email to create your account and get
+                started. 🚀
             </p>
             <p>
                 Already have an account?{' '}
diff --git a/frontend/src/app/(user-area)/teams/[teamId]/page.tsx b/frontend/src/app/(user-area)/teams/[teamId]/page.tsx
index 0990d25f..060477d0 100644
--- a/frontend/src/app/(user-area)/teams/[teamId]/page.tsx
+++ b/frontend/src/app/(user-area)/teams/[teamId]/page.tsx
@@ -252,13 +252,14 @@ const Page = () => {
         zoom,
     ]);
 
-    const teamAwsIntegrationsIfAdminAndNoReports = useTeamAwsIntegrations(
-        isTeamAdmin && teamReports && teamReports.length === 0 ? teamId : undefined,
+    const needsData = teamReports && teamReports.length === 0;
+    const teamAwsIntegrationsIfAdminAndNeedsData = useTeamAwsIntegrations(
+        isTeamAdmin && needsData ? teamId : undefined,
     );
     const needsSubscriptionSetup = team && !team.entitlements.individualFeatures;
     const needsAwsIntegrationSetup =
-        teamAwsIntegrationsIfAdminAndNoReports && teamAwsIntegrationsIfAdminAndNoReports.length === 0;
-    const needsSetup = needsSubscriptionSetup || needsAwsIntegrationSetup;
+        teamAwsIntegrationsIfAdminAndNeedsData && teamAwsIntegrationsIfAdminAndNeedsData.length === 0;
+    const needsSetup = needsSubscriptionSetup || needsAwsIntegrationSetup || needsData;
 
     const canManageScps =
         teamAwsAccountsMap && [...teamAwsAccountsMap.values()].some((account) => account.canManageScps);
@@ -355,7 +356,7 @@ const Page = () => {
                             <div className="flex flex-col gap-4 translucent-snow border border-platinum rounded-xl p-8 max-w-2xl">
                                 <h1>Welcome!</h1>
                                 <p>This is the dashboard for your team.</p>
-                                <p>There&apos;s nothing here, but we can fix that!</p>
+                                <p>There&apos;s currently nothing here, but we can fix that!</p>
                                 {needsSubscriptionSetup && (
                                     <>
                                         <p className="uppercase label">Activate a subscription</p>
@@ -369,7 +370,7 @@ const Page = () => {
                                         </p>
                                     </>
                                 )}
-                                {needsAwsIntegrationSetup && (
+                                {needsAwsIntegrationSetup ? (
                                     <>
                                         <p className="uppercase label">Integrate with your AWS account</p>
                                         <p>
@@ -380,7 +381,30 @@ const Page = () => {
                                             to configure ingestion from your AWS account.
                                         </p>
                                     </>
-                                )}
+                                ) : needsData ? (
+                                    <>
+                                        <p className="uppercase label">Wait for data</p>
+                                        <p>
+                                            If you&apos;ve recently configured your AWS integration and chose to
+                                            backfill data, it will be available here shortly.
+                                        </p>
+                                        <p>
+                                            If you did not choose to backfill data, it will take up to 24 hours for data
+                                            to appear.
+                                        </p>
+                                        <p>
+                                            If data does not appear as expected, please double check your team&apos;s{' '}
+                                            <Link href={`/teams/${teamId}/settings/integrations`} className="link">
+                                                integration settings
+                                            </Link>{' '}
+                                            or{' '}
+                                            <Link href="/contact" className="link">
+                                                contact us
+                                            </Link>{' '}
+                                            for help.
+                                        </p>
+                                    </>
+                                ) : null}
                             </div>
                         </div>
                     )}
diff --git a/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx b/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx
index 4930ff3a..82a33f03 100644
--- a/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx
+++ b/frontend/src/app/(user-area)/teams/[teamId]/settings/integrations/page.tsx
@@ -29,7 +29,7 @@ const CreateIntegrationForm = (props: CreateIntegrationFormProps) => {
     const [getAccountNamesFromOrganizations, setGetAccountNamesFromOrganizations] = useState(false);
     const [manageScps, setManageScps] = useState(false);
     const [isBusy, setIsBusy] = useState(false);
-    const [queueReportGeneration, setQueueReportGeneration] = useState(false);
+    const [queueReportGeneration, setQueueReportGeneration] = useState(true);
     const [errorMessage, setErrorMessage] = useState('');
 
     const doCreate = async () => {