Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Fix#2980: Educational in-product Notification #3151

Merged
merged 36 commits into from
Jan 14, 2021

Conversation

soner-yuksel
Copy link
Contributor

@soner-yuksel soner-yuksel commented Dec 15, 2020

This PR is adding functionality to educational in-product notifications.

The added functionality can be states as follows.

Notification types will be shown

  • First time blocking
  • 20+ trackers & ads blocked on this page.
  • HTTPS Upgrade triggered
  • A Streaming site is loaded and ad is blocked

And also Brave Benchmark Tiers are added so every tier user will be shown a notification regarding to which level they are and sharing options for Issue #2981

Please refer to respected documents for details.

Summary of Changes

This pull request fixes #2980

Submitter Checklist:

  • Unit Tests are updated to cover new or changed functionality
  • User-facing strings use NSLocalizableString()

Test Plan:

  • Load fresh installed Brave Browser
  • Type www.google.com in address bar and check Type 1 - "Trackers & ads blocked on this page." pop-over is displayed.
  • Press "Take a look" button and check Brave Shields pop-over is displayed.
  • Load a URL from Vimeo (https://vimeo.com/search?q=test) and check Type 2 - "Ads are blocked while watching videos on this website" pop-over is displayed.
  • Kill the application and start again. Type 2 - 3 - 4 (blue background) pop-overs can be shown only once per application session (repeat this every time you want to check a different type of notification pop-over.
  • Load a URL from a website that has lots of tracker like (www.buzzfeed.com), check Type 3 - "10+ trackers & ads blocked on this page." pop-over is displayed.
  • Repeat the previous step (Kill the application and start again)
  • Load a URL from a website that triggers from a website that triggers https upgrade like (www.cnn.com or https://imagery.pragprog.com), check Type 4 - "Your connection is now encrypted." pop-over is displayed.

Screenshots:

slack-imgs

Reviewer Checklist:

  • Issues include necessary QA labels:
    • QA/(Yes|No)
    • release-notes/(include|exclude)
    • bug / enhancement
  • Necessary security reviews have taken place.
  • Adequate unit test coverage exists to prevent regressions.
  • Adequate test plan exists for QA to validate (if applicable).
  • Issue is assigned to a milestone (should happen at merge time).

@soner-yuksel soner-yuksel added the blocked If a ticket is blocked for some reason, if not using a sub-block label, please provide info in issue label Dec 15, 2020
@soner-yuksel soner-yuksel added this to the 1.23 milestone Dec 15, 2020
@soner-yuksel soner-yuksel self-assigned this Dec 15, 2020
@soner-yuksel soner-yuksel force-pushed the educational-product-notification branch from 5f97e02 to 3b04919 Compare December 16, 2020 21:31
This was linked to issues Dec 16, 2020
@soner-yuksel soner-yuksel changed the base branch from increase-app-virality to development December 23, 2020 15:21
@soner-yuksel soner-yuksel changed the title Fix#2980 / Fix#2081: Increase App Virality - Educational in-product Notification (Part 2 - Logic) Fix#2980: Educational in-product Notification Dec 23, 2020
@soner-yuksel soner-yuksel removed the blocked If a ticket is blocked for some reason, if not using a sub-block label, please provide info in issue label Dec 23, 2020
@soner-yuksel soner-yuksel force-pushed the educational-product-notification branch 2 times, most recently from b275c01 to cf6dfb6 Compare December 23, 2020 19:04
Copy link
Contributor

@iccub iccub left a comment

Choose a reason for hiding this comment

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

Please look at both this review and the other PR, i did not notice they are based off each other

@soner-yuksel soner-yuksel force-pushed the educational-product-notification branch from 01f4b5f to ff510f9 Compare January 6, 2021 18:05
@anthonypkeane anthonypkeane self-assigned this Jan 6, 2021
@soner-yuksel soner-yuksel force-pushed the educational-product-notification branch from caa6200 to 5b915db Compare January 11, 2021 19:15
@kylehickinson kylehickinson removed this from the 1.23 milestone Jan 11, 2021
@soner-yuksel soner-yuksel force-pushed the educational-product-notification branch from 0a570de to 93f7322 Compare January 12, 2021 22:15
Copy link
Contributor

@iccub iccub left a comment

Choose a reason for hiding this comment

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

minor comments

@soner-yuksel soner-yuksel requested a review from iccub January 13, 2021 22:06
Copy link
Contributor

@iccub iccub left a comment

Choose a reason for hiding this comment

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

99,9% ready last nitpicks left :)

@soner-yuksel soner-yuksel merged commit 0ca0cb7 into development Jan 14, 2021
@soner-yuksel soner-yuksel deleted the educational-product-notification branch January 14, 2021 18:53
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Increase App Virality Educational in-product notification
5 participants