Skip to content

Conversation

@andrewserong
Copy link
Member

@andrewserong andrewserong commented May 20, 2025

Follow up to: #102811 and #103445, thanks to @adamwoodnz for catching this!

Proposed Changes

  • Ensure Blaze Pro 2FA screens don't get the is-white-login treatment (they skip it in the usual login screen, but the 2FA screen was still getting the top masterbar + common styling)
  • In logged-out, factor in that the oauth2 client isn't always in the query string. On the 2FA screen, it's in state, so we need to include that in the check for isWhiteLogin
  • Ensure that the styling that unsets the max width on the login form only applies when the expected login form is present. This will allow the 2FA version of the screen for Blaze Pro to not be full width, and render as expected.

Why are these changes being made?

Testing Instructions

  • In an incognito browser and with a WordPress.com account that has 2FA enabled, go to https://blazepro.com/ and go to log in
  • Once you land on the log in screen, copy the query string for the route and paste it into a local URL with this branch checked out, and paste it into your browser bar after this url: http://calypso.localhost:3000/log-in/
  • That should take you to the Blaze Pro login screen
  • Log in with your username and password, and check that the 2FA screen displays correctly
  • Smoke test other variations of the login screens to make sure nothing is broken as a result of this PR

Screenshots

Before After
image image

Pre-merge Checklist

  • Has the general commit checklist been followed? (PCYsg-hS-p2)
  • Have you written new tests for your changes?
  • Have you tested the feature in Simple (P9HQHe-k8-p2), Atomic (P9HQHe-jW-p2), and self-hosted Jetpack sites (PCYsg-g6b-p2)?
  • Have you checked for TypeScript, React or other console errors?
  • Have you used memoizing on expensive computations? More info in Memoizing with create-selector and Using memoizing selectors and Our Approach to Data
  • Have we added the "[Status] String Freeze" label as soon as any new strings were ready for translation (p4TIVU-5Jq-p2)?
    • For UI changes, have we tested the change in various languages (for example, ES, PT, FR, or DE)? The length of text and words vary significantly between languages.
  • For changes affecting Jetpack: Have we added the "[Status] Needs Privacy Updates" label if this pull request changes what data or activity we track or use (p4TIVU-aUh-p2)?

@andrewserong andrewserong self-assigned this May 20, 2025
@andrewserong andrewserong added the [Type] Bug When a feature is broken and / or not performing as intended label May 20, 2025
@matticbot matticbot added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label May 20, 2025
@matticbot
Copy link
Contributor

matticbot commented May 20, 2025

This PR modifies the release build for the following Calypso Apps:

For info about this notification, see here: PCYsg-OT6-p2

  • notifications
  • wpcom-block-editor

To test WordPress.com changes, run install-plugin.sh $pluginSlug try/fix-blaze-pro-2fa-screen on your sandbox.

@github-actions
Copy link

github-actions bot commented May 20, 2025

@matticbot
Copy link
Contributor

This PR does not affect the size of JS and CSS bundles shipped to the user's browser.

Generated by performance advisor bot at iscalypsofastyet.com.

Copy link
Contributor

@adamwoodnz adamwoodnz left a comment

Choose a reason for hiding this comment

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

Thanks for picking this up!

Works for me, just one question inline.

@andrewserong
Copy link
Member Author

That one-liner's testing well for me, too. Thanks for taking a look @adamwoodnz! 🙇

Copy link
Contributor

@adamwoodnz adamwoodnz left a comment

Choose a reason for hiding this comment

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

LGTM! :shipit:

@andrewserong andrewserong merged commit f9446ff into trunk May 22, 2025
11 checks passed
@andrewserong andrewserong deleted the try/fix-blaze-pro-2fa-screen branch May 22, 2025 04:24
@github-actions github-actions bot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label May 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

[Type] Bug When a feature is broken and / or not performing as intended

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants