Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird

2019-11-21 11:15:32 +00:00
parent 6121420113 04641a0f87
commit d3f872bf7a
24 changed files with 262 additions and 107 deletions
@@ -43,7 +43,8 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
        if (room) {
            const senders = [];
            for (const reactionEvent of reactionEvents) {
-                const { name } = room.getMember(reactionEvent.getSender());
+                const member = room.getMember(reactionEvent.getSender());
+                const name = member ? member.name : reactionEvent.getSender();
                senders.push(name);
            }
            const shortName = unicodeToShortcode(content);