-
Notifications
You must be signed in to change notification settings - Fork 970
Fixed issue #13256 - Removing or modifying URL will now hide EVC #13295
Conversation
Codecov Report
@@ Coverage Diff @@
## master #13295 +/- ##
=======================================
Coverage 56.01% 56.01%
=======================================
Files 282 282
Lines 28211 28211
Branches 4642 4642
=======================================
Hits 15801 15801
Misses 12410 12410
|
If not reviewed by eob, will be punted to later release. |
@@ -64,7 +65,7 @@ class UrlBar extends React.Component { | |||
} | |||
|
|||
maybeUrlBarTextChanged (value) { | |||
if (value !== this.props.urlbarLocation) { | |||
if (value !== this.props.urlbarLocation) { |
There was a problem hiding this comment.
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; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no trailing semicolon
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 } |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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?
Yes. That works. Didn't know about props.isActive. |
# 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) { |
There was a problem hiding this comment.
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) { |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?
I hosed this. Moving to PR #13335 |
Submitter Checklist:
git rebase -i
to squash commits (if needed).Test Plan:
Fixes: #13256
Reviewer Checklist:
Tests
@bsclifton @srirambv