Merge branch 'feature/dynamic-messaging' into feature/DTCRCMERC-3014-offer-list-as-string

Author: Seavenly

Diff for: package.json

@@ -114,7 +114,7 @@
     "@paypal/connect-loader-component": "1.1.1",
     "@paypal/funding-components": "^1.0.31",
     "@paypal/sdk-client": "^4.0.184",
-    "@paypal/sdk-constants": "^1.0.141",
+    "@paypal/sdk-constants": "^1.0.146",
     "@paypal/sdk-logos": "^2.2.6"
   },
   "lint-staged": {

Diff for: src/zoid/buttons/component.jsx

@@ -726,20 +726,21 @@ export const getButtonsComponent: () => ButtonsComponent = memoize(() => {
               .track({
                 [FPTI_KEY.TRANSITION]: "button_message_click",
                 [FPTI_KEY.STATE]: "BUTTON_MESSAGE",
+                [FPTI_KEY.BUTTON_SESSION_UID]: buttonSessionID,
                 [FPTI_KEY.CONTEXT_ID]: buttonSessionID,
                 [FPTI_KEY.CONTEXT_TYPE]: "button_session_id",
                 [FPTI_KEY.EVENT_NAME]: "message_click",
-                // adding temp string here for our sdk constants
-                button_message_offer_type: offerType,
-                button_message_credit_product_identifier:
+                [FPTI_KEY.SELLER_ID]: merchantID?.join(","),
+                [FPTI_KEY.BUTTON_MESSAGE_OFFER_TYPE]: offerType,
+                [FPTI_KEY.BUTTON_MESSAGE_CREDIT_PRODUCT_IDENTIFIER]:
                   creditProductIdentifier,
-                button_message_type: messageType,
-                button_message_position: message?.position,
-                button_message_align: message?.align,
-                button_message_color: message?.color,
-                button_message_offer_country: offerCountryCode,
-                button_message_amount: amount,
-                [FPTI_KEY.BUTTON_SESSION_UID]: buttonSessionID,
+                [FPTI_KEY.BUTTON_MESSAGE_TYPE]: messageType,
+                [FPTI_KEY.BUTTON_MESSAGE_POSITION]: message?.position,
+                [FPTI_KEY.BUTTON_MESSAGE_ALIGN]: message?.align,
+                [FPTI_KEY.BUTTON_MESSAGE_COLOR]: message?.color,
+                [FPTI_KEY.BUTTON_MESSAGE_OFFER_COUNTRY]: offerCountryCode,
+                [FPTI_KEY.BUTTON_MESSAGE_CURRENCY]: currency,
+                [FPTI_KEY.BUTTON_MESSAGE_AMOUNT]: amount,
               });
 
             const modalInstance = await getModal(clientID, merchantID);
@@ -776,27 +777,28 @@ export const getButtonsComponent: () => ButtonsComponent = memoize(() => {
             offerCountryCode,
             creditProductIdentifier,
           }) => {
-            const { message, buttonSessionID } = props;
+            const { message, buttonSessionID, currency, merchantID } = props;
 
             getLogger()
               .info("button_message_render")
               .track({
                 [FPTI_KEY.TRANSITION]: "button_message_render",
                 [FPTI_KEY.STATE]: "BUTTON_MESSAGE",
+                [FPTI_KEY.BUTTON_SESSION_UID]: buttonSessionID,
                 [FPTI_KEY.CONTEXT_ID]: buttonSessionID,
                 [FPTI_KEY.CONTEXT_TYPE]: "button_session_id",
                 [FPTI_KEY.EVENT_NAME]: "message_render",
-                // adding temp string here for our sdk constants
-                button_message_offer_type: offerType,
-                button_message_credit_product_identifier:
+                [FPTI_KEY.SELLER_ID]: merchantID?.join(","),
+                [FPTI_KEY.BUTTON_MESSAGE_OFFER_TYPE]: offerType,
+                [FPTI_KEY.BUTTON_MESSAGE_CREDIT_PRODUCT_IDENTIFIER]:
                   creditProductIdentifier,
-                button_message_type: messageType,
-                button_message_posiiton: message?.position,
-                button_message_align: message?.align,
-                button_message_color: message?.color,
-                button_message_offer_country: offerCountryCode,
-                button_message_amount: message?.amount,
-                [FPTI_KEY.BUTTON_SESSION_UID]: buttonSessionID,
+                [FPTI_KEY.BUTTON_MESSAGE_TYPE]: messageType,
+                [FPTI_KEY.BUTTON_MESSAGE_POSITION]: message?.position,
+                [FPTI_KEY.BUTTON_MESSAGE_ALIGN]: message?.align,
+                [FPTI_KEY.BUTTON_MESSAGE_COLOR]: message?.color,
+                [FPTI_KEY.BUTTON_MESSAGE_CURRENCY]: currency,
+                [FPTI_KEY.BUTTON_MESSAGE_OFFER_COUNTRY]: offerCountryCode,
+                [FPTI_KEY.BUTTON_MESSAGE_AMOUNT]: message?.amount,
               });
           };
         },