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

Commit

Permalink
Merge pull request #79 from brave/shields_total_blocked
Browse files Browse the repository at this point in the history
properly merge ads and trackers blocked list
  • Loading branch information
cezaraugusto authored Oct 30, 2018
2 parents 5e821c9 + f418a5a commit 6ba9928
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/components/braveShields/interfaceControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default class ShieldsInterfaceControls extends React.PureComponent<Props,

get totalAdsTrackersBlockedList (): Array<string> {
const { adsBlockedResources, trackersBlockedResources } = this.props
return Object.assign(adsBlockedResources, trackersBlockedResources)
return [...adsBlockedResources, ...trackersBlockedResources]
}

onChangeBlockAds = (event: React.ChangeEvent<HTMLInputElement>) => {
Expand Down

0 comments on commit 6ba9928

Please sign in to comment.