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-10855 #23671 Reenable rating prompt with different rules (backport #24253) #24272

Open
wants to merge 3 commits into
base: release/v135
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 21, 2025

📜 Tickets

Jira ticket
Github issue

💡 Description

  • Moved default browser user default to DefaultBrowserUtil, much cleaner than having this under the RatingPromptManager
  • Change logic of rating prompt to latest requirements discussed in Document and the task description. This implies we remove the CumulativeDaysOfUseCounter code.
  • Call the rating prompt on init of BVC so we show it on the start of the application
  • Remove rating prompt from dependency container as its not needed there anymore
Rating prompt screenshot

Simulator Screenshot - iPhone 16 Pro Max - 2025-01-20 at 15 52 33

📝 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 #24253 done by [Mergify](https://mergify.com).

…es (#24253)

* - Moved default browser user default to default browser util
- Change logic of rating prompt, remove cumulative days of use counter
- Call rating prompt on init of BVC
- Remove rating prompt from dependency container

* Fix tests

* Use time interval instead of calendar

(cherry picked from commit f1074ee)

# Conflicts:
#	firefox-ios/Client/Application/AppDelegate.swift
@mergify mergify bot added the conflicts label Jan 21, 2025
Copy link
Contributor Author

mergify bot commented Jan 21, 2025

Cherry-pick of f1074ee has failed:

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

You are currently cherry-picking commit f1074eef6.
  (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/Client.xcodeproj/project.pbxproj
	modified:   firefox-ios/Client/Application/DefaultBrowserUtil.swift
	modified:   firefox-ios/Client/Application/DependencyHelper.swift
	modified:   firefox-ios/Client/Coordinators/Router/RouteBuilder.swift
	modified:   firefox-ios/Client/Experiments/Messaging/GleanPlumbContextProvider.swift
	modified:   firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
	modified:   firefox-ios/Client/RatingPromptManager.swift
	deleted:    firefox-ios/Client/Utils/CumulativeDaysOfUseCounter.swift
	modified:   firefox-ios/firefox-ios-tests/Tests/ClientTests/DependencyInjection/DependencyHelperMock.swift
	modified:   firefox-ios/firefox-ios-tests/Tests/ClientTests/Helpers/RatingPromptManagerTests.swift
	deleted:    firefox-ios/firefox-ios-tests/Tests/ClientTests/Utils/CumulativeDaysOfUseCounterTests.swift

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   firefox-ios/Client/Application/AppDelegate.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 a review from a team as a code owner January 21, 2025 19:27
@mergify mergify bot requested review from cyndichin and removed request for a team January 21, 2025 19:27
@lmarceau lmarceau added weekly-release Tagging backports for rapid release and removed conflicts labels Jan 21, 2025
@lmarceau lmarceau force-pushed the mergify/bp/release/v135/pr-24253 branch from 4917ecf to 1ff9631 Compare January 21, 2025 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
weekly-release Tagging backports for rapid release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant