Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Adding new TOS to Rewards UI Opt-In points #440

Merged
merged 1 commit into from
Apr 8, 2019
Merged

Adding new TOS to Rewards UI Opt-In points #440

merged 1 commit into from
Apr 8, 2019

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Apr 2, 2019

Related: brave/brave-browser#3124

This adds block of TOS copy to the points Rewards can be opted in to specified in the issue. This also adds a new component called DisabledBox.

With the Pre-Opt-In rewards panel, some padding from the design was reduced to respect vertical height.

Welcome Page:
Screen Shot 2019-04-01 at 5 49 56 PM

Pre-Opt-In Panel:
Screen Shot 2019-04-01 at 5 49 32 PM

Rewards Setting Page (With new component)
Screen Shot 2019-04-01 at 5 49 15 PM

Welcome Page Header:
Screen Shot 2019-04-05 at 2 59 21 AM

Changes

Test plan

Link / storybook path to visual changes

https://brave-ui-klmmryl7y.now.sh

Integration

  • Does this contain changes to src/components or src/

    • Will you publish to npm immediately after this PR, or wait until sometime in the future?
    • Incompatible API change to something existing (major version increase)
    • Adding new backwards-compatible functionality? (minor version increase)
    • Fixing a bug backwards-compatibly? (patch version increase)
  • Does this contain changes to src/features for brave-core?

    • Are there non backwards-compatible changes required for brave-core? Do not merge until brave-core PR is approvable. Link to brave-core PR:
    • Will you create brave-core PR to update to this commit after it is merged?
    • Wants uplift to brave-core feature branch?
      • When uplift-approved, merge to brave-core-0.VV.x feature branch
      • Create additional brave-core PRs for each feature branch to update commit

@ryanml ryanml force-pushed the rewards-tos branch 2 times, most recently from 61c42d3 to bd9f9b1 Compare April 2, 2019 20:32
@ryanml ryanml merged commit d594010 into master Apr 8, 2019
@ryanml ryanml deleted the rewards-tos branch April 8, 2019 09:39
ryanml added a commit that referenced this pull request Apr 8, 2019
Adding new TOS to Rewards UI Opt-In points
NejcZdovc added a commit that referenced this pull request Apr 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants