Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions static/app/views/authV2/authLogin/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,9 @@ describe('AuthLogin', () => {
expect(screen.getByRole('button', {name: 'SSO'})).toBeInTheDocument();
expect(screen.queryByRole('textbox', {name: 'Email'})).not.toBeInTheDocument();
expect(screen.queryByLabelText('Password')).not.toBeInTheDocument();
expect(screen.getByRole('button', {name: 'Account Settings'})).toHaveAttribute(
'href',
'https://sentry.io/settings/account/'
);
expect(
screen.queryByRole('button', {name: 'Account Settings'})
).not.toBeInTheDocument();
Comment on lines +176 to +178

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete

expect(
screen.queryByRole('button', {name: 'Clear organization login context'})
).not.toBeInTheDocument();
Expand Down
17 changes: 1 addition & 16 deletions static/app/views/authV2/authLogin/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {Heading, Text} from '@sentry/scraps/text';
import {BrandPageLayout} from 'sentry/components/brandPageLayout';
import {IconGithub, IconGoogle, IconLab, IconSentry, IconVsts} from 'sentry/icons';
import {t, tct} from 'sentry/locale';
import {ConfigStore} from 'sentry/stores/configStore';
import type {AuthConfig} from 'sentry/types/auth';
import {trackAnalytics} from 'sentry/utils/analytics';
import {MarkedText} from 'sentry/utils/marked/markedText';
Expand Down Expand Up @@ -48,7 +47,6 @@ export default function AuthLogin() {
const theme = useTheme();
const {orgSlug} = useParams<{orgSlug?: string}>();
const location = useLocation();
const sentryUrl = ConfigStore.get('links').sentryUrl;
const {setAuthV2CookieState} = useEnableAuthV2();
const hasStartedAnalyticsSession = useRef(false);

Expand Down Expand Up @@ -309,20 +307,7 @@ export default function AuthLogin() {
/>
</Stack>

{focusedOrgAuth ? (
<Stack gap="md">
<Grid columns="1fr max-content 1fr" align="center" gap="md">
<Container borderTop="secondary" />
<Text as="div" align="center" variant="muted" size="lg">
{t('or')}
</Text>
<Container borderTop="secondary" />
</Grid>
<LinkButton href={`${sentryUrl}/settings/account/`}>
{t('Account Settings')}
</LinkButton>
</Stack>
) : (
{!focusedOrgAuth && (
<Fragment>
<AuthDivider />

Expand Down
Loading