Skip to content

Commit 8eac678

Browse files
authored
Fix case where DonateDialog receives incorrect CampaignID. (#6157)
1 parent b3571c4 commit 8eac678

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.wikipedia.activity.BaseActivity
1919
import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
2020
import org.wikipedia.databinding.DialogDonateBinding
2121
import org.wikipedia.dataclient.donate.CampaignCollection
22+
import org.wikipedia.donate.donationreminder.DonationReminderAbTest
2223
import org.wikipedia.donate.donationreminder.DonationReminderHelper
2324
import org.wikipedia.page.ExtendedBottomSheetDialogFragment
2425
import org.wikipedia.settings.Prefs
@@ -29,13 +30,17 @@ import org.wikipedia.util.Resource
2930
class DonateDialog : ExtendedBottomSheetDialogFragment() {
3031
private var _binding: DialogDonateBinding? = null
3132
private val binding get() = _binding!!
33+
private var campaignIdOriginal: String? = null
3234
private var campaignId: String? = null
3335

3436
private val viewModel: DonateViewModel by viewModels()
3537

3638
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
3739
_binding = DialogDonateBinding.inflate(inflater, container, false)
38-
campaignId = arguments?.getString(ARG_CAMPAIGN_ID)
40+
campaignIdOriginal = arguments?.getString(ARG_CAMPAIGN_ID)
41+
campaignId = campaignIdOriginal + if (DonationReminderHelper.isInEligibleCountry) {
42+
if (DonationReminderAbTest().isTestGroupUser()) "_reminderB" else "_reminderA"
43+
} else ""
3944

4045
val activeInterface = if (arguments?.getBoolean(ARG_FROM_YIR) == true) {
4146
"wiki_yir"
@@ -108,7 +113,7 @@ class DonateDialog : ExtendedBottomSheetDialogFragment() {
108113
}
109114

110115
private fun invalidateCampaign() {
111-
campaignId?.let {
116+
campaignIdOriginal?.let {
112117
Prefs.announcementShownDialogs = setOf(it)
113118
}
114119
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class CampaignDialog internal constructor(private val context: Context, val camp
5757
DonorExperienceEvent.logAction("donate_start_click", "article_banner", campaignId = campaignId)
5858
val customTabUrl = Prefs.announcementCustomTabTestUrl.orEmpty().ifEmpty { url }
5959
if (context is BaseActivity) {
60-
context.launchDonateDialog(campaignId, customTabUrl)
60+
context.launchDonateDialog(campaignIdOriginal, customTabUrl)
6161
dismissDialog(false)
6262
} else {
6363
CustomTabsUtil.openInCustomTab(context, customTabUrl)

0 commit comments

Comments
 (0)