Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: E2EE room setup header #32446

Open
wants to merge 61 commits into
base: develop
Choose a base branch
from
Open

feat: E2EE room setup header #32446

wants to merge 61 commits into from

Conversation

yash-rajpal
Copy link
Member

@yash-rajpal yash-rajpal commented May 16, 2024

This is a new Header for the E2EE room setup flow, idea is that we shouldn't show all the room actions on the setup window and only a few items makes sense to be kept on this Header.

This PR introduces a new E2EERoomHeaderToolbox which is a toolbox for this specific use-case which contains only 3 room actions, e2e, room-info and members tab.

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

E2EE-27

@yash-rajpal yash-rajpal marked this pull request as ready for review May 16, 2024 18:03
@yash-rajpal yash-rajpal requested a review from a team as a code owner May 16, 2024 18:03
hugocostadev
hugocostadev previously approved these changes May 20, 2024
@yash-rajpal yash-rajpal added this to the 6.9 milestone May 20, 2024
@scuciatto scuciatto removed this from the 6.9 milestone May 21, 2024
Base automatically changed from e2e-unencrypted-setting to develop May 24, 2024 20:08
@kodiakhq kodiakhq bot dismissed hugocostadev’s stale review May 24, 2024 20:08

The base branch was changed.

@kodiakhq kodiakhq bot requested a review from a team as a code owner May 24, 2024 20:08
@yash-rajpal yash-rajpal removed the request for review from a team June 11, 2024 16:21
Comment on lines +2 to +3
'@rocket.chat/i18n': patch
'@rocket.chat/meteor': patch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'@rocket.chat/i18n': patch
'@rocket.chat/meteor': patch
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor

@@ -18,6 +19,9 @@ type HeaderProps<T> = {

const Header = ({ room }: HeaderProps<IRoom>): ReactElement | null => {
const { isMobile, isEmbedded, showTopNavbarEmbeddedLayout } = useLayout();
const encrypted = Boolean(room.encrypted);
const unencryptedMessagesAllowed = useSetting('E2E_Allow_Unencrypted_Messages');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const unencryptedMessagesAllowed = useSetting('E2E_Allow_Unencrypted_Messages');
const unencryptedMessagesAllowed = useSetting<boolean>('E2E_Allow_Unencrypted_Messages');

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants