Conditionally fetch for defaults

Author: LauraBeatris

packages/clerk-js/src/core/resources/Environment.ts

@@ -16,8 +16,6 @@ import { APIKeySettings } from './APIKeySettings';
 import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
 import { OrganizationSettings } from './OrganizationSettings';
 
-// TODO -> Update with new flag for default orgs
-// Use it to conditionally trigger query
 export class Environment extends BaseResource implements EnvironmentResource {
   private static instance: Environment;
 

packages/ui/src/components/CreateOrganization/CreateOrganizationForm.tsx

@@ -36,7 +36,6 @@ type CreateOrganizationFormProps = {
   };
 };
 
-// TODO -> Prefill form with organization creation defaults
 export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
   const card = useCardState();
   const wizard = useWizard({ onNextStep: () => card.setError(undefined) });

packages/ui/src/components/SessionTasks/tasks/TaskChooseOrganization/index.tsx

@@ -17,12 +17,10 @@ import { CreateOrganizationScreen } from './CreateOrganizationScreen';
 
 const TaskChooseOrganizationInternal = () => {
   const { user } = useUser();
-  const { environment } = useEnvironment();
+  const { organizationSettings } = useEnvironment();
   const { userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
   const organizationCreationDefaults = useFetch(
-    environment.organizationSettings.organizationCreationDefaults.enabled
-      ? user?.getOrganizationCreationDefaults
-      : undefined,
+    organizationSettings.organizationCreationDefaults?.enabled ? user?.getOrganizationCreationDefaults : undefined,
     'organization-creation-defaults',
     { staleTime: Infinity },
   );