edit group editing title to match Android

_locales/en/messages.json

@@ -1645,25 +1645,22 @@
     "message": "Select message",
     "description": "Button action that the user can click to select the message"
   },
-  "copiedMessage": {
+  "editGroup": {
-    "message": "Message text copied",
+    "message": "Edit group",
-    "description": "A toast message telling the user that the message text was copied"
+    "description": "Button action that the user can click to edit a group name (open)",
-  },
+    "androidKey": "conversation__menu_edit_group"
-  "editGroupNameOrPicture": {
-    "message": "Edit group name or picture",
-    "description": "Button action that the user can click to edit a group name (open)"
   },
   "editGroupName": {
     "message": "Edit group name",
     "description": "Button action that the user can click to edit a group name (closed)"
   },
   "updateGroupDialogTitle": {
-    "message": "Updating a Closed Group",
+    "message": "Updating $name$...",
-    "description": "Title for the dialog box used to update an existing private group"
+    "description": "Title for the dialog box used to update an existing private group",
-  },
+    "androidKey": "GroupCreateActivity_updating_group",
-  "updatePublicGroupDialogTitle": {
+    "androidReplace": {
-    "message": "Updating a open group Channel",
+      "%1$s": "$name$"
-    "description": "Title for the dialog box used to update an existing open group channel"
+    }
   },
   "showRecoveryPhrase": {
     "message": "Show Recovery Phrase",

js/views/create_group_dialog_view.js

@@ -12,7 +12,8 @@
       this.groupName = groupConvo.get('name');
 
       this.conversation = groupConvo;
-      this.titleText = i18n('updateGroupDialogTitle');
+      this.titleText = i18n('updateGroupDialogTitle', this.groupName);
+
       this.close = this.close.bind(this);
       this.onSubmit = this.onSubmit.bind(this);
       this.isPublic = groupConvo.isPublic();
@@ -27,9 +28,7 @@
       // public chat settings overrides
       if (this.isPublic) {
         // fix the title
-        this.titleText = `${i18n('updatePublicGroupDialogTitle')}: ${
+        this.titleText = i18n('updateGroupDialogTitle', this.groupName);
-          this.groupName
-        }`;
         // I'd much prefer to integrate mods with groupAdmins
         // but lets discuss first...
         this.isAdmin = groupConvo.isModerator(
@@ -88,9 +87,7 @@
       this.avatarPath = groupConvo.getAvatarPath();
 
       if (this.isPublic) {
-        this.titleText = `${i18n('updatePublicGroupDialogTitle')}: ${
+        this.titleText = i18n('updateGroupDialogTitle', this.groupName);
-          this.groupName
-        }`;
         // I'd much prefer to integrate mods with groupAdmins
         // but lets discuss first...
         this.isAdmin = groupConvo.isModerator(
@@ -100,7 +97,7 @@
         this.contactsAndMembers = [];
         this.existingMembers = [];
       } else {
-        this.titleText = i18n('updateGroupDialogTitle');
+        this.titleText = i18n('updateGroupDialogTitle', this.groupName);
         this.isAdmin = groupConvo.get('groupAdmins').includes(ourPK);
         const convos = window.getConversations().models.filter(d => !!d);
 

js/views/network_status_view.js

@@ -50,8 +50,6 @@
       let message = '';
       let instructions = '';
       let hasInterruption = false;
-      let action = null;
-      let buttonClass = null;
 
       const socketStatus = this.getSocketStatus();
       switch (socketStatus) {
@@ -106,20 +104,14 @@
         hasInterruption = true;
         message = i18n('offline');
         instructions = i18n('checkNetworkConnection');
-      } else if (!Whisper.Registration.isDone()) {
-        hasInterruption = true;
-        message = i18n('unlinked');
-        instructions = i18n('unlinkedWarning');
-        action = i18n('relink');
-        buttonClass = 'openInstaller';
       }
 
       return {
         message,
         instructions,
         hasInterruption,
-        action,
+        action: null,
-        buttonClass,
+        buttonClass: null,
       };
     },
     update() {

ts/components/session/SessionGroupSettings.tsx

@@ -267,9 +267,7 @@ export class SessionGroupSettings extends React.Component<Props, any> {
             role="button"
             onClick={this.props.onUpdateGroupName}
           >
-            {isPublic
+            {isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
-              ? window.i18n('editGroupNameOrPicture')
-              : window.i18n('editGroupName')}
           </div>
         )}
         {showUpdateGroupMembersButton && (

ts/session/utils/Menu.tsx

@@ -174,9 +174,7 @@ export function getUpdateGroupNameMenuItem(
   i18n: LocalizerType
 ): JSX.Element | null {
   if (showUpdateGroupName(Boolean(amMod), Boolean(isKickedFromGroup))) {
-    return (
+    return <MenuItem onClick={action}>{i18n('editGroup')}</MenuItem>;
-      <MenuItem onClick={action}>{i18n('editGroupNameOrPicture')}</MenuItem>
-    );
   }
   return null;
 }