Split ACI contact when it is unregistered
This commit is contained in:
parent
a5a6b74f98
commit
63d6b14516
11 changed files with 317 additions and 81 deletions
|
@ -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 = [];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue