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: conversation creation conflict backends dialog #1998

Merged
merged 18 commits into from
Jul 26, 2023
Merged

feat: conversation creation conflict backends dialog #1998

merged 18 commits into from
Jul 26, 2023

Conversation

Garzas
Copy link
Contributor

@Garzas Garzas commented Jul 24, 2023

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

We are not handling federation not fully connected graphs error on group creation

Causes (Optional)

We show unknown error

Solutions

Show dialog for this error with options

Attachments (Optional)

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

Before After
Screenshot 2023-07-24 at 16 47 33

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.

@Garzas Garzas self-assigned this Jul 24, 2023
@AndroidBob
Copy link
Collaborator

Build 632 failed.

@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 3f5f8f02c6df626b0dfe8dd8b4386e9c5adcf7fb

Is this intentional?

@github-actions
Copy link
Contributor

github-actions bot commented Jul 25, 2023 •
edited

Test Results

513 tests  +2   512 ✔️ +2   21s ⏱️ -3s
  74 suites ±0       1 💤 ±0 
  74 files   ±0       0 ❌ ±0 

Results for commit a351acf. ± Comparison against base commit e6d21d6.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 3f5f8f02c6df626b0dfe8dd8b4386e9c5adcf7fb

Is this intentional?

@codecov
Copy link

codecov bot commented Jul 25, 2023 •
edited

Codecov Report

Merging #1998 (341cb8e) into develop (e6d21d6) will increase coverage by 0.03%.
The diff coverage is 58.33%.

❗ Current head 341cb8e differs from pull request most recent head a351acf. Consider uploading reports for the commit a351acf to get more accurate results

@@              Coverage Diff              @@
##             develop    #1998      +/-   ##
=============================================
+ Coverage      38.51%   38.55%   +0.03%     
- Complexity       893      895       +2     
=============================================
  Files            287      287              
  Lines          11335    11347      +12     
  Branches        1459     1460       +1     
=============================================
+ Hits            4366     4375       +9     
- Misses          6541     6544       +3     
  Partials         428      428
Files Changed Coverage Δ
...in/kotlin/com/wire/android/util/CoreFailureUtil.kt 0.00% <0.00%> (ø)
...i/home/newconversation/NewConversationViewModel.kt 62.71% <55.55%> (+1.24%) ⬆️
...e/newconversation/groupOptions/GroupOptionState.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 e6d21d6...a351acf. Read the comment docs.

@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 642 succeeded.

The build produced the following APK's:

@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 3f5f8f02c6df626b0dfe8dd8b4386e9c5adcf7fb

Is this intentional?

@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 673 succeeded.

The build produced the following APK's:

@Garzas
added tests
aeb38b2
@Garzas
Merge branch 'feat/conversation-creation-conflict-backends-dialog' of…
cc27b6a 
… github.com:wireapp/wire-android-reloaded into feat/conversation-creation-conflict-backends-dialog
@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc b15e86d1d7d00fa022b0b94d9ce724c9b087d6a5

Is this intentional?

@Garzas Garzas requested a review from ohassine July 26, 2023 08:55
alexandreferris
alexandreferris approved these changes Jul 26, 2023
View reviewed changes
Copy link
Contributor

@alexandreferris alexandreferris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!

I just have a tiny comment but not sure if it is the focus on this PR and if it should be changed here

app/src/main/kotlin/com/wire/android/ui/common/WireDialog.kt Outdated Show resolved Hide resolved
@Garzas Garzas added this pull request to the merge queue Jul 26, 2023
@github-actions
Copy link
Contributor

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

@alexandreferris alexandreferris removed this pull request from the merge queue due to a manual request Jul 26, 2023
@AndroidBob
Copy link
Collaborator

Build 677 succeeded.

The build produced the following APK's:

@Garzas Garzas requested a review from ohassine July 26, 2023 09:35
@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 91dd6d5afaea817fda74f51765ed3b33a7475911

Is this intentional?

@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 91dd6d5afaea817fda74f51765ed3b33a7475911

Is this intentional?

@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 91dd6d5afaea817fda74f51765ed3b33a7475911

Is this intentional?

@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 03057fa341bd02f63c33309afc7074882eda3198

Is this intentional?

@Garzas Garzas enabled auto-merge July 26, 2023 10:23
@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 03057fa341bd02f63c33309afc7074882eda3198

Is this intentional?

1 similar comment
@github-actions
Copy link
Contributor

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc 03057fa341bd02f63c33309afc7074882eda3198

Is this intentional?

@Garzas Garzas added this pull request to the merge queue Jul 26, 2023
@Garzas Garzas removed this pull request from the merge queue due to a manual request Jul 26, 2023
@Garzas Garzas added this pull request to the merge queue Jul 26, 2023
@github-actions
Copy link
Contributor

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

Merged via the queue into develop with commit 476f61c Jul 26, 2023
11 of 12 checks passed
@Garzas Garzas deleted the feat/conversation-creation-conflict-backends-dialog branch July 26, 2023 10:50
@AndroidBob
Copy link
Collaborator

Build 688 succeeded.

The build produced the following APK's:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yamilmedina yamilmedina yamilmedina approved these changes

@alexandreferris alexandreferris alexandreferris approved these changes

@ohassine ohassine ohassine approved these changes

@vitorhugods vitorhugods Awaiting requested review from vitorhugods

@trOnk12 trOnk12 Awaiting requested review from trOnk12

@saleniuk saleniuk Awaiting requested review from saleniuk

Assignees

@Garzas Garzas

Labels
size/L
Projects
None yet
Milestone
No milestone
5 participants
@Garzas @AndroidBob @yamilmedina @alexandreferris @ohassine