Donation reminder: instrumentation for v2 (#6110)

* Donation reminder: instrumentation for v2

* Verified

* Code review comments

* Remove the feature flag

* Appends the ab test group before constructing the campaign id

* Revert "Appends the ab test group before constructing the campaign id"

This reverts commit aa9e654.

* Append after constructed ID for campaign dialog

---------

Co-authored-by: William Rai <[email protected]>
Co-authored-by: Dmitry Brant <[email protected]>

Author: 3 people

app/src/main/java/org/wikipedia/analytics/eventplatform/DonorExperienceEvent.kt

@@ -33,14 +33,14 @@ open class DonorExperienceEvent {
             campaignId: String? = null,
             articleFrequency: Int? = null,
             donateAmount: Float? = null,
-            settingSelect: Boolean? = null
+            groupAssigned: String? = null
         ) {
             val actionData = DonationRemindersActionData(
                 defaultMilestone = defaultMilestone,
                 campaignId = campaignId?.let { CampaignCollection.getFormattedCampaignId(campaignId) },
                 articleFrequency = articleFrequency,
                 donateAmount = donateAmount,
-                settingSelect = settingSelect
+                groupAssigned = groupAssigned
             )
             submit(
                 action,
@@ -75,7 +75,6 @@ open class DonorExperienceEvent {
         @SerialName("campaign_id") val campaignId: String? = null,
         @SerialName("read_freq") val articleFrequency: Int? = null,
         @SerialName("donate_amount") val donateAmount: Float? = null,
-        @SerialName("setting_select") val settingSelect: Boolean? = null,
-        @SerialName("user_group") val userGroup: String? = null
+        @SerialName("group") val groupAssigned: String? = null
     )
 }

app/src/main/java/org/wikipedia/donate/DonateDialog.kt

@@ -123,26 +123,26 @@ class DonateDialog : ExtendedBottomSheetDialogFragment() {
             DonorExperienceEvent.logDonationReminderAction(
                 activeInterface = "reminder_milestone",
                 action = "gpay_click",
-                campaignId = DonationReminderHelper.CAMPAIGN_ID
+                campaignId = DonationReminderHelper.campaignId
             )
             (requireActivity() as? BaseActivity)?.launchDonateActivity(
-                GooglePayComponent.getDonateActivityIntent(requireActivity(), filledAmount = donateAmount, campaignId = DonationReminderHelper.CAMPAIGN_ID))
+                GooglePayComponent.getDonateActivityIntent(requireActivity(), filledAmount = donateAmount, campaignId = DonationReminderHelper.campaignId))
         }
         binding.donateGooglePayDifferentAmountButton.isVisible = true
         binding.donateGooglePayDifferentAmountButton.setOnClickListener {
             DonorExperienceEvent.logDonationReminderAction(
                 activeInterface = "reminder_milestone",
                 action = "other_gpay_click",
-                campaignId = DonationReminderHelper.CAMPAIGN_ID
+                campaignId = DonationReminderHelper.campaignId
             )
             (requireActivity() as? BaseActivity)?.launchDonateActivity(
-                GooglePayComponent.getDonateActivityIntent(requireActivity(), campaignId = DonationReminderHelper.CAMPAIGN_ID))
+                GooglePayComponent.getDonateActivityIntent(requireActivity(), campaignId = DonationReminderHelper.campaignId))
         }
         binding.donateOtherButton.setOnClickListener {
             DonorExperienceEvent.logDonationReminderAction(
                 activeInterface = "reminder_milestone",
                 action = "other_method_click",
-                campaignId = DonationReminderHelper.CAMPAIGN_ID
+                campaignId = DonationReminderHelper.campaignId
             )
             onDonateClicked()
         }

app/src/main/java/org/wikipedia/donate/donationreminder/DonationReminderActivity.kt

