Merge pull request #3193 from matrix-org/bwindels/replace-server-date

Take server-side aggregation into account for timestamp on (edited) tooltip
matrix-org · Jul 9, 2019 · 7ab665b · 7ab665b
2 parents 349afb1 + 58d7ed0
commit 7ab665b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
@@ -364,11 +364,11 @@ module.exports = React.createClass({
         let editedTooltip;
         if (this.state.editedMarkerHovered) {
             const Tooltip = sdk.getComponent('elements.Tooltip');
-            const editEvent = this.props.mxEvent.replacingEvent();
-            const date = editEvent && formatDate(editEvent.getDate());
+            const date = this.props.mxEvent.replacingEventDate();
+            const dateString = date && formatDate(date);
             editedTooltip = <Tooltip
                 tooltipClassName="mx_Tooltip_timeline"
-                label={_t("Edited at %(date)s. Click to view edits.", {date})}
+                label={_t("Edited at %(date)s. Click to view edits.", {date: dateString})}
             />;
         }
         return (