diff --git a/app/soapbox/actions/me.js b/app/soapbox/actions/me.js index 02b4cd664..4f8e7d1f2 100644 --- a/app/soapbox/actions/me.js +++ b/app/soapbox/actions/me.js @@ -62,6 +62,7 @@ export function fetchMeFail(error) { return { type: ME_FETCH_FAIL, error, + skipAlert: true, }; }; diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index c4b48b5d2..c51d14af7 100644 --- a/app/soapbox/features/forms/index.js +++ b/app/soapbox/features/forms/index.js @@ -8,6 +8,7 @@ const FormPropTypes = { label: PropTypes.oneOfType([ PropTypes.string, PropTypes.object, + PropTypes.node, ]), }; @@ -38,7 +39,7 @@ InputContainer.propTypes = { export const LabelInputContainer = ({ label, children, ...props }) => { const id = uuidv4(); const childrenWithProps = React.Children.map(children, child => ( - React.cloneElement(child, { id: id }) + React.cloneElement(child, { id: id, key: id }) )); return ( diff --git a/app/soapbox/features/landing_page/components/registration_form.js b/app/soapbox/features/landing_page/components/registration_form.js index c145ca9a8..23d0f1f8e 100644 --- a/app/soapbox/features/landing_page/components/registration_form.js +++ b/app/soapbox/features/landing_page/components/registration_form.js @@ -38,7 +38,7 @@ class RegistrationForm extends ImmutablePureComponent { static propTypes = { instance: ImmutablePropTypes.map, locale: PropTypes.string, - intl: PropTypes.func.isRequired, + intl: PropTypes.object.isRequired, } state = { @@ -141,7 +141,7 @@ class RegistrationForm extends ImmutablePureComponent { />
{intl.formatMessage(messages.tos)} })} + label={intl.formatMessage(messages.agreement, { tos: {intl.formatMessage(messages.tos)} })} name='agreement' onChange={this.onCheckboxChange} required