Fix divider not being completely hidden when applicable

mullvad · Jan 7, 2025 · da9d9fa · da9d9fa
1 parent 712d19e
commit da9d9fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/...PN/View controllers/Tunnel/FeatureIndicators/ConnectionView/ConnectionViewViewModel.swift b/...PN/View controllers/Tunnel/FeatureIndicators/ConnectionView/ConnectionViewViewModel.swift
@@ -52,9 +52,9 @@ extension ConnectionViewViewModel {
     var showConnectionDetails: Bool {
         switch tunnelStatus.state {
         case .connecting, .reconnecting, .waitingForConnectivity(.noConnection), .negotiatingEphemeralPeer,
-             .connected, .pendingReconnect, .waitingForConnectivity(.noNetwork):
+             .connected, .pendingReconnect:
             true
-        case .disconnecting, .disconnected, .error:
+        case .disconnecting, .disconnected, .waitingForConnectivity(.noNetwork), .error:
             false
         }
     }
@@ -130,9 +130,9 @@ extension ConnectionViewViewModel {
 
     var localizedTitleForSelectLocationButton: LocalizedStringKey {
         switch tunnelStatus.state {
-        case .disconnecting, .pendingReconnect, .disconnected:
+        case .disconnecting, .pendingReconnect, .disconnected, ..waitingForConnectivity(.noNetwork):
             LocalizedStringKey("Select location")
-        case .connecting, .connected, .reconnecting, .waitingForConnectivity, .negotiatingEphemeralPeer, .error:
+        case .connecting, .connected, .reconnecting, .waitingForConnectivity(.noConnection), .negotiatingEphemeralPeer, .error:
             LocalizedStringKey("Switch location")
         }
     }

diff --git a/...ullvadVPN/View controllers/Tunnel/FeatureIndicators/ConnectionView/DetailsContainer.swift b/...ullvadVPN/View controllers/Tunnel/FeatureIndicators/ConnectionView/DetailsContainer.swift
@@ -17,11 +17,10 @@ extension ConnectionView {
         @State private var scrollViewHeight: CGFloat = 0
 
         var body: some View {
-//            if isExpanded {
-            Divider()
-                .background(UIColor.secondaryTextColor.color)
-                .opacity(isExpanded ? 1.0 : 0.0)
-//            }
+            if isExpanded {
+                Divider()
+                    .background(UIColor.secondaryTextColor.color)
+            }
 
             // This geometry reader is somewhat of a workaround. It's "smart" in that it takes up as much
             // space as it can and thereby helps the view to understand the maximum allowed height when