Merge remote-tracking branch 'origin/Display-tags-by-alphabetical-order' into Display-tags-by-alphabetical-order

# Conflicts:
#	features/cells/src/main/res/values/strings.xml

Author: ohassine

features/cells/src/main/java/com/wire/android/feature/cells/ui/CellViewModel.kt

@@ -532,7 +532,7 @@ class CellViewModel @Inject constructor(
     }
 
     suspend fun loadTags() {
-        getAllTagsUseCase().onSuccess { updated -> _tags.update { updated } }
+        getAllTagsUseCase().onSuccess { updated -> _tags.update { updated.sorted().toSet() } }
         // apply delay to avoid too frequent requests
         delay(30.seconds)
     }

features/cells/src/main/java/com/wire/android/feature/cells/ui/tags/AddRemoveTagsViewModel.kt

@@ -66,7 +66,7 @@ class AddRemoveTagsViewModel @Inject constructor(
     private val _suggestedTags = MutableStateFlow<Set<String>>(emptySet())
     internal val suggestedTags =
         allTags.combine(addedTags) { all, added ->
-            all.filter { it !in added }.toSet()
+            all.filter { it !in added }.toSet().sorted()
         }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptySet())
 
     init {

features/cells/src/main/res/values/strings.xml

@@ -120,6 +120,7 @@
     <string name="no_tags_message">No tags were added yet.</string>
     <string name="tags_edited">Tags were edited</string>
     <string name="failed_edit_tags">Unable to add or remove tags</string>
+    <string name="create_folder_invalid_name">Use a name without "/"</string>
     <string name="file_list_empty_title">There are no files or folders yet</string>
     <string name="no_results_found_label">No results found</string>
     <string name="filters_try_adjusting_your_filters_label">Try adjusting your filters.</string>