Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Early preparations for PNP Contact Merging

Browse Source
This commit is contained in:
Scott Nonnenberg
2022-08-09 14:39:00 -07:00
committed by GitHub
parent 2f5dd73e58
commit faf6c41332
30 changed files with 1572 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ts/state/smart/CallManager.tsx
View File

@@ -121,10 +121,10 @@ const mapStateToActiveCallProp = (
const conversationSelectorByUuid = memoize<
(uuid: UUIDStringType) => undefined | ConversationType
>(uuid => {
const conversationId = window.ConversationController.ensureContactIds({
const convoForUuid = window.ConversationController.lookupOrCreate({
uuid,
});
return conversationId ? conversationSelector(conversationId) : undefined;
return convoForUuid ? conversationSelector(convoForUuid.id) : undefined;
});
const baseResult = {