{t('hub_tutorial_antisuite_antitracking_description')}
@@ -64,7 +64,7 @@ const TutorialAntiSuiteView = ({ isAndroid }) => (
- {t('enhanced_ad_blocking')}
+ {t('ad_blocking')}
{t('ad_blocking_DESC')}
@@ -72,13 +72,13 @@ const TutorialAntiSuiteView = ({ isAndroid }) => (
-
+
- {t('smart_blocking')}
+ {t('smart_browsing')}
- {t('smart_blocking_DESC')}
+ {t('smart_browsing_DESC')}
diff --git a/app/hub/Views/TutorialViews/TutorialAntiSuiteView/__test__/__snapshots__/TutorialAntiSuiteView.test.jsx.snap b/app/hub/Views/TutorialViews/TutorialAntiSuiteView/__test__/__snapshots__/TutorialAntiSuiteView.test.jsx.snap
index bed91e7ce..e9acc6d0a 100644
--- a/app/hub/Views/TutorialViews/TutorialAntiSuiteView/__test__/__snapshots__/TutorialAntiSuiteView.test.jsx.snap
+++ b/app/hub/Views/TutorialViews/TutorialAntiSuiteView/__test__/__snapshots__/TutorialAntiSuiteView.test.jsx.snap
@@ -51,7 +51,7 @@ exports[`app/hub/Views/TutorialViews/TutorialAntiSuiteView component Snapshot te
- enhanced_anti_tracking
+ anti_tracking
- enhanced_ad_blocking
+ ad_blocking
- smart_blocking
+ smart_browsing
- smart_blocking_DESC
+ smart_browsing_DESC
diff --git a/app/panel-android/actions/blockingActions.js b/app/panel-android/actions/blockingActions.js
index d8c248a3c..ac37b23d9 100644
--- a/app/panel-android/actions/blockingActions.js
+++ b/app/panel-android/actions/blockingActions.js
@@ -421,7 +421,7 @@ export function resetSettings({ state }) {
paused_blocking: false,
enable_anti_tracking: true,
enable_ad_block: true,
- enable_smart_block: true,
+ enable_smart_browse: true,
});
return {
@@ -439,7 +439,7 @@ export function resetSettings({ state }) {
panel: {
enable_anti_tracking: true,
enable_ad_block: true,
- enable_smart_block: true,
+ enable_smart_browse: true,
},
};
}
diff --git a/app/panel-android/components/PanelAndroid.jsx b/app/panel-android/components/PanelAndroid.jsx
index 43eb6eacd..12a638cb7 100644
--- a/app/panel-android/components/PanelAndroid.jsx
+++ b/app/panel-android/components/PanelAndroid.jsx
@@ -35,8 +35,8 @@ class PanelAndroid extends React.Component {
panel: {
enable_ad_block: false,
enable_anti_tracking: false,
- enable_smart_block: false,
- smartBlock: { blocked: {}, unblocked: {} },
+ enable_smart_browse: false,
+ smartBrowse: { blocked: {}, unblocked: {} },
},
summary: {
categories: [],
diff --git a/app/panel-android/components/content/BlockingTracker.jsx b/app/panel-android/components/content/BlockingTracker.jsx
index 584551e05..8f8e86341 100644
--- a/app/panel-android/components/content/BlockingTracker.jsx
+++ b/app/panel-android/components/content/BlockingTracker.jsx
@@ -25,11 +25,11 @@ class BlockingTracker extends React.Component {
catId = '',
ss_allowed = false,
ss_blocked = false,
- warningSmartBlock = false,
+ warningSmartBrowse = false,
} = tracker;
if (type === 'site') {
- if (warningSmartBlock) {
+ if (warningSmartBrowse) {
return 'override-sb';
}
@@ -214,7 +214,7 @@ class BlockingTracker extends React.Component {
renderTrackerStatus() {
const trackerSelect = this.trackerSelectStatus;
const trackerSelectClassNames = ClassNames({
- OverrideSmartBlock: trackerSelect === 'override-sb',
+ OverrideSmartBrowse: trackerSelect === 'override-sb',
BlockingSelectButton: trackerSelect.indexOf('override-') === -1,
BlockingSelectButton__blocked: trackerSelect === 'blocked',
BlockingSelectButton__trusted: trackerSelect === 'trusted',
@@ -277,15 +277,15 @@ class BlockingTracker extends React.Component {
);
}
- renderSmartBlockOverflow() {
+ renderSmartBrowseOverflow() {
const { open, tracker } = this.props;
- const { warningSmartBlock } = tracker;
+ const { warningSmartBrowse } = tracker;
const selectGroupClassNames = ClassNames('OverrideText full-height',
'flex-container align-center-middle', {
'OverrideText--open': open,
});
- const text = (warningSmartBlock && warningSmartBlock === 'blocked') ?
- t('panel_tracker_warning_smartblock_tooltip') :
+ const text = (warningSmartBrowse && warningSmartBrowse === 'blocked') ?
+ t('panel_tracker_warning_smartbrowse_tooltip') :
t('panel_tracker_warning_smartunblock_tooltip');
return (
@@ -363,7 +363,7 @@ class BlockingTracker extends React.Component {
return this.renderUnidentifiedOverflow();
}
if (trackerSelect === 'override-sb') {
- return this.renderSmartBlockOverflow();
+ return this.renderSmartBrowseOverflow();
}
return this.renderBlockingOverflow();
diff --git a/app/panel-android/components/content/OverviewTab.jsx b/app/panel-android/components/content/OverviewTab.jsx
index 579d7e78d..ed07fe672 100644
--- a/app/panel-android/components/content/OverviewTab.jsx
+++ b/app/panel-android/components/content/OverviewTab.jsx
@@ -74,12 +74,12 @@ class OverviewTab extends React.Component {
return (trackerCounts && (trackerCounts.allowed + trackerCounts.blocked)) || 0;
}
- get smartBlockBlocked() {
+ get smartBrowseBlocked() {
const { panel, summary } = this.props;
- const { smartBlock } = panel;
+ const { smartBrowse } = panel;
const { trackerCounts } = summary;
- let sbBlocked = (smartBlock && smartBlock.blocked && Object.keys(smartBlock.blocked).length) || 0;
+ let sbBlocked = (smartBrowse && smartBrowse.blocked && Object.keys(smartBrowse.blocked).length) || 0;
if (sbBlocked === trackerCounts.sbBlocked) {
sbBlocked = 0;
}
@@ -87,12 +87,12 @@ class OverviewTab extends React.Component {
return sbBlocked;
}
- get smartBlockAllowed() {
+ get smartBrowseAllowed() {
const { panel, summary } = this.props;
- const { smartBlock } = panel;
+ const { smartBrowse } = panel;
const { trackerCounts } = summary;
- let sbAllowed = (smartBlock && smartBlock.unblocked && Object.keys(smartBlock.unblocked).length) || 0;
+ let sbAllowed = (smartBrowse && smartBrowse.unblocked && Object.keys(smartBrowse.unblocked).length) || 0;
if (sbAllowed === trackerCounts.sbAllowed) {
sbAllowed = 0;
}
@@ -100,11 +100,11 @@ class OverviewTab extends React.Component {
return sbAllowed;
}
- get smartBlockAdjust() {
+ get smartBrowseAdjust() {
const { panel } = this.props;
- const { enable_smart_block } = panel;
+ const { enable_smart_browse } = panel;
- return enable_smart_block && ((this.smartBlockBlocked - this.smartBlockAllowed) || 0);
+ return enable_smart_browse && ((this.smartBrowseBlocked - this.smartBrowseAllowed) || 0);
}
get trackersBlockedCount() {
@@ -117,7 +117,7 @@ class OverviewTab extends React.Component {
} else if (sitePolicy === BLACKLISTED) {
totalTrackersBlockedCount = trackerCounts.blocked + trackerCounts.allowed || 0;
} else {
- totalTrackersBlockedCount = trackerCounts.blocked + this.smartBlockAdjust || 0;
+ totalTrackersBlockedCount = trackerCounts.blocked + this.smartBrowseAdjust || 0;
}
return totalTrackersBlockedCount;
@@ -313,7 +313,7 @@ class OverviewTab extends React.Component {
_renderCliqzFeatures() {
const { panel, summary } = this.props;
- const { enable_anti_tracking, enable_ad_block, enable_smart_block } = panel;
+ const { enable_anti_tracking, enable_ad_block, enable_smart_browse } = panel;
const { paused_blocking, sitePolicy } = summary;
const disableBlocking = this.siteNotScanned;
@@ -340,8 +340,8 @@ class OverviewTab extends React.Component {
@@ -392,8 +392,8 @@ OverviewTab.propTypes = {
panel: PropTypes.shape({
enable_ad_block: PropTypes.bool.isRequired,
enable_anti_tracking: PropTypes.bool.isRequired,
- enable_smart_block: PropTypes.bool.isRequired,
- smartBlock: PropTypes.shape({
+ enable_smart_browse: PropTypes.bool.isRequired,
+ smartBrowse: PropTypes.shape({
blocked: PropTypes.shape({}).isRequired,
unblocked: PropTypes.shape({}).isRequired,
}).isRequired,
diff --git a/app/panel-android/components/content/__tests__/OverviewTab.jsx b/app/panel-android/components/content/__tests__/OverviewTab.jsx
index 4fec3f938..17f7661e1 100644
--- a/app/panel-android/components/content/__tests__/OverviewTab.jsx
+++ b/app/panel-android/components/content/__tests__/OverviewTab.jsx
@@ -24,8 +24,8 @@ describe('app/panel-android/components/content/OverviewTab.jsx', () => {
const panel = {
enable_ad_block: false,
enable_anti_tracking: false,
- enable_smart_block: false,
- smartBlock: { blocked: {}, unblocked: {} },
+ enable_smart_browse: false,
+ smartBrowse: { blocked: {}, unblocked: {} },
};
const summary = {
categories: [],
@@ -63,8 +63,8 @@ describe('app/panel-android/components/content/OverviewTab.jsx', () => {
const panel = {
enable_ad_block: true,
enable_anti_tracking: true,
- enable_smart_block: true,
- smartBlock: { blocked: { 1: true }, unblocked: { 2: true, 3: true } },
+ enable_smart_browse: true,
+ smartBrowse: { blocked: { 1: true }, unblocked: { 2: true, 3: true } },
};
const summary = {
categories: ['ads', 'trackers'],
@@ -104,8 +104,8 @@ describe('app/panel-android/components/content/OverviewTab.jsx', () => {
const panel = {
enable_ad_block: false,
enable_anti_tracking: false,
- enable_smart_block: false,
- smartBlock: { blocked: {}, unblocked: {} },
+ enable_smart_browse: false,
+ smartBrowse: { blocked: {}, unblocked: {} },
};
const summary = {
categories: [],
diff --git a/app/panel-android/components/content/__tests__/__snapshots__/OverviewTab.jsx.snap b/app/panel-android/components/content/__tests__/__snapshots__/OverviewTab.jsx.snap
index d345de9e4..fe71a256d 100644
--- a/app/panel-android/components/content/__tests__/__snapshots__/OverviewTab.jsx.snap
+++ b/app/panel-android/components/content/__tests__/__snapshots__/OverviewTab.jsx.snap
@@ -180,7 +180,7 @@ exports[`app/panel-android/components/content/OverviewTab.jsx Snapshot tests wit
- enhanced_anti_tracking
+ anti_tracking
@@ -202,7 +202,7 @@ exports[`app/panel-android/components/content/OverviewTab.jsx Snapshot tests wit