mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Re-pin a conversation after undoing archival

Browse source 
Fixes #6968.
This commit is contained in:
Vincent 2024-08-09 00:02:43 +02:00
parent faea93e5ce
commit 606103be8d
No known key found for this signature in database
4 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ts/components/ToastManager.stories.tsx
View file

@ -52,7 +52,10 @@ function getToast(toastType: ToastType): AnyToast {
case ToastType.ConversationArchived:
return {
toastType: ToastType.ConversationArchived,
parameters: { conversationId: 'some-conversation-id' },
parameters: {
conversationId: 'some-conversation-id',
wasPinned: false,
},
};
case ToastType.ConversationMarkedUnread:
return { toastType: ToastType.ConversationMarkedUnread };

9
ts/components/ToastManager.tsx
View file

@ -23,7 +23,10 @@ export type PropsType = {
openFileInFolder: (target: string) => unknown;
OS: string;
onShowDebugLog: () => unknown;
onUndoArchive: (conversaetionId: string) => unknown;
onUndoArchive: (
conversationId: string,
options?: { wasPinned?: boolean }
) => unknown;
toast?: AnyToast;
megaphone?: AnyActionableMegaphone;
centerToast?: boolean;
@ -166,7 +169,9 @@ export function renderToast({
toastAction={{
label: i18n('icu:conversationArchivedUndo'),
onClick: () => {
onUndoArchive(String(toast.parameters.conversationId));
onUndoArchive(String(toast.parameters.conversationId), {
wasPinned: toast.parameters.wasPinned,
});
},
}}
>