Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Moves Ledger Deleted Sites List to a new dialog #13056

Merged
merged 2 commits into from
Feb 19, 2018

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Feb 7, 2018

Resolves #12833

Do not squash commits

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed. (Ask a Brave employee to help if you cannot access this document.)

Test Plan:

Plan a

  1. enable payments and add few publishers
  2. make sure that delete link is not present in the footer
  3. delete few of them
  4. make sure that delete link is added
  5. click on it an make sure that deleted publisher is on the list
  6. click on X on one of them and make sure that publishers can be added back to the list

Plan b

  1. do steps 1-5 from plan a
  2. click clear all and make sure that publishers can be added back to the list

Plan c

  1. Visit a few sites and toggle the shield setting (turn shields off for example)
  2. Visit Preferences > Shields and confirm the entries show there under "Saved Site Exceptions"

Reviewer Checklist:

  • Request a security/privacy review as needed if one was not already requested.

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

@NejcZdovc NejcZdovc added this to the 0.21.x (Beta Channel) milestone Feb 7, 2018
@NejcZdovc NejcZdovc self-assigned this Feb 7, 2018
@codecov-io
Copy link

codecov-io commented Feb 7, 2018

Codecov Report

Merging #13056 into master will increase coverage by 0.04%.
The diff coverage is 37.85%.

@@            Coverage Diff             @@
##           master   #13056      +/-   ##
==========================================
+ Coverage   56.15%   56.19%   +0.04%     
==========================================
  Files         279      282       +3     
  Lines       27908    27994      +86     
  Branches     4567     4577      +10     
==========================================
+ Hits        15671    15732      +61     
- Misses      12237    12262      +25
Flag Coverage Δ
#unittest 56.19% <37.85%> (+0.04%) ⬆️
Impacted Files Coverage Δ
js/about/preferences.js 59.21% <100%> (+12.61%) ⬆️
...erer/components/preferences/sitePermissionsPage.js 18.75% <18.75%> (ø)
app/renderer/components/preferences/paymentsTab.js 71.83% <44.82%> (-3.61%) ⬇️
app/renderer/components/preferences/shieldsTab.js 47.61% <46.77%> (ø)
...rer/components/preferences/payment/deletedSites.js 48.48% <48.48%> (ø)
...r/components/preferences/payment/enabledContent.js 75.34% <75%> (+0.1%) ⬆️
js/stores/appStoreRenderer.js 91.66% <0%> (-8.34%) ⬇️
app/renderer/components/reduxComponent.js 57.75% <0%> (-3.45%) ⬇️
js/stores/windowStore.js 27.65% <0%> (-0.3%) ⬇️
... and 5 more

@bradleyrichter
Copy link
Contributor

bradleyrichter commented Feb 7, 2018

One addition I'd like to add to this PR is to hide or disable the lower link string until the first site is added to the deleted list.

prevents this case:
image

@NejcZdovc
Copy link
Contributor Author

link is now removed, when you don't have deleted sites

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

Changes look great! I updated the test plan to cover the shields panel, since that was refactored. I tested this too, to make sure it still worked as expected. Nice job! 😄

@bsclifton bsclifton merged commit a0cfa58 into brave:master Feb 19, 2018
bsclifton added a commit that referenced this pull request Feb 19, 2018
Moves Ledger Deleted Sites List to a new dialog
@bsclifton
Copy link
Member

master a0cfa58
0.22.x 7aedbb3
0.21.x in progress

NejcZdovc pushed a commit that referenced this pull request Feb 19, 2018
Moves Ledger Deleted Sites List to a new dialog
@NejcZdovc
Copy link
Contributor Author

0.21 914ec89

@NejcZdovc NejcZdovc modified the milestones: 0.21.x (Beta Channel), 0.21.x (Twitch) Feb 24, 2018
@NejcZdovc
Copy link
Contributor Author

NejcZdovc commented Feb 24, 2018

0.21 twitch 2a58dc2

NejcZdovc pushed a commit that referenced this pull request Feb 24, 2018
Moves Ledger Deleted Sites List to a new dialog
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants