Lint and simplification.

app/panel/actions/PanelActions.js

@@ -16,7 +16,7 @@ import {
 	SHOW_NOTIFICATION,
 	CLOSE_NOTIFICATION,
 	TOGGLE_EXPERT,
-	SET_THEME,
+	SET_THEME
 } from '../constants/constants';
 import { sendMessageInPromise } from '../utils/msg';
 
@@ -107,11 +107,11 @@ export function toggleExpert() {
 export function setTheme(data) {
 	return function (dispatch) {
 		return sendMessageInPromise('setThemeData', data)
-		.then ( result => {
-			dispatch({
-				type: SET_THEME,
-				data: result,
+			.then((result) => {
+				dispatch({
+					type: SET_THEME,
+					data: result,
+				});
 			});
-		});
-	}
+	};
 }

app/panel/components/Subscription.jsx

@@ -17,7 +17,6 @@ import SubscriptionMenu from './Subscription/SubscriptionMenu';
 import SubscriptionInfo from './Subscription/SubscriptionInfo';
 import SubscriptionThemes from './Subscription/SubscriptionThemes';
 import PrioritySupport from './Subscription/PrioritySupport';
-import { setTheme } from '../utils/utils';
 /**
  * @class Implement base Subscription view which routes navigation to all subscription subviews
  * @memberof PanelClasses
@@ -37,29 +36,22 @@ class Subscription extends React.Component {
 	 * Lifecycle event. Default sub view is set here.
 	 */
 	componentWillMount() {
-		this.props.history.push('/subscription/info');
-		this.setState({isChecked: (this.props.currentTheme !== 'default')});
-		console.log("SUBSCRIPTION PROPS IN WILL MOUNT", this.props, this.state);
-		// this.props.actions.getSubscriptionData().then(() => {});
+		this.setState({ isChecked: (this.props.currentTheme !== 'default') });
 	}
-	componentWillReceiveProps(nextProps) {
-		console.log("SUBSCRIPTION PROPS", this.props, nextProps);
-	}
-	toggleThemes(event) {
+
+	toggleThemes() {
 		const newChecked = !this.state.isChecked;
-		this.setState({isChecked: newChecked});
-		if(newChecked) {
-			this.props.actions.setTheme({currentTheme:'midnight'});
-//			setTheme(document, this.props.currentTheme, this.props.theme);
+		this.setState({ isChecked: newChecked });
+		if (newChecked) {
+			this.props.actions.setTheme({ currentTheme: 'midnight' });
 		} else {
-			this.props.actions.setTheme({currentTheme:'default'});
-//			setTheme(document, 'default');
+			this.props.actions.setTheme({ currentTheme: 'default' });
 		}
 	}
 
-	SubscriptionInfoComponent = () => (<SubscriptionInfo subscriptionData={this.props}/>);
+	SubscriptionInfoComponent = () => (<SubscriptionInfo subscriptionData={this.props} />);
 	SubscriptionThemesComponent = () => (<SubscriptionThemes isChecked={this.state.isChecked} subscriptionData={this.props} toggleThemes={this.toggleThemes} actions={this.props.actions} />);
-	PrioritySupportComponent = () => (<PrioritySupport/>);
+	PrioritySupportComponent = () => (<PrioritySupport />);
 	/**
 	 * Render top level component of the Subscription view.
 	 * @return {ReactComponent}   ReactComponent instance
@@ -68,7 +60,7 @@ class Subscription extends React.Component {
 		return (
 			<div>
 				<div id="content-settings">
-					<SubscriptionMenu/>
+					<SubscriptionMenu />
 					<Route path="/subscription/info" render={this.SubscriptionInfoComponent} />
 					<Route path="/subscription/themes" render={this.SubscriptionThemesComponent} />
 					<Route path="/subscription/prioritysupport" render={this.PrioritySupportComponent} />

app/panel/components/Subscription/PrioritySupport.jsx

@@ -1,4 +1,4 @@
-//Priority Support
+// Priority Support
 /**
  * Priority Support Subscription Component
  *
@@ -20,17 +20,15 @@ import React from 'react';
  * It allows user to access Priority Support
  * @memberOf SubscriptionComponents
  */
-const PrioritySupport = (props) => {
-	const { subscriptionData } = props;
-	return (
+const PrioritySupport = () =>
+	// const { subscriptionData } = props;
+	(
 		<div className="content-subscription s-tabs-panel">
 			<div className="row">
 				<div className="columns column-subscription">
-				<h1>{ t('subscription_priority_support_title') }</h1>
+					<h1>{ t('subscription_priority_support_title') }</h1>
 				</div>
 			</div>
 		</div>
 	);
-};
-
 export default PrioritySupport;

app/panel/components/Subscription/SubscriptionInfo.jsx

@@ -1,4 +1,4 @@
-//SubscriptionInfo
+// SubscriptionInfo
 /**
  * Subscription Info Component
  *
@@ -17,7 +17,7 @@ import React from 'react';
 /**
  * @class Implement Subscription Info in subview as a React component.
  * The view opens from the left-side menu of the main Subscription view.
- * It invites user to examine the status of his subscription 
+ * It invites user to examine the status of his subscription
  * @memberOf SubscriptionComponents
  */
 const SubscriptionInfo = (props) => {
@@ -29,7 +29,7 @@ const SubscriptionInfo = (props) => {
 					<h1>{ t('subscription_info_title') }</h1>
 					<div className="status-row">
 						<span className="status-label">{`${t('subscription_account_status')}: `}</span>
-						<span className="status-value">{subscriptionData.canceled ? `${t ('subscription_account_canceled')} ${subscriptionData.canceled}` :  t('subscription_account_active') }</span>
+						<span className="status-value">{subscriptionData.canceled ? `${t('subscription_account_canceled')} ${subscriptionData.canceled}` : t('subscription_account_active') }</span>
 						<div className="s-tooltip-down" data-g-tooltip={t('subscription_status_tooltip')}>
 							<img src="../../app/images/panel/icon-information-tooltip.svg" className="s-question" />
 						</div>
@@ -39,23 +39,23 @@ const SubscriptionInfo = (props) => {
 							<li className="list-item">{t('subscription_midnight_theme')}</li>
 							<li className="list-item">{t('subscription_priority_support')}</li>
 						</ul>
-					</div> 
+					</div>
 					<div className="manage-row">
 						<span>
 							<svg width="14px" height="12px" viewBox="0 0 14 12">
 								<g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
 									<g transform="translate(-272.000000, -265.000000)" fill="#2092BF" fillRule="nonzero">
 										<g transform="translate(272.000000, 265.000000)">
-											<path d="M13.7261009,8.1256701 L13.1618624,8.05608247 C13.1309725,7.97214433 13.0923761,7.88659794 13.0420917,7.78874227 L13.3884954,7.36286598 C13.4807798,7.25350515 13.472367,7.0957732 13.3691651,6.99538144 L12.6707064,6.32257732 C12.616633,6.2711134 12.545156,6.24284536 12.4693761,6.24284536 C12.404,6.24284536 12.3400367,6.26474227 12.2903945,6.30346392 L11.8472752,6.63773196 C11.7451009,6.58905155 11.6560917,6.55181443 11.5697156,6.52249485 L11.4975963,5.97859794 C11.479422,5.84783505 11.3671651,5.7474433 11.2305688,5.73983505 L10.2416422,5.7397732 C10.2241743,5.73835052 10.2065138,5.73847423 10.1891743,5.74014433 L10.1810183,5.74131959 C10.0583578,5.76457732 9.96633028,5.86057732 9.95220183,5.97909278 L9.88014679,6.5225567 C9.79274312,6.55224742 9.70386239,6.58936082 9.60245872,6.63779381 L9.16049541,6.30420619 C9.10969725,6.2645567 9.04573394,6.24272165 8.9803578,6.24272165 C8.90425688,6.24272165 8.83297248,6.27098969 8.77857798,6.32282474 L8.08018349,6.99550515 C7.97730275,7.09564948 7.96914679,7.25356701 8.06033945,7.36193814 L8.40744954,7.78861856 C8.35677982,7.88709278 8.31824771,7.9728866 8.2876789,8.05595876 L7.72299083,8.12554639 C7.58022936,8.14404124 7.47375229,8.26243299 7.47497248,8.40037113 L7.47497248,9.35189691 L7.47516514,9.35672165 C7.48312844,9.48841237 7.5873578,9.59653608 7.72344037,9.61404124 L8.28774312,9.68338144 C8.31863303,9.76731959 8.3570367,9.85298969 8.40744954,9.95084536 L8.06098165,10.3765979 C7.96901835,10.4859588 7.97717431,10.6439381 8.08044037,10.7442062 L8.77883486,11.4168866 C8.83277982,11.4683505 8.90425688,11.4966186 8.98029358,11.4966186 C9.0456055,11.4966186 9.10956881,11.4747216 9.15914679,11.4360619 L9.60226606,11.1016701 C9.70450459,11.1504742 9.79344954,11.1873402 9.87995413,11.2169072 L9.95220183,11.7608041 C9.97108257,11.8969485 10.0929083,11.9997526 10.2355413,11.9997526 L11.2251743,11.9997526 L11.2303119,11.9996289 C11.3670367,11.9918969 11.4791651,11.8915052 11.4973394,11.7601856 L11.5694587,11.2167835 C11.6568624,11.1870928 11.7458073,11.1499794 11.8470826,11.1016701 L12.2890459,11.435134 C12.3399083,11.4749072 12.4038716,11.4966186 12.4693119,11.4966186 C12.5450917,11.4966186 12.6165688,11.4683505 12.6709633,11.4166392 L13.3692936,10.7438351 C13.4721743,10.6438144 13.4805229,10.4857732 13.3892661,10.3776495 L13.0419633,9.95072165 C13.0928899,9.85224742 13.1311651,9.76657732 13.1618624,9.68325773 L13.726422,9.61404124 C13.862055,9.59641237 13.9665413,9.48816495 13.9743761,9.35672165 L13.9745688,8.40098969 C13.975789,8.2625567 13.8694404,8.14416495 13.7261009,8.1256701 Z M13.3831651,9.09859794 L12.9195596,9.15296907 C12.8021651,9.16410309 12.7071835,9.24538144 12.6761009,9.35591753 C12.6289633,9.53084536 12.5592844,9.69853608 12.4644954,9.85329897 C12.403422,9.95053608 12.4122844,10.0758557 12.4861376,10.1670309 L12.7916972,10.5261031 L12.4441376,10.8611134 L12.070055,10.5660619 C12.020156,10.5283918 11.9576055,10.5078557 11.8942202,10.5078557 C11.8418807,10.5078557 11.790633,10.5217732 11.7468349,10.5472577 C11.586156,10.6386186 11.412055,10.7080825 11.2287064,10.7541031 C11.114844,10.7837938 11.0305229,10.8769485 11.0192202,10.9885979 L10.9625138,11.4434845 L10.4874771,11.4434845 L10.4309633,10.9900825 C10.4194037,10.8770103 10.3350183,10.7825567 10.2203211,10.752433 C10.0388349,10.7071546 9.86479817,10.6383711 9.70399083,10.5470722 C9.6049633,10.4891753 9.47234862,10.4963505 9.37813761,10.5669897 L9.00540367,10.8609278 L8.65765138,10.5260412 L8.96398165,10.1655464 C9.03661468,10.0759175 9.04412844,9.95059794 8.98376147,9.85435052 C8.88884404,9.69958763 8.81672477,9.53202062 8.76894495,9.35517526 C8.73805505,9.24550515 8.64133945,9.16416495 8.52561468,9.15327835 L8.05301835,9.09865979 L8.05301835,8.64117526 L8.52355963,8.58705155 C8.64114679,8.57591753 8.73921101,8.49451546 8.77061468,8.38385567 C8.81749541,8.20905155 8.8890367,8.04148454 8.98376147,7.88647423 C9.04477064,7.78948454 9.03687156,7.66379381 8.96308257,7.57261856 L8.65874312,7.21465979 L9.00566055,6.88991753 L9.37993578,7.17383505 C9.4299633,7.21138144 9.4923211,7.23191753 9.55577064,7.23191753 C9.60798165,7.23191753 9.65916514,7.21824742 9.70315596,7.19263918 C9.8633211,7.10152577 10.037422,7.03193814 10.2212844,6.98579381 C10.3350183,6.95597938 10.4194679,6.86931959 10.4308991,6.75779381 L10.4874771,6.30946392 L10.962578,6.30946392 L11.0190275,6.75612371 C11.0304587,6.86919588 11.1147798,6.96068041 11.2297339,6.99074227 C11.4112844,7.03589691 11.5853853,7.10319588 11.7461927,7.19430928 C11.8450917,7.2523299 11.9785413,7.24348454 12.070633,7.17451546 L12.4443945,6.89047423 L12.7915046,7.21496907 L12.4858807,7.57428866 C12.4133761,7.66404124 12.4057339,7.78948454 12.466422,7.88585567 C12.5611468,8.04037113 12.6333945,8.20793814 12.6810459,8.38503093 C12.7119358,8.49451546 12.8020367,8.57579381 12.9176972,8.58668041 L13.3831651,8.64117526 L13.3831651,9.09859794 Z"></path>
-											<path d="M10.7246422,7.26210309 C9.80436697,7.26210309 9.05581651,7.98346392 9.05581651,8.86985567 C9.05581651,9.75637113 9.80436697,10.4776082 10.7246422,10.4776082 C11.6453028,10.4776082 12.3939817,9.75637113 12.3939817,8.86985567 C12.3939817,7.98346392 11.6453028,7.26210309 10.7246422,7.26210309 Z M11.5013853,9.61769072 C11.2948532,9.81692784 11.019156,9.92647423 10.7246422,9.92647423 C10.119945,9.92647423 9.62788991,9.45253608 9.62788991,8.86973196 C9.62788991,8.28729897 10.119945,7.81323711 10.7246422,7.81323711 C11.019156,7.81323711 11.2948532,7.92272165 11.5013853,8.1217732 C11.7081101,8.32101031 11.8217798,8.5865567 11.8217798,8.86973196 C11.8217798,9.15321649 11.7081101,9.41876289 11.5013853,9.61769072 Z"></path>
-											<path d="M0.667568807,9.93364948 L0.667568807,2.78839175 C0.667568807,2.51220619 0.901651376,2.28878351 1.18826606,2.28878351 L11.6414495,2.28878351 C11.9281284,2.28878351 12.1629817,2.51226804 12.1629817,2.78839175 L12.1629817,5.44342268 L12.8051835,5.44342268 L12.8051835,2.78839175 C12.8051835,2.15505155 12.2990642,1.6702268 11.6415138,1.6702268 L8.95197248,1.6702268 L8.95197248,0.514824742 C8.95197248,0.238701031 8.72476147,6.18556701e-05 8.43808257,6.18556701e-05 L4.39176147,6.18556701e-05 C4.10514679,6.18556701e-05 3.8786422,0.238762887 3.8786422,0.514824742 L3.8786422,1.67016495 L1.18826606,1.67016495 C0.530779817,1.67016495 0.0253669725,2.15498969 0.0253669725,2.7883299 L0.0253669725,9.93358763 C0.0253669725,10.566866 0.530779817,11.0722268 1.18826606,11.0722268 L7.21802752,11.0722268 L7.21802752,10.3918144 L1.18826606,10.3918144 C0.901651376,10.3918763 0.667568807,10.2098351 0.667568807,9.93364948 Z M4.585,0.680474227 L8.24555046,0.680474227 L8.24555046,1.67016495 L4.585,1.67016495 L4.585,0.680474227 Z"></path>
+											<path d="M13.7261009,8.1256701 L13.1618624,8.05608247 C13.1309725,7.97214433 13.0923761,7.88659794 13.0420917,7.78874227 L13.3884954,7.36286598 C13.4807798,7.25350515 13.472367,7.0957732 13.3691651,6.99538144 L12.6707064,6.32257732 C12.616633,6.2711134 12.545156,6.24284536 12.4693761,6.24284536 C12.404,6.24284536 12.3400367,6.26474227 12.2903945,6.30346392 L11.8472752,6.63773196 C11.7451009,6.58905155 11.6560917,6.55181443 11.5697156,6.52249485 L11.4975963,5.97859794 C11.479422,5.84783505 11.3671651,5.7474433 11.2305688,5.73983505 L10.2416422,5.7397732 C10.2241743,5.73835052 10.2065138,5.73847423 10.1891743,5.74014433 L10.1810183,5.74131959 C10.0583578,5.76457732 9.96633028,5.86057732 9.95220183,5.97909278 L9.88014679,6.5225567 C9.79274312,6.55224742 9.70386239,6.58936082 9.60245872,6.63779381 L9.16049541,6.30420619 C9.10969725,6.2645567 9.04573394,6.24272165 8.9803578,6.24272165 C8.90425688,6.24272165 8.83297248,6.27098969 8.77857798,6.32282474 L8.08018349,6.99550515 C7.97730275,7.09564948 7.96914679,7.25356701 8.06033945,7.36193814 L8.40744954,7.78861856 C8.35677982,7.88709278 8.31824771,7.9728866 8.2876789,8.05595876 L7.72299083,8.12554639 C7.58022936,8.14404124 7.47375229,8.26243299 7.47497248,8.40037113 L7.47497248,9.35189691 L7.47516514,9.35672165 C7.48312844,9.48841237 7.5873578,9.59653608 7.72344037,9.61404124 L8.28774312,9.68338144 C8.31863303,9.76731959 8.3570367,9.85298969 8.40744954,9.95084536 L8.06098165,10.3765979 C7.96901835,10.4859588 7.97717431,10.6439381 8.08044037,10.7442062 L8.77883486,11.4168866 C8.83277982,11.4683505 8.90425688,11.4966186 8.98029358,11.4966186 C9.0456055,11.4966186 9.10956881,11.4747216 9.15914679,11.4360619 L9.60226606,11.1016701 C9.70450459,11.1504742 9.79344954,11.1873402 9.87995413,11.2169072 L9.95220183,11.7608041 C9.97108257,11.8969485 10.0929083,11.9997526 10.2355413,11.9997526 L11.2251743,11.9997526 L11.2303119,11.9996289 C11.3670367,11.9918969 11.4791651,11.8915052 11.4973394,11.7601856 L11.5694587,11.2167835 C11.6568624,11.1870928 11.7458073,11.1499794 11.8470826,11.1016701 L12.2890459,11.435134 C12.3399083,11.4749072 12.4038716,11.4966186 12.4693119,11.4966186 C12.5450917,11.4966186 12.6165688,11.4683505 12.6709633,11.4166392 L13.3692936,10.7438351 C13.4721743,10.6438144 13.4805229,10.4857732 13.3892661,10.3776495 L13.0419633,9.95072165 C13.0928899,9.85224742 13.1311651,9.76657732 13.1618624,9.68325773 L13.726422,9.61404124 C13.862055,9.59641237 13.9665413,9.48816495 13.9743761,9.35672165 L13.9745688,8.40098969 C13.975789,8.2625567 13.8694404,8.14416495 13.7261009,8.1256701 Z M13.3831651,9.09859794 L12.9195596,9.15296907 C12.8021651,9.16410309 12.7071835,9.24538144 12.6761009,9.35591753 C12.6289633,9.53084536 12.5592844,9.69853608 12.4644954,9.85329897 C12.403422,9.95053608 12.4122844,10.0758557 12.4861376,10.1670309 L12.7916972,10.5261031 L12.4441376,10.8611134 L12.070055,10.5660619 C12.020156,10.5283918 11.9576055,10.5078557 11.8942202,10.5078557 C11.8418807,10.5078557 11.790633,10.5217732 11.7468349,10.5472577 C11.586156,10.6386186 11.412055,10.7080825 11.2287064,10.7541031 C11.114844,10.7837938 11.0305229,10.8769485 11.0192202,10.9885979 L10.9625138,11.4434845 L10.4874771,11.4434845 L10.4309633,10.9900825 C10.4194037,10.8770103 10.3350183,10.7825567 10.2203211,10.752433 C10.0388349,10.7071546 9.86479817,10.6383711 9.70399083,10.5470722 C9.6049633,10.4891753 9.47234862,10.4963505 9.37813761,10.5669897 L9.00540367,10.8609278 L8.65765138,10.5260412 L8.96398165,10.1655464 C9.03661468,10.0759175 9.04412844,9.95059794 8.98376147,9.85435052 C8.88884404,9.69958763 8.81672477,9.53202062 8.76894495,9.35517526 C8.73805505,9.24550515 8.64133945,9.16416495 8.52561468,9.15327835 L8.05301835,9.09865979 L8.05301835,8.64117526 L8.52355963,8.58705155 C8.64114679,8.57591753 8.73921101,8.49451546 8.77061468,8.38385567 C8.81749541,8.20905155 8.8890367,8.04148454 8.98376147,7.88647423 C9.04477064,7.78948454 9.03687156,7.66379381 8.96308257,7.57261856 L8.65874312,7.21465979 L9.00566055,6.88991753 L9.37993578,7.17383505 C9.4299633,7.21138144 9.4923211,7.23191753 9.55577064,7.23191753 C9.60798165,7.23191753 9.65916514,7.21824742 9.70315596,7.19263918 C9.8633211,7.10152577 10.037422,7.03193814 10.2212844,6.98579381 C10.3350183,6.95597938 10.4194679,6.86931959 10.4308991,6.75779381 L10.4874771,6.30946392 L10.962578,6.30946392 L11.0190275,6.75612371 C11.0304587,6.86919588 11.1147798,6.96068041 11.2297339,6.99074227 C11.4112844,7.03589691 11.5853853,7.10319588 11.7461927,7.19430928 C11.8450917,7.2523299 11.9785413,7.24348454 12.070633,7.17451546 L12.4443945,6.89047423 L12.7915046,7.21496907 L12.4858807,7.57428866 C12.4133761,7.66404124 12.4057339,7.78948454 12.466422,7.88585567 C12.5611468,8.04037113 12.6333945,8.20793814 12.6810459,8.38503093 C12.7119358,8.49451546 12.8020367,8.57579381 12.9176972,8.58668041 L13.3831651,8.64117526 L13.3831651,9.09859794 Z" />
+											<path d="M10.7246422,7.26210309 C9.80436697,7.26210309 9.05581651,7.98346392 9.05581651,8.86985567 C9.05581651,9.75637113 9.80436697,10.4776082 10.7246422,10.4776082 C11.6453028,10.4776082 12.3939817,9.75637113 12.3939817,8.86985567 C12.3939817,7.98346392 11.6453028,7.26210309 10.7246422,7.26210309 Z M11.5013853,9.61769072 C11.2948532,9.81692784 11.019156,9.92647423 10.7246422,9.92647423 C10.119945,9.92647423 9.62788991,9.45253608 9.62788991,8.86973196 C9.62788991,8.28729897 10.119945,7.81323711 10.7246422,7.81323711 C11.019156,7.81323711 11.2948532,7.92272165 11.5013853,8.1217732 C11.7081101,8.32101031 11.8217798,8.5865567 11.8217798,8.86973196 C11.8217798,9.15321649 11.7081101,9.41876289 11.5013853,9.61769072 Z" />
+											<path d="M0.667568807,9.93364948 L0.667568807,2.78839175 C0.667568807,2.51220619 0.901651376,2.28878351 1.18826606,2.28878351 L11.6414495,2.28878351 C11.9281284,2.28878351 12.1629817,2.51226804 12.1629817,2.78839175 L12.1629817,5.44342268 L12.8051835,5.44342268 L12.8051835,2.78839175 C12.8051835,2.15505155 12.2990642,1.6702268 11.6415138,1.6702268 L8.95197248,1.6702268 L8.95197248,0.514824742 C8.95197248,0.238701031 8.72476147,6.18556701e-05 8.43808257,6.18556701e-05 L4.39176147,6.18556701e-05 C4.10514679,6.18556701e-05 3.8786422,0.238762887 3.8786422,0.514824742 L3.8786422,1.67016495 L1.18826606,1.67016495 C0.530779817,1.67016495 0.0253669725,2.15498969 0.0253669725,2.7883299 L0.0253669725,9.93358763 C0.0253669725,10.566866 0.530779817,11.0722268 1.18826606,11.0722268 L7.21802752,11.0722268 L7.21802752,10.3918144 L1.18826606,10.3918144 C0.901651376,10.3918763 0.667568807,10.2098351 0.667568807,9.93364948 Z M4.585,0.680474227 L8.24555046,0.680474227 L8.24555046,1.67016495 L4.585,1.67016495 L4.585,0.680474227 Z" />
 										</g>
 									</g>
 								</g>
-							</svg>							
+							</svg>
 						</span>
 						<a className="manage-link" href="https://www.ghostery.com/about-ghostery/browser-extension-privacy-policy/" target="_blank" rel="noopener noreferrer">
-							<span>{t ('subscription_manage')}</span>
+							<span>{t('subscription_manage')}</span>
 						</a>
 					</div>
 				</div>