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

Fixes formatting for YT on shields page #12299

Merged
merged 1 commit into from
Apr 11, 2018

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Dec 15, 2017

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.

Resolves #12271

Test Plan: defined in #12271

New layout
image

Reviewer Checklist:

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

@codecov-io
Copy link

codecov-io commented Dec 15, 2017

Codecov Report

Merging #12299 into master will decrease coverage by 0.05%.
The diff coverage is 57.57%.

@@            Coverage Diff             @@
##           master   #12299      +/-   ##
==========================================
- Coverage   56.77%   56.72%   -0.06%     
==========================================
  Files         285      285              
  Lines       29042    29075      +33     
  Branches     4800     4806       +6     
==========================================
+ Hits        16489    16493       +4     
- Misses      12553    12582      +29
Flag Coverage Δ
#unittest 56.72% <57.57%> (-0.06%) ⬇️
Impacted Files Coverage Δ
...rer/components/preferences/payment/deletedSites.js 41.02% <0%> (-7.46%) ⬇️
app/renderer/components/preferences/paymentsTab.js 68.27% <20%> (-2.95%) ⬇️
...erer/components/preferences/payment/ledgerTable.js 85.71% <66.66%> (-0.42%) ⬇️
app/sessionStore.js 87.79% <84.21%> (-0.62%) ⬇️
js/stores/appStoreRenderer.js 91.66% <0%> (-8.34%) ⬇️
app/renderer/components/reduxComponent.js 57.75% <0%> (-3.45%) ⬇️
js/stores/windowStore.js 28.46% <0%> (-0.3%) ⬇️

@LaurenWags
Copy link
Member

Verified the following:

  1. When YT channel is removed from ledger table via trash can it displays under Shields > Saved Site Exceptions > Brave Payments in a readable format (same as on ledger table without the link)
  2. When you click the x next to a YT channel on Shields > Saved Site Exceptions > Brave Payments it is re-added to ledger table when the channel is visited next and displays in a readable format (with link)
  3. When you delete this YT channel from ledger table via trash can it displays under Shields > Saved Site Exceptions > Brave Payments again in the same readable format.
  4. Multiple YT channels removed from ledger table display under Shields > Saved Site Exceptions > Brave Payments as expected.

@NejcZdovc NejcZdovc added this to the 0.19.x Hotfix 9 milestone Dec 16, 2017
@NejcZdovc
Copy link
Contributor Author

added session conversion as well. @bsclifton wdyt, should we go with versions like I did or should we use timestamp check?

try { runWidevineCleanup = compareVersions(data.lastAppVersion, '0.18.25') < 1 } catch (e) {}
try {
runWidevineCleanup = compareVersions(data.lastAppVersion, '0.18.25') < 1
formatPublishers = compareVersions(data.lastAppVersion, '0.22.0') < 1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

we need to change this to 0.19.118, but is here for testing purposes for now

@bsclifton bsclifton modified the milestones: 0.19.x Hotfix 9, 0.21.x (Developer Channel) Dec 20, 2017
@NejcZdovc NejcZdovc modified the milestones: 0.21.x (Developer Channel), 0.20.x Hotfix 1 Jan 16, 2018
@alexwykoff alexwykoff modified the milestones: 0.20.x Hotfix 3 (Ledger improvments), 0.21.x (Beta Channel) Feb 6, 2018
@NejcZdovc
Copy link
Contributor Author

blocked on #13056

@alexwykoff alexwykoff modified the milestones: 0.22.x (Developer Channel), Backlog (Prioritized) Feb 27, 2018
@alexwykoff alexwykoff added the priority/P5 Cosmetic. Spelling, copy, layout. New features (which should also be part of an initiative). label Feb 27, 2018
@bsclifton bsclifton modified the milestones: Backlog (Prioritized), Completed work Feb 28, 2018
Copy link
Member

@mrose17 mrose17 left a comment

Choose a reason for hiding this comment

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

after rebase, please ping me.

@NejcZdovc
Copy link
Contributor Author

@mrose17 ready

@NejcZdovc NejcZdovc requested a review from mrose17 March 14, 2018 23:03
Copy link
Contributor

@jasonrsadler jasonrsadler left a comment

Choose a reason for hiding this comment

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

Works great!
++

@NejcZdovc NejcZdovc modified the milestones: Completed work, 0.22.x Release 2, 0.22.x Release 3 (Beta channel) Apr 10, 2018
@NejcZdovc NejcZdovc merged commit 0b9e0a8 into brave:master Apr 11, 2018
NejcZdovc added a commit that referenced this pull request Apr 11, 2018
Fixes formatting for YT on shields page
NejcZdovc added a commit that referenced this pull request Apr 11, 2018
Fixes formatting for YT on shields page
@NejcZdovc
Copy link
Contributor Author

master 0b9e0a8
0.23 1cce79a
0.22 5a002f6

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
feature/rewards feature/shields priority/P5 Cosmetic. Spelling, copy, layout. New features (which should also be part of an initiative).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants