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.

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: Remove Reset Session for MLS conversations [WPB-10426] 🍒 🍒 #3309

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 12, 2024

BugWPB-10426 [Android] Hide Reset session button in MLS conversations

This PR was automatically cherry-picked based on the following PR:

Original PR description:


This PR was automatically cherry-picked based on the following PR:

Original PR description:


What's new in this PR?

Issues

When we receive decryption errors in an MLS conversation, we show a “reset session” button.
But this button does not help to reset the session and is useless.

Therefore, we should hide it and not show it to the user.

Causes (Optional)

Nobody think about differences in MLS conversations :)

Solutions

Think about it and remove "Reset Session" btn and text "Try resetting the session ..." text

  • small refactoring in Compose MessageItem to make it bit more readable

@github-actions github-actions bot added cherry-pick PR is cherry-picking changes from another banch size/M labels Aug 12, 2024
Copy link

@borichellow borichellow enabled auto-merge August 13, 2024 09:10
@borichellow borichellow added this pull request to the merge queue Aug 13, 2024
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 92.30769% with 1 line in your changes missing coverage. Please review.

Project coverage is 44.54%. Comparing base (23a615d) to head (8c291de).

Files Patch % Lines
...me/conversations/info/ConversationInfoViewModel.kt 80.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3309      +/-   ##
===========================================
+ Coverage    44.51%   44.54%   +0.02%     
===========================================
  Files          453      453              
  Lines        15335    15341       +6     
  Branches      2560     2560              
===========================================
+ Hits          6827     6833       +6     
  Misses        7791     7791              
  Partials       717      717              
Files Coverage Δ
...me/conversations/info/ConversationInfoViewState.kt 100.00% <100.00%> (ø)
...nversations/messages/item/MessageItemComponents.kt 0.00% <ø> (ø)
...conversations/messages/item/MessageTypesPreview.kt 0.00% <ø> (ø)
.../conversations/messages/item/RegularMessageItem.kt 0.00% <ø> (ø)
...me/conversations/info/ConversationInfoViewModel.kt 81.94% <80.00%> (+0.78%) ⬆️

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 23a615d...8c291de. Read the comment docs.

Copy link
Contributor Author

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

Copy link
Contributor Author

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

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Aug 13, 2024
@MohamadJaara MohamadJaara added this pull request to the merge queue Aug 13, 2024
Merged via the queue into develop with commit 9f7f5c2 Aug 13, 2024
11 of 12 checks passed
@MohamadJaara MohamadJaara deleted the fix/remove_reset_session_for_mls_conversations-cherry-pick-cherry-pick branch August 13, 2024 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick PR is cherry-picking changes from another banch size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants