Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix WooPay button preview in plugin settings. #9649

Merged
merged 6 commits into from
Oct 31, 2024
Merged

Fix WooPay button preview in plugin settings. #9649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75d4ffe
Fix WooPay button preview in plugin settings.
rafaelzaleski Oct 30, 2024
839616e
Merge branch 'develop' into fix/9537-woopay-button-size-preview
rafaelzaleski Oct 30, 2024
f640019
Add changelog
rafaelzaleski Oct 30, 2024
e716c9f
Remove console log
rafaelzaleski Oct 30, 2024
84d1fc0
Update client/checkout/woopay/express-button/woopay-express-checkout-…
rafaelzaleski Oct 31, 2024
81bd795
Merge branch 'develop' into fix/9537-woopay-button-size-preview
rafaelzaleski Oct 31, 2024
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
4 changes: 4 additions & 0 deletions changelog/fix-9537-woopay-button-size-preview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Fix WooPay button preview in plugin settings.
5 changes: 3 additions & 2 deletions client/checkout/woopay/express-button/woopay-express-checkout-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,11 @@ export const WoopayExpressCheckoutButton = ( {
// If we are on the checkout block, we receive button attributes which overwrite the extension specific settings
if ( typeof buttonAttributes !== 'undefined' ) {
buttonHeight = buttonAttributes.height || buttonHeight;
borderRadius = buttonAttributes.borderRadius || borderRadius;
borderRadius = buttonAttributes.borderRadius ?? borderRadius;
}

const buttonSize = buttonSizeMap.get( buttonHeight );
const buttonSize =
buttonSizeMap.get( buttonHeight?.toString() ) || 'medium';

const buttonText =
ButtonTypeTextMap[ buttonType || 'default' ] ??
Expand Down
5 changes: 4 additions & 1 deletion client/settings/express-checkout-settings/payment-request-button-preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ const WooPayButtonPreview = ( { size, buttonType, theme, radius } ) => (
buttonSizeToPxMap[ size ] || buttonSizeToPxMap.medium
}px`,
size,
radius,
} }
buttonAttributes={ {
height: buttonSizeToPxMap[ size ] || buttonSizeToPxMap.medium,
borderRadius: radius,
} }
/>
);
Expand Down
Loading