Fix notification panel crashes and user name color mode

Closes SchildiChat/schildichat-desktop#185
SchildiChat · Feb 27, 2023 · 17bdda6 · 17bdda6
1 parent a384cfb
commit 17bdda6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/components/structures/NotificationPanel.tsx b/src/components/structures/NotificationPanel.tsx
@@ -26,9 +26,11 @@ import { Layout } from "../../settings/enums/Layout";
 import RoomContext, { TimelineRenderingType } from "../../contexts/RoomContext";
 import Measured from "../views/elements/Measured";
 import Heading from "../views/typography/Heading";
+import { UserNameColorMode } from "../../settings/enums/UserNameColorMode";
 
 interface IProps {
     onClose(): void;
+    userNameColorMode?: UserNameColorMode;
 }
 
 interface IState {
@@ -75,6 +77,7 @@ export default class NotificationPanel extends React.PureComponent<IProps, IStat
                     showUrlPreview={false}
                     empty={emptyState}
                     alwaysShowTimestamps={true}
+                    userNameColorMode={this.props.userNameColorMode}
                     layout={Layout.Group}
                 />
             );

diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
@@ -205,7 +205,10 @@ export default class RightPanel extends React.Component<IProps, IState> {
                 break;
 
             case RightPanelPhases.NotificationPanel:
-                card = <NotificationPanel onClose={this.onClose} />;
+                card = <NotificationPanel
+                    onClose={this.onClose}
+                    userNameColorMode={this.props.userNameColorMode}
+                />;
                 break;
 
             case RightPanelPhases.PinnedMessages:

diff --git a/src/components/views/messages/DisambiguatedProfile.tsx b/src/components/views/messages/DisambiguatedProfile.tsx
@@ -44,7 +44,7 @@ export default class DisambiguatedProfile extends React.Component<IProps> {
         let colorClass: string | undefined;
         if (colored) {
             colorClass = getUserNameColorClass(
-                userNameColorMode, fallbackName, MatrixClientPeg.get().getRoom(member.roomId));
+                userNameColorMode, fallbackName, MatrixClientPeg.get().getRoom(member?.roomId));
         }
 
         let mxidElement;

diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
@@ -1073,7 +1073,11 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                     userNameColorMode={this.props.userNameColorMode}
                 />;
             } else if (this.context.timelineRenderingType === TimelineRenderingType.ThreadsList) {
-                sender = <SenderProfile mxEvent={this.props.mxEvent} withTooltip />;
+                sender = <SenderProfile
+                    mxEvent={this.props.mxEvent}
+                    userNameColorMode={this.props.userNameColorMode}
+                    withTooltip
+                />;
             } else {
                 sender = <SenderProfile
                     mxEvent={this.props.mxEvent}