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

8
ts/state/ducks/conversations.ts
View file

@ -1201,6 +1201,7 @@ function onArchive(
throw new Error('onArchive: Conversation not found!');
}
const wasPinned = conversation.attributes.isPinned ?? false;
conversation.setArchived(true);
onConversationClosed(conversationId, 'archive')(
@ -1215,13 +1216,15 @@ function onArchive(
toastType: ToastType.ConversationArchived,
parameters: {
conversationId,
wasPinned,
},
},
});
};
}
function onUndoArchive(
conversationId: string
conversationId: string,
options: { wasPinned?: boolean } = {}
): ThunkAction<
void,
RootStateType,
@ -1235,6 +1238,9 @@ function onUndoArchive(
}
conversation.setArchived(false);
if (options.wasPinned) {
conversation.pin();
}
showConversation({
conversationId,
})(dispatch, getState, null);