scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-26 17:16:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make join flow modal stay showing even when session is refreshed

Browse source
This commit is contained in:
Ben Wheeler 2019-08-23 17:19:12 -04:00
parent 3ac1ef34ae
commit 98bb0cbb11
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/components/navigation/www/navigation.jsx
View file

@ -198,17 +198,6 @@ class Navigation extends React.Component {
<FormattedMessage id="general.joinScratch" /> <FormattedMessage id="general.joinScratch" />
</a> </a>
</li>, </li>,
(
USE_SCRATCH3_REGISTRATION ? (
<Scratch3Registration
key="scratch3registration"
/>
) : (
<Registration
key="registration"
/>
)
),
<li <li
className="link right login-item" className="link right login-item"
key="login" key="login"
@ -225,7 +214,19 @@ class Navigation extends React.Component {
key="login-dropdown" key="login-dropdown"
/> />
</li> </li>
]) : []} ]) : []
}
{this.props.registrationOpen && (
USE_SCRATCH3_REGISTRATION ? (
<Scratch3Registration
key="scratch3registration"
/>
) : (
<Registration
key="registration"
/>
)
)}
</ul> </ul>
<CanceledDeletionModal /> <CanceledDeletionModal />
</NavigationBox> </NavigationBox>
@ -250,6 +251,7 @@ Navigation.propTypes = {
educator_invitee: PropTypes.bool, educator_invitee: PropTypes.bool,
student: PropTypes.bool student: PropTypes.bool
}), }),
registrationOpen: PropTypes.bool,
searchTerm: PropTypes.string, searchTerm: PropTypes.string,
session: PropTypes.shape({ session: PropTypes.shape({
status: PropTypes.string status: PropTypes.string
@ -273,6 +275,7 @@ const mapStateToProps = state => ({
accountNavOpen: state.navigation && state.navigation.accountNavOpen, accountNavOpen: state.navigation && state.navigation.accountNavOpen,
session: state.session, session: state.session,
permissions: state.permissions, permissions: state.permissions,
registrationOpen: state.navigation.registrationOpen,
searchTerm: state.navigation.searchTerm, searchTerm: state.navigation.searchTerm,
unreadMessageCount: state.messageCount.messageCount, unreadMessageCount: state.messageCount.messageCount,
user: state.session && state.session.session && state.session.session.user user: state.session && state.session.session && state.session.session.user