Add FXIOS-12322 Implement tracking protection screen in new onboarding with crash & telemetry toggle modal #27217

razvanlitianu · 2025-06-10T15:09:56Z

📜 Tickets

💡 Description

Create a modern new UI for the Terms of Service screen. Create the view and configure it with the other onboarding cards. Integrate it into the main targeted screen and present it using the flag.

🎥 Demos

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 needed, I updated documentation and added comments to complex code
If needed, I added a backport comment (example @Mergifyio backport release/v120)

…nent

…eCardView.swift Co-authored-by: lmarceau <[email protected]>

…le generic Onboarding card

…c-&-Multi-Select-cards-into-a-single-generic-Onboarding-card # Conflicts: # BrowserKit/Sources/OnboardingKit/Preview/PreviewModel.swift # BrowserKit/Sources/OnboardingKit/Views/OnboardingBasicCardView.swift # BrowserKit/Sources/OnboardingKit/Views/OnboardingMultipleChoiceCardView.swift

…c-&-Multi-Select-cards-into-a-single-generic-Onboarding-card

…mbus

…ding-View-into-Main-Target-with-Nimbus # Conflicts: # BrowserKit/Sources/OnboardingKit/Models/OnboardingFlowViewModel.swift # BrowserKit/Sources/OnboardingKit/Preview/PreviewModel.swift # BrowserKit/Sources/OnboardingKit/Views/OnboardingBasicCardView.swift # BrowserKit/Sources/OnboardingKit/Views/OnboardingCardView.swift # BrowserKit/Sources/OnboardingKit/Views/OnboardingMultipleChoiceCardView.swift # BrowserKit/Sources/OnboardingKit/Views/UX.swift

…ding-View-into-Main-Target-with-Nimbus

…ding with Crash & Telemetry Toggle Modal

…nto-Main-Target-with-Nimbus' into rlitianu/FXIOS-12322-#26842-Implement-Tracking-Protection-Screen-in-New-Onboarding-with-Crash-&-Telemetry-Toggle-Modal

mergify · 2025-06-10T15:10:38Z

This pull request has conflicts when rebasing. Could you fix it @razvanlitianu? 🙏

razvanlitianu · 2025-06-10T15:10:45Z

BrowserKit/Sources/OnboardingKit/Preview/PreviewModel.swift

@@ -159,6 +162,42 @@ extension PreviewModel {
        imageID: "toolbar",
        instructionsPopup: nil
    )
+
+    static let tos = PreviewModel(


mobiletest-ci-bot · 2025-06-10T15:41:42Z

	Messages
📖	Project coverage: 35.83%
📖	Edited 9 files
📖	Created 7 files

Client.app: Coverage: 35.37

File	Coverage
TermsOfServiceManager.swift	18.46%	⚠️
TermsOfServiceViewController.swift	81.71%	✅
LaunchCoordinator.swift	37.41%	⚠️
OnboardingKitCardInfoModel.swift	0.0%	⚠️

ComponentLibrary: Coverage: 33.59

File	Coverage
AttributedLinkText.swift	0.0%	⚠️

Generated by 🚫 Danger Swift against 2c6ee67

PARAIPAN9

LGTM!! 😎

razvanlitianu · 2025-06-12T06:45:11Z

@Mergifyio backport release/v140

mergify · 2025-06-12T06:45:18Z

backport release/v140

✅ Backports have been created

#27268 Add FXIOS-12322 Implement tracking protection screen in new onboarding with crash & telemetry toggle modal (backport #27217) has been created for branch release/v140 but encountered conflicts

…g with crash & telemetry toggle modal (#27217) * FXIOS-12237 #26639 Implement Multiple-Selection Onboarding card component * Swiftlint fix * Swiftlint fix * Pr review * Update BrowserKit/Sources/OnboardingKit/Views/OnboardingMultipleChoiceCardView.swift Co-authored-by: lmarceau <[email protected]> * PR updates * FXIOS-12238 #26640 Encapsulate Basic & Multi-Select cards into a single generic Onboarding card * Swiftlint fix * swiftlint fix * Style cards * Improve page change logic * FXIOS-12325 #26845 Integrate Onboarding View into Main Target with Nimbus * Add ui variants * Swiftlint fix * Fix naming * cleanup * swiftlint * swiftlint * Swiftlint * Add cards * Change experiment * Turn off modern ui * FXIOS-12322 #26842 Implement Tracking Protection Screen in New Onboarding with Crash & Telemetry Toggle Modal * Swiftlint fix * Reset strings * Filter --------- Co-authored-by: lmarceau <[email protected]> (cherry picked from commit 295fcbc) # Conflicts: # firefox-ios/Client/Frontend/Onboarding/Models/OnboardingKitCardInfoModel.swift

…g with crash & telemetry toggle modal (backport #27217) (#27268) Add FXIOS-12322 Implement tracking protection screen in new onboarding with crash & telemetry toggle modal (#27217) * FXIOS-12237 #26639 Implement Multiple-Selection Onboarding card component * Swiftlint fix * Swiftlint fix * Pr review * Update BrowserKit/Sources/OnboardingKit/Views/OnboardingMultipleChoiceCardView.swift Co-authored-by: lmarceau <[email protected]> * PR updates * FXIOS-12238 #26640 Encapsulate Basic & Multi-Select cards into a single generic Onboarding card * Swiftlint fix * swiftlint fix * Style cards * Improve page change logic * FXIOS-12325 #26845 Integrate Onboarding View into Main Target with Nimbus * Add ui variants * Swiftlint fix * Fix naming * cleanup * swiftlint * swiftlint * Swiftlint * Add cards * Change experiment * Turn off modern ui * FXIOS-12322 #26842 Implement Tracking Protection Screen in New Onboarding with Crash & Telemetry Toggle Modal * Swiftlint fix * Reset strings * Filter --------- Co-authored-by: lmarceau <[email protected]> (cherry picked from commit 295fcbc) # Conflicts: # firefox-ios/Client/Frontend/Onboarding/Models/OnboardingKitCardInfoModel.swift Co-authored-by: Litianu Razvan <[email protected]>

lmarceau · 2025-06-12T13:47:55Z

firefox-ios/Shared/Strings.swift

                public static let ContinueAction = MZLocalizedString(
-                    key: "Onboarding.Modern.Customization.Theme.Continue.Action.v123",
+                    key: "Onboarding.Modern.Customization.Theme.Continue.Action.v140",


Hey! Just stumbled on this. This string was already exported and only changing the key will effectively remove all translations for that string. Why are we changing the key here?

Hey @lmarceau, I apologize for the oversight. I was supposed to add 140, but I accidentally copied the wrong value. I thought I could modify the string before exporting, but if I missed it, I’ll have to add a new key. Do you happen to know if the export was already completed?

lmarceau · 2025-06-12T13:59:05Z

BrowserKit/Sources/OnboardingKit/Preview/PreviewModel.swift

+        title: "Upgrade your browsing",
+        body: "Our fastest iOS browser yet\nAutomatic tracking protection\nSync on all your devices",


Can we double check those strings don't get exported to l10n? We had an issue at one point where some SwiftUI preview string gets exported. I just wanna make sure this isn't the case here

We used Text(verbatim: in those specific places 👀

In this case, the use of \n is intentional. We configure the onboarding cards from Nimbus, which have a title and a subtitle. However, there’s no option to add an array of strings for the subtitle, so we have to format it as shown.

razvanlitianu and others added 30 commits May 21, 2025 16:19

FXIOS-12237 #26639 Implement Multiple-Selection Onboarding card compo…

23421d6

…nent

Swiftlint fix

9fb99f0

Swiftlint fix

e9a1ca1

Pr review

5500d2a

Update BrowserKit/Sources/OnboardingKit/Views/OnboardingMultipleChoic…

b6004a6

…eCardView.swift Co-authored-by: lmarceau <[email protected]>

PR updates

c49edc3

FXIOS-12238 #26640 Encapsulate Basic & Multi-Select cards into a sing…

7e2700e

…le generic Onboarding card

Swiftlint fix

af41223

swiftlint fix

fba7fda

Style cards

e56142b

Merge branch 'main' into rlitianu/FXIOS-12238-#26640-Encapsulate-Basi…

58eed8b

…c-&-Multi-Select-cards-into-a-single-generic-Onboarding-card

Improve page change logic

5afcd5e

FXIOS-12325 #26845 Integrate Onboarding View into Main Target with Ni…

96bcee4

…mbus

Add ui variants

80483c3

Swiftlint fix

23de9e8

Fix naming

cb2239e

cleanup

34ed5a8

swiftlint

2a6b6f6

swiftlint

bb12b6f

Swiftlint

050ed11

Add cards

0924ac3

Merge branch 'main' into rlitianu/FXIOS-12325-#26845-Integrate-Onboar…

92b4c86

…ding-View-into-Main-Target-with-Nimbus

Change experiment

ba0495d

Turn off modern ui

b2f0b9f

FXIOS-12322 #26842 Implement Tracking Protection Screen in New Onboar…

d271eae

…ding with Crash & Telemetry Toggle Modal

Swiftlint fix

1ad3698

Reset strings

5a59644

Filter

2a50e73

Merge branch 'rlitianu/FXIOS-12325-#26845-Integrate-Onboarding-View-i…

c157e5f

…nto-Main-Target-with-Nimbus' into rlitianu/FXIOS-12322-#26842-Implement-Tracking-Protection-Screen-in-New-Onboarding-with-Crash-&-Telemetry-Toggle-Modal

razvanlitianu commented Jun 10, 2025

View reviewed changes

no message

2c6ee67

razvanlitianu marked this pull request as ready for review June 10, 2025 15:35

razvanlitianu requested a review from a team as a code owner June 10, 2025 15:35

razvanlitianu requested review from FilippoZazzeroni and Cramsden June 10, 2025 15:35

razvanlitianu requested a review from PARAIPAN9 June 11, 2025 14:59

PARAIPAN9 approved these changes Jun 11, 2025

View reviewed changes

razvanlitianu merged commit 295fcbc into main Jun 12, 2025
11 checks passed

razvanlitianu deleted the rlitianu/FXIOS-12322-#26842-Implement-Tracking-Protection-Screen-in-New-Onboarding-with-Crash-&-Telemetry-Toggle-Modal branch June 12, 2025 06:44

mergify bot mentioned this pull request Jun 12, 2025

Add FXIOS-12322 Implement tracking protection screen in new onboarding with crash & telemetry toggle modal (backport #27217) #27268

Merged

7 tasks

lmarceau reviewed Jun 12, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add FXIOS-12322 Implement tracking protection screen in new onboarding with crash & telemetry toggle modal #27217

Add FXIOS-12322 Implement tracking protection screen in new onboarding with crash & telemetry toggle modal #27217

Uh oh!

razvanlitianu commented Jun 10, 2025 •

edited

Loading

Uh oh!

mergify bot commented Jun 10, 2025

Uh oh!

razvanlitianu Jun 10, 2025

Uh oh!

mobiletest-ci-bot commented Jun 10, 2025

Uh oh!

PARAIPAN9 left a comment

Uh oh!

Uh oh!

razvanlitianu commented Jun 12, 2025

Uh oh!

mergify bot commented Jun 12, 2025 •

edited

Loading

Uh oh!

lmarceau Jun 12, 2025

Uh oh!

razvanlitianu Jun 12, 2025

Uh oh!

lmarceau Jun 12, 2025

Uh oh!

lmarceau Jun 12, 2025

Uh oh!

razvanlitianu Jun 12, 2025

Uh oh!

Uh oh!

		title: "Upgrade your browsing",
		body: "Our fastest iOS browser yet\nAutomatic tracking protection\nSync on all your devices",

Add FXIOS-12322 Implement tracking protection screen in new onboarding with crash & telemetry toggle modal #27217

Add FXIOS-12322 Implement tracking protection screen in new onboarding with crash & telemetry toggle modal #27217

Uh oh!

Conversation

razvanlitianu commented Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📜 Tickets

💡 Description

🎥 Demos

📝 Checklist

Uh oh!

mergify bot commented Jun 10, 2025

Uh oh!

razvanlitianu Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

mobiletest-ci-bot commented Jun 10, 2025

Client.app: Coverage: 35.37

ComponentLibrary: Coverage: 33.59

Uh oh!

PARAIPAN9 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

razvanlitianu commented Jun 12, 2025

Uh oh!

mergify bot commented Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

lmarceau Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

razvanlitianu Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

lmarceau Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

lmarceau Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

razvanlitianu Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

razvanlitianu commented Jun 10, 2025 •

edited

Loading

mergify bot commented Jun 12, 2025 •

edited

Loading