diff --git a/.github/workflows/snapshotCommit.yml b/.github/workflows/snapshotCommit.yml
index 6691ff78e5..00b74e4924 100644
--- a/.github/workflows/snapshotCommit.yml
+++ b/.github/workflows/snapshotCommit.yml
@@ -21,13 +21,13 @@ jobs:
repository: ${{ github.event.workflow_run.head_repository.full_name }}
- name: Download Artifacts
- uses: actions/github-script@v3.1.0
+ uses: actions/github-script@v7
with:
script: |
const fs = require('fs');
const { execSync } = require('child_process');
- const artifacts = await github.actions.listWorkflowRunArtifacts({
+ const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: context.payload.workflow_run.id
@@ -35,7 +35,7 @@ jobs:
await Promise.all(
artifacts.data.artifacts.map(async (artifact) => {
- const download = await github.actions.downloadArtifact({
+ const download = await github.rest.actions.downloadArtifact({
owner: context.repo.owner,
repo: context.repo.repo,
artifact_id: artifact.id,
@@ -66,7 +66,7 @@ jobs:
- name: Reset Label
if: github.event.workflow_run.event == 'pull_request'
- uses: actions/github-script@v3.1.0
+ uses: actions/github-script@v7
with:
# The workflow_run that comes along with the event drops the PR number for some reason
# so we have to pass the PR number from the original workflow as an artifact
@@ -75,7 +75,7 @@ jobs:
const pullNumber = Number(fs.readFileSync('./pull_number.txt', 'utf8')).toString();
- await github.issues.removeLabel({
+ await github.rest.issues.removeLabel({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: pullNumber,
diff --git a/.github/workflows/snapshotCompare.yml b/.github/workflows/snapshotCompare.yml
index f8af7d217e..09296d2b29 100644
--- a/.github/workflows/snapshotCompare.yml
+++ b/.github/workflows/snapshotCompare.yml
@@ -64,9 +64,9 @@ jobs:
run: |
npm run test:func -- --testPathPattern "${{ matrix.testPathPattern }}"
- - name: Collect Diffs and Upload to Imgur
- run: |
- ./scripts/snapshot-tests/collect-diffs.sh
+ # - name: Collect Diffs and Upload to Imgur
+ # run: |
+ # ./scripts/snapshot-tests/collect-diffs.sh
compareSnapshotsV2:
name: Compare V2
@@ -101,6 +101,6 @@ jobs:
run: |
CONFIG_PATH=${{ matrix.testConfig }} npm run test:func:snapshots
- - name: Collect Diffs and Upload to Imgur
- run: |
- ./scripts/snapshot-tests/collect-diffs-v2.sh
+ # - name: Collect Diffs and Upload to Imgur
+ # run: |
+ # ./scripts/snapshot-tests/collect-diffs-v2.sh
diff --git a/content/messages/US/ppc_ni_nq.json b/content/messages/US/ppc_ni_nq.json
index 7d70e662ff..b2cb064075 100644
--- a/content/messages/US/ppc_ni_nq.json
+++ b/content/messages/US/ppc_ni_nq.json
@@ -16,7 +16,7 @@
"headline": [
["Buy now. Pay over time.", ["default", "xsmall", "small"]],
[
- ["No Interest if paid in full in 6 months", ["on purchases of $99+.", "weak"]],
+ ["No Interest if paid in full in 6 months", ["on purchases of {formattedMinAmount}+.", "weak"]],
["medium", "large", "xlarge"]
]
],
diff --git a/content/messages/US/ppc_ni_nq_xb.json b/content/messages/US/ppc_ni_nq_xb.json
index 6e5f1a0a72..54adcc1089 100644
--- a/content/messages/US/ppc_ni_nq_xb.json
+++ b/content/messages/US/ppc_ni_nq_xb.json
@@ -16,7 +16,7 @@
"headline": [
["Buy now. Pay over time.", ["default", "xsmall", "small"]],
[
- ["No Interest if paid in full in 6 months", ["on purchases of $99+", "weak"]],
+ ["No Interest if paid in full in 6 months", ["on purchases of {formattedMinAmount}+", "weak"]],
["medium", "large", "xlarge"]
]
],
diff --git a/content/messages/US/ppc_ni_q.json b/content/messages/US/ppc_ni_q.json
index 6c2b007c0e..d6c729e12b 100644
--- a/content/messages/US/ppc_ni_q.json
+++ b/content/messages/US/ppc_ni_q.json
@@ -16,7 +16,7 @@
"headline": [
["Buy now. Pay over time.", ["default", "xsmall", "small"]],
[
- ["No Interest if paid in full in 6 months", ["on purchases of $99+.", "weak"]],
+ ["No Interest if paid in full in 6 months", ["on purchases of {formattedMinAmount}+.", "weak"]],
["medium", "large", "xlarge"]
]
],
diff --git a/content/messages/US/ppc_ni_q_xb.json b/content/messages/US/ppc_ni_q_xb.json
index 0ef8d4c921..c62e925d39 100644
--- a/content/messages/US/ppc_ni_q_xb.json
+++ b/content/messages/US/ppc_ni_q_xb.json
@@ -16,7 +16,7 @@
"headline": [
["Buy now. Pay over time.", ["default", "xsmall", "small"]],
[
- ["No Interest if paid in full in 6 months", ["on purchases of $99+", "weak"]],
+ ["No Interest if paid in full in 6 months", ["on purchases of {formattedMinAmount}+", "weak"]],
["medium", "large", "xlarge"]
]
],
diff --git a/content/modals/US/legacy_ppc_ni.json b/content/modals/US/legacy_ppc_ni.json
index 2ec1099bf1..33d572ec7c 100644
--- a/content/modals/US/legacy_ppc_ni.json
+++ b/content/modals/US/legacy_ppc_ni.json
@@ -9,14 +9,14 @@
"title": "Buy now and pay over time with PayPal Credit",
"subtitle": "Subject to credit approval.",
"terms": {
- "title": "No Interest if paid in full in 6 months on purchases of $99 or more",
+ "title": "No Interest if paid in full in 6 months on purchases of $149 or more",
"items": [
"Interest will be charged to your account from the purchase date if the balance is not paid in full within 6 months.",
"A minimum monthly payment is required and may or may not pay off the promotional purchase by the end of the 6 month period.",
"No interest will be charged on the purchase if you pay it off in full within 6 months. If you do not, interest will be charged on the purchase from the purchase date at the Purchase APR applicable to your account.",
"For New Accounts: Variable Purchase APR is {aprEntry.apr}%. The APR is accurate as of {aprEntry.formattedDate} and will vary with the market based on the Prime Rate (as defined in your credit card agreement). Minimum interest charge is $2.00.",
- "Individual items that are less than $99 qualify for special financing when combined for a total of $99 or more in a single transaction.",
- "Multiple separate transactions of less than $99 per transaction cannot be combined to meet the minimum purchase amount."
+ "Individual items that are less than $149 qualify for special financing when combined for a total of $149 or more in a single transaction.",
+ "Multiple separate transactions of less than $149 per transaction cannot be combined to meet the minimum purchase amount."
]
},
"instructions": {
diff --git a/content/modals/US/long_term_df.json b/content/modals/US/long_term_df.json
new file mode 100644
index 0000000000..0a9ab08873
--- /dev/null
+++ b/content/modals/US/long_term_df.json
@@ -0,0 +1,55 @@
+{
+ "meta": {
+ "product": "PAY_LATER_LONG_TERM",
+ "offerCountry": "US",
+ "useV5Design": "true",
+ "variables": {
+ "transaction_amount": "${eval(transaction_amount ? transaction_amount : '-')}",
+ "qualifying_offer": "${eval(CREDIT_OFFERS_DS.qualifying_offer ? CREDIT_OFFERS_DS.qualifying_offer : 'false')}",
+ "financing_code": "${CREDIT_OFFERS_DS.financing_code}",
+ "formattedPeriodicPayment": "${CREDIT_OFFERS_DS.formattedPeriodicPayment}",
+ "total_payments": "${CREDIT_OFFERS_DS.total_payments}",
+ "formattedMinAmount": "${CREDIT_OFFERS_DS.formattedMinAmount}",
+ "formattedMaxAmount": "${CREDIT_OFFERS_DS.formattedMaxAmount}",
+ "formattedTotalCost": "${CREDIT_OFFERS_DS.formattedTotalCost}",
+ "minAmount": "${CREDIT_OFFERS_DS.minAmount}",
+ "maxAmount": "${CREDIT_OFFERS_DS.maxAmount}",
+ "apr": "${CREDIT_OFFERS_DS.apr}",
+ "nominal_rate": "${CREDIT_OFFERS_DS.nominal_rate}"
+ }
+ },
+ "content": {
+ "headline": "Switch to Pay Monthly",
+ "subheadline": "Pay in installments, starting 1 month from today",
+ "calculator": {
+ "title": "Examples for your purchase",
+ "genericTitle": "How much is your purchase?",
+ "inputLabel": "Purchase amount",
+ "inputPlaceholder": "Enter amount",
+ "genericError": "Something went wrong. Please try again later."
+ },
+ "genericDisclaimer": "Terms vary based on purchase amount and your credit.",
+ "instructions": {
+ "instructionsHeadline": "How to switch",
+ "instructionsSubHeadline": [
+ "Apply for Pay Monthly. Switching is available for purchases of {formattedMinAmount} to {formattedMaxAmount}.",
+ "Choose a Pay Monthly plan. First payment due in 1 month with $0 due today.",
+ "Get money back in your PayPal balance and keep any rewards from your original purchase."
+ ],
+ "instructionsIcons": {
+ "monogram-logo-icon": "",
+ "pay-later-icon": "",
+ "refund-icon": ""
+ }
+ },
+ "disclosure": [
+ "Pay Monthly is subject to consumer credit approval. Eligible purchases are available to switch within 30 days after the completed transaction. Payments may change based on shipping, taxes, updates to your purchase, or missed payments. Availability depends on the merchant and purchase type and may not be available for subscriptions or recurring payments. Pay Monthly is currently not available to residents of AK, CT, HI, NC, or NVAlaska, Connecticut, Hawaii, North Carolina, or Nevada. You must be 18 years old or older to apply. Missed payments may have an impact on your credit score. The lender for Pay Monthly is WebBank. PayPal, Inc. (NMLS #910457): RIRhode Island Loan Broker Licensee. VTVermont Loan Solicitation Licensee. VTVermont residents:",
+ [
+ "Find more disclosures ",
+ "https://www.paypal.com/us/digital-wallet/ways-to-pay/buy-now-pay-later",
+ "Find more disclosures, opens new tab"
+ ],
+ "by going to PayPal’s page on Pay Later."
+ ]
+ }
+}
diff --git a/content/modals/US/v2_ppc_ni.json b/content/modals/US/v2_ppc_ni.json
index 223dfb7cb8..7c28ea01f3 100644
--- a/content/modals/US/v2_ppc_ni.json
+++ b/content/modals/US/v2_ppc_ni.json
@@ -26,15 +26,15 @@
"instructions": [
"Apply now and get a decision in seconds.",
"Check out with PayPal and choose PayPal Credit.",
- "No Interest if paid in full in 6 months on purchases of $99+"
+ "No Interest if paid in full in 6 months on purchases of {formattedMinAmount}+"
],
"terms": [
"Interest will be charged to your account from the purchase date if the balance is not paid in full within 6 months.",
"A minimum monthly payment is required and may or may not pay off the promotional purchase by the end of the 6 month period.",
"No interest will be charged on the purchase if you pay it off in full within 6 months. If you do not, interest will be charged on the purchase from the purchase date at the Purchase APR applicable to your account.",
"For New Accounts: Variable Purchase APR is {aprEntry.apr}%. The APR is accurate as of {aprEntry.formattedDate} and will vary with the market based on the Prime Rate (as defined in your credit card agreement). Minimum interest charge is $2.00.",
- "Individual items that are less than $99 qualify for special financing when combined for a total of $99 or more in a single transaction.",
- "Multiple separate transactions of less than $99 per transaction cannot be combined to meet the minimum purchase amount."
+ "Individual items that are less than {formattedMinAmount} qualify for special financing when combined for a total of {formattedMinAmount} or more in a single transaction.",
+ "Multiple separate transactions of less than {formattedMinAmount} per transaction cannot be combined to meet the minimum purchase amount."
],
"buttonText": "Apply Now",
"disclaimer": "Subject to credit approval",
diff --git a/content/modals/US/v2_product_list.json b/content/modals/US/v2_product_list.json
index d5aee35808..fadcc7daa9 100644
--- a/content/modals/US/v2_product_list.json
+++ b/content/modals/US/v2_product_list.json
@@ -27,7 +27,7 @@
"credit": [
{
"header": "PayPal Credit",
- "body": "No Interest if paid in full in 6 months for purchases of $99+.",
+ "body": "No Interest if paid in full in 6 months for purchases of $149+.",
"viewName": "PAYPAL_CREDIT_NO_INTEREST"
}
]
diff --git a/content/offers/US/long_term_df.json b/content/offers/US/long_term_df.json
new file mode 100644
index 0000000000..2b1674dab7
--- /dev/null
+++ b/content/offers/US/long_term_df.json
@@ -0,0 +1,48 @@
+{
+ "meta": {
+ "product": "PAY_LATER_LONG_TERM",
+ "offerCountry": "US",
+ "periodicPayment": "{formattedPeriodicPayment}",
+ "minAmount": "{minAmount}",
+ "maxAmount": "{maxAmount}",
+ "qualifying": "{qualifying_offer}",
+ "amount": "{transaction_amount}",
+ "formattedMinAmount": "{formattedMinAmount}",
+ "formattedMaxAmount": "{formattedMaxAmount}",
+ "apr": "{apr}",
+ "total_payments": "{total_payments}",
+ "formattedTotalCost": "{formattedTotalCost}",
+ "formattedTotalInterest": "{formattedTotalInterest}",
+ "variables": {
+ "transaction_amount": "${eval(transaction_amount ? transaction_amount : '-')}",
+ "qualifying_offer": "${eval(CREDIT_OFFERS_DS.qualifying_offer ? CREDIT_OFFERS_DS.qualifying_offer : 'false')}",
+ "financing_code": "${CREDIT_OFFERS_DS.financing_code}",
+ "formattedPeriodicPayment": "${CREDIT_OFFERS_DS.formattedPeriodicPayment}",
+ "total_payments": "${CREDIT_OFFERS_DS.total_payments}",
+ "formattedMinAmount": "${CREDIT_OFFERS_DS.formattedMinAmount}",
+ "formattedMaxAmount": "${CREDIT_OFFERS_DS.formattedMaxAmount}",
+ "formattedTotalCost": "${CREDIT_OFFERS_DS.formattedTotalCost}",
+ "minAmount": "${CREDIT_OFFERS_DS.minAmount}",
+ "maxAmount": "${CREDIT_OFFERS_DS.maxAmount}",
+ "apr": "${CREDIT_OFFERS_DS.apr}",
+ "nominal_rate": "${CREDIT_OFFERS_DS.nominal_rate}"
+ }
+ },
+ "content": {
+ "calculator": {
+ "belowThreshold": "Enter an amount of {formattedMinAmount} or more.",
+ "aboveThreshold": "Enter an amount no larger than {formattedMaxAmount}."
+ },
+ "disclaimer": {
+ "zeroAPR": "Terms vary based on purchase amount and your credit.",
+ "nonZeroAPR": "*Fixed APR is 9.99% to 35.99%. Terms and rates vary based on purchase amount and your credit."
+ },
+ "termsLabel": {
+ "offerHeader": "{formattedPeriodicPayment}/mo.per month for {total_payments} months",
+ "zeroApr": "APR",
+ "nonZeroApr": "Est. APR*Estimated APR, see star for more details below.",
+ "totalInterest": "Interest",
+ "total": "Total"
+ }
+ }
+}
diff --git a/demo/accessibility/flexsdk.html b/demo/accessibility/flexsdk.html
new file mode 100644
index 0000000000..7aea169dfe
--- /dev/null
+++ b/demo/accessibility/flexsdk.html
@@ -0,0 +1,125 @@
+
+
+
+ Messaging.js Dev Sandbox
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/playwright.config.js b/playwright.config.js
index d68c3ebeea..0382c7fe17 100644
--- a/playwright.config.js
+++ b/playwright.config.js
@@ -28,19 +28,6 @@ module.exports = defineConfig({
...devices['Desktop Chrome']
}
},
- {
- name: 'firefox',
- use: {
- ...devices['Desktop Firefox']
- }
- },
-
- {
- name: 'webkit',
- use: {
- ...devices['Desktop Safari']
- }
- },
/* Test against mobile viewports. */
{
name: 'Mobile Chrome',
@@ -48,22 +35,6 @@ module.exports = defineConfig({
...devices['Pixel 5']
}
},
-
- {
- name: 'Mobile Safari',
- use: {
- ...devices['iPhone 12']
- }
- },
-
- /* Test against branded browsers. */
- {
- name: 'Microsoft Edge',
- use: {
- ...devices['Desktop Edge'],
- channel: 'msedge'
- }
- },
{
name: 'Google Chrome',
use: {
diff --git a/src/components/modal/v2/parts/Calculator.jsx b/src/components/modal/v2/parts/Calculator.jsx
index 7714a8f2b3..56d9502762 100644
--- a/src/components/modal/v2/parts/Calculator.jsx
+++ b/src/components/modal/v2/parts/Calculator.jsx
@@ -76,7 +76,7 @@ const Calculator = ({
const { view, value, isLoading, submit, changeInput } = useCalculator({ autoSubmit: true });
const { amount } = useXProps();
const { country, views } = useServerData();
- const { title, inputLabel, inputPlaceholder, inputCurrencySymbol } = calculator;
+ const { title, genericTitle, inputLabel, inputPlaceholder, inputCurrencySymbol } = calculator;
// Set hasUsedInputField to true if someone has typed in the input field at any point.
const [hasUsedInputField, setHasUsedInputField] = useState(false);
diff --git a/src/components/modal/v2/parts/Header.jsx b/src/components/modal/v2/parts/Header.jsx
index 86eb636c5a..8b3ec4a847 100644
--- a/src/components/modal/v2/parts/Header.jsx
+++ b/src/components/modal/v2/parts/Header.jsx
@@ -7,7 +7,6 @@ import Icon from './Icon';
const Header = ({
headline,
subheadline,
- logo,
isQualifying = 'false',
qualifyingSubheadline,
closeButtonLabel = 'Close',
@@ -55,7 +54,7 @@ const Header = ({