woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 18:16:38 +08:00
Code Issues Projects Packages Wiki Activity Actions

🔀 Merge branch 'trunk' & resolve conflicts

Browse source 
# Conflicts:
#	modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/FeatureSettingsBlock.js
#	modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Overview/Features.js
This commit is contained in:
Philipp Stracker 2025-01-27 13:36:30 +01:00
commit a582b256d8
No known key found for this signature in database
4 changed files with 389 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/FeatureSettingsBlock.js
View file

@ -46,6 +46,15 @@ const FeatureSettingsBlock = ( { title, description, ...props } ) => {
return <Button { ...buttonProps }>{ text }</Button>;
};
const renderDescription = () => {
return (
<span
className="ppcp-r-feature-item__description ppcp-r-settings-block__feature__description"
dangerouslySetInnerHTML={ { __html: description } }
/>
);
};
return (
<SettingsBlock { ...props } className="ppcp-r-settings-block__feature">
<Header>
@ -56,7 +65,7 @@ const FeatureSettingsBlock = ( { title, description, ...props } ) => {
) }
</Title>
<Description className="ppcp-r-settings-block__feature__description">
{ description }
{ renderDescription() }
{ printNotes() }
</Description>
</Header>