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

fix: use correct connecting copy when a call is trying to establish #2236

Merged
merged 6 commits into from
Sep 15, 2023
Merged

fix: use correct connecting copy when a call is trying to establish #2236

merged 6 commits into from
Sep 15, 2023

Conversation

github-actions[bot]
Copy link
Contributor

Cherry pick from the original PR:

⚠️ Conflicts during cherry-pick:

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

Text was changed in some other PRs

Solutions

Use correct copy

It was displaying
"Decrypting Messages"

Now:
"Connecting…"

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
  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.

@github-actions github-actions bot added the cherry-pick PR is cherry-picking changes from another banch label Sep 14, 2023
@AndroidBob
Copy link
Collaborator

Build 771 failed.

@github-actions
Copy link
Contributor Author

github-actions bot commented Sep 14, 2023 •
edited

Test Results

600 tests  ±0   599 ✔️ ±0   4m 12s ⏱️ - 3m 22s
  85 suites ±0       1 💤 ±0 
  85 files   ±0       0 ❌ ±0 

Results for commit 65e52b0. ± Comparison against base commit 1fa4b42.

♻️ This comment has been updated with latest results.

@AndroidBob
Copy link
Collaborator

Build 780 failed.

@AndroidBob
Copy link
Collaborator

Build 788 failed.

@AndroidBob
Copy link
Collaborator

Build 795 failed.

@ohassine ohassine added this pull request to the merge queue Sep 15, 2023
@github-actions
Copy link
Contributor Author

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

Merged via the queue into develop with commit a7cb96b Sep 15, 2023
13 of 14 checks passed
@ohassine ohassine deleted the connecting_copy-cherry-pick branch September 15, 2023 07:41
@AndroidBob
Copy link
Collaborator

Build 798 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

@alexandreferris alexandreferris alexandreferris approved these changes

@MohamadJaara MohamadJaara MohamadJaara approved these changes

@yamilmedina yamilmedina Awaiting requested review from yamilmedina

@vitorhugods vitorhugods Awaiting requested review from vitorhugods

Assignees

@ohassine ohassine

Labels
cherry-pick PR is cherry-picking changes from another banch size/XS
Projects
None yet
Milestone
No milestone
4 participants
@AndroidBob @alexandreferris @MohamadJaara @ohassine