Skip to content

Commit

Permalink
fix: E2EE not rendering new navigation feature preview (#33631)
Browse files Browse the repository at this point in the history
  • Loading branch information
hugocostadev authored Oct 18, 2024
1 parent d44f614 commit d879c8b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/real-plants-mix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes E2EE not rendering new navigation feature preview
13 changes: 12 additions & 1 deletion apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next';

import { e2e } from '../../../../app/e2e/client';
import { E2EEState } from '../../../../app/e2e/client/E2EEState';
import { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState';
import RoomBody from '../body/RoomBody';
import RoomBodyV2 from '../body/RoomBodyV2';
import { useRoom } from '../contexts/RoomContext';
import { useE2EERoomState } from '../hooks/useE2EERoomState';
import { useE2EEState } from '../hooks/useE2EEState';
Expand Down Expand Up @@ -63,7 +65,16 @@ const RoomE2EESetup = () => {
);
}

return <RoomBody />;
return (
<FeaturePreview feature='newNavigation'>
<FeaturePreviewOn>
<RoomBodyV2 />
</FeaturePreviewOn>
<FeaturePreviewOff>
<RoomBody />
</FeaturePreviewOff>
</FeaturePreview>
);
};

export default RoomE2EESetup;

0 comments on commit d879c8b

Please sign in to comment.