From 5d05be18961bcce93abda88f87e2aa4c7a3b3297 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 26 Aug 2019 17:08:16 +0600
Subject: [PATCH 1/3] Recurring Payments: Remove BlockIcon Wrappers

---
 extensions/blocks/recurring-payments/edit.jsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/blocks/recurring-payments/edit.jsx b/extensions/blocks/recurring-payments/edit.jsx
index cc8237bd006fa..920296f95d12e 100644
--- a/extensions/blocks/recurring-payments/edit.jsx
+++ b/extensions/blocks/recurring-payments/edit.jsx
@@ -19,7 +19,7 @@ import {
 	withNotices,
 	SelectControl,
 } from '@wordpress/components';
-import { InspectorControls, BlockIcon } from '@wordpress/editor';
+import { InspectorControls } from '@wordpress/editor';
 import { Fragment, Component } from '@wordpress/element';
 
 /**
@@ -358,7 +358,7 @@ class MembershipsButtonEdit extends Component {
 				{ this.state.shouldUpgrade && (
 					<div className="wp-block-jetpack-recurring-payments">
 						<Placeholder
-							icon={ <BlockIcon icon={ icon } /> }
+							icon={ icon }
 							label={ __( 'Recurring Payments', 'jetpack' ) }
 							notices={ notices }
 						>
@@ -380,7 +380,7 @@ class MembershipsButtonEdit extends Component {
 				{ ( connected === API_STATE_LOADING ||
 					this.state.addingMembershipAmount === PRODUCT_FORM_SUBMITTED ) &&
 					! this.props.attributes.planId && (
-						<Placeholder icon={ <BlockIcon icon={ icon } /> } notices={ notices }>
+						<Placeholder icon={ icon } notices={ notices }>
 							<Spinner />
 						</Placeholder>
 					) }
@@ -389,7 +389,7 @@ class MembershipsButtonEdit extends Component {
 					connected === API_STATE_NOTCONNECTED && (
 						<div className="wp-block-jetpack-recurring-payments">
 							<Placeholder
-								icon={ <BlockIcon icon={ icon } /> }
+								icon={ icon }
 								label={ __( 'Recurring Payments', 'jetpack' ) }
 								notices={ notices }
 							>
@@ -418,7 +418,7 @@ class MembershipsButtonEdit extends Component {
 					products.length === 0 && (
 						<div className="wp-block-jetpack-recurring-payments">
 							<Placeholder
-								icon={ <BlockIcon icon={ icon } /> }
+								icon={ icon }
 								label={ __( 'Recurring Payments', 'jetpack' ) }
 								notices={ notices }
 							>
@@ -437,7 +437,7 @@ class MembershipsButtonEdit extends Component {
 					products.length > 0 && (
 						<div className="wp-block-jetpack-recurring-payments">
 							<Placeholder
-								icon={ <BlockIcon icon={ icon } /> }
+								icon={ icon }
 								label={ __( 'Recurring Payments', 'jetpack' ) }
 								notices={ notices }
 							>

From 743fa04e85c42f86e36344d082ca421117809742 Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Mon, 31 Jan 2022 18:25:22 +0100
Subject: [PATCH 2/3] Add changelog

---
 .../changelog/remove-recurring-payments-block-icon-wrapper    | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/remove-recurring-payments-block-icon-wrapper

diff --git a/projects/plugins/jetpack/changelog/remove-recurring-payments-block-icon-wrapper b/projects/plugins/jetpack/changelog/remove-recurring-payments-block-icon-wrapper
new file mode 100644
index 0000000000000..415ab77e3d7df
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/remove-recurring-payments-block-icon-wrapper
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Payments Block: remove wrapper around icons.

From 69f0583dca457c7baf9e029c26a638fb8567a5b4 Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Mon, 31 Jan 2022 18:57:01 +0100
Subject: [PATCH 3/3] fix left-over merging conflicts

---
 .../blocks/recurring-payments/edit.jsx        | 53 +------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx b/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
index 8eb67fbca0c1f..b40e907eac7fd 100644
--- a/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
+++ b/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
@@ -412,50 +412,10 @@ export class MembershipsButtonEdit extends Component {
 					) }
 				{ ! this.state.shouldUpgrade &&
 					! this.props.attributes.planId &&
-<<<<<<< HEAD:extensions/blocks/recurring-payments/edit.jsx
-					connected === API_STATE_NOTCONNECTED && (
-						<div className="wp-block-jetpack-recurring-payments">
-							<Placeholder
-								icon={ icon }
-								label={ __( 'Recurring Payments', 'jetpack' ) }
-								notices={ notices }
-							>
-								<div className="components-placeholder__instructions">
-									<p>
-										{ __(
-											'In order to start selling Recurring Payments plans, you have to connect to Stripe:',
-											'jetpack'
-										) }
-									</p>
-									<Button isDefault isLarge href={ connectURL } target="_blank">
-										{ __( 'Connect to Stripe or set up an account', 'jetpack' ) }
-									</Button>
-									<br />
-									<Button isLink onClick={ this.apiCall }>
-										{ __( 'Re-check Connection', 'jetpack' ) }
-									</Button>
-									{ this.renderDisclaimer() }
-								</div>
-							</Placeholder>
-						</div>
-					) }
-				{ ! this.state.shouldUpgrade &&
-					! this.props.attributes.planId &&
-=======
->>>>>>> origin/master:projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
 					connected === API_STATE_CONNECTED &&
 					products.length === 0 && (
 						<div className="wp-block-jetpack-recurring-payments">
-							<Placeholder
-<<<<<<< HEAD:extensions/blocks/recurring-payments/edit.jsx
-								icon={ icon }
-								label={ __( 'Recurring Payments', 'jetpack' ) }
-=======
-								icon={ <BlockIcon icon={ icon } /> }
-								label={ __( 'Payments', 'jetpack' ) }
->>>>>>> origin/master:projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
-								notices={ notices }
-							>
+							<Placeholder icon={ icon } label={ __( 'Payments', 'jetpack' ) } notices={ notices }>
 								<div className="components-placeholder__instructions">
 									<p>
 										{ __( 'To use this block, first add at least one payment plan.', 'jetpack' ) }
@@ -472,16 +432,7 @@ export class MembershipsButtonEdit extends Component {
 					connected === API_STATE_CONNECTED &&
 					products.length > 0 && (
 						<div className="wp-block-jetpack-recurring-payments">
-							<Placeholder
-<<<<<<< HEAD:extensions/blocks/recurring-payments/edit.jsx
-								icon={ icon }
-								label={ __( 'Recurring Payments', 'jetpack' ) }
-=======
-								icon={ <BlockIcon icon={ icon } /> }
-								label={ __( 'Payments', 'jetpack' ) }
->>>>>>> origin/master:projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
-								notices={ notices }
-							>
+							<Placeholder icon={ icon } label={ __( 'Payments', 'jetpack' ) } notices={ notices }>
 								<div className="components-placeholder__instructions">
 									<p>
 										{ __(