verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

refactor useAppSelector and change the variable names

This commit is contained in:
Reinaldo Neto 2023-08-28 19:39:15 -03:00
parent 5df1c1c1be
commit 3d433478a6
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/CreateChannelView/RoomSettings/index.tsx
View File

@ -14,17 +14,17 @@ export const RoomSettings = ({
setValue, setValue,
createChannelPermission, createChannelPermission,
createPrivateChannelPermission, createPrivateChannelPermission,
defaultEncryptionOn e2eEnabledDefaultPrivateRooms
}: { }: {
isTeam: boolean; isTeam: boolean;
setValue: UseFormSetValue<IFormData>; setValue: UseFormSetValue<IFormData>;
createChannelPermission: boolean; createChannelPermission: boolean;
createPrivateChannelPermission: boolean; createPrivateChannelPermission: boolean;
defaultEncryptionOn: boolean; e2eEnabledDefaultPrivateRooms: boolean;
}) => { }) => {
const [type, setType] = useState(true); const [type, setType] = useState(true);
const [readOnly, setReadOnly] = useState(false); const [readOnly, setReadOnly] = useState(false);
const [encrypted, setEncrypted] = useState(defaultEncryptionOn); const [encrypted, setEncrypted] = useState(e2eEnabledDefaultPrivateRooms);
const [broadcast, setBroadcast] = useState(false); const [broadcast, setBroadcast] = useState(false);
const { encryptionEnabled } = useAppSelector(state => ({ const { encryptionEnabled } = useAppSelector(state => ({

34
app/views/CreateChannelView/index.tsx
View File

@ -68,12 +68,15 @@ export interface IFormData {
const CreateChannelView = () => { const CreateChannelView = () => {
const [createChannelPermission, createPrivateChannelPermission] = usePermissions(['create-c', 'create-p']); const [createChannelPermission, createPrivateChannelPermission] = usePermissions(['create-c', 'create-p']);
const { defaultEncryptionOn } = useAppSelector(state => { const { isFetching, useRealName, users, e2eEnabledDefaultPrivateRooms } = useAppSelector(
const defaultEncryptionOn = state.encryption.enabled && (state.settings.E2E_Enabled_Default_PrivateRooms as boolean); state => ({
return { isFetching: state.createChannel.isFetching,
defaultEncryptionOn 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 { const {
control, control,
@ -81,7 +84,13 @@ const CreateChannelView = () => {
formState: { isDirty }, formState: { isDirty },
setValue setValue
} = useForm<IFormData>({ } = 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'>>(); const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'CreateChannelView'>>();
@ -91,15 +100,6 @@ const CreateChannelView = () => {
const { colors } = useTheme(); const { colors } = useTheme();
const dispatch = useDispatch(); 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(() => { useEffect(() => {
sendLoadingEvent({ visible: isFetching }); sendLoadingEvent({ visible: isFetching });
}, [isFetching]); }, [isFetching]);
@ -161,7 +161,7 @@ const CreateChannelView = () => {
createPrivateChannelPermission={createPrivateChannelPermission} createPrivateChannelPermission={createPrivateChannelPermission}
isTeam={isTeam} isTeam={isTeam}
setValue={setValue} setValue={setValue}
defaultEncryptionOn={defaultEncryptionOn} e2eEnabledDefaultPrivateRooms={e2eEnabledDefaultPrivateRooms}
/> />
</View> </View>
{users.length > 0 ? ( {users.length > 0 ? (