Merge pull request #3606 from matrix-org/travis/edit-history

Use a ternary operator instead of relying on AND semantics in EditHistoryDialog
2019-11-11 08:24:07 -07:00 · 2019-11-11 08:24:07 -07:00 · df1d5055c0
parent 81ae6b5e51 c4d45e87ea
commit df1d5055c0
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/dialogs/MessageEditHistoryDialog.js
+++ b/src/components/views/dialogs/MessageEditHistoryDialog.js
@ -116,7 +116,7 @@ export default class MessageEditHistoryDialog extends React.PureComponent {
            nodes.push((
                <EditHistoryMessage
                    key={e.getId()}
-                    previousEdit={!isBaseEvent && allEvents[i + 1]}
+                    previousEdit={!isBaseEvent ? allEvents[i + 1] : null}
                    isBaseEvent={isBaseEvent}
                    mxEvent={e}
                    isTwelveHour={this.state.isTwelveHour}