Skip to content

Refactor FXIOS-15063 [Terms of use] Refactor navigation bar from Terms of Use links VC#32443

Merged
lmarceau merged 6 commits intomainfrom
riordan/FXIOS-15063_Refactor-TermsOfUseLinkVC-navigation-bar
Apr 10, 2026
Merged

Refactor FXIOS-15063 [Terms of use] Refactor navigation bar from Terms of Use links VC#32443
lmarceau merged 6 commits intomainfrom
riordan/FXIOS-15063_Refactor-TermsOfUseLinkVC-navigation-bar

Conversation

@rilury
Copy link
Copy Markdown
Collaborator

@rilury rilury commented Mar 11, 2026 •
edited
Loading

📜 Tickets

Jira ticket
Github issue

💡 Description

NOTE! This PR should be merged in v150 not earlier to make sure we have all the translations available

This PR adds close button instead of back button for the custom tab that opens links like privacy notice, learn more etc, since the custom tab is presented modally on top of the bottom sheet. Also, now is used a native navigation bar to be aligned with the global nav bar design.

🎥 Demos

Simulator Screenshot - iPhone 17 - 2026-03-11 at 11 30 26
Demo

📝 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 adding or modifying strings, I read the guidelines and will request a string review from l10n
  • If needed, I updated documentation and added comments to complex code

@mobiletest-ci-bot
Copy link
Copy Markdown

mobiletest-ci-bot commented Mar 11, 2026 •
edited
Loading

Messages
📖 Project coverage: 41.03%

💪 Quality guardian

1 tests files modified. You're a champion of test coverage! 🚀

🧹 Tidy commit

Just 4 file(s) touched. Thanks for keeping it clean and review-friendly!

🙌 Friday high-five

Thanks for pushing us across the finish line this week! 🙌

💬 Description craftsman

Great PR description! Reviewers salute you 🫡

✅ New file code coverage

No new file detected so code coverage gate wasn't ran.

Client.app: Coverage: 39.41

File Coverage
TermsOfUseLinkViewController.swift 5.71% ⚠️
BrowserCoordinator.swift 64.98% ✅
TermsOfUseCoordinator.swift 59.68% ✅

Generated by 🚫 Danger Swift against 9f8d4f0

@rilury rilury requested a review from thatswinnie March 11, 2026 11:16
@rilury rilury marked this pull request as ready for review March 11, 2026 11:16
@rilury rilury requested a review from a team as a code owner March 11, 2026 11:16
lmarceau
lmarceau reviewed Mar 11, 2026
View reviewed changes
Comment thread firefox-ios/Shared/Strings.swift Outdated
comment: "Label for the back button shown in the Terms of Use web view."
)
public static let CloseButton = MZLocalizedString(
key: "TermsOfUse.CloseButton.v148",
Copy link
Copy Markdown
Contributor

@lmarceau lmarceau Mar 11, 2026

Choose a reason for hiding this comment

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

We should be riding the v150 train (Nightly). See this website

Suggested change
key: "TermsOfUse.CloseButton.v148",
key: "TermsOfUse.CloseButton.v150",

Copy link
Copy Markdown
Collaborator Author

@rilury rilury Mar 11, 2026

Choose a reason for hiding this comment

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

Thank you, @lmarceau, for explaining the process. :)

Comment thread firefox-ios/Client/Frontend/Browser/TermsOfUse/View/TermsOfUseLinkViewController.swift
@lmarceau lmarceau requested a review from Delphine March 11, 2026 14:23
@lmarceau
Copy link
Copy Markdown
Contributor

lmarceau commented Mar 11, 2026

This PR is adding a new string, please always tag a member of the firefox-ios-l10n team as reviewer when this is the case

@rilury @lmarceau
Update firefox-ios/Shared/Strings.swift
58d2c12 
Co-authored-by: lmarceau <lmarceau@mozilla.com>
@rilury rilury mentioned this pull request Mar 12, 2026
Merged
7 tasks
@rilury rilury added the Do Not Merge ⛔️ This issue is a work in progress and is not ready to land label Mar 12, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 27, 2026

This PR has been automatically marked as stale. Please leave any comment to keep this PR opened. It will be closed automatically if no further update occurs in the next 7 days. Thank you for your contributions!

@github-actions github-actions Bot added the stale Stalebot use this label to stale issues and PRs label Mar 27, 2026
@rilury
Copy link
Copy Markdown
Collaborator Author

rilury commented Mar 30, 2026

This should be merged in v150

@github-actions github-actions Bot removed the stale Stalebot use this label to stale issues and PRs label Mar 31, 2026
@rilury rilury removed the Do Not Merge ⛔️ This issue is a work in progress and is not ready to land label Apr 9, 2026
@rilury
Copy link
Copy Markdown
Collaborator Author

rilury commented Apr 9, 2026

Hey, @lmarceau please, can you help me with a review here to get this ticket merged? We were waiting for v150 to have the string translations available. Thank you!

@rilury rilury requested a review from lmarceau April 9, 2026 07:13
@lmarceau lmarceau changed the title Refactor FXIOS-15063 Refactor navigation bar from Terms of Use links VC Refactor FXIOS-15063 [Terms of use] Refactor navigation bar from Terms of Use links VC Apr 9, 2026
lmarceau
lmarceau reviewed Apr 9, 2026
View reviewed changes
Comment thread firefox-ios/Shared/Strings.swift Outdated
@lmarceau lmarceau self-requested a review April 9, 2026 16:11
lmarceau
lmarceau reviewed Apr 10, 2026
View reviewed changes
Comment thread firefox-ios/Shared/Strings.swift Outdated
@lmarceau
Apply suggestions from code review
9f8d4f0 
Co-authored-by: lmarceau <lmarceau@mozilla.com>
@lmarceau lmarceau merged commit 8611895 into main Apr 10, 2026
9 checks passed
@lmarceau lmarceau deleted the riordan/FXIOS-15063_Refactor-TermsOfUseLinkVC-navigation-bar branch April 10, 2026 19:31
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 10, 2026

🚀 PR merged to main, targeting version: 150.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lmarceau lmarceau lmarceau approved these changes

@thatswinnie thatswinnie Awaiting requested review from thatswinnie

+1 more reviewer

@Delphine Delphine Delphine approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@rilury @mobiletest-ci-bot @lmarceau @thatswinnie @Delphine