fix(ui): Handle logo upload failure in `TaskChooseOrganization` #7638

LauraBeatris · 2026-01-21T20:43:50Z

Description

Port from #7635

Checklist

pnpm test runs as expected.
pnpm build runs as expected.
(If applicable) JSDoc comments have been added or updated for any package exports
(If applicable) Documentation has been updated

Type of change

Summary by CodeRabbit

Bug Fixes

Organization activation now completes successfully even if logo upload fails during setup. Previously, failed logo uploads could interrupt the activation process and block users from completing organization creation. This fix ensures users can finish setting up their organization without delays, providing a more reliable and seamless onboarding experience regardless of upload results.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

changeset-bot · 2026-01-21T20:43:55Z

🦋 Changeset detected

Latest commit: 0fd9c47

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages

Name	Type
@clerk/ui	Patch
@clerk/chrome-extension	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

vercel · 2026-01-21T20:43:55Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Review	Updated (UTC)
clerk-js-sandbox	Ready	Preview, Comment	Jan 22, 2026 4:57pm

coderabbitai · 2026-01-21T20:49:42Z

📝 Walkthrough

Walkthrough

This pull request patches the @clerk/ui package to handle logo upload failures during organization creation. The TaskChooseOrganization component's CreateOrganizationScreen has been refactored to use an asynchronous logo upload helper function. Instead of setting the logo immediately after organization creation, the new flow invokes uploadOrganizationLogo via Promise.allSettled, allowing it to run concurrently without blocking organization activation if the upload fails. Corresponding test additions verify this behavior, ensuring that setActive is called even when logo upload fails.

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The pull request title clearly summarizes the main change: handling logo upload failures in TaskChooseOrganization. It is specific, concise, and directly reflects the core objective of the changeset across all modified files.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In
`@packages/ui/src/components/SessionTasks/tasks/TaskChooseOrganization/__tests__/TaskChooseOrganization.test.tsx`:
- Around line 14-26: Remove the locally redeclared FakeOrganizationParams type
in TaskChooseOrganization.test.tsx and rely on the imported
FakeOrganizationParams (import type { FakeOrganizationParams } ...) instead;
delete the duplicate type block (the type declaration that lists id, createdAt,
imageUrl, slug, name, membersCount, pendingInvitationsCount, adminDeleteEnabled,
maxAllowedMemberships) so only the imported symbol FakeOrganizationParams
remains used in the test.

coderabbitai · 2026-01-21T20:49:45Z

...mponents/SessionTasks/tasks/TaskChooseOrganization/__tests__/TaskChooseOrganization.test.tsx

+import type { FakeOrganizationParams } from '../../../../CreateOrganization/__tests__/CreateOrganization.test';
+
+type FakeOrganizationParams = {
+  id: string;
+  createdAt?: Date;
+  imageUrl?: string;
+  slug: string;
+  name: string;
+  membersCount: number;
+  pendingInvitationsCount: number;
+  adminDeleteEnabled: boolean;
+  maxAllowedMemberships: number;
+};


⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

cat -n packages/ui/src/components/SessionTasks/tasks/TaskChooseOrganization/__tests__/TaskChooseOrganization.test.tsx | head -30

Repository: clerk/javascript

Length of output: 1275

🏁 Script executed:

grep -n "FakeOrganizationParams" packages/ui/src/components/CreateOrganization/__tests__/CreateOrganization.test.tsx | head -20

Repository: clerk/javascript

Length of output: 272

Remove the duplicate FakeOrganizationParams type declaration.

Line 14 imports FakeOrganizationParams from the CreateOrganization test file, but lines 16–26 re-declare it locally. This duplicate identifier causes a TypeScript compiler error that blocks the build.

Suggested fix

-import type { FakeOrganizationParams } from '../../../../CreateOrganization/__tests__/CreateOrganization.test'; - -type FakeOrganizationParams = { - id: string; - createdAt?: Date; - imageUrl?: string; - slug: string; - name: string; - membersCount: number; - pendingInvitationsCount: number; - adminDeleteEnabled: boolean; - maxAllowedMemberships: number; -};

Keep only the import and use the imported type.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

import type { FakeOrganizationParams } from '../../../../CreateOrganization/__tests__/CreateOrganization.test';

type FakeOrganizationParams = {

id: string;

createdAt?: Date;

imageUrl?: string;

slug: string;

name: string;

membersCount: number;

pendingInvitationsCount: number;

adminDeleteEnabled: boolean;

maxAllowedMemberships: number;

};

