Skip to content

/ ghostery-extension

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-2158: Subscription_type ping parameter not sending on login #606

Merged
merged 4 commits into from Sep 28, 2020
+6 −5
Merged

GH-2158: Subscription_type ping parameter not sending on login #606

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5592a18
Move sign_in_success ping to Account#getUserSubscriptionData to fix r…
benstrumeyer Sep 18, 2020
f0897cc
Fix linter
benstrumeyer Sep 18, 2020
5c7d5a7
Merge in develop
wlycdgr Sep 24, 2020
13cfd8b
Merge branch 'develop' into GH-2158
christophertino Sep 28, 2020
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

Fix linter

  • Loading branch information
@benstrumeyer
benstrumeyer committed Sep 18, 2020
commit f0897cce68697d2a6c1d20e184d72a5c60d581cf
4 src/classes/Account.js
View file
Open in desktop
@@ -22,7 +22,7 @@ import conf from './Conf';
import dispatcher from './Dispatcher';
import { log } from '../utils/common';
import Api from '../utils/api';
import metrics from '../classes/Metrics';
import metrics from './Metrics';

const api = new Api();
const {
@@ -163,7 +163,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) => {
ProTip! Use n and p to navigate between commits in a pull request.