Skip to content

feat(ui): reverse sheet primary button colors, fix liquid QR icon #183

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
Kelbie merged 1 commit into from
Mar 7, 2026
Merged

feat(ui): reverse sheet primary button colors, fix liquid QR icon #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/(drawer)/(tabs)/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,4 @@ export default function TabLayout() {
</OfflineProvider>
</BackgroundProvider>
);
}
}
116 changes: 76 additions & 40 deletions shared/blocks/popup/PopupHost.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ function getStickyFooterClass(mode?: 'contentHeight' | 'snapPoints'): string {
return `bg-surface pt-4 ${pb} ${px}`;
}

function getSheetButtonClassName(variant: 'primary' | 'tertiary'): string | undefined {
return variant === 'primary' ? 'bg-foreground' : undefined;
}

function getSheetButtonLabelClassName(variant: 'primary' | 'tertiary'): string | undefined {
return variant === 'primary' ? 'text-background' : undefined;
}

function ToastRegistrar() {
const { toast } = useToast();

Expand Down Expand Up @@ -385,25 +393,29 @@ function SheetContent({

{(standardPayload?.buttons?.length ?? 0) > 0 ? (
<View className="mt-4 gap-2">
{standardPayload?.buttons?.map((button, index) => (
<Button
key={`${button.text}-${index}`}
variant={index === 0 ? 'primary' : 'tertiary'}
className={hasLiveStatus ? 'bg-foreground' : undefined}
feedbackVariant={hasLiveStatus ? 'scale' : undefined}
onPress={async () => {
if (button.onPress) {
await button.onPress();
} else if (button.page) {
router.navigate(`/${button.page}` as any);
}
close();
}}>
<Button.Label className={hasLiveStatus ? 'text-overlay' : undefined}>
{button.text}
</Button.Label>
</Button>
))}
{standardPayload?.buttons?.map((button, index) => {
const variant = index === 0 ? 'primary' : 'tertiary';
const className = getSheetButtonClassName(variant);
const labelClassName = getSheetButtonLabelClassName(variant);

return (
<Button
key={`${button.text}-${index}`}
variant={variant}
className={className}
feedbackVariant={hasLiveStatus ? 'scale' : undefined}
onPress={async () => {
if (button.onPress) {
await button.onPress();
} else if (button.page) {
router.navigate(`/${button.page}` as any);
}
close();
}}>
<Button.Label className={labelClassName}>{button.text}</Button.Label>
</Button>
);
})}
</View>
) : null}

Expand Down Expand Up @@ -607,16 +619,27 @@ function SheetPopup() {
<View
className={customFooterConfig.layout === 'row' ? 'flex-row' : undefined}
style={{ gap: 10 }}>
{customFooterConfig.buttons.map((button, index) => (
<Button
key={`${button.label}-${index}`}
variant={button.variant ?? (index === 0 ? 'primary' : 'tertiary')}
onPress={button.onPress}
className={customFooterConfig.layout === 'row' ? 'flex-1' : undefined}
isDisabled={button.isDisabled}>
<Button.Label>{button.label}</Button.Label>
</Button>
))}
{customFooterConfig.buttons.map((button, index) => {
const variant = button.variant ?? (index === 0 ? 'primary' : 'tertiary');
const buttonClassName = getSheetButtonClassName(variant);
const className =
customFooterConfig.layout === 'row'
? [buttonClassName, 'flex-1'].filter(Boolean).join(' ')
: buttonClassName;

return (
<Button
key={`${button.label}-${index}`}
variant={variant}
onPress={button.onPress}
className={className}
isDisabled={button.isDisabled}>
<Button.Label className={getSheetButtonLabelClassName(variant)}>
{button.label}
</Button.Label>
</Button>
);
})}
</View>
</View>
</BottomSheetFooter>
Expand All @@ -631,11 +654,15 @@ function SheetPopup() {
{profileRoute === 'profile-list' ? (
<>
<Button
variant="primary"
className={getSheetButtonClassName('primary')}
onPress={() => {
switcherPayload.onRequestAction({ type: 'create' });
close();
}}>
<Button.Label>Generate new account</Button.Label>
<Button.Label className={getSheetButtonLabelClassName('primary')}>
Generate new account
</Button.Label>
</Button>
<Button variant="tertiary" onPress={() => pushProfileRoute('import-nsec')}>
<Button.Label>{IMPORT_NSEC_LABEL}</Button.Label>
Expand All @@ -644,9 +671,11 @@ function SheetPopup() {
) : (
<>
<Button
variant="primary"
className={getSheetButtonClassName('primary')}
onPress={importFooterState.onImport}
isDisabled={importFooterState.isDisabled}>
<Button.Label>
<Button.Label className={getSheetButtonLabelClassName('primary')}>
{importFooterState.isImporting ? 'Importing...' : 'Import'}
</Button.Label>
</Button>
Expand Down Expand Up @@ -731,15 +760,22 @@ function SheetPopup() {
customFooterConfig.buttons.length > 0 && (
<View className={getStickyFooterClass(layoutConfig?.mode)}>
<View style={{ gap: 10 }}>
{customFooterConfig.buttons.map((button, index) => (
<Button
key={`${button.label}-${index}`}
variant={button.variant ?? (index === 0 ? 'primary' : 'tertiary')}
onPress={button.onPress}
isDisabled={button.isDisabled}>
<Button.Label>{button.label}</Button.Label>
</Button>
))}
{customFooterConfig.buttons.map((button, index) => {
const variant = button.variant ?? (index === 0 ? 'primary' : 'tertiary');

return (
<Button
key={`${button.label}-${index}`}
variant={variant}
className={getSheetButtonClassName(variant)}
onPress={button.onPress}
isDisabled={button.isDisabled}>
<Button.Label className={getSheetButtonLabelClassName(variant)}>
{button.label}
</Button.Label>
</Button>
);
})}
</View>
</View>
)}
Expand Down
9 changes: 1 addition & 8 deletions shared/ui/composed/QRButton/QRButton.ios.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,7 @@ export function QRButton(props: QRButtonProps): React.ReactElement {
const { onPress, accentColor = shadeColor100, color = foreground, size = DEFAULT_SIZE } = props;

if (supportsLiquidGlass()) {
return (
<QRButtonLiquid
onPress={onPress}
accentColor={accentColor}
color={shadeColor300}
size={size}
/>
);
return <QRButtonLiquid onPress={onPress} accentColor={accentColor} color={color} size={size} />;
}

return (
Expand Down