import type { FakeOrganizationParams } from '../../../../CreateOrganization/__tests__/CreateOrganization.test';

🧰 Tools

🪛 Biome (2.1.2)

[error] 16-16: Shouldn't redeclare 'FakeOrganizationParams'. Consider to delete it or rename it.

'FakeOrganizationParams' is defined here:

(lint/suspicious/noRedeclare)

🤖 Prompt for AI Agents

In `@packages/ui/src/components/SessionTasks/tasks/TaskChooseOrganization/__tests__/TaskChooseOrganization.test.tsx` around lines 14 - 26, Remove the locally redeclared FakeOrganizationParams type in TaskChooseOrganization.test.tsx and rely on the imported FakeOrganizationParams (import type { FakeOrganizationParams } ...) instead; delete the duplicate type block (the type declaration that lists id, createdAt, imageUrl, slug, name, membersCount, pendingInvitationsCount, adminDeleteEnabled, maxAllowedMemberships) so only the imported symbol FakeOrganizationParams remains used in the test.

pkg-pr-new · 2026-01-22T17:00:30Z

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7638

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7638

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7638

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7638

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7638

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7638

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@7638

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7638

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7638

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7638

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7638

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7638

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7638

@clerk/react

npm i https://pkg.pr.new/@clerk/react@7638

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7638

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7638

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7638

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7638

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@7638

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7638

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7638

commit: 0fd9c47

LauraBeatris requested a review from a team January 21, 2026 20:43

LauraBeatris self-assigned this Jan 21, 2026

vercel bot deployed to Preview January 21, 2026 20:44 View deployment

github-actions bot added the core-3 label Jan 21, 2026

coderabbitai bot reviewed Jan 21, 2026

View reviewed changes

NicolasLopes7 approved these changes Jan 22, 2026

View reviewed changes

LauraBeatris added 2 commits January 22, 2026 13:56

Backport changes

247f241

Add changeset

0fd9c47

LauraBeatris force-pushed the laura/create-org-even-if-logo-upload-fails-2 branch from 3b2f0ff to 0fd9c47 Compare January 22, 2026 16:56

vercel bot deployed to Preview January 22, 2026 16:57 View deployment

LauraBeatris merged commit 7c0ff4a into main Jan 22, 2026
36 checks passed

LauraBeatris deleted the laura/create-org-even-if-logo-upload-fails-2 branch January 22, 2026 17:05

bratsos pushed a commit that referenced this pull request Jan 23, 2026

fix(ui): Handle logo upload failure in TaskChooseOrganization (#7638)

ba1a314

nikosdouvlis pushed a commit that referenced this pull request Jan 27, 2026

fix(ui): Handle logo upload failure in TaskChooseOrganization (#7638)

0c5e91e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(ui): Handle logo upload failure in `TaskChooseOrganization` #7638

fix(ui): Handle logo upload failure in `TaskChooseOrganization` #7638

Uh oh!

LauraBeatris commented Jan 21, 2026 •

edited by coderabbitai bot

Loading

Uh oh!

changeset-bot bot commented Jan 21, 2026 •

edited

Loading

Uh oh!

vercel bot commented Jan 21, 2026 •

edited

Loading

Uh oh!

coderabbitai bot commented Jan 21, 2026

Walkthrough

Uh oh!

coderabbitai bot left a comment

Uh oh!

coderabbitai bot Jan 21, 2026

Uh oh!

pkg-pr-new bot commented Jan 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fix(ui): Handle logo upload failure in TaskChooseOrganization #7638

fix(ui): Handle logo upload failure in TaskChooseOrganization #7638

Uh oh!

Conversation

LauraBeatris commented Jan 21, 2026 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Type of change

Summary by CodeRabbit

Bug Fixes

Uh oh!

changeset-bot bot commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

vercel bot commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot commented Jan 21, 2026

Walkthrough

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

pkg-pr-new bot commented Jan 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fix(ui): Handle logo upload failure in `TaskChooseOrganization` #7638

fix(ui): Handle logo upload failure in `TaskChooseOrganization` #7638

LauraBeatris commented Jan 21, 2026 •

edited by coderabbitai bot

Loading

changeset-bot bot commented Jan 21, 2026 •

edited

Loading

vercel bot commented Jan 21, 2026 •

edited

Loading