Postal/Zero
1
0
Fork 0
mirror of https://github.com/Mail-0/Zero.git synced 2026-07-01 08:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #815 from Mail-0/fix-back-button

Browse Source 
temporary fix
This commit is contained in:
Adam
2025-05-01 09:57:42 -07:00
committed by GitHub
parent cd6afd1588 4981b79590
commit ca640fa2cb
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/mail/components/ui/nav-main.tsx
View File

@@ -90,7 +90,7 @@ export function NavMain({ items }: NavMainProps) {
defaultValues: {
name: '',
color: { backgroundColor: '', textColor: '#ffffff' },
}
},
});
const formColor = form.watch('color');
@@ -138,16 +138,16 @@ export function NavMain({ items }: NavMainProps) {
// }
// Handle back button with redirect protection
if (item.isBackButton) {
if (currentFrom) {
const decodedFrom = decodeURIComponent(currentFrom);
if (isValidInternalUrl(decodedFrom)) {
return decodedFrom;
}
}
// Fall back to safe default if URL is missing or invalid
return '/mail';
}
// if (item.isBackButton) {
// if (currentFrom) {
// const decodedFrom = decodeURIComponent(currentFrom);
// if (isValidInternalUrl(decodedFrom)) {
// return decodedFrom;
// }
// }
// // Fall back to safe default if URL is missing or invalid
// return '/mail';
// }
// Handle settings pages navigation
if (item.isSettingsPage && currentFrom) {
@@ -214,7 +214,7 @@ export function NavMain({ items }: NavMainProps) {
if (!data.color?.backgroundColor) {
form.setError('color', {
type: 'required',
message: 'Please select a color'
message: 'Please select a color',
});
return;
}
@@ -503,7 +503,12 @@ function NavItem(item: NavItemProps & { href: string }) {
);
if (item.isBackButton) {
return <Link {...linkProps}>{buttonContent}</Link>;
return (
// TODO: Fix back link to go back a step not to /mail/inbox
<Link {...linkProps} href="/mail/inbox">
{buttonContent}
</Link>
);
}
return (