diff --git a/frontend/app/components/auth-panel/auth-panel.test.tsx b/frontend/app/components/auth-panel/auth-panel.test.tsx index cf5ca97e..c1e41a01 100644 --- a/frontend/app/components/auth-panel/auth-panel.test.tsx +++ b/frontend/app/components/auth-panel/auth-panel.test.tsx @@ -30,7 +30,7 @@ describe('', () => { const authForm = authPanelColumn.first(); - expect(authForm.text()).toEqual(expect.stringContaining('Sign in to comment using')); + expect(authForm.text()).toEqual(expect.stringContaining('Login:')); const providerLinks = authForm.find(Button); @@ -95,7 +95,7 @@ describe('', () => { const authForm = authPanelColumn.first(); - expect(authForm.text()).toEqual(expect.stringContaining('Sign in using Google or GitHub')); + expect(authForm.text()).toEqual(expect.stringContaining('Login: Google or GitHub')); const providerLinks = authForm.find(Button); @@ -142,7 +142,7 @@ describe('', () => { const userInfo = authPanelColumn.first(); - expect(userInfo.text()).toEqual(expect.stringContaining('You signed in as John')); + expect(userInfo.text()).toEqual(expect.stringContaining('You logged in as John')); }); }); describe('For admin user', () => { diff --git a/frontend/app/components/auth-panel/auth-panel.tsx b/frontend/app/components/auth-panel/auth-panel.tsx index 4eb0e09f..3e625443 100644 --- a/frontend/app/components/auth-panel/auth-panel.tsx +++ b/frontend/app/components/auth-panel/auth-panel.tsx @@ -155,7 +155,7 @@ export class AuthPanel extends Component { return (
- You signed in as{' '} + You logged in as{' '}
{ )} {' '}
); @@ -244,11 +244,10 @@ export class AuthPanel extends Component { }; renderUnauthorized = () => { - const { user, providers = [], postInfo } = this.props; + const { user, providers = [] } = this.props; const { threshold } = this.state; if (user || !IS_STORAGE_AVAILABLE) return null; - const signInMessage = postInfo.read_only ? 'Sign in using ' : 'Sign in to comment using '; const sortedProviders = ((): typeof providers => { if (!this.props.provider.name) return providers; const lastProviderIndex = providers.indexOf(this.props.provider.name as typeof providers[0]); @@ -264,7 +263,7 @@ export class AuthPanel extends Component { return (
- {signInMessage} + {'Login: '} {!isAboveThreshold && sortedProviders.map((provider, i) => { const comma = i === 0 ? '' : i === sortedProviders.length - 1 ? ' or ' : ', '; @@ -301,7 +300,7 @@ export class AuthPanel extends Component { if (IS_STORAGE_AVAILABLE || !IS_THIRD_PARTY) return null; return (
- Disable third-party cookies blocking to sign in or open comments in{' '} + Disable third-party cookies blocking to login or open comments in{' '} { renderCookiesWarning = () => { if (IS_STORAGE_AVAILABLE || IS_THIRD_PARTY) return null; - return
Allow cookies to sign in and comment
; + return
Allow cookies to login and comment
; }; renderSettingsLabel = () => {