Fix “Sign up” button with closed registrations not opening modal on mobile (#22060)
Fixes #20840
This commit is contained in:
		
							parent
							
								
									f6492a7c4d
								
							
						
					
					
						commit
						51098035ed
					
				
					 1 changed files with 28 additions and 3 deletions
				
			
		|  | @ -6,6 +6,7 @@ import { registrationsOpen, me } from 'mastodon/initial_state'; | ||||||
| import Avatar from 'mastodon/components/avatar'; | import Avatar from 'mastodon/components/avatar'; | ||||||
| import PropTypes from 'prop-types'; | import PropTypes from 'prop-types'; | ||||||
| import { connect } from 'react-redux'; | import { connect } from 'react-redux'; | ||||||
|  | import { openModal } from 'mastodon/actions/modal'; | ||||||
| 
 | 
 | ||||||
| const Account = connect(state => ({ | const Account = connect(state => ({ | ||||||
|   account: state.getIn(['accounts', me]), |   account: state.getIn(['accounts', me]), | ||||||
|  | @ -15,7 +16,14 @@ const Account = connect(state => ({ | ||||||
|   </Link> |   </Link> | ||||||
| )); | )); | ||||||
| 
 | 
 | ||||||
| export default @withRouter | const mapDispatchToProps = (dispatch) => ({ | ||||||
|  |   openClosedRegistrationsModal() { | ||||||
|  |     dispatch(openModal('CLOSED_REGISTRATIONS')); | ||||||
|  |   }, | ||||||
|  | }); | ||||||
|  | 
 | ||||||
|  | export default @connect(null, mapDispatchToProps) | ||||||
|  | @withRouter | ||||||
| class Header extends React.PureComponent { | class Header extends React.PureComponent { | ||||||
| 
 | 
 | ||||||
|   static contextTypes = { |   static contextTypes = { | ||||||
|  | @ -23,12 +31,13 @@ class Header extends React.PureComponent { | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   static propTypes = { |   static propTypes = { | ||||||
|  |     openClosedRegistrationsModal: PropTypes.func, | ||||||
|     location: PropTypes.object, |     location: PropTypes.object, | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   render () { |   render () { | ||||||
|     const { signedIn } = this.context.identity; |     const { signedIn } = this.context.identity; | ||||||
|     const { location } = this.props; |     const { location, openClosedRegistrationsModal } = this.props; | ||||||
| 
 | 
 | ||||||
|     let content; |     let content; | ||||||
| 
 | 
 | ||||||
|  | @ -40,10 +49,26 @@ class Header extends React.PureComponent { | ||||||
|         </> |         </> | ||||||
|       ); |       ); | ||||||
|     } else { |     } 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 = ( |       content = ( | ||||||
|         <> |         <> | ||||||
|           <a href='/auth/sign_in' className='button'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a> |           <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} | ||||||
|         </> |         </> | ||||||
|       ); |       ); | ||||||
|     } |     } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue