Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Entrepreneur my home goes to Calypso instead #1467

Merged
merged 3 commits into from
May 14, 2024

Conversation

JuanLucha
Copy link
Contributor

@JuanLucha JuanLucha commented May 10, 2024

☢️☢️☢️ Don't merge yet ☢️☢️☢️

Changes proposed in this Pull Request:

This PR changes the URL of My Home link in the main menu. If the site plan is Entrepreneur, that link will go to Calypso My Home instead.

Closes https://github.com/Automattic/dotcom-forge/issues/6932

  • This PR is a very minor change/addition and does not require testing instructions (if checked you can ignore/remove the next section).

How to test the changes in this Pull Request:

  1. Apply these changes locally.
  2. Follow these instructions to sync with your staging site: pdDOJh-3ob-p2
  3. Go to your staging site and click My Home in the main menu.
  4. You should go to Calypso My Home with a feature flag. Note: the feature flag won't be required once all the changes related to the new Entrepreneur plan are merged and deployed to production.

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?

FOR PR REVIEWER ONLY:

  • I have reviewed that everything is sanitized/escaped appropriately for any SQL or XSS injection possibilities. I made sure Linting is not ignored or disabled.

@JuanLucha JuanLucha requested a review from a team May 10, 2024 14:42
@JuanLucha JuanLucha self-assigned this May 10, 2024
Copy link

github-actions bot commented May 10, 2024

Size Change: 0 B

Total Size: 197 kB

ℹ️ View Unchanged
Filename Size
./build/53.js 1.05 kB
./build/index.css 883 B
./build/index.js 122 kB
./build/marketing.js 58 kB
./build/payment-gateway-suggestions.css 1.25 kB
./build/payment-gateway-suggestions.js 6.46 kB
./build/plugins.js 3.92 kB
./build/style-index.css 2.15 kB
./build/style-marketing.css 805 B

compressed-size-action

Copy link
Contributor

@ivan-ottinger ivan-ottinger left a comment

Choose a reason for hiding this comment

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

Hey Juan 👋🏼 I haven't tested the changes yet, but they look good to me. Left one inline comment only so far.

Just checking first whether you had a chance to https://github.com/Automattic/dotcom-forge/issues/6932#issuecomment-2098324092?

.sshyncignore Outdated Show resolved Hide resolved
Copy link
Contributor

@ivan-ottinger ivan-ottinger left a comment

Choose a reason for hiding this comment

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

Nice! The changes look good and work as expected for the "full" Entrepreneur plan. There's just one more thing I noticed. Please see the inline comment below.

*/
protected function has_entrepreneur_plan() {
$current_plan = get_option( 'jetpack_active_plan', array() );
return ! empty( $current_plan ) && 'ecommerce-bundle' === $current_plan['product_slug'];
Copy link
Contributor

Choose a reason for hiding this comment

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

This will work for the "full" Entrepreneur plan, however, the Entrepreneur Trial plan currently has the follwing product_slug: ecommerce-trial-bundle-monthly.

I think this product_slug shouldn't change when launching. Maybe @andregardi could confirm. 🙂

Copy link
Contributor

Choose a reason for hiding this comment

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

Correct, we are not changing the product slug. Good catch @ivan-ottinger.

Copy link
Contributor

@mashikag mashikag left a comment

Choose a reason for hiding this comment

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

As per @ivan-ottinger's comment this will not work for entrepreneur trial plan.

Copy link
Contributor

@mashikag mashikag left a comment

Choose a reason for hiding this comment

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

Looks good now! 👍

@JuanLucha JuanLucha merged commit 7b3101a into master May 14, 2024
5 checks passed
@JuanLucha JuanLucha deleted the update/entrepreneur-my-home-link branch May 14, 2024 15:30
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.

3 participants