From 7dedb0a9abd4b2f0945527f5d2c488fdda46c4b5 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Tue, 3 Dec 2024 10:37:39 -0800
Subject: [PATCH 01/17] Add shopper insights session ID to paypalRequest

---
 .../demo/ShopperInsightsFragment.kt           |  6 ++++
 .../res/layout/fragment_shopping_insights.xml | 29 ++++++++++++++++++-
 .../api/paypal/PayPalCheckoutRequest.kt       |  4 +++
 .../api/paypal/PayPalRequest.kt               |  4 +++
 .../api/paypal/PayPalVaultRequest.kt          |  2 ++
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
index 65ad45b48e..871b8f25c2 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
+++ b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
@@ -49,6 +49,8 @@ class ShopperInsightsFragment : BaseFragment() {
     private lateinit var nationalNumberInput: TextInputLayout
     private lateinit var emailNullSwitch: SwitchMaterial
     private lateinit var phoneNullSwitch: SwitchMaterial
+    private lateinit var shopperInsightsSessionIdInput: TextInputLayout
+    private lateinit var shopperInsightsSessionIdNullSwitch: SwitchMaterial
 
     private lateinit var shopperInsightsClient: ShopperInsightsClient
     private lateinit var payPalClient: PayPalClient
@@ -95,9 +97,13 @@ class ShopperInsightsFragment : BaseFragment() {
         nationalNumberInput = view.findViewById(R.id.nationalNumberInput)
         emailNullSwitch = view.findViewById(R.id.emailNullSwitch)
         phoneNullSwitch = view.findViewById(R.id.phoneNullSwitch)
+        shopperInsightsSessionIdInput = view.findViewById(R.id.shopperInsightsSessionIdInput)
+        shopperInsightsSessionIdNullSwitch = view.findViewById(R.id.shopperInsightsSessionIdNullSwitch)
+
 
         emailInput.editText?.setText("PR1_merchantname@personal.example.com")
         nationalNumberInput.editText?.setText("4082321001")
+        shopperInsightsSessionIdInput.editText?.setText("shopperSessionId")
         countryCodeInput.editText?.setText("1")
     }
 
diff --git a/Demo/src/main/res/layout/fragment_shopping_insights.xml b/Demo/src/main/res/layout/fragment_shopping_insights.xml
index 2560fc92d9..6c9e60f2a4 100644
--- a/Demo/src/main/res/layout/fragment_shopping_insights.xml
+++ b/Demo/src/main/res/layout/fragment_shopping_insights.xml
@@ -79,6 +79,23 @@
             android:hint="@string/insights_text_input_national_number" />
     </com.google.android.material.textfield.TextInputLayout>
 
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/shopperInsightsSessionIdInput"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintEnd_toStartOf="@+id/shopperInsightsSessionIdNullSwitch"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/countryCodeInput">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Session Id" />
+    </com.google.android.material.textfield.TextInputLayout>
+
     <TextView
         android:id="@+id/responseTextView"
         android:layout_width="0dp"
@@ -101,7 +118,7 @@
         android:text="@string/insights_action_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/countryCodeInput" />
+        app:layout_constraintTop_toBottomOf="@+id/shopperInsightsSessionIdInput" />
 
     <Button
         android:id="@+id/payPalVaultButton"
@@ -149,6 +166,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/nationalNumberInput" />
 
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/shopperInsightsSessionIdNullSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:text="@string/insights_null_switch"
+        app:layout_constraintBottom_toBottomOf="@+id/shopperInsightsSessionIdInput"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/shopperInsightsSessionIdInput" />
+
     <View
         android:id="@+id/view3"
         android:layout_width="match_parent"
diff --git a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalCheckoutRequest.kt b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalCheckoutRequest.kt
index e95d708813..0a0420b86d 100644
--- a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalCheckoutRequest.kt
+++ b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalCheckoutRequest.kt
@@ -126,6 +126,10 @@ class PayPalCheckoutRequest @JvmOverloads constructor(
 
         userPhoneNumber?.let { parameters.put(PHONE_NUMBER_KEY, it.toJson()) }
 
+        shopperSessionId?.let {
+            if (it.isNotEmpty()) parameters.put(SHOPPER_SESSION_ID, it)
+        }
+
         if (currencyCode == null) {
             currencyCode = configuration?.payPalCurrencyIsoCode
         }
diff --git a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
index adfd68924c..e970e9dd8f 100644
--- a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
+++ b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
@@ -72,6 +72,8 @@ import org.json.JSONException
  * where the user has a PayPal Account with the same email.
  * @property userPhoneNumber User phone number used to initiate a quicker authentication flow in
  * cases where the user has a PayPal Account with the phone number.
+ * @property shopperSessionId value should be the shopper session ID returned from your server SDK
+ * request.
  * @property lineItems The line items for this transaction. It can include up to 249 line items.
  */
 abstract class PayPalRequest internal constructor(
@@ -87,6 +89,7 @@ abstract class PayPalRequest internal constructor(
     open var riskCorrelationId: String? = null,
     open var userAuthenticationEmail: String? = null,
     open var userPhoneNumber: PayPalPhoneNumber? = null,
+    open var shopperSessionId: String? = null,
     open var lineItems: List<PayPalLineItem> = emptyList()
 ) : Parcelable {
 
@@ -132,5 +135,6 @@ abstract class PayPalRequest internal constructor(
         internal const val PLAN_TYPE_KEY: String = "plan_type"
         internal const val PLAN_METADATA_KEY: String = "plan_metadata"
         internal const val PHONE_NUMBER_KEY: String = "phone_number"
+        internal const val SHOPPER_SESSION_ID: String = "shopper_session_id"
     }
 }
diff --git a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt
index ea19bfb618..f85f06295c 100644
--- a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt
+++ b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt
@@ -92,6 +92,8 @@ class PayPalVaultRequest
 
         parameters.putOpt(PAYER_EMAIL_KEY, userAuthenticationEmail)
 
+        parameters.putOpt(SHOPPER_SESSION_ID, shopperSessionId)
+
         userPhoneNumber?.let { parameters.put(PHONE_NUMBER_KEY, it.toJson()) }
 
         if (enablePayPalAppSwitch && !appLink.isNullOrEmpty() && !userAuthenticationEmail.isNullOrEmpty()) {

From dedaf01f545db28c634cd86cf4128aae39ddc15b Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Tue, 3 Dec 2024 11:09:27 -0800
Subject: [PATCH 02/17] Update factory for paypal request

---
 .../braintreepayments/demo/PayPalFragment.java  |  6 ++++--
 .../demo/PayPalRequestFactory.java              | 17 +++++++++++++++--
 .../demo/ShopperInsightsFragment.kt             |  9 ++++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java
index fa90df0b62..5c499719e5 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java
@@ -148,7 +148,8 @@ private void launchPayPal(
                 activity,
                 buyerEmailAddress,
                 buyerPhoneCountryCode,
-                buyerPhoneNationalNumber
+                buyerPhoneNationalNumber,
+                    null
             );
         } else {
             payPalRequest = createPayPalCheckoutRequest(
@@ -156,7 +157,8 @@ private void launchPayPal(
                 amount,
                 buyerEmailAddress,
                 buyerPhoneCountryCode,
-                buyerPhoneNationalNumber
+                buyerPhoneNationalNumber,
+                    null
             );
         }
         payPalClient.createPaymentAuthRequest(requireContext(), payPalRequest,
diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
index efdc0d8bd5..0ed55ec7b5 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
@@ -18,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public class PayPalRequestFactory {
 
@@ -25,7 +26,8 @@ public static PayPalVaultRequest createPayPalVaultRequest(
         Context context,
         String buyerEmailAddress,
         String buyerPhoneCountryCode,
-        String buyerPhoneNationalNumber
+        String buyerPhoneNationalNumber,
+        Optional<String> shopperInsightsSessionId
     ) {
 
         PayPalVaultRequest request = new PayPalVaultRequest(true);
@@ -38,6 +40,11 @@ public static PayPalVaultRequest createPayPalVaultRequest(
             request.setUserPhoneNumber(new PayPalPhoneNumber(buyerPhoneCountryCode, buyerPhoneNationalNumber));
         }
 
+        if (!shopperInsightsSessionId.toString().isEmpty()) {
+            request.setShopperSessionId(shopperInsightsSessionId.toString());
+            request.setUserAuthenticationEmail(buyerEmailAddress);
+        }
+
         if (Settings.isPayPalAppSwithEnabled(context)) {
             request.setEnablePayPalAppSwitch(true);
         }
@@ -111,7 +118,8 @@ public static PayPalCheckoutRequest createPayPalCheckoutRequest(
         String amount,
         String buyerEmailAddress,
         String buyerPhoneCountryCode,
-        String buyerPhoneNationalNumber
+        String buyerPhoneNationalNumber,
+        Optional<String> shopperInsightsSessionId
     ) {
         PayPalCheckoutRequest request = new PayPalCheckoutRequest(amount, true);
 
@@ -123,6 +131,11 @@ public static PayPalCheckoutRequest createPayPalCheckoutRequest(
             request.setUserPhoneNumber(new PayPalPhoneNumber(buyerPhoneCountryCode, buyerPhoneNationalNumber));
         }
 
+        if (!shopperInsightsSessionId.toString().isEmpty()) {
+            request.setShopperSessionId(shopperInsightsSessionId.toString());
+            request.setUserAuthenticationEmail(buyerEmailAddress);
+        }
+
         request.setDisplayName(Settings.getPayPalDisplayName(context));
 
         String landingPageType = Settings.getPayPalLandingPageType(context);
diff --git a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
index 871b8f25c2..722dbe5818 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
+++ b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
@@ -32,6 +32,7 @@ import com.braintreepayments.api.venmo.VenmoRequest
 import com.braintreepayments.api.venmo.VenmoResult
 import com.google.android.material.switchmaterial.SwitchMaterial
 import com.google.android.material.textfield.TextInputLayout
+import java.util.Optional
 
 /**
  * Fragment for handling shopping insights.
@@ -229,13 +230,19 @@ class ShopperInsightsFragment : BaseFragment() {
     private fun launchPayPalVault() {
         shopperInsightsClient.sendPayPalSelectedEvent()
 
+        val shopperSessionId =
+            if (shopperInsightsSessionIdNullSwitch.isChecked) null
+            else shopperInsightsSessionIdInput.editText?.text.toString()
+
         payPalClient.createPaymentAuthRequest(
             requireContext(),
             PayPalRequestFactory.createPayPalVaultRequest(
                 activity,
                 emailInput.editText?.text.toString(),
                 countryCodeInput.editText?.text.toString(),
-                nationalNumberInput.editText?.text.toString()
+                nationalNumberInput.editText?.text.toString(),
+                Optional.ofNullable(shopperSessionId)
+
             )
         ) { authRequest ->
             when (authRequest) {

From b1f1767289d0520c208be03771411fbed7beeae3 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Tue, 3 Dec 2024 11:20:29 -0800
Subject: [PATCH 03/17] remove extra setting of email address

---
 .../java/com/braintreepayments/demo/PayPalRequestFactory.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
index 0ed55ec7b5..3f03fbc9d0 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
@@ -42,7 +42,6 @@ public static PayPalVaultRequest createPayPalVaultRequest(
 
         if (!shopperInsightsSessionId.toString().isEmpty()) {
             request.setShopperSessionId(shopperInsightsSessionId.toString());
-            request.setUserAuthenticationEmail(buyerEmailAddress);
         }
 
         if (Settings.isPayPalAppSwithEnabled(context)) {

From ebb92f197871269ad530c5e2653b64f17832d7f3 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Tue, 3 Dec 2024 13:45:14 -0800
Subject: [PATCH 04/17] Remove optional null and check for null in
 PayPalRequestFactory

---
 .../braintreepayments/demo/PayPalRequestFactory.java   | 10 +++++-----
 .../braintreepayments/demo/ShopperInsightsFragment.kt  |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
index 3f03fbc9d0..dec67abf6d 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
@@ -27,21 +27,21 @@ public static PayPalVaultRequest createPayPalVaultRequest(
         String buyerEmailAddress,
         String buyerPhoneCountryCode,
         String buyerPhoneNationalNumber,
-        Optional<String> shopperInsightsSessionId
+        String shopperInsightsSessionId
     ) {
 
         PayPalVaultRequest request = new PayPalVaultRequest(true);
 
-        if (!buyerEmailAddress.isEmpty()) {
+        if (buyerEmailAddress != null) {
             request.setUserAuthenticationEmail(buyerEmailAddress);
         }
 
-        if (!buyerPhoneCountryCode.isEmpty() && !buyerPhoneNationalNumber.isEmpty()) {
+        if (buyerPhoneCountryCode != null && buyerPhoneNationalNumber != null) {
             request.setUserPhoneNumber(new PayPalPhoneNumber(buyerPhoneCountryCode, buyerPhoneNationalNumber));
         }
 
-        if (!shopperInsightsSessionId.toString().isEmpty()) {
-            request.setShopperSessionId(shopperInsightsSessionId.toString());
+        if (shopperInsightsSessionId != null) {
+            request.setShopperSessionId(shopperInsightsSessionId);
         }
 
         if (Settings.isPayPalAppSwithEnabled(context)) {
diff --git a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
index 722dbe5818..f26714d98c 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
+++ b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
@@ -32,7 +32,6 @@ import com.braintreepayments.api.venmo.VenmoRequest
 import com.braintreepayments.api.venmo.VenmoResult
 import com.google.android.material.switchmaterial.SwitchMaterial
 import com.google.android.material.textfield.TextInputLayout
-import java.util.Optional
 
 /**
  * Fragment for handling shopping insights.
@@ -241,7 +240,7 @@ class ShopperInsightsFragment : BaseFragment() {
                 emailInput.editText?.text.toString(),
                 countryCodeInput.editText?.text.toString(),
                 nationalNumberInput.editText?.text.toString(),
-                Optional.ofNullable(shopperSessionId)
+                shopperSessionId
 
             )
         ) { authRequest ->

From 7b06a235809df7f84203d6b2800dbb30f41348f6 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Tue, 3 Dec 2024 14:32:27 -0800
Subject: [PATCH 05/17] Use String type and fix check for null to prevent run
 time crashes

---
 .../braintreepayments/demo/PayPalRequestFactory.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
index dec67abf6d..96aed003eb 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
@@ -118,21 +118,20 @@ public static PayPalCheckoutRequest createPayPalCheckoutRequest(
         String buyerEmailAddress,
         String buyerPhoneCountryCode,
         String buyerPhoneNationalNumber,
-        Optional<String> shopperInsightsSessionId
+        String shopperInsightsSessionId
     ) {
         PayPalCheckoutRequest request = new PayPalCheckoutRequest(amount, true);
 
-        if (!buyerEmailAddress.isEmpty()) {
+        if (buyerEmailAddress != null) {
             request.setUserAuthenticationEmail(buyerEmailAddress);
         }
 
-        if (!buyerPhoneCountryCode.isEmpty() && !buyerPhoneNationalNumber.isEmpty()) {
+        if (buyerPhoneCountryCode != null && buyerPhoneNationalNumber != null) {
             request.setUserPhoneNumber(new PayPalPhoneNumber(buyerPhoneCountryCode, buyerPhoneNationalNumber));
         }
 
-        if (!shopperInsightsSessionId.toString().isEmpty()) {
-            request.setShopperSessionId(shopperInsightsSessionId.toString());
-            request.setUserAuthenticationEmail(buyerEmailAddress);
+        if (shopperInsightsSessionId != null) {
+            request.setShopperSessionId(shopperInsightsSessionId);
         }
 
         request.setDisplayName(Settings.getPayPalDisplayName(context));

From 737f16fe0ce9b1375d1b3669290cd0d00da1c24c Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 12:08:45 -0800
Subject: [PATCH 06/17] Remove DEMO UI updates

---
 .../demo/ShopperInsightsFragment.kt           | 15 +++-------
 .../res/layout/fragment_shopping_insights.xml | 29 +------------------
 2 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
index bcf4346999..b963d2a121 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
+++ b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
@@ -49,7 +49,6 @@ class ShopperInsightsFragment : BaseFragment() {
     private lateinit var nationalNumberInput: TextInputLayout
     private lateinit var emailNullSwitch: SwitchMaterial
     private lateinit var phoneNullSwitch: SwitchMaterial
-    private lateinit var shopperInsightsSessionIdInput: TextInputLayout
     private lateinit var shopperInsightsSessionIdNullSwitch: SwitchMaterial
 
     private lateinit var shopperInsightsClient: ShopperInsightsClient
@@ -62,12 +61,14 @@ class ShopperInsightsFragment : BaseFragment() {
     private lateinit var venmoStartedPendingRequest: VenmoPendingRequest.Started
     private lateinit var paypalStartedPendingRequest: PayPalPendingRequest.Started
 
+    private var sessionId: String = "test-shopper-session-id"
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        shopperInsightsClient = ShopperInsightsClient(requireContext(), authStringArg, "test-shopper-session-id")
+        shopperInsightsClient = ShopperInsightsClient(requireContext(), authStringArg, sessionId)
 
         venmoClient = VenmoClient(requireContext(), super.getAuthStringArg(), null)
         payPalClient = PayPalClient(
@@ -97,13 +98,9 @@ class ShopperInsightsFragment : BaseFragment() {
         nationalNumberInput = view.findViewById(R.id.nationalNumberInput)
         emailNullSwitch = view.findViewById(R.id.emailNullSwitch)
         phoneNullSwitch = view.findViewById(R.id.phoneNullSwitch)
-        shopperInsightsSessionIdInput = view.findViewById(R.id.shopperInsightsSessionIdInput)
-        shopperInsightsSessionIdNullSwitch = view.findViewById(R.id.shopperInsightsSessionIdNullSwitch)
-
 
         emailInput.editText?.setText("PR1_merchantname@personal.example.com")
         nationalNumberInput.editText?.setText("4082321001")
-        shopperInsightsSessionIdInput.editText?.setText("shopperSessionId")
         countryCodeInput.editText?.setText("1")
     }
 
@@ -229,10 +226,6 @@ class ShopperInsightsFragment : BaseFragment() {
     private fun launchPayPalVault() {
         shopperInsightsClient.sendPayPalSelectedEvent()
 
-        val shopperSessionId =
-            if (shopperInsightsSessionIdNullSwitch.isChecked) null
-            else shopperInsightsSessionIdInput.editText?.text.toString()
-
         payPalClient.createPaymentAuthRequest(
             requireContext(),
             PayPalRequestFactory.createPayPalVaultRequest(
@@ -240,7 +233,7 @@ class ShopperInsightsFragment : BaseFragment() {
                 emailInput.editText?.text.toString(),
                 countryCodeInput.editText?.text.toString(),
                 nationalNumberInput.editText?.text.toString(),
-                shopperSessionId
+                sessionId
 
             )
         ) { authRequest ->
diff --git a/Demo/src/main/res/layout/fragment_shopping_insights.xml b/Demo/src/main/res/layout/fragment_shopping_insights.xml
index 6c9e60f2a4..2560fc92d9 100644
--- a/Demo/src/main/res/layout/fragment_shopping_insights.xml
+++ b/Demo/src/main/res/layout/fragment_shopping_insights.xml
@@ -79,23 +79,6 @@
             android:hint="@string/insights_text_input_national_number" />
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/shopperInsightsSessionIdInput"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintEnd_toStartOf="@+id/shopperInsightsSessionIdNullSwitch"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/countryCodeInput">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Session Id" />
-    </com.google.android.material.textfield.TextInputLayout>
-
     <TextView
         android:id="@+id/responseTextView"
         android:layout_width="0dp"
@@ -118,7 +101,7 @@
         android:text="@string/insights_action_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/shopperInsightsSessionIdInput" />
+        app:layout_constraintTop_toBottomOf="@+id/countryCodeInput" />
 
     <Button
         android:id="@+id/payPalVaultButton"
@@ -166,16 +149,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/nationalNumberInput" />
 
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/shopperInsightsSessionIdNullSwitch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:text="@string/insights_null_switch"
-        app:layout_constraintBottom_toBottomOf="@+id/shopperInsightsSessionIdInput"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/shopperInsightsSessionIdInput" />
-
     <View
         android:id="@+id/view3"
         android:layout_width="match_parent"

From c4437cd123ee060058197098deac77306dfa6742 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 12:34:54 -0800
Subject: [PATCH 07/17] Update comment for shopperSessionId

---
 .../com/braintreepayments/demo/ShopperInsightsFragment.kt   | 6 +++---
 .../java/com/braintreepayments/api/paypal/PayPalRequest.kt  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
index b963d2a121..1ee7775b6b 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
+++ b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
@@ -61,14 +61,14 @@ class ShopperInsightsFragment : BaseFragment() {
     private lateinit var venmoStartedPendingRequest: VenmoPendingRequest.Started
     private lateinit var paypalStartedPendingRequest: PayPalPendingRequest.Started
 
-    private var sessionId: String = "test-shopper-session-id"
+    private var shopperSessionId: String = "test-shopper-session-id"
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        shopperInsightsClient = ShopperInsightsClient(requireContext(), authStringArg, sessionId)
+        shopperInsightsClient = ShopperInsightsClient(requireContext(), authStringArg, shopperSessionId)
 
         venmoClient = VenmoClient(requireContext(), super.getAuthStringArg(), null)
         payPalClient = PayPalClient(
@@ -233,7 +233,7 @@ class ShopperInsightsFragment : BaseFragment() {
                 emailInput.editText?.text.toString(),
                 countryCodeInput.editText?.text.toString(),
                 nationalNumberInput.editText?.text.toString(),
-                sessionId
+                shopperSessionId
 
             )
         ) { authRequest ->
diff --git a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
index e970e9dd8f..52dbc49e6d 100644
--- a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
+++ b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
@@ -72,8 +72,8 @@ import org.json.JSONException
  * where the user has a PayPal Account with the same email.
  * @property userPhoneNumber User phone number used to initiate a quicker authentication flow in
  * cases where the user has a PayPal Account with the phone number.
- * @property shopperSessionId value should be the shopper session ID returned from your server SDK
- * request.
+ * @property shopperSessionId the shopper session ID returned from your shopper insights server SDK
+ * integration
  * @property lineItems The line items for this transaction. It can include up to 249 line items.
  */
 abstract class PayPalRequest internal constructor(

From c6b72d503e02663e26ed810b111d4971204d9a65 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 14:31:10 -0800
Subject: [PATCH 08/17] Add experimentalAPI for shopper session Id

---
 .../java/com/braintreepayments/api/paypal/PayPalRequest.kt     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
index 52dbc49e6d..d5b687e97f 100644
--- a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
+++ b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalRequest.kt
@@ -4,6 +4,7 @@ import android.os.Parcelable
 import androidx.annotation.RestrictTo
 import com.braintreepayments.api.core.Authorization
 import com.braintreepayments.api.core.Configuration
+import com.braintreepayments.api.core.ExperimentalBetaApi
 import com.braintreepayments.api.core.PostalAddress
 import org.json.JSONException
 
@@ -89,6 +90,8 @@ abstract class PayPalRequest internal constructor(
     open var riskCorrelationId: String? = null,
     open var userAuthenticationEmail: String? = null,
     open var userPhoneNumber: PayPalPhoneNumber? = null,
+
+    @property:ExperimentalBetaApi
     open var shopperSessionId: String? = null,
     open var lineItems: List<PayPalLineItem> = emptyList()
 ) : Parcelable {

From e548542344e5e988b94841195952cac3f2bd8715 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 14:31:22 -0800
Subject: [PATCH 09/17] Remove unused shopperInsightsSessionIdNullSwitch

---
 .../java/com/braintreepayments/demo/ShopperInsightsFragment.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
index 1ee7775b6b..aa4f4065ee 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
+++ b/Demo/src/main/java/com/braintreepayments/demo/ShopperInsightsFragment.kt
@@ -49,7 +49,6 @@ class ShopperInsightsFragment : BaseFragment() {
     private lateinit var nationalNumberInput: TextInputLayout
     private lateinit var emailNullSwitch: SwitchMaterial
     private lateinit var phoneNullSwitch: SwitchMaterial
-    private lateinit var shopperInsightsSessionIdNullSwitch: SwitchMaterial
 
     private lateinit var shopperInsightsClient: ShopperInsightsClient
     private lateinit var payPalClient: PayPalClient

From c9f419a2582fcb08b0b3e15513379b3b8bcc013d Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 14:38:15 -0800
Subject: [PATCH 10/17] Check for null and empty string

---
 .../demo/PayPalRequestFactory.java                 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
index 96aed003eb..dc9be1be1c 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class PayPalRequestFactory {
 
@@ -32,15 +31,20 @@ public static PayPalVaultRequest createPayPalVaultRequest(
 
         PayPalVaultRequest request = new PayPalVaultRequest(true);
 
-        if (buyerEmailAddress != null) {
+        if (buyerEmailAddress != null && !buyerEmailAddress.isEmpty() ) {
             request.setUserAuthenticationEmail(buyerEmailAddress);
         }
 
-        if (buyerPhoneCountryCode != null && buyerPhoneNationalNumber != null) {
-            request.setUserPhoneNumber(new PayPalPhoneNumber(buyerPhoneCountryCode, buyerPhoneNationalNumber));
+        if ((buyerPhoneCountryCode != null && !buyerPhoneCountryCode.isEmpty())
+                && (buyerPhoneNationalNumber != null && !buyerPhoneNationalNumber.isEmpty())) {
+
+            request.setUserPhoneNumber(new PayPalPhoneNumber(
+                    buyerPhoneCountryCode,
+                    buyerPhoneNationalNumber)
+            );
         }
 
-        if (shopperInsightsSessionId != null) {
+        if (shopperInsightsSessionId != null && !shopperInsightsSessionId.isEmpty()) {
             request.setShopperSessionId(shopperInsightsSessionId);
         }
 

From 179e35b4b166dddbc54100dd214be0e48c33969b Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 14:42:43 -0800
Subject: [PATCH 11/17] Update to use putOpt method for shopperId

---
 .../braintreepayments/api/paypal/PayPalCheckoutRequest.kt   | 6 +++---
 .../com/braintreepayments/api/paypal/PayPalVaultRequest.kt  | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalCheckoutRequest.kt b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalCheckoutRequest.kt
index 0a0420b86d..66b51a9baa 100644
--- a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalCheckoutRequest.kt
+++ b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalCheckoutRequest.kt
@@ -4,6 +4,7 @@ import android.text.TextUtils
 import com.braintreepayments.api.core.Authorization
 import com.braintreepayments.api.core.ClientToken
 import com.braintreepayments.api.core.Configuration
+import com.braintreepayments.api.core.ExperimentalBetaApi
 import com.braintreepayments.api.core.PostalAddress
 import com.braintreepayments.api.core.PostalAddressParser
 import kotlinx.parcelize.Parcelize
@@ -91,6 +92,7 @@ class PayPalCheckoutRequest @JvmOverloads constructor(
     lineItems = lineItems
 ) {
 
+    @OptIn(ExperimentalBetaApi::class)
     @Throws(JSONException::class)
     @Suppress("LongMethod", "CyclomaticComplexMethod")
     override fun createRequestBody(
@@ -126,9 +128,7 @@ class PayPalCheckoutRequest @JvmOverloads constructor(
 
         userPhoneNumber?.let { parameters.put(PHONE_NUMBER_KEY, it.toJson()) }
 
-        shopperSessionId?.let {
-            if (it.isNotEmpty()) parameters.put(SHOPPER_SESSION_ID, it)
-        }
+        parameters.putOpt(SHOPPER_SESSION_ID, shopperSessionId)
 
         if (currencyCode == null) {
             currencyCode = configuration?.payPalCurrencyIsoCode
diff --git a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt
index f85f06295c..5a21564f62 100644
--- a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt
+++ b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalVaultRequest.kt
@@ -5,6 +5,7 @@ import android.text.TextUtils
 import com.braintreepayments.api.core.Authorization
 import com.braintreepayments.api.core.ClientToken
 import com.braintreepayments.api.core.Configuration
+import com.braintreepayments.api.core.ExperimentalBetaApi
 import com.braintreepayments.api.core.PostalAddress
 import com.braintreepayments.api.core.PostalAddressParser
 import kotlinx.parcelize.Parcelize
@@ -65,6 +66,7 @@ class PayPalVaultRequest
     lineItems = lineItems
 ) {
 
+    @OptIn(ExperimentalBetaApi::class)
     @Throws(JSONException::class)
     @Suppress("LongMethod")
     override fun createRequestBody(

From 152b11e0dca577fd39fafcc950461f6d466cf809 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 14:45:30 -0800
Subject: [PATCH 12/17] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8cea1961c..c48f9d95ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 * ShopperInsights (BETA)
   * Add `isPayPalAppInstalled` and `isVenmoAppInstalled` methods
   * Add `shopperSessionId` parameter to `ShopperInsightsClient`
+* BraintreePayPal
+  * Add `shopperSessionInsight`
 
 ## 5.2.0 (2024-10-30)
 

From 073938bc021ca330c7e440e66917cfa85408551b Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 14:49:27 -0800
Subject: [PATCH 13/17] Check for null and empty strings for request
 properties.

---
 .../demo/PayPalRequestFactory.java                 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
index dc9be1be1c..2331067882 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalRequestFactory.java
@@ -31,7 +31,7 @@ public static PayPalVaultRequest createPayPalVaultRequest(
 
         PayPalVaultRequest request = new PayPalVaultRequest(true);
 
-        if (buyerEmailAddress != null && !buyerEmailAddress.isEmpty() ) {
+        if (buyerEmailAddress != null && !buyerEmailAddress.isEmpty()) {
             request.setUserAuthenticationEmail(buyerEmailAddress);
         }
 
@@ -126,15 +126,19 @@ public static PayPalCheckoutRequest createPayPalCheckoutRequest(
     ) {
         PayPalCheckoutRequest request = new PayPalCheckoutRequest(amount, true);
 
-        if (buyerEmailAddress != null) {
+        if (buyerEmailAddress != null && !buyerEmailAddress.isEmpty()) {
             request.setUserAuthenticationEmail(buyerEmailAddress);
         }
 
-        if (buyerPhoneCountryCode != null && buyerPhoneNationalNumber != null) {
-            request.setUserPhoneNumber(new PayPalPhoneNumber(buyerPhoneCountryCode, buyerPhoneNationalNumber));
+        if ((buyerPhoneCountryCode != null && !buyerPhoneCountryCode.isEmpty())
+                && (buyerPhoneNationalNumber != null && !buyerPhoneNationalNumber.isEmpty())) {
+            request.setUserPhoneNumber(new PayPalPhoneNumber(
+                    buyerPhoneCountryCode,
+                    buyerPhoneNationalNumber)
+            );
         }
 
-        if (shopperInsightsSessionId != null) {
+        if (shopperInsightsSessionId != null && !shopperInsightsSessionId.isEmpty()) {
             request.setShopperSessionId(shopperInsightsSessionId);
         }
 

From fe9def09ff2e6f1c70087caa7cb359e288aeebc1 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 14:59:14 -0800
Subject: [PATCH 14/17] Update unit tests

---
 .../api/paypal/PayPalVaultRequestUnitTest.java                | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
index 350e1c9ad5..28e838d04d 100644
--- a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
+++ b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
@@ -16,6 +16,7 @@
 import com.braintreepayments.api.testutils.Fixtures;
 
 import org.json.JSONException;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -32,6 +33,7 @@ public class PayPalVaultRequestUnitTest {
     public void newPayPalVaultRequest_setsDefaultValues() {
         PayPalVaultRequest request = new PayPalVaultRequest(false);
 
+        assertNull(request.getShopperSessionId());
         assertNull(request.getLocaleCode());
         assertFalse(request.isShippingAddressRequired());
         assertNull(request.getShippingAddressOverride());
@@ -46,6 +48,7 @@ public void newPayPalVaultRequest_setsDefaultValues() {
     public void setsValuesCorrectly() {
         PostalAddress postalAddress = new PostalAddress();
         PayPalVaultRequest request = new PayPalVaultRequest(true);
+        request.setShopperSessionId("shopper-insights-id");
         request.setLocaleCode("US");
         request.setBillingAgreementDescription("Billing Agreement Description");
         request.setShippingAddressRequired(true);
@@ -75,6 +78,7 @@ public void setsValuesCorrectly() {
         request.setRecurringBillingDetails(billingDetails);
         request.setRecurringBillingPlanType(PayPalRecurringBillingPlanType.RECURRING);
 
+        assertEquals("shopper-insights-id", request.getShopperSessionId());
         assertEquals("US", request.getLocaleCode());
         assertEquals("Billing Agreement Description", request.getBillingAgreementDescription());
         assertTrue(request.isShippingAddressRequired());

From 41a47b0084c99b367086f8d7fac608c473f95441 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 15:01:30 -0800
Subject: [PATCH 15/17] Update test

---
 .../api/paypal/PayPalVaultRequestUnitTest.java                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
index 28e838d04d..889bcd7b3b 100644
--- a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
+++ b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
@@ -220,7 +220,7 @@ public void createRequestBody_sets_enablePayPalSwitch_and_userAuthenticationEmai
         String versionSDK = String.valueOf(Build.VERSION.SDK_INT);
         String payerEmail = "payer_email@example.com";
         PayPalVaultRequest request = new PayPalVaultRequest(true);
-
+        request.setShopperSessionId("shopper-insights-id");
         request.setEnablePayPalAppSwitch(true);
         request.setUserAuthenticationEmail(payerEmail);
         String requestBody = request.createRequestBody(
@@ -231,6 +231,7 @@ public void createRequestBody_sets_enablePayPalSwitch_and_userAuthenticationEmai
             "universal_url"
         );
 
+        assertTrue(requestBody.contains("\"shopper_session_id\":shopper-insights-id"));
         assertTrue(requestBody.contains("\"launch_paypal_app\":true"));
         assertTrue(requestBody.contains("\"os_type\":" + "\"Android\""));
         assertTrue(requestBody.contains("\"os_version\":" + "\"" + versionSDK + "\""));

From c5c0c219da41d64eed23581303a1166fad103e54 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Fri, 6 Dec 2024 16:20:44 -0800
Subject: [PATCH 16/17] Update unit tests

---
 .../paypal/PayPalCheckoutRequestUnitTest.java | 19 +++++++++++++++++++
 .../paypal/PayPalVaultRequestUnitTest.java    | 18 ++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalCheckoutRequestUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalCheckoutRequestUnitTest.java
index 8752cde5f0..d0a8f9118f 100644
--- a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalCheckoutRequestUnitTest.java
+++ b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalCheckoutRequestUnitTest.java
@@ -1,5 +1,6 @@
 package com.braintreepayments.api.paypal;
 
+import android.os.Build;
 import android.os.Parcel;
 
 import com.braintreepayments.api.core.Authorization;
@@ -27,6 +28,7 @@ public class PayPalCheckoutRequestUnitTest {
     public void newPayPalCheckoutRequest_setsDefaultValues() {
         PayPalCheckoutRequest request = new PayPalCheckoutRequest("1.00", false);
 
+        assertNull(request.getShopperSessionId());
         assertNotNull(request.getAmount());
         assertNull(request.getCurrencyCode());
         assertNull(request.getLocaleCode());
@@ -44,6 +46,7 @@ public void newPayPalCheckoutRequest_setsDefaultValues() {
     public void setsValuesCorrectly() {
         PostalAddress postalAddress = new PostalAddress();
         PayPalCheckoutRequest request = new PayPalCheckoutRequest("1.00", true);
+        request.setShopperSessionId("shopper-insights-id");
         request.setCurrencyCode("USD");
         request.setShouldOfferPayLater(true);
         request.setIntent(PayPalPaymentIntent.SALE);
@@ -58,6 +61,7 @@ public void setsValuesCorrectly() {
         request.setRiskCorrelationId("123-correlation");
         request.setLandingPageType(PayPalLandingPageType.LANDING_PAGE_TYPE_LOGIN);
 
+        assertEquals("shopper-insights-id", request.getShopperSessionId());
         assertEquals("1.00", request.getAmount());
         assertEquals("USD", request.getCurrencyCode());
         assertEquals("US", request.getLocaleCode());
@@ -156,6 +160,21 @@ public void createRequestBody_does_not_set_userAuthenticationEmail_when_email_is
         assertFalse(requestBody.contains("\"payer_email\":" + "\"" + payerEmail + "\""));
     }
 
+    @Test
+    public void createRequestBody_sets_shopper_insights_session_id() throws JSONException {
+        PayPalCheckoutRequest request = new PayPalCheckoutRequest("1.00", true);
+        request.setShopperSessionId("shopper-insights-id");
+        String requestBody = request.createRequestBody(
+                mock(Configuration.class),
+                mock(Authorization.class),
+                "success_url",
+                "cancel_url",
+                "universal_url"
+        );
+
+        assertTrue(requestBody.contains("\"shopper_session_id\":" + "\"shopper-insights-id\""));
+    }
+
     @Test
     public void createRequestBody_sets_userPhoneNumber_when_not_null() throws JSONException {
         PayPalCheckoutRequest request = new PayPalCheckoutRequest("1.00", true);
diff --git a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
index 889bcd7b3b..4cac7b935a 100644
--- a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
+++ b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalVaultRequestUnitTest.java
@@ -216,11 +216,11 @@ public void createRequestBody_sets_userAuthenticationEmail_when_not_null() throw
         assertTrue(requestBody.contains("\"payer_email\":" + "\"" + payerEmail + "\""));
     }
 
+    @Test
     public void createRequestBody_sets_enablePayPalSwitch_and_userAuthenticationEmail_not_null() throws JSONException {
         String versionSDK = String.valueOf(Build.VERSION.SDK_INT);
         String payerEmail = "payer_email@example.com";
         PayPalVaultRequest request = new PayPalVaultRequest(true);
-        request.setShopperSessionId("shopper-insights-id");
         request.setEnablePayPalAppSwitch(true);
         request.setUserAuthenticationEmail(payerEmail);
         String requestBody = request.createRequestBody(
@@ -231,13 +231,27 @@ public void createRequestBody_sets_enablePayPalSwitch_and_userAuthenticationEmai
             "universal_url"
         );
 
-        assertTrue(requestBody.contains("\"shopper_session_id\":shopper-insights-id"));
         assertTrue(requestBody.contains("\"launch_paypal_app\":true"));
         assertTrue(requestBody.contains("\"os_type\":" + "\"Android\""));
         assertTrue(requestBody.contains("\"os_version\":" + "\"" + versionSDK + "\""));
         assertTrue(requestBody.contains("\"merchant_app_return_url\":" + "\"universal_url\""));
     }
 
+    @Test
+    public void createRequestBody_sets_shopper_insights_session_id() throws JSONException {
+        PayPalVaultRequest request = new PayPalVaultRequest(true);
+        request.setShopperSessionId("shopper-insights-id");
+        String requestBody = request.createRequestBody(
+                mock(Configuration.class),
+                mock(Authorization.class),
+                "success_url",
+                "cancel_url",
+                "universal_url"
+        );
+
+        assertTrue(requestBody.contains("\"shopper_session_id\":" + "\"shopper-insights-id\""));
+    }
+
     @Test
     public void createRequestBody_correctlyFormatsJSON() throws JSONException {
         PayPalVaultRequest request = new PayPalVaultRequest(true);

From 41c4f17519a61e26a034ce23b595e67b6c230075 Mon Sep 17 00:00:00 2001
From: Justin Warmkessel <Jwarmkessel@paypal.com>
Date: Mon, 9 Dec 2024 09:10:01 -0800
Subject: [PATCH 17/17] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c48f9d95ee..4ef49bf35d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
   * Add `isPayPalAppInstalled` and `isVenmoAppInstalled` methods
   * Add `shopperSessionId` parameter to `ShopperInsightsClient`
 * BraintreePayPal
-  * Add `shopperSessionInsight`
+  * Add `shopperSessionId` to `PayPalCheckoutRequest` and `PayPalVaultRequest`
 
 ## 5.2.0 (2024-10-30)