diff --git a/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx b/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx index b31d529f40..64e5da0734 100644 --- a/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx @@ -27,6 +27,7 @@ const createConversation = (): ConversationType => type: 'group', lastUpdated: 0, title: text('conversation title', 'Some Conversation'), + groupDescription: text('description', 'This is a group description'), }); const createProps = (overrideProps: Partial = {}): Props => ({ @@ -49,3 +50,31 @@ story.add('Editable', () => { return ; }); + +story.add('Basic no-description', () => { + const props = createProps(); + + return ( + + ); +}); + +story.add('Editable no-description', () => { + const props = createProps({ canEdit: true }); + + return ( + + ); +}); diff --git a/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx b/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx index 533cdddba5..d12de1dbb6 100644 --- a/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx +++ b/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx @@ -118,6 +118,7 @@ export const ConversationDetailsHeader: React.ComponentType = ({ {avatarLightbox} {avatar} {contents} +
{subtitle}
); }; diff --git a/ts/services/storageRecordOps.ts b/ts/services/storageRecordOps.ts index 48520c61ea..64d3e2f5fd 100644 --- a/ts/services/storageRecordOps.ts +++ b/ts/services/storageRecordOps.ts @@ -568,7 +568,7 @@ export async function mergeGroupV1Record( // still V1, because the storageItem that we'll put into manifest will have // a different record type. window.log.info( - 'storageService.mergeGroupV1Record marking v1 ' + + 'storageService.mergeGroupV1Record marking v1' + ' group for an update to v2', conversation.idForLogging() );