Skip to content

Commit 90d1be6

Browse files
authored
Merge pull request #129 from peelar/fix/various
2 parents e5b5fc7 + 4ef1a7b commit 90d1be6

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"dopeshot-app": patch
3+
---
4+
5+
Fix logo button showing dropdown menu for logged out users instead of direct file picker
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"dopeshot-app": patch
3+
---
4+
5+
Hide brand personality indicator in font selector for logged out users

apps/app/src/components/config/layout-config.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ export const LayoutConfigPanel = ({
6262

6363
// Check if brand logo is currently applied
6464
const isBrandLogoApplied = logoAsset && brandLogoAsset && logoAsset.id === brandLogoAsset.id;
65-
66-
// Check if brand logo is available but not applied
67-
const hasBrandLogoAvailable = !logoAsset && brandSettings.logoUrl;
65+
66+
// Check if brand logo is available but not applied (only for brand users)
67+
const hasBrandLogoAvailable = isBrandUser && !logoAsset && brandSettings.logoUrl;
6868

6969
// Check if text is actually supported (not just hidden by layout type)
7070
const isPeakLeftOrRight = config.layoutId === "popup-gradient-left" || config.layoutId === "popup-gradient-right";

apps/app/src/components/sidebar/layout-section.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ export function LayoutSection({ isBrandUser = false }: LayoutSectionProps) {
100100
fontStyle={config.fontStyle}
101101
onFontStyleChange={handleFontStyleChange}
102102
isBrandUser={isBrandUser}
103-
brandFontStyle={personalityStyle?.fontStyle}
104-
brandPersonalityName={personalityName}
103+
brandFontStyle={isBrandUser ? personalityStyle?.fontStyle : undefined}
104+
brandPersonalityName={isBrandUser ? personalityName : undefined}
105105
/>
106106
</div>
107107
)}

0 commit comments

Comments
 (0)