Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: enhancement

Newsletter: explain why the Everyone audience is unavailable when a post has a paywall block, instead of linking to the block.
3 changes: 3 additions & 0 deletions projects/plugins/jetpack/extensions/blocks/paywall/edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ function PaywallEdit() {
stripeConnectUrl={ stripeConnectUrl }
hasTierPlans={ hasTierPlans }
postHasPaywallBlock={ true }
// The block card above this panel already explains the paywall, so the
// notice would only repeat the heading it sits under.
explainPaywallConstraint={ false }
/>
</PanelBody>
</InspectorControls>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ function NewsletterPrePublishSettingsPanel( { accessLevel, showPreviewModal } )
{ __( 'Audience:', 'jetpack' ) }
{ accessLevel && (
<span className={ 'jetpack-subscribe-post-publish-panel__heading' }>
{ accessOptions[ accessLevel ].panelHeading }
{ accessOptions[ accessLevel ].label }
</span>
) }
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@ export const accessOptions = {
everybody: {
key: 'everybody',
label: __( 'Everyone', 'jetpack' ),
panelHeading: __( 'Everyone', 'jetpack' ),
},
subscribers: {
key: 'subscribers',
label: __( 'Subscribers', 'jetpack' ),
panelHeading: __( 'Subscribers', 'jetpack' ),
},
paid_subscribers: {
key: 'paid_subscribers',
label: __( 'Paid subscribers', 'jetpack' ),
panelHeading: __( 'Paid subscribers', 'jetpack' ),
},
};
Loading
Loading