From d679b6e84ce8f04b09bad334aa2957852c4eadbe Mon Sep 17 00:00:00 2001
From: Shavindra <shavindra@users.noreply.github.com>
Date: Mon, 24 Feb 2020 15:51:51 +0100
Subject: [PATCH 1/3] Add custom events for analytics tracking box.

---
 assets/js/components/activation/activation-main.js          | 4 +++-
 assets/js/components/optin.js                               | 6 ++++++
 assets/js/components/settings/settings-admin.js             | 4 +++-
 .../components/setup-wizard/wizard-step-authentication.js   | 4 +++-
 assets/js/components/setup/setup-proxy.js                   | 4 +++-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/assets/js/components/activation/activation-main.js b/assets/js/components/activation/activation-main.js
index 9941f7cfc05..729c162a2e5 100644
--- a/assets/js/components/activation/activation-main.js
+++ b/assets/js/components/activation/activation-main.js
@@ -54,7 +54,9 @@ export function ActivationMain( { buttonURL, onButtonClick, buttonLabel } ) {
 							<Fragment>
 								{ CTAFeedback }
 
-								<OptIn />
+								<OptIn
+									optinAction="analytics_optin_setup_banner"
+								/>
 
 								<div className="googlesitekit-start-setup-wrap">
 									<Button
diff --git a/assets/js/components/optin.js b/assets/js/components/optin.js
index 13f12178537..86ef35d870a 100644
--- a/assets/js/components/optin.js
+++ b/assets/js/components/optin.js
@@ -36,6 +36,7 @@ import { __ } from '@wordpress/i18n';
 import {
 	isTrackingEnabled,
 	toggleTracking,
+	trackEvent,
 } from '../util/tracking';
 
 class OptIn extends Component {
@@ -56,6 +57,10 @@ class OptIn extends Component {
 
 		toggleTracking( checked );
 
+		if ( checked ) {
+			trackEvent( 'tracking_plguin', this.props.optinAction );
+		}
+
 		apiFetch( {
 			path: '/wp/v2/users/me',
 			method: 'POST',
@@ -120,6 +125,7 @@ OptIn.propTypes = {
 	id: PropTypes.string,
 	name: PropTypes.string,
 	className: PropTypes.string,
+	optinAction: PropTypes.string,
 };
 
 OptIn.defaultProps = {
diff --git a/assets/js/components/settings/settings-admin.js b/assets/js/components/settings/settings-admin.js
index 139e04cad0d..f80f60d002c 100644
--- a/assets/js/components/settings/settings-admin.js
+++ b/assets/js/components/settings/settings-admin.js
@@ -146,7 +146,9 @@ class SettingsAdmin extends Component {
 												googlesitekit-settings-module__meta-item
 												googlesitekit-settings-module__meta-item--nomargin
 											">
-												<OptIn />
+												<OptIn
+													optinAction="analytics_optin_settings_page"
+												/>
 											</div>
 										</div>
 									</div>
diff --git a/assets/js/components/setup-wizard/wizard-step-authentication.js b/assets/js/components/setup-wizard/wizard-step-authentication.js
index 529a3625978..f9b4b32928c 100644
--- a/assets/js/components/setup-wizard/wizard-step-authentication.js
+++ b/assets/js/components/setup-wizard/wizard-step-authentication.js
@@ -84,7 +84,9 @@ class WizardStepAuthentication extends Component {
 								}
 							</p>
 							<div className="googlesitekit-wizard-step__action googlesitekit-wizard-step__action--justify">
-								<OptIn />
+								<OptIn
+									optinAction="analytics_optin_setup_fallback"
+								/>
 								<HelpLink />
 							</div>
 						</div>
diff --git a/assets/js/components/setup/setup-proxy.js b/assets/js/components/setup/setup-proxy.js
index b8f48767c7b..0659c971a1f 100644
--- a/assets/js/components/setup/setup-proxy.js
+++ b/assets/js/components/setup/setup-proxy.js
@@ -164,7 +164,9 @@ class SetupUsingProxy extends Component {
 																<Fragment>
 																	{ CTAFeedback }
 
-																	<OptIn />
+																	<OptIn
+																		optinAction="analytics_optin_setup_fallback"
+																	/>
 
 																	<div className="googlesitekit-start-setup-wrap">
 																		<Button

From 5179bd05a1e410643d4bf65b9ded1c38f5f2f125 Mon Sep 17 00:00:00 2001
From: Evan Mattson <evan.mattson@10up.com>
Date: Wed, 4 Mar 2020 09:45:04 +0200
Subject: [PATCH 2/3] Fix typo in event category.

---
 assets/js/components/optin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/components/optin.js b/assets/js/components/optin.js
index 01e007580b2..f3fd6d0e57e 100644
--- a/assets/js/components/optin.js
+++ b/assets/js/components/optin.js
@@ -58,7 +58,7 @@ class OptIn extends Component {
 		toggleTracking( checked );
 
 		if ( checked ) {
-			trackEvent( 'tracking_plguin', this.props.optinAction );
+			trackEvent( 'tracking_plugin', this.props.optinAction );
 		}
 
 		apiFetch( {

From db1f6667906ead05fd96643336643c48b944b398 Mon Sep 17 00:00:00 2001
From: Evan Mattson <evan.mattson@10up.com>
Date: Wed, 4 Mar 2020 09:46:10 +0200
Subject: [PATCH 3/3] Update formatting.

---
 assets/js/components/activation/activation-main.js           | 4 +---
 assets/js/components/settings/settings-admin.js              | 4 +---
 .../js/components/setup-wizard/wizard-step-authentication.js | 5 ++---
 assets/js/components/setup/setup-proxy.js                    | 4 +---
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/assets/js/components/activation/activation-main.js b/assets/js/components/activation/activation-main.js
index 729c162a2e5..37451eb342a 100644
--- a/assets/js/components/activation/activation-main.js
+++ b/assets/js/components/activation/activation-main.js
@@ -54,9 +54,7 @@ export function ActivationMain( { buttonURL, onButtonClick, buttonLabel } ) {
 							<Fragment>
 								{ CTAFeedback }
 
-								<OptIn
-									optinAction="analytics_optin_setup_banner"
-								/>
+								<OptIn optinAction="analytics_optin_setup_banner" />
 
 								<div className="googlesitekit-start-setup-wrap">
 									<Button
diff --git a/assets/js/components/settings/settings-admin.js b/assets/js/components/settings/settings-admin.js
index f80f60d002c..cc7762b3a27 100644
--- a/assets/js/components/settings/settings-admin.js
+++ b/assets/js/components/settings/settings-admin.js
@@ -146,9 +146,7 @@ class SettingsAdmin extends Component {
 												googlesitekit-settings-module__meta-item
 												googlesitekit-settings-module__meta-item--nomargin
 											">
-												<OptIn
-													optinAction="analytics_optin_settings_page"
-												/>
+												<OptIn optinAction="analytics_optin_settings_page" />
 											</div>
 										</div>
 									</div>
diff --git a/assets/js/components/setup-wizard/wizard-step-authentication.js b/assets/js/components/setup-wizard/wizard-step-authentication.js
index f9b4b32928c..ed7f035e635 100644
--- a/assets/js/components/setup-wizard/wizard-step-authentication.js
+++ b/assets/js/components/setup-wizard/wizard-step-authentication.js
@@ -84,9 +84,8 @@ class WizardStepAuthentication extends Component {
 								}
 							</p>
 							<div className="googlesitekit-wizard-step__action googlesitekit-wizard-step__action--justify">
-								<OptIn
-									optinAction="analytics_optin_setup_fallback"
-								/>
+								<OptIn optinAction="analytics_optin_setup_fallback" />
+
 								<HelpLink />
 							</div>
 						</div>
diff --git a/assets/js/components/setup/setup-proxy.js b/assets/js/components/setup/setup-proxy.js
index 0659c971a1f..19842b0ecd3 100644
--- a/assets/js/components/setup/setup-proxy.js
+++ b/assets/js/components/setup/setup-proxy.js
@@ -164,9 +164,7 @@ class SetupUsingProxy extends Component {
 																<Fragment>
 																	{ CTAFeedback }
 
-																	<OptIn
-																		optinAction="analytics_optin_setup_fallback"
-																	/>
+																	<OptIn optinAction="analytics_optin_setup_fallback" />
 
 																	<div className="googlesitekit-start-setup-wrap">
 																		<Button