Ensure RMF is not shown on app start if browser showing (#4753)

Task/Issue URL:
https://app.asana.com/0/1157893581871903/1207786103010682

### Description

### Steps to test this PR
_RMF_
- [ ] checkout develop
- [ ] Change RMF endpoint to
https://www.jsonblob.com/api/1260259880362434560
- [ ] fresh install
- [ ] complete onboarding open a site (don’t open New Tab so that RMF is
not triggered)
- [ ] close the app and open it again
- [ ] See logs filtering by message~:"RMF|m_remote_message”
- [ ] verify no pixel is sent
- [ ] Open new tab
- [ ] verify pixel is sent

Author: malmstein

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -2377,6 +2377,19 @@ class BrowserTabViewModelTest {
         testee.refreshCta()
         assertNull(testee.ctaViewState.value!!.cta)
         assertTrue(testee.ctaViewState.value!!.daxOnboardingComplete)
+        assertFalse(testee.ctaViewState.value!!.isBrowserShowing)
+    }
+
+    @Test
+    fun whenCtaRefreshedAndBrowserShowingThenViewStateUpdated() = runTest {
+        setBrowserShowing(true)
+        whenever(mockWidgetCapabilities.supportsAutomaticWidgetAdd).thenReturn(false)
+        whenever(mockWidgetCapabilities.hasInstalledWidgets).thenReturn(true)
+        whenever(mockDismissedCtaDao.exists(DAX_END)).thenReturn(true)
+        testee.refreshCta()
+        assertNull(testee.ctaViewState.value!!.cta)
+        assertTrue(testee.ctaViewState.value!!.daxOnboardingComplete)
+        assertTrue(testee.ctaViewState.value!!.isBrowserShowing)
     }
 
     @Test

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -1148,10 +1148,12 @@ class BrowserTabFragment :
     }
 
     private fun showHome() {
+        Timber.d("New Tab: showHome")
         viewModel.onHomeShown()
         dismissAppLinkSnackBar()
         errorSnackbar.dismiss()
         newBrowserTab.newTabLayout.show()
+        newBrowserTab.newTabContainerLayout.show()
         binding.browserLayout.gone()
         webViewContainer.gone()
         omnibar.appBarLayout.setExpanded(true)
@@ -1162,7 +1164,9 @@ class BrowserTabFragment :
     }
 
     private fun showBrowser() {
+        Timber.d("New Tab: showBrowser")
         newBrowserTab.newTabLayout.gone()
+        newBrowserTab.newTabContainerLayout.gone()
         binding.browserLayout.show()
         webViewContainer.show()
         webView?.show()
@@ -1175,8 +1179,10 @@ class BrowserTabFragment :
         errorType: WebViewErrorResponse,
         url: String?,
     ) {
+        Timber.d("New Tab: showError")
         webViewContainer.gone()
         newBrowserTab.newTabLayout.gone()
+        newBrowserTab.newTabContainerLayout.gone()
         sslErrorView.gone()
         omnibar.appBarLayout.setExpanded(true)
         omnibar.shieldIcon.isInvisible = true
@@ -1197,6 +1203,7 @@ class BrowserTabFragment :
     ) {
         webViewContainer.gone()
         newBrowserTab.newTabLayout.gone()
+        newBrowserTab.newTabContainerLayout.gone()
         webView?.onPause()
         webView?.hide()
         omnibar.appBarLayout.setExpanded(true)
@@ -3819,6 +3826,10 @@ class BrowserTabFragment :
                         showCta(viewState.cta)
                     }
 
+                    viewState.isBrowserShowing -> {
+                        hideNewTab()
+                    }
+
                     viewState.daxOnboardingComplete -> {
                         showNewTab()
                     }
@@ -3925,6 +3936,7 @@ class BrowserTabFragment :
         }
 
         private fun showNewTab() {
+            Timber.d("New Tab: showNewTab")
             newTabPageProvider.provideNewTabPageVersion().onEach { newTabPage ->
                 newBrowserTab.newTabContainerLayout.addView(
                     newTabPage.getView(requireContext()),
@@ -3936,9 +3948,11 @@ class BrowserTabFragment :
             }
                 .launchIn(lifecycleScope)
             newBrowserTab.newTabContainerLayout.show()
+            newBrowserTab.newTabLayout.show()
         }
 
         private fun hideNewTab() {
+            Timber.d("New Tab: hideNewTab")
             newBrowserTab.newTabContainerLayout.gone()
         }
 

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

@@ -2453,7 +2453,11 @@ class BrowserTabViewModel @Inject constructor(
                 ctaViewModel.daxDialogEndShown()
             }
             if (isBrowserShowing && cta != null) hasCtaBeenShownForCurrentPage.set(true)
-            ctaViewState.value = currentCtaViewState().copy(cta = cta, daxOnboardingComplete = isOnboardingComplete)
+            ctaViewState.value = currentCtaViewState().copy(
+                cta = cta,
+                daxOnboardingComplete = isOnboardingComplete,
+                isBrowserShowing = isBrowserShowing,
+            )
             ctaChangedTicker.emit(System.currentTimeMillis().toString())
             return cta
         }

app/src/main/java/com/duckduckgo/app/browser/newtab/NewTabLegacyPageView.kt

@@ -23,9 +23,11 @@ import android.content.Context
 import android.content.Intent
 import android.text.Spanned
 import android.util.AttributeSet
+import android.view.View
 import android.widget.LinearLayout
 import androidx.core.text.toSpannable
 import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.fragment.app.findFragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeLifecycleOwner
@@ -217,6 +219,7 @@ class NewTabLegacyPageView @JvmOverloads constructor(
     }
 
     private fun render(viewState: ViewState) {
+        Timber.d("New Tab: render $viewState")
         if (viewState.message == null && viewState.favourites.isEmpty()) {
             homeBackgroundLogo.showLogo()
         } else {
@@ -344,7 +347,10 @@ class NewTabLegacyPageView @JvmOverloads constructor(
         message: RemoteMessage,
         newMessage: Boolean,
     ) {
-        val shouldRender = newMessage || binding.messageCta.isGone
+        val parentVisible = (this.parent as? View)?.isVisible ?: false
+        Timber.d("New Tab: RMF isParentVisible $parentVisible")
+
+        val shouldRender = parentVisible && (newMessage || binding.messageCta.isGone)
 
         if (shouldRender) {
             binding.messageCta.setMessage(message.asMessage())

app/src/main/java/com/duckduckgo/app/browser/newtab/NewTabLegacyPageViewModel.kt

@@ -60,6 +60,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 @SuppressLint("NoLifecycleObserver") // we don't observe app lifecycle
 @ContributesViewModel(ViewScope::class)
@@ -118,6 +119,7 @@ class NewTabLegacyPageViewModel @Inject constructor(
     override fun onStart(owner: LifecycleOwner) {
         super.onStart(owner)
 
+        Timber.d("New Tab: onStart")
         viewModelScope.launch(dispatchers.io()) {
             savedSitesRepository.getFavorites()
                 .combine(hiddenIds) { favorites, hiddenIds ->
@@ -131,6 +133,7 @@ class NewTabLegacyPageViewModel @Inject constructor(
                 }
                 .flowOn(dispatchers.io())
                 .onEach { snapshot ->
+                    Timber.d("New Tab: $snapshot")
                     val newMessage = snapshot.remoteMessage?.id != lastRemoteMessageSeen?.id
                     if (newMessage) {
                         lastRemoteMessageSeen = snapshot.remoteMessage

app/src/main/java/com/duckduckgo/app/browser/viewstate/CtaViewState.kt

@@ -21,4 +21,5 @@ import com.duckduckgo.app.cta.ui.Cta
 data class CtaViewState(
     val cta: Cta? = null,
     val daxOnboardingComplete: Boolean = false,
+    val isBrowserShowing: Boolean = true,
 )