Merge pull request #6200 from matrix-org/gsouquet/fix-17632

src/components/structures/RoomView.tsx

@@ -701,6 +701,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                 room_id: this.state.room.roomId,
                 event_id: this.state.initialEventId,
                 highlighted: false,
+                replyingToEvent: this.state.replyToEvent,
             });
         }
     }

src/components/views/messages/MessageTimestamp.tsx

@@ -16,20 +16,19 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { formatFullDate, formatTime, formatFullTime } from '../../../DateUtils';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-@replaceableComponent("views.messages.MessageTimestamp")
+interface IProps {
-export default class MessageTimestamp extends React.Component {
+    ts: number;
-    static propTypes = {
+    showTwelveHour?: boolean;
-        ts: PropTypes.number.isRequired,
+    showFullDate?: boolean;
-        showTwelveHour: PropTypes.bool,
+    showSeconds?: boolean;
-        showFullDate: PropTypes.bool,
+}
-        showSeconds: PropTypes.bool,
-    };
 
-    render() {
+@replaceableComponent("views.messages.MessageTimestamp")
+export default class MessageTimestamp extends React.Component<IProps> {
+    public render() {
         const date = new Date(this.props.ts);
         let timestamp;
         if (this.props.showFullDate) {
@@ -41,7 +40,11 @@ export default class MessageTimestamp extends React.Component {
         }
 
         return (
-            <span className="mx_MessageTimestamp" title={formatFullDate(date, this.props.showTwelveHour)} aria-hidden={true}>
+            <span
+                className="mx_MessageTimestamp"
+                title={formatFullDate(date, this.props.showTwelveHour)}
+                aria-hidden={true}
+            >
                 {timestamp}
             </span>
         );