From 785b93aeaa439b7a9a1b566324f80a4350e26fc1 Mon Sep 17 00:00:00 2001
From: Miguel Lezama <miguel@automattic.com>
Date: Thu, 3 Dec 2015 12:01:12 -0300
Subject: [PATCH 1/2] Invites: Disable buttons after clicking on accept.

---
 .../invites/invite-accept-logged-in/index.jsx   | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/client/my-sites/invites/invite-accept-logged-in/index.jsx b/client/my-sites/invites/invite-accept-logged-in/index.jsx
index 76c81932153e27..98216fdf17dc8c 100644
--- a/client/my-sites/invites/invite-accept-logged-in/index.jsx
+++ b/client/my-sites/invites/invite-accept-logged-in/index.jsx
@@ -3,6 +3,7 @@
  */
 import React from 'react';
 import classNames from 'classnames';
+import page from 'page';
 
 /**
  * Internal dependencies
@@ -18,6 +19,16 @@ export default React.createClass( {
 
 	displayName: 'InviteAcceptLoggedIn',
 
+	getInitialState() {
+		return { submitting: false }
+	},
+
+	accept() {
+		this.setState( { submitting: true } );
+		page( this.props.redirectTo );
+		acceptInvite( this.props.invite );
+	},
+
 	render() {
 		const { user } = this.props,
 			signInLink = config( 'login_url' ) + '?redirect_to=' + encodeURIComponent( window.location.href );
@@ -40,11 +51,11 @@ export default React.createClass( {
 						}
 					</div>
 					<div className="invite-accept-logged-in__button-bar">
-						<Button onClick={ this.props.decline }>
+						<Button onClick={ this.props.decline } disabled={ this.state.submitting }>
 							{ this.translate( 'Decline', { context: 'button' } ) }
 						</Button>
-						<Button primary onClick={ () => acceptInvite( this.props.invite ) } href={ this.props.redirectTo } >
-							{ this.translate( 'Join', { context: 'button' } ) }
+						<Button primary onClick={ this.accept } disabled={ this.state.submitting }>
+							{ this.state.submitting ? this.translate( 'Joining…', { context: 'button' } ) : this.translate( 'Join', { context: 'button' } ) }
 						</Button>
 					</div>
 				</Card>

From cc380b165c9aefe971cf29a3154e831ebcf6c4aa Mon Sep 17 00:00:00 2001
From: Miguel Lezama <miguel@automattic.com>
Date: Thu, 3 Dec 2015 13:22:26 -0300
Subject: [PATCH 2/2] Invites: fix redirect after accepting invite

---
 client/my-sites/invites/invite-accept-logged-in/index.jsx | 3 +--
 client/my-sites/invites/invite-accept/index.jsx           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/my-sites/invites/invite-accept-logged-in/index.jsx b/client/my-sites/invites/invite-accept-logged-in/index.jsx
index 98216fdf17dc8c..d659396c538216 100644
--- a/client/my-sites/invites/invite-accept-logged-in/index.jsx
+++ b/client/my-sites/invites/invite-accept-logged-in/index.jsx
@@ -25,8 +25,7 @@ export default React.createClass( {
 
 	accept() {
 		this.setState( { submitting: true } );
-		page( this.props.redirectTo );
-		acceptInvite( this.props.invite );
+		acceptInvite( this.props.invite, () => page( this.props.redirectTo ) );
 	},
 
 	render() {
diff --git a/client/my-sites/invites/invite-accept/index.jsx b/client/my-sites/invites/invite-accept/index.jsx
index 33242a4f5118fb..be754ceb6e84b6 100644
--- a/client/my-sites/invites/invite-accept/index.jsx
+++ b/client/my-sites/invites/invite-accept/index.jsx
@@ -87,7 +87,7 @@ export default React.createClass( {
 		}
 		debug( 'Rendering invite' );
 		return user
-			? <LoggedIn { ...this.state.invite } decline={ this.decline } user={ user } />
+			? <LoggedIn { ...this.state.invite } redirectTo={ this.getRedirectAfterAccept() } decline={ this.decline } user={ user } />
 			: <LoggedOut { ...this.state.invite } redirectTo={ this.getRedirectAfterAccept() } decline={ this.decline } />;
 	},