Check for current user connection instead of connected owner

Automattic · Oct 7, 2024 · 853745d · 853745d
1 parent 1bfc15f
commit 853745d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/edit.js b/projects/plugins/jetpack/extensions/blocks/donations/edit.js
@@ -22,7 +22,7 @@ const Edit = props => {
 	const blockProps = useBlockProps();
 	const [ loadingError, setLoadingError ] = useState( '' );
 	const [ products, setProducts ] = useState( [] );
-	const { hasConnectedOwner } = useConnection();
+	const { isUserConnected } = useConnection();
 
 	const { lockPostSaving, unlockPostSaving } = useDispatch( 'core/editor' );
 	const post = useSelect( select => select( 'core/editor' ).getCurrentPost(), [] );
@@ -137,7 +137,7 @@ const Edit = props => {
 
 	let content;
 
-	if ( ! hasConnectedOwner ) {
+	if ( ! isUserConnected ) {
 		content = (
 			<ConnectBanner
 				explanation={ __( 'Connect your WordPress.com account to enable donations.', 'jetpack' ) }

diff --git a/projects/plugins/jetpack/extensions/blocks/payment-buttons/edit.js b/projects/plugins/jetpack/extensions/blocks/payment-buttons/edit.js
@@ -14,7 +14,7 @@ const ALLOWED_BLOCKS = [ 'jetpack/recurring-payments' ];
 
 function PaymentButtonsEdit( { clientId, attributes } ) {
 	const { layout, fontSize } = attributes;
-	const { hasConnectedOwner } = useConnection();
+	const { isUserConnected } = useConnection();
 	const { connectUrl, isApiConnected } = useSelect( select => {
 		const { getConnectUrl, isApiStateConnected } = select( membershipProductsStore );
 		return {
@@ -76,7 +76,7 @@ function PaymentButtonsEdit( { clientId, attributes } ) {
 	delete innerBlocksProps.id;
 	delete innerBlocksProps[ 'data-block' ];
 
-	if ( ! hasConnectedOwner ) {
+	if ( ! isUserConnected ) {
 		return (
 			<div { ...blockProps }>
 				<ConnectBanner

diff --git a/projects/plugins/jetpack/extensions/blocks/payments-intro/edit.js b/projects/plugins/jetpack/extensions/blocks/payments-intro/edit.js
@@ -26,7 +26,7 @@ export default function JetpackPaymentsIntroEdit( { name, clientId } ) {
 		};
 	} );
 
-	const { hasConnectedOwner } = useConnection();
+	const { isUserConnected } = useConnection();
 
 	const { replaceBlock, selectBlock, updateSettings } = useDispatch( blockEditorStore );
 
@@ -71,7 +71,7 @@ export default function JetpackPaymentsIntroEdit( { name, clientId } ) {
 
 	let content;
 
-	if ( ! hasConnectedOwner ) {
+	if ( ! isUserConnected ) {
 		content = (
 			<ConnectBanner
 				explanation={ __(

diff --git a/projects/plugins/jetpack/extensions/blocks/paywall/edit.js b/projects/plugins/jetpack/extensions/blocks/paywall/edit.js
@@ -18,7 +18,7 @@ function PaywallEdit() {
 	const blockProps = useBlockProps();
 	const postType = useSelect( select => select( editorStore ).getCurrentPostType(), [] );
 	const accessLevel = useAccessLevel( postType );
-	const { hasConnectedOwner } = useConnection();
+	const { isUserConnected } = useConnection();
 
 	const { stripeConnectUrl, hasTierPlans } = useSelect( select => {
 		const { getNewsletterTierProducts, getConnectUrl } = select( 'jetpack/membership-products' );
@@ -46,7 +46,7 @@ function PaywallEdit() {
 		setAccess( value );
 	}
 
-	if ( ! hasConnectedOwner ) {
+	if ( ! isUserConnected ) {
 		return (
 			<div { ...blockProps }>
 				<ConnectBanner

diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/edit.js b/projects/plugins/jetpack/extensions/blocks/premium-content/edit.js
@@ -62,7 +62,7 @@ function Edit( { clientId, isSelected, attributes, setAttributes } ) {
 
 	const [ selectedTab, selectTab ] = useState( tabs[ WALL_TAB ] );
 	const blockProps = useBlockProps();
-	const { hasConnectedOwner } = useConnection();
+	const { isUserConnected } = useConnection();
 
 	const setSelectedProductIds = productIds => setAttributes( { selectedPlanIds: productIds } );
 
@@ -102,7 +102,7 @@ function Edit( { clientId, isSelected, attributes, setAttributes } ) {
 
 	const isSmallViewport = useViewportMatch( 'medium', '<' );
 
-	if ( ! hasConnectedOwner ) {
+	if ( ! isUserConnected ) {
 		return (
 			<div { ...blockProps }>
 				<ConnectBanner