Remove FXIOS-14370 [Toolbar] Clean up TabToolbar #31151

thatswinnie · 2025-12-08T12:24:14Z

📜 Tickets

Jira ticket
Github issue

💡 Description

Clean up TabToolbar from old toolbar.

📝 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

# Conflicts: # firefox-ios/Shared/Strings.swift

mobiletest-ci-bot · 2025-12-08T12:36:27Z

	Messages
📖	Project coverage: 38.03%

✍️ Strings Updated

Detected changes in Shared/Strings.swift.
To keep strings up to standards, please add a member of the firefox-ios-l10n team as reviewer. 🌍

💪 Quality guardian

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

🏔️ Summit Climber

This PR is a big climb with 1365 lines changed!
Thanks for taking on the heavy lifting 💪.
Reviewers: a quick overview or walkthrough will make the ascent smoother.

🎉 BrowserViewController got smaller

Nice! BrowserViewController.swift got smaller by 41 lines.

❌ Per-file test coverage gate

The following changed file(s) are below 35.0% coverage:

File	Coverage	Required
`firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+ToolBarActionMenuDelegate.swift`	6.0%	35.0%

Client.app: Coverage: 37.12

File	Coverage
BrowserViewController.swift	29.22%	⚠️
TopTabsViewController.swift	21.52%	⚠️
PhotonActionSheetView.swift	0.0%	⚠️
BrowserViewController+ToolBarActionMenuDelegate.swift	5.97%	⚠️
OverlayModeManager.swift	88.64%	✅
SingleActionViewModel.swift	48.0%	⚠️
TabTrayViewController.swift	49.51%	⚠️
PrivateModeButton.swift	81.82%	✅

Generated by 🚫 Danger Swift against 3f497aa

firefox-ios/Client/Frontend/Widgets/PrivateModeButton.swift

clarmso · 2025-12-08T15:35:33Z

I can reproduce the test failures reported on Bitrise.

On iPhone only: There's a split second that the toolbar isn't visible when the test attempts to navigate to private mode.

mergify · 2025-12-08T18:35:05Z

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

Co-authored-by: lmarceau <[email protected]>

…la-mobile/firefox-ios into wt/clean-up-legacy-toolbar

…olbar # Conflicts: # firefox-ios/Client.xcodeproj/project.pbxproj # firefox-ios/Shared/Strings.swift

This reverts commit 345657f.

…olbar

mergify · 2025-12-09T13:31:08Z

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

…olbar # Conflicts: # firefox-ios/Client.xcodeproj/project.pbxproj

lmarceau · 2025-12-10T19:56:34Z

firefox-ios/firefox-ios-tests/Tests/XCUITests/LibraryTests.swift

-        navigator.nowAt(HomePanel_Library)
-        navigator.goto(LibraryPanel_ReadingList)
-        mozWaitForElementToExist(app.tables[AccessibilityIdentifiers.LibraryPanels.ReadingListPanel.tableView])
+//        mozWaitForElementToExist(app.buttons[AccessibilityIdentifiers.Toolbar.bookmarksButton])


Why do we comment those here? Should we fix them or discard the test?

Good point. Fixed the test.

…olbar

github-actions · 2025-12-11T12:28:06Z

🚀 PR merged to main, targeting version: 147.0

thatswinnie added 13 commits November 5, 2025 18:29

Remove unused code

8c4d8d9

Delete TabToolbarButton and move OverlayModeManager

dda3d02

Rename methods

7cdc2c8

Move unused strings

7163010

Merge branch 'main' into wt/clean-up-legacy-toolbar

d3f7647

Merge branch 'main' into wt/clean-up-legacy-toolbar

559fd52

# Conflicts: # firefox-ios/Shared/Strings.swift

Rename file

04a2542

Remove file

fec469e

Rename file

e32c43a

Remove TabsButton from top tabs

9a1b64b

Remove unused BadgeWithBackdrop

a30d944

Remove unused a11y ids and unused test

345657f

Update test

b44d9c2

