element-hq · richvdh · Apr 23, 2026 · Apr 23, 2026 · Apr 23, 2026 · Apr 23, 2026
@@ -13,7 +13,6 @@ import { createRoom, sendMessageInCurrentRoom } from "./utils";
 
 test.use({
     displayName: "Alice",
-    labsFlags: ["feature_share_history_on_invite"],
 });
 
 /** Tests for MSC4268: encrypted history sharing */

@@ -446,7 +446,6 @@ export default function RoomHeader({
     const roomName = useRoomName(room);
     const joinRule = useRoomState(room, (state) => state.getJoinRule());
     const historyVisibility = useRoomState(room, (state) => state.getHistoryVisibility());
-    const historySharingEnabled = useFeatureEnabled("feature_share_history_on_invite");
     const dmMember = useDmMember(room);
     const isDirectMessage = !!dmMember;
     const isRoomEncrypted = useIsEncrypted(client, room);
@@ -532,7 +531,7 @@ export default function RoomHeader({
                                     </Tooltip>
                                 )}
 
-                                {isRoomEncrypted && historySharingEnabled && historyVisibilityIcon(historyVisibility)}
+                                {isRoomEncrypted && historyVisibilityIcon(historyVisibility)}
                             </Text>
                         </Box>
                     </button>

@@ -1577,9 +1577,6 @@
         "report_to_moderators": "Report to moderators",
         "report_to_moderators_description": "In rooms that support moderation, the “Report” button will let you report abuse to room moderators.",
         "room_list_sections": "Room list sections",
-        "share_history_on_invite": "Share encrypted history with new members",
-        "share_history_on_invite_description": "When inviting a user to an encrypted room that has history visibility set to \"shared\", share encrypted history with that user, and accept encrypted history when you are invited to such a room.",
-        "share_history_on_invite_warning": "This feature is EXPERIMENTAL and not all security precautions are implemented. Do not enable on production accounts.",
         "sliding_sync": "Sliding Sync mode",
         "sliding_sync_description": "Under active development, cannot be disabled. Currently, not compatible with Element Call.",
         "sliding_sync_disabled_notice": "Sign in again to disable",

@@ -212,7 +212,6 @@ export interface Settings {
     "feature_mjolnir": IFeature;
     "feature_custom_themes": IFeature;
     "feature_exclude_insecure_devices": IFeature;
-    "feature_share_history_on_invite": IFeature;
     "feature_html_topic": IFeature;
     "feature_bridge_state": IFeature;
     "feature_jump_to_date": IFeature;
@@ -522,29 +521,6 @@ export const SETTINGS: Settings = {
         supportedLevelsAreOrdered: true,
         default: false,
     },
-    "feature_share_history_on_invite": {
-        isFeature: true,
-        labsGroup: LabGroup.Encryption,
-        displayName: _td("labs|share_history_on_invite"),
-        description: () => (
-            <>
-                {_t("labs|share_history_on_invite_description")}
-                <div className="mx_SettingsFlag_microcopy">
-                    {_t(
-                        "settings|warning",
-                        {},
-                        {
-                            w: (sub) => <span className="mx_SettingsTab_microcopy_warning">{sub}</span>,
-                            description: _t("labs|share_history_on_invite_warning"),
-                        },
-                    )}
-                </div>
-            </>
-        ),
-        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG_PRIORITISED,
-        supportedLevelsAreOrdered: true,
-        default: false,
-    },
     // Defaulted to true Feb 26, intention is to remove entirely, all being well,
     // as this fixes bugs where display name / avatar are missing and also makes
     // Element Web consistent with Element X.

@@ -544,11 +544,9 @@ export class RoomViewStore extends EventEmitter {
 
         const joinOpts: IJoinRoomOpts = {
             viaServers,
+            acceptSharedHistory: true,
             ...(payload.opts ?? {}),
         };
-        if (SettingsStore.getValue("feature_share_history_on_invite")) {
-            joinOpts.acceptSharedHistory = true;
-        }
         try {
             const cli = MatrixClientPeg.safeGet();
             await retry<Room, MatrixError>(

@@ -228,10 +228,10 @@ export default class MultiInviter {
                 }
             }
 
-            const opts: InviteOpts = {};
+            const opts: InviteOpts = {
+                shareEncryptedHistory: true,
+            };
             if (this.reason !== undefined) opts.reason = this.reason;
-            if (SettingsStore.getValue("feature_share_history_on_invite")) opts.shareEncryptedHistory = true;
-
             return this.matrixClient.invite(roomId, addr, opts);
         } else {
             throw new Error("Unsupported address");

@@ -723,25 +723,9 @@
             ],
             { addToState: true },
         );
-        let featureEnabled = true;
-        jest.spyOn(SettingsStore, "getValue").mockImplementation(
-            (flag) => flag === "feature_share_history_on_invite" && featureEnabled,
-        );
 
         render(<RoomHeader room={room} />, getWrapper());
         await waitFor(() => getByLabelText(document.body, "New members see history"));
-
-        // Disable the labs flag and check the icon disappears
-        featureEnabled = false;
-        act(() =>
-            defaultWatchManager.notifyUpdate(
-                "feature_share_history_on_invite",
-                null,
-                SettingLevel.DEVICE,
-                featureEnabled,
-            ),
-        );
-        expect(queryByLabelText(document.body, "New members see history")).not.toBeInTheDocument();
     });
 
     it("shows a user icon if the room is encrypted and has world readable history", async () => {
@@ -758,10 +742,6 @@
             ],
             { addToState: true },
         );
-        const featureEnabled = true;
-        jest.spyOn(SettingsStore, "getValue").mockImplementation(
-            (flag) => flag === "feature_share_history_on_invite" && featureEnabled,
-        );
 
         render(<RoomHeader room={room} />, getWrapper());
         await waitFor(() => getByLabelText(document.body, "Anyone can see history"));
@@ -819,7 +799,7 @@
            });
            const { asFragment } = render(<RoomHeader room={room} />, getWrapper());

            expect(asFragment()).toMatchSnapshot();
        });

        it("updates the icon when the encryption status changes", async () => {

@@ -213,7 +213,7 @@
        dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
        dis.dispatch({ action: Action.JoinRoom });
        await untilDispatch(Action.JoinRoomReady, dis);
        expect(mockClient.joinRoom).toHaveBeenCalledWith(roomId, { viaServers: [] });
        expect(roomViewStore.isJoining()).toBe(true);
    });

