Skip to content
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.

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

Refactor FXIOS-7817 [v122] Add BrowserViewControllerState (backport #17565) #17631

Merged
merged 2 commits into from
Dec 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2023

This is an automatic backport of pull request #17565 done by Mergify.
Cherry-pick of 723d77f has failed:

On branch mergify/bp/release/v121/pr-17565
Your branch is up to date with 'origin/release/v121'.

You are currently cherry-picking commit 723d77f29.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Client/Frontend/Browser/BrowserViewController.swift
	modified:   Client/Frontend/Fakespot/FakespotState.swift
	new file:   Client/Frontend/FeltPrivacy/BrowserViewControllerState.swift
	new file:   Client/Frontend/FeltPrivacy/FeltPrivacyManager.swift
	new file:   Client/Frontend/FeltPrivacy/FeltPrivacyMiddleware.swift
	new file:   Client/Frontend/FeltPrivacy/FeltPrivacyState.swift
	modified:   Client/Redux/GlobalState/ActiveScreenAction.swift

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Client.xcodeproj/project.pbxproj
	deleted by us:   Client/Frontend/FeltPrivacy/FeltPrivacyAction.swift
	both modified:   Client/Frontend/Home/HomepageViewController.swift
	both modified:   Client/Redux/GlobalState/ActiveScreenState.swift
	both modified:   Client/Redux/GlobalState/AppState.swift
	both modified:   Client/TabManagement/TabManager.swift

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Lots of learning

* Updates & cleanup

* Remove things

* Minor refactor lolololololol

* Language and big brain fixes

* PR comments

---------

Co-authored-by: roux g. buciu <github@fringe.foundation>
(cherry picked from commit 723d77f)

# Conflicts:
#	Client.xcodeproj/project.pbxproj
#	Client/Frontend/FeltPrivacy/FeltPrivacyAction.swift
#	Client/Frontend/Home/HomepageViewController.swift
#	Client/Redux/GlobalState/ActiveScreenState.swift
#	Client/Redux/GlobalState/AppState.swift
#	Client/TabManagement/TabManager.swift
@mergify mergify bot requested a review from a team as a code owner December 5, 2023 19:03
@mergify mergify bot requested review from nbhasin2 and removed request for a team December 5, 2023 19:03
@mergify mergify bot added the conflicts label Dec 5, 2023
Copy link
Contributor

@adudenamedruby adudenamedruby left a comment

Choose a reason for hiding this comment

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

Oh boy......

@adudenamedruby adudenamedruby removed the request for review from nbhasin2 December 5, 2023 19:23
@adudenamedruby
Copy link
Contributor

@thatswinnie here's the other PR

@mobiletest-ci-bot
Copy link

Messages
📖 Project coverage: 34.52%
📖 Edited 8 files
📖 Created 5 files

Client.app: Coverage: 31.9

File Coverage
FeltPrivacyState.swift 35.29% ⚠️
AppState.swift 100.0%
BrowserViewControllerState.swift 77.14%
TabManager.swift 39.47% ⚠️
FakespotState.swift 30.0% ⚠️
BrowserViewController.swift 17.38% ⚠️
FeltPrivacyMiddleware.swift 100.0%
HomepageViewController.swift 36.42% ⚠️
FeltPrivacyManager.swift 100.0%
ActiveScreenState.swift 96.08%

Generated by 🚫 Danger Swift against 71a4c97

@adudenamedruby adudenamedruby merged commit dc0bec6 into release/v121 Dec 5, 2023
9 of 10 checks passed
@adudenamedruby adudenamedruby deleted the mergify/bp/release/v121/pr-17565 branch December 5, 2023 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants