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

Add a way to disable inline tipping buttons without enabling Brave Rewards (separate set of toggles) and update toggles UI styling #28023

Closed
6 tasks
Miyayes opened this issue Jan 25, 2023 · 2 comments · Fixed by brave/brave-core#17339

Comments

@Miyayes
Copy link
Collaborator

Miyayes commented Jan 25, 2023

Description

At buttons in brave://settings/rewards that toggle in-line tipping buttons, regardless of whether Rewards is enabled.

Solution

  • On brave://settings/rewards when Rewards is disabled, use this construct:

image

Change text to:

Show Tip buttons on sites [Master toggle]
[checkbox] Twitter
[checkbox] Reddit
[checkbox] GitHub

  • If requires browser relaunch (ideally would work instantly), prompt user to relaunch Brave.
  • On brave://settings/rewards when Rewards is enabled, copy the same construct where "Tip buttons" currently is
  • On brave://rewards page, under Tip settings, replicate same structure: (1) add master toggle, (2) change "Enable content-level tips on these sites" text to "Show Tip buttons on sites", (3) replace site toggles with checkboxes, and place them on the left of site name: e.g., [checkbox] Reddit
  • Retain preferences after user enables Rewards: state says exactly the same
  • BAT icon removal toggle is overloaded -- remove inline tip toggle functionality from that toggle

Test Plan

Case 1: Migrate from existing profile / tipping buttons enabled / Rewards not joined

  1. Start a version of Brave prior to this change.
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and verify that the Show Brave Rewards icon in address bar is turned on.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.
  7. Navigate to https://reddit.com and verify that the inline tipping buttons are shown.
  8. On brave://settings/rewards turn the Show Tip buttons on sites to off.
  9. Verify that the Relaunch button is shown in the toggle.
  10. Click the Relaunch button.
  11. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  12. On brave://settings/rewards turn the Show Tip buttons on sites to on and click the Relaunch button.
  13. After the browser restarts, on brave://settings/rewards verify that the Show Tip buttons on sites is set to on and all checkboxes are checked.
  14. Uncheck the Reddit checkbox.
  15. Verify that the Relaunch button is shown and click it.
  16. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.

Case 2: Migrate from existing profile / tipping buttons disabled / Rewards not joined

  1. Start a version of Brave prior to this change.
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and toggle the Show Brave Rewards icon in address bar to off.
  4. Restart the browser
  5. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  6. Upgrade to the version of Brave with this change.
  7. Navigate to brave://settings/rewards.
  8. Verify that:
    a. Show Brave Rewards icon in address bar is turned off.
    b. Show Tip buttons on sites is turned off.
    c. No checkboxes are shown under the Show Tip buttons on sites toggle.
  9. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.

Case 3: Migrate from existing profile / tipping buttons enabled / Rewards joined

  1. Start a version of Brave prior to this change.
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and verify that
    a. the Show Brave Rewards icon in address bar is turned on.
    b. the toggles for inline tipping buttons (Reddit, Github, Twitter) are turned on.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.

Case 4: Migrate from existing profile / tipping buttons disabled / Rewards joined

  1. Start a version of Brave prior to this change.
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and turn off the Show Brave Rewards icon in address bar toggle.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned off.
    b. Show Tip buttons on sites is turned off.
    c. No checkboxes are shown under the Show Tip buttons on sites.

Case 5: Migrate from existing profile / tipping buttons enabled / Rewards joined / Reddit disabled

  1. Start a version of Brave prior to this change.
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and verify that
    a. the Show Brave Rewards icon in address bar is turned on.
    b. the toggles for inline tipping buttons (Reddit, Github, Twitter) are turned on.
  4. Turn off the Reddit toggle and click the Relaunch button.
  5. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  6. Upgrade to the version of Brave with this change.
  7. Navigate to brave://settings/rewards.
  8. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. Reddit checkbox is unchecked, the other checkboxes are checked.
  9. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.

Case 6: Fresh profile

  1. Install a version of Brave with this change.
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and verify that the
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.
  4. Join Rewards
  5. Navigate to brave://rewards and click on the Tips section's settings button
  6. Verify that the
    a. Show Tip buttons on sites toggle is turned on
    b. All checkboxes under the toggle are checked
  7. Turn the Show Tip buttons on sites toggle to off
  8. Verify that:
    a. the checkboxes under the toggle are not shown.
    b. the Relauch button is shown.
    c. on brave://settings/rewards page the Show Tip buttons on sites also transitioned to off, no checkboxes are shown, and the Relaunch button is shown.
  9. On brave://settings/rewards page toggle the Show Tip buttons on sites to on
  10. Verify that the Relaunch button is no longer shown
  11. Uncheck Reddit checkbox.
  12. Verify that the Relaunch button is show in the Show Tip buttons on sites toggle again.
  13. On the brave://rewards -> Tips section's settings screen verify that the Show Tip buttons on sites is set to on and the Reddit checkbox is unchecked.
