-
- );
- }
-}
-
-export default RewardsView;
diff --git a/app/hub/Views/RewardsView/RewardsView.scss b/app/hub/Views/RewardsView/RewardsView.scss
deleted file mode 100644
index 3da218100..000000000
--- a/app/hub/Views/RewardsView/RewardsView.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Rewards View Sass
- *
- * Ghostery Browser Extension
- * https://www.ghostery.com/
- *
- * Copyright 2019 Ghostery, Inc. All rights reserved.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0
- */
-
-// Rewards View
-.RewardsView {
- background: linear-gradient(#daf4ff, #ffffff 30%) no-repeat;
-}
-.RewardsView--paddingTop {
- padding-top: 80px;
-}
-.RewardsView__screenshot {
- max-width: 430px;
- padding-right: 50px;
-}
-.RewardsView__headerText {
- padding-left: 50px;
- line-height: 38px;
- max-width: 350px;
-}
-.RewardsView__headerTitle {
- font-size: 24px;
- font-weight: 700;
-}
-.RewardsView__headerDescription {
- font-size: 14px;
-}
-.RewardsView__buttonContainer {
- padding-top: 20px;
-}
-.RewardsView__button {
- font-size: 14px;
-}
-.RewardsView__promoFeature {
- padding: 40px 50px 100px 50px;
- font-size: 14px;
- max-width: 250px;
-}
-.RewardsView__promoTitle {
- line-height: 38px;
- font-weight: 700;
- text-align: center;
-}
-.RewardsView__promoDescription {
- line-height: 30px;
- text-align: center;
-}
-.RewardsView__promoIcon {
- height: 85px;
- width: 100%;
- background-size: contain;
- background-repeat: no-repeat;
- background-position: center center;
-}
-.RewardsView__lightBulbIcon {
- background-image: buildIconLightBulb(#4a4a4a, #daf4ff);
-}
-.RewardsView__eyeIcon {
- background-image: buildIconEye(#4a4a4a, #daf4ff);
-}
-.RewardsView__starIcon {
- background-image: buildIconStar(#4a4a4a, #daf4ff);
-}
-.RewardsView__backgroundStars {
- padding-bottom: 60px;
- background:
- url('/app/images/hub/rewards/background-stars-left.svg') no-repeat left 70px bottom 20px,
- url('/app/images/hub/rewards/background-stars-right.svg') no-repeat right 70px bottom 50px;
-}
-.RewardsView__closerText {
- font-size: 14px;
-}
-@media only screen and (max-width: 960px) {
- .RewardsView--paddingTop {
- padding-top: 0;
- }
- .RewardsView__screenshot {
- padding: 40px 90px 0 90px;
- }
- .RewardsView__headerText {
- padding: 50px;
- align-items: center;
- text-align: center;
- }
- .RewardsView__promoFeature {
- padding: 50px 100px;
- }
- .RewardsView__closerText {
- padding: 100px 140px 0 140px;
- }
- .RewardsView__backgroundStars {
- background:
- url('/app/images/hub/rewards/background-stars-left.svg') no-repeat left 30px bottom 20px,
- url('/app/images/hub/rewards/background-stars-right.svg') no-repeat right 30px bottom 50px;
- }
-}
-@media only screen and (max-width: 600px) {
- .RewardsView__screenshot {
- padding: 40px 50px 0 50px;
- }
- .RewardsView__promoFeature {
- padding: 50px 50px;
- }
- .RewardsView__closerText {
- padding: 100px 100px 0 100px;
- }
- .RewardsView__backgroundStars {
- background:
- url('/app/images/hub/rewards/background-stars-left.svg') no-repeat left 20px bottom 20px,
- url('/app/images/hub/rewards/background-stars-right.svg') no-repeat right 20px bottom 50px;
- }
-}
-@media only screen and (max-width: 400px) {
- .RewardsView__closerText {
- padding: 100px 60px 50px 60px;
- }
-}
diff --git a/app/hub/Views/RewardsView/__tests__/RewardsView.test.jsx b/app/hub/Views/RewardsView/__tests__/RewardsView.test.jsx
deleted file mode 100644
index 84ff39e9d..000000000
--- a/app/hub/Views/RewardsView/__tests__/RewardsView.test.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Reward View Test Component
- *
- * Ghostery Browser Extension
- * https://www.ghostery.com/
- *
- * Copyright 2019 Ghostery, Inc. All rights reserved.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0
- */
-
-import React from 'react';
-import renderer from 'react-test-renderer';
-import { shallow } from 'enzyme';
-import RewardsView from '../RewardsView';
-
-describe('app/hub/Views/RewardsView component', () => {
- describe('Snapshot tests with react-test-renderer', () => {
- test('rewards view is rendered correctly', () => {
- const component = renderer.create(
-
-
-
- 
-
-
-
-
-
- {t('hub_rewards_header_title')}
-
-
- {t('hub_rewards_header_description')}
-
-
-
-
-
-
-
-
- {t('hub_rewards_experience_title')}
-
-
- {t('hub_rewards_experience_description')}
-
-
-
-
-
- {t('hub_rewards_privacy_title')}
-
-
- {t('hub_rewards_privacy_description')}
-
-
-
-
-
- {t('hub_rewards_relevant_title')}
-
-
- {t('hub_rewards_relevant_description')}
-
-
-
-
-
-
- {t('hub_rewards_closer')}
-
-
-
-`;
diff --git a/app/hub/Views/RewardsView/index.js b/app/hub/Views/RewardsView/index.js
deleted file mode 100644
index 26f5ddbe9..000000000
--- a/app/hub/Views/RewardsView/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Point of entry index.js file for Rewards View
- *
- * Ghostery Browser Extension
- * https://www.ghostery.com/
- *
- * Copyright 2019 Ghostery, Inc. All rights reserved.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0
- */
-
-import RewardsView from './RewardsView';
-
-export default RewardsView;
diff --git a/app/hub/Views/SetupView/SetupViewConstants.js b/app/hub/Views/SetupView/SetupViewConstants.js
index 73744d686..30d0af60d 100644
--- a/app/hub/Views/SetupView/SetupViewConstants.js
+++ b/app/hub/Views/SetupView/SetupViewConstants.js
@@ -29,7 +29,6 @@ export const BLOCKING_POLICY_CUSTOM = 'BLOCKING_POLICY_CUSTOM';
export const SET_ANTI_TRACKING = 'SET_ANTI_TRACKING';
export const SET_AD_BLOCK = 'SET_AD_BLOCK';
export const SET_SMART_BLOCK = 'SET_SMART_BLOCK';
-export const SET_GHOSTERY_REWARDS = 'SET_GHOSTERY_REWARDS';
// Setup Human Web
export const SET_HUMAN_WEB = 'SET_HUMAN_WEB';
diff --git a/app/hub/Views/SetupView/SetupViewContainer.jsx b/app/hub/Views/SetupView/SetupViewContainer.jsx
index 6d4eb087c..90a98fb1a 100644
--- a/app/hub/Views/SetupView/SetupViewContainer.jsx
+++ b/app/hub/Views/SetupView/SetupViewContainer.jsx
@@ -29,7 +29,6 @@ import SetupDoneView from '../SetupViews/SetupDoneView';
const { BROWSER_INFO } = globals;
const IS_FIREFOX = (BROWSER_INFO.name === 'firefox');
-const IS_ANDROID = (BROWSER_INFO.os === 'android');
/**
* @class Implement the Setup View for the Ghostery Hub
@@ -110,7 +109,6 @@ 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 && BROWSER_INFO.name !== 'ghostery_desktop' });
actions.setHumanWeb({ enable_human_web: !IS_FIREFOX || BROWSER_INFO.name === 'ghostery_desktop' || BROWSER_INFO.name === 'ghostery_android' });
}
@@ -249,7 +247,6 @@ SetupViewContainer.propTypes = {
enable_anti_tracking: PropTypes.bool,
enable_ad_block: PropTypes.bool,
enable_smart_block: PropTypes.bool,
- enable_ghostery_rewards: PropTypes.bool,
enable_human_web: PropTypes.bool,
}),
actions: PropTypes.shape({
@@ -262,7 +259,6 @@ SetupViewContainer.propTypes = {
setAntiTracking: PropTypes.func.isRequired,
setAdBlock: PropTypes.func.isRequired,
setSmartBlocking: PropTypes.func.isRequired,
- setGhosteryRewards: PropTypes.func.isRequired,
setHumanWeb: PropTypes.func.isRequired,
setSetupComplete: PropTypes.func.isRequired,
}).isRequired,
@@ -286,7 +282,6 @@ SetupViewContainer.defaultProps = {
enable_anti_tracking: true,
enable_ad_block: true,
enable_smart_block: true,
- enable_ghostery_rewards: true,
enable_human_web: true,
},
};
diff --git a/app/hub/Views/SetupView/SetupViewReducer.js b/app/hub/Views/SetupView/SetupViewReducer.js
index 46c5c51a1..b061d2461 100644
--- a/app/hub/Views/SetupView/SetupViewReducer.js
+++ b/app/hub/Views/SetupView/SetupViewReducer.js
@@ -20,7 +20,6 @@ import {
SET_ANTI_TRACKING,
SET_AD_BLOCK,
SET_SMART_BLOCK,
- SET_GHOSTERY_REWARDS,
SET_HUMAN_WEB
} from './SetupViewConstants';
@@ -42,7 +41,6 @@ function SetupViewReducer(state = initialState, action) {
enable_anti_tracking,
enable_ad_block,
enable_smart_block,
- enable_ghostery_rewards,
enable_human_web,
} = action.data;
const {
@@ -71,7 +69,6 @@ function SetupViewReducer(state = initialState, action) {
enable_anti_tracking,
enable_ad_block,
enable_smart_block,
- enable_ghostery_rewards,
enable_human_web,
}
};
@@ -122,10 +119,6 @@ function SetupViewReducer(state = initialState, action) {
const { enable_smart_block } = action.data;
return { ...state, setup: { ...state.setup, enable_smart_block } };
}
- case SET_GHOSTERY_REWARDS: {
- const { enable_ghostery_rewards } = action.data;
- return { ...state, setup: { ...state.setup, enable_ghostery_rewards } };
- }
// Setup Human Web View
case SET_HUMAN_WEB: {
diff --git a/app/hub/Views/SetupView/__tests__/SetupViewContainer.test.jsx b/app/hub/Views/SetupView/__tests__/SetupViewContainer.test.jsx
index 163b4ec80..14939e74a 100644
--- a/app/hub/Views/SetupView/__tests__/SetupViewContainer.test.jsx
+++ b/app/hub/Views/SetupView/__tests__/SetupViewContainer.test.jsx
@@ -45,7 +45,6 @@ const actions = {
setAntiTracking: () => {},
setAdBlock: () => {},
setSmartBlocking: () => {},
- setGhosteryRewards: () => {},
setHumanWeb: () => {},
setSetupComplete: () => {},
};
diff --git a/app/hub/Views/SetupView/__tests__/SetupViewReducer.test.js b/app/hub/Views/SetupView/__tests__/SetupViewReducer.test.js
index 865ec3a7b..820922cb3 100644
--- a/app/hub/Views/SetupView/__tests__/SetupViewReducer.test.js
+++ b/app/hub/Views/SetupView/__tests__/SetupViewReducer.test.js
@@ -24,7 +24,6 @@ import {
SET_ANTI_TRACKING,
SET_AD_BLOCK,
SET_SMART_BLOCK,
- SET_GHOSTERY_REWARDS,
SET_HUMAN_WEB
} from '../SetupViewConstants';
@@ -45,7 +44,6 @@ const initialState = Immutable({
enable_anti_tracking: true,
enable_ad_block: true,
enable_smart_block: true,
- enable_ghostery_rewards: true,
enable_human_web: true,
},
});
@@ -172,29 +170,6 @@ describe('app/hub/Views/SetupView reducer', () => {
});
});
- test('reducer correctly handles SET_GHOSTERY_REWARDS', () => {
- const data = {
- test: 'test-bad-data',
- enable_ad_block: true, // Bad Data
- enable_smart_block: false, // Bad Data
- enable_ghostery_rewards: false,
- };
- const action = { data, type: SET_GHOSTERY_REWARDS };
- const initSetupState = Immutable.merge(initialState.setup, {
- test: 'test-good-data',
- example: 'example-good-data',
- enable_ad_block: false,
- });
-
- const updatedSetupState = Immutable.merge(initSetupState, {
- enable_ghostery_rewards: data.enable_ghostery_rewards
- });
-
- expect(SetupViewReducer({ setup: initSetupState }, action)).toEqual({
- setup: updatedSetupState
- });
- });
-
test('reducer correctly handles SET_HUMAN_WEB', () => {
const data = { enable_human_web: false };
const action = { data, type: SET_HUMAN_WEB };
diff --git a/app/hub/Views/SetupView/index.js b/app/hub/Views/SetupView/index.js
index 5bd10681d..6c2f6ae99 100644
--- a/app/hub/Views/SetupView/index.js
+++ b/app/hub/Views/SetupView/index.js
@@ -22,8 +22,7 @@ import setBlockingPolicy from '../SetupViews/SetupBlockingView/SetupBlockingView
import {
setAntiTracking,
setAdBlock,
- setSmartBlocking,
- setGhosteryRewards
+ setSmartBlocking
} from '../SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewActions';
import setHumanWeb from '../SetupViews/SetupHumanWebView/SetupHumanWebViewActions';
import setSetupComplete from '../SetupViews/SetupDoneView/SetupDoneViewActions';
@@ -49,7 +48,6 @@ const mapDispatchToProps = dispatch => ({
setAntiTracking,
setAdBlock,
setSmartBlocking,
- setGhosteryRewards,
setHumanWeb,
setSetupComplete
}, dispatch),
diff --git a/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.scss b/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.scss
index e1ab62416..869422ce8 100644
--- a/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.scss
+++ b/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteView.scss
@@ -71,14 +71,6 @@
background-image: buildSmartBlockingActiveIcon(#1dafed);
}
-// Ghostery Rewards Icon
-.SetupAntiSuite__feature .ghostery-rewards {
- background-image: buildGhosteryRewardsIcon(#9f9f9f);
-}
-.SetupAntiSuite__feature .ghostery-rewards.active {
- background-image: buildGhosteryRewardsActiveIcon(#1dafed);
-}
-
@media only screen and (max-width: 960px) {
.SetupAntiSuite--alignOnMedium {
display: flex;
diff --git a/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewActions.js b/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewActions.js
index f26319b72..973c5bae9 100644
--- a/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewActions.js
+++ b/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewActions.js
@@ -15,8 +15,7 @@ import { log, sendMessageInPromise } from '../../../utils';
import {
SET_ANTI_TRACKING,
SET_AD_BLOCK,
- SET_SMART_BLOCK,
- SET_GHOSTERY_REWARDS
+ SET_SMART_BLOCK
} from '../../SetupView/SetupViewConstants';
export function setAntiTracking(actionData) {
@@ -57,16 +56,3 @@ export function setSmartBlocking(actionData) {
});
};
}
-
-export function setGhosteryRewards(actionData) {
- return function(dispatch) {
- return sendMessageInPromise(SET_GHOSTERY_REWARDS, actionData).then((data) => {
- dispatch({
- type: SET_GHOSTERY_REWARDS,
- data,
- });
- }).catch((err) => {
- log('setupBlocking Action setGhosteryRewards Error', err);
- });
- };
-}
diff --git a/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx b/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx
index bc473de16..2d4b24cc9 100644
--- a/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx
+++ b/app/hub/Views/SetupViews/SetupAntiSuiteView/SetupAntiSuiteViewContainer.jsx
@@ -17,8 +17,7 @@ import SetupAntiSuiteView from './SetupAntiSuiteView';
import globals from '../../../../../src/classes/Globals';
// simple consts
-const { IS_CLIQZ, BROWSER_INFO } = globals;
-const IS_ANDROID = (BROWSER_INFO.os === 'android');
+const { IS_CLIQZ } = globals;
/**
* @class Implement the Setup Anti-Suite View for the Ghostery Hub
@@ -48,13 +47,11 @@ class SetupAntiSuiteViewContainer extends Component {
enable_anti_tracking,
enable_ad_block,
enable_smart_block,
- enable_ghostery_rewards
} = setup;
props.actions.setSetupStep({ setup_step: 9 });
props.actions.setAntiTracking({ enable_anti_tracking });
props.actions.setAdBlock({ enable_ad_block });
props.actions.setSmartBlocking({ enable_smart_block });
- props.actions.setGhosteryRewards({ enable_ghostery_rewards });
}
}
@@ -80,11 +77,6 @@ class SetupAntiSuiteViewContainer extends Component {
actions.setSmartBlocking({ enable_smart_block });
break;
}
- case 'ghostery-rewards': {
- const enable_ghostery_rewards = !setup.enable_ghostery_rewards;
- actions.setGhosteryRewards({ enable_ghostery_rewards });
- break;
- }
default: break;
}
}
@@ -99,7 +91,6 @@ class SetupAntiSuiteViewContainer extends Component {
enable_anti_tracking,
enable_ad_block,
enable_smart_block,
- enable_ghostery_rewards,
} = setup;
const anti_tracking_enabled = IS_CLIQZ ? false : enable_anti_tracking;
@@ -134,16 +125,6 @@ class SetupAntiSuiteViewContainer extends Component {
}
];
- if (!IS_CLIQZ && !IS_ANDROID) {
- features.push({
- id: 'ghostery-rewards',
- name: t('hub_setup_ghosteryrewards_name_rewards'),
- enabled: enable_ghostery_rewards,
- toggle: () => this._handleToggle('ghostery-rewards'),
- description: t('hub_setup_ghosteryrewards_description_rewards'),
- });
- }
-
return
-
-
-
-
-
-
-
-
-
-
-
-
- hub_rewards_experience_title
-
-
- hub_rewards_experience_description
-
-
-
-
-
- hub_rewards_privacy_title
-
-
- hub_rewards_privacy_description
-
-
-
-
-
- hub_rewards_relevant_title
-
-
- hub_rewards_relevant_description
-
-
-
-
-
-
- hub_rewards_closer
-
- 
-