Merge branch 'main' into contact-information-feature

CHANGELOG.md

@@ -5,6 +5,7 @@
 * PayPal
   * Add `PayPalContactInformation` request object
   * Add `PayPalCheckoutRequest.contactInformation` optional property
+  * Fix bug where `intent=order` was not being set as expected
 
 ## 5.4.0 (2025-01-21)
 

PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalPaymentIntent.kt

@@ -26,7 +26,7 @@ enum class PayPalPaymentIntent(internal val stringValue: String) {
         @JvmStatic
         @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
         fun fromString(string: String?): PayPalPaymentIntent? {
-            return PayPalPaymentIntent.values().firstOrNull { it.stringValue == string }
+            return entries.firstOrNull { it.stringValue.equals(string, ignoreCase = true) }
         }
     }
 }

PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalPaymentIntentTest.kt

@@ -0,0 +1,20 @@
+package com.braintreepayments.api.paypal
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Test
+
+class PayPalPaymentIntentTest {
+
+    @Test
+    fun `Test PayPalPaymentIntent fromString -- accepts case insensitive strings`() {
+        assertEquals(PayPalPaymentIntent.ORDER, PayPalPaymentIntent.fromString("order"))
+        assertEquals(PayPalPaymentIntent.ORDER, PayPalPaymentIntent.fromString("Order"))
+        assertEquals(PayPalPaymentIntent.ORDER, PayPalPaymentIntent.fromString("ORDER"))
+    }
+
+    @Test
+    fun `Test PayPalPaymentIntent fromString - random string fails equality`() {
+        assertNotEquals(PayPalPaymentIntent.ORDER, PayPalPaymentIntent.fromString("random"))
+    }
+}