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

runfix: reinstate missing commits lost in conflict resolution #17803

Merged
merged 2 commits into from
Jul 22, 2024

Conversation

V-Gira
Copy link
Contributor

@V-Gira V-Gira commented Jul 22, 2024

Description

Conflict resolution for reverting changes to the minimized call ui here #17696 reverted some previous changes by mistake

Two of those were reinstated here #17763 and here #17777

this restores #17683 and #17685

V-Gira and others added 2 commits July 22, 2024 12:26
* runfix: prevent empty state when all conversations are archived (WPB-9483)

* runfix: filter out archived conversations from group and 1on1 tab (WPB-9768)
Copy link

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 46.26%. Comparing base (78f4956) to head (15bc746).

Additional details and impacted files
@@            Coverage Diff             @@
##              dev   #17803      +/-   ##
==========================================
- Coverage   46.26%   46.26%   -0.01%     
==========================================
  Files         770      770              
  Lines       25157    25157              
  Branches     5751     5751              
==========================================
- Hits        11639    11638       -1     
  Misses      12046    12046              
- Partials     1472     1473       +1     

@V-Gira V-Gira marked this pull request as ready for review July 22, 2024 10:57
@V-Gira V-Gira requested review from otto-the-bot and a team as code owners July 22, 2024 10:57
@V-Gira V-Gira changed the title chore: reinstate missing commits fix: reinstate missing commits Jul 22, 2024
@V-Gira V-Gira changed the title fix: reinstate missing commits fix: reinstate missing commits lost in conflict resolution Jul 22, 2024
@V-Gira V-Gira changed the title fix: reinstate missing commits lost in conflict resolution frunix: reinstate missing commits lost in conflict resolution Jul 22, 2024
@V-Gira V-Gira changed the title frunix: reinstate missing commits lost in conflict resolution runfix: reinstate missing commits lost in conflict resolution Jul 22, 2024
@V-Gira V-Gira merged commit 144c79f into dev Jul 22, 2024
21 checks passed
@V-Gira V-Gira deleted the v/missing-commits branch July 22, 2024 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants