Merged
Conversation
* Propose fix some typos Signed-off-by: John E <jeis4wpi@outlook.com> revert Package.resolved file Signed-off-by: John E <jeis4wpi@outlook.com> * fix value errors Signed-off-by: John E <jeis4wpi@outlook.com> --------- Signed-off-by: John E <jeis4wpi@outlook.com>
* Add Privacy button * Add privacy button --------- Co-authored-by: Filippo Zazzeroni <fzazzeroni@mozilla.com>
…string (mozilla-mobile#33213) * Update caps on blocked status string * update key
…o ThemeSettingsState. (mozilla-mobile#33187) applied @CopyWithUpdates in ThemeSettingsState
… migrate addressBarMenu (mozilla-mobile#33208) * migrate addressBarMenu and searchBarSettings * Fix tests * figuring out top/bottom default logic
… inactive tabs from tab tray (mozilla-mobile#33181) * Needs reload on webview url nil back * Fix for popups
…le#33158) * Add MTE-5285 Automatically Update Kingfisher dependency * add slack notification * remove duplicated json
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…a-mobile#33184) * clean up theming and ui * fix merge conflict * update status descriptions
…#33240) migrate adsClient
…ile#33243) migrate aiKillSwitch
…obile#33246) migrate appearanceMenu
…-mobile#33249) migrate appIconSelection
…ozilla-mobile#33300) migrate badCertDomainPage
…ozilla-mobile#33304) migrate bookmarksSearchFeature
…re (mozilla-mobile#33307) migrate deeplinkOptimizationFeature
…cro for MicrosurveyState (mozilla-mobile#33301)
…design remove undo toast (mozilla-mobile#33142) * Remove Toast telemetry and test * Remove toast type * Remove actions and handling in middleware * Remove undo all tabs and backup from TabManager * miss one * Remove string and metrics
…ozilla-mobile#33308) migrate downloadLiveActivities
…sentations is present (mozilla-mobile#33032) * We need to await the media to be closed before closing the tab * Fix tests * Adjust closing private tabs unit tests * New strategy * Adjust tests * Revert changes * Swiftlint
… button to change language (mozilla-mobile#33157) * Bugfix FXIOS-15230 [Translations Phase 2] Wire long-press on active translate button and filter original page language from picker * Bugfix FXIOS-15230 [Translations Phase 2] Set bold attributed title after preferredAction to prevent reset * Bugfix FXIOS-15230 [Translations Phase 2] Only show long-press on translate button when active * Bugfix FXIOS-15230 [Translations Phase 2] Apply bold title after all actions, use source language for filtering in main menu * Bugfix FXIOS-15230 [Translations Phase 2] Filter translated-to language from language picker
mozilla-mobile#33302) * remove extra calls to setting translation and summarize features * fix tests
…mozilla-mobile#33317) migrate firefoxJpGuideDefaultSite
…a-mobile#33231) * Add HompageHeaderCell quick answers entry point button * lint * Fix blinnk issue in homepage header cell * lint * Fix layout on homepage header cell * Refactor HeaderStateTests * Fix MockBrowserCoordinator * lint * Refactor as per code review --------- Co-authored-by: Filippo Zazzeroni <fzazzeroni@mozilla.com>
…3234) * Add QuickAnswersSourceView initial implementation * Changes to content view * Fixed collection view layout * Correct QuickSourceItem layout * Final implementation QuickAnswersSourceView * Refactor ContentView according to design * lint --------- Co-authored-by: Filippo Zazzeroni <fzazzeroni@mozilla.com>
…ode and picker selection with search (mozilla-mobile#33381) * BugFix FXIOS-15470 [Translations] Fix toggle firing in edit mode and picker selection with search - Guard toggle action handlers against edit mode: if a touch-up reaches the UISwitch after edit mode was entered, reset the switch visually and skip the dispatch instead of toggling the setting - Skip reloadData in updateSearchResults when filtered results are unchanged, preventing UIKit from cancelling an in-progress cell tap when the search controller re-fires the callback during the touch * Revert picker filter guard - iOS 26 UISearchController regression The newFiltered != filteredLanguages guard did not fix the single-tap selection issue when searching. Apple feedback FB20259131/FB21160098 documents the underlying UISearchController cancellation behavior; it cannot be worked around without replacing UISearchController.
…la-mobile#33418) Revert "Bump FXIOS-14570 [JS] Update darkreader (mozilla-mobile#32022)" This reverts commit c35f968.
…acro for PasswordGeneratorState (mozilla-mobile#33325) apply @CopyWithUpdates macro to PasswordGeneratorState
…ome, hostedSummarize, snapkitRemovalRefactor (mozilla-mobile#33421) * migrate snapkitRemovalRefactor * migrate splashScreen * migrate startAtHome * migrate hostedSummarizer
…ozilla-mobile#33422) * migrate hostedSummarizerToolbarEntrypoint * migrate hostedSummarizerShakeGesture * migrate improvedAppStoreReviewTriggerFeature * migrate summarizerAppAttestAuth * migrate summarizerLanguageExpansion * migrate summarizerPermissiveGuardrails
…a-mobile#33382) Localize [v151] String import 2026-04-23 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…tray flags (mozilla-mobile#33428) * migrate tabScrollRefactorFeature * migrate tabTrayiPadUIExperiments * migrate tabTrayUIExperiments * migrate tabTrayTranslucency * migrate toolbarUpdateHint
…ozilla-mobile#33429) update initial_experiments.json based on the current first-run experiments in experimenter Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…re flag logic (mozilla-mobile#33367) * cancel task to prevent memory leaks * add load settings task cancel * fix feature flag logic * clean up tests * pr feedback
…acro for AddressBarState (mozilla-mobile#33319) * apply @CopyWithUpdates macro to AddressBarState * fix init param order in AddressBarState to match struct field declaration order * fixed warnings * fix AddressBarState init param order and update test call site
mozilla-mobile#33365) * Shuffle didSelectedTabChange, attempt at having clearer purpose * computed var * Add comment so it's easier to know whats up there and why its needed
…, trackingProtection flags (mozilla-mobile#33431) * migrate tosFeature * migrate touFeature * migrate trackingProtectionRefactor * migrate translation * migrate translationLanguagePicker * migrate trendingSearches
…unifiedSearch (mozilla-mobile#33433) * migrate unifiedSearch * migrate videoIntroOnboarding
…mobile#33449) Updated Icons from Acorn repo Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Rebased all custom changes onto upstream mozilla-mobile/firefox-ios at commit 3e0a361 (~2900 commits ahead of the previous fork base). Changes: custom bundle IDs (me.whydontyoulove.ios.webviewer.*), app icon, de-branded launch/splash screens, disabled privacy protection overlay, simplified UI (always-visible toolset, clear backgrounds, no URL bar interaction), removed Firefox/Chrome/Shortcuts menu items, disabled tips and review prompts, and X/Twitter-to-Echo redirect. See CUSTOMIZATIONS.md for full details. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Replace URL bar background with iOS 26 UIGlassEffect (falls back to clear on older iOS) - Tap URL bar to open share sheet instead of scroll-to-top - Hide shield/tracking protection icon from URL bar - Suppress all onboarding tooltips and tracking protection popups Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
DISPLAY_NAME was already changed but PRODUCT_NAME (which CFBundleName derives from) still said "Firefox Focus" in several build configurations. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Xcode auto-updated BuildableName references from "Firefox Focus.app" to "Web Viewer.app" in all shared schemes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
🚀 PR merged to |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This rebases the Web Viewer fork onto the latest upstream Firefox iOS base while preserving the Focus/Web Viewer customization stack.
It reapplies the documented branding, signing, icon, splash, privacy-overlay, URL bar, menu, tip, Echo redirect, dark mode, Archive.is, PDF attachment, accent styling, package pin, SwiftLint baseline, and build-script changes.
The diff also includes upstream updates across firefox-ios, BrowserKit, workflows, packages, localization, and tests that are part of moving fork/main forward.
Validation: the rebase completed,
git diff --check origin/main...HEADpassed, and no unresolved conflict markers were found; I did not run a full build or test suite.