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

VPN screen improvements #2550

Merged
merged 33 commits into from
Apr 19, 2024
Merged

VPN screen improvements #2550

merged 33 commits into from
Apr 19, 2024

Conversation

quanganhdo
Copy link
Member

@quanganhdo quanganhdo commented Apr 4, 2024

Task/Issue URL: https://app.asana.com/0/0/1206942473732463/f
Tech Design URL:
CC:

Description:

Updates the VPN screen header.

Steps to test this PR:

  1. Open VPN screen
  2. Disconnect/Connect the VPN
  3. Expect to see the new Lottie animation, new message, and the yellow/green dot next to the status
  4. Try toggling the VPN screen visibility
  5. Expect to see the screen at the same place (no weird placement)

Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

@github-actions github-actions bot added the bot: not in app board Added by automation for pull requests with tasks not added to macOS App Board Asana project label Apr 4, 2024
@quanganhdo quanganhdo removed the bot: not in app board Added by automation for pull requests with tasks not added to macOS App Board Asana project label Apr 5, 2024
@quanganhdo quanganhdo marked this pull request as ready for review April 5, 2024 05:10
@quanganhdo quanganhdo changed the title VPN screen improvements: Header VPN screen improvements #1: Header Apr 9, 2024
Copy link
Collaborator

@samsymons samsymons left a comment

Choose a reason for hiding this comment

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

LGTM, works great! Tested with light and dark mode, multiple windows open simultaneously, etc. Worked great each time - nice work!

Task/Issue URL:
https://app.asana.com/0/72649045549333/1206942473732466/f
Tech Design URL:
CC:

**Description**:

Updates the location displayed on VPN screen

**Steps to test this PR**:
1. Check the location section of the VPN screen
2. Make sure changing locations work
Task/Issue URL: https://app.asana.com/0/0/1206942473732464/f
Tech Design URL:
CC:

**Description**:

Adds the Data Volume item & reorder the menu items.

**Steps to test this PR**:

1. Open the VPN screen on either the status bar or main browser
2. Check if data volume is correct
3. Also, verify the menu item ordering. Open DDG should go last.

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
@quanganhdo quanganhdo changed the title VPN screen improvements #1: Header VPN screen improvements Apr 19, 2024
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/Application/URLEventHandler.swift
#	DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
#	DuckDuckGo/Windows/View/WindowControllersManager.swift
@quanganhdo
Copy link
Member Author

Merged changes from #2590 and #2611

Copy link
Contributor

github-actions bot commented Apr 19, 2024

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS against 1e39ac1

@quanganhdo quanganhdo merged commit b59493f into main Apr 19, 2024
16 checks passed
@quanganhdo quanganhdo deleted the anh/netp/screen-improvements branch April 19, 2024 16:37
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