chore: Legal button on SettingsView (#6053)

Co-authored-by: Diego Mello <[email protected]>
RocketChat · Dec 16, 2024 · 523b8a2 · 523b8a2
1 parent f9d1ba2
commit 523b8a2
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 3 deletions.
diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
@@ -74,6 +74,7 @@ import AddExistingChannelView from '../views/AddExistingChannelView';
 import SelectListView from '../views/SelectListView';
 import DiscussionsView from '../views/DiscussionsView';
 import ChangeAvatarView from '../views/ChangeAvatarView';
+import LegalView from '../views/LegalView';
 import {
 	AdminPanelStackParamList,
 	ChatsStackParamList,
@@ -188,6 +189,8 @@ const SettingsStackNavigator = () => {
 			<SettingsStack.Screen name='DefaultBrowserView' component={DefaultBrowserView} />
 			<SettingsStack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
 			<SettingsStack.Screen name='GetHelpView' component={GetHelpView} />
+			{/* @ts-ignore */}
+			<SettingsStack.Screen name='LegalView' component={LegalView} />
 			<SettingsStack.Screen
 				name='ScreenLockConfigView'
 				// @ts-ignore

diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx
@@ -46,6 +46,7 @@ import NewMessageView from '../../views/NewMessageView';
 import CreateChannelView from '../../views/CreateChannelView';
 import UserPreferencesView from '../../views/UserPreferencesView';
 import UserNotificationPrefView from '../../views/UserNotificationPreferencesView';
+import LegalView from '../../views/LegalView';
 import SecurityPrivacyView from '../../views/SecurityPrivacyView';
 import MediaAutoDownloadView from '../../views/MediaAutoDownloadView';
 import E2EEncryptionSecurityView from '../../views/E2EEncryptionSecurityView';
@@ -168,6 +169,8 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 					options={props => ReadReceiptsView.navigationOptions!({ ...props, isMasterDetail: true })}
 				/>
 				<ModalStack.Screen name='SettingsView' component={SettingsView} />
+				{/* @ts-ignore */}
+				<ModalStack.Screen name='LegalView' component={LegalView} />
 				<ModalStack.Screen name='LanguageView' component={LanguageView} />
 				<ModalStack.Screen name='ThemeView' component={ThemeView} />
 				<ModalStack.Screen name='DefaultBrowserView' component={DefaultBrowserView} />

diff --git a/app/stacks/MasterDetailStack/types.ts b/app/stacks/MasterDetailStack/types.ts
@@ -200,6 +200,7 @@ export type ModalStackParamList = {
 	MediaAutoDownloadView: undefined;
 	E2EEncryptionSecurityView: undefined;
 	PushTroubleshootView: undefined;
+	LegalView: undefined;
 	SupportedVersionsWarning: {
 		showCloseButton?: boolean;
 	};

diff --git a/app/stacks/types.ts b/app/stacks/types.ts
@@ -205,6 +205,7 @@ export type ProfileStackParamList = {
 };
 
 export type SettingsStackParamList = {
+	LegalView: undefined;
 	SettingsView: undefined;
 	SecurityPrivacyView: undefined;
 	E2EEncryptionSecurityView: undefined;

diff --git a/app/views/LegalView.tsx b/app/views/LegalView.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useLayoutEffect } from 'react';
 import { useSelector } from 'react-redux';
 
 import I18n from '../i18n';
@@ -18,7 +18,7 @@ const LegalView = ({ navigation }: ILegalViewProps): React.ReactElement => {
 	const server = useSelector((state: IApplicationState) => state.server.server);
 	const { theme } = useTheme();
 
-	useEffect(() => {
+	useLayoutEffect(() => {
 		navigation.setOptions({
 			title: I18n.t('Legal')
 		});

diff --git a/app/views/SettingsView/index.tsx b/app/views/SettingsView/index.tsx
@@ -259,6 +259,14 @@ const SettingsView = (): React.ReactElement => {
 						left={() => <List.Icon name='arrow-forward' />}
 					/>
 					<List.Separator />
+					<List.Item
+						title='Legal'
+						showActionIndicator
+						onPress={() => navigateToScreen('LegalView')}
+						testID='settings-view-legal'
+						left={() => <List.Icon name='book' />}
+					/>
+					<List.Separator />
 					<List.Item
 						title='Contact_us'
 						onPress={sendEmail}

diff --git a/e2e/tests/assorted/04-setting.spec.ts b/e2e/tests/assorted/04-setting.spec.ts
@@ -65,10 +65,14 @@ describe('Settings screen', () => {
 			await expect(element(by.id('settings-view-media-auto-download'))).toExist();
 		});
 
-		it('should have licence', async () => {
+		it('should have license', async () => {
 			await expect(element(by.id('settings-view-license'))).toExist();
 		});
 
+		it('should have legal', async () => {
+			await expect(element(by.id('settings-view-legal'))).toExist();
+		});
+
 		it('should have version no', async () => {
 			await expect(element(by.id('settings-view-version'))).toExist();
 		});
@@ -106,5 +110,35 @@ describe('Settings screen', () => {
 				.toExist()
 				.withTimeout(10000);
 		});
+
+		describe('Legal button', () => {
+			it('should navigate to legalview', async () => {
+				await element(by.id('rooms-list-view-sidebar')).tap();
+				await waitFor(element(by.id('sidebar-view')))
+					.toBeVisible()
+					.withTimeout(2000);
+				await waitFor(element(by.id('sidebar-settings')))
+					.toBeVisible()
+					.withTimeout(2000);
+				await element(by.id('sidebar-settings')).tap();
+				await waitFor(element(by.id('settings-view')))
+					.toBeVisible()
+					.withTimeout(2000);
+
+				await expect(element(by.id('settings-view-legal'))).toExist();
+				await element(by.id('settings-view-legal')).tap();
+				await waitFor(element(by.id('legal-view')))
+					.toBeVisible()
+					.withTimeout(4000);
+			});
+
+			it('should have terms of service button', async () => {
+				await expect(element(by.id('legal-terms-button'))).toBeVisible();
+			});
+
+			it('should have privacy policy button', async () => {
+				await expect(element(by.id('legal-privacy-button'))).toBeVisible();
+			});
+		});
 	});
 });