Merge tag 'v3.67.0' into sc

* Fix block code styling in rich text editor ([\matrix-org#10246](matrix-org#10246)). Contributed by @alunturner.
* Poll history: fetch more poll history ([\matrix-org#10235](matrix-org#10235)). Contributed by @kerryarchibald.
* Sort short/exact emoji matches before longer incomplete matches ([\matrix-org#10212](matrix-org#10212)). Fixes element-hq/element-web#23210. Contributed by @grimhilt.
* Poll history: detail screen ([\matrix-org#10172](matrix-org#10172)). Contributed by @kerryarchibald.
* Provide a more detailed error message than "No known servers" ([\matrix-org#6048](matrix-org#6048)). Fixes element-hq/element-web#13247. Contributed by @aaronraimist.
* Say when a call was answered from a different device ([\matrix-org#10224](matrix-org#10224)).
* Widget permissions customizations using module api ([\matrix-org#10121](matrix-org#10121)). Contributed by @maheichyk.
* Fix copy button icon overlapping with copyable text ([\matrix-org#10227](matrix-org#10227)). Contributed by @Adesh-Pandey.
* Support joining non-peekable rooms via the module API ([\matrix-org#10154](matrix-org#10154)). Contributed by @maheichyk.
* The "new login" toast does now display the same device information as in the settings. "No" does now open the device settings. "Yes, it was me" dismisses the toast. ([\matrix-org#10200](matrix-org#10200)).
* Do not prompt for a password when doing a „reset all“ after login ([\matrix-org#10208](matrix-org#10208)).
* Display "The sender has blocked you from receiving this message" error message instead of "Unable to decrypt message" ([\matrix-org#10202](matrix-org#10202)). Contributed by @florianduros.
* Polls: show warning about undecryptable relations ([\matrix-org#10179](matrix-org#10179)). Contributed by @kerryarchibald.
* Poll history: fetch last 30 days of polls ([\matrix-org#10157](matrix-org#10157)). Contributed by @kerryarchibald.
* Poll history - ended polls list items ([\matrix-org#10119](matrix-org#10119)). Contributed by @kerryarchibald.
* Remove threads labs flag and the ability to disable threads ([\matrix-org#9878](matrix-org#9878)). Fixes element-hq/element-web#24365.
* Show a success dialog after setting up the key backup ([\matrix-org#10177](matrix-org#10177)). Fixes element-hq/element-web#24487.
* Release Sign in with QR out of labs ([\matrix-org#10066](matrix-org#10066)). Contributed by @hughns.
* Hide indent button in rte ([\matrix-org#10149](matrix-org#10149)). Contributed by @alunturner.
* Add option to find own location in map views ([\matrix-org#10083](matrix-org#10083)).
* Render poll end events in timeline ([\matrix-org#10027](matrix-org#10027)). Contributed by @kerryarchibald.
* Use the room avatar as a placeholder in calls ([\matrix-org#10231](matrix-org#10231)).
* Fix calls showing as 'connecting' after hangup ([\matrix-org#10223](matrix-org#10223)).
* Stop access token overflowing the box ([\matrix-org#10069](matrix-org#10069)). Fixes element-hq/element-web#24023. Contributed by @sbjaj33.
* Prevent multiple Jitsi calls started at the same time ([\matrix-org#10183](matrix-org#10183)). Fixes element-hq/element-web#23009.
* Make localization keys compatible with agglutinative and/or SOV type languages ([\matrix-org#10159](matrix-org#10159)). Contributed by @luixxiul.
* Add link to next file in the export ([\matrix-org#10190](matrix-org#10190)). Fixes element-hq/element-web#20272. Contributed by @grimhilt.
* Ended poll tiles: add ended the poll message ([\matrix-org#10193](matrix-org#10193)). Fixes element-hq/element-web#24579. Contributed by @kerryarchibald.
* Fix accidentally inverted condition for room ordering ([\matrix-org#10178](matrix-org#10178)). Fixes element-hq/element-web#24527. Contributed by @justjanne.
* Re-focus the composer on dialogue quit ([\matrix-org#10007](matrix-org#10007)). Fixes element-hq/element-web#22832. Contributed by @Ashu999.
* Try to resolve emails before creating a DM ([\matrix-org#10164](matrix-org#10164)).
* Disable poll response loading test ([\matrix-org#10168](matrix-org#10168)). Contributed by @justjanne.
* Fix email lookup in invite dialog ([\matrix-org#10150](matrix-org#10150)). Fixes element-hq/element-web#23353.
* Remove duplicate white space characters from translation keys ([\matrix-org#10152](matrix-org#10152)). Contributed by @luixxiul.
* Fix the caption of new sessions manager on Labs settings page for localization ([\matrix-org#10143](matrix-org#10143)). Contributed by @luixxiul.
* Prevent start another DM with a user if one already exists ([\matrix-org#10127](matrix-org#10127)). Fixes element-hq/element-web#23138.
* Remove white space characters before the horizontal ellipsis ([\matrix-org#10130](matrix-org#10130)). Contributed by @luixxiul.
* Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\matrix-org#10128](matrix-org#10128)). Fixes element-hq/element-web#23232. Contributed by @akshattchhabra.
* Correctly Identify emoticons ([\matrix-org#10108](matrix-org#10108)). Fixes element-hq/element-web#19472. Contributed by @adarsh-sgh.
* Remove a redundant white space ([\matrix-org#10129](matrix-org#10129)). Contributed by @luixxiul.

Author: su-ex

.github/workflows/static_analysis.yaml

@@ -52,6 +52,8 @@ jobs:
                     - "--noImplicitAny"
         steps:
             - uses: actions/checkout@v3
+              with:
+                  ref: ${{ github.event.pull_request.head.sha }}
 
             - name: Install Deps
               run: "scripts/ci/layered.sh"

CHANGELOG.md

@@ -1,3 +1,50 @@
+Changes in [3.67.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.67.0) (2023-02-28)
+=====================================================================================================
+
+## ✨ Features
+ * Fix block code styling in rich text editor ([\#10246](https://github.com/matrix-org/matrix-react-sdk/pull/10246)). Contributed by @alunturner.
+ * Poll history: fetch more poll history ([\#10235](https://github.com/matrix-org/matrix-react-sdk/pull/10235)). Contributed by @kerryarchibald.
+ * Sort short/exact emoji matches before longer incomplete matches ([\#10212](https://github.com/matrix-org/matrix-react-sdk/pull/10212)). Fixes vector-im/element-web#23210. Contributed by @grimhilt.
+ * Poll history: detail screen ([\#10172](https://github.com/matrix-org/matrix-react-sdk/pull/10172)). Contributed by @kerryarchibald.
+ * Provide a more detailed error message than "No known servers" ([\#6048](https://github.com/matrix-org/matrix-react-sdk/pull/6048)). Fixes vector-im/element-web#13247. Contributed by @aaronraimist.
+ * Say when a call was answered from a different device ([\#10224](https://github.com/matrix-org/matrix-react-sdk/pull/10224)).
+ * Widget permissions customizations using module api ([\#10121](https://github.com/matrix-org/matrix-react-sdk/pull/10121)). Contributed by @maheichyk.
+ * Fix copy button icon overlapping with copyable text ([\#10227](https://github.com/matrix-org/matrix-react-sdk/pull/10227)). Contributed by @Adesh-Pandey.
+ * Support joining non-peekable rooms via the module API ([\#10154](https://github.com/matrix-org/matrix-react-sdk/pull/10154)). Contributed by @maheichyk.
+ * The "new login" toast does now display the same device information as in the settings. "No" does now open the device settings. "Yes, it was me" dismisses the toast. ([\#10200](https://github.com/matrix-org/matrix-react-sdk/pull/10200)).
+ * Do not prompt for a password when doing a „reset all“ after login ([\#10208](https://github.com/matrix-org/matrix-react-sdk/pull/10208)).
+ * Display "The sender has blocked you from receiving this message" error message instead of "Unable to decrypt message" ([\#10202](https://github.com/matrix-org/matrix-react-sdk/pull/10202)). Contributed by @florianduros.
+ * Polls: show warning about undecryptable relations ([\#10179](https://github.com/matrix-org/matrix-react-sdk/pull/10179)). Contributed by @kerryarchibald.
+ * Poll history: fetch last 30 days of polls ([\#10157](https://github.com/matrix-org/matrix-react-sdk/pull/10157)). Contributed by @kerryarchibald.
+ * Poll history - ended polls list items ([\#10119](https://github.com/matrix-org/matrix-react-sdk/pull/10119)). Contributed by @kerryarchibald.
+ * Remove threads labs flag and the ability to disable threads ([\#9878](https://github.com/matrix-org/matrix-react-sdk/pull/9878)). Fixes vector-im/element-web#24365.
+ * Show a success dialog after setting up the key backup ([\#10177](https://github.com/matrix-org/matrix-react-sdk/pull/10177)). Fixes vector-im/element-web#24487.
+ * Release Sign in with QR out of labs ([\#10066](https://github.com/matrix-org/matrix-react-sdk/pull/10066)). Contributed by @hughns.
+ * Hide indent button in rte ([\#10149](https://github.com/matrix-org/matrix-react-sdk/pull/10149)). Contributed by @alunturner.
+ * Add option to find own location in map views ([\#10083](https://github.com/matrix-org/matrix-react-sdk/pull/10083)).
+ * Render poll end events in timeline ([\#10027](https://github.com/matrix-org/matrix-react-sdk/pull/10027)). Contributed by @kerryarchibald.
+
+## 🐛 Bug Fixes
+ * Use the room avatar as a placeholder in calls ([\#10231](https://github.com/matrix-org/matrix-react-sdk/pull/10231)).
+ * Fix calls showing as 'connecting' after hangup ([\#10223](https://github.com/matrix-org/matrix-react-sdk/pull/10223)).
+ * Stop access token overflowing the box ([\#10069](https://github.com/matrix-org/matrix-react-sdk/pull/10069)). Fixes vector-im/element-web#24023. Contributed by @sbjaj33.
+ * Prevent multiple Jitsi calls started at the same time ([\#10183](https://github.com/matrix-org/matrix-react-sdk/pull/10183)). Fixes vector-im/element-web#23009.
+ * Make localization keys compatible with agglutinative and/or SOV type languages ([\#10159](https://github.com/matrix-org/matrix-react-sdk/pull/10159)). Contributed by @luixxiul.
+ * Add link to next file in the export ([\#10190](https://github.com/matrix-org/matrix-react-sdk/pull/10190)). Fixes vector-im/element-web#20272. Contributed by @grimhilt.
+ * Ended poll tiles: add ended the poll message ([\#10193](https://github.com/matrix-org/matrix-react-sdk/pull/10193)). Fixes vector-im/element-web#24579. Contributed by @kerryarchibald.
+ * Fix accidentally inverted condition for room ordering ([\#10178](https://github.com/matrix-org/matrix-react-sdk/pull/10178)). Fixes vector-im/element-web#24527. Contributed by @justjanne.
+ * Re-focus the composer on dialogue quit ([\#10007](https://github.com/matrix-org/matrix-react-sdk/pull/10007)). Fixes vector-im/element-web#22832. Contributed by @Ashu999.
+ * Try to resolve emails before creating a DM ([\#10164](https://github.com/matrix-org/matrix-react-sdk/pull/10164)).
+ * Disable poll response loading test ([\#10168](https://github.com/matrix-org/matrix-react-sdk/pull/10168)). Contributed by @justjanne.
+ * Fix email lookup in invite dialog ([\#10150](https://github.com/matrix-org/matrix-react-sdk/pull/10150)). Fixes vector-im/element-web#23353.
+ * Remove duplicate white space characters from translation keys ([\#10152](https://github.com/matrix-org/matrix-react-sdk/pull/10152)). Contributed by @luixxiul.
+ * Fix the caption of new sessions manager on Labs settings page for localization ([\#10143](https://github.com/matrix-org/matrix-react-sdk/pull/10143)). Contributed by @luixxiul.
+ * Prevent start another DM with a user if one already exists ([\#10127](https://github.com/matrix-org/matrix-react-sdk/pull/10127)). Fixes vector-im/element-web#23138.
+ * Remove white space characters before the horizontal ellipsis ([\#10130](https://github.com/matrix-org/matrix-react-sdk/pull/10130)). Contributed by @luixxiul.
+ * Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\#10128](https://github.com/matrix-org/matrix-react-sdk/pull/10128)). Fixes vector-im/element-web#23232. Contributed by @akshattchhabra.
+ * Correctly Identify emoticons ([\#10108](https://github.com/matrix-org/matrix-react-sdk/pull/10108)). Fixes vector-im/element-web#19472. Contributed by @adarsh-sgh.
+ * Remove a redundant white space ([\#10129](https://github.com/matrix-org/matrix-react-sdk/pull/10129)). Contributed by @luixxiul.
+
 Changes in [3.66.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.66.0) (2023-02-14)
 =====================================================================================================
 

cypress/e2e/crypto/crypto.spec.ts

@@ -183,6 +183,10 @@ describe("Cryptography", function () {
             cy.contains(".mx_Dialog_primary:not([disabled])", "Continue").click();
             cy.contains(".mx_Dialog_title", "Setting up keys").should("exist");
             cy.contains(".mx_Dialog_title", "Setting up keys").should("not.exist");
+
+            cy.contains("Secure Backup successful").should("exist");
+            cy.contains("Done").click();
+            cy.contains("Secure Backup successful").should("not.exist");
         });
         return;
     });

cypress/e2e/crypto/decryption-failure.spec.ts

@@ -181,12 +181,14 @@ describe("Decryption Failure Bar", () => {
 
             cy.contains(".mx_DecryptionFailureBar_button", "Reset").click();
 
+            // Set up key backup
             cy.get(".mx_Dialog").within(() => {
                 cy.contains(".mx_Dialog_primary", "Continue").click();
                 cy.get(".mx_CreateSecretStorageDialog_recoveryKey code").invoke("text").as("securityKey");
                 // Clicking download instead of Copy because of https://github.com/cypress-io/cypress/issues/2851
                 cy.contains(".mx_AccessibleButton", "Download").click();
                 cy.contains(".mx_Dialog_primary:not([disabled])", "Continue").click();
+                cy.contains("Done").click();
             });
 
             cy.get(".mx_DecryptionFailureBar .mx_DecryptionFailureBar_message_headline").should(

cypress/e2e/location/location.spec.ts

@@ -27,7 +27,7 @@ describe("Location sharing", () => {
     };
 
     const submitShareLocation = (): void => {
-        cy.get('[data-test-id="location-picker-submit-button"]').click();
+        cy.get('[data-testid="location-picker-submit-button"]').click();
     };
 
     beforeEach(() => {

cypress/e2e/polls/polls.spec.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2022 - 2023 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -54,12 +54,12 @@ describe("Polls", () => {
     };
 
     const getPollOption = (pollId: string, optionText: string): Chainable<JQuery> => {
-        return getPollTile(pollId).contains(".mx_MPollBody_option .mx_StyledRadioButton", optionText);
+        return getPollTile(pollId).contains(".mx_PollOption .mx_StyledRadioButton", optionText);
     };
 
     const expectPollOptionVoteCount = (pollId: string, optionText: string, votes: number): void => {
         getPollOption(pollId, optionText).within(() => {
-            cy.get(".mx_MPollBody_optionVoteCount").should("contain", `${votes} vote`);
+            cy.get(".mx_PollOption_optionVoteCount").should("contain", `${votes} vote`);
         });
     };
 
@@ -83,7 +83,6 @@ describe("Polls", () => {
     };
 
     beforeEach(() => {
-        cy.enableLabsFeature("feature_threadenabled");
         cy.window().then((win) => {
             win.localStorage.setItem("mx_lhs_size", "0"); // Collapse left panel for these tests
         });

cypress/e2e/threads/threads.spec.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2022 - 2023 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,17 +19,10 @@ limitations under the License.
 import { HomeserverInstance } from "../../plugins/utils/homeserver";
 import { MatrixClient } from "../../global";
 
-function markWindowBeforeReload(): void {
-    // mark our window object to "know" when it gets reloaded
-    cy.window().then((w) => (w.beforeReload = true));
-}
-
 describe("Threads", () => {
     let homeserver: HomeserverInstance;
 
     beforeEach(() => {
-        // Default threads to ON for this spec
-        cy.enableLabsFeature("feature_threadenabled");
         cy.window().then((win) => {
             win.localStorage.setItem("mx_lhs_size", "0"); // Collapse left panel for these tests
         });
@@ -44,35 +37,6 @@ describe("Threads", () => {
         cy.stopHomeserver(homeserver);
     });
 
-    it("should reload when enabling threads beta", () => {
-        markWindowBeforeReload();
-
-        // Turn off
-        cy.openUserSettings("Labs").within(() => {
-            // initially the new property is there
-            cy.window().should("have.prop", "beforeReload", true);
-
-            cy.leaveBeta("Threaded messages");
-            cy.wait(1000);
-            // after reload the property should be gone
-            cy.window().should("not.have.prop", "beforeReload");
-        });
-
-        cy.get(".mx_MatrixChat", { timeout: 15000 }); // wait for the app
-        markWindowBeforeReload();
-
-        // Turn on
-        cy.openUserSettings("Labs").within(() => {
-            // initially the new property is there
-            cy.window().should("have.prop", "beforeReload", true);
-
-            cy.joinBeta("Threaded messages");
-            cy.wait(1000);
-            // after reload the property should be gone
-            cy.window().should("not.have.prop", "beforeReload");
-        });
-    });
-
     it("should be usable for a conversation", () => {
         let bot: MatrixClient;
         cy.getBot(homeserver, {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "matrix-react-sdk",
-    "version": "3.66.0",
+    "version": "3.67.0",
     "description": "SDK for matrix.org using React",
     "author": "matrix.org",
     "repository": {
@@ -57,7 +57,7 @@
     "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@matrix-org/analytics-events": "^0.4.0",
-        "@matrix-org/matrix-wysiwyg": "^0.23.0",
+        "@matrix-org/matrix-wysiwyg": "^1.1.1",
         "@matrix-org/react-sdk-module-api": "^0.0.3",
         "@sentry/browser": "^7.0.0",
         "@sentry/tracing": "^7.0.0",
@@ -93,7 +93,7 @@
         "maplibre-gl": "^2.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
         "matrix-events-sdk": "0.0.1",
-        "matrix-js-sdk": "23.3.0",
+        "matrix-js-sdk": "23.4.0",
         "matrix-widget-api": "^1.1.1",
         "minimist": "^1.2.5",
         "opus-recorder": "^8.0.3",
@@ -112,7 +112,7 @@
         "react-transition-group": "^4.4.1",
         "rfc4648": "^1.4.0",
         "sanitize-filename": "^1.6.3",
-        "sanitize-html": "^2.3.2",
+        "sanitize-html": "2.8.0",
         "tar-js": "^0.3.0",
         "ua-parser-js": "^1.0.2",
         "url": "^0.11.0",
@@ -153,22 +153,24 @@
         "@types/escape-html": "^1.0.1",
         "@types/file-saver": "^2.0.3",
         "@types/flux": "^3.1.9",
-        "@types/fs-extra": "^9.0.13",
+        "@types/fs-extra": "^11.0.0",
         "@types/geojson": "^7946.0.8",
+        "@types/glob-to-regexp": "^0.4.1",
         "@types/jest": "^29.2.1",
-        "@types/katex": "^0.14.0",
+        "@types/katex": "^0.16.0",
         "@types/lodash": "^4.14.168",
         "@types/modernizr": "^3.5.3",
         "@types/node": "^16",
+        "@types/node-fetch": "^2.6.2",
         "@types/pako": "^2.0.0",
         "@types/parse5": "^6.0.0",
         "@types/qrcode": "^1.3.5",
         "@types/react": "17.0.49",
         "@types/react-beautiful-dnd": "^13.0.0",
         "@types/react-dom": "17.0.17",
-        "@types/react-test-renderer": "^17.0.1",
         "@types/react-transition-group": "^4.4.0",
-        "@types/sanitize-html": "^2.3.1",
+        "@types/sanitize-html": "2.8.0",
+        "@types/tar-js": "^0.3.2",
         "@types/ua-parser-js": "^0.7.36",
         "@types/zxcvbn": "^4.4.0",
         "@typescript-eslint/eslint-plugin": "^5.35.1",
@@ -210,7 +212,6 @@
         "postcss-scss": "^4.0.4",
         "prettier": "2.8.0",
         "raw-loader": "^4.0.2",
-        "react-test-renderer": "^17.0.2",
         "rimraf": "^3.0.2",
         "stylelint": "^14.9.1",
         "stylelint-config-prettier": "^9.0.4",

res/css/_components.pcss

@@ -18,7 +18,9 @@
 @import "./components/views/beacon/_StyledLiveBeaconIcon.pcss";
 @import "./components/views/context_menus/_KebabContextMenu.pcss";
 @import "./components/views/dialogs/polls/_PollListItem.pcss";
+@import "./components/views/dialogs/polls/_PollListItemEnded.pcss";
 @import "./components/views/elements/_FilterDropdown.pcss";
+@import "./components/views/elements/_FilterTabGroup.pcss";
 @import "./components/views/elements/_LearnMore.pcss";
 @import "./components/views/location/_EnableLiveShare.pcss";
 @import "./components/views/location/_LiveDurationDropdown.pcss";
@@ -32,6 +34,7 @@
 @import "./components/views/messages/_MBeaconBody.pcss";
 @import "./components/views/messages/shared/_MediaProcessingError.pcss";
 @import "./components/views/pips/_WidgetPip.pcss";
+@import "./components/views/polls/_PollOption.pcss";
 @import "./components/views/settings/devices/_CurrentDeviceSection.pcss";
 @import "./components/views/settings/devices/_DeviceDetailHeading.pcss";
 @import "./components/views/settings/devices/_DeviceDetails.pcss";
@@ -48,6 +51,7 @@
 @import "./components/views/spaces/_QuickThemeSwitcher.pcss";
 @import "./components/views/typography/_Caption.pcss";
 @import "./compound/_Icon.pcss";
+@import "./compound/_SuccessDialog.pcss";
 @import "./structures/_AutoHideScrollbar.pcss";
 @import "./structures/_AutocompleteInput.pcss";
 @import "./structures/_BackdropPanel.pcss";
@@ -236,6 +240,7 @@
 @import "./views/messages/_MLocationBody.pcss";
 @import "./views/messages/_MNoticeBody.pcss";
 @import "./views/messages/_MPollBody.pcss";
+@import "./views/messages/_MPollEndBody.pcss";
 @import "./views/messages/_MStickerBody.pcss";
 @import "./views/messages/_MTextBody.pcss";
 @import "./views/messages/_MVideoBody.pcss";

res/css/components/views/dialogs/polls/_PollListItemEnded.pcss

@@ -0,0 +1,60 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_PollListItemEnded {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    color: $primary-content;
+}
+
+.mx_PollListItemEnded_title {
+    display: grid;
+    justify-content: left;
+    align-items: center;
+    grid-gap: $spacing-8;
+    grid-template-columns: min-content 1fr min-content;
+    grid-template-rows: auto;
+}
+
+.mx_PollListItemEnded_icon {
+    height: 14px;
+    width: 14px;
+    color: $quaternary-content;
+    padding-left: $spacing-8;
+}
+
+.mx_PollListItemEnded_date {
+    font-size: $font-12px;
+    color: $secondary-content;
+}
+
+.mx_PollListItemEnded_question {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.mx_PollListItemEnded_answers {
+    display: grid;
+    grid-gap: $spacing-8;
+    margin-top: $spacing-12;
+}
+
+.mx_PollListItemEnded_voteCount {
+    // 6px to match PollOption padding
+    margin: $spacing-8 0 0 6px;
+}