From 5dd3cd004d018db9cc508089a3937544f26ae7e1 Mon Sep 17 00:00:00 2001
From: Brie Anne Demkiw <brie@automattic.com>
Date: Thu, 17 Dec 2015 08:38:15 -0800
Subject: [PATCH 1/3] Domain Management: Add onclick back for the privacy
 protection compact notice.

---
 .../edit/registered-domain.jsx                | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx b/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
index b16dcc7f5039d..756b7338aabc0 100644
--- a/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
+++ b/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
@@ -43,27 +43,30 @@ const RegisteredDomain = React.createClass( {
 	getPrivacyProtection() {
 		if ( this.props.domain.hasPrivacyProtection ) {
 			return (
-				<Notice
-					isCompact
-					status="is-success"
-					icon="lock">
-					{ this.translate( 'On', {
-						context: 'An icon label when Privacy Protection is enabled.'
-					} ) }
-				</Notice>
+				<a href="#" onClick={ this.goToPrivacyProtection }>
+					<Notice
+						isCompact
+						status="is-success"
+						icon="lock">
+						{ this.translate( 'On', {
+							context: 'An icon label when Privacy Protection is enabled.'
+						} ) }
+					</Notice>
+				</a>
 			);
 		}
 
 		return (
-			<Notice
-				isCompact
-				status="is-warning"
-				icon="notice"
-				onClick={ this.goToPrivacyProtection }>
-				{ this.translate( 'None', {
-					context: 'An icon label when Privacy Protection is disabled.'
-				} ) }
-			</Notice>
+			<a href="#" onClick={ this.goToPrivacyProtection }>
+				<Notice
+					isCompact
+					status="is-warning"
+					icon="notice">
+					{ this.translate( 'None', {
+						context: 'An icon label when Privacy Protection is disabled.'
+					} ) }
+				</Notice>
+			</a>
 		);
 	},
 

From af5c371f548c1e227847655ed817b1d664eb5c64 Mon Sep 17 00:00:00 2001
From: Brie Anne Demkiw <brie@automattic.com>
Date: Thu, 17 Dec 2015 16:48:02 -0800
Subject: [PATCH 2/3] Domain Management: Update link to domain contacts and
 privacy.

---
 .../upgrades/domain-management/edit/registered-domain.jsx  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx b/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
index 756b7338aabc0..e9219f4f2a30c 100644
--- a/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
+++ b/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
@@ -42,8 +42,13 @@ const RegisteredDomain = React.createClass( {
 
 	getPrivacyProtection() {
 		if ( this.props.domain.hasPrivacyProtection ) {
+			const path = paths.domainManagementContactsPrivacy(
+				this.props.selectedSite.domain,
+				this.props.domain.name
+			);
+
 			return (
-				<a href="#" onClick={ this.goToPrivacyProtection }>
+				<a href={ path }>
 					<Notice
 						isCompact
 						status="is-success"

From 0a6650f6b508c753470d399a84ab688cc2897ae8 Mon Sep 17 00:00:00 2001
From: Grzegorz Ziolkowski <grzegorz@gziolo.pl>
Date: Fri, 18 Dec 2015 12:15:56 +0100
Subject: [PATCH 3/3] Domains: Make sure there no # added to the url when
 clicking None button on Domain Settings page

---
 .../domain-management/edit/registered-domain.jsx   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx b/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
index e9219f4f2a30c..6df17cbb09667 100644
--- a/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
+++ b/client/my-sites/upgrades/domain-management/edit/registered-domain.jsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import page from 'page';
 import React from 'react';
 
 /**
@@ -61,8 +60,13 @@ const RegisteredDomain = React.createClass( {
 			);
 		}
 
+		const path = paths.domainManagementPrivacyProtection(
+			this.props.selectedSite.domain,
+			this.props.domain.name
+		);
+
 		return (
-			<a href="#" onClick={ this.goToPrivacyProtection }>
+			<a href={ path } onClick={ this.recordEvent( 'noneClick', this.props.domain ) }>
 				<Notice
 					isCompact
 					status="is-warning"
@@ -197,12 +201,6 @@ const RegisteredDomain = React.createClass( {
 				{ this.getVerticalNav() }
 			</div>
 		);
-	},
-
-	goToPrivacyProtection() {
-		this.recordEvent( 'noneClick', this.props.domain );
-
-		page( paths.domainManagementPrivacyProtection( this.props.selectedSite.domain, this.props.domain.name ) );
 	}
 } );