Set filters on the FilterView when they are shown or hidden

4 files changed, 17 insertions, 9 deletions

diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationViewController.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationViewController.swift
index 91305ddaea..5bd6021b96 100644
--- a/ios/MullvadVPN/View controllers/SelectLocation/LocationViewController.swift
+++ b/ios/MullvadVPN/View controllers/SelectLocation/LocationViewController.swift
@@ -92,11 +92,11 @@ final class LocationViewController: UIViewController {
         self.relaysWithLocation = relaysWithLocation
         self.filter = filter
 
+        filterView.setFilter(filter)
         if filterViewShouldBeHidden {
             filterView.isHidden = true
         } else {
             filterView.isHidden = false
-            filterView.setFilter(filter)
         }
 
         dataSource?.setRelays(relaysWithLocation, selectedRelays: selectedRelays)
diff --git a/ios/MullvadVPNTests/MullvadREST/Relay/MultihopDecisionFlowTests.swift b/ios/MullvadVPNTests/MullvadREST/Relay/MultihopDecisionFlowTests.swift
index 9ff0848ebd..2919cff700 100644
--- a/ios/MullvadVPNTests/MullvadREST/Relay/MultihopDecisionFlowTests.swift
+++ b/ios/MullvadVPNTests/MullvadREST/Relay/MultihopDecisionFlowTests.swift
@@ -169,8 +169,7 @@ extension MultihopDecisionFlowTests {
             relays: sampleRelays,
             constraints: constraints,
             connectionAttemptCount: 0,
-            daitaSettings: DAITASettings(daitaState: .off),
-            automaticDaitaRouting: false
+            daitaSettings: DAITASettings(daitaState: .off)
         )
     }
 
diff --git a/ios/MullvadVPNTests/MullvadREST/Relay/RelayPickingTests.swift b/ios/MullvadVPNTests/MullvadREST/Relay/RelayPickingTests.swift
index 00191ecaf4..e65a1c5a17 100644
--- a/ios/MullvadVPNTests/MullvadREST/Relay/RelayPickingTests.swift
+++ b/ios/MullvadVPNTests/MullvadREST/Relay/RelayPickingTests.swift
@@ -122,7 +122,7 @@ class RelayPickingTests: XCTestCase {
 
         let selectedRelays = try picker.pick()
 
-        XCTAssertNil(selectedRelays.entry?.hostname)
+        XCTAssertEqual(selectedRelays.entry?.hostname, "us-nyc-wg-301") // New York relay is closest to exit relay.
         XCTAssertEqual(selectedRelays.exit.hostname, "es1-wireguard")
     }
 
@@ -150,7 +150,7 @@ class RelayPickingTests: XCTestCase {
             exitLocations: .only(UserSelectedRelays(locations: [.hostname("se", "got", "se10-wireguard")]))
         )
 
-        let picker = SinglehopPicker(
+        let picker = MultihopPicker(
             relays: sampleRelays,
             constraints: constraints,
             connectionAttemptCount: 0,
@@ -169,7 +169,7 @@ class RelayPickingTests: XCTestCase {
             exitLocations: .only(UserSelectedRelays(locations: [.hostname("se", "got", "se10-wireguard")]))
         )
 
-        let picker = SinglehopPicker(
+        let picker = MultihopPicker(
             relays: sampleRelays,
             constraints: constraints,
             connectionAttemptCount: 0,
@@ -188,7 +188,7 @@ class RelayPickingTests: XCTestCase {
             exitLocations: .only(UserSelectedRelays(locations: [.hostname("se", "got", "se10-wireguard")]))
         )
 
-        let picker = SinglehopPicker(
+        let picker = MultihopPicker(
             relays: sampleRelays,
             constraints: constraints,
             connectionAttemptCount: 0,
diff --git a/ios/MullvadVPNTests/MullvadSettings/DAITASettingsTests.swift b/ios/MullvadVPNTests/MullvadSettings/DAITASettingsTests.swift
index f153de9a55..0057857349 100644
--- a/ios/MullvadVPNTests/MullvadSettings/DAITASettingsTests.swift
+++ b/ios/MullvadVPNTests/MullvadSettings/DAITASettingsTests.swift
@@ -10,12 +10,21 @@
 import XCTest
 
 final class DAITASettingsTests: XCTestCase {
-    func testShouldDoDirectOnly() throws {
+    func testIsAutomaticRouting() throws {
         let settings = DAITASettings()
 
         XCTAssertEqual(
-            settings.shouldDoAutomaticRouting,
+            settings.isAutomaticRouting,
             settings.daitaState == .on && settings.directOnlyState == .off
         )
     }
+
+    func testIsDirectOnly() throws {
+        let settings = DAITASettings()
+
+        XCTAssertEqual(
+            settings.isDirectOnly,
+            settings.daitaState == .on && settings.directOnlyState == .on
+        )
+    }
 }