PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

display beacon tiles in timeline regardless of labs flag (#8423)

Browse source 
Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-04-29 16:12:10 +02:00 committed by GitHub
parent 12e8534c2b
commit 36fd9cb0d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/events/EventTileFactory.tsx
View file

@ -41,7 +41,6 @@ import MJitsiWidgetEvent from "../components/views/messages/MJitsiWidgetEvent";
import { hasText } from "../TextForEvent"; import { hasText } from "../TextForEvent";
import { getMessageModerationState, MessageModerationState } from "../utils/EventUtils"; import { getMessageModerationState, MessageModerationState } from "../utils/EventUtils";
import HiddenBody from "../components/views/messages/HiddenBody"; import HiddenBody from "../components/views/messages/HiddenBody";
import SettingsStore from "../settings/SettingsStore";
import ViewSourceEvent from "../components/views/messages/ViewSourceEvent"; import ViewSourceEvent from "../components/views/messages/ViewSourceEvent";
import { shouldDisplayAsBeaconTile } from "../utils/beacon/timeline"; import { shouldDisplayAsBeaconTile } from "../utils/beacon/timeline";
@ -218,12 +217,7 @@ export function pickFactory(
// Try and pick a state event factory, if we can. // Try and pick a state event factory, if we can.
if (mxEvent.isState()) { if (mxEvent.isState()) {
if ( if (shouldDisplayAsBeaconTile(mxEvent)) {
shouldDisplayAsBeaconTile(mxEvent) &&
// settings store access here temporarily during labs
// only hit when a beacon_info event is hit
SettingsStore.getValue("feature_location_share_live")
) {
return MessageEventFactory; return MessageEventFactory;
} }