chore: Unblock button is no longer visible when we block someone (WPB-2427) #2012

ohassine · 2023-07-26T11:56:47Z

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?

Issues

In other profile screen, unblock button is no longer visible when block someone. We see "Open Conversation" instead

Causes (Optional)

Main Cause: The state in ConnectionActionButtonViewModelImpl is not being updating when the user is blocked.

The state is initialised on viewModel creation by getting passed params and then it will never be updated.
This happens because we already have an instance of the viewModel and the system won't create another one after recomposition. Therefore we will use the same state all the time.

Solutions

Since the connectionState is not something specific to ConnectionActionButtonViewModel, and it's already managed in OtherUserProfileScreenViewModel. I removed it from ConnectionActionButtonViewModel to be handled in one place.

Dependencies (Optional)

If there are some other pull requests related to this one (e.g. new releases of frameworks), specify them here.

Needs releases with:

GitHub link to other pull request

Testing

Test Coverage (Optional)

I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)

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

https://sparkbox.com/foundry/semantic_commit_messages
https://github.com/wireapp/.github#usage
E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

…king_someone

codecov · 2023-07-26T12:07:50Z

Codecov Report

Merging #2012 (07094be) into develop (35bc54c) will increase coverage by 0.09%.
Report is 2 commits behind head on develop.
The diff coverage is 68.75%.

@@              Coverage Diff              @@
##             develop    #2012      +/-   ##
=============================================
+ Coverage      38.54%   38.64%   +0.09%     
  Complexity       895      895              
=============================================
  Files            287      287              
  Lines          11347    11345       -2     
  Branches        1460     1460              
=============================================
+ Hits            4374     4384      +10     
+ Misses          6545     6536       -9     
+ Partials         428      425       -3

