Use systemNickname in conversation merger

2023-02-14 14:35:34 -08:00 · 2023-02-14 14:35:34 -08:00 · 23b04847e1
commit 23b04847e1
parent 49d5e9beea
2 changed files with 3 additions and 0 deletions
--- a/ts/ConversationController.ts
+++ b/ts/ConversationController.ts
@ -601,6 +601,7 @@ export class ConversationController {
                'profileName',
                'systemGivenName',
                'systemFamilyName',
+                'systemNickname',
                'type',
                'username',
              ]);
--- 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'
 >;