Fix wrong location being selected after cancel

duckduckgo · Feb 23, 2024 · c2f6066 · c2f6066
1 parent 5537a9d
commit c2f6066
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift
@@ -56,6 +56,11 @@ struct VPNLocationView: View {
                     await model.onViewAppeared()
                 }
             }
+            .onDisappear {
+                Task {
+                    await model.onViewDisappered()
+                }
+            }
         }
         .frame(width: 624, height: 640, alignment: .top)
     }

diff --git a/...DuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift b/...DuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
@@ -69,6 +69,11 @@ final class VPNLocationViewModel: ObservableObject {
         await reloadList()
     }
 
+    func onViewDisappered() async {
+        selectedLocation = settings.selectedLocation
+        await reloadList()
+    }
+
     func onNearestItemSelection() async {
         DailyPixel.fire(pixel: .networkProtectionGeoswitchingSetNearest, frequency: .dailyAndCount, includeAppVersionParameter: true)
         selectedLocation = .nearest