fix(whitelabeling): eliminate logo flash by fetching org settings server-side

[waleedlatif1]

Summary

• Fix logo flash on hard refresh: workspace layout now fetches org whitelabel settings directly from the DB server-side so the correct org logo is baked into the initial HTML
• Simplify BrandingProvider: drop the cookie-based cache mechanism entirely — effectiveOrgSettings falls back to the server-fetched initialOrgSettings while React Query is in flight, then switches to live data once resolved
• Fix missing 'whitelabeling' entry in SECTION_TITLES so the page title renders correctly

Type of Change

• Bug fix

Testing

Tested manually — hard refresh no longer flashes the Sim default logo before showing org branding

Checklist

• Code follows project style guidelines
• Self-reviewed my changes
• Tests added/updated and passing
• No new warnings introduced
• I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

[cursor]

PR Summary

Medium Risk
Medium risk because it changes the workspace layout/branding initialization path (server-side session + DB fetch) and removes the prior cookie cache, which could affect initial render branding and hydration behavior across workspaces.

Overview
Prevents whitelabel logo/theme flashing on hard refresh by fetching org whitelabel settings server-side in workspace/[workspaceId]/layout.tsx (via session org id) and passing them into BrandingProvider as the initial source of truth.

Simplifies BrandingProvider by removing the cookie-based branding cache entirely and computing config/theme from effectiveOrgSettings (server-fetched settings until React Query resolves). Also drops the unused merged-config helper in org-branding.ts.

Polishes related UI: adds missing whitelabeling settings title, disables SSR for WhitelabelingSettings, improves tooltip video previews (preload + loading placeholder), shows skeletons for workspace color badges while data loads, enables SVG uploads for branding/profile images, and tweaks an auto-connect tooltip preview to loop.

^{Reviewed by Cursor Bugbot for commit 0209873. Configure here.}

[vercel]

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

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
docs	Skipped		Apr 8, 2026 8:56pm

[waleedlatif1]

Also added SVG support for logo/wordmark uploads in this commit — server already accepted it, just needed the client validation and accept attributes updated.

[greptile-apps]

Greptile Summary

This PR eliminates the logo flash on hard refresh by fetching org whitelabel settings server-side in the workspace layout and passing them as initialOrgSettings to BrandingProvider. The provider uses these as a synchronous fallback until React Query resolves, so the correct branding is baked into the initial HTML. It also fixes the missing 'whitelabeling' entry in SECTION_TITLES and bundles SVG support for logo/wordmark uploads.

Confidence Score: 5/5

Safe to merge — the server-side fetch correctly eliminates the logo flash, the undefined vs null distinction in the fallback logic is sound, and there are no runtime errors or data-integrity concerns.

All changes are P2 or lower. The core fix is architecturally clean: initialOrgSettings is fetched once at SSR time and used synchronously on hydration so the React Query transition never shows the default logo. Error handling in getOrgWhitelabelSettings ensures the layout never throws even on DB failure.

No files require special attention.

Vulnerabilities

No security concerns identified. The server-side DB fetch is gated behind a session check (orgId comes from the authenticated session). The new SVG upload support is scoped to org-admin level whitelabeling (trusted users), and SVG blob preview URLs don't execute scripts. The org-branding.ts DB query uses parameterized Drizzle ORM calls with eq() — no SQL injection risk.

Important Files Changed

Filename	Overview
apps/sim/app/workspace/[workspaceId]/layout.tsx	Core fix: adds a server-side DB query for org whitelabel settings and passes initialOrgSettings to BrandingProvider; sequential with getSession() (unavoidable since orgId comes from the session), gracefully returns null on failure.
apps/sim/ee/whitelabeling/components/branding-provider.tsx	Simplified: drops cookie cache, uses orgSettings !== undefined ? orgSettings : (initialOrgSettings ?? null) to serve server-fetched settings until React Query resolves; correctly distinguishes "loading" (undefined) from "no settings" (null).
apps/sim/ee/whitelabeling/org-branding.ts	New server-only module exposing getOrgWhitelabelSettings; uses Drizzle ORM with eq(), has error handling that returns null on failure so layout never throws.
apps/sim/ee/whitelabeling/org-branding-utils.ts	Clean utility module for mergeOrgBrandConfig and CSS variable generation; isDarkBackground luminance math is correct; no issues.
apps/sim/app/workspace/[workspaceId]/settings/[section]/page.tsx	Adds the missing whitelabeling: 'Whitelabeling' entry to SECTION_TITLES, fixing the broken page title for this settings section.
apps/sim/app/workspace/[workspaceId]/settings/hooks/use-profile-picture-upload.ts	Adds image/svg+xml to accepted types; blob preview URLs don't execute SVG scripts; file is properly cleaned up on unmount.
apps/sim/ee/whitelabeling/components/whitelabeling-settings.tsx	Settings UI for org branding; uses useProfilePictureUpload for logo/wordmark uploads with proper drag-and-drop and preview; no issues found.
apps/sim/components/emcn/components/tooltip/tooltip.tsx	Adds Preview sub-component for video/image tooltips with a shimmer placeholder while video loads; clean implementation.
apps/sim/lib/uploads/utils/file-utils.ts	Adds image/svg+xml to MIME_TYPE_MAPPING with a comment explaining it's handled specially for Claude API; createFileContent correctly converts SVG to XML document type.
apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx	Updates workspace color fallback to var(--brand-accent) so it respects org-level color theming; no issues.
apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx	Adds ssr: false to the WhitelabelingSettings dynamic import, appropriate since it's a client-only interactive settings panel.
apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx	Integrates new Tooltip.Preview component for the auto-connect and error-notification tooltips; no logic changes.

Sequence Diagram

sequenceDiagram
    participant Browser
    participant NextServer as Next.js Server
    participant DB as Database
    participant ReactQuery as React Query (client)

    Browser->>NextServer: Hard refresh /workspace/[id]
    NextServer->>NextServer: getSession()
    NextServer->>DB: getOrgWhitelabelSettings(orgId)
    DB-->>NextServer: OrganizationWhitelabelSettings | null
    NextServer-->>Browser: HTML with initialOrgSettings baked in

    Note over Browser: BrandingProvider hydrates
    Note over Browser: effectiveOrgSettings = initialOrgSettings
    Note over Browser: (orgSettings still undefined)

    Browser->>ReactQuery: useWhitelabelSettings(orgId) fires
    ReactQuery-->>Browser: OrganizationWhitelabelSettings
    Note over Browser: effectiveOrgSettings = orgSettings (live data)

Loading

_{Reviews (4): Last reviewed commit: "chore(whitelabeling): inline hasOrgBrand" | Re-trigger Greptile}

[waleedlatif1]

@greptile

[waleedlatif1]

@cursor review

[waleedlatif1]

Both issues addressed:

P1 — Blob preview dep cycle (Greptile): Fixed in a3c959e. Removed previewUrl from the useEffect deps entirely — the effect's only job is to sync when the external currentImage prop changes, so [currentImage] is the correct dep array. Also dropped the now-unnecessary currentImage !== previewUrl guard since we no longer read previewUrl inside the effect, eliminating the circular trigger.

Missing color fallback (Cursor): Fixed in c70c8ef — using activeWorkspaceFull.color ?? 'var(--brand-accent)' on all three avatar instances. Skeleton still shows while activeWorkspaceFull is null (loading); the fallback only applies when the workspace object exists but has no color set.

[waleedlatif1]

@greptile

[waleedlatif1]

@cursor review

[waleedlatif1]

@greptile

[waleedlatif1]

@cursor review

[cursor]

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit 0209873. Configure here.}