diff --git a/native/community-creation/community-configuration.react.js b/native/community-creation/community-configuration.react.js index eb795ab83..e9740ac46 100644 --- a/native/community-creation/community-configuration.react.js +++ b/native/community-creation/community-configuration.react.js @@ -1,210 +1,214 @@ // @flow import * as React from 'react'; import { Text, View } from 'react-native'; import { newThread, newThreadActionTypes } from 'lib/actions/thread-actions.js'; import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js'; import type { LoadingStatus } from 'lib/types/loading-types.js'; import { threadTypes } from 'lib/types/thread-types-enum.js'; import type { NewThreadResult } from 'lib/types/thread-types.js'; import { useDispatchActionPromise, useServerCall, } from 'lib/utils/action-utils.js'; import CommunityCreationKeyserverLabel from './community-creation-keyserver-label.react.js'; import type { CommunityCreationNavigationProp } from './community-creation-navigator.react.js'; import RegistrationButtonContainer from '../account/registration/registration-button-container.react.js'; import RegistrationButton from '../account/registration/registration-button.react.js'; import RegistrationContainer from '../account/registration/registration-container.react.js'; import RegistrationContentContainer from '../account/registration/registration-content-container.react.js'; import { ThreadSettingsCategoryFooter, ThreadSettingsCategoryHeader, } from '../chat/settings/thread-settings-category.react.js'; import EnumSettingsOption from '../components/enum-settings-option.react.js'; import TextInput from '../components/text-input.react.js'; import { useCalendarQuery } from '../navigation/nav-selectors.js'; import { CommunityCreationMembersRouteName, type NavigationRoute, } from '../navigation/route-names.js'; import { useSelector } from '../redux/redux-utils.js'; import { useColors, useStyles } from '../themes/colors.js'; type Props = { +navigation: CommunityCreationNavigationProp<'CommunityConfiguration'>, +route: NavigationRoute<'CommunityConfiguration'>, }; const createNewCommunityLoadingStatusSelector = createLoadingStatusSelector(newThreadActionTypes); // eslint-disable-next-line no-unused-vars function CommunityConfiguration(props: Props): React.Node { const styles = useStyles(unboundStyles); const colors = useColors(); const { navigate } = props.navigation; const dispatchActionPromise = useDispatchActionPromise(); const callNewThread = useServerCall(newThread); const calendarQueryFunc = useCalendarQuery(); const createNewCommunityLoadingStatus: LoadingStatus = useSelector( createNewCommunityLoadingStatusSelector, ); const [pendingCommunityName, setPendingCommunityName] = React.useState(''); const [announcementSetting, setAnnouncementSetting] = React.useState(false); const [errorMessage, setErrorMessage] = React.useState(); const onChangePendingCommunityName = React.useCallback(newValue => { setErrorMessage(); setPendingCommunityName(newValue); }, []); const callCreateNewCommunity = React.useCallback(async () => { const calendarQuery = calendarQueryFunc(); try { const newThreadResult: NewThreadResult = await callNewThread({ name: pendingCommunityName, type: announcementSetting ? threadTypes.COMMUNITY_ANNOUNCEMENT_ROOT : threadTypes.COMMUNITY_ROOT, calendarQuery, }); return newThreadResult; } catch (e) { setErrorMessage('Community creation failed. Please try again.'); throw e; } }, [ announcementSetting, calendarQueryFunc, callNewThread, pendingCommunityName, ]); const createNewCommunity = React.useCallback(async () => { setErrorMessage(); const newThreadResultPromise = callCreateNewCommunity(); dispatchActionPromise(newThreadActionTypes, newThreadResultPromise); const newThreadResult = await newThreadResultPromise; navigate<'CommunityCreationMembers'>({ name: CommunityCreationMembersRouteName, params: { announcement: announcementSetting, threadID: newThreadResult.newThreadID, }, }); }, [ announcementSetting, callCreateNewCommunity, dispatchActionPromise, navigate, ]); const onCheckBoxPress = React.useCallback(() => { setErrorMessage(); setAnnouncementSetting(!announcementSetting); }, [announcementSetting]); + const enumSettingsOptionDescription = + 'Make it so only admins can post to ' + + 'the root channel of the community.'; + return ( Name You may edit your community’s image and name later. {errorMessage} ); } const unboundStyles = { containerPaddingOverride: { padding: 0, }, communityNameRow: { backgroundColor: 'panelForeground', flexDirection: 'row', paddingHorizontal: 24, paddingVertical: 8, }, communityNameLabel: { color: 'panelForegroundTertiaryLabel', fontSize: 16, width: 96, }, communityNamePendingValue: { color: 'panelForegroundSecondaryLabel', flex: 1, fontFamily: 'Arial', fontSize: 16, margin: 0, paddingLeft: 4, paddingRight: 0, paddingVertical: 0, borderBottomColor: 'transparent', }, communityNameNoticeContainer: { display: 'flex', flexDirection: 'row', justifyContent: 'center', }, communityNameNoticeText: { color: 'panelForegroundTertiaryLabel', }, errorMessageContainer: { alignItems: 'center', }, errorMessageText: { color: 'redText', }, }; export default CommunityConfiguration; diff --git a/native/components/enum-settings-option.react.js b/native/components/enum-settings-option.react.js index a5e45768d..2eac60c2a 100644 --- a/native/components/enum-settings-option.react.js +++ b/native/components/enum-settings-option.react.js @@ -1,110 +1,110 @@ // @flow import * as React from 'react'; import { Text, TouchableOpacity, View } from 'react-native'; import CommIcon from '../components/comm-icon.react.js'; import { useColors, useStyles } from '../themes/colors.js'; type EnumSettingsOptionProps = { +icon?: string, +name: string, +description: string, +enumValue: boolean, +onEnumValuePress: () => mixed, }; function EnumSettingsOption(props: EnumSettingsOptionProps): React.Node { const styles = useStyles(unboundStyles); const colors = useColors(); const { icon, name, description, enumValue, onEnumValuePress } = props; const enumIcon = React.useMemo(() => { - if (icon) { + if (!icon) { return null; } return ( ); }, [icon, styles.enumIcon, colors.purpleButton]); const checkBoxFill = enumValue ? ( ) : null; const infoContainerStyle = React.useMemo( () => props.icon ? styles.enumInfoContainer : { ...styles.enumInfoContainer, marginLeft: 10 }, [props.icon, styles.enumInfoContainer], ); return ( {enumIcon} {name} {description} {checkBoxFill} ); } const unboundStyles = { enumCell: { flexDirection: 'row', height: 96, backgroundColor: 'panelForeground', }, enumIcon: { padding: 16, }, enumInfoContainer: { flex: 1, flexDirection: 'column', justifyContent: 'space-evenly', padding: 8, }, enumInfoName: { color: 'panelForegroundLabel', fontSize: 18, lineHeight: 24, }, enumInfoDescription: { color: 'panelForegroundSecondaryLabel', lineHeight: 18, }, enumCheckBoxContainer: { padding: 22, justifyContent: 'center', alignItems: 'center', }, enumCheckBox: { height: 32, width: 32, borderRadius: 3.5, borderWidth: 1, borderColor: 'panelSecondaryForegroundBorder', justifyContent: 'center', alignItems: 'center', }, enumCheckBoxFill: { height: 20, width: 20, borderRadius: 2.1875, backgroundColor: 'panelForegroundSecondaryLabel', }, }; export default EnumSettingsOption;