Files Changed	Coverage Δ
...d/ui/connection/ConnectionActionButtonViewModel.kt	`74.00% <66.66%> (+11.62%)`	⬆️
...n/kotlin/com/wire/android/model/ActionableState.kt	`100.00% <100.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 35bc54c...07094be. Read the comment docs.

github-actions · 2023-07-26T12:14:44Z

Test Results

516 tests +3 515 ✔️ +3 26s ⏱️ +5s
  74 suites ±0     1 💤 ±0
  74 files ±0     0 ❌ ±0

Results for commit 07094be. ± Comparison against base commit 35bc54c.

This pull request removes 5 and adds 8 tests. Note that renamed tests count towards both.

com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given a userId, when accepting a connection request, then returns a Success result and update view state()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given a userId, when canceling a connection request, then returns a Success result and update view state()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given a userId, when ignoring a connection request, then returns a Success result and update view state()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given a userId, when sending a connection request a fails, then returns a Failure result and show error message()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given a userId, when sending a connection request, then returns a Success result and update view state()

com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given a failure, when sending a connection request, then emit failure message()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given failure, when accepting a connection request, then emit failure message()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given failure, when canceling a connection request, then emit failure message()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given failure, when ignoring a connection request, then emit error message()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given success, when accepting a connection request, then emit success message()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given success, when canceling a connection request, then emit success message()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given success, when ignoring a connection request, then navigate back()
com.wire.android.ui.connection.ConnectionActionButtonViewModelTest ‑ given success, when sending a connection request, then emit success message()

♻️ This comment has been updated with latest results.

github-actions · 2023-07-26T12:14:46Z

APKs built during tests are available here. Scroll down to Artifacts!

AndroidBob · 2023-07-26T12:45:48Z

Build 701 succeeded.

The build produced the following APK's:

com.wire.android-v4.4.0(7140742)(7140742)-staging-compat.apk

alexandreferris

Nice! Just have some tiny suggestions if they make sense 🤔

app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt

…ctionButtonViewModel.kt Co-authored-by: Alexandre Ferris <[email protected]>

github-actions · 2023-07-26T13:58:08Z

APKs built during tests are available here. Scroll down to Artifacts!

AndroidBob · 2023-07-26T14:23:49Z

Build 707 succeeded.

The build produced the following APK's:

com.wire.android-v4.4.0(7141321)(7141321)-staging-compat.apk

…-2427) (#2012) Co-authored-by: Alexandre Ferris <[email protected]>

chore: remove connection state from ConnectionActionButtonViewModel

ba38367

pull-request-size bot added the size/L label Jul 26, 2023

Merge branch 'develop' into fix_unblock_button_not_visible_after_bloc…

bf5d788

…king_someone

github-actions bot assigned ohassine Jul 26, 2023

ohassine requested review from Garzas, a team, typfel, gongracr, MohamadJaara and vitorhugods and removed request for a team July 26, 2023 12:40

alexandreferris approved these changes Jul 26, 2023

View reviewed changes

ohassine and others added 4 commits July 26, 2023 15:38

Update app/src/main/kotlin/com/wire/android/ui/connection/ConnectionA…

6ecef43

…ctionButtonViewModel.kt Co-authored-by: Alexandre Ferris <[email protected]>

Update app/src/main/kotlin/com/wire/android/ui/connection/ConnectionA…

699bccf

…ctionButtonViewModel.kt Co-authored-by: Alexandre Ferris <[email protected]>

Update app/src/main/kotlin/com/wire/android/ui/connection/ConnectionA…

91babf8

…ctionButtonViewModel.kt Co-authored-by: Alexandre Ferris <[email protected]>

Update app/src/main/kotlin/com/wire/android/ui/connection/ConnectionA…

07094be

…ctionButtonViewModel.kt Co-authored-by: Alexandre Ferris <[email protected]>

MohamadJaara approved these changes Jul 26, 2023

View reviewed changes

MohamadJaara added this pull request to the merge queue Jul 26, 2023

Merged via the queue into develop with commit 8232380 Jul 26, 2023
10 checks passed

MohamadJaara deleted the fix_unblock_button_not_visible_after_blocking_someone branch July 26, 2023 14:39

ohassine mentioned this pull request Jul 31, 2023

fix: show unblock user confirmation dialog (WPB-2427) #2028

Merged

8 tasks

ohassine added a commit that referenced this pull request Aug 18, 2023

chore: Unblock button is no longer visible when we block someone (WPB…

6c4ff0b

…-2427) (#2012) Co-authored-by: Alexandre Ferris <[email protected]>

ohassine mentioned this pull request Aug 18, 2023

fix(cherry-pick): Unblock button is no longer visible when we block someone (WPB-2427) (RC) #2113

Merged

8 tasks

github-actions bot mentioned this pull request Aug 18, 2023

fix(cherry-pick): Unblock button is no longer visible when we block someone (WPB-2427) (RC) #2115

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Unblock button is no longer visible when we block someone (WPB-2427) #2012

chore: Unblock button is no longer visible when we block someone (WPB-2427) #2012

ohassine commented Jul 26, 2023 •

edited

Loading

codecov bot commented Jul 26, 2023 •

edited

Loading

github-actions bot commented Jul 26, 2023 •

edited

Loading

github-actions bot commented Jul 26, 2023

AndroidBob commented Jul 26, 2023

alexandreferris left a comment

github-actions bot commented Jul 26, 2023

AndroidBob commented Jul 26, 2023

chore: Unblock button is no longer visible when we block someone (WPB-2427) #2012

chore: Unblock button is no longer visible when we block someone (WPB-2427) #2012

Conversation

ohassine commented Jul 26, 2023 • edited Loading

PR Submission Checklist for internal contributors

What's new in this PR?

Issues

Causes (Optional)

Solutions

Dependencies (Optional)

Testing

Test Coverage (Optional)

How to Test

Notes (Optional)

Attachments (Optional)

PR Post Submission Checklist for internal contributors (Optional)

PR Post Merge Checklist for internal contributors

References

codecov bot commented Jul 26, 2023 • edited Loading

Codecov Report

github-actions bot commented Jul 26, 2023 • edited Loading

Test Results

github-actions bot commented Jul 26, 2023

AndroidBob commented Jul 26, 2023

alexandreferris left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 26, 2023

AndroidBob commented Jul 26, 2023

ohassine commented Jul 26, 2023 •

edited

Loading

codecov bot commented Jul 26, 2023 •

edited

Loading

github-actions bot commented Jul 26, 2023 •

edited

Loading