some fixes
This commit is contained in:
@@ -113,6 +113,7 @@ export default function Home() {
|
|||||||
const { identities } = useIdentityStore();
|
const { identities } = useIdentityStore();
|
||||||
useIdentitySync();
|
useIdentitySync();
|
||||||
const trustedSendersAddressBook = useSettingsStore((state) => state.trustedSendersAddressBook);
|
const trustedSendersAddressBook = useSettingsStore((state) => state.trustedSendersAddressBook);
|
||||||
|
const sendDelaySeconds = useSettingsStore((state) => state.sendDelaySeconds);
|
||||||
const { loadTrustedSendersBook, trustedSendersLoaded } = useContactStore();
|
const { loadTrustedSendersBook, trustedSendersLoaded } = useContactStore();
|
||||||
|
|
||||||
// Load trusted senders address book when feature is enabled
|
// Load trusted senders address book when feature is enabled
|
||||||
@@ -1107,7 +1108,6 @@ export default function Home() {
|
|||||||
if (result.scheduled) {
|
if (result.scheduled) {
|
||||||
await refreshScheduledMetadata(client);
|
await refreshScheduledMetadata(client);
|
||||||
if (isScheduledView) await fetchScheduledEmails(client);
|
if (isScheduledView) await fetchScheduledEmails(client);
|
||||||
toast.success(t('email_viewer.scheduled_send_created'));
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1263,9 +1263,10 @@ export default function Home() {
|
|||||||
|
|
||||||
lastUndoToastSubmissionRef.current = pendingUndoSend.submissionId;
|
lastUndoToastSubmissionRef.current = pendingUndoSend.submissionId;
|
||||||
const pending = pendingUndoSend;
|
const pending = pendingUndoSend;
|
||||||
|
const undoDurationMs = Math.max(sendDelaySeconds, 8) * 1000;
|
||||||
|
|
||||||
toast.info(t('email_viewer.undo_send_scheduled'), {
|
toast.success(t('email_viewer.scheduled_send_created'), {
|
||||||
duration: 8000,
|
duration: undoDurationMs,
|
||||||
action: {
|
action: {
|
||||||
label: t('email_viewer.undo_send'),
|
label: t('email_viewer.undo_send'),
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
@@ -1289,11 +1290,11 @@ export default function Home() {
|
|||||||
if (current?.submissionId === pending.submissionId) {
|
if (current?.submissionId === pending.submissionId) {
|
||||||
clearPendingUndoSend();
|
clearPendingUndoSend();
|
||||||
}
|
}
|
||||||
}, 8000);
|
}, undoDurationMs);
|
||||||
|
|
||||||
return () => clearTimeout(timer);
|
return () => clearTimeout(timer);
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [cancelUndoSend, clearPendingUndoSend, client, fetchScheduledEmails, isScheduledView, pendingUndoSend?.submissionId, t]);
|
}, [cancelUndoSend, clearPendingUndoSend, client, fetchScheduledEmails, isScheduledView, pendingUndoSend?.submissionId, sendDelaySeconds, t]);
|
||||||
|
|
||||||
const handleReplyAll = async () => {
|
const handleReplyAll = async () => {
|
||||||
if (selectedEmail) {
|
if (selectedEmail) {
|
||||||
@@ -2812,7 +2813,6 @@ export default function Home() {
|
|||||||
await refreshScheduledMetadata(client);
|
await refreshScheduledMetadata(client);
|
||||||
if (isScheduledView) await fetchScheduledEmails(client);
|
if (isScheduledView) await fetchScheduledEmails(client);
|
||||||
}
|
}
|
||||||
toast.success(t('email_viewer.scheduled_send_created'));
|
|
||||||
setShowComposer(false);
|
setShowComposer(false);
|
||||||
setPendingDraft(null);
|
setPendingDraft(null);
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -4821,7 +4821,7 @@ export function EmailViewer({
|
|||||||
{/* Draft Banner */}
|
{/* Draft Banner */}
|
||||||
{isDraft && (
|
{isDraft && (
|
||||||
<div className="border-b border-border bg-warning/10">
|
<div className="border-b border-border bg-warning/10">
|
||||||
<div className="max-w-4xl mx-auto px-6 py-2.5 flex items-center justify-between">
|
<div className="px-6 py-2.5 flex items-center justify-between">
|
||||||
<div className="flex items-center gap-2 text-warning">
|
<div className="flex items-center gap-2 text-warning">
|
||||||
<File className="w-4 h-4" />
|
<File className="w-4 h-4" />
|
||||||
<span className="text-sm font-medium">{t('draft_banner')}</span>
|
<span className="text-sm font-medium">{t('draft_banner')}</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user