Skip to content

/ ghostery-extension

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature/reward signal hotfix #111

Merged
merged 6 commits into from Jun 22, 2018
+135 −74
Merged

feature/reward signal hotfix #111

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc608d9
GH-1177
trickpattyFH20 Jun 20, 2018
17aede1
remove listener for offer shown + GH-1234
trickpattyFH20 Jun 20, 2018
5886905
fix disconnect listener
trickpattyFH20 Jun 20, 2018
bd8a202
hub closed signal on disconnect
trickpattyFH20 Jun 22, 2018
3e029a4
Merge branch 'develop' into feature/reward-signal-hotfix
trickpattyFH20 Jun 22, 2018
6db7d07
Merge branch 'develop' into feature/reward-signal-hotfix
trickpattyFH20 Jun 22, 2018
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
Loading status checks…
Merge branch 'develop' into feature/reward-signal-hotfix
  • Loading branch information
@trickpattyFH20
trickpattyFH20 committed Jun 22, 2018
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
commit 6db7d074dc2693b2eff4d17b7843eeb2f3b4f7a6
3 app/content-scripts/rewards/OfferCard.jsx
View file
Open in desktop
@@ -131,9 +131,8 @@ class OfferCard extends Component {
}

disableRewards() {
this.props.actions.sendSignal('rewards_off', false);
sendMessage('ping', 'rewards_off');
this.props.actions.messageBackground('rewardsDisabled');
this.props.actions.sendSignal('rewards_off', null, false);
}

disableRewardsNotification() {
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.