From 247e7d2c8f3a5e2979c93f6a8c31d47d540cc186 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:28:18 +0900
Subject: [PATCH 1/4] 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>
---
 .../dialogs/_MessageEditHistoryDialog.pcss    | 19 +++++++++++++------
 .../views/messages/EditHistoryMessage.tsx     |  6 +++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/res/css/views/dialogs/_MessageEditHistoryDialog.pcss b/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
index ff7c1002c42..4cef6d287b9 100644
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
@@ -74,13 +74,20 @@ limitations under the License.
         }
     }
 
-    .mx_MessageActionBar .mx_AccessibleButton {
-        display: flex;
-        align-items: center;
+    .mx_MessageActionBar {
+        &.mx_MessageActionBar--noButton {
+            /* Hide if neither redact nor view source button is rendered inside it */
+            display: none;
+        }
+
+        .mx_AccessibleButton {
+            display: flex;
+            align-items: center;
 
-        padding-inline-start: $spacing-8;
-        padding-inline-end: $spacing-8;
+            padding-inline-start: $spacing-8;
+            padding-inline-end: $spacing-8;
 
-        font-size: $font-15px;
+            font-size: $font-15px;
+        }
     }
 }
diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx
index 906867d6a8d..a2212a1cf82 100644
--- a/src/components/views/messages/EditHistoryMessage.tsx
+++ b/src/components/views/messages/EditHistoryMessage.tsx
@@ -141,9 +141,13 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
             );
         }
 
+        const classes = classNames("mx_MessageActionBar", {
+            "mx_MessageActionBar--noButton": !SettingsStore.getValue("developerMode") && !redactButton,
+        });
+
         // disabled remove button when not allowed
         return (
-            <div className="mx_MessageActionBar">
+            <div className={classes}>
                 {redactButton}
                 {viewSourceButton}
             </div>

From 08229666361a4a653d3b9387782526f6c0df9594 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Tue, 28 Mar 2023 14:57:39 +0900
Subject: [PATCH 2/4] Revert "Hide MessageActionBar on message edit history
 dialog if neither redact nor view source button is rendered inside it"

This reverts commit 247e7d2c8f3a5e2979c93f6a8c31d47d540cc186.
---
 .../dialogs/_MessageEditHistoryDialog.pcss    | 19 ++++++-------------
 .../views/messages/EditHistoryMessage.tsx     |  6 +-----
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/res/css/views/dialogs/_MessageEditHistoryDialog.pcss b/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
index 4cef6d287b9..ff7c1002c42 100644
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
@@ -74,20 +74,13 @@ limitations under the License.
         }
     }
 
-    .mx_MessageActionBar {
-        &.mx_MessageActionBar--noButton {
-            /* Hide if neither redact nor view source button is rendered inside it */
-            display: none;
-        }
-
-        .mx_AccessibleButton {
-            display: flex;
-            align-items: center;
+    .mx_MessageActionBar .mx_AccessibleButton {
+        display: flex;
+        align-items: center;
 
-            padding-inline-start: $spacing-8;
-            padding-inline-end: $spacing-8;
+        padding-inline-start: $spacing-8;
+        padding-inline-end: $spacing-8;
 
-            font-size: $font-15px;
-        }
+        font-size: $font-15px;
     }
 }
diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx
index a2212a1cf82..906867d6a8d 100644
--- a/src/components/views/messages/EditHistoryMessage.tsx
+++ b/src/components/views/messages/EditHistoryMessage.tsx
@@ -141,13 +141,9 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
             );
         }
 
-        const classes = classNames("mx_MessageActionBar", {
-            "mx_MessageActionBar--noButton": !SettingsStore.getValue("developerMode") && !redactButton,
-        });
-
         // disabled remove button when not allowed
         return (
-            <div className={classes}>
+            <div className="mx_MessageActionBar">
                 {redactButton}
                 {viewSourceButton}
             </div>

From e5d560c7817c37eff679947a7832362e343dcbb5 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Tue, 28 Mar 2023 15:02:54 +0900
Subject: [PATCH 3/4] 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>
---
 .../views/messages/EditHistoryMessage.tsx     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx
index 906867d6a8d..844104fc95c 100644
--- a/src/components/views/messages/EditHistoryMessage.tsx
+++ b/src/components/views/messages/EditHistoryMessage.tsx
@@ -141,13 +141,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 {

From 9c4e9a0d64dd17ff0d521f3e0665d5a12fb0613f Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Wed, 10 May 2023 15:11:29 +0000
Subject: [PATCH 4/4] Feedback

---
 src/components/views/messages/EditHistoryMessage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/EditHistoryMessage.tsx b/src/components/views/messages/EditHistoryMessage.tsx
index fd3bdcbd2e6..d4a8af9538c 100644
--- a/src/components/views/messages/EditHistoryMessage.tsx
+++ b/src/components/views/messages/EditHistoryMessage.tsx
@@ -127,7 +127,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) {