@@ -37,9 +37,8 @@ class DonationReminderActivity : BaseActivity() {
                     onFooterButtonClick = {
                         if (viewModel.isFromSettings) {
                             UriUtil.visitInExternalBrowser(this, getString(R.string.donation_reminders_experiment_url).toUri())
-                            val activeInterface = if (viewModel.isFromSettings) "global_setting" else "reminder_config"
                             DonorExperienceEvent.logDonationReminderAction(
-                                activeInterface = activeInterface,
+                                activeInterface = "global_setting",
                                 action = "reminder_about_click"
                             )
                         } else {
@@ -56,9 +55,17 @@ class DonationReminderActivity : BaseActivity() {
                         }
                     ),
                     onLearnMoreClick = {
+                        DonorExperienceEvent.logDonationReminderAction(
+                            activeInterface = if (viewModel.isFromSettings) "global_setting" else "reminder_config",
+                            action = "overflow_learn_more_click"
+                        )
                         UriUtil.visitInExternalBrowser(this, getString(R.string.donation_reminders_experiment_url).toUri())
                     },
                     onReportClick = {
+                        DonorExperienceEvent.logDonationReminderAction(
+                            activeInterface = if (viewModel.isFromSettings) "global_setting" else "reminder_config",
+                            action = "overflow_problem_click"
+                        )
                         FeedbackUtil.composeEmail(this,
                             subject = getString(R.string.donation_reminders_settings_report_email_subject),
                             body = getString(R.string.donation_reminders_settings_report_email_body))
@@ -73,7 +80,8 @@ class DonationReminderActivity : BaseActivity() {
         if (!viewModel.isFromSettings) {
             DonorExperienceEvent.logDonationReminderAction(
                 activeInterface = "reminder_config",
-                action = "impression"
+                action = "impression",
+                campaignId = DonationReminderHelper.campaignId
             )
         }
     }

app/src/main/java/org/wikipedia/donate/donationreminder/DonationReminderHelper.kt

@@ -13,25 +13,25 @@ import org.wikipedia.util.ReleaseUtil
 import java.time.LocalDate
 
 object DonationReminderHelper {
-    const val CAMPAIGN_ID = "appmenu_reminder"
     const val MAX_REMINDER_PROMPTS = 2
     private val validReadCountOnSeconds = if (ReleaseUtil.isDevRelease) 1 else 15
 
     private val isTestGroupUser = DonationReminderAbTest().isTestGroupUser()
     private val enabledCountries = listOf(
         "GB", "AU", "CA"
     )
-    private val isInEligibleCountry get() = ReleaseUtil.isDevRelease || enabledCountries.contains(GeoUtil.geoIPCountry.orEmpty())
+    val isInEligibleCountry get() = ReleaseUtil.isDevRelease || enabledCountries.contains(GeoUtil.geoIPCountry.orEmpty())
 
     val defaultReadFrequencyOptions = listOf(5, 10, 15, 25, 50)
 
-    // TODO: remove the feature flag before Dec 1 2025.
     val isEnabled
-        get() = ReleaseUtil.isDevRelease || !ReleaseUtil.isProdRelease && isInEligibleCountry &&
-                        LocalDate.now() <= LocalDate.of(2026, 3, 15) && isTestGroupUser
+        get() = ReleaseUtil.isDevRelease || isInEligibleCountry &&
+                LocalDate.now() <= LocalDate.of(2026, 3, 15) && isTestGroupUser
 
     val hasActiveReminder get() = Prefs.donationReminderConfig.userEnabled && Prefs.donationReminderConfig.isReminderReady && isInEligibleCountry
 
+    val campaignId = "appmenu_" + (if (isTestGroupUser) "reminderB" else "reminderA")
+
     var shouldShowSettingSnackbar = false
 
     fun thankYouMessageForSettings(): String {

app/src/main/java/org/wikipedia/page/PageFragment.kt

@@ -75,6 +75,7 @@ import org.wikipedia.dataclient.okhttp.HttpStatusException
 import org.wikipedia.dataclient.okhttp.OkHttpWebViewClient
 import org.wikipedia.descriptions.DescriptionEditActivity
 import org.wikipedia.diff.ArticleEditDetailsActivity
+import org.wikipedia.donate.donationreminder.DonationReminderAbTest
 import org.wikipedia.donate.donationreminder.DonationReminderActivity
 import org.wikipedia.donate.donationreminder.DonationReminderHelper
 import org.wikipedia.edit.EditHandler
@@ -710,6 +711,12 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
                         if (!Prefs.announcementShownDialogs.contains(campaignId)) {
                             DonorExperienceEvent.logAction("impression", "article_banner", pageTitle.wikiSite.languageCode, campaignId)
                             campaignDialog = CampaignDialog(requireActivity(), it, onNeutralBtnClick = { campaignId ->
+                                DonorExperienceEvent.logDonationReminderAction(
+                                    action = "group_assigned",
+                                    activeInterface = "article_banner",
+                                    groupAssigned = if (DonationReminderAbTest().isTestGroupUser()) "android_remind_b" else "android_remind_a",
+                                    campaignId = DonationReminderHelper.campaignId
+                                )
                                 Prefs.announcementShownDialogs = setOf(campaignId)
                                 donationReminderLauncher.launch(DonationReminderActivity.newIntent(requireContext()))
                             })

app/src/main/java/org/wikipedia/page/campaign/CampaignDialog.kt

@@ -8,6 +8,7 @@ import org.wikipedia.WikipediaApp
 import org.wikipedia.activity.BaseActivity
 import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.dataclient.donate.Campaign
+import org.wikipedia.donate.donationreminder.DonationReminderAbTest
 import org.wikipedia.donate.donationreminder.DonationReminderHelper
 import org.wikipedia.settings.Prefs
 import org.wikipedia.util.CustomTabsUtil
@@ -19,7 +20,10 @@ import java.util.Date
 
 class CampaignDialog internal constructor(private val context: Context, val campaign: Campaign, val onNeutralBtnClick: ((campaignId: String) -> Unit)? = null) : AlertDialog.Builder(context), CampaignDialogView.Callback {
     private var dialog: AlertDialog? = null
-    private val campaignId = campaign.getIdForLang(WikipediaApp.instance.appOrSystemLanguageCode)
+    private val campaignId = campaign.getIdForLang(WikipediaApp.instance.appOrSystemLanguageCode) +
+            if (DonationReminderHelper.isInEligibleCountry) {
+                if (DonationReminderAbTest().isTestGroupUser()) "_reminderB" else "_reminderA"
+            } else ""
 
     init {
         val campaignView = CampaignDialogView(context)
@@ -28,6 +32,8 @@ class CampaignDialog internal constructor(private val context: Context, val camp
         campaignView.showNeutralButton = dateDiff.toDays() >= 1 && campaign.endDateTime?.isAfter(LocalDateTime.now().plusDays(1)) == true || Prefs.ignoreDateForAnnouncements
         campaignView.setupViews(campaignId, campaign.getAssetsForLang(WikipediaApp.instance.appOrSystemLanguageCode))
         setView(campaignView)
+
+        DonorExperienceEvent.logAction("impression", "article_banner", campaignId = campaignId)
     }
 
     override fun show(): AlertDialog {

app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.kt

@@ -211,7 +211,7 @@ class LeadImagesHandler(private val parentFragment: PageFragment,
                 DonorExperienceEvent.logDonationReminderAction(
                     activeInterface = "reminder_milestone",
                     action = "donate_start_click",
-                    campaignId = DonationReminderHelper.CAMPAIGN_ID
+                    campaignId = DonationReminderHelper.campaignId
                 )
                 ExclusiveBottomSheetPresenter.show(parentFragment.parentFragmentManager, DonateDialog.newInstance(fromDonationReminder = true))
             }
@@ -224,6 +224,10 @@ class LeadImagesHandler(private val parentFragment: PageFragment,
                 )
                 FeedbackUtil.makeSnackbar(activity, activity.getString(R.string.donation_reminders_prompt_dismiss_snackbar))
                     .setAction(R.string.donation_reminders_snackbar_modify_button_label) {
+                        DonorExperienceEvent.logDonationReminderAction(
+                            activeInterface = "reminder_milestone",
+                            action = "setting_click"
+                        )
                         activity.startActivity(DonationReminderActivity.newIntent(activity))
                     }.show()
             }

app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.kt

@@ -11,6 +11,7 @@ import org.wikipedia.BuildConfig
 import org.wikipedia.Constants
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
+import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.analytics.eventplatform.RecommendedReadingListEvent
 import org.wikipedia.analytics.eventplatform.YearInReviewEvent
 import org.wikipedia.auth.AccountUtil
@@ -134,6 +135,10 @@ internal class SettingsPreferenceLoader(fragment: PreferenceFragmentCompat) : Ba
                 }
         }
         findPreference(R.string.preference_key_delete_local_donation_history).onPreferenceClickListener = Preference.OnPreferenceClickListener {
+            DonorExperienceEvent.logDonationReminderAction(
+                activeInterface = "global_setting",
+                action = "clear_donation_hist_click"
+            )
             val hasDonations = Prefs.donationResults.isNotEmpty()
 
             if (hasDonations) {