Skip to content

Conversation

@elazzabi
Copy link
Member

@elazzabi elazzabi commented May 7, 2025

Fixes woocommerce/woocommerce#57799

Proposed Changes

This fixes two main problems:

  • In the new NOX In-Context flow, and the Connect to WordPress.com step specifically, if a user clicks on "Sign in as a different user" the displayed page shows two logos:

CleanShot 2025-05-07 at 17 16 27@2x

  • On the same page, there is a small typo in the paragraph (in in):

CleanShot 2025-05-07 at 17 17 05@2x

This PR fixes both issues.

Why are these changes being made?

To fix the logo issue (and typo as a bonus)

Testing Instructions

  • Clone and set up this repo locally using the Getting Started
  • Start the server locally on http://calypso.localhost:3000/
  • Create a new JN site from WooCommerce core and use a zip of WooPayments 9.3.0.
  • Visit WooCommerce > Settings > Payments and start the NOX
  • Once you're redirect to connect WordPress.com, make sure you see both logos (and that there is a typo in the page):

CleanShot 2025-05-07 at 17 16 27@2x

  • Replace https://wordpress.com/ with http://calypso.localhost:3000/. You should see the same login page but with one logo only (and a fixed typo):

CleanShot 2025-05-07 at 17 21 37@2x

  • Enjoy

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)?

@elazzabi elazzabi requested a review from dmallory42 May 7, 2025 16:22
@elazzabi elazzabi self-assigned this May 7, 2025
@matticbot matticbot added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels May 7, 2025
@github-actions
Copy link

github-actions bot commented May 7, 2025

@elazzabi elazzabi changed the title Do not show the Woo logo for Woo [NOX In-Context] Do not show the Jetpack logo when onboarding for Woo accounts May 7, 2025
@matticbot
Copy link
Contributor

matticbot commented May 7, 2025

Here is how your PR affects size of JS and CSS bundles shipped to the user's browser:

App Entrypoints (~4 bytes added 📈 [gzipped])

Details
name         parsed_size           gzip_size
entry-login        +29 B  (+0.0%)       +4 B  (+0.0%)

Common code that is always downloaded and parsed every time the app is loaded, no matter which route is used.

Legend

What is parsed and gzip size?

Parsed Size: Uncompressed size of the JS and CSS files. This much code needs to be parsed and stored in memory.
Gzip Size: Compressed size of the JS and CSS files. This much data needs to be downloaded over network.

Generated by performance advisor bot at iscalypsofastyet.com.

Copy link
Contributor

@dmallory42 dmallory42 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 working on this! I can see it looks as expected with the typo fixed and the logo showing correctly. Let's ship it! 🚢

@matticbot
Copy link
Contributor

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

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

  • help-center
  • notifications
  • wpcom-block-editor

To test WordPress.com changes, run install-plugin.sh $pluginSlug fix/woo-jetpack-logo on your sandbox.

@elazzabi elazzabi merged commit 9ccefe0 into trunk May 12, 2025
14 checks passed
@elazzabi elazzabi deleted the fix/woo-jetpack-logo branch May 12, 2025 09:32
@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 12, 2025
@a8ci18n
Copy link

a8ci18n commented May 12, 2025

Translation for this Pull Request has now been finished.

tellthemachines added a commit that referenced this pull request May 13, 2025
@tellthemachines
Copy link
Contributor

Hi! I had to fix some merge conflicts in #102811 due to this PR, and wanted to check if these changes weren't affected, but I'm not sure how to test this. Assume I know nothing about Woo 😅

How do I create a JN site from WooCommerce core? And where can I find a zip of WooPayments 9.3.0?

@dmallory42
Copy link
Contributor

Hi @tellthemachines! To create a JN site from WooCommerce Core and WooPayments 9.3, you can go to Jurassic Ninja, log in to your WP account, and then click Show more options and select WooCommerce Beta Tester and then enter trunk when prompted to select a branch. And then you can also select WooPayments, because 9.3.0 is now the latest released version.

Let us know if we can help further!

@tellthemachines
Copy link
Contributor

Thanks @dmallory42! I've tested and all looks good.

tellthemachines added a commit that referenced this pull request May 14, 2025
* Update content area of login screens to use StepContainerV2

* Dead code removal

* Untangle Gravatar and WP Job Manager logins from isWhiteLogin

* Extract header text rendering logic from LoginBlock

* Correct header text logic and wp cloud logo

* Move things around and re-style them

* Use component alignment

* Remove extra padding and update tos

* Additional merge-related changes

* Remove continue as user height

* Remove convoluted button widths

* Fix scrollbar

* Improve syntax

* Remove positioning from "Not you"

* Update `showContinueAsUser` to optional boolean in getHeaderText

* Fix use of `is-white-login` in magic login component

* Fix height in magic login

* Update header condition to isWhiteLogin

* Fix weird a4a login screen

* Remove privateSite mentions

* Reapply changes from #103213

* Fix typo

* Fix margin for 2fa screen
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[NOX In-Context] Woo and Jetpack logos during the WPCOM connection step

6 participants