Wp-calypso: Plans: /my-plan should show domains even if already upgraded

[meremagee]

The intention of /my-plan is to showcase what the user can do with the plan that they purchased. Currently, if the user has added a domain upgrade to their plan, we remove any reference to domains being included in plans.

Regardless of whether or not a user has added a custom domain for their site, we should showcase that the domain is included in the plan, perhaps even highlighting the domain(s) they have associated with the site here.

Steps to reproduce

1. Go to /my-plan on a site with a plan but no custom domain upgrade
2. Notice that there's a nudge to add a custom domain in the "what your plan includes" text
3. Go to /my-plan on a site with a plan and a custom domain upgrade
4. Notice that there is no mention of domains being included in any of the plans

[mtias]

Regardless of whether or not a user has added a custom domain for their site, we should showcase that the domain is included in the plan, perhaps even highlighting the domain(s) they have associated with the site here.

Agreed. Don't know why the domains module is not being used here? cc @artpi

[apeatling]

/cc @rralian Could we squeeze in a fix for this one?

[meremagee]

Hm, using the domains module here was very likely explicitly removed because it doesn't always make sense in this context. For instance, for this site, I have a custom domain - the domain module will always nudge me to "get my custom domain," which is irrelevant:

I was more suggesting the following:

• if user does not have custom domain, show module with CTA to secure their custom domain
• if a user has used their custom domain credit, show that they are using it without a nudge to "get your custom domain," since it's already been... gotten, and highlight that that is one of the wonderful things included in the plan.

[mtias]

Well, the domains module should be taking that into account.

[lamosty]

Sorry, this is my fault. When redesigning My Plans page to use two-column layout (and doing quite a refactor in #7410), I wrongly copied old domains logic instead of using the new one introduced in #7311. The code is still there in upgrades/checkout-thank-you/custom-domain-purchase-detail, we just need to use it in ProductPurchaseDetails instead of what we use now. Will create PR soon

[meremagee]

Closing this given updates in https://github.com/Automattic/wp-calypso/pull/7311

Thanks @lamosty!