Merge branch 'fix-swiftlint-warning-void_function_in_ternary-ios-269'

mullvad · Aug 22, 2023 · 3413af0 · 3413af0
2 parents 5881129 + 304a4b1
commit 3413af0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift b/ios/MullvadVPN/Containers/Root/RootContainerViewController.swift
@@ -102,9 +102,11 @@ class RootContainerViewController: UIViewController {
             guard let notificationController else {
                 return
             }
-            isNavigationBarHidden
-                ? removeNotificationController(notificationController)
-                : addNotificationController(notificationController)
+            if isNavigationBarHidden {
+                removeNotificationController(notificationController)
+            } else {
+                addNotificationController(notificationController)
+            }
         }
     }
 
@@ -686,9 +688,11 @@ class RootContainerViewController: UIViewController {
     private func updateNotificationBarHiddenFromChildPreferences() {
         if let notificationController,
            let conforming = topViewController as? RootContainment {
-            conforming.prefersNotificationBarHidden
-                ? removeNotificationController(notificationController)
-                : addNotificationController(notificationController)
+            if conforming.prefersNotificationBarHidden {
+                removeNotificationController(notificationController)
+            } else {
+                addNotificationController(notificationController)
+            }
         }
     }
 

diff --git a/ios/MullvadVPN/View controllers/AccountDeletion/AccountDeletionContentView.swift b/ios/MullvadVPN/View controllers/AccountDeletion/AccountDeletionContentView.swift
@@ -319,7 +319,11 @@ class AccountDeletionContentView: UIView {
     }
 
     private func updateUI() {
-        isLoading ? activityIndicator.startAnimating() : activityIndicator.stopAnimating()
+        if isLoading {
+            activityIndicator.startAnimating()
+        } else {
+            activityIndicator.stopAnimating()
+        }
         deleteButton.isEnabled = isDeleteButtonEnabled && isAccountNumberLengthSatisfied
         statusLabel.text = text
         statusLabel.textColor = textColor

diff --git a/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherContentView.swift b/ios/MullvadVPN/View controllers/RedeemVoucher/RedeemVoucherContentView.swift
@@ -264,7 +264,11 @@ final class RedeemVoucherContentView: UIView {
     }
 
     private func updateUI() {
-        isLoading ? activityIndicator.startAnimating() : activityIndicator.stopAnimating()
+        if isLoading {
+            activityIndicator.startAnimating()
+        } else {
+            activityIndicator.stopAnimating()
+        }
         redeemButton.isEnabled = isRedeemButtonEnabled && textField.isVoucherLengthSatisfied
         statusLabel.text = text
         statusLabel.textColor = textColor