Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/pages/settings/Profile/CustomStatus/StatusSetPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {View} from 'react-native';
import PropTypes from 'prop-types';
import lodashGet from 'lodash/get';
import {withOnyx} from 'react-native-onyx';
import Form from '../../../../components/Form';
import HeaderWithBackButton from '../../../../components/HeaderWithBackButton';
import ROUTES from '../../../../ROUTES';
import ScreenWrapper from '../../../../components/ScreenWrapper';
Expand All @@ -17,6 +16,8 @@ import ONYXKEYS from '../../../../ONYXKEYS';
import * as User from '../../../../libs/actions/User';
import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes} from '../../../../components/withCurrentUserPersonalDetails';
import TextInput from '../../../../components/TextInput';
import FormProvider from '../../../../components/Form/FormProvider';
import InputWrapper from '../../../../components/Form/InputWrapper';

const propTypes = {
/** The draft status of the user */
Expand Down Expand Up @@ -52,7 +53,7 @@ function StatusSetPage({draftStatus, currentUserPersonalDetails}) {
title={translate('statusPage.status')}
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_STATUS)}
/>
<Form
<FormProvider
formID={ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM}
style={[styles.flexGrow1, styles.ph5]}
submitButtonText={translate('statusPage.save')}
Expand All @@ -62,13 +63,15 @@ function StatusSetPage({draftStatus, currentUserPersonalDetails}) {
<View>
<View style={[styles.mb4]}>
<View style={[styles.mt1]}>
<EmojiPickerButtonDropdown
<InputWrapper
InputComponent={EmojiPickerButtonDropdown}
inputID={INPUT_IDS.EMOJI_CODE}
accessibilityLabel={INPUT_IDS.EMOJI_CODE}
defaultValue={defaultEmoji}
/>
</View>
<TextInput
<InputWrapper
InputComponent={TextInput}
inputID={INPUT_IDS.STATUS_TEXT}
label={translate('statusPage.message')}
accessibilityLabel={INPUT_IDS.STATUS_TEXT}
Expand All @@ -80,7 +83,7 @@ function StatusSetPage({draftStatus, currentUserPersonalDetails}) {
/>
</View>
</View>
</Form>
</FormProvider>
</ScreenWrapper>
);
}
Expand Down