Poll history: detail screen

src/components/views/dialogs/polls/PollDetail.tsx

@@ -23,7 +23,7 @@ import { Action } from "../../../../dispatcher/actions";
 import { ViewRoomPayload } from "../../../../dispatcher/payloads/ViewRoomPayload";
 import { RoomPermalinkCreator } from "../../../../utils/permalinks/Permalinks";
 import { MediaEventHelper } from "../../../../utils/MediaEventHelper";
-import AccessibleButton from "../../elements/AccessibleButton";
+import AccessibleButton, { ButtonEvent } from "../../elements/AccessibleButton";
 import MPollBody from "../../messages/MPollBody";
 
 interface Props {
@@ -34,13 +34,16 @@ interface Props {
 
 const NOOP = (): void => {};
 
+/**
+ * Content of the PollHistoryDialog when a specific poll is selected
+ */
 export const PollDetail: React.FC<Props> = ({ poll, permalinkCreator, requestModalClose }) => {
     // link to end event for ended polls
     const eventIdToLinkTo = poll.isEnded ? poll.endEventId! : poll.pollId;
     const linkToTimeline = permalinkCreator.forEvent(eventIdToLinkTo);
 
-    const onLinkClick = (e: React.MouseEvent): void => {
-        if (e.ctrlKey || e.metaKey) {
+    const onLinkClick = (e: ButtonEvent): void => {
+        if ((e as React.MouseEvent).ctrlKey || (e as React.MouseEvent).metaKey) {
             // native behavior for link on ctrl/cmd + click
             return;
         }

src/components/views/dialogs/polls/PollHistoryDialog.tsx

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React, { useState } from "react";
 import { MatrixClient } from "matrix-js-sdk/src/client";
-import { MatrixEvent, Poll } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, Poll, Room } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../../languageHandler";
 import BaseDialog from "../BaseDialog";
@@ -30,7 +30,7 @@ import { usePollsWithRelations } from "./usePollHistory";
 import { useFetchPastPolls } from "./fetchPastPolls";
 
 type PollHistoryDialogProps = Pick<IDialogProps, "onFinished"> & {
-    roomId: string;
+    room: Room;
     matrixClient: MatrixClient;
     permalinkCreator: RoomPermalinkCreator;
 };
@@ -51,15 +51,14 @@ const filterAndSortPolls = (polls: Map<string, Poll>, filter: PollHistoryFilter)
 };
 
 export const PollHistoryDialog: React.FC<PollHistoryDialogProps> = ({
-    roomId,
+    room,
     matrixClient,
     permalinkCreator,
     onFinished,
 }) => {
-    const { polls } = usePollsWithRelations(roomId, matrixClient);
+    const { polls } = usePollsWithRelations(room.roomId, matrixClient);
     const [filter, setFilter] = useState<PollHistoryFilter>("ACTIVE");
     const [focusedPollId, setFocusedPollId] = useState<string | null>(null);
-    const room = matrixClient.getRoom(roomId)!;
     const { isLoading } = useFetchPastPolls(room, matrixClient);
 
     const pollStartEvents = filterAndSortPolls(polls, filter);

src/components/views/right_panel/RoomSummaryCard.tsx

@@ -56,7 +56,7 @@ import { PollHistoryDialog } from "../dialogs/polls/PollHistoryDialog";
 
 interface IProps {
     room: Room;
-    permalinkCreator: RoomPermalinkCreator;
+    permalinkCreator?: RoomPermalinkCreator;
     onClose(): void;
 }
 
@@ -287,7 +287,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose })
 
     const onRoomPollHistoryClick = (): void => {
         Modal.createDialog(PollHistoryDialog, {
-            roomId: room.roomId,
+            room,
             matrixClient: cli,
             permalinkCreator,
         });

test/components/views/dialogs/polls/PollHistoryDialog-test.tsx

@@ -60,7 +60,7 @@ describe("<PollHistoryDialog />", () => {
     });
 
     const defaultProps = {
-        roomId,
+        room,
         matrixClient: mockClient,
         permalinkCreator: new RoomPermalinkCreator(room),
         onFinished: jest.fn(),
@@ -74,6 +74,7 @@ describe("<PollHistoryDialog />", () => {
     beforeEach(() => {
         room = new Room(roomId, mockClient, userId);
         mockClient.getRoom.mockReturnValue(room);
+        defaultProps.room = room;
         mockClient.relations.mockResolvedValue({ events: [] });
         const timeline = room.getLiveTimeline();
         jest.spyOn(timeline, "getEvents").mockReturnValue([]);

test/components/views/right_panel/RoomSummaryCard-test.tsx

@@ -148,7 +148,7 @@ describe("<RoomSummaryCard />", () => {
             fireEvent.click(getByText("Polls history"));
 
             expect(modalSpy).toHaveBeenCalledWith(PollHistoryDialog, {
-                roomId,
+                room,
                 matrixClient: mockClient,
                 permalinkCreator: defaultProps.permalinkCreator,
             });