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

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 = {