diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 00:25:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-07 00:25:40 +0100 |
commit | 51098035ed2f42d949d6ec3f8ecdd5e68e73874d (patch) | |
tree | 89f2b5572623757b8b9a628148d7ec990fefa477 | |
parent | f6492a7c4d7cd08364ba507911f6b3c3df1c7e70 (diff) |
Fix “Sign up” button with closed registrations not opening modal on mobile (#22060)
Fixes #20840
-rw-r--r-- | app/javascript/mastodon/features/ui/components/header.js | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js index bbb0ca1c6..1384bebda 100644 --- a/app/javascript/mastodon/features/ui/components/header.js +++ b/app/javascript/mastodon/features/ui/components/header.js @@ -6,6 +6,7 @@ import { registrationsOpen, me } from 'mastodon/initial_state'; import Avatar from 'mastodon/components/avatar'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; +import { openModal } from 'mastodon/actions/modal'; const Account = connect(state => ({ account: state.getIn(['accounts', me]), @@ -15,7 +16,14 @@ const Account = connect(state => ({ </Link> )); -export default @withRouter +const mapDispatchToProps = (dispatch) => ({ + openClosedRegistrationsModal() { + dispatch(openModal('CLOSED_REGISTRATIONS')); + }, +}); + +export default @connect(null, mapDispatchToProps) +@withRouter class Header extends React.PureComponent { static contextTypes = { @@ -23,12 +31,13 @@ class Header extends React.PureComponent { }; static propTypes = { + openClosedRegistrationsModal: PropTypes.func, location: PropTypes.object, }; render () { const { signedIn } = this.context.identity; - const { location } = this.props; + const { location, openClosedRegistrationsModal } = this.props; let content; @@ -40,10 +49,26 @@ class Header extends React.PureComponent { </> ); } else { + let signupButton; + + if (registrationsOpen) { + signupButton = ( + <a href='/auth/sign_up' className='button button-tertiary'> + <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' /> + </a> + ); + } else { + signupButton = ( + <button className='button button-tertiary' onClick={openClosedRegistrationsModal}> + <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' /> + </button> + ); + } + content = ( <> <a href='/auth/sign_in' className='button'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a> - <a href={registrationsOpen ? '/auth/sign_up' : 'https://joinmastodon.org/servers'} className='button button-tertiary'><FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' /></a> + {signupButton} </> ); } |