From 42e13f4ab683d31f8bb8a7eca715c8ba0c1ec0f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gergely=20M=C3=A1rk=20Juh=C3=A1sz?=
 <36671565+gmjuhasz@users.noreply.github.com>
Date: Fri, 15 Sep 2023 23:10:12 +0200
Subject: [PATCH] Social Change/move auto conversion notice up (#33106)

* Move auto-conversion notice to the other notices

* changelog

* Fixup versions

* Update text in notice
---
 .../change-move-auto-conversion-notice-up     |  4 ++
 .../publicize-components/package.json         |  2 +-
 .../src/components/form/index.js              | 60 +++++++++----------
 3 files changed, 32 insertions(+), 34 deletions(-)
 create mode 100644 projects/js-packages/publicize-components/changelog/change-move-auto-conversion-notice-up

diff --git a/projects/js-packages/publicize-components/changelog/change-move-auto-conversion-notice-up b/projects/js-packages/publicize-components/changelog/change-move-auto-conversion-notice-up
new file mode 100644
index 0000000000000..c9d8250187e96
--- /dev/null
+++ b/projects/js-packages/publicize-components/changelog/change-move-auto-conversion-notice-up
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Move auto-conversion notice near the Instagram one
diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json
index dab956c053432..e063c83f883bc 100644
--- a/projects/js-packages/publicize-components/package.json
+++ b/projects/js-packages/publicize-components/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize-components",
-	"version": "0.37.1-alpha",
+	"version": "0.38.0-alpha",
 	"description": "A library of JS components required by the Publicize editor plugin",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme",
 	"bugs": {
diff --git a/projects/js-packages/publicize-components/src/components/form/index.js b/projects/js-packages/publicize-components/src/components/form/index.js
index 8781c7c2c8195..41d72147fa7bc 100644
--- a/projects/js-packages/publicize-components/src/components/form/index.js
+++ b/projects/js-packages/publicize-components/src/components/form/index.js
@@ -160,6 +160,33 @@ export default function PublicizeForm( {
 					) }
 				</Notice>
 			) }
+			{ shouldAutoConvert &&
+				showValidationNotice &&
+				mediaId &&
+				shouldShowNotice( NOTICES.autoConversion ) && (
+					<Notice
+						type={ 'warning' }
+						actions={ [
+							<Button onClick={ onAutoConversionNoticeDismiss } key="dismiss" variant="primary">
+								{ __( 'Got it', 'jetpack' ) }
+							</Button>,
+							<Button
+								className={ styles[ 'change-settings-button' ] }
+								key="change-settings"
+								href={ adminUrl || jetpackSharingSettingsUrl }
+								target="_blank"
+								rel="noreferrer noopener"
+							>
+								{ __( 'Change settings', 'jetpack' ) }
+							</Button>,
+						] }
+					>
+						{ __(
+							'When your post is published, the selected image will be converted for maximum compatibility across your connected social networks.',
+							'jetpack'
+						) }
+					</Notice>
+				) }
 		</>
 	);
 
@@ -418,39 +445,6 @@ export default function PublicizeForm( {
 									  )
 									: null
 							}
-							CustomNotice={
-								shouldAutoConvert &&
-								showValidationNotice &&
-								mediaId &&
-								shouldShowNotice( NOTICES.autoConversion ) && (
-									<Notice
-										type={ 'warning' }
-										actions={ [
-											<Button
-												onClick={ onAutoConversionNoticeDismiss }
-												key="dismiss"
-												variant="primary"
-											>
-												{ __( 'Got it', 'jetpack' ) }
-											</Button>,
-											<Button
-												className={ styles[ 'change-settings-button' ] }
-												key="change-settings"
-												href={ adminUrl || jetpackSharingSettingsUrl }
-												target="_blank"
-												rel="noreferrer noopener"
-											>
-												{ __( 'Change settings', 'jetpack' ) }
-											</Button>,
-										] }
-									>
-										{ __(
-											'When your post is published, this image will be converted for maximum compatibility across your connected social networks.',
-											'jetpack'
-										) }
-									</Notice>
-								)
-							}
 						/>
 					) }
 				</Fragment>