mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2025-12-24 04:09:49 +00:00
Split ACI contact when it is unregistered
This commit is contained in:
@@ -381,7 +381,7 @@ export class ConversationController {
|
||||
reason: 'getOurConversationId',
|
||||
});
|
||||
|
||||
return conversation?.id;
|
||||
return conversation.id;
|
||||
}
|
||||
|
||||
getOurConversationIdOrThrow(): string {
|
||||
@@ -465,7 +465,7 @@ export class ConversationController {
|
||||
fromPniSignature?: boolean;
|
||||
mergeOldAndNew?: (options: SafeCombineConversationsParams) => Promise<void>;
|
||||
}): {
|
||||
conversation: ConversationModel | undefined;
|
||||
conversation: ConversationModel;
|
||||
mergePromises: Array<Promise<void>>;
|
||||
} {
|
||||
const dataProvided = [];
|
||||
|
||||
Reference in New Issue
Block a user