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

Fix selected VPN location consistency #2797

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Conversation

samsymons
Copy link
Contributor

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

Description:

This PR fixes two issues with location selection:

  1. When you have connected and then disconnected the VPN, the status view was remembering the last connected location and showing it as your location instead of your selection in settings
  2. When selecting a city, the flag emoji wasn't being included in the title

Steps to test this PR:

  1. Select a specific location in the VPN settings
  2. Connect then disconnect
  3. Change your location in settings and check that the location changes in the status UI
  4. Finally, select a specific US city and check that the flag emoji appears

OS Testing:

  • iOS 14
  • iOS 15
  • iOS 16

Internal references:

Software Engineering Expectations
Technical Design Template

@samsymons samsymons requested a review from graeme April 26, 2024 21:32
city: city,
country: countryLabelsModel.title
)

title = "\(countryLabelsModel.emoji) \(formattedCityAndCountry)"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This should ideally go into the localized string. We're doing this elsewhere so I've reused that pattern here, but in this form it won't handle RTL languages very well. I'll look at changing this before it gets merged.

Copy link
Contributor

Choose a reason for hiding this comment

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

I’m assuming from Asana that you want this merged to make the release, so perhaps tackle this in a follow-up.

@graeme graeme merged commit 612de01 into main Apr 29, 2024
13 checks passed
@graeme graeme deleted the sam/fix-location-status-text-bugs branch April 29, 2024 10:07
samsymons added a commit that referenced this pull request Apr 30, 2024
* main: (38 commits)
  Disable the feedback send button when there’s no text (#2800)
  Release 7.118.0-0 (#2802)
  Autofill Settings - Import passwords via sync (#2756)
  Fix selected VPN location consistency (#2797)
  Reapply "Report Apple Ad attribution using pixel" (#2702)
  reapply auto clear fix, clear cookies, load page on link click (#2798)
  Toggle Connect on Demand when receiving user initiated VPN lifecycle events (#2771)
  Update BSK to 141.1.1 (#2796)
  iOS: VPN Metadata Improvements (#2791)
  Add Internal Page suggestions support (#2784)
  iOS: Add pixels to track VPN wake and stop attempts (#2785)
  Fix bug that shows selected tab in strange position in the switcher (#2789)
  Remove AppTP (#2682)
  Release 7.117.0-1 (#2794)
  cherry pick progress bar fix (#2793)
  fix progress bar missing after cold launch (#2792)
  Check entitlements before showing VPN screen from notification (#2748)
  Add parameter allowed encoding to error descriptions (#2781)
  Update Lottie to 4.4.3 (#2765)
  Update to fastlane 2.220.0 to fix ad-hoc lane (#2782)
  ...
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.

None yet

2 participants