Remove WordPress uninstall card from Jetpack dashboard

The "Welcome to the Jetpack app. You can uninstall the WordPress app"
card was showing incorrectly even when WordPress was not installed,
confusing users. Remove the card entirely along with the associated
"Please Delete WordPress" screen, analytics tracking, navigation
action, drawables, and translated strings.

Fixes: CMM-2004

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jkmassel

WordPress/src/main/java/org/wordpress/android/localcontentmigration/ContentMigrationAnalyticsTracker.kt

@@ -49,18 +49,6 @@ class ContentMigrationAnalyticsTracker @Inject constructor(
     fun trackNoSitesFlowThanksScreenFinishButtonTapped() =
         analyticsTracker.track(Stat.JPMIGRATION_THANKS_SCREEN_FINISH_BUTTON_TAPPED, mapOf(NO_SITES to true))
 
-    fun trackPleaseDeleteWordPressCardTapped() =
-        analyticsTracker.track(Stat.JPMIGRATION_PLEASE_DELETE_WORDPRESS_CARD_TAPPED)
-
-    fun trackPleaseDeleteWordPressScreenShown() =
-        analyticsTracker.track(Stat.JPMIGRATION_PLEASE_DELETE_WORDPRESS_SCREEN_SHOWN)
-
-    fun trackPleaseDeleteWordPressGotItTapped() =
-        analyticsTracker.track(Stat.JPMIGRATION_PLEASE_DELETE_WORDPRESS_GOTIT_TAPPED)
-
-    fun trackPleaseDeleteWordPressHelpTapped() =
-        analyticsTracker.track(Stat.JPMIGRATION_PLEASE_DELETE_WORDPRESS_HELP_BUTTON_TAPPED)
-
     fun trackErrorScreenShown() =
         analyticsTracker.track(Stat.JPMIGRATION_ERROR_SCREEN_SHOWN)
 

WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationActivity.kt

@@ -1,7 +1,5 @@
 package org.wordpress.android.ui.main.jetpack.migration
 
-import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
@@ -18,9 +16,8 @@ class JetpackMigrationActivity : BaseAppCompatActivity() {
         with(ActivityJetpackMigrationBinding.inflate(layoutInflater)) {
             setContentView(root)
             if (savedInstanceState == null) {
-                val showDeleteWpState = intent.getBooleanExtra(KEY_SHOW_DELETE_WP_STATE, false)
                 val deepLinkData = intent.getParcelableExtraCompat<PreMigrationDeepLinkData>(KEY_DEEP_LINK_DATA)
-                val fragment = JetpackMigrationFragment.newInstance(showDeleteWpState, deepLinkData)
+                val fragment = JetpackMigrationFragment.newInstance(deepLinkData)
                 supportFragmentManager.beginTransaction()
                     .replace(R.id.fragment_container, fragment)
                     .commit()
@@ -30,10 +27,5 @@ class JetpackMigrationActivity : BaseAppCompatActivity() {
 
     companion object {
         const val KEY_DEEP_LINK_DATA = "KEY_DEEP_LINK_DATA"
-        private const val KEY_SHOW_DELETE_WP_STATE = "KEY_SHOW_DELETE_WP_STATE"
-        fun createIntent(context: Context, showDeleteWpState: Boolean = false): Intent =
-            Intent(context, JetpackMigrationActivity::class.java).apply {
-                putExtra(KEY_SHOW_DELETE_WP_STATE, showDeleteWpState)
-            }
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationFragment.kt

@@ -29,14 +29,12 @@ import org.wordpress.android.ui.compose.theme.AppThemeM3
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.CompleteFlow
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.FallbackToLogin
-import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.FinishActivity
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.Logout
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.RequestNotificationPermission
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.ShowHelp
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Content
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Error
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Loading
-import org.wordpress.android.ui.main.jetpack.migration.compose.state.DeleteStep
 import org.wordpress.android.ui.main.jetpack.migration.compose.state.DoneStep
 import org.wordpress.android.ui.main.jetpack.migration.compose.state.ErrorStep
 import org.wordpress.android.ui.main.jetpack.migration.compose.state.LoadingState
@@ -78,11 +76,9 @@ class JetpackMigrationFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         observeViewModelEvents()
         observeRefreshAppThemeEvents()
-        val showDeleteWpState = arguments?.getBoolean(KEY_SHOW_DELETE_WP_STATE, false) ?: false
         val deepLinkData = arguments?.getParcelableCompat<PreMigrationDeepLinkData>(KEY_DEEP_LINK_DATA)
-        initBackPressHandler(showDeleteWpState)
+        initBackPressHandler()
         viewModel.start(
-            showDeleteWpState,
             requireActivity().application as WordPress,
             deepLinkData
         )
@@ -115,7 +111,6 @@ class JetpackMigrationFragment : Fragment() {
             is Logout -> (requireActivity().application as? WordPress)?.let { viewModel.signOutWordPress(it) }
             is ShowHelp -> launchHelpScreen()
             is RequestNotificationPermission -> requestNotificationPermission()
-            is FinishActivity -> requireActivity().finish()
         }
     }
 
@@ -153,24 +148,20 @@ class JetpackMigrationFragment : Fragment() {
         }
     }
 
-    private fun initBackPressHandler(showDeleteWpState: Boolean) {
-        if (showDeleteWpState) return
+    private fun initBackPressHandler() {
         requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
             viewModel.logoutAndFallbackToLogin()
         }
     }
 
     companion object {
         private const val KEY_DEEP_LINK_DATA = "KEY_DEEP_LINK_DATA"
-        private const val KEY_SHOW_DELETE_WP_STATE = "KEY_SHOW_DELETE_WP_STATE"
 
         fun newInstance(
-            showDeleteWpState: Boolean = false,
             deepLinkData: PreMigrationDeepLinkData?
         ): JetpackMigrationFragment =
             JetpackMigrationFragment().apply {
                 arguments = Bundle().apply {
-                    putBoolean(KEY_SHOW_DELETE_WP_STATE, showDeleteWpState)
                     if (deepLinkData != null) {
                         putParcelable(KEY_DEEP_LINK_DATA, deepLinkData)
                     }
@@ -189,7 +180,6 @@ private fun JetpackMigrationScreen(viewModel: JetpackMigrationViewModel = viewMo
                 is Content.Welcome -> WelcomeStep(state)
                 is Content.Notifications -> NotificationsStep(state)
                 is Content.Done -> DoneStep(state)
-                is Content.Delete -> DeleteStep(state)
                 is Error -> ErrorStep(state)
                 is Loading -> LoadingState()
             }

WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationViewModel.kt

@@ -40,8 +40,6 @@ import org.wordpress.android.localcontentmigration.MigrationEmailHelper
 import org.wordpress.android.localcontentmigration.WelcomeScreenData
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.sharedlogin.resolver.LocalMigrationOrchestrator
-import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.ActionButton.DeletePrimaryButton
-import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.ActionButton.DeleteSecondaryButton
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.ActionButton.DonePrimaryButton
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.ActionButton.ErrorPrimaryButton
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.ActionButton.ErrorSecondaryButton
@@ -50,10 +48,8 @@ import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.ActionButton.WelcomeSecondaryButton
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.CompleteFlow
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.FallbackToLogin
-import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.FinishActivity
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.Logout
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.JetpackMigrationActionEvent.ShowHelp
-import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Content.Delete
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Content.Done
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Content.Notifications
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Content.Welcome
@@ -98,7 +94,6 @@ class JetpackMigrationViewModel @Inject constructor(
     private val migrationStateFlow = MutableStateFlow<LocalMigrationState>(Initial)
     private val continueClickedFlow = MutableStateFlow(false)
     private val notificationContinueClickedFlow = MutableStateFlow(false)
-    private var showDeleteState: Boolean = false
     private var deepLinkData: PreMigrationDeepLinkData? = null
 
     val uiState = combineTransform(
@@ -107,7 +102,6 @@ class JetpackMigrationViewModel @Inject constructor(
         notificationContinueClickedFlow
     ) { migrationState, continueClicked, notificationContinueClicked ->
         when {
-            showDeleteState -> emit(initPleaseDeleteWordPressAppScreenUi())
             migrationState is Ineligible -> {
                 appPrefsWrapper.setJetpackMigrationEligible(false)
                 emit(Loading)
@@ -133,16 +127,12 @@ class JetpackMigrationViewModel @Inject constructor(
     }.stateIn(viewModelScope, SharingStarted.Lazily, Loading)
 
     fun start(
-        showDeleteState: Boolean,
         application: WordPress,
         deepLinkData: PreMigrationDeepLinkData?
     ) {
         if (isStarted) return
         isStarted = true
 
-        this.showDeleteState = showDeleteState
-        if (showDeleteState) return
-
         this.deepLinkData = deepLinkData
 
         tryMigration(application)
@@ -208,18 +198,6 @@ class JetpackMigrationViewModel @Inject constructor(
         )
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    fun initPleaseDeleteWordPressAppScreenUi(): Delete {
-        migrationAnalyticsTracker.trackPleaseDeleteWordPressScreenShown()
-
-        return Delete(
-            primaryActionButton = DeletePrimaryButton(::onGotItClicked),
-            secondaryActionButton = DeleteSecondaryButton {
-                onHelpClicked(source = HelpButtonSource.Delete)
-            },
-        )
-    }
-
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     fun initErrorScreenUi(): UiState.Error {
         migrationAnalyticsTracker.trackErrorScreenShown()
@@ -344,16 +322,10 @@ class JetpackMigrationViewModel @Inject constructor(
             HelpButtonSource.Welcome -> migrationAnalyticsTracker.trackWelcomeScreenHelpButtonTapped()
             HelpButtonSource.WelcomeAvatar -> migrationAnalyticsTracker.trackWelcomeScreenAvatarTapped()
             HelpButtonSource.Error -> migrationAnalyticsTracker.trackErrorHelpTapped()
-            HelpButtonSource.Delete -> migrationAnalyticsTracker.trackPleaseDeleteWordPressHelpTapped()
         }
         postActionEvent(ShowHelp)
     }
 
-    private fun onGotItClicked() {
-        migrationAnalyticsTracker.trackPleaseDeleteWordPressGotItTapped()
-        postActionEvent(FinishActivity)
-    }
-
     private fun resizeAvatarUrl(avatarUrl: String) = avatarUtilsWrapper.rewriteAvatarUrlWithResource(
         avatarUrl,
         R.dimen.jp_migration_user_avatar_size
@@ -416,19 +388,6 @@ class JetpackMigrationViewModel @Inject constructor(
                 val deleteWpIcon = R.drawable.ic_jetpack_migration_delete_wp
                 val noSitesMessage = UiStringRes(R.string.jp_migration_done_no_sites_message)
             }
-
-            data class Delete(
-                override val primaryActionButton: ActionButton,
-                override val secondaryActionButton: ActionButton
-            ) : Content(
-                primaryActionButton = primaryActionButton,
-                screenIconRes = R.drawable.ic_jetpack_migration_delete,
-                title = UiStringRes(R.string.jp_migration_delete_title),
-                subtitle = UiStringRes(R.string.jp_migration_delete_subtitle),
-                message = UiStringRes(R.string.jp_migration_delete_message),
-            ) {
-                val deleteWpIcon = R.drawable.ic_jetpack_migration_delete_wp
-            }
         }
 
         data class Error(
@@ -519,26 +478,11 @@ class JetpackMigrationViewModel @Inject constructor(
             onClick = onClick,
             text = UiStringRes(R.string.jp_migration_help_button),
         )
-
-        data class DeletePrimaryButton(
-            override val onClick: () -> Unit
-        ) : ActionButton(
-            onClick = onClick,
-            text = UiStringRes(R.string.jp_migration_got_it_button)
-        )
-
-        data class DeleteSecondaryButton(
-            override val onClick: () -> Unit
-        ) : ActionButton(
-            onClick = onClick,
-            text = UiStringRes(R.string.jp_migration_need_help_button)
-        )
     }
 
     sealed class HelpButtonSource {
         object Welcome : HelpButtonSource()
         object WelcomeAvatar : HelpButtonSource()
-        object Delete : HelpButtonSource()
         object Error : HelpButtonSource()
     }
 
@@ -555,7 +499,6 @@ class JetpackMigrationViewModel @Inject constructor(
             val deepLinkData: PreMigrationDeepLinkData? = null,
         ) : JetpackMigrationActionEvent()
 
-        object FinishActivity : JetpackMigrationActionEvent()
         object Logout : JetpackMigrationActionEvent()
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/DeleteStep.kt

@@ -40,7 +40,6 @@ import org.wordpress.android.ui.main.AddSiteHandler
 import org.wordpress.android.ui.main.ChooseSiteActivity
 import org.wordpress.android.ui.main.WPMainActivity
 import org.wordpress.android.ui.main.WPMainActivity.OnScrollToTopListener
-import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationActivity
 import org.wordpress.android.ui.main.utils.MeGravatarLoader
 import org.wordpress.android.ui.mysite.MySiteViewModel.State
 import org.wordpress.android.ui.mysite.cards.dashboard.bloggingprompts.BloggingPromptsCardAnalyticsTracker
@@ -645,7 +644,6 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
         is SiteNavigationAction.OpenDeepLink ->
             DeepLinkingIntentReceiverActivity.openDeepLinkUrl(requireActivity(), action.url)
         is SiteNavigationAction.OpenJetpackPoweredBottomSheet -> showJetpackPoweredBottomSheet()
-        is SiteNavigationAction.OpenJetpackMigrationDeleteWP -> showJetpackMigrationDeleteWP()
         is SiteNavigationAction.OpenJetpackFeatureOverlay -> showJetpackFeatureOverlay(action.source)
         is SiteNavigationAction.OpenPromoteWithBlazeOverlay -> activityNavigator.openPromoteWithBlaze(
             requireActivity(),
@@ -777,14 +775,6 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
             .show(requireActivity().supportFragmentManager, JetpackPoweredBottomSheetFragment.TAG)
     }
 
-    private fun showJetpackMigrationDeleteWP() {
-        val intent = JetpackMigrationActivity.createIntent(
-            context = requireActivity(),
-            showDeleteWpState = true
-        )
-        startActivity(intent)
-    }
-
     private fun showJetpackFeatureOverlay(
         source: JetpackFeatureRemovalOverlayUtil.JetpackFeatureCollectionOverlaySource
     ) {