diff --git a/src/components/Composer/index.android.js b/src/components/Composer/index.android.js index ed23d98020f2..687ac17ff91b 100644 --- a/src/components/Composer/index.android.js +++ b/src/components/Composer/index.android.js @@ -64,6 +64,7 @@ class Composer extends React.Component { render() { return ( this.textInput = el} maxHeight={CONST.COMPOSER_MAX_HEIGHT} diff --git a/src/components/Composer/index.ios.js b/src/components/Composer/index.ios.js index 73784ace874e..d61339f18f3f 100644 --- a/src/components/Composer/index.ios.js +++ b/src/components/Composer/index.ios.js @@ -76,6 +76,7 @@ class Composer extends React.Component { const propsToPass = _.omit(this.props, 'selection'); return ( this.textInput = el} maxHeight={CONST.COMPOSER_MAX_HEIGHT} diff --git a/src/components/Composer/index.js b/src/components/Composer/index.js index caec71317e84..740d28757a6f 100755 --- a/src/components/Composer/index.js +++ b/src/components/Composer/index.js @@ -348,6 +348,7 @@ class Composer extends React.Component { const propsWithoutStyles = _.omit(this.props, 'style'); return ( this.textInput = el} selection={this.state.selection} diff --git a/src/components/SignInPageForm/BaseForm.js b/src/components/FormElement.js similarity index 63% rename from src/components/SignInPageForm/BaseForm.js rename to src/components/FormElement.js index 21a4e19b1f9b..f46b24708c4c 100644 --- a/src/components/SignInPageForm/BaseForm.js +++ b/src/components/FormElement.js @@ -1,8 +1,8 @@ import React, {forwardRef} from 'react'; import {View} from 'react-native'; -import * as ComponentUtils from '../../libs/ComponentUtils'; +import * as ComponentUtils from '../libs/ComponentUtils'; -const BaseForm = forwardRef((props, ref) => ( +const FormElement = forwardRef((props, ref) => ( ( /> )); -BaseForm.displayName = 'BaseForm'; -export default BaseForm; +FormElement.displayName = 'BaseForm'; +export default FormElement; diff --git a/src/components/SignInPageForm/index.js b/src/components/SignInPageForm/index.js index 163f1ee223b1..4ee95d1cb81e 100644 --- a/src/components/SignInPageForm/index.js +++ b/src/components/SignInPageForm/index.js @@ -1,5 +1,5 @@ import React from 'react'; -import BaseForm from './BaseForm'; +import FormElement from '../FormElement'; class Form extends React.Component { componentDidMount() { @@ -16,7 +16,7 @@ class Form extends React.Component { render() { return ( - this.form = el} // eslint-disable-next-line react/jsx-props-no-spreading {...this.props} diff --git a/src/components/SignInPageForm/index.native.js b/src/components/SignInPageForm/index.native.js index 21f10e7a428d..d09e60c1b98d 100644 --- a/src/components/SignInPageForm/index.native.js +++ b/src/components/SignInPageForm/index.native.js @@ -1,8 +1,8 @@ import React from 'react'; -import BaseForm from './BaseForm'; +import FormElement from '../FormElement'; // eslint-disable-next-line react/jsx-props-no-spreading -const Form = props => ; +const Form = props => ; Form.displayName = 'Form'; export default Form; diff --git a/src/pages/RequestCallPage.js b/src/pages/RequestCallPage.js index 84504769a867..582c056b87b9 100644 --- a/src/pages/RequestCallPage.js +++ b/src/pages/RequestCallPage.js @@ -31,6 +31,7 @@ import * as LoginUtils from '../libs/LoginUtils'; import * as ValidationUtils from '../libs/ValidationUtils'; import * as PersonalDetails from '../libs/actions/PersonalDetails'; import * as User from '../libs/actions/User'; +import FormElement from '../components/FormElement'; const propTypes = { ...withLocalizePropTypes, @@ -262,45 +263,47 @@ class RequestCallPage extends Component { onCloseButtonPress={() => Navigation.dismissModal(true)} /> -
- - {this.props.translate('requestCallPage.description')} - - this.setState({firstName})} - onChangeLastName={lastName => this.setState({lastName})} - style={[styles.mv4]} - /> - this.setState({phoneNumber})} - /> - this.setState({phoneExtension})} - containerStyles={[styles.mt4]} - /> - {this.getWaitTimeMessage()} -
+ +
+ + {this.props.translate('requestCallPage.description')} + + this.setState({firstName})} + onChangeLastName={lastName => this.setState({lastName})} + style={[styles.mv4]} + /> + this.setState({phoneNumber})} + /> + this.setState({phoneExtension})} + containerStyles={[styles.mt4]} + /> + {this.getWaitTimeMessage()} +
+
{isBlockedFromConcierge && (