Skip to content
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

fix: allowing empty team name when migrating [WPB-15092] 🍒 #3764

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: allowing empty team name when migrating [WPB-15092] 🍒 #3764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d645852
fix: allowing empty team name when migrating [WPB-15092] (#3763)
saleniuk Dec 20, 2024
002ce0d
trigger build
saleniuk Dec 20, 2024
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
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/TeamMigrationViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class TeamMigrationViewModel @Inject constructor(
fun migrateFromPersonalToTeamAccount(onSuccess: () -> Unit) {
viewModelScope.launch {
migrateFromPersonalToTeam.invoke(
teamMigrationState.teamNameTextState.text.toString(),
teamMigrationState.teamNameTextState.text.trim().toString(),
).let { result ->
when (result) {
is MigrateFromPersonalToTeamResult.Success -> {
Expand Down
2 changes: 1 addition & 1 deletion ...in/com/wire/android/ui/userprofile/teammigration/step2/TeamMigrationTeamNameStepScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private fun TeamMigrationTeamNameStepScreenContent(
textFieldState = teamNameTextFieldState,
)
}
val isContinueButtonEnabled = teamNameTextFieldState.text.isNotEmpty()
val isContinueButtonEnabled = teamNameTextFieldState.text.isNotEmpty() && teamNameTextFieldState.text.isNotBlank()
BottomLineButtons(
isContinueButtonEnabled = isContinueButtonEnabled,
onContinue = onContinueButtonClicked,
Expand Down
16 changes: 16 additions & 0 deletions ...c/test/kotlin/com/wire/android/ui/userprofile/teammigration/TeamMigrationViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,22 @@ class TeamMigrationViewModelTest {
Assertions.assertNull(viewModel.teamMigrationState.migrationFailure)
}

@Test
fun `given team name with spaces at start or end, when invoking migration, then trim the name`() = runTest {
// given
val (arrangement, viewModel) = Arrangement()
.withMigrateFromPersonalToTeamSuccess()
.arrange()
val onSuccess = {}
viewModel.teamMigrationState.teamNameTextState.setTextAndPlaceCursorAtEnd(" ${Arrangement.TEAM_NAME} ")
// when
viewModel.migrateFromPersonalToTeamAccount(onSuccess)
// then
coVerify(exactly = 1) {
arrangement.migrateFromPersonalToTeam(Arrangement.TEAM_NAME)
}
}

private class Arrangement {

@MockK
Expand Down
Loading