-
Notifications
You must be signed in to change notification settings - Fork 21
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
Update HelpText to maintain parity with what is currently in web #23
Conversation
9dfe781
to
9ccece8
Compare
074e3bc
to
8f02ffc
Compare
<Link | ||
url={`https://help.shopify.com/${i18n.locale}/manual/discounts/combining-discounts`} | ||
external | ||
// todo: do we want to import @web-utilities? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so, but I wouldn't be the one to make the call. I think web-utilities has a lot of private code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed! This comment can be removed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh hey derek commented on this i forgot to remove the comment. thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh and there's derek again, thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎩 and code lgtm! Just waiting for translations to come back.
623d215
to
69e65a6
Compare
</Stack> | ||
) : ( | ||
<> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I don't think you need to use a fragment here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Didn't 🎩 , but code is 👍
tests, fully functional helptext, translation copy copy test fixes lint remove comment
332af38
to
181ba27
Compare
Updated HelpText combo card to match what is currently on Web.
Figma: https://www.figma.com/file/m81kpkSdIYieWQQA9rl5qr/Extensible-Discounts-Main-File?node-id=8053%3A142722#215788222
Work done in Web: https://github.com/Shopify/web/pull/67404/files#diff-d19bbdbc75c3532233b29c7d18d337618cf24497545a03b7bef3693fce4429f9
What problem is this PR Solving?
Addressing the feedback from Glen and UX team for combinations card
https://github.com/Shopify/web/commit/c7ccafb42c1c789cfa300c6bb1c8a9d4b1ef8984 Empty state changes
Update copy
Remove icon and update the layout
https://github.com/Shopify/web/commit/033384ae6347941902722119536082db0d1b5087 Combinations changes
Update CTA content to have a special case for product combines with product scenario
Update main copy to only have warning about overdiscounting when product combines with product
Resolves https://github.com/Shopify/core-issues/issues/40640
Reviewer Hatrack:
CombinationCardPattern.tsx
you can modify:and
and
to run through the different states/copy
Product with Product and Shipping combos
Product with No combos
What is the impact of this PR?
Make sure you consider Shopify experience values and any consequences on Merchants or on Shopify.
On Merchants
On Shopify
Before you deploy
/foundation
or/server
directories, or if it updates a key dependency like Polaris or sewing kit.Footnotes
If it is not safe, please detail what would need to happen to make it safe. For example, if this PR removes a GraphQL field that will then be removed from the schema, link to the Shopify Core PR that removes the field. ↩
If you are having difficulties accessing or deploying to staging, or you are having difficulties running the production build, please ask in #shopify-web. ↩ ↩2
Instead of just refreshing when switching between production/staging/canaries, consider performing a fresh login, especially when your changes touch configuration or the server middleware. ↩