Skip to content

Add FXIOS-12147 Change ToS card's button string from Agree and continue to just Continue Firefox and Focus (backport #26564) #26566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 12, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2025

📜 Tickets

Jira ticket
Github issue

💡 Description

Use previous translated value, until new string is translated.

📝 Checklist

  • I filled in the ticket numbers and a description of my work
  • I updated the PR name to follow our PR naming guidelines
  • I ensured unit tests pass and wrote tests for new code
  • If working on UI, I checked and implemented accessibility (Dynamic Text and VoiceOver)
  • If adding telemetry, I read the data stewardship requirements and will request a data review
  • If needed, I updated documentation and added comments to complex code
  • If needed, I added a backport comment (example @Mergifyio backport release/v120)

This is an automatic backport of pull request #26564 done by [Mergify](https://mergify.com).

…ue to just Continue Firefox and Focus (#26564)

FXIOS-12147 #26429 Change ToS card's button string from Agree and continue to just Continue Firefox and Focus

(cherry picked from commit df7bfc5)

# Conflicts:
#	firefox-ios/Client/Frontend/Onboarding/Views/TermsOfServiceViewController.swift
@mergify mergify bot added the conflicts label May 7, 2025
@mergify mergify bot requested a review from a team as a code owner May 7, 2025 11:50
@mergify mergify bot requested review from PARAIPAN9 and removed request for a team May 7, 2025 11:50
Copy link
Contributor Author

mergify bot commented May 7, 2025

Cherry-pick of df7bfc5 has failed:

On branch mergify/bp/release/v138/pr-26564
Your branch is up to date with 'origin/release/v138'.

You are currently cherry-picking commit df7bfc50e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   firefox-ios/Client/Frontend/Onboarding/Views/TermsOfServiceViewController.swift

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mobiletest-ci-bot
Copy link

mobiletest-ci-bot commented May 7, 2025

Messages
📖 Project coverage: 35.22%
📖 Edited 1 files
📖 Created 0 files

Client.app: Coverage: 33.72

File Coverage
TermsOfServiceViewController.swift 81.71%

Generated by 🚫 Danger Swift against cf34ae4

@dsmithpadilla
Copy link
Contributor

@mergify update

Copy link
Contributor Author

mergify bot commented May 12, 2025

update

✅ Branch has been successfully updated

@dsmithpadilla dsmithpadilla self-requested a review May 12, 2025 10:55
Copy link
Contributor

@dsmithpadilla dsmithpadilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved for 138.2

@dsmithpadilla dsmithpadilla merged commit 35b4135 into release/v138 May 12, 2025
12 checks passed
@dsmithpadilla dsmithpadilla deleted the mergify/bp/release/v138/pr-26564 branch May 12, 2025 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
weekly-release Tagging backports for rapid release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants