From c7870090f8466bff4f40ea074c36c56b68469f28 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Apr 2020 23:29:38 +0100
Subject: [PATCH] clean ups

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MessagePanel.js         | 1 -
 src/components/views/elements/EventListSummary.js | 8 +-------
 src/i18n/strings/en_EN.json                       | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index a83529e055..6fbfdb504b 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -29,7 +29,6 @@ import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import {textForEvent} from "../../TextForEvent";
-import RedactionEventListSummary from "../views/elements/RedactionEventListSummary";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
diff --git a/src/components/views/elements/EventListSummary.js b/src/components/views/elements/EventListSummary.js
index 707b9e79b0..bf0f8ea133 100644
--- a/src/components/views/elements/EventListSummary.js
+++ b/src/components/views/elements/EventListSummary.js
@@ -22,8 +22,7 @@ import {MatrixEvent, RoomMember} from "matrix-js-sdk";
 import {useStateToggle} from "../../../hooks/useStateToggle";
 import AccessibleButton from "./AccessibleButton";
 
-const EventListSummary = (props) => {
-    const {events, children, threshold=3, onToggle, startExpanded, summaryMembers=[], summaryText, summary} = props;
+const EventListSummary = ({events, children, threshold=3, onToggle, startExpanded, summaryMembers=[], summaryText}) => {
     const [expanded, toggleExpanded] = useStateToggle(startExpanded);
 
     // Whenever expanded changes call onToggle
@@ -50,8 +49,6 @@ const EventListSummary = (props) => {
             <div className="mx_EventListSummary_line">&nbsp;</div>
             { children }
         </React.Fragment>;
-    } else if (summary) {
-        body = summary;
     } else {
         const avatars = summaryMembers.map((m) => <MemberAvatar key={m.userId} member={m} width={14} height={14} />);
         body = (
@@ -90,9 +87,6 @@ EventListSummary.propTypes = {
     // Whether or not to begin with state.expanded=true
     startExpanded: PropTypes.bool,
 
-    // The node to render as a summary when the summary is not collapsed,
-    // alternately summaryMembers and summaryText can be provided.
-    summary: PropTypes.node,
     // The list of room members for which to show avatars next to the summary, ignored if summary is provided
     summaryMembers: PropTypes.arrayOf(PropTypes.instanceOf(RoomMember)),
     // The text to show as the summary of this event list, ignored if summary is provided
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index de3f88c244..8785b5e244 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1488,8 +1488,6 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
     "Power level": "Power level",
     "Custom level": "Custom level",
-    "%(count)s messages deleted|other": "%(count)s messages deleted",
-    "%(count)s messages deleted by %(name)s|other": "%(count)s messages deleted by %(name)s",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.",
     "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
     "Room alias": "Room alias",