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.

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

Client displays correct subscription #3620

Merged
merged 22 commits into from
Nov 29, 2024

Conversation

miasma13
Copy link
Contributor

@miasma13 miasma13 commented Nov 25, 2024

Task/Issue URL: https://app.asana.com/0/1208524871249522/1208379950230747/f

Description:
See https://app.asana.com/0/1208524871249522/1208799981662317/f

Steps to test this PR:
See https://app.asana.com/0/0/1208836865988482/f and its parent task.

Definition of Done (Internal Only):

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
Technical Design Template

@samsymons samsymons self-requested a review November 25, 2024 20:53
Comment on lines +332 to +336
if featureFlagger.localOverrides?.override(for: flag) == nil {
featureFlagger.localOverrides?.toggleOverride(for: flag)
} else {
featureFlagger.localOverrides?.clearOverride(for: flag)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 🙌

@miasma13 miasma13 changed the base branch from main to release/7.147.0 November 27, 2024 13:31
@miasma13 miasma13 changed the title Michal/non us subscriptions Client displays correct subscription Nov 27, 2024
@miasma13 miasma13 marked this pull request as ready for review November 28, 2024 18:31
Comment on lines +122 to +134
Task {
let features = await subscriptionManager.currentSubscriptionFeatures()

if features.contains(.networkProtection) {
availableCategories.append(.vpn)
}
if features.contains(.dataBrokerProtection) {
availableCategories.append(.pir)
}
if features.contains(.identityTheftRestoration) || features.contains(.identityTheftRestorationGlobal) {
availableCategories.append(.itr)
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks!

miasma13 added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Nov 29, 2024
**Required**:

Task/Issue URL:
https://app.asana.com/0/1208524871249522/1208379950230747/f
iOS PR: duckduckgo/iOS#3620
macOS PR: duckduckgo/macos-browser#3581
What kind of version bump will this require?: Minor

**Description**:
See https://app.asana.com/0/1208524871249522/1208379950230747/f

**Steps to test this PR**:
See client PRs

**OS Testing**:

* [ ] iOS 14
* [ ] iOS 15
* [ ] iOS 16
* [ ] macOS 10.15
* [ ] macOS 11
* [ ] macOS 12

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

github-actions bot commented Nov 29, 2024

Messages
📖

You seem to be updating localized strings. Make sure that you request translations and include translated strings before you ship your change. See Localization Guidelines for more information.

Generated by 🚫 dangerJS against dfaa6a6

@miasma13 miasma13 merged commit 4a3c4e8 into release/7.147.0 Nov 29, 2024
13 checks passed
@miasma13 miasma13 deleted the michal/non-us-subscriptions branch November 29, 2024 12:22
samsymons added a commit that referenced this pull request Nov 29, 2024
# By Bartek Waresiak (3) and others
# Via GitHub (1) and others
* main:
  Remove incorrect tests and reenable some of the non-flaky ones (#3653)
  Update BSK with version including Privacy Stats module for use in the macOS browser (#3651)
  point to BSK branch and updates (#3636)
  Release 7.147.0-6 (#3652)
  Revert incorrect push
  Client displays correct subscription (#3620)
  Re-enable pixel tests except for flaky one
  Remove Special Pages tests
  Include inactive tabs statistics in daily tab switcher pixel (#3643)
  Release 7.147.0-5 (#3649)
  [Release PR] Add StoreKit debugging metadata to the debug menu (#3637)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Nov 30, 2024
# By Bartek Waresiak (3) and others
# Via GitHub (1) and others
* main:
  Add support for RMF survey `locale` parameter (#3648)
  Remove incorrect tests and reenable some of the non-flaky ones (#3653)
  Update BSK with version including Privacy Stats module for use in the macOS browser (#3651)
  point to BSK branch and updates (#3636)
  Release 7.147.0-6 (#3652)
  Revert incorrect push
  Client displays correct subscription (#3620)
  Re-enable pixel tests except for flaky one
  Remove Special Pages tests
  Include inactive tabs statistics in daily tab switcher pixel (#3643)
  Release 7.147.0-5 (#3649)
  [Release PR] Add StoreKit debugging metadata to the debug menu (#3637)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants