Merge remote-tracking branch 'origin/fenix/123.1.0' into iceraven

pull/745/head
akliuxingyuan 2 months ago
commit 2d29c7d830

@ -192,6 +192,7 @@ class FirefoxSuggestTest {
}
// TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348374
@Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1882035")
@SmokeTest
@Test
fun verifyFirefoxSuggestNonSponsoredSearchResultsTest() {
@ -218,6 +219,7 @@ class FirefoxSuggestTest {
}
// TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348375
@Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1882035")
@Test
fun verifyFirefoxSuggestNonSponsoredSearchResultsWithPartialKeywordTest() {
runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {
@ -237,6 +239,7 @@ class FirefoxSuggestTest {
}
// TestRail link: https://testrail.stage.mozaws.net/index.php?/cases/view/2348376
@Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1882035")
@Test
fun openFirefoxSuggestNonSponsoredSearchResultsTest() {
runWithCondition(TestHelper.appContext.settings().enableFxSuggest) {

@ -483,8 +483,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
var maxDurationReached = false
val delay = FxNimbus.features.splashScreen.value().maximumDurationMs.toLong()
splashScreen.setKeepOnScreenCondition {
val dataFetched = components.settings.utmParamsKnown &&
components.settings.nimbusExperimentsFetched
val dataFetched = components.settings.nimbusExperimentsFetched
val keepOnScreen = !maxDurationReached && !dataFetched
if (!keepOnScreen) {
SplashScreen.firstLaunchExtended.record(

Loading…
Cancel
Save