Conditional target

Automattic · Sep 3, 2019 · 0f224cf · 0f224cf
1 parent 4a016a1
commit 0f224cf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/extensions/blocks/recurring-payments/edit.jsx b/extensions/blocks/recurring-payments/edit.jsx
@@ -348,7 +348,7 @@ class MembershipsButtonEdit extends Component {
 	}
 
 	render = () => {
-		const { className, notices } = this.props;
+		const { className, notices, postId } = this.props;
 		const { connected, products } = this.state;
 
 		const stripeConnectUrl = this.getConnectUrl();
@@ -441,7 +441,11 @@ class MembershipsButtonEdit extends Component {
 										isLarge
 										disabled={ ! stripeConnectUrl }
 										href={ stripeConnectUrl }
-										target="_blank"
+										target={
+											// If we know the postId, we'll try to return to the editor.
+											// Otherwise the flow will continue externally.
+											postId ? undefined : '_blank'
+										}
 									>
 										{ __( 'Connect to Stripe or set up an account', 'jetpack' ) }
 									</Button>