Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 8 commits into from
Apr 8, 2026
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03b06e7
fix(whitelabeling): eliminate logo flash by fetching org settings ser…
waleedlatif1 Apr 8, 2026
7ffb247
improvement(whitelabeling): add SVG support for logo and wordmark upl…
waleedlatif1 Apr 8, 2026
f73ccea
skelly in workspace header
waleedlatif1 Apr 8, 2026
6c2c0ae
remove dead code
waleedlatif1 Apr 8, 2026
516027e
fix(whitelabeling): hydration error, SVG support, skeleton shimmer, d…
waleedlatif1 Apr 8, 2026
a3c959e
fix(whitelabeling): blob preview dep cycle and missing color fallback
waleedlatif1 Apr 8, 2026
c70c8ef
fix(whitelabeling): use brand-accent as color fallback when workspace…
waleedlatif1 Apr 8, 2026
0209873
chore(whitelabeling): inline hasOrgBrand
waleedlatif1 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
skelly in workspace header
  • Loading branch information
@waleedlatif1
waleedlatif1 committed Apr 8, 2026
commit f73ccea9bae8310f69e4ce4a992803b8a5418bd2
2 changes: 1 addition & 1 deletion apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ const WhitelabelingSettings = dynamic(
import('@/ee/whitelabeling/components/whitelabeling-settings').then(
(m) => m.WhitelabelingSettings
),
{ loading: () => <SettingsSectionSkeleton /> }
{ loading: () => <SettingsSectionSkeleton />, ssr: false }
)

interface SettingsPageProps {
Expand Down
53 changes: 31 additions & 22 deletions ...space/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
ModalFooter,
ModalHeader,
Plus,
Skeleton,
UserPlus,
} from '@/components/emcn'
import { getDisplayPlanName, isFree } from '@/lib/billing/plan-helpers'
Expand Down Expand Up @@ -356,14 +357,16 @@ export function WorkspaceHeader({
}
}}
>
<div
className='flex h-[20px] w-[20px] flex-shrink-0 items-center justify-center rounded-sm font-medium text-caption text-white leading-none'
style={{
backgroundColor: activeWorkspaceFull?.color || 'var(--brand-accent)',
}}
>
{workspaceInitial}
</div>
{activeWorkspaceFull ? (
<div
className='flex h-[20px] w-[20px] flex-shrink-0 items-center justify-center rounded-sm font-medium text-caption text-white leading-none'
style={{ backgroundColor: activeWorkspaceFull.color }}
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated
>
{workspaceInitial}
</div>
) : (
<Skeleton className='h-[20px] w-[20px] flex-shrink-0 rounded-sm' />
)}
{!isCollapsed && (
<>
<span className='min-w-0 flex-1 truncate text-left font-base text-[var(--text-primary)] text-sm'>
Expand Down Expand Up @@ -400,14 +403,16 @@ export function WorkspaceHeader({
) : (
<>
<div className='flex items-center gap-2 px-0.5 py-0.5'>
<div
className='flex h-[32px] w-[32px] flex-shrink-0 items-center justify-center rounded-md font-medium text-caption text-white'
style={{
backgroundColor: activeWorkspaceFull?.color || 'var(--brand-accent)',
}}
>
{workspaceInitial}
</div>
{activeWorkspaceFull ? (
<div
className='flex h-[32px] w-[32px] flex-shrink-0 items-center justify-center rounded-md font-medium text-caption text-white'
style={{ backgroundColor: activeWorkspaceFull.color }}
>
{workspaceInitial}
</div>
) : (
<Skeleton className='h-[32px] w-[32px] flex-shrink-0 rounded-md' />
)}
<div className='flex min-w-0 flex-1 flex-col'>
<span className='truncate font-medium text-[var(--text-primary)] text-small'>
{activeWorkspace?.name || 'Loading...'}
Expand Down Expand Up @@ -580,12 +585,16 @@ export function WorkspaceHeader({
title={activeWorkspace?.name || 'Loading...'}
disabled
>
<div
className='flex h-[20px] w-[20px] flex-shrink-0 items-center justify-center rounded-sm font-medium text-caption text-white leading-none'
style={{ backgroundColor: activeWorkspaceFull?.color || 'var(--brand-accent)' }}
>
{workspaceInitial}
</div>
{activeWorkspaceFull ? (
<div
className='flex h-[20px] w-[20px] flex-shrink-0 items-center justify-center rounded-sm font-medium text-caption text-white leading-none'
style={{ backgroundColor: activeWorkspaceFull.color }}
>
{workspaceInitial}
</div>
) : (
<Skeleton className='h-[20px] w-[20px] flex-shrink-0 rounded-sm' />
)}
{!isCollapsed && (
<>
<span className='min-w-0 flex-1 truncate text-left font-base text-[var(--text-primary)] text-sm'>
Expand Down
Loading