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

fix: properly read default form values in RoomSettings

This commit is contained in:
Aviad Pineles 2023-08-19 15:50:23 +03:00
parent 303766ed11
commit 51db92bfe1
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,8 @@ export const RoomSettings = ({
isTeam,
setValue,
createChannelPermission,
createPrivateChannelPermission
createPrivateChannelPermission,
defaultEncryptionOn
}: {
isTeam: boolean;
setValue: UseFormSetValue<IFormData>;
@ -22,18 +23,13 @@ export const RoomSettings = ({
}) => {
const [type, setType] = useState(true);
const [readOnly, setReadOnly] = useState(false);
const { encryptionEnabled, defaultEncryptionOn } = useAppSelector(state => {
const defaultEncryptionOn = state.settings.E2E_Enabled_Default_PrivateRooms;
return {
encryptionEnabled: state.encryption.enabled,
defaultEncryptionOn
};
});
const [encrypted, setEncrypted] = useState(defaultEncryptionOn);
const [broadcast, setBroadcast] = useState(false);
const { encryptionEnabled } = useAppSelector(state => ({
encryptionEnabled: state.encryption.enabled
}));
const onValueChangeType = useCallback(
(value: boolean) => {
logEvent(events.CR_TOGGLE_TYPE);

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

@ -68,13 +68,20 @@ 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;
return {
defaultEncryptionOn
};
});
const {
control,
handleSubmit,
formState: { isDirty },
setValue
} = useForm<IFormData>({
defaultValues: { channelName: '', broadcast: false, encrypted: false, readOnly: false, type: createPrivateChannelPermission }
defaultValues: { channelName: '', broadcast: false, encrypted: defaultEncryptionOn, readOnly: false, type: createPrivateChannelPermission }
});
const navigation = useNavigation<StackNavigationProp<ChatsStackParamList, 'CreateChannelView'>>();
@ -154,6 +161,7 @@ const CreateChannelView = () => {
createPrivateChannelPermission={createPrivateChannelPermission}
isTeam={isTeam}
setValue={setValue}
defaultEncryptionOn={defaultEncryptionOn}
/>
</View>
{users.length > 0 ? (