Refactor FXIOS-7812 [v121] Fakespot - iPad - sidebar open/close state resets itself when user changes from landscape to portrait mode (backport #17587) #17623
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
… resets itself when user changes from landscape to portrait mode (#17587) * Dismiss sidebar when opting out * Dismiss sidebar when tapping not now * Use state to dismiss and show Fakespot * Dismiss Fakespot when startAtHome * Use iPad sidebar state * Update Fakespot when user navigates using the back/forward buttons * Update Fakespot when user navigates using the back/forward buttons * Update Fakespot actions * Open and close fakespot via state change * Fix bugs related to deep-linking * Fix test * Address PR comments * Fix merge issues * Fix Swiftlint warning (cherry picked from commit f8565a9) # Conflicts: # Client/Frontend/Browser/BrowserViewController.swift # Client/Frontend/Fakespot/FakespotState.swift # Client/Frontend/FeltPrivacy/BrowserViewControllerState.swift
mergify
bot
requested review from
adudenamedruby
and removed request for
a team
5 tasks
thatswinnie
approved these changes
Dec 5, 2023
|
This pull request has conflicts when rebasing. Could you fix it @mergify[bot]? 🙏 |
|
ok. Now try it again! |
|
@Mergifyio rebase |
☑️ Nothing to do
|
# Conflicts: # Client/Frontend/Browser/BrowserViewController.swift # Client/Frontend/Fakespot/FakespotState.swift # Client/Frontend/FeltPrivacy/BrowserViewControllerState.swift
Client.app: Coverage: 31.9
Generated by 🚫 Danger Swift against a90160a |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 is an automatic backport of pull request #17587 done by Mergify.
Cherry-pick of f8565a9 has failed:
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com