thatswinnie requested review from lmarceau and yoanarios December 8, 2025 12:24

thatswinnie requested review from a team as code owners December 8, 2025 12:24

thatswinnie requested review from clarmso and mdotb-moz and removed request for mdotb-moz December 8, 2025 12:24

lmarceau reviewed Dec 8, 2025

View reviewed changes

firefox-ios/Client/Frontend/Widgets/PrivateModeButton.swift Outdated Show resolved Hide resolved

thatswinnie and others added 6 commits December 9, 2025 09:40

Update firefox-ios/Client/Frontend/Widgets/PrivateModeButton.swift

d20a0d2

Co-authored-by: lmarceau <[email protected]>

Merge branch 'main' into wt/clean-up-legacy-toolbar

7cc180d

Merge branch 'wt/clean-up-legacy-toolbar' of https://github.com/mozil…

64d7ad4

…la-mobile/firefox-ios into wt/clean-up-legacy-toolbar

Merge remote-tracking branch 'origin/main' into wt/clean-up-legacy-to…

5a414ad

…olbar # Conflicts: # firefox-ios/Client.xcodeproj/project.pbxproj # firefox-ios/Shared/Strings.swift

Add unit test back but comment it out

813f2cd

This reverts commit 345657f.

Update constraints correctly

074a729

Merge remote-tracking branch 'origin/main' into wt/clean-up-legacy-to…

a264d42

…olbar

Merge remote-tracking branch 'origin/main' into wt/clean-up-legacy-to…

d15200b

…olbar # Conflicts: # firefox-ios/Client.xcodeproj/project.pbxproj

clarmso approved these changes Dec 10, 2025

View reviewed changes

lmarceau reviewed Dec 10, 2025

View reviewed changes

lmarceau approved these changes Dec 10, 2025

View reviewed changes

thatswinnie added 2 commits December 11, 2025 10:12

Merge remote-tracking branch 'origin/main' into wt/clean-up-legacy-to…

e7bb038

…olbar

Fix iPad library UITest

3f497aa

isabelrios approved these changes Dec 11, 2025

View reviewed changes

thatswinnie merged commit fd71622 into main Dec 11, 2025
8 checks passed

thatswinnie deleted the wt/clean-up-legacy-toolbar branch December 11, 2025 12:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Remove FXIOS-14370 [Toolbar] Clean up TabToolbar #31151

Remove FXIOS-14370 [Toolbar] Clean up TabToolbar #31151

Uh oh!

thatswinnie commented Dec 8, 2025 •

edited

Loading

Uh oh!

mobiletest-ci-bot commented Dec 8, 2025 •

edited

Loading

Uh oh!

Uh oh!

clarmso commented Dec 8, 2025 •

edited

Loading

Uh oh!

mergify bot commented Dec 8, 2025

Uh oh!

mergify bot commented Dec 9, 2025

Uh oh!

lmarceau Dec 10, 2025

Uh oh!

thatswinnie Dec 11, 2025

Uh oh!

Uh oh!

github-actions bot commented Dec 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Remove FXIOS-14370 [Toolbar] Clean up TabToolbar #31151

Remove FXIOS-14370 [Toolbar] Clean up TabToolbar #31151

Uh oh!

Conversation

thatswinnie commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📜 Tickets

💡 Description

📝 Checklist

Uh oh!

mobiletest-ci-bot commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✍️ Strings Updated

💪 Quality guardian

🏔️ Summit Climber

🎉 BrowserViewController got smaller

❌ Per-file test coverage gate

Client.app: Coverage: 37.12

Uh oh!

Uh oh!

clarmso commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mergify bot commented Dec 8, 2025

Uh oh!

mergify bot commented Dec 9, 2025

Uh oh!

lmarceau Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

thatswinnie Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Dec 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

thatswinnie commented Dec 8, 2025 •

edited

Loading

mobiletest-ci-bot commented Dec 8, 2025 •

edited

Loading

clarmso commented Dec 8, 2025 •

edited

Loading