From 3d433478a619075afee3bb5a58fdec5dc24b29ac Mon Sep 17 00:00:00 2001
From: Reinaldo Neto <reinaldonetof@hotmail.com>
Date: Mon, 28 Aug 2023 19:39:15 -0300
Subject: [PATCH] refactor useAppSelector and change the variable names

---
 .../CreateChannelView/RoomSettings/index.tsx  |  6 ++--
 app/views/CreateChannelView/index.tsx         | 34 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/CreateChannelView/RoomSettings/index.tsx b/app/views/CreateChannelView/RoomSettings/index.tsx
index 3e933dfff..74fffbe9a 100644
--- a/app/views/CreateChannelView/RoomSettings/index.tsx
+++ b/app/views/CreateChannelView/RoomSettings/index.tsx
@@ -14,17 +14,17 @@ export const RoomSettings = ({
 	setValue,
 	createChannelPermission,
 	createPrivateChannelPermission,
-	defaultEncryptionOn
+	e2eEnabledDefaultPrivateRooms
 }: {
 	isTeam: boolean;
 	setValue: UseFormSetValue<IFormData>;
 	createChannelPermission: boolean;
 	createPrivateChannelPermission: boolean;
-	defaultEncryptionOn: boolean;
+	e2eEnabledDefaultPrivateRooms: boolean;
 }) => {
 	const [type, setType] = useState(true);
 	const [readOnly, setReadOnly] = useState(false);
-	const [encrypted, setEncrypted] = useState(defaultEncryptionOn);
+	const [encrypted, setEncrypted] = useState(e2eEnabledDefaultPrivateRooms);
 	const [broadcast, setBroadcast] = useState(false);
 
 	const { encryptionEnabled } = useAppSelector(state => ({
diff --git a/app/views/CreateChannelView/index.tsx b/app/views/CreateChannelView/index.tsx
index b663c9d9a..44b841b91 100644
--- a/app/views/CreateChannelView/index.tsx
+++ b/app/views/CreateChannelView/index.tsx
@@ -68,12 +68,15 @@ export interface IFormData {
 const CreateChannelView = () => {
 	const [createChannelPermission, createPrivateChannelPermission] = usePermissions(['create-c', 'create-p']);
 
-	const { defaultEncryptionOn } = useAppSelector(state => {
-		const defaultEncryptionOn = state.encryption.enabled && (state.settings.E2E_Enabled_Default_PrivateRooms as boolean);
-		return {
-			defaultEncryptionOn
-		};
-	});
+	const { isFetching, useRealName, users, e2eEnabledDefaultPrivateRooms } = useAppSelector(
+		state => ({
+			isFetching: state.createChannel.isFetching,
+			users: state.selectedUsers.users,
+			useRealName: state.settings.UI_Use_Real_Name as boolean,
+			e2eEnabledDefaultPrivateRooms: state.encryption.enabled && (state.settings.E2E_Enabled_Default_PrivateRooms as boolean)
+		}),
+		shallowEqual
+	);
 
 	const {
 		control,
@@ -81,7 +84,13 @@ const CreateChannelView = () => {
 		formState: { isDirty },
 		setValue
 	} = useForm<IFormData>({
-		defaultValues: { channelName: '', broadcast: false, encrypted: defaultEncryptionOn, readOnly: false, type: createPrivateChannelPermission }
+		defaultValues: {
+			channelName: '',
+			broadcast: false,
+			encrypted: e2eEnabledDefaultPrivateRooms,
+			readOnly: false,
+			type: createPrivateChannelPermission
+		}
 	});
 
 	const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'CreateChannelView'>>();
@@ -91,15 +100,6 @@ const CreateChannelView = () => {
 	const { colors } = useTheme();
 	const dispatch = useDispatch();
 
-	const { isFetching, useRealName, users } = useAppSelector(
-		state => ({
-			isFetching: state.createChannel.isFetching,
-			users: state.selectedUsers.users,
-			useRealName: state.settings.UI_Use_Real_Name as boolean
-		}),
-		shallowEqual
-	);
-
 	useEffect(() => {
 		sendLoadingEvent({ visible: isFetching });
 	}, [isFetching]);
@@ -161,7 +161,7 @@ const CreateChannelView = () => {
 							createPrivateChannelPermission={createPrivateChannelPermission}
 							isTeam={isTeam}
 							setValue={setValue}
-							defaultEncryptionOn={defaultEncryptionOn}
+							e2eEnabledDefaultPrivateRooms={e2eEnabledDefaultPrivateRooms}
 						/>
 					</View>
 					{users.length > 0 ? (