From 7813ed3b2856bd14b01159da22ba98681790c3f1 Mon Sep 17 00:00:00 2001
From: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
Date: Fri, 21 Aug 2020 15:14:06 -0300
Subject: [PATCH] [FIX] User Preferences (#2418)

* [FIX] User Preferences

* PreferencesView -> UserPreferencesView

Co-authored-by: Diego Mello <diegolmello@gmail.com>
---
 app/stacks/InsideStack.js                     | 34 +++++++++----------
 app/stacks/MasterDetailStack/index.js         |  8 ++---
 app/views/ProfileView/index.js                |  2 +-
 .../index.js                                  |  4 +--
 4 files changed, 24 insertions(+), 24 deletions(-)
 rename app/views/{PreferencesView => UserPreferencesView}/index.js (94%)

diff --git a/app/stacks/InsideStack.js b/app/stacks/InsideStack.js
index e9f2f1aeb..7e96293e6 100644
--- a/app/stacks/InsideStack.js
+++ b/app/stacks/InsideStack.js
@@ -34,6 +34,8 @@ import QueueListView from '../views/QueueListView';
 
 // Profile Stack
 import ProfileView from '../views/ProfileView';
+import UserPreferencesView from '../views/UserPreferencesView';
+import UserNotificationPrefView from '../views/UserNotificationPreferencesView';
 
 // Settings Stack
 import SettingsView from '../views/SettingsView';
@@ -41,8 +43,6 @@ import LanguageView from '../views/LanguageView';
 import ThemeView from '../views/ThemeView';
 import DefaultBrowserView from '../views/DefaultBrowserView';
 import ScreenLockConfigView from '../views/ScreenLockConfigView';
-import PreferencesView from '../views/PreferencesView';
-import UserNotificationPrefView from '../views/UserNotificationPreferencesView';
 
 // Admin Stack
 import AdminPanelView from '../views/AdminPanelView';
@@ -186,6 +186,21 @@ const ProfileStackNavigator = () => {
 				component={ProfileView}
 				options={ProfileView.navigationOptions}
 			/>
+			<ProfileStack.Screen
+				name='UserPreferencesView'
+				component={UserPreferencesView}
+				options={UserPreferencesView.navigationOptions}
+			/>
+			<ProfileStack.Screen
+				name='UserNotificationPrefView'
+				component={UserNotificationPrefView}
+				options={UserNotificationPrefView.navigationOptions}
+			/>
+			<ProfileStack.Screen
+				name='PickerView'
+				component={PickerView}
+				options={PickerView.navigationOptions}
+			/>
 		</ProfileStack.Navigator>
 	);
 };
@@ -222,21 +237,6 @@ const SettingsStackNavigator = () => {
 				component={ScreenLockConfigView}
 				options={ScreenLockConfigView.navigationOptions}
 			/>
-			<SettingsStack.Screen
-				name='PreferencesView'
-				component={PreferencesView}
-				options={PreferencesView.navigationOptions}
-			/>
-			<SettingsStack.Screen
-				name='UserNotificationPrefView'
-				component={UserNotificationPrefView}
-				options={UserNotificationPrefView.navigationOptions}
-			/>
-			<SettingsStack.Screen
-				name='PickerView'
-				component={PickerView}
-				options={PickerView.navigationOptions}
-			/>
 		</SettingsStack.Navigator>
 	);
 };
diff --git a/app/stacks/MasterDetailStack/index.js b/app/stacks/MasterDetailStack/index.js
index f3389b67b..424f57bc2 100644
--- a/app/stacks/MasterDetailStack/index.js
+++ b/app/stacks/MasterDetailStack/index.js
@@ -42,7 +42,7 @@ import AdminPanelView from '../../views/AdminPanelView';
 import NewMessageView from '../../views/NewMessageView';
 import CreateChannelView from '../../views/CreateChannelView';
 import QueueListView from '../../views/QueueListView';
-import PreferencesView from '../../views/PreferencesView';
+import UserPreferencesView from '../../views/UserPreferencesView';
 import UserNotificationPrefView from '../../views/UserNotificationPreferencesView';
 
 // InsideStackNavigator
@@ -256,9 +256,9 @@ const ModalStackNavigator = React.memo(({ navigation }) => {
 					component={CreateDiscussionView}
 				/>
 				<ModalStack.Screen
-					name='PreferencesView'
-					component={PreferencesView}
-					options={PreferencesView.navigationOptions}
+					name='UserPreferencesView'
+					component={UserPreferencesView}
+					options={UserPreferencesView.navigationOptions}
 				/>
 				<ModalStack.Screen
 					name='UserNotificationPrefView'
diff --git a/app/views/ProfileView/index.js b/app/views/ProfileView/index.js
index 5fcd421c3..19d718768 100644
--- a/app/views/ProfileView/index.js
+++ b/app/views/ProfileView/index.js
@@ -40,7 +40,7 @@ class ProfileView extends React.Component {
 			options.headerLeft = () => <DrawerButton navigation={navigation} />;
 		}
 		options.headerRight = () => (
-			<PreferencesButton onPress={() => navigation.navigate('PreferencesView')} testID='preferences-view-open' />
+			<PreferencesButton onPress={() => navigation.navigate('UserPreferencesView')} testID='preferences-view-open' />
 		);
 		return options;
 	}
diff --git a/app/views/PreferencesView/index.js b/app/views/UserPreferencesView/index.js
similarity index 94%
rename from app/views/PreferencesView/index.js
rename to app/views/UserPreferencesView/index.js
index 027cc9824..096736b7c 100644
--- a/app/views/PreferencesView/index.js
+++ b/app/views/UserPreferencesView/index.js
@@ -14,7 +14,7 @@ import ListItem from '../../containers/ListItem';
 import { DisclosureImage } from '../../containers/DisclosureIndicator';
 import { withTheme } from '../../theme';
 
-class PreferencesView extends React.Component {
+class UserPreferencesView extends React.Component {
 	static navigationOptions = () => ({
 		title: I18n.t('Preferences')
 	});
@@ -62,4 +62,4 @@ class PreferencesView extends React.Component {
 	}
 }
 
-export default withTheme(PreferencesView);
+export default withTheme(UserPreferencesView);