From 3a124c6a6a521e61a8e22d11667696bd49615be4 Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Fri, 6 Dec 2024 13:41:57 -0800
Subject: [PATCH 1/9] Limit eligible button to Paypal when new
 createSubscription is used

---
 src/ui/buttons/buttons.jsx     |  22 ++--
 src/ui/buttons/buttons.test.js | 194 +++++++++++++++++++++++++++++++++
 src/zoid/buttons/component.jsx |  17 +++
 3 files changed, 225 insertions(+), 8 deletions(-)
 create mode 100644 src/ui/buttons/buttons.test.js

diff --git a/src/ui/buttons/buttons.jsx b/src/ui/buttons/buttons.jsx
index f7281f86ac..28d7a2bc65 100644
--- a/src/ui/buttons/buttons.jsx
+++ b/src/ui/buttons/buttons.jsx
@@ -134,7 +134,7 @@ export function validateButtonProps(props: ButtonPropsInputs) {
 }
 
 export function Buttons(props: ButtonsProps): ElementNode {
-  const { onClick = noop } = props;
+  const { onClick = noop, isFsSubscription } = props;
   const {
     applePaySupport,
     buyerCountry,
@@ -190,7 +190,6 @@ export function Buttons(props: ButtonsProps): ElementNode {
     experiment,
     displayOnly,
   });
-  const multiple = fundingSources.length > 1;
 
   if (!fundingSources.length) {
     throw new ValidationError(
@@ -209,13 +208,20 @@ export function Buttons(props: ButtonsProps): ElementNode {
     ];
   }
 
-  const isAPM = fundingSources.some((src) => {
+  // Set the value of the FINAL fundingSource we want to use
+  const finalFundingSources = isFsSubscription
+    ? fundingSources.filter((src) => src === FUNDING.PAYPAL)
+    : fundingSources;
+
+  const multiple = finalFundingSources.length > 1;
+
+  const isAPM = finalFundingSources.some((src) => {
     return APM_LIST.includes(src);
   });
 
   const instruments = getWalletInstruments({
     wallet,
-    fundingSources,
+    fundingSources: finalFundingSources,
     layout,
     hasShippingCallback,
   });
@@ -234,7 +240,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
     !fundingSource &&
     !message;
 
-  const showPoweredBy = calculateShowPoweredBy(layout, fundingSources);
+  const showPoweredBy = calculateShowPoweredBy(layout, finalFundingSources);
 
   return (
     <div
@@ -260,7 +266,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
         <Message markup={messageMarkup} position={message.position} />
       ) : null}
 
-      {fundingSources.map((source, i) => (
+      {finalFundingSources.map((source, i) => (
         <Button
           content={content}
           i={index(i)}
@@ -293,7 +299,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
 
       {showTagline ? (
         <TagLine
-          fundingSource={fundingSources[0]}
+          fundingSource={finalFundingSources[0]}
           style={style}
           locale={locale}
           multiple={multiple}
@@ -302,7 +308,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
         />
       ) : null}
 
-      {fundingSources.indexOf(FUNDING.CARD) !== -1 ? (
+      {finalFundingSources.indexOf(FUNDING.CARD) !== -1 ? (
         <div id="card-fields-container" class="card-fields-container" />
       ) : null}
 
diff --git a/src/ui/buttons/buttons.test.js b/src/ui/buttons/buttons.test.js
new file mode 100644
index 0000000000..66b949c740
--- /dev/null
+++ b/src/ui/buttons/buttons.test.js
@@ -0,0 +1,194 @@
+import { describe, expect } from "vitest";
+import { Buttons } from "./buttons";
+
+describe("Smart Payment Buttons - limit button to PayPal for FSS", () => {
+  test("should return only 1 PayPal button if isFsSubscription=true", async () => {
+    const mockedButtonProps = {
+      // isFsSubscription is the determinant of how many buttons get shown
+      isFsSubscription: true,
+      flow: "subscription_setup",
+      fundingEligibility,
+    };
+
+    const jsxElems = Buttons(mockedButtonProps);
+
+    const allButtonsTotalCount = jsxElems?.children.filter(
+      (elem) => elem?.component?.name === "Button"
+    ).length;
+
+    const hasPayPalButton =
+      jsxElems?.children.filter(
+        (elem) => elem?.props?.fundingSource === "paypal"
+      ).length === 1;
+
+    expect(allButtonsTotalCount).toBe(1);
+    expect(hasPayPalButton).toBe(true);
+  });
+
+  test("should return 1 or more buttons if not isFsSubscription", async () => {
+    const mockedButtonProps = {
+      // isFsSubscription is the determinant of how many buttons get shown
+      isFsSubscription: false,
+      flow: "subscription_setup",
+      fundingEligibility,
+    };
+
+    const jsxElems = Buttons(mockedButtonProps);
+
+    const allButtonsTotalCount = jsxElems?.children.filter(
+      (elem) => elem?.component?.name === "Button"
+    ).length;
+
+    const hasPayPalButton =
+      jsxElems?.children.filter(
+        (elem) => elem?.props?.fundingSource === "paypal"
+      ).length === 1;
+
+    expect(allButtonsTotalCount).toBeGreaterThanOrEqual(1);
+    expect(hasPayPalButton).toBe(true);
+  });
+});
+
+/* NOTE: We want to give a "complete" fundingEligibility object since this is what determines how many buttons there will be to start with, before we try to limit the buttons */
+const fundingEligibility = {
+  paypal: {
+    eligible: true,
+    vaultable: true,
+  },
+  paylater: {
+    eligible: true,
+    vaultable: true,
+    products: {
+      payIn3: {
+        eligible: false,
+        variant: null,
+      },
+      payIn4: {
+        eligible: false,
+        variant: null,
+      },
+      paylater: {
+        eligible: true,
+        variant: null,
+      },
+    },
+  },
+  card: {
+    eligible: true,
+    branded: false,
+    installments: false,
+    vendors: {
+      visa: {
+        eligible: true,
+        vaultable: true,
+      },
+      mastercard: {
+        eligible: true,
+        vaultable: true,
+      },
+      amex: {
+        eligible: true,
+        vaultable: true,
+      },
+      discover: {
+        eligible: true,
+        vaultable: true,
+      },
+      hiper: {
+        eligible: false,
+        vaultable: false,
+      },
+      elo: {
+        eligible: false,
+        vaultable: true,
+      },
+      jcb: {
+        eligible: false,
+        vaultable: true,
+      },
+      maestro: {
+        eligible: true,
+        vaultable: true,
+      },
+      diners: {
+        eligible: true,
+        vaultable: true,
+      },
+      cup: {
+        eligible: true,
+        vaultable: true,
+      },
+    },
+    guestEnabled: false,
+  },
+  venmo: {
+    eligible: false,
+    vaultable: false,
+  },
+  itau: {
+    eligible: false,
+  },
+  credit: {
+    eligible: false,
+  },
+  applepay: {
+    eligible: true,
+  },
+  sepa: {
+    eligible: false,
+  },
+  ideal: {
+    eligible: false,
+  },
+  bancontact: {
+    eligible: false,
+  },
+  giropay: {
+    eligible: false,
+  },
+  eps: {
+    eligible: false,
+  },
+  sofort: {
+    eligible: false,
+  },
+  mybank: {
+    eligible: false,
+  },
+  p24: {
+    eligible: false,
+  },
+  wechatpay: {
+    eligible: false,
+  },
+  payu: {
+    eligible: false,
+  },
+  blik: {
+    eligible: false,
+  },
+  trustly: {
+    eligible: false,
+  },
+  oxxo: {
+    eligible: false,
+  },
+  boleto: {
+    eligible: false,
+  },
+  boletobancario: {
+    eligible: false,
+  },
+  mercadopago: {
+    eligible: false,
+  },
+  multibanco: {
+    eligible: false,
+  },
+  satispay: {
+    eligible: false,
+  },
+  paidy: {
+    eligible: false,
+  },
+};
diff --git a/src/zoid/buttons/component.jsx b/src/zoid/buttons/component.jsx
index f846d8ca1a..b2ac3ae138 100644
--- a/src/zoid/buttons/component.jsx
+++ b/src/zoid/buttons/component.jsx
@@ -42,6 +42,7 @@ import {
   getSDKAttribute,
   getJsSdkLibrary,
   wasShopperInsightsUsed,
+  getSDKToken,
 } from "@paypal/sdk-client/src";
 import {
   rememberFunding,
@@ -613,6 +614,16 @@ export const getButtonsComponent: () => ButtonsComponent = memoize(() => {
         value: getIntent,
       },
 
+      isFsSubscription: {
+        type: "boolean",
+        queryParam: true,
+        required: false,
+        value: ({ props }) =>
+          props.createSubscription &&
+          getSDKToken() &&
+          props.intent !== "subscription",
+      },
+
       jsSdkLibrary: {
         type: "string",
         queryParam: true,
@@ -933,6 +944,12 @@ export const getButtonsComponent: () => ButtonsComponent = memoize(() => {
         value: getSDKMeta,
       },
 
+      sdkToken: {
+        type: "string",
+        required: false,
+        value: getSDKToken,
+      },
+
       /**
        * Version of the SDK used in first render.
        * This is passed to the `/smart/buttons` endpoint in order for the second render

From 49ab6a1d51aabd1bf89584f3886e7a15a12646e6 Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Fri, 6 Dec 2024 14:15:08 -0800
Subject: [PATCH 2/9] Fix lint error

---
 src/ui/buttons/buttons.test.js | 98 +++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/src/ui/buttons/buttons.test.js b/src/ui/buttons/buttons.test.js
index 66b949c740..936ac9af18 100644
--- a/src/ui/buttons/buttons.test.js
+++ b/src/ui/buttons/buttons.test.js
@@ -1,53 +1,7 @@
+/* @flow */
 import { describe, expect } from "vitest";
-import { Buttons } from "./buttons";
-
-describe("Smart Payment Buttons - limit button to PayPal for FSS", () => {
-  test("should return only 1 PayPal button if isFsSubscription=true", async () => {
-    const mockedButtonProps = {
-      // isFsSubscription is the determinant of how many buttons get shown
-      isFsSubscription: true,
-      flow: "subscription_setup",
-      fundingEligibility,
-    };
-
-    const jsxElems = Buttons(mockedButtonProps);
-
-    const allButtonsTotalCount = jsxElems?.children.filter(
-      (elem) => elem?.component?.name === "Button"
-    ).length;
-
-    const hasPayPalButton =
-      jsxElems?.children.filter(
-        (elem) => elem?.props?.fundingSource === "paypal"
-      ).length === 1;
-
-    expect(allButtonsTotalCount).toBe(1);
-    expect(hasPayPalButton).toBe(true);
-  });
 
-  test("should return 1 or more buttons if not isFsSubscription", async () => {
-    const mockedButtonProps = {
-      // isFsSubscription is the determinant of how many buttons get shown
-      isFsSubscription: false,
-      flow: "subscription_setup",
-      fundingEligibility,
-    };
-
-    const jsxElems = Buttons(mockedButtonProps);
-
-    const allButtonsTotalCount = jsxElems?.children.filter(
-      (elem) => elem?.component?.name === "Button"
-    ).length;
-
-    const hasPayPalButton =
-      jsxElems?.children.filter(
-        (elem) => elem?.props?.fundingSource === "paypal"
-      ).length === 1;
-
-    expect(allButtonsTotalCount).toBeGreaterThanOrEqual(1);
-    expect(hasPayPalButton).toBe(true);
-  });
-});
+import { Buttons } from "./buttons";
 
 /* NOTE: We want to give a "complete" fundingEligibility object since this is what determines how many buttons there will be to start with, before we try to limit the buttons */
 const fundingEligibility = {
@@ -192,3 +146,51 @@ const fundingEligibility = {
     eligible: false,
   },
 };
+
+describe("Smart Payment Buttons - limit button to PayPal for FSS", () => {
+  test("should return only 1 PayPal button if isFsSubscription=true", () => {
+    const mockedButtonProps = {
+      // isFsSubscription is the determinant of how many buttons get shown
+      isFsSubscription: true,
+      flow: "subscription_setup",
+      fundingEligibility,
+    };
+
+    const jsxElems = Buttons(mockedButtonProps);
+
+    const allButtonsTotalCount = jsxElems?.children.filter(
+      (elem) => elem?.component?.name === "Button"
+    ).length;
+
+    const hasPayPalButton =
+      jsxElems?.children.filter(
+        (elem) => elem?.props?.fundingSource === "paypal"
+      ).length === 1;
+
+    expect(allButtonsTotalCount).toBe(1);
+    expect(hasPayPalButton).toBe(true);
+  });
+
+  test("should return 1 or more buttons if not isFsSubscription", () => {
+    const mockedButtonProps = {
+      // isFsSubscription is the determinant of how many buttons get shown
+      isFsSubscription: false,
+      flow: "subscription_setup",
+      fundingEligibility,
+    };
+
+    const jsxElems = Buttons(mockedButtonProps);
+
+    const allButtonsTotalCount = jsxElems?.children.filter(
+      (elem) => elem?.component?.name === "Button"
+    ).length;
+
+    const hasPayPalButton =
+      jsxElems?.children.filter(
+        (elem) => elem?.props?.fundingSource === "paypal"
+      ).length === 1;
+
+    expect(allButtonsTotalCount).toBeGreaterThanOrEqual(1);
+    expect(hasPayPalButton).toBe(true);
+  });
+});

From 8f3c86937696fa5605c961dd02b883ab94be77a4 Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Fri, 6 Dec 2024 15:12:08 -0800
Subject: [PATCH 3/9] Fix typecheck errors

---
 src/ui/buttons/buttons.test.js | 6 ++++++
 src/ui/buttons/props.js        | 1 +
 src/zoid/buttons/component.jsx | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ui/buttons/buttons.test.js b/src/ui/buttons/buttons.test.js
index 936ac9af18..8fbd288eb2 100644
--- a/src/ui/buttons/buttons.test.js
+++ b/src/ui/buttons/buttons.test.js
@@ -156,14 +156,17 @@ describe("Smart Payment Buttons - limit button to PayPal for FSS", () => {
       fundingEligibility,
     };
 
+    // $FlowFixMe
     const jsxElems = Buttons(mockedButtonProps);
 
     const allButtonsTotalCount = jsxElems?.children.filter(
+      // $FlowFixMe
       (elem) => elem?.component?.name === "Button"
     ).length;
 
     const hasPayPalButton =
       jsxElems?.children.filter(
+        // $FlowFixMe
         (elem) => elem?.props?.fundingSource === "paypal"
       ).length === 1;
 
@@ -179,14 +182,17 @@ describe("Smart Payment Buttons - limit button to PayPal for FSS", () => {
       fundingEligibility,
     };
 
+    // $FlowFixMe
     const jsxElems = Buttons(mockedButtonProps);
 
     const allButtonsTotalCount = jsxElems?.children.filter(
+      // $FlowFixMe
       (elem) => elem?.component?.name === "Button"
     ).length;
 
     const hasPayPalButton =
       jsxElems?.children.filter(
+        // $FlowFixMe
         (elem) => elem?.props?.fundingSource === "paypal"
       ).length === 1;
 
diff --git a/src/ui/buttons/props.js b/src/ui/buttons/props.js
index fcd6312200..76734f6981 100644
--- a/src/ui/buttons/props.js
+++ b/src/ui/buttons/props.js
@@ -597,6 +597,7 @@ export type ButtonPropsInputs = {
   message?: ButtonMessageInputs | void,
   messageMarkup?: string | void,
   renderedButtons: $ReadOnlyArray<$Values<typeof FUNDING>>,
+  isFsSubscription: boolean,
 };
 
 export const DEFAULT_STYLE = {
diff --git a/src/zoid/buttons/component.jsx b/src/zoid/buttons/component.jsx
index b2ac3ae138..d67bed1b48 100644
--- a/src/zoid/buttons/component.jsx
+++ b/src/zoid/buttons/component.jsx
@@ -620,7 +620,7 @@ export const getButtonsComponent: () => ButtonsComponent = memoize(() => {
         required: false,
         value: ({ props }) =>
           props.createSubscription &&
-          getSDKToken() &&
+          Boolean(getSDKToken()) &&
           props.intent !== "subscription",
       },
 

From 1c4750e7e767a6417888dfc4ba0de5aa4078d9d5 Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Tue, 28 Jan 2025 20:35:27 -0800
Subject: [PATCH 4/9] Add FSS as a flow, clean up isFsSubscription prop

---
 src/constants/button.js        |  2 ++
 src/funding/paypal/config.jsx  |  1 +
 src/ui/buttons/buttons.jsx     |  9 +++++----
 src/ui/buttons/buttons.test.js | 10 +++-------
 src/ui/buttons/props.js        |  1 -
 src/zoid/buttons/component.jsx | 10 ----------
 src/zoid/buttons/util.js       |  4 ++++
 7 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/constants/button.js b/src/constants/button.js
index 9d34cd87bb..5667af1f9f 100644
--- a/src/constants/button.js
+++ b/src/constants/button.js
@@ -56,6 +56,8 @@ export const BUTTON_FLOW = {
   PURCHASE: ("purchase": "purchase"),
   BILLING_SETUP: ("billing_setup": "billing_setup"),
   SUBSCRIPTION_SETUP: ("subscription_setup": "subscription_setup"),
+  FULL_STACK_SUBSCRIPTION_SETUP:
+    ("full_stack_subscription_setup": "full_stack_subscription_setup"),
   VAULT_WITHOUT_PURCHASE: ("vault_without_purchase": "vault_without_purchase"),
 };
 
diff --git a/src/funding/paypal/config.jsx b/src/funding/paypal/config.jsx
index 5b708d2ea6..72cd1c0463 100644
--- a/src/funding/paypal/config.jsx
+++ b/src/funding/paypal/config.jsx
@@ -22,6 +22,7 @@ export function getPayPalConfig(): FundingSourceConfig {
       BUTTON_FLOW.PURCHASE,
       BUTTON_FLOW.BILLING_SETUP,
       BUTTON_FLOW.SUBSCRIPTION_SETUP,
+      BUTTON_FLOW.FULL_STACK_SUBSCRIPTION_SETUP,
       BUTTON_FLOW.VAULT_WITHOUT_PURCHASE,
     ],
 
diff --git a/src/ui/buttons/buttons.jsx b/src/ui/buttons/buttons.jsx
index 28d7a2bc65..8426c53e0b 100644
--- a/src/ui/buttons/buttons.jsx
+++ b/src/ui/buttons/buttons.jsx
@@ -134,7 +134,7 @@ export function validateButtonProps(props: ButtonPropsInputs) {
 }
 
 export function Buttons(props: ButtonsProps): ElementNode {
-  const { onClick = noop, isFsSubscription } = props;
+  const { onClick = noop } = props;
   const {
     applePaySupport,
     buyerCountry,
@@ -209,9 +209,10 @@ export function Buttons(props: ButtonsProps): ElementNode {
   }
 
   // Set the value of the FINAL fundingSource we want to use
-  const finalFundingSources = isFsSubscription
-    ? fundingSources.filter((src) => src === FUNDING.PAYPAL)
-    : fundingSources;
+  const finalFundingSources =
+    flow === BUTTON_FLOW.FULL_STACK_SUBSCRIPTION_SETUP
+      ? fundingSources.filter((src) => src === FUNDING.PAYPAL)
+      : fundingSources;
 
   const multiple = finalFundingSources.length > 1;
 
diff --git a/src/ui/buttons/buttons.test.js b/src/ui/buttons/buttons.test.js
index 8fbd288eb2..0b4e2fbdd8 100644
--- a/src/ui/buttons/buttons.test.js
+++ b/src/ui/buttons/buttons.test.js
@@ -148,11 +148,9 @@ const fundingEligibility = {
 };
 
 describe("Smart Payment Buttons - limit button to PayPal for FSS", () => {
-  test("should return only 1 PayPal button if isFsSubscription=true", () => {
+  test("should return only 1 PayPal button if flow=full_stack_subscription_setup", () => {
     const mockedButtonProps = {
-      // isFsSubscription is the determinant of how many buttons get shown
-      isFsSubscription: true,
-      flow: "subscription_setup",
+      flow: "full_stack_subscription_setup",
       fundingEligibility,
     };
 
@@ -174,10 +172,8 @@ describe("Smart Payment Buttons - limit button to PayPal for FSS", () => {
     expect(hasPayPalButton).toBe(true);
   });
 
-  test("should return 1 or more buttons if not isFsSubscription", () => {
+  test("should return 1 or more buttons if flow != full_stack_subscription_setup", () => {
     const mockedButtonProps = {
-      // isFsSubscription is the determinant of how many buttons get shown
-      isFsSubscription: false,
       flow: "subscription_setup",
       fundingEligibility,
     };
diff --git a/src/ui/buttons/props.js b/src/ui/buttons/props.js
index 8000525db4..277603adfa 100644
--- a/src/ui/buttons/props.js
+++ b/src/ui/buttons/props.js
@@ -615,7 +615,6 @@ export type ButtonPropsInputs = {
   message?: ButtonMessageInputs | void,
   messageMarkup?: string | void,
   renderedButtons: $ReadOnlyArray<$Values<typeof FUNDING>>,
-  isFsSubscription: boolean,
 };
 
 export const DEFAULT_STYLE = {
diff --git a/src/zoid/buttons/component.jsx b/src/zoid/buttons/component.jsx
index e681fbbab9..bb42faf402 100644
--- a/src/zoid/buttons/component.jsx
+++ b/src/zoid/buttons/component.jsx
@@ -745,16 +745,6 @@ export const getButtonsComponent: () => ButtonsComponent = memoize(() => {
         value: getIntent,
       },
 
-      isFsSubscription: {
-        type: "boolean",
-        queryParam: true,
-        required: false,
-        value: ({ props }) =>
-          props.createSubscription &&
-          Boolean(getSDKToken()) &&
-          props.intent !== "subscription",
-      },
-
       jsSdkLibrary: {
         type: "string",
         queryParam: true,
diff --git a/src/zoid/buttons/util.js b/src/zoid/buttons/util.js
index 39c58906f7..4d5f6c6f5f 100644
--- a/src/zoid/buttons/util.js
+++ b/src/zoid/buttons/util.js
@@ -26,6 +26,7 @@ import {
   getNamespace,
   getPayPalDomain,
   getFirstRenderExperiments,
+  getSDKToken,
 } from "@paypal/sdk-client/src";
 import { FUNDING, FPTI_KEY } from "@paypal/sdk-constants/src";
 import { getRefinedFundingEligibility } from "@paypal/funding-components/src";
@@ -84,6 +85,9 @@ export function determineFlow(
   } else if (props.createBillingAgreement) {
     return BUTTON_FLOW.BILLING_SETUP;
   } else if (props.createSubscription) {
+    if (Boolean(getSDKToken()) && props.intent !== "subscription") {
+      return BUTTON_FLOW.FULL_STACK_SUBSCRIPTION_SETUP;
+    }
     return BUTTON_FLOW.SUBSCRIPTION_SETUP;
   } else {
     return BUTTON_FLOW.PURCHASE;

From cb34480335c9c3e1b9f0305d8a71b3398a4cb15b Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Tue, 28 Jan 2025 20:54:35 -0800
Subject: [PATCH 5/9] Reverting code from isFsSubscription

---
 src/ui/buttons/buttons.jsx | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/ui/buttons/buttons.jsx b/src/ui/buttons/buttons.jsx
index 8426c53e0b..90600bdad1 100644
--- a/src/ui/buttons/buttons.jsx
+++ b/src/ui/buttons/buttons.jsx
@@ -190,6 +190,9 @@ export function Buttons(props: ButtonsProps): ElementNode {
     experiment,
     displayOnly,
   });
+  const multiple = fundingSources.length > 1;
+
+  console.log("[checkout-components] fundingSources:", fundingSources);
 
   if (!fundingSources.length) {
     throw new ValidationError(
@@ -208,21 +211,13 @@ export function Buttons(props: ButtonsProps): ElementNode {
     ];
   }
 
-  // Set the value of the FINAL fundingSource we want to use
-  const finalFundingSources =
-    flow === BUTTON_FLOW.FULL_STACK_SUBSCRIPTION_SETUP
-      ? fundingSources.filter((src) => src === FUNDING.PAYPAL)
-      : fundingSources;
-
-  const multiple = finalFundingSources.length > 1;
-
-  const isAPM = finalFundingSources.some((src) => {
+  const isAPM = fundingSources.some((src) => {
     return APM_LIST.includes(src);
   });
 
   const instruments = getWalletInstruments({
     wallet,
-    fundingSources: finalFundingSources,
+    fundingSources: fundingSources,
     layout,
     hasShippingCallback,
   });
@@ -241,7 +236,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
     !fundingSource &&
     !message;
 
-  const showPoweredBy = calculateShowPoweredBy(layout, finalFundingSources);
+  const showPoweredBy = calculateShowPoweredBy(layout, fundingSources);
 
   return (
     <div
@@ -267,7 +262,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
         <Message markup={messageMarkup} position={message.position} />
       ) : null}
 
-      {finalFundingSources.map((source, i) => (
+      {fundingSources.map((source, i) => (
         <Button
           content={content}
           i={index(i)}
@@ -300,7 +295,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
 
       {showTagline ? (
         <TagLine
-          fundingSource={finalFundingSources[0]}
+          fundingSource={fundingSources[0]}
           style={style}
           locale={locale}
           multiple={multiple}
@@ -309,7 +304,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
         />
       ) : null}
 
-      {finalFundingSources.indexOf(FUNDING.CARD) !== -1 ? (
+      {fundingSources.indexOf(FUNDING.CARD) !== -1 ? (
         <div id="card-fields-container" class="card-fields-container" />
       ) : null}
 

From 2aa4bdbdfc470fe39c29d94f69fbf196e944b309 Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Tue, 28 Jan 2025 22:00:49 -0800
Subject: [PATCH 6/9] Reverting change from isFsSubscription

---
 src/ui/buttons/buttons.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/ui/buttons/buttons.jsx b/src/ui/buttons/buttons.jsx
index 90600bdad1..f7281f86ac 100644
--- a/src/ui/buttons/buttons.jsx
+++ b/src/ui/buttons/buttons.jsx
@@ -192,8 +192,6 @@ export function Buttons(props: ButtonsProps): ElementNode {
   });
   const multiple = fundingSources.length > 1;
 
-  console.log("[checkout-components] fundingSources:", fundingSources);
-
   if (!fundingSources.length) {
     throw new ValidationError(
       `No eligible funding fundingSources found to render buttons:\n\n${JSON.stringify(
@@ -217,7 +215,7 @@ export function Buttons(props: ButtonsProps): ElementNode {
 
   const instruments = getWalletInstruments({
     wallet,
-    fundingSources: fundingSources,
+    fundingSources,
     layout,
     hasShippingCallback,
   });

From 64a7853c30db58afac2be028900a4e438ff8ab8b Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Fri, 31 Jan 2025 15:59:14 -0800
Subject: [PATCH 7/9] Passing more properties into eligible

---
 src/funding/common.jsx        |  4 ++++
 src/funding/funding.js        | 19 +++++++++++++++++++
 src/funding/paypal/config.jsx | 18 +++++++++++++++++-
 src/ui/buttons/buttons.jsx    | 13 ++++++++++++-
 src/ui/buttons/props.js       |  3 +++
 src/zoid/buttons/util.js      |  4 ++++
 6 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/funding/common.jsx b/src/funding/common.jsx
index 7b085c09fb..b50444ad7a 100644
--- a/src/funding/common.jsx
+++ b/src/funding/common.jsx
@@ -3,6 +3,7 @@
 /** @jsx node */
 
 import { node, type ChildType } from "@krakenjs/jsx-pragmatic/src";
+import { ZalgoPromise } from "@krakenjs/zalgo-promise/src";
 import type { FundingEligibilityType } from "@paypal/sdk-client/src";
 import {
   PLATFORM,
@@ -13,6 +14,7 @@ import {
   FUNDING,
   ENV,
   DISPLAY_ONLY_VALUES,
+  INTENT,
 } from "@paypal/sdk-constants/src";
 import { LOGO_COLOR } from "@paypal/sdk-logos/src";
 
@@ -117,6 +119,8 @@ export type FundingSourceConfig = {|
     shippingChange?: ?boolean,
     wallet: ?Wallet,
     displayOnly?: $ReadOnlyArray<$Values<typeof DISPLAY_ONLY_VALUES>>,
+    intent?: $Values<typeof INTENT>,
+    createSubscription?: () => ZalgoPromise<string> | string,
   |}) => boolean,
   Logo: (LogoOptions) => ChildType,
   Mark?: () => ChildType,
diff --git a/src/funding/funding.js b/src/funding/funding.js
index 87781217e9..e86de007fc 100644
--- a/src/funding/funding.js
+++ b/src/funding/funding.js
@@ -9,8 +9,10 @@ import {
   FUNDING,
   COMPONENTS,
   DISPLAY_ONLY_VALUES,
+  INTENT,
 } from "@paypal/sdk-constants/src";
 import { SUPPORTED_FUNDING_SOURCES } from "@paypal/funding-components/src";
+import { ZalgoPromise } from "@krakenjs/zalgo-promise/src";
 
 import type { Wallet, Experiment } from "../types";
 import { BUTTON_LAYOUT, BUTTON_FLOW } from "../constants";
@@ -35,6 +37,9 @@ type IsFundingEligibleOptions = {|
   supportedNativeBrowser: boolean,
   experiment?: Experiment,
   displayOnly?: $ReadOnlyArray<$Values<typeof DISPLAY_ONLY_VALUES>>,
+  intent?: $Values<typeof INTENT>,
+  createSubscription?: () => ZalgoPromise<string> | string,
+  sdkToken?: string,
 |};
 
 function isFundingVaultable({
@@ -84,6 +89,9 @@ export function isFundingEligible(
     supportedNativeBrowser,
     experiment,
     displayOnly,
+    intent,
+    createSubscription,
+    sdkToken,
   }: IsFundingEligibleOptions
 ): boolean {
   if (!fundingEligibility[source] || !fundingEligibility[source].eligible) {
@@ -132,6 +140,8 @@ export function isFundingEligible(
       ),
       wallet,
       displayOnly,
+      intent,
+      createSubscription,
     })
   ) {
     return false;
@@ -204,6 +214,9 @@ export function determineEligibleFunding({
   supportedNativeBrowser,
   experiment,
   displayOnly = [],
+  intent,
+  createSubscription,
+  sdkToken,
 }: {|
   fundingSource: ?$Values<typeof FUNDING>,
   remembered: $ReadOnlyArray<$Values<typeof FUNDING>>,
@@ -223,6 +236,9 @@ export function determineEligibleFunding({
   supportedNativeBrowser: boolean,
   experiment: Experiment,
   displayOnly?: $ReadOnlyArray<$Values<typeof DISPLAY_ONLY_VALUES>>,
+  intent?: $Values<typeof INTENT>,
+  createSubscription?: () => ZalgoPromise<string> | string,
+  sdkToken?: string,
 |}): $ReadOnlyArray<$Values<typeof FUNDING>> {
   if (fundingSource) {
     return [fundingSource];
@@ -247,6 +263,9 @@ export function determineEligibleFunding({
       supportedNativeBrowser,
       experiment,
       displayOnly,
+      intent,
+      createSubscription,
+      sdkToken,
     })
   );
 
diff --git a/src/funding/paypal/config.jsx b/src/funding/paypal/config.jsx
index 72cd1c0463..2982522823 100644
--- a/src/funding/paypal/config.jsx
+++ b/src/funding/paypal/config.jsx
@@ -2,7 +2,11 @@
 /** @jsx node */
 
 import { LOGO_COLOR } from "@paypal/sdk-logos/src";
-import { FUNDING_BRAND_LABEL } from "@paypal/sdk-constants/src";
+import {
+  FUNDING_BRAND_LABEL,
+  DISPLAY_ONLY_VALUES,
+  INTENT,
+} from "@paypal/sdk-constants/src";
 
 import {
   BUTTON_COLOR,
@@ -44,6 +48,18 @@ export function getPayPalConfig(): FundingSourceConfig {
       [BUTTON_COLOR.WHITE]: LOGO_COLOR.BLUE,
     },
 
+    eligible: ({ createSubscription, intent, displayOnly }) => {
+      if (
+        createSubscription &&
+        intent !== INTENT.SUBSCRIPTION &&
+        displayOnly?.includes(DISPLAY_ONLY_VALUES.SUBSCRIBABLE)
+      ) {
+        return false;
+      }
+
+      return true;
+    },
+
     labelText: ({ content, label, period }) => {
       let text = `${FUNDING_BRAND_LABEL.PAYPAL}`;
 
diff --git a/src/ui/buttons/buttons.jsx b/src/ui/buttons/buttons.jsx
index f7281f86ac..4fc4da4360 100644
--- a/src/ui/buttons/buttons.jsx
+++ b/src/ui/buttons/buttons.jsx
@@ -6,6 +6,8 @@ import {
   FUNDING,
   WALLET_INSTRUMENT,
   APM_LIST,
+  INTENT,
+  DISPLAY_ONLY_VALUES,
 } from "@paypal/sdk-constants/src";
 import { noop } from "@krakenjs/belter/src";
 
@@ -134,7 +136,7 @@ export function validateButtonProps(props: ButtonPropsInputs) {
 }
 
 export function Buttons(props: ButtonsProps): ElementNode {
-  const { onClick = noop } = props;
+  const { onClick = noop, intent, createSubscription, sdkToken } = props;
   const {
     applePaySupport,
     buyerCountry,
@@ -189,9 +191,18 @@ export function Buttons(props: ButtonsProps): ElementNode {
     supportedNativeBrowser,
     experiment,
     displayOnly,
+    intent,
+    createSubscription,
+    sdkToken,
   });
   const multiple = fundingSources.length > 1;
 
+  // Confirm if this is what we're supposed to do
+  if (createSubscription && intent !== INTENT.SUBSCRIPTION && sdkToken) {
+    // Error: read-only arrays cannot be written to
+    // displayOnly[0] = DISPLAY_ONLY_VALUES.SUBSCRIBABLE
+  }
+
   if (!fundingSources.length) {
     throw new ValidationError(
       `No eligible funding fundingSources found to render buttons:\n\n${JSON.stringify(
diff --git a/src/ui/buttons/props.js b/src/ui/buttons/props.js
index 277603adfa..855ccbbfd1 100644
--- a/src/ui/buttons/props.js
+++ b/src/ui/buttons/props.js
@@ -615,6 +615,9 @@ export type ButtonPropsInputs = {
   message?: ButtonMessageInputs | void,
   messageMarkup?: string | void,
   renderedButtons: $ReadOnlyArray<$Values<typeof FUNDING>>,
+  intent?: $Values<typeof INTENT>,
+  createSubscription?: () => ZalgoPromise<string> | string,
+  sdkToken?: string,
 };
 
 export const DEFAULT_STYLE = {
diff --git a/src/zoid/buttons/util.js b/src/zoid/buttons/util.js
index 4d5f6c6f5f..00b373811f 100644
--- a/src/zoid/buttons/util.js
+++ b/src/zoid/buttons/util.js
@@ -197,6 +197,7 @@ export function getRenderedButtons(
     createSubscription,
     createVaultSetupToken,
     displayOnly,
+    intent,
   } = props;
 
   const flow = determineFlow({
@@ -227,6 +228,9 @@ export function getRenderedButtons(
     supportedNativeBrowser,
     experiment,
     displayOnly,
+    intent,
+    // $FlowIgnore[incompatible-call]
+    createSubscription,
   });
   return renderedButtons;
 }

From 4d83d23962ab1ef5ed606c58fc0e51b58fccac01 Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Mon, 3 Feb 2025 17:41:14 -0800
Subject: [PATCH 8/9] Temp removal of DISPLAY_ONLY and eligible

---
 src/funding/common.jsx        |  4 ----
 src/funding/funding.js        | 19 -------------------
 src/funding/paypal/config.jsx | 18 +-----------------
 src/ui/buttons/buttons.jsx    | 13 +------------
 src/ui/buttons/props.js       |  3 ---
 src/zoid/buttons/util.js      |  4 ----
 6 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/src/funding/common.jsx b/src/funding/common.jsx
index b50444ad7a..7b085c09fb 100644
--- a/src/funding/common.jsx
+++ b/src/funding/common.jsx
@@ -3,7 +3,6 @@
 /** @jsx node */
 
 import { node, type ChildType } from "@krakenjs/jsx-pragmatic/src";
-import { ZalgoPromise } from "@krakenjs/zalgo-promise/src";
 import type { FundingEligibilityType } from "@paypal/sdk-client/src";
 import {
   PLATFORM,
@@ -14,7 +13,6 @@ import {
   FUNDING,
   ENV,
   DISPLAY_ONLY_VALUES,
-  INTENT,
 } from "@paypal/sdk-constants/src";
 import { LOGO_COLOR } from "@paypal/sdk-logos/src";
 
@@ -119,8 +117,6 @@ export type FundingSourceConfig = {|
     shippingChange?: ?boolean,
     wallet: ?Wallet,
     displayOnly?: $ReadOnlyArray<$Values<typeof DISPLAY_ONLY_VALUES>>,
-    intent?: $Values<typeof INTENT>,
-    createSubscription?: () => ZalgoPromise<string> | string,
   |}) => boolean,
   Logo: (LogoOptions) => ChildType,
   Mark?: () => ChildType,
diff --git a/src/funding/funding.js b/src/funding/funding.js
index e86de007fc..87781217e9 100644
--- a/src/funding/funding.js
+++ b/src/funding/funding.js
@@ -9,10 +9,8 @@ import {
   FUNDING,
   COMPONENTS,
   DISPLAY_ONLY_VALUES,
-  INTENT,
 } from "@paypal/sdk-constants/src";
 import { SUPPORTED_FUNDING_SOURCES } from "@paypal/funding-components/src";
-import { ZalgoPromise } from "@krakenjs/zalgo-promise/src";
 
 import type { Wallet, Experiment } from "../types";
 import { BUTTON_LAYOUT, BUTTON_FLOW } from "../constants";
@@ -37,9 +35,6 @@ type IsFundingEligibleOptions = {|
   supportedNativeBrowser: boolean,
   experiment?: Experiment,
   displayOnly?: $ReadOnlyArray<$Values<typeof DISPLAY_ONLY_VALUES>>,
-  intent?: $Values<typeof INTENT>,
-  createSubscription?: () => ZalgoPromise<string> | string,
-  sdkToken?: string,
 |};
 
 function isFundingVaultable({
@@ -89,9 +84,6 @@ export function isFundingEligible(
     supportedNativeBrowser,
     experiment,
     displayOnly,
-    intent,
-    createSubscription,
-    sdkToken,
   }: IsFundingEligibleOptions
 ): boolean {
   if (!fundingEligibility[source] || !fundingEligibility[source].eligible) {
@@ -140,8 +132,6 @@ export function isFundingEligible(
       ),
       wallet,
       displayOnly,
-      intent,
-      createSubscription,
     })
   ) {
     return false;
@@ -214,9 +204,6 @@ export function determineEligibleFunding({
   supportedNativeBrowser,
   experiment,
   displayOnly = [],
-  intent,
-  createSubscription,
-  sdkToken,
 }: {|
   fundingSource: ?$Values<typeof FUNDING>,
   remembered: $ReadOnlyArray<$Values<typeof FUNDING>>,
@@ -236,9 +223,6 @@ export function determineEligibleFunding({
   supportedNativeBrowser: boolean,
   experiment: Experiment,
   displayOnly?: $ReadOnlyArray<$Values<typeof DISPLAY_ONLY_VALUES>>,
-  intent?: $Values<typeof INTENT>,
-  createSubscription?: () => ZalgoPromise<string> | string,
-  sdkToken?: string,
 |}): $ReadOnlyArray<$Values<typeof FUNDING>> {
   if (fundingSource) {
     return [fundingSource];
@@ -263,9 +247,6 @@ export function determineEligibleFunding({
       supportedNativeBrowser,
       experiment,
       displayOnly,
-      intent,
-      createSubscription,
-      sdkToken,
     })
   );
 
diff --git a/src/funding/paypal/config.jsx b/src/funding/paypal/config.jsx
index 2982522823..72cd1c0463 100644
--- a/src/funding/paypal/config.jsx
+++ b/src/funding/paypal/config.jsx
@@ -2,11 +2,7 @@
 /** @jsx node */
 
 import { LOGO_COLOR } from "@paypal/sdk-logos/src";
-import {
-  FUNDING_BRAND_LABEL,
-  DISPLAY_ONLY_VALUES,
-  INTENT,
-} from "@paypal/sdk-constants/src";
+import { FUNDING_BRAND_LABEL } from "@paypal/sdk-constants/src";
 
 import {
   BUTTON_COLOR,
@@ -48,18 +44,6 @@ export function getPayPalConfig(): FundingSourceConfig {
       [BUTTON_COLOR.WHITE]: LOGO_COLOR.BLUE,
     },
 
-    eligible: ({ createSubscription, intent, displayOnly }) => {
-      if (
-        createSubscription &&
-        intent !== INTENT.SUBSCRIPTION &&
-        displayOnly?.includes(DISPLAY_ONLY_VALUES.SUBSCRIBABLE)
-      ) {
-        return false;
-      }
-
-      return true;
-    },
-
     labelText: ({ content, label, period }) => {
       let text = `${FUNDING_BRAND_LABEL.PAYPAL}`;
 
diff --git a/src/ui/buttons/buttons.jsx b/src/ui/buttons/buttons.jsx
index 4fc4da4360..f7281f86ac 100644
--- a/src/ui/buttons/buttons.jsx
+++ b/src/ui/buttons/buttons.jsx
@@ -6,8 +6,6 @@ import {
   FUNDING,
   WALLET_INSTRUMENT,
   APM_LIST,
-  INTENT,
-  DISPLAY_ONLY_VALUES,
 } from "@paypal/sdk-constants/src";
 import { noop } from "@krakenjs/belter/src";
 
@@ -136,7 +134,7 @@ export function validateButtonProps(props: ButtonPropsInputs) {
 }
 
 export function Buttons(props: ButtonsProps): ElementNode {
-  const { onClick = noop, intent, createSubscription, sdkToken } = props;
+  const { onClick = noop } = props;
   const {
     applePaySupport,
     buyerCountry,
@@ -191,18 +189,9 @@ export function Buttons(props: ButtonsProps): ElementNode {
     supportedNativeBrowser,
     experiment,
     displayOnly,
-    intent,
-    createSubscription,
-    sdkToken,
   });
   const multiple = fundingSources.length > 1;
 
-  // Confirm if this is what we're supposed to do
-  if (createSubscription && intent !== INTENT.SUBSCRIPTION && sdkToken) {
-    // Error: read-only arrays cannot be written to
-    // displayOnly[0] = DISPLAY_ONLY_VALUES.SUBSCRIBABLE
-  }
-
   if (!fundingSources.length) {
     throw new ValidationError(
       `No eligible funding fundingSources found to render buttons:\n\n${JSON.stringify(
diff --git a/src/ui/buttons/props.js b/src/ui/buttons/props.js
index 855ccbbfd1..277603adfa 100644
--- a/src/ui/buttons/props.js
+++ b/src/ui/buttons/props.js
@@ -615,9 +615,6 @@ export type ButtonPropsInputs = {
   message?: ButtonMessageInputs | void,
   messageMarkup?: string | void,
   renderedButtons: $ReadOnlyArray<$Values<typeof FUNDING>>,
-  intent?: $Values<typeof INTENT>,
-  createSubscription?: () => ZalgoPromise<string> | string,
-  sdkToken?: string,
 };
 
 export const DEFAULT_STYLE = {
diff --git a/src/zoid/buttons/util.js b/src/zoid/buttons/util.js
index 00b373811f..4d5f6c6f5f 100644
--- a/src/zoid/buttons/util.js
+++ b/src/zoid/buttons/util.js
@@ -197,7 +197,6 @@ export function getRenderedButtons(
     createSubscription,
     createVaultSetupToken,
     displayOnly,
-    intent,
   } = props;
 
   const flow = determineFlow({
@@ -228,9 +227,6 @@ export function getRenderedButtons(
     supportedNativeBrowser,
     experiment,
     displayOnly,
-    intent,
-    // $FlowIgnore[incompatible-call]
-    createSubscription,
   });
   return renderedButtons;
 }

From e5ef586fd29fa3057dd7914734f9596e4b7c03ee Mon Sep 17 00:00:00 2001
From: Maria Chin <mschin@paypal.com>
Date: Tue, 11 Feb 2025 11:15:07 -0800
Subject: [PATCH 9/9] Checking intent to determine flow

---
 src/zoid/buttons/util.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/zoid/buttons/util.js b/src/zoid/buttons/util.js
index 4d5f6c6f5f..8054928029 100644
--- a/src/zoid/buttons/util.js
+++ b/src/zoid/buttons/util.js
@@ -27,8 +27,9 @@ import {
   getPayPalDomain,
   getFirstRenderExperiments,
   getSDKToken,
+  getIntent,
 } from "@paypal/sdk-client/src";
-import { FUNDING, FPTI_KEY } from "@paypal/sdk-constants/src";
+import { FUNDING, FPTI_KEY, INTENT } from "@paypal/sdk-constants/src";
 import { getRefinedFundingEligibility } from "@paypal/funding-components/src";
 
 import type { Experiment as EligibilityExperiment } from "../../types";
@@ -85,7 +86,7 @@ export function determineFlow(
   } else if (props.createBillingAgreement) {
     return BUTTON_FLOW.BILLING_SETUP;
   } else if (props.createSubscription) {
-    if (Boolean(getSDKToken()) && props.intent !== "subscription") {
+    if (Boolean(getSDKToken()) && getIntent() !== INTENT.SUBSCRIPTION) {
       return BUTTON_FLOW.FULL_STACK_SUBSCRIPTION_SETUP;
     }
     return BUTTON_FLOW.SUBSCRIPTION_SETUP;