Skip to content
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

GH-2188 - Adjustments for Ghostery Browser #622

Merged
merged 5 commits into from Oct 26, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

set hub settings for Ghostery browser

  • Loading branch information
christophertino committed Oct 23, 2020
commit 5bf5c45fbb1810ebc4be352aa7808638b794a035
@@ -110,8 +110,8 @@ class SetupViewContainer extends Component {
actions.setAntiTracking({ enable_anti_tracking: true });
actions.setAdBlock({ enable_ad_block: true });
actions.setSmartBlocking({ enable_smart_block: true });
actions.setGhosteryRewards({ enable_ghostery_rewards: !IS_FIREFOX && !IS_ANDROID });
actions.setHumanWeb({ enable_human_web: !IS_FIREFOX || BROWSER_INFO.name === 'ghostery_android' });
actions.setGhosteryRewards({ enable_ghostery_rewards: !IS_FIREFOX && !IS_ANDROID && BROWSER_INFO.name !== 'ghostery_desktop' });
actions.setHumanWeb({ enable_human_web: !IS_FIREFOX || BROWSER_INFO.name === 'ghostery_desktop' || BROWSER_INFO.name === 'ghostery_android' });
}

/**
@@ -14,9 +14,6 @@
import React from 'react';
import { openSupportPage, openHubPage } from '../utils/msg';
import PanelToTabLink from './BuildingBlocks/PanelToTabLink';
import globals from '../../../src/classes/Globals';

const { BROWSER_INFO } = globals;

/**
* Render Help view that user can open from the header drop-down menu
@@ -26,11 +23,9 @@ const Help = () => (
<div className="row">
<div className="small-12 columns">
<h1>{t('panel_help_panel_header')}</h1>
{ BROWSER_INFO.name !== 'ghostery_desktop' && (
<div className="support-section">
<a href="#" onClick={openHubPage}>{t('panel_help_setup')}</a>
</div>
)}
<div className="support-section">
<a href="#" onClick={openHubPage}>{t('panel_help_setup')}</a>
</div>
<div className="support-section">
<h3>{t('panel_help_questions_header')}</h3>
<PanelToTabLink href="https://www.ghostery.com/faqs/">{t('panel_help_faq')}</PanelToTabLink>
ProTip! Use n and p to navigate between commits in a pull request.