Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add campaign ID to button taps on campaign modal #4847

Merged
merged 2 commits into from
May 15, 2024
Merged

Add campaign ID to button taps on campaign modal #4847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
598c973
Add campaign ID to button taps on campaign modal
tonisevener May 7, 2024
008c066
Merge branch 'main' into T352722
tonisevener May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions Wikipedia/Code/AppInteractionFunnel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,41 @@ import WMF
logEvent(activeInterface: .articleBanner, action: .impression, actionData: actionData, project: project)
}

func logFundraisingCampaignModalDidTapClose(project: WikimediaProject) {
logEvent(activeInterface: .articleBanner, action: .closeClick, project: project)
func logFundraisingCampaignModalDidTapClose(project: WikimediaProject, campaignID: String?) {
var actionData: [String: String]?
if let campaignID {
actionData = [:]
actionData?["campaign_id"] = campaignID
}

logEvent(activeInterface: .articleBanner, action: .closeClick, actionData: actionData, project: project)
}

func logFundraisingCampaignModalDidTapDonate(project: WikimediaProject) {
logEvent(activeInterface: .articleBanner, action: .donateClick, project: project)
func logFundraisingCampaignModalDidTapDonate(project: WikimediaProject, campaignID: String?) {
var actionData: [String: String]?
if let campaignID {
actionData = ["campaign_id": campaignID]
}

logEvent(activeInterface: .articleBanner, action: .donateClick, actionData: actionData, project: project)
}

func logFundraisingCampaignModalDidTapMaybeLater(project: WikimediaProject) {
logEvent(activeInterface: .articleBanner, action: .laterClick, project: project)
func logFundraisingCampaignModalDidTapMaybeLater(project: WikimediaProject, campaignID: String?) {
var actionData: [String: String]?
if let campaignID {
actionData = ["campaign_id": campaignID]
}

logEvent(activeInterface: .articleBanner, action: .laterClick, actionData: actionData, project: project)
}

func logFundraisingCampaignModalDidTapAlreadyDonated(project: WikimediaProject) {
logEvent(activeInterface: .articleBanner, action: .alreadyDonatedClick, project: project)
func logFundraisingCampaignModalDidTapAlreadyDonated(project: WikimediaProject, campaignID: String?) {
var actionData: [String: String]?
if let campaignID {
actionData = ["campaign_id": campaignID]
}

logEvent(activeInterface: .articleBanner, action: .alreadyDonatedClick, actionData: actionData, project: project)
}

func logFundraisingCampaignModalDidTapDonorPolicy(project: WikimediaProject) {
Expand Down
10 changes: 5 additions & 5 deletions Wikipedia/Code/ArticleViewController+Announcements.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ extension ArticleViewController {

wmf_showFundraisingAnnouncement(theme: theme, asset: asset, primaryButtonTapHandler: { button, _ in

AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapDonate(project: project)
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapDonate(project: project, campaignID: asset.utmSource)
self.pushToDonateForm(asset: asset, sourceView: button)
dataController.markAssetAsPermanentlyHidden(asset: asset)

}, secondaryButtonTapHandler: { _, _ in
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapMaybeLater(project: project)
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapMaybeLater(project: project, campaignID: asset.utmSource)


if shouldShowMaybeLater {
dataController.markAssetAsMaybeLater(asset: asset, currentDate: Date())
self.donateDidSetMaybeLater()
} else {
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapAlreadyDonated(project: project)
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapAlreadyDonated(project: project, campaignID: asset.utmSource)
self.donateAlreadyDonated()
dataController.markAssetAsPermanentlyHidden(asset: asset)
}

}, optionalButtonTapHandler: { _, _ in
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapAlreadyDonated(project: project)
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapAlreadyDonated(project: project, campaignID: asset.utmSource)
self.donateAlreadyDonated()
dataController.markAssetAsPermanentlyHidden(asset: asset)

Expand All @@ -55,7 +55,7 @@ extension ArticleViewController {
}, traceableDismissHandler: { action in

if action == .tappedClose {
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapClose(project: project)
AppInteractionFunnel.shared.logFundraisingCampaignModalDidTapClose(project: project, campaignID: asset.utmSource)
dataController.markAssetAsPermanentlyHidden(asset: asset)
}
}, showMaybeLater: shouldShowMaybeLater)
Expand Down