From c27688c2cb79c12db743a68c81b8b6dbe532ba43 Mon Sep 17 00:00:00 2001
From: Tommy <thomasisaactayler@gmail.com>
Date: Sun, 1 Feb 2026 22:24:41 +0000
Subject: [PATCH 1/2] feat: conditionally render team selection based on user
 sign-in status

- Updated LanguageScreen component to display team selection prompts only when the user is signed in.
- Ensured that both desktop and mobile views show the appropriate team selection text based on the sign-in state.
---
 .../Screens/LanguageScreen/LanguageScreen.tsx | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/journeys-admin/src/components/TemplateCustomization/MultiStepForm/Screens/LanguageScreen/LanguageScreen.tsx b/apps/journeys-admin/src/components/TemplateCustomization/MultiStepForm/Screens/LanguageScreen/LanguageScreen.tsx
index ce20b29bad7..26655c2bb0a 100644
--- a/apps/journeys-admin/src/components/TemplateCustomization/MultiStepForm/Screens/LanguageScreen/LanguageScreen.tsx
+++ b/apps/journeys-admin/src/components/TemplateCustomization/MultiStepForm/Screens/LanguageScreen/LanguageScreen.tsx
@@ -216,20 +216,24 @@ export function LanguageScreen({
                   }))}
                   onChange={(value) => setFieldValue('languageSelect', value)}
                 />
-                <Typography
-                  variant="h6"
-                  display={{ xs: 'none', sm: 'block' }}
-                  sx={{ mt: 4 }}
-                >
-                  {t('Select a team')}
-                </Typography>
-                <Typography
-                  variant="body2"
-                  display={{ xs: 'block', sm: 'none' }}
-                  sx={{ mt: 4 }}
-                >
-                  {t('Select a team')}
-                </Typography>
+                {isSignedIn && (
+                  <Typography
+                    variant="h6"
+                    display={{ xs: 'none', sm: 'block' }}
+                    sx={{ mt: 4 }}
+                  >
+                    {t('Select a team')}
+                  </Typography>
+                )}
+                {isSignedIn && (
+                  <Typography
+                    variant="body2"
+                    display={{ xs: 'block', sm: 'none' }}
+                    sx={{ mt: 4 }}
+                  >
+                    {t('Select a team')}
+                  </Typography>
+                )}
                 {isSignedIn && <JourneyCustomizeTeamSelect />}
                 <CustomizeFlowNextButton
                   label={t('Next')}

From 34a9a890c4da5c1c29de18216b48047d45f12e62 Mon Sep 17 00:00:00 2001
From: Tommy <thomasisaactayler@gmail.com>
Date: Mon, 9 Feb 2026 20:53:27 +0000
Subject: [PATCH 2/2] refactor: consolidate isSignedIn check

---
 .../Screens/LanguageScreen/LanguageScreen.tsx | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/apps/journeys-admin/src/components/TemplateCustomization/MultiStepForm/Screens/LanguageScreen/LanguageScreen.tsx b/apps/journeys-admin/src/components/TemplateCustomization/MultiStepForm/Screens/LanguageScreen/LanguageScreen.tsx
index 26655c2bb0a..a199e47b4e2 100644
--- a/apps/journeys-admin/src/components/TemplateCustomization/MultiStepForm/Screens/LanguageScreen/LanguageScreen.tsx
+++ b/apps/journeys-admin/src/components/TemplateCustomization/MultiStepForm/Screens/LanguageScreen/LanguageScreen.tsx
@@ -217,24 +217,25 @@ export function LanguageScreen({
                   onChange={(value) => setFieldValue('languageSelect', value)}
                 />
                 {isSignedIn && (
-                  <Typography
-                    variant="h6"
-                    display={{ xs: 'none', sm: 'block' }}
-                    sx={{ mt: 4 }}
-                  >
-                    {t('Select a team')}
-                  </Typography>
+                  <>
+                    <Typography
+                      variant="h6"
+                      display={{ xs: 'none', sm: 'block' }}
+                      sx={{ mt: 4 }}
+                    >
+                      {t('Select a team')}
+                    </Typography>
+
+                    <Typography
+                      variant="body2"
+                      display={{ xs: 'block', sm: 'none' }}
+                      sx={{ mt: 4 }}
+                    >
+                      {t('Select a team')}
+                    </Typography>
+                    <JourneyCustomizeTeamSelect />
+                  </>
                 )}
-                {isSignedIn && (
-                  <Typography
-                    variant="body2"
-                    display={{ xs: 'block', sm: 'none' }}
-                    sx={{ mt: 4 }}
-                  >
-                    {t('Select a team')}
-                  </Typography>
-                )}
-                {isSignedIn && <JourneyCustomizeTeamSelect />}
                 <CustomizeFlowNextButton
                   label={t('Next')}
                   onClick={() => handleSubmit()}