From 4d73900c779930f98f8bf032dd8ff27404e67fd7 Mon Sep 17 00:00:00 2001 From: tomlum Date: Thu, 13 Jul 2023 10:11:55 -0400 Subject: [PATCH 1/2] far lint fixes --- src/redux/session.js | 4 ++-- .../bad-username-splash.jsx | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/redux/session.js b/src/redux/session.js index 2986d19cc..48c85acb3 100644 --- a/src/redux/session.js +++ b/src/redux/session.js @@ -86,7 +86,7 @@ const handleSessionResponse = (dispatch, body) => { body.user.banned && banGoodListPaths.every(goodPath => window.location.pathname.indexOf(goodPath) === -1) ) { - if(body.user.banned_status === 'far_banned'){ + if (body.user.banned_status === 'far_banned'){ window.location = '/accounts/bad-username/'; } else { window.location = '/accounts/banned-response/'; @@ -158,7 +158,7 @@ module.exports.selectIsLoggedIn = state => !!get(state, ['session', 'session', ' module.exports.selectUsername = state => get(state, ['session', 'session', 'user', 'username'], null); module.exports.selectToken = state => get(state, ['session', 'session', 'user', 'token'], null); module.exports.selectIsAdmin = state => get(state, ['session', 'session', 'permissions', 'admin'], false); -module.exports.selectBannedUser = state => get(state, ['session', 'session', 'user'], false); +module.exports.selectUser = state => get(state, ['session', 'session', 'user'], false); module.exports.selectIsSocial = state => get(state, ['session', 'session', 'permissions', 'social'], false); module.exports.selectIsEducator = state => get(state, ['session', 'session', 'permissions', 'educator'], false); module.exports.selectProjectCommentsGloballyEnabled = state => diff --git a/src/views/bad-username-splash/bad-username-splash.jsx b/src/views/bad-username-splash/bad-username-splash.jsx index 98c568e2b..f490d56c4 100644 --- a/src/views/bad-username-splash/bad-username-splash.jsx +++ b/src/views/bad-username-splash/bad-username-splash.jsx @@ -2,7 +2,7 @@ const injectIntl = require('react-intl').injectIntl; const React = require('react'); const FormattedMessage = require('react-intl').FormattedMessage; import {connect} from 'react-redux'; -import {selectBannedUser, selectHasFetchedSession} from '../../redux/session'; +import {selectUser, selectHasFetchedSession} from '../../redux/session'; const messageActions = require('../../redux/messages.js'); const JoinFlowStep = require('../../components/join-flow/join-flow-step.jsx'); const FormikInput = require('../../components/formik-forms/formik-input.jsx'); @@ -105,7 +105,12 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {

)}} + values={{ + communityGuidelinesLink: ( + + + ) + }} />

) } @@ -138,7 +143,13 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => { )}} + values={{ + communityGuidelinesLink: ( + + + + ) + }} />} innerClassName="change-username-inner" outerClassName="change-username-outer" @@ -253,7 +264,7 @@ BannedSplash.propTypes = { const ConnectedBannedSplash = connect( state => ({ - user: selectBannedUser(state), + user: selectUser(state), hasSession: selectHasFetchedSession(state), adminMessages: state.messages.messages && state.messages.messages.admin && From d21ebc5c5697e141aef3a0bf4ea21b66885bd25a Mon Sep 17 00:00:00 2001 From: tomlum Date: Thu, 13 Jul 2023 10:34:42 -0400 Subject: [PATCH 2/2] indent fix --- src/views/bad-username-splash/bad-username-splash.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/bad-username-splash/bad-username-splash.jsx b/src/views/bad-username-splash/bad-username-splash.jsx index f490d56c4..37c89b9a2 100644 --- a/src/views/bad-username-splash/bad-username-splash.jsx +++ b/src/views/bad-username-splash/bad-username-splash.jsx @@ -107,9 +107,10 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => { id="renameAccount.rememberToFollow" values={{ communityGuidelinesLink: ( - - - ) + + + + ) }} />

)