Skip to content

fix: Save button enabled before tag is added (WPB-21033) #4354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

fix: Save button enabled before tag is added (WPB-21033) #4354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion features/cells/src/main/java/com/wire/android/feature/cells/ui/tags/AddRemoveTagsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,14 @@ fun AddRemoveTagsScreen(
.padding(horizontal = dimensions().spacing16x)
.height(dimensions().groupButtonHeight)
) {
val shouldDisabledSaveButton =
isLoading || addRemoveTagsViewModel.initialTags == addRemoveTagsViewModel.addedTags.collectAsState().value
WirePrimaryButton(
text = stringResource(R.string.save_label),
onClick = {
addRemoveTagsViewModel.updateTags()
},
state = if (isLoading) WireButtonState.Disabled else WireButtonState.Default,
state = if (shouldDisabledSaveButton) WireButtonState.Disabled else WireButtonState.Default,
loading = isLoading,
clickBlockParams = ClickBlockParams(blockWhenSyncing = true, blockWhenConnecting = true),
)
Expand Down Expand Up @@ -188,6 +190,7 @@ fun AddRemoveTagsScreenContent(
errorText = stringResource(R.string.invalid_tag_name_error),
withStartPadding = true
)

else -> WireTextFieldState.Default
},
trailingIcon = {
Expand Down
1 change: 1 addition & 0 deletions ...ures/cells/src/main/java/com/wire/android/feature/cells/ui/tags/AddRemoveTagsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class AddRemoveTagsViewModel @Inject constructor(

private val allTags: MutableStateFlow<Set<String>> = MutableStateFlow(emptySet())

val initialTags: Set<String> = navArgs.tags.toSet()
private val _addedTags: MutableStateFlow<Set<String>> = MutableStateFlow(navArgs.tags.toSet())
internal val addedTags = _addedTags.asStateFlow()

Expand Down