Merge branch 'main' into feat/handshake-e2e-attempt

Author: jfoshee

.changeset/happy-icons-float.md

@@ -0,0 +1,2 @@
+---
+---

integration/tests/astro/components.test.ts

@@ -488,7 +488,9 @@ testAgainstRunningApps({ withPattern: ['astro.node.withCustomRoles'] })('basic f
     await u.page.goToRelative('/server-islands');
     // The loading slot for server islands will appear very quickly.
     // Wait for next state (default slot) to be ready
-    await expect(u.page.getByText('Loading')).toBeHidden();
+    // This is being investigated upstream with the Astro team. The test is commented out for now
+    // to unblock development and will be revisited once the root cause is resolved.
+    // await expect(u.page.getByText('Loading')).toBeHidden();
     await expect(u.page.getByText('Not an admin')).toBeVisible();
 
     // Sign in as admin user
@@ -504,7 +506,9 @@ testAgainstRunningApps({ withPattern: ['astro.node.withCustomRoles'] })('basic f
 
     // Visit page again
     await u.page.goToRelative('/server-islands');
-    await expect(u.page.getByText('Loading')).toBeHidden();
+    // This is being investigated upstream with the Astro team. The test is commented out for now
+    // to unblock development and will be revisited once the root cause is resolved.
+    // await expect(u.page.getByText('Loading')).toBeHidden();
     await expect(u.page.getByText("I'm an admin")).toBeVisible();
   });
 });

packages/shared/src/react/hooks/useOrganizationList.tsx

@@ -76,7 +76,7 @@ const undefinedPaginatedResource = {
 export type UseOrganizationListReturn<T extends UseOrganizationListParams> =
   | {
       /**
-       * A boolean that indicates whether Clerk has completed initialization and there is an authenicated user. Initially `false`, becomes `true` once Clerk loads with a user
+       * A boolean that indicates whether Clerk has completed initialization and there is an authenticated user. Initially `false`, becomes `true` once Clerk loads with a user.
        */
       isLoaded: false;
       /**