Hide empty MessageActionBar on message edit history dialog (#10447)

* Hide MessageActionBar on message edit history dialog if neither redact nor view source button is rendered inside it Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com> * Revert "Hide MessageActionBar on message edit history dialog if neither redact nor view source button is rendered inside it" This reverts commit 247e7d2. * Iterate - Hide MessageActionBar on message edit history dialog if neither redact nor view source button is rendered inside it Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com> * Feedback --------- Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
matrix-org · May 18, 2023 · 8779219 · 8779219
1 parent d9d5387
commit 8779219
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx
@@ -129,7 +129,7 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
         this.tooltipifyLinks();
     }
 
-    private renderActionBar(): JSX.Element {
+    private renderActionBar(): React.ReactNode {
         // hide the button when already redacted
         let redactButton: JSX.Element | undefined;
         if (!this.props.mxEvent.isRedacted() && !this.props.isBaseEvent && this.state.canRedact) {
@@ -143,13 +143,18 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
             );
         }
 
-        // disabled remove button when not allowed
-        return (
-            <div className="mx_MessageActionBar">
-                {redactButton}
-                {viewSourceButton}
-            </div>
-        );
+        if (!redactButton && !viewSourceButton) {
+            // Hide the empty MessageActionBar
+            return null;
+        } else {
+            // disabled remove button when not allowed
+            return (
+                <div className="mx_MessageActionBar">
+                    {redactButton}
+                    {viewSourceButton}
+                </div>
+            );
+        }
     }
 
     public render(): React.ReactNode {