Merge branch 'limit-the-name-of-a-custom-list-to-30-characters-ios-621'

mullvad · Apr 16, 2024 · 0e716a9 · 0e716a9
2 parents 6fdc653 + 25ea585
commit 0e716a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ios/MullvadVPN/Coordinators/CustomLists/CustomListCellConfiguration.swift b/ios/MullvadVPN/Coordinators/CustomLists/CustomListCellConfiguration.swift
@@ -75,6 +75,7 @@ struct CustomListCellConfiguration {
         contentConfiguration.setPlaceholder(type: .required)
         contentConfiguration.textFieldProperties = .withSmartFeaturesDisabled()
         contentConfiguration.inputText = subject.value.name
+        contentConfiguration.maxLength = 30
         contentConfiguration.editingEvents.onChange = subject.bindTextAction(to: \.name)
 
         cell.contentConfiguration = contentConfiguration

diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift
@@ -20,9 +20,8 @@ class LocationCell: UITableViewCell {
         let label = UILabel()
         label.font = UIFont.systemFont(ofSize: 16)
         label.textColor = .white
-        label.lineBreakMode = .byWordWrapping
-        label.numberOfLines = 0
-        label.lineBreakStrategy = []
+        label.lineBreakMode = .byTruncatingTail
+        label.numberOfLines = 1
         return label
     }()