@@ -229,14 +229,14 @@
            }),
        );
        await untilDispatch(Action.JoinRoomReady, dis);
        expect(mockClient.joinRoom).toHaveBeenCalledWith(alias, { viaServers: ["server1"] });
        expect(roomViewStore.isJoining()).toBe(true);
    });

    it("can auto-join a room", async () => {
        dis.dispatch({ action: Action.ViewRoom, room_id: roomId, auto_join: true });
        await untilDispatch(Action.JoinRoomReady, dis);
        expect(mockClient.joinRoom).toHaveBeenCalledWith(roomId, { viaServers: [] });
        expect(roomViewStore.isJoining()).toBe(true);
    });

@@ -282,7 +282,7 @@
        await untilDispatch(Action.JoinRoomReady, dis);

        expect(roomViewStore.isJoining()).toBeTruthy();
        expect(mockClient.joinRoom).toHaveBeenCalledWith(alias, { viaServers: [] });
    });

    it("emits ViewRoomError if the alias lookup fails", async () => {
@@ -548,11 +548,7 @@
             expect(mocked(dis.dispatch).mock.calls[2][0]).toEqual({ action: "prompt_ask_to_join" });
         });
 
-        it("sets 'acceptSharedHistory' if that option is enabled", async () => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName, roomId, value) => {
-                return settingName === "feature_share_history_on_invite"; // this is enabled, everything else is disabled.
-            });
-
+        it("sets 'acceptSharedHistory'", async () => {
             dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
             dis.dispatch({ action: Action.JoinRoom });
             await untilDispatch(Action.JoinRoomReady, dis);

@@ -256,12 +256,7 @@ describe("MultiInviter", () => {
             );
         });
 
-        it("should set shareEncryptedHistory if that setting is enabled", async () => {
-            mocked(SettingsStore.getValue).mockImplementation((settingName, roomId, value) => {
-                return settingName === "feature_share_history_on_invite"; // this is enabled, everything else is disabled.
-            });
-            await inviter.invite([MXID1]);
-
+        it("should set shareEncryptedHistory", async () => {
             expect(client.invite).toHaveBeenCalledTimes(1);
             expect(client.invite).toHaveBeenNthCalledWith(1, ROOMID, MXID1, { shareEncryptedHistory: true });
         });