Skip to content

Commit 7a94e89

Browse files
committed
Create custom subtitle when org creation is disabled
1 parent a574389 commit 7a94e89

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/ChooseOrganizationScreen.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ type ChooseOrganizationScreenProps = {
3333

3434
export const ChooseOrganizationScreen = (props: ChooseOrganizationScreenProps) => {
3535
const card = useCardState();
36+
const { user } = useUser();
3637
const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
3738

3839
const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
@@ -50,7 +51,13 @@ export const ChooseOrganizationScreen = (props: ChooseOrganizationScreenProps) =
5051
sx={t => ({ padding: `${t.space.$none} ${t.space.$8}` })}
5152
>
5253
<Header.Title localizationKey={localizationKeys('taskChooseOrganization.chooseOrganization.title')} />
53-
<Header.Subtitle localizationKey={localizationKeys('taskChooseOrganization.chooseOrganization.subtitle')} />
54+
<Header.Subtitle
55+
localizationKey={
56+
user?.createOrganizationEnabled
57+
? localizationKeys('taskChooseOrganization.chooseOrganization.subtitle')
58+
: localizationKeys('taskChooseOrganization.chooseOrganization.subtitle__createOrganizationDisabled')
59+
}
60+
/>
5461
</Header.Root>
5562
<Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$8}` })}>{card.error}</Card.Alert>
5663
<Col elementDescriptor={descriptors.main}>

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/__tests__/TaskChooseOrganization.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ describe('TaskChooseOrganization', () => {
307307
}),
308308
);
309309

310-
const { findByText, queryByText, queryByRole } = render(<TaskChooseOrganization />, { wrapper });
310+
const { findByText, queryByText } = render(<TaskChooseOrganization />, { wrapper });
311311

312-
expect(await findByText('Existing Org')).toBeInTheDocument();
312+
expect(await findByText('Join an existing organization')).toBeInTheDocument();
313313
expect(await queryByText('Create new organization')).not.toBeInTheDocument();
314-
expect(queryByRole('textbox', { name: /name/i })).not.toBeInTheDocument();
314+
expect(await findByText('Existing Org')).toBeInTheDocument();
315315
});
316316
});
317317
});

packages/localizations/src/en-US.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,7 @@ export const enUS: LocalizationResource = {
862862
action__invitationAccept: 'Join',
863863
action__suggestionsAccept: 'Request to join',
864864
subtitle: 'Join an existing organization or create a new one',
865+
subtitle__createOrganizationDisabled: 'Join an existing organization',
865866
suggestionsAcceptedLabel: 'Pending approval',
866867
title: 'Choose an organization',
867868
},

packages/shared/src/types/localization.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,6 +1304,7 @@ export type __internal_LocalizationResource = {
13041304
chooseOrganization: {
13051305
title: LocalizationValue;
13061306
subtitle: LocalizationValue;
1307+
subtitle__createOrganizationDisabled: LocalizationValue;
13071308
suggestionsAcceptedLabel: LocalizationValue;
13081309
action__suggestionsAccept: LocalizationValue;
13091310
action__createOrganization: LocalizationValue;

0 commit comments

Comments
 (0)