Skip to content

Bugfix FXIOS-11782 Missing experiment related image identifiers (backport #25733) #25738

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

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 2, 2025

📜 Tickets

Jira ticket

💡 Description

After the experiment is disabled, the "x" button should now be StandardImageIdentifiers.Large.cross for iPhones. The change should've been in #25690 😄

📝 Checklist

You have to check all boxes before merging

  • Filled in the above information (tickets numbers and description of your work)
  • Updated the PR name to follow our PR naming guidelines
  • Wrote unit tests and/or ensured the tests suite is passing
  • When working on UI, I checked and implemented accessibility (minimum Dynamic Text and VoiceOver)
  • If needed, I updated documentation / comments for complex code and public methods
  • If needed, added a backport comment (example @Mergifyio backport release/v120)

This is an automatic backport of pull request #25733 done by [Mergify](https://mergify.com).

Revert close button back to StandardImageIdentifiers.Large.cross

(cherry picked from commit a73eda1)

# Conflicts:
#	firefox-ios/firefox-ios-tests/Tests/XCUITests/TopTabsTest.swift
@mergify mergify bot requested a review from a team as a code owner April 2, 2025 12:14
@mergify mergify bot added the conflicts label Apr 2, 2025
Copy link
Contributor Author

mergify bot commented Apr 2, 2025

Cherry-pick of a73eda1 has failed:

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

You are currently cherry-picking commit a73eda1ac.
  (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:   firefox-ios/firefox-ios-tests/Tests/XCUITests/TabCounterTests.swift

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   firefox-ios/firefox-ios-tests/Tests/XCUITests/TopTabsTest.swift

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

@mergify mergify bot requested review from jjSDET and removed request for a team April 2, 2025 12:14
@mobiletest-ci-bot
Copy link

mobiletest-ci-bot commented Apr 2, 2025

Messages
📖 Edited 2 files
📖 Created 0 files

Generated by 🚫 Danger Swift against fc5170f

@clarmso clarmso self-requested a review April 3, 2025 17:55
Copy link
Contributor Author

mergify bot commented Apr 3, 2025

This pull request has conflicts when rebasing. Could you fix it @mergify[bot]? 🙏

Copy link
Contributor

This PR has been automatically marked as stale. Please leave any comment to keep this PR opened. It will be closed automatically if no further update occurs in the next 7 days. Thank you for your contributions!

@github-actions github-actions bot added the stale Stalebot use this label to stale issues and PRs label Apr 18, 2025
@github-actions github-actions bot closed this Apr 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts stale Stalebot use this label to stale issues and PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants