Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Move pin drop out of labs (PSG-664) #9135

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions cypress/e2e/location/location.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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(() => {
Expand Down
4 changes: 1 addition & 3 deletions src/components/views/location/LocationShareMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,6 @@
"Jump to date (adds /jumptodate and jump to date headers)": "Jump to date (adds /jumptodate and jump to date headers)",
"Don't send read receipts": "Don't 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",
Expand Down
7 changes: 0 additions & 7 deletions src/settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions test/components/views/location/LocationShareMenu-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,6 @@ describe('<LocationShareMenu />', () => {
});

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);
Expand Down