Skip to content

Commit

Permalink
Merge branch 'develop' into playwright-automated-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
erikacolette29 authored Oct 15, 2024
2 parents 1277e45 + ccca6e2 commit 9be4cc7
Show file tree
Hide file tree
Showing 2,659 changed files with 249 additions and 38 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/snapshotCommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ 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
});
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,
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/snapshotCompare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion content/messages/US/ppc_ni_nq.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
]
],
Expand Down
2 changes: 1 addition & 1 deletion content/messages/US/ppc_ni_nq_xb.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
]
],
Expand Down
2 changes: 1 addition & 1 deletion content/messages/US/ppc_ni_q.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
]
],
Expand Down
2 changes: 1 addition & 1 deletion content/messages/US/ppc_ni_q_xb.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
]
],
Expand Down
2 changes: 1 addition & 1 deletion content/modals/US/legacy_ppc_ezp.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"title": "About promotional offers",
"text": "PayPal Credit promotional offers are available for a limited time only and may vary, depending on where you shop. Offers aren't valid on previous returns, refunds, and exchanges, or when using the Send Money feature in your PayPal account."
},
"disclaimer": "PayPal Credit is subject to credit approval as determined by the lender, Synchrony Bank, and is available to US customers who are of legal age in their state of residence. You must pay with PayPal Credit to get the offers. Offers not valid on previous purchases, returns or exchanges. Minimum purchase required is before shipping and tax. 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.",
"disclaimer": "PayPal Credit is subject to credit approval as determined by the lender, Synchrony Bank, and is available to US customers who are of legal age in their state of residence. You must pay with PayPal Credit to get the offers. Offers not valid on previous purchases, returns or exchanges. Minimum purchase required is before shipping and tax. For New Accounts: Variable Purchase and Cash APR is {aprEntry.apr}%. Variable Penalty APR is 35.99%. The APRs are 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.",
"copyright": "Copyright {fullYear} Bill Me Later, Inc. All rights reserved."
}
}
10 changes: 5 additions & 5 deletions content/modals/US/legacy_ppc_ni.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
"For New Accounts: Variable Purchase and Cash APR is {aprEntry.apr}%. Variable Penalty APR is 35.99%. The APRs are 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 $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": {
Expand All @@ -30,7 +30,7 @@
["monogram", "Click the PayPal button at checkout and pay with PayPal Credit."]
]
},
"disclaimer": "PayPal Credit is subject to credit approval as determined by the lender, Synchrony Bank, and is available to US customers who are of legal age in their state of residence. You must pay with PayPal Credit to get the offers. Offers not valid on previous purchases, returns or exchanges. Minimum purchase required is before shipping and tax. 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.",
"disclaimer": "PayPal Credit is subject to credit approval as determined by the lender, Synchrony Bank, and is available to US customers who are of legal age in their state of residence. You must pay with PayPal Credit to get the offers. Offers not valid on previous purchases, returns or exchanges. Minimum purchase required is before shipping and tax. For New Accounts: Variable Purchase and Cash APR is {aprEntry.apr}%. Variable Penalty APR is 35.99%. The APRs are 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.",
"copyright": "Copyright {fullYear} Bill Me Later, Inc. All rights reserved."
}
}
Loading

0 comments on commit 9be4cc7

Please sign in to comment.