Skip to content

Commit

Permalink
Merge pull request #6756 from brave/fix-11958
Browse files Browse the repository at this point in the history
Fixes breaking amount input field on Windows and Linux
  • Loading branch information
ryanml committed Oct 4, 2020
1 parent 659ac25 commit 85a2b5c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
14 changes: 0 additions & 14 deletions browser/extensions/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,6 @@ source_set("extensions") {
configs += [ ":infura_config" ]
}

if (binance_enabled) {
sources += [
"api/binance_api.cc",
"api/binance_api.h",
]
}

if (brave_together_enabled) {
sources += [
"api/brave_together_api.cc",
"api/brave_together_api.h",
]
}

deps = [
":resources",
"//base",
Expand Down
5 changes: 4 additions & 1 deletion browser/extensions/api/moonpay_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@

namespace {
bool IsMoonpayAPIAvailable(content::BrowserContext* context) {
return brave::IsRegularProfile(context);
Profile* profile = Profile::FromBrowserContext(context);
return !brave::IsTorProfile(profile) &&
!profile->IsIncognitoProfile() &&
!profile->IsGuestSession();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ export const AmountInput = styled<StyleProps, 'input'>('input')`
border-right: none;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
width: 75%;
${(p) => p.dropdownShowing
? css`
Expand All @@ -160,7 +161,7 @@ export const FiatDropdown = styled<StyleProps, 'div'>('div')`
display: inline-block;
height: 40px;
vertical-align: bottom;
width: 64px;
width: 25%;
padding-top: 10px;
cursor: pointer;
border-top-left-radius: 0px;
Expand Down

0 comments on commit 85a2b5c

Please sign in to comment.