@Miyayes Miyayes added the priority/P3 The next thing for us to work on. It'll ride the trains. label Jan 25, 2023
@Miyayes Miyayes added priority/P2 A bad problem. We might uplift this to the next planned release. and removed priority/P3 The next thing for us to work on. It'll ride the trains. labels Feb 2, 2023
@mkarolin mkarolin added this to the 1.50.x - Nightly milestone Feb 27, 2023
@Miyayes Miyayes changed the title Add a way to disable inline tipping buttons without enabling Brave Rewards Add a way to disable inline tipping buttons without enabling Brave Rewards (separate set of toggles) Feb 27, 2023
@Miyayes Miyayes changed the title Add a way to disable inline tipping buttons without enabling Brave Rewards (separate set of toggles) Add a way to disable inline tipping buttons without enabling Brave Rewards (separate set of toggles) and update toggles UI styling Feb 27, 2023
@GeetaSarvadnya GeetaSarvadnya added the QA/In-Progress Indicates that QA is currently in progress for that particular issue label Mar 9, 2023
@GeetaSarvadnya
Copy link

GeetaSarvadnya commented Mar 9, 2023

Verification PASSED on

Brave | 1.50.85 Chromium: 111.0.5563.64 (Official Build) beta (64-bit)
-- | --
Revision | c710e93d5b63b7095afe8c2c17df34408078439d-refs/branch-heads/5563@{#995}
OS | Windows 10 Version 21H2 (Build 19044.2604)

UI changes

UI changes validations_PASSED
  • Verified that the Show Tip button on sites master toggle is added in the brave://settings/rewards
  • Verified that the checkbox is added for the GitHub, Reddit and Twitter sites
  • Verified that Show Tip button on sites master toggle is added on the brave://rewards page
  • Verified that GitHub, Reddit and Twitter sites toggles replaced with checkboxes
Tip settings in brave://rewards/settings Tip settings in brave://rewards
image image

Upgrade profile

Case 1: Migrate from existing profile / tipping buttons enabled / Rewards not joined_PASSED
  1. Start a version of Brave prior to this change.
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and verify that the Show Brave Rewards icon in address bar is turned on.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.
  7. Navigate to https://reddit.com and verify that the inline tipping buttons are shown.
  8. On brave://settings/rewards turn the Show Tip buttons on sites to off.
  9. Verify that the Relaunch button is shown in the toggle.
  10. Click the Relaunch button.
  11. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  12. On brave://settings/rewards turn the Show Tip buttons on sites to on and click the Relaunch button.
  13. After the browser restarts, on brave://settings/rewards verify that the Show Tip buttons on sites is set to on and all checkboxes are checked.
  14. Uncheck the Reddit checkbox.
  15. Verify that the Relaunch button is shown and click it.
  16. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
step 1 step 2 step 3 step 4 step 5 & 6 step 8 step 9, 10 step 11 step 12 step 13 step 14 step 15 step 16 step 17
image image image image image image image image image image image image image image
Case 2: Migrate from existing profile / tipping buttons disabled / Rewards not joined_PASSED
  1. Start a version of Brave prior to this change.
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and toggle the Show Brave Rewards icon in address bar to off.
  4. Restart the browser
  5. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  6. Upgrade to the version of Brave with this change.
  7. Navigate to brave://settings/rewards.
  8. Verify that:
    a. Show Brave Rewards icon in address bar is turned off.
    b. Show Tip buttons on sites is turned off.
    c. No checkboxes are shown under the Show Tip buttons on sites toggle.
  9. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
step 1 step 2 step 3 step 4 & 5 step 6 step 7 & 8 step 10
image image image image image image image
Case 3: Migrate from existing profile / tipping buttons enabled / Rewards joined_PASSED
  1. Start a version of Brave prior to this change.
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and verify that
    a. the Show Brave Rewards icon in address bar is turned on.
    b. the toggles for inline tipping buttons (Reddit, Github, Twitter) are turned on.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.
step 1 step 2 step 3 a 3 b (Reddit) 3 b (Github) 3 b (Twitter) step 4 step 5 & 7
image image image image image image image image
Case 4: Migrate from existing profile / tipping buttons disabled / Rewards joined_PASSED
  1. Start a version of Brave prior to this change.
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and turn off the Show Brave Rewards icon in address bar toggle.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned off.
    b. Show Tip buttons on sites is turned off.
    c. No checkboxes are shown under the Show Tip buttons on sites.
step 1 step 2 step 3 step 4 step 5 & 7
image image image image image
Case 5: Migrate from existing profile / tipping buttons enabled / Rewards joined / Reddit disabled_PASSED
  1. Start a version of Brave prior to this change.
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and verify that
    a. the Show Brave Rewards icon in address bar is turned on.
    b. the toggles for inline tipping buttons (Reddit, Github, Twitter) are turned on.
  4. Turn off the Reddit toggle and click the Relaunch button.
  5. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  6. Upgrade to the version of Brave with this change.
  7. Navigate to brave://settings/rewards.
  8. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. Reddit checkbox is unchecked, the other checkboxes are checked.
  9. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
step 1 step 2 step 3a step 3b - Reddit step 3b - Github step 3b - Twitter step 4 step 5 step 6 step 7 & 8 step 9
image image image image image image image image image image image

Clean profile

Case 6: Fresh profile_PASSED
  1. Install a version of Brave with this change.
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and verify that the
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.
  4. Join Rewards
  5. Navigate to brave://rewards and click on the Tips section's settings button
  6. Verify that the
    a. Show Tip buttons on sites toggle is turned on
    b. All checkboxes under the toggle are checked
  7. Turn the Show Tip buttons on sites toggle to off
  8. Verify that:
    a. the checkboxes under the toggle are not shown.
    b. the Relauch button is shown.
    c. on brave://settings/rewards page the Show Tip buttons on sites also transitioned to off, no checkboxes are shown, and the Relaunch button is shown.
  9. On brave://settings/rewards page toggle the Show Tip buttons on sites to on
  10. Verify that the Relaunch button is no longer shown
  11. Uncheck Reddit checkbox.
  12. Verify that the Relaunch button is show in the Show Tip buttons on sites toggle again.
  13. On the brave://rewards -> Tips section's settings screen verify that the Show Tip buttons on sites is set to on and the Reddit checkbox is unchecked.
step 3 step 4 step 5 step 6 steps 7, 8 (a,b) step 8 (c) step 9,10 step 11,12 step 13
image image image image image image image image image

@GeetaSarvadnya GeetaSarvadnya added QA Pass-Win64 and removed QA/In-Progress Indicates that QA is currently in progress for that particular issue labels Mar 10, 2023
@LaurenWags
Copy link
Member

LaurenWags commented Mar 17, 2023

Verified with

Brave | 1.50.92 Chromium: 111.0.5563.64 (Official Build) beta (x86_64)
-- | --
Revision | c710e93d5b63b7095afe8c2c17df34408078439d-refs/branch-heads/5563@{#995}
OS | macOS Version 12.6.3 (Build 21G419)

UI changes

UI changes validations - PASSED
  • Verified that the Show Tip button on sites master toggle is added in the brave://settings/rewards
  • Verified that the checkbox is added for the GitHub, Reddit and Twitter sites
  • Verified that Show Tip button on sites master toggle is added on the brave://rewards page
  • Verified that GitHub, Reddit and Twitter sites toggles replaced with checkboxes
Tip settings in brave://rewards/settings Tip settings in brave://rewards
1 2

Upgrade profile

Case 1: Migrate from existing profile / tipping buttons enabled / Rewards not joined - PASSED
  1. Start a version of Brave prior to this change. (I used 1.49.120)
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and verify that the Show Brave Rewards icon in address bar is turned on.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.
  7. Navigate to https://reddit.com and verify that the inline tipping buttons are shown.
  8. On brave://settings/rewards turn the Show Tip buttons on sites to off.
  9. Verify that the Relaunch button is shown in the toggle.
  10. Click the Relaunch button.
  11. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  12. On brave://settings/rewards turn the Show Tip buttons on sites to on and click the Relaunch button.
  13. After the browser restarts, on brave://settings/rewards verify that the Show Tip buttons on sites is set to on and all checkboxes are checked.
  14. Uncheck the Reddit checkbox.
  15. Verify that the Relaunch button is shown and click it.
  16. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
step 1 step 3 step 4 step 5 & 6 step 8 step 9 & 10 step 12 step 13 step 14 step 15 & 16 step 17
1 3 4 6 8 10 12 13 14 15 17
Case 2: Migrate from existing profile / tipping buttons disabled / Rewards not joined - PASSED
  1. Start a version of Brave prior to this change. (I used 1.49.120)
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and toggle the Show Brave Rewards icon in address bar to off.
  4. Restart the browser
  5. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  6. Upgrade to the version of Brave with this change.
  7. Navigate to brave://settings/rewards.
  8. Verify that:
    a. Show Brave Rewards icon in address bar is turned off.
    b. Show Tip buttons on sites is turned off.
    c. No checkboxes are shown under the Show Tip buttons on sites toggle.
  9. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
step 1 step 3 step 4 & 5 step 6 step 7 & 8 step 9
1 3 5 6 8 9
Case 3: Migrate from existing profile / tipping buttons enabled / Rewards joined - PASSED
  1. Start a version of Brave prior to this change. (I used 1.49.120)
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and verify that
    a. the Show Brave Rewards icon in address bar is turned on.
    b. the toggles for inline tipping buttons (Reddit, Github, Twitter) are turned on.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.
  7. Confirm in-line tip buttons shown on:
    a. GitHub
    b. Reddit
    c. Twitter
step 1 step 2 step 3 step 4 step 6 Step 7a Step 7b Step 7c
1 2 3 4 6 7a 7b 7c
Case 4: Migrate from existing profile / tipping buttons disabled / Rewards joined - PASSED
  1. Start a version of Brave prior to this change. (I used 1.49.120)
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and turn off the Show Brave Rewards icon in address bar toggle.
  4. Upgrade to the version of Brave with this change.
  5. Navigate to brave://settings/rewards.
  6. Verify that:
    a. Show Brave Rewards icon in address bar is turned off.
    b. Show Tip buttons on sites is turned off.
    c. No checkboxes are shown under the Show Tip buttons on sites.
  7. Connected a custodial account
  8. Opened brave://rewards and then settings under "Tips"
  9. Confirmed:
    a. Show Tip buttons on sites is turned off.
    b. No checkboxes are shown under the Show Tip buttons on sites.
step 1 step 2 step 3 step 4 step 6 Step 9
1 2 3 4 6 9
Case 5: Migrate from existing profile / tipping buttons enabled / Rewards joined / Reddit disabled - PASSED
  1. Start a version of Brave prior to this change. (I used 1.49.120)
  2. Join Rewards.
  3. Navigate to brave://settings/rewards and verify that
    a. the Show Brave Rewards icon in address bar is turned on.
    b. the toggles for inline tipping buttons (Reddit, Github, Twitter) are turned on.
  4. Turn off the Reddit toggle and click the Relaunch button.
  5. After the browser restarts, navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  6. Upgrade to the version of Brave with this change.
  7. Navigate to brave://settings/rewards.
  8. Verify that:
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. Reddit checkbox is unchecked, the other checkboxes are checked.
  9. Navigate to https://reddit.com and verify that the inline tipping buttons are not shown.
  10. Connect a custodial account
  11. Open brave://rewards and then settings under "Tips"
  12. Confirmed:
    a. Show Tip buttons on sites is turned on.
    b. Reddit checkbox is unchecked, the other checkboxes are checked.
step 1 step 2 step 3 step 4 step 5 step 6 step 7 & 8 step 9 Step 12
1 2 3 4 5 6 8 9 12

Clean profile

Case 6: Fresh profile - PASSED
  1. Install a version of Brave with this change.
  2. Do not join Rewards.
  3. Navigate to brave://settings/rewards and verify that the
    a. Show Brave Rewards icon in address bar is turned on.
    b. Show Tip buttons on sites is turned on.
    c. All checkboxes under the Show Tip buttons on sites are checked.
  4. Join Rewards and connect to custodian
  5. Navigate to brave://rewards and click on the Tips section's settings button
  6. Verify that the
    a. Show Tip buttons on sites toggle is turned on
    b. All checkboxes under the toggle are checked
  7. Turn the Show Tip buttons on sites toggle to off
  8. Verify that:
    a. the checkboxes under the toggle are not shown.
    b. the Relauch button is shown.
    c. on brave://settings/rewards page the Show Tip buttons on sites also transitioned to off, no checkboxes are shown, and the Relaunch button is shown.
  9. On brave://settings/rewards page toggle the Show Tip buttons on sites to on
  10. Verify that the Relaunch button is no longer shown
  11. Uncheck Reddit checkbox.
  12. Verify that the Relaunch button is show in the Show Tip buttons on sites toggle again.
  13. On the brave://rewards -> Tips section's settings screen verify that the Show Tip buttons on sites is set to on and the Reddit checkbox is unchecked.
step 3 step 4 step 6 steps 7, 8 (a,b) step 8 (c) step 9,10 step 11,12 step 13
3 4 6 7 8 9 11 13

Encountered the following while testing:

#29182
#29183

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

4 participants