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.

Sign up for GitHub

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

Jump to bottom

Update Brave merch store subtext on benefits card on Rewards page #27211

Merged
merged 1 commit into from
Jan 14, 2025
Merged

Update Brave merch store subtext on benefits card on Rewards page #27211

merged 1 commit into from
Jan 14, 2025
+3 −2

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Jan 13, 2025

Resolves brave/brave-browser#43203

Screenshot 2025-01-13 125444

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@emerick emerick self-assigned this Jan 13, 2025
@emerick emerick requested review from a team as code owners January 13, 2025 19:02
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Jan 13, 2025
emerick
emerick commented Jan 13, 2025
View reviewed changes
components/brave_rewards/resources/rewards_page/components/home/benefits_card.style.ts Outdated
@@ -29,6 +29,7 @@ import { scoped } from '../../lib/scoped_css'
--leo-icon-size: 28px;
--leo-icon-color: ${color.white};

min-width: 48px;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Without this, the icon was being stretched vertically when the text expanded beyond a single line.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks for catching this - I think this is flexbox shrinking the element. Doing:

flex-shrink: 0;

or

flex: 0 0 auto;

might also work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nice, I went with flex-shrink and that seems to work great. Thanks!

zenparsing
zenparsing approved these changes Jan 13, 2025
View reviewed changes
components/brave_rewards/resources/rewards_page/components/home/benefits_card.style.ts Outdated
@@ -29,6 +29,7 @@ import { scoped } from '../../lib/scoped_css'
--leo-icon-size: 28px;
--leo-icon-color: ${color.white};

min-width: 48px;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks for catching this - I think this is flexbox shrinking the element. Doing:

flex-shrink: 0;

or

flex: 0 0 auto;

might also work.

mkarolin
mkarolin approved these changes Jan 13, 2025
View reviewed changes
Copy link
Collaborator

@mkarolin mkarolin left a comment

Choose a reason for hiding this comment

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

strings++

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@emerick emerick force-pushed the emerick-rewards-update-brave-merch-store-description branch from ed62aed to dbb2802 Compare January 13, 2025 20:34
@emerick emerick merged commit 9f21607 into master Jan 14, 2025
18 checks passed
@emerick emerick deleted the emerick-rewards-update-brave-merch-store-description branch January 14, 2025 02:42
@github-actions github-actions bot added this to the 1.76.x - Nightly milestone Jan 14, 2025
brave-builds added a commit that referenced this pull request Jan 14, 2025
@brave-builds
Uplift of #27211 (squashed) to beta
671fd34
@brave-builds brave-builds mentioned this pull request Jan 14, 2025
Merged
7 tasks
@brave-builds
Copy link
Collaborator

Released in v1.76.12

@GeetaSarvadnya
Copy link

Verification PASSED on

Brave | 1.76.13 Chromium: 132.0.6834.83 (Official Build) nightly (64-bit)
-- | --
Revision | 886363cccfee3d0d19418354fe0894e2fa676a57
OS | Windows 10 Version 22H2 (Build 19045.5247)
Non -connected state Connected state
image image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkarolin mkarolin mkarolin approved these changes

@zenparsing zenparsing zenparsing approved these changes

Assignees

@emerick emerick

Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
Milestone
1.76.x - Nightly
Development

Successfully merging this pull request may close these issues.

Update Brave Merch Store description text in Rewards benefits for coupons
5 participants
@emerick @brave-builds @GeetaSarvadnya @zenparsing @mkarolin