Group Description: Render newlines, view button in change notification

Co-authored-by: Scott Nonnenberg <scott@signal.org>
signalapp · Jun 4, 2021 · a087d4f · a087d4f
1 parent 48ffc0b
commit a087d4f
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 28 deletions.
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
@@ -9595,6 +9595,10 @@ button.module-image__border-overlay:focus {
   margin-right: auto;
 }
 
+.module-group-v2-change--button-container {
+  margin-top: 10px;
+}
+
 // Module: GV1 Migration
 
 .module-group-v1-migration {

diff --git a/ts/components/conversation/GroupDescription.tsx b/ts/components/conversation/GroupDescription.tsx
@@ -4,6 +4,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { Modal } from '../Modal';
 import { LocalizerType } from '../../types/Util';
+import { AddNewLines } from './AddNewLines';
 
 export type PropsType = {
   i18n: LocalizerType;
@@ -37,7 +38,7 @@ export const GroupDescription = ({
           onClose={() => setShowFullDescription(false)}
           title={title}
         >
-          {text}
+          <AddNewLines text={text} />
         </Modal>
       )}
       <div className="GroupDescription__text" ref={textRef}>

diff --git a/ts/components/conversation/GroupV2Change.stories.tsx b/ts/components/conversation/GroupV2Change.stories.tsx
@@ -46,10 +46,11 @@ const renderContact: SmartContactRendererType = (conversationId: string) => (
   </React.Fragment>
 );
 
-const renderChange = (change: GroupV2ChangeType) => (
+const renderChange = (change: GroupV2ChangeType, groupName?: string) => (
   <GroupV2Change
     AccessControlEnum={AccessControlEnum}
     change={change}
+    groupName={groupName}
     i18n={i18n}
     ourConversationId={OUR_ID}
     renderContact={renderContact}
@@ -1360,29 +1361,44 @@ storiesOf('Components/Conversation/GroupV2Change', module)
   .add('Description (Change)', () => {
     return (
       <>
-        {renderChange({
-          from: OUR_ID,
-          details: [
-            {
-              type: 'description',
-            },
-          ],
-        })}
-        {renderChange({
-          from: ADMIN_A,
-          details: [
-            {
-              type: 'description',
-            },
-          ],
-        })}
-        {renderChange({
-          details: [
-            {
-              type: 'description',
-            },
-          ],
-        })}
+        {renderChange(
+          {
+            from: OUR_ID,
+            details: [
+              {
+                type: 'description',
+                description:
+                  'This is a long description.\n\nWe need a dialog to view it all!',
+              },
+            ],
+          },
+          'We do hikes 🌲'
+        )}
+        {renderChange(
+          {
+            from: ADMIN_A,
+            details: [
+              {
+                type: 'description',
+                description:
+                  'This is a long description.\n\nWe need a dialog to view it all!',
+              },
+            ],
+          },
+          'We do hikes 🌲'
+        )}
+        {renderChange(
+          {
+            details: [
+              {
+                type: 'description',
+                description:
+                  'This is a long description.\n\nWe need a dialog to view it all!',
+              },
+            ],
+          },
+          'We do hikes 🌲'
+        )}
       </>
     );
   });
diff --git a/ts/components/conversation/GroupV2Change.tsx b/ts/components/conversation/GroupV2Change.tsx
@@ -1,19 +1,23 @@
 // Copyright 2020 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import * as React from 'react';
+import React, { ReactElement, useState } from 'react';
 
 import { ReplacementValuesType } from '../../types/I18N';
 import { FullJSXType, Intl } from '../Intl';
 import { LocalizerType } from '../../types/Util';
+import { AddNewLines } from './AddNewLines';
+import { Button, ButtonSize, ButtonVariant } from '../Button';
 
-import { GroupV2ChangeType } from '../../groups';
+import { GroupV2ChangeType, GroupV2DescriptionChangeType } from '../../groups';
 
 import { renderChange, SmartContactRendererType } from '../../groupChange';
+import { Modal } from '../Modal';
 
 import { AccessControlClass, MemberClass } from '../../textsecure.d';
 
 export type PropsDataType = {
+  groupName?: string;
   ourConversationId: string;
   change: GroupV2ChangeType;
   AccessControlEnum: typeof AccessControlClass.AccessRequired;
@@ -35,16 +39,27 @@ function renderStringToIntl(
   return <Intl id={id} i18n={i18n} components={components} />;
 }
 
-export function GroupV2Change(props: PropsType): React.ReactElement {
+export function GroupV2Change(props: PropsType): ReactElement {
   const {
     AccessControlEnum,
     change,
+    groupName,
     i18n,
     ourConversationId,
     renderContact,
     RoleEnum,
   } = props;
 
+  const [
+    isGroupDescriptionDialogOpen,
+    setIsGroupDescriptionDialogOpen,
+  ] = useState<boolean>(false);
+
+  const groupDescriptionChange = change.details.find(
+    (item): item is GroupV2DescriptionChangeType =>
+      Boolean(item.type === 'description' && item.description)
+  );
+
   return (
     <div className="module-group-v2-change">
       <div className="module-group-v2-change--icon" />
@@ -60,6 +75,27 @@ export function GroupV2Change(props: PropsType): React.ReactElement {
         // eslint-disable-next-line react/no-array-index-key
         <div key={index}>{item}</div>
       ))}
+      {groupDescriptionChange ? (
+        <div className="module-group-v2-change--button-container">
+          <Button
+            size={ButtonSize.Small}
+            variant={ButtonVariant.SecondaryAffirmative}
+            onClick={() => setIsGroupDescriptionDialogOpen(true)}
+          >
+            {i18n('view')}
+          </Button>
+        </div>
+      ) : null}
+      {groupDescriptionChange && isGroupDescriptionDialogOpen ? (
+        <Modal
+          hasXButton
+          i18n={i18n}
+          title={groupName}
+          onClose={() => setIsGroupDescriptionDialogOpen(false)}
+        >
+          <AddNewLines text={groupDescriptionChange.description} />
+        </Modal>
+      ) : null}
     </div>
   );
 }
diff --git a/ts/groups.ts b/ts/groups.ts
@@ -181,6 +181,8 @@ export type GroupV2AdminApprovalRemoveOneChangeType = {
 export type GroupV2DescriptionChangeType = {
   type: 'description';
   removed?: boolean;
+  // Adding this field; cannot remove previous field for backwards compatibility
+  description?: string;
 };
 
 export type GroupV2ChangeDetailType =
@@ -3654,6 +3656,7 @@ function extractDiffs({
     details.push({
       type: 'description',
       removed: !current.description,
+      description: current.description,
     });
   }
 

diff --git a/ts/models/messages.ts b/ts/models/messages.ts
@@ -643,7 +643,12 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
       throw new Error('change is undefined');
     }
 
+    const conversation = this.getConversation();
+
     return {
+      groupName: conversation?.isGroupV2()
+        ? conversation.get('name')
+        : undefined,
       AccessControlEnum: protobuf.AccessControl.AccessRequired,
       RoleEnum: protobuf.Member.Role,
       ourConversationId,