This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
Fixes url bar shape when payment is disabled #8207
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@srirambv would you be able to give this one a go? 😄 |
| @@ -242,7 +246,7 @@ class NavigationBar extends ImmutableComponent { | |||
| urlbar={this.props.navbar.get('urlbar')} | |||
| onStop={this.onStop} | |||
| menubarVisible={this.props.menubarVisible} | |||
| noBorderRadius={!isSourceAboutUrl(this.props.location)} | |||
| noBorderRadius={(isSourceAboutUrl(this.props.location) && this.isPublisherButtonEnabled) || this.isPublisherButtonEnabled} | |||
There was a problem hiding this comment.
I think you don't need to check aboutUrls since it will return false with UrlUtil.isHttpOrHttps.
noBorderRadius={this.isPublisherButtonEnabled} should work as expected
There was a problem hiding this comment.
Let me try to rework it. I found another example that is not working correctly:
Resolves brave#8170 Auditors: @srirambv @bsclifton Test Plan: - with payments disabled visit a site - url border should be shaped
NejcZdovc
force-pushed
the
hotfix/#8170-urlbar
branch
from
f8f6d74
to
97da92d
Compare
|
@bsclifton @cezaraugusto I changed the logic now to be the same as is for |
|
Tested on Windows. Looks good and neat 👍 |
srirambv
approved these changes
Apr 11, 2017
bsclifton
pushed a commit
that referenced
this pull request
Apr 11, 2017
Resolves #8170 Auditors: @srirambv @bsclifton Test Plan: - with payments disabled visit a site - url border should be shaped
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git rebase -ito squash commits (if needed).Resolves #8170
Auditors
@srirambv @bsclifton
Test Plan