Revert to Braintree Merchant Server #1173
Merged
Conversation
This file contains 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
sarahkoop
approved these changes
Sep 30, 2024
jaxdesmarais
approved these changes
Sep 30, 2024
tdchow
added a commit
that referenced
this pull request
Oct 11, 2024
* main: (54 commits) Firebase App Distribution Branch (#1182) Fix lint warnings - replace kapt with ksp, remove unused properties and resources, added Intent extension functions for handling deprecated functions (#1181) [open dev] Cleanup integration tests (#1180) Update README and CHANGELOG (#1176) App link setup docs (#1171) Revert to Braintree Merchant Server (#1173) Prepare for development Release 5.0.0 Remove BA toast from PatPal Fragment (#1172) [App Switch] Update CHANGELOG (#1166) Make pending request constructors public (#1169) [App Switch] Add analytic events (#1111) Fix 3DS Cancel (#1161) Fix `os_version` and `enablePayPalAppSwitch` (#1162) Fix analytic event timestamps (#1160) Rename handleReturnToAppFromBrowser to handleReturnToApp (#1158) Parse error messages from multiple possible fields in the error response (#1156) External Interface Access Control (#1155) Update Google Pay Integration (#1153) Batch Analytics Events by Session ID (#1152) ... # Conflicts: # CHANGELOG.md # Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java # Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java # Demo/src/main/res/layout/fragment_paypal.xml # PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt # PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt # PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
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.
Summary of changes
Checklist
Added a changelog entry[ ] Relevant test coverageAuthors