From 23b04847e10cf6836b70e76f604c5dd0b094b9d1 Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Tue, 14 Feb 2023 14:35:34 -0800 Subject: [PATCH] Use systemNickname in conversation merger --- ts/ConversationController.ts | 1 + ts/model-types.d.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ts/ConversationController.ts b/ts/ConversationController.ts index 71c08364d..860d10e1a 100644 --- a/ts/ConversationController.ts +++ b/ts/ConversationController.ts @@ -601,6 +601,7 @@ export class ConversationController { 'profileName', 'systemGivenName', 'systemFamilyName', + 'systemNickname', 'type', 'username', ]); diff --git a/ts/model-types.d.ts b/ts/model-types.d.ts index 2cdc63e23..9473713d6 100644 --- a/ts/model-types.d.ts +++ b/ts/model-types.d.ts @@ -422,6 +422,8 @@ export type ConversationRenderInfoType = Pick< | 'profileFamilyName' | 'profileName' | 'systemGivenName' + | 'systemFamilyName' + | 'systemNickname' | 'type' | 'username' >;