Avoid API 24 Map.merge in billing address fields (MOBILESDK-4667)

cttsai-stripe · codex · cttsai-stripe · commit 7a8fe604bc8c · 2026-08-05T09:51:10.000-07:00
Committed-By-Agent: codex
Co-authored-by: codex &lt;noreply@openai.com&gt;
diff --git a/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/BillingAddressElement.kt b/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/BillingAddressElement.kt
@@ -58,7 +58,7 @@ fun cardBillingAddressCollectionMode(
                 }
                 if (requiresBillingAddressForAutomaticTax) {
                     additionalAutomaticTaxFieldsByCountry.forEach { (countryCode, fields) ->
-                        merge(countryCode, fields) { existing, additional -> existing + additional }
+                        put(countryCode, get(countryCode).orEmpty() + fields)
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ fun cardBillingAddressCollectionMode(`
`58`	`58`	`}`
`59`	`59`	`if (requiresBillingAddressForAutomaticTax) {`
`60`	`60`	`additionalAutomaticTaxFieldsByCountry.forEach { (countryCode, fields) ->`
`61`		`- merge(countryCode, fields) { existing, additional -> existing + additional }`
	`61`	`+ put(countryCode, get(countryCode).orEmpty() + fields)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`