Use systemNickname in conversation merger

signalapp · Feb 14, 2023 · 23b0484 · 23b0484
1 parent 49d5e9b
commit 23b0484
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -422,6 +422,8 @@ export type ConversationRenderInfoType = Pick<
   | 'profileFamilyName'
   | 'profileName'
   | 'systemGivenName'
+  | 'systemFamilyName'
+  | 'systemNickname'
   | 'type'
   | 'username'
 >;