Rename subscriptionsPlus and subscriptionsPremium to plusAccess and p…

…remiumAccess

app/hub/Views/HomeView/HomeViewContainer.jsx

@@ -106,8 +106,8 @@ class HomeViewContainer extends Component {
 	_render() {
 		const { justInstalled } = this.state;
 		const { home, user } = this.props;
-		const isPlus = user && user.subscriptionsPlus || false;
-		const isPremium = user && user.subscriptionsPremium || false;
+		const isPlus = user && user.plusAccess || false;
+		const isPremium = user && user.premiumAccess || false;
 		const {
 			premium_promo_modal_shown,
 			setup_complete,
@@ -164,7 +164,7 @@ HomeViewContainer.propTypes = {
 	}),
 	user: PropTypes.shape({
 		email: PropTypes.string,
-		subscriptionsPlus: PropTypes.bool,
+		plusAccess: PropTypes.bool,
 	}),
 	actions: PropTypes.shape({
 		getHomeProps: PropTypes.func.isRequired,
@@ -184,7 +184,7 @@ HomeViewContainer.defaultProps = {
 	},
 	user: {
 		email: '',
-		subscriptionsPlus: false,
+		plusAccess: false,
 	},
 };
 

app/hub/Views/PlusView/PlusViewContainer.jsx

@@ -44,7 +44,7 @@ class PlusViewContainer extends Component {
 	 */
 	render() {
 		const childProps = {
-			isPlus: this.props.user && this.props.user.subscriptionsPlus || false,
+			isPlus: this.props.user && this.props.user.plusAccess || false,
 			onPlusClick: this._sendPlusPing,
 		};
 
@@ -56,7 +56,7 @@ class PlusViewContainer extends Component {
 PlusViewContainer.propTypes = {
 	user: PropTypes.shape({
 		email: PropTypes.string,
-		subscriptionsPlus: PropTypes.bool,
+		plusAccess: PropTypes.bool,
 	}),
 	actions: PropTypes.shape({
 		sendPing: PropTypes.func.isRequired,
@@ -68,7 +68,7 @@ PlusViewContainer.propTypes = {
 PlusViewContainer.defaultProps = {
 	user: {
 		email: false,
-		subscriptionsPlus: false,
+		plusAccess: false,
 	},
 };
 

app/panel/components/Detail.jsx

@@ -80,7 +80,7 @@ class Detail extends React.Component {
 					<Route path="/detail/rewards" render={this.RewardsComponent} />
 					<DetailMenu
 						hasReward={false}
-						subscriptionsPlus={this.props.user && this.props.user.subscriptionsPlus}
+						plusAccess={this.props.user && this.props.user.plusAccess}
 						activeTab={activeTab}
 					/>
 				</div>

app/panel/components/Header.jsx

@@ -149,8 +149,8 @@ class Header extends React.Component {
 		// TODO check whether this is the message we want to be sending now
 		sendMessage('ping', 'plus_panel_from_badge');
 		const { user } = this.props;
-		const plusSubscriber = user && user.subscriptionsPlus;
-		const premiumSubscriber = user && user.subscriptionsPremium;
+		const plusSubscriber = user && user.plusAccess;
+		const premiumSubscriber = user && user.premiumAccess;
 		this.props.history.push(plusSubscriber || premiumSubscriber ? '/subscription/info' : `/subscribe/${!!user}`);
 	}
 
@@ -177,8 +177,8 @@ class Header extends React.Component {
 		const tabDetailedClassNames = ClassNames('header-tab', {
 			active: is_expert,
 		});
-		const plusSubscriber = user && user.subscriptionsPlus;
-		const premiumSubscriber = user && user.subscriptionsPremium;
+		const plusSubscriber = user && user.plusAccess;
+		const premiumSubscriber = user && user.premiumAccess;
 		const accountLogolink = this.generateAccountLogo();
 		const badgeClasses = ClassNames('columns', 'shrink', {
 			'non-subscriber-badge': !(plusSubscriber || premiumSubscriber),
@@ -240,8 +240,8 @@ class Header extends React.Component {
 		const headerMenu = (
 			<HeaderMenu
 				loggedIn={loggedIn}
-				subscriptionsPremium={user && user.subscriptionsPremium}
-				subscriptionsPlus={user && user.subscriptionsPlus}
+				premiumAccess={user && user.premiumAccess}
+				plusAccess={user && user.plusAccess}
 				email={user && user.email}
 				language={this.props.language}
 				tab_id={this.props.tab_id}

app/panel/components/HeaderMenu.jsx

@@ -152,10 +152,10 @@ class HeaderMenu extends React.Component {
 	 * Handle click on Subscriber menu item.
 	 */
 	clickSubscriber = () => {
-		const { subscriptionsPlus, subscriptionsPremium } = this.props;
+		const { plusAccess, premiumAccess } = this.props;
 		sendMessage('ping', 'plus_panel_from_menu');
 		this.props.toggleDropdown();
-		this.props.history.push(subscriptionsPremium || subscriptionsPlus ? '/subscription/info' : `/subscribe/${this.props.loggedIn}`);
+		this.props.history.push(premiumAccess || plusAccess ? '/subscription/info' : `/subscribe/${this.props.loggedIn}`);
 	}
 
 	/**
@@ -166,17 +166,17 @@ class HeaderMenu extends React.Component {
 		const {
 			loggedIn,
 			email,
-			subscriptionsPremium,
-			subscriptionsPlus
+			premiumAccess,
+			plusAccess
 		} = this.props;
 		const optionClasses = ClassNames({
-			'menu-option': subscriptionsPremium || subscriptionsPlus,
-			'menu-option-non-subscriber': !subscriptionsPremium || !subscriptionsPlus
+			'menu-option': premiumAccess || plusAccess,
+			'menu-option-non-subscriber': !premiumAccess || !plusAccess
 		});
 		const iconClasses = ClassNames('menu-icon-container', {
-			subscriptionsPremium,
-			subscriptionsPlus: subscriptionsPlus && !subscriptionsPremium,
-			'non-subscriber': !subscriptionsPremium && !subscriptionsPlus
+			premiumAccess,
+			plusAccess: plusAccess && !premiumAccess,
+			'non-subscriber': !premiumAccess && !plusAccess
 		});
 		return (
 			<ClickOutside onClickOutside={this.handleClickOutside} excludeEl={this.props.kebab}>
@@ -244,15 +244,15 @@ class HeaderMenu extends React.Component {
 						<li className={optionClasses} onClick={this.clickSubscriber}>
 							<div>
 								{/* Show premium icon to premium users and plus icon to basic and plus users */}
-								{!subscriptionsPremium && (
+								{!premiumAccess && (
 									<svg className={iconClasses} width="84" height="77" viewBox="0 0 84 77">
 										<g className="about-icon" fill="none">
 											<path d="M79.858 74.75L43.1 57.9c-.579-.315-1.447-.315-2.026 0L4.604 74.75c-.867.472-2.604 0-2.604-.63V2.786C2 2.315 2.579 2 3.447 2h76.99c.868 0 1.447.315 1.447.787V74.12c.58.63-1.157 1.103-2.026.63z" />
 											<path className="text" d="M47.156 37.256c-1.186 1.592-2.981 3.32-4.879 3.184-2.405-.169-2.473-2.676-1.728-4.912.746-2.237 2.474-5.557 4.676-8.64.271-.373.61-.34.88-.034.746 1.118.577 2.642-.643 4.574-1.254 1.999-1.931 3.354-2.643 4.98-.711 1.66-.61 2.88.17 2.948 1.321.102 3.185-2.27 5.014-5.218 2.135-3.456 3.117-5.794 4.202-7.25.339-.475.576-.543.847-.204.508.61.78 2.1-.034 3.795-.746 1.525-2.44 4.066-3.219 5.794-.88 1.931-.745 3.354.474 3.287 1.423-.068 3.151-2.304 4.473-4.676.17-.305.474-.34.61-.034.135.27.17 1.186-.305 2.134-.983 1.898-3.083 3.626-5.083 3.626-2.202 0-3.083-1.39-2.812-3.354z M25.98 22.754c-1.152-.136-1.796-.712-2.135-1.423-.17-.373-.101-.576.339-.61 2.812-.305 5.353-1.728 7.657-1.83 1.728-.067 3.22.475 4.032 2.813.712 2.032.136 3.998-1.016 5.793-1.694 2.643-5.353 5.184-9.792 6.031-.78.136-1.525 0-2.1-.338-.95 1.863-1.966 4.1-3.152 6.912-.135.338-.305.338-.542.101-.474-.508-.813-1.524-.305-3.354.881-3.083 4.066-9.453 7.014-14.095zm-2.033 8.538c7.59-1.423 11.384-6.912 10.47-9.284-.712-1.863-4.1-.101-6.337.543 0 .914-.338 2.1-1.287 3.727-.881 1.558-1.83 3.117-2.846 5.014zm12.773 1.932c-1.355 3.32-1.728 6.132-.203 6.268 1.627.135 3.998-2.304 5.32-4.913.237-.44.61-.475.745 0 .17.542.034 1.287-.339 2.1-.474 1.017-2.947 3.83-5.658 3.761-2.338-.067-3.592-1.694-2.812-5.353 1.253-5.895 5.116-12.028 8.572-15.62.508-.542.983-.61 1.457-.17.982.882 1.186 2.135.78 3.728-1.051 4.167-4.846 8.233-7.862 10.199zm.61-1.457c4.642-3.761 6.54-9.183 6.1-9.454-.441-.27-2.949 3.49-5.286 7.827a18.192 18.192 0 0 0-.814 1.627zm18.06 2.676c1.389-1.897 2.914-4.1 3.896-5.827.17-1.322.508-1.966 1.22-2.61.745-.677 1.525-.813 1.83-.508.338.34.169.712-.272 1.491-.135.203-.237.407-.372.644-.237 3.117.406 5.76.305 8.098-.068 1.321-.305 2.744-1.525 3.557 2.27-.847 3.693-2.88 4.54-4.71.17-.372.508-.27.644 0 .136.306.102 1.187-.474 2.237a7.139 7.139 0 0 1-5.998 3.727c-1.965.068-3.862-.44-5.014-2.541-.813-1.525-.712-3.761.44-4.71.407-.339.678-.203.712.34.034.27.034.541.068.812zm3.828-3.659c-.982 1.796-2.236 3.66-3.523 5.489.508 1.965 1.49 3.354 2.609 3.015 1.558-.474 1.05-5.793.914-8.504z" />
 										</g>
 									</svg>
 								)}
-								{subscriptionsPremium && (
+								{premiumAccess && (
 									<svg className={iconClasses} width="27" height="25" viewBox="0 0 27 25">
 										<g fill="none" fillRule="evenodd">
 											<g>
@@ -263,7 +263,7 @@ class HeaderMenu extends React.Component {
 										</g>
 									</svg>
 								)}
-								<span>{subscriptionsPremium ? t('panel_detail_premium_title') : t('ghostery_plus')}</span>
+								<span>{premiumAccess ? t('panel_detail_premium_title') : t('ghostery_plus')}</span>
 							</div>
 						</li>
 					</ul>

app/panel/components/Panel.jsx

@@ -217,7 +217,7 @@ class Panel extends React.Component {
 	_premiumSubscriber = () => {
 		const { loggedIn, user } = this.props;
 
-		return loggedIn && (user && user.subscriptionsPremium);
+		return loggedIn && (user && user.premiumAccess);
 	}
 
 	/**
@@ -228,7 +228,7 @@ class Panel extends React.Component {
 	_plusSubscriber = () => {
 		const { loggedIn, user } = this.props;
 
-		return loggedIn && (user && user.subscriptionsPlus);
+		return loggedIn && (user && user.plusAccess);
 	}
 
 	/**

app/panel/components/Stats.jsx

@@ -329,7 +329,7 @@ class Stats extends React.Component {
 			monthlyAverageData: clearData,
 			dailyAverageData: clearData,
 			showResetModal: false,
-			showPitchModal: (!this.props.user || !this.props.user.subscriptionsPlus),
+			showPitchModal: (!this.props.user || !this.props.user.plusAccess),
 		};
 		return clearOrDemoState;
 	}
@@ -517,7 +517,7 @@ class Stats extends React.Component {
 		return selectionData;
 	}
 
-	_isPlus = props => props.user && props.user.subscriptionsPlus;
+	_isPlus = props => props.user && props.user.plusAccess;
 
 	/**
 	 * Render the the Stats View
@@ -529,7 +529,7 @@ class Stats extends React.Component {
 		return (
 			<StatsView
 				showResetModal={showResetModal}
-				showPitchModal={!user || !user.subscriptionsPlus}
+				showPitchModal={!user || !user.plusAccess}
 				loggedIn={loggedIn}
 				getStats={this.getStats}
 				selection={selection}

app/panel/components/Summary.jsx

@@ -309,13 +309,13 @@ class Summary extends React.Component {
 	_isPlusSubscriber() {
 		const { user } = this.props;
 
-		return user && user.subscriptionsPlus;
+		return user && user.plusAccess;
 	}
 
 	_isPremiumSubscriber() {
 		const { user } = this.props;
 
-		return user && user.subscriptionsPremium;
+		return user && user.premiumAccess;
 	}
 
 	_pageHost() {

app/scss/partials/_header.scss

@@ -148,13 +148,13 @@
 
 		.menu-option {
 			@extend .menu-option-base;
-			.subscriptionsPlus {
+			.plusAccess {
 				width: 18px;
 				height: 16px;
 				path {fill: $light-gray;}
 				path.text {fill: #4a4a4a;}
 			}
-			.subscriptionsPremium {
+			.premiumAccess {
 				margin-left: -4px;
 				g > g {
 					fill: #DEDEDE;
@@ -171,7 +171,7 @@
 					path {stroke: $ghosty-blue;}
 					path.text {fill: $ghosty-blue;}
 				}
-				.subscriptionsPremium > g > g {
+				.premiumAccess > g > g {
 					fill: $ghosty-blue;
 				}
 			}

src/background.js

@@ -881,9 +881,9 @@ function onMessageHandler(request, sender, callback) {
 		account.getUser(message)
 			.then((user) => {
 				if (user) {
-					user.subscriptionsPlus = account.hasScopesUnverified(['subscriptions:plus'])
+					user.plusAccess = account.hasScopesUnverified(['subscriptions:plus'])
 											|| account.hasScopesUnverified(['subscriptions:premium']);
-					user.subscriptionsPremium = account.hasScopesUnverified(['subscriptions:premium']);
+					user.premiumAccess = account.hasScopesUnverified(['subscriptions:premium']);
 				}
 				callback({ user });
 			})

src/classes/PanelData.js

@@ -264,9 +264,9 @@ class PanelData {
 	_getCurrentAccount() {
 		const currentAccount = conf.account;
 		if (currentAccount && currentAccount.user) {
-			currentAccount.user.subscriptionsPlus = account.hasScopesUnverified(['subscriptions:plus'])
+			currentAccount.user.plusAccess = account.hasScopesUnverified(['subscriptions:plus'])
 													|| account.hasScopesUnverified(['subscriptions:premium']);
-			currentAccount.user.subscriptionsPremium = account.hasScopesUnverified(['subscriptions:premium']);
+			currentAccount.user.premiumAccess = account.hasScopesUnverified(['subscriptions:premium']);
 		}
 		return currentAccount;
 	}