Merge branch 'enable-ip-overrides-in-release-mode-ios-516'

buggmagnet · buggmagnet · commit 29bad7d315c2 · 2024-02-26T14:36:07.000+01:00
diff --git a/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideTextViewController.swift b/ios/MullvadVPN/Coordinators/Settings/IPOverride/IPOverrideTextViewController.swift
@@ -63,6 +63,7 @@ class IPOverrideTextViewController: UIViewController {
         textView.delegate = self
         textView.spellCheckingType = .no
         textView.autocorrectionType = .no
+        textView.textColor = UIColor.label
         textView.font = UIFont.monospacedSystemFont(
             ofSize: UIFont.systemFont(ofSize: 14).pointSize,
             weight: .regular
diff --git a/ios/MullvadVPN/View controllers/Settings/SettingsDataSource.swift b/ios/MullvadVPN/View controllers/Settings/SettingsDataSource.swift
@@ -153,10 +153,7 @@ final class SettingsDataSource: UITableViewDiffableDataSource<SettingsDataSource
         }
 
         snapshot.appendItems([.apiAccess], toSection: .main)
-
-        #if DEBUG
         snapshot.appendItems([.ipOverride], toSection: .main)
-        #endif
 
         snapshot.appendSections([.version, .problemReport])
         snapshot.appendItems([.version], toSection: .version)

Original file line number	Diff line number	Diff line change
`@@ -153,10 +153,7 @@ final class SettingsDataSource: UITableViewDiffableDataSource<SettingsDataSource`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`snapshot.appendItems([.apiAccess], toSection: .main)`
`156`		`-`
`157`		`- #if DEBUG`
`158`	`156`	`snapshot.appendItems([.ipOverride], toSection: .main)`
`159`		`- #endif`
`160`	`157`
`161`	`158`	`snapshot.appendSections([.version, .problemReport])`
`162`	`159`	`snapshot.appendItems([.version], toSection: .version)`