Skip to content
This repository has been archived by the owner on Feb 24, 2025. It is now read-only.

Commit

Permalink
Aligning Privacy Dashboard EventMapping with macOS (#3822)
Browse files Browse the repository at this point in the history
<!--
Note: This checklist is a reminder of our shared engineering
expectations. Feel free to change it, although assigning a GitHub
reviewer and the items in bold are required.

⚠️ If you're an external contributor, please file an issue first before
working on a PR, as we can't guarantee that we will accept your changes
if they haven't been discussed ahead of time. Thanks!
-->

Task/Issue URL:
https://app.asana.com/0/1206594217596623/1209173355503842/f

**Description**:

Removes automatic firing of `BrokenSiteReportShown` pixel to align with
macOS. The firing of that pixel is now actively requested by the Privacy
Dashboard (see
duckduckgo/BrowserServicesKit#1167)

This PR contains a fix for on
#3802 which is why it is stacked
on it. Please let me know if this is not the best way to have this code
reviewed.

**Steps to test this PR**:

1. Invoke the breakage form in the two possible ways:
Open the Privacy Dashboard and click on "Report a problem with this
site"
Open the app menu ••• and click on "Report Broken Site” (iOS)

2. Confirm that the pixel `m_report-broken-site_shown` was fired
3. Submit a report
4. Confirm that the pixels `epbf` and `m_report-broken-site_sent` were
fired

**Definition of Done (Internal Only)**:

* [ ] Does this PR satisfy our [Definition of
Done](https://app.asana.com/0/1202500774821704/1207634633537039/f)?

**Copy Testing**:

* [ ] Use of correct apostrophes in new copy, ie `’` rather than `’`

**Orientation Testing**:

* [ ] Portrait
* [ ] Landscape

**Device Testing**:

* [ ] iPhone SE (1st Gen)
* [ ] iPhone 8
* [ ] iPhone X
* [ ] iPhone 14 Pro
* [ ] iPad

**OS Testing**:

* [ ] iOS 15
* [ ] iOS 16
* [ ] iOS 17

**Theme Testing**:

* [ ] Light theme
* [ ] Dark theme

—
###### Internal references:
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)

---------

Co-authored-by: Jacek Łyp <[email protected]>
  • Loading branch information
mgurgel and jaceklyp authored Jan 17, 2025
1 parent b7776e3 commit a211046
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -11952,7 +11952,7 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
branch = "mgurgel/improved-breakage-form";
branch = "mgurgel/improved-breakage-form-pixel";
kind = branch;
};
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"branch" : "mgurgel/improved-breakage-form",
"revision" : "c77e36efe790bc01af9b152fc0ef0fbb35a32f82"
"branch" : "mgurgel/improved-breakage-form-pixel",
"revision" : "f85a4199ba4251921ecff6d110527c8d5c44e329"
}
},
{
Expand Down Expand Up @@ -122,8 +122,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/privacy-dashboard",
"state" : {
"revision" : "3f58e008d4e9d1b56ab12dbb95bd891045cf2758",
"version" : "8.0.0"
"branch" : "pr-releases/pr-302",
"revision" : "05d04de7505117b32949b2007e5a56ba2d39469b"
}
},
{
Expand Down
11 changes: 0 additions & 11 deletions DuckDuckGo/MainViewController+Segues.swift
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ extension MainViewController {
return
}

if entryPoint == .report {
fireBrokenSiteReportShown()
}

let storyboard = UIStoryboard(name: "PrivacyDashboard", bundle: nil)
let controller = storyboard.instantiateInitialViewController { coder in
PrivacyDashboardViewController(coder: coder,
Expand Down Expand Up @@ -141,13 +137,6 @@ extension MainViewController {
present(controller, animated: true)
}

private func fireBrokenSiteReportShown() {
let parameters = [
PrivacyDashboardEvents.Parameters.source: BrokenSiteReport.Source.appMenu.rawValue
]
Pixel.fire(pixel: .reportBrokenSiteShown, withAdditionalParameters: parameters)
}

func segueToNegativeFeedbackForm() {
Logger.lifecycle.debug(#function)
hideAllHighlightsIfNeeded()
Expand Down

0 comments on commit a211046

Please sign in to comment.