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

Jump to bottom

feat: Ask user to confirm canceling team migration (WPB-11268) #3546

Merged
merged 17 commits into from
Oct 24, 2024
Merged

feat: Ask user to confirm canceling team migration (WPB-11268) #3546

merged 17 commits into from
Oct 24, 2024

Conversation

ohassine
Copy link
Member

@ohassine ohassine commented Oct 23, 2024 •
edited by github-actions bot
Loading

StoryWPB-11268 [Android] Start and follow team creation flow for personal users

PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³

  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Description

A follow up PR of #3517

It aims to ask the user to confirm the cancelation of team migration flow by showing a dialog.
The dialog should not be show in step 4, when the migration is done.

Screenshot_20241023_125631

Needs releases with:

  • GitHub link to other pull request

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution
  • [ ]

PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.
References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

@pull-request-size Pull Request Size
Copy link

Ups 🫰🟨

This PR is too big. Please try to break it up into smaller PRs.

@ohassine ohassine changed the title Confirm leave dialog feat: Ask user to confirm canceling team migration Oct 23, 2024
@ohassine ohassine changed the title feat: Ask user to confirm canceling team migration feat: Ask user to confirm canceling team migration (WPB-11268) Oct 23, 2024
@codecov-commenter
Copy link

codecov-commenter commented Oct 23, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 6 lines in your changes missing coverage. Please review.

Project coverage is 45.23%. Comparing base (acf4562) to head (fd72119).

Files with missing lines Patch % Lines
...ui/userprofile/teammigration/TeamMigrationState.kt 0.00% 3 Missing ⚠️
...serprofile/teammigration/TeamMigrationViewModel.kt 0.00% 3 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #3546      +/-   ##
===========================================
- Coverage    45.24%   45.23%   -0.02%     
===========================================
  Files          470      471       +1     
  Lines        15724    15728       +4     
  Branches      2630     2630              
===========================================
  Hits          7114     7114              
- Misses        7863     7867       +4     
  Partials       747      747
Files with missing lines Coverage Δ
...ui/userprofile/teammigration/TeamMigrationState.kt 0.00% <0.00%> (ø)
...serprofile/teammigration/TeamMigrationViewModel.kt 0.00% <0.00%> (ø)

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update acf4562...fd72119. Read the comment docs.

@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-staging-compat-pr-3546.apk is available for download

@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-dev-debug-pr-3546.apk is available for download

@ohassine
Merge remote-tracking branch 'origin/develop' into confirm-leave-dialog
07dd045
@ohassine
Merge remote-tracking branch 'origin/develop' into confirm-leave-dialog
01d6749 
# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/TeamMigrationScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/TeamMigrationViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/step1/TeamMigrationTeamPlanStepScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/step2/TeamMigrationTeamNameStepScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/step3/TeamMigrationConfirmationStepScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/userprofile/teammigration/step4/TeamMigrationDoneStepScreen.kt
#	app/src/main/res/values/strings.xml
@ohassine ohassine requested review from damian-kaczmarek and a team and removed request for a team October 23, 2024 11:50
@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-staging-compat-pr-3546.apk is available for download

@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-dev-debug-pr-3546.apk is available for download

@pull-request-size pull-request-size bot added size/S and removed size/M labels Oct 23, 2024
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-staging-compat-pr-3546.apk is available for download

@github-actions GitHub Actions
Copy link
Contributor

Built wire-android-dev-debug-pr-3546.apk is available for download

@ohassine ohassine added this pull request to the merge queue Oct 24, 2024
Merged via the queue into develop with commit 8700565 Oct 24, 2024
11 of 12 checks passed
@ohassine ohassine deleted the confirm-leave-dialog branch October 24, 2024 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saleniuk saleniuk saleniuk approved these changes

@MohamadJaara MohamadJaara MohamadJaara approved these changes

@damian-kaczmarek damian-kaczmarek Awaiting requested review from damian-kaczmarek

@typfel typfel Awaiting requested review from typfel typfel was automatically assigned from wireapp/android

@alexandreferris alexandreferris Awaiting requested review from alexandreferris alexandreferris was automatically assigned from wireapp/android

Assignees

@ohassine ohassine

Labels
echoes/initiative: personal-users-to-team-users... size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ohassine @codecov-commenter @MohamadJaara @saleniuk