Don't show polls in timeline if polls are disabled (#7332)

andybalaam · web-flow · commit c21895b5b4bf · 2021-12-10T13:28:21.000Z
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
@@ -172,6 +172,13 @@ export function getHandlerTile(ev) {
         }
     }
 
+    if (
+        POLL_START_EVENT_TYPE.matches(type) &&
+        !SettingsStore.getValue("feature_polls")
+    ) {
+        return undefined;
+    }
+
     if (ev.isState()) {
         if (stateEventSingular.has(type) && ev.getStateKey() !== "") return undefined;
         return stateEventTileTypes[type];

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,13 @@ export function getHandlerTile(ev) {`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
	`175`	`+ if (`
	`176`	`+ POLL_START_EVENT_TYPE.matches(type) &&`
	`177`	`+ !SettingsStore.getValue("feature_polls")`
	`178`	`+ ) {`
	`179`	`+ return undefined;`
	`180`	`+ }`
	`181`	`+`
`175`	`182`	`if (ev.isState()) {`
`176`	`183`	`if (stateEventSingular.has(type) && ev.getStateKey() !== "") return undefined;`
`177`	`184`	`return stateEventTileTypes[type];`