fix: split Google Pay merchantId, add borderRadius, fix WebView sizing#43
Merged
fix: split Google Pay merchantId, add borderRadius, fix WebView sizing#43
Conversation
✅ Snyk checks have passed. No issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
RhysAtBolt
approved these changes
Mar 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Splits the single
merchantIdfield inGooglePayConfiginto two distinct fields:gatewayMerchantId(Bolt merchant ID used for tokenization) andgoogleMerchantId(Google-assigned BCR2DN... ID for production). The previous API conflated these two identifiers, which could lead toOR_BIBED_06errors when merchants incorrectly used their app ID or Google merchant ID as the gateway merchant ID. This PR also adds aborderRadiusprop to the Google Pay button (Android) usingViewOutlineProviderclipping, and fixes WebView sizing inBoltPaymentWebViewby extracting height-parsing logic into a robusttryExtractHeightcallback that handles double-serialized messages and addsoverflow: 'hidden'to the container style.Testing
GoogleWallet.test.tsxandWalletTypes.test.tsto reflect the newgatewayMerchantId/googleMerchantIdsplit — both pass with the new config shape.example/src/App.tsx) updated to demonstrate the new config fields andborderRadiusprop.borderRadiusis set and resets when omitted.gatewayMerchantId→ tokenization spec,googleMerchantId→ merchant info).SetIFrameHeightmessages, including double-serialized string payloads.Security Review
Important
A security review is required for every PR in this repository to comply with PCI requirements.
Security Impact Summary
The change to
GooglePayModule.ktmodifies which merchant ID values are sent in the Google Pay tokenization specification and merchant info payload. ThegatewayMerchantId(Bolt merchant ID) is now correctly routed to the tokenization parameters, while thegoogleMerchantIdis sent as the merchant identifier to Google. This is a correctness fix for the payment flow — previously misconfigured values could cause payment failures. No new external integrations, auth changes, or user data handling are introduced. The WebView changes do not alter message dispatch or payment data handling, only height-resize parsing.