From e8d06e86b566c0ff85598176466d507965cb2714 Mon Sep 17 00:00:00 2001
From: Warrick Corfe-Tan <warrickct@gmail.com>
Date: Wed, 16 Jun 2021 10:45:22 +1000
Subject: [PATCH] Fixed error message always appearing for group rename.

---
 .../conversation/UpdateGroupNameDialog.tsx       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ts/components/conversation/UpdateGroupNameDialog.tsx b/ts/components/conversation/UpdateGroupNameDialog.tsx
index 85fd24b36..619c6d6f0 100644
--- a/ts/components/conversation/UpdateGroupNameDialog.tsx
+++ b/ts/components/conversation/UpdateGroupNameDialog.tsx
@@ -85,9 +85,17 @@ class UpdateGroupNameDialogInner extends React.Component<Props, State> {
         onClose={() => this.closeDialog()}
         theme={this.props.theme}
       >
-        <div className="spacer-md" />
-        <p className={errorMessageClasses}>{errorMsg}</p>
-        <div className="spacer-md" />
+
+        { this.state.errorDisplayed ?
+          <>
+            <div className="spacer-md" />
+            <p className={errorMessageClasses}>{errorMsg}</p>
+            <div className="spacer-md" />
+          </>
+          :
+          null
+        }
+
         {this.renderAvatar()}
         <div className="spacer-md" />
 
@@ -95,7 +103,7 @@ class UpdateGroupNameDialogInner extends React.Component<Props, State> {
           type="text"
           className="profile-name-input"
           value={this.state.groupName}
-          placeholder={this.props.i18n('groupNamePlaceholder')}
+          placeholder={window.i18n('groupNamePlaceholder')}
           onChange={this.onGroupNameChanged}
           tabIndex={0}
           required={true}