Skip to content

Bugfix FXIOS-14055 ⁃ [S2S] [iOS26] - Incorrect display of the CFR after a specific scenario #30502

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.

Sign up for GitHub

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
Nov 18, 2025
Merged

Bugfix FXIOS-14055 ⁃ [S2S] [iOS26] - Incorrect display of the CFR after a specific scenario #30502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfa5438
FXIOS-14055 #30467 ⁃ [S2S] [iOS26] - Incorrect display of the CFR aft…
dicarobinho Nov 10, 2025
55f6370
Merge branch 'main' into afarcasanu/fxios_14055_30467_summarize_homepage
dicarobinho Nov 11, 2025
2c9c97c
Refactor
dicarobinho Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...d/Browser/BrowserViewController/Extensions/BrowserViewController+TabToolbarDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,12 @@ extension BrowserViewController: TabToolbarDelegate, PhotonActionSheetProtocol {
UIAccessibility.post(notification: .layoutChanged, argument: summarizeToolbarEntryContextHintVC)
}

// Reset the CFR timer for the data clearance button to avoid presenting the CFR
// In cases, such as if user navigates to homepage
func resetSummarizeToolbarCFRTimer() {
summarizeToolbarEntryContextHintVC.stopTimer()
}

// MARK: - Translation CFR
func configureTranslationContextualHint(for view: UIView) {
guard let state = store.state.screenState(ToolbarState.self, for: .toolbar, window: windowUUID) else { return }
Expand Down Expand Up @@ -181,6 +187,12 @@ extension BrowserViewController: TabToolbarDelegate, PhotonActionSheetProtocol {
resetTranslationCFRTimer()
}
}

func resetCFRsTimer() {
resetDataClearanceCFRTimer()
resetSummarizeToolbarCFRTimer()
}

// Reset the CFR timer for the translation button to avoid presenting the CFR
// In cases, such as if translation icon is not available
private func resetTranslationCFRTimer() {
Expand Down
2 changes: 1 addition & 1 deletion firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1754,7 +1754,7 @@ class BrowserViewController: UIViewController,
/// on the tab bar to open a new tab or by pressing the home page button on the tab bar. Inline is false when
/// it's the zero search page, aka when the home page is shown by clicking the url bar from a loaded web page.
func showEmbeddedHomepage(inline: Bool, isPrivate: Bool) {
resetDataClearanceCFRTimer()
resetCFRsTimer()

if isPrivate && featureFlags.isFeatureEnabled(.feltPrivacySimplifiedUI, checking: .buildOnly) {
browserDelegate?.showPrivateHomepage(overlayManager: overlayManager)
Expand Down