Merge branch 'develop' into GH-2158

src/classes/Account.js

@@ -88,7 +88,7 @@ class Account {
 			ghosteryDebugger.addAccountEvent('login', 'cookie set by fetch POST');
 			this._getUserIDFromCookie().then((userID) => {
 				this._setAccountInfo(userID);
-				this.getUserSubscriptionData({ calledFrom: 'login'});
+				this.getUserSubscriptionData({ calledFrom: 'login' });
 			});
 			return {};
 		});
@@ -169,7 +169,7 @@ class Account {
 	/**
 	 * @return {array}	All subscriptions the user has, empty if none
 	*/
-	getUserSubscriptionData = (options) => (
+	getUserSubscriptionData = options => (
 		this._getUserID()
 			.then(userID => api.get('stripe/customers', userID, 'cards,subscriptions'))
 			.then((res) => {
@@ -196,9 +196,6 @@ class Account {
 						this._setSubscriptionData(plusSubscription);
 					}
 				}
-				if (options && options.calledFrom === 'login') {
-					metrics.ping('sign_in_success');
-				}
 
 				return subscriptions;