From 4a1488293850a8ba2be47515ce3639574edbc91b Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Mon, 8 Aug 2022 10:57:38 +0200 Subject: [PATCH] Move pin drop out of labs (PSG-664) (#9135) * Move pin drop out of labs (PSG-664) Signed-off-by: Johannes Marbach * Regenerate strings Signed-off-by: Johannes Marbach --- cypress/e2e/location/location.spec.ts | 4 ---- src/components/views/location/LocationShareMenu.tsx | 4 +--- src/i18n/strings/en_EN.json | 1 - src/settings/Settings.tsx | 7 ------- test/components/views/location/LocationShareMenu-test.tsx | 2 -- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/cypress/e2e/location/location.spec.ts b/cypress/e2e/location/location.spec.ts index 65b1e8bcc8..b0cc5e555c 100644 --- a/cypress/e2e/location/location.spec.ts +++ b/cypress/e2e/location/location.spec.ts @@ -18,7 +18,6 @@ limitations under the License. import { SynapseInstance } from "../../plugins/synapsedocker"; import Chainable = Cypress.Chainable; -import { SettingLevel } from "../../../src/settings/SettingLevel"; describe("Location sharing", () => { let synapse: SynapseInstance; @@ -40,9 +39,6 @@ describe("Location sharing", () => { cy.initTestUser(synapse, "Tom"); }); - - // enable pin drop location sharing feature - cy.setSettingValue("feature_location_share_pin_drop", null, SettingLevel.DEVICE, true); }); afterEach(() => { diff --git a/src/components/views/location/LocationShareMenu.tsx b/src/components/views/location/LocationShareMenu.tsx index 7b31b45b04..0d9ec242c6 100644 --- a/src/components/views/location/LocationShareMenu.tsx +++ b/src/components/views/location/LocationShareMenu.tsx @@ -49,9 +49,7 @@ const getEnabledShareTypes = (relation): LocationShareType[] => { enabledShareTypes.push(LocationShareType.Live); } - if (SettingsStore.getValue("feature_location_share_pin_drop")) { - enabledShareTypes.push(LocationShareType.Pin); - } + enabledShareTypes.push(LocationShareType.Pin); return enabledShareTypes; }; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 7ce4908afe..d509ec6494 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -900,7 +900,6 @@ "Jump to date (adds /jumptodate and jump to date headers)": "Jump to date (adds /jumptodate and jump to date headers)", "Send read receipts": "Send read receipts", "Right-click message context menu": "Right-click message context menu", - "Location sharing - pin drop": "Location sharing - pin drop", "Live Location Sharing (temporary implementation: locations persist in room history)": "Live Location Sharing (temporary implementation: locations persist in room history)", "Favourite Messages (under active development)": "Favourite Messages (under active development)", "Font size": "Font size", diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx index 8414b25394..05e4308a1c 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -413,13 +413,6 @@ export const SETTINGS: {[setting: string]: ISetting} = { displayName: _td("Right-click message context menu"), default: false, }, - "feature_location_share_pin_drop": { - isFeature: true, - labsGroup: LabGroup.Messaging, - supportedLevels: LEVELS_FEATURE, - displayName: _td("Location sharing - pin drop"), - default: false, - }, "feature_location_share_live": { isFeature: true, labsGroup: LabGroup.Messaging, diff --git a/test/components/views/location/LocationShareMenu-test.tsx b/test/components/views/location/LocationShareMenu-test.tsx index e25fab3ade..94e2cd6213 100644 --- a/test/components/views/location/LocationShareMenu-test.tsx +++ b/test/components/views/location/LocationShareMenu-test.tsx @@ -213,8 +213,6 @@ describe('', () => { }); describe('with pin drop share type enabled', () => { - beforeEach(() => enableSettings(["feature_location_share_pin_drop"])); - it('renders share type switch with own and pin drop options', () => { const component = getComponent(); expect(component.find('LocationPicker').length).toBe(0);