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

Fixed issue #13256 - Removing or modifying URL will now hide EVC #13295

Closed
wants to merge 3 commits into from
Closed

Fixed issue #13256 - Removing or modifying URL will now hide EVC #13295

wants to merge 3 commits into from

Conversation

jasonrsadler
Copy link
Contributor

@jasonrsadler jasonrsadler commented Feb 24, 2018

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:

Fixes: #13256

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

@bsclifton @srirambv

@codecov-io
Copy link

codecov-io commented Feb 24, 2018

Codecov Report

Merging #13295 into master will not change coverage.
The diff coverage is 0%.

@@           Coverage Diff           @@
##           master   #13295   +/-   ##
=======================================
  Coverage   56.01%   56.01%           
=======================================
  Files         282      282           
  Lines       28211    28211           
  Branches     4642     4642           
=======================================
  Hits        15801    15801           
  Misses      12410    12410
Flag Coverage Δ
#unittest 56.01% <0%> (ø) ⬆️
Impacted Files Coverage Δ
...r/components/preferences/payment/ledgerRecovery.js 37.25% <0%> (ø) ⬆️

@srirambv srirambv added this to the 0.23.x (Nightly Channel) milestone Feb 27, 2018
@bsclifton bsclifton modified the milestones: 0.23.x (Nightly Channel), 0.24.x (coming soon), 0.22.x (Developer Channel) Feb 27, 2018
@NejcZdovc NejcZdovc removed their request for review February 27, 2018 06:06
@alexwykoff alexwykoff added the priority/P3 Major loss of function. label Feb 27, 2018
@alexwykoff alexwykoff modified the milestones: 0.22.x (Developer Channel), Backlog (Prioritized) Feb 27, 2018
@alexwykoff
Copy link
Contributor

If not reviewed by eob, will be punted to later release.

@diracdeltas diracdeltas self-requested a review February 27, 2018 18:32
@@ -64,7 +65,7 @@ class UrlBar extends React.Component {
}

maybeUrlBarTextChanged (value) {
if (value !== this.props.urlbarLocation) {
if (value !== this.props.urlbarLocation) {
Copy link
Member

Choose a reason for hiding this comment

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

please remove trailing whitespace. i think npm run lint should catch this

@@ -52,6 +52,7 @@ class UrlBar extends React.Component {
this.lastVal = ''
this.lastSuffix = ''
this.isOnComposition = false
this.isChanging = false;
Copy link
Member

Choose a reason for hiding this comment

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

no trailing semicolon

@jasonrsadler
Copy link
Contributor Author

Running lint did indeed catch it. Sorry about those old habits.

@@ -501,7 +513,7 @@ class UrlBar extends React.Component {
<UrlBarIcon
titleMode={this.props.titleMode}
/>
{this.showEvCert}
{this.showEvCert }
Copy link
Member

Choose a reason for hiding this comment

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

extra space before the bracket

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Linter didn't catch that one

@@ -52,6 +52,7 @@ class UrlBar extends React.Component {
this.lastVal = ''
this.lastSuffix = ''
this.isOnComposition = false
this.isChanging = false
Copy link
Member

Choose a reason for hiding this comment

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

why not use this.props.isActive for this purpose?

@jasonrsadler
Copy link
Contributor Author

Yes. That works. Didn't know about props.isActive.

Fixed issue #13256 - Removing or modifying URL will now hide EVC

Updated to pass linting

Convention clean up

Fixed issue #13256 - Removing or modifying URL will now hide EVC
# This is the 1st commit message:

Fixes #11422, keeps recovery modal open after a recovery failure

# This is the commit message #2:

Fixed issue #13256 - Removing or modifying URL will now hide EVC

# This is the commit message #3:

Updated to pass linting

# This is the commit message #4:

Convention clean up
@@ -489,7 +493,7 @@ class UrlBar extends React.Component {
}

get showEvCert () {
if (this.props.titleMode) {
if (this.props.titleMode || this.props.isActive) {
Copy link
Member

Choose a reason for hiding this comment

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

awesome, this simplifies things a lot :)

@@ -31,8 +31,10 @@ class LedgerRecoveryContent extends ImmutableComponent {
this.props.handleRecoveryKeyChange(e.target.value)
}

clearRecoveryStatus () {
this.props.hideAdvancedOverlays()
clearRecoveryStatus (success) {
Copy link
Member

Choose a reason for hiding this comment

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

i think the changes to this and the following files aren't supposed to be here

Copy link
Contributor Author

@jasonrsadler jasonrsadler Feb 27, 2018

Choose a reason for hiding this comment

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

I went back too far on the squash

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@diracdeltas Is this back to normal with the right changes?

@jasonrsadler
Copy link
Contributor Author

I hosed this. Moving to PR #13335

@bsclifton bsclifton closed this Feb 27, 2018
@bsclifton bsclifton removed this from the 0.22.x (Developer Channel) milestone Feb 27, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
feature/URLbar priority/P3 Major loss of function.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants