Fix mutual state update messages #11178
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jenkins BuildsClick to see older builds (132)
|
MishkaRogachev
force-pushed
the
fix/issue-11121-mutual-state-messages
branch
2 times, most recently
from
16fc8ad to
d140267
Compare
MishkaRogachev
force-pushed
the
fix/issue-11121-mutual-state-messages
branch
from
d140267 to
95a55db
Compare
MishkaRogachev
force-pushed
the
fix/issue-11121-mutual-state-messages
branch
10 times, most recently
from
9c1b144 to
24feafc
Compare
5 tasks
jrainville
reviewed
Jul 10, 2023
MishkaRogachev
force-pushed
the
fix/issue-11121-mutual-state-messages
branch
3 times, most recently
from
8979343 to
56b6634
Compare
MishkaRogachev
commented
Jul 11, 2023
| @@ -19,7 +19,9 @@ type | |||
| ContactIdentityVerification = 13 | |||
| # Local only | |||
| SystemMessagePinnedMessage = 14 | |||
| SystemMessageMutualStateUpdate = 15 | |||
| SystemMessageMutualEventSent = 15 | |||
There was a problem hiding this comment.
Different message types needed by mobile, see status-im/status-mobile#16254
MishkaRogachev
force-pushed
the
fix/issue-11121-mutual-state-messages
branch
3 times, most recently
from
f24297e to
689814f
Compare
MishkaRogachev
force-pushed
the
fix/issue-11121-mutual-state-messages
branch
2 times, most recently
from
9d6376f to
f98aa93
Compare
jrainville
approved these changes
Jul 12, 2023
igor-sirotin
approved these changes
Jul 12, 2023
| qsTr("%1 sent you a contact request").arg(displayName) | ||
| case Constants.messageContentType.systemMessageMutualEventAccepted: | ||
| return root.amISender ? | ||
| qsTr("You accepted %1's contact request").arg(displayName) : |
There was a problem hiding this comment.
Not sure if localisation will work in the right way for %1's.
cc @caybro
There was a problem hiding this comment.
I believe arg() is applied after qsTr(), so any translation containing %1 should work, like Přijali jste žádost o kontakt od %1
MishkaRogachev
force-pushed
the
fix/issue-11121-mutual-state-messages
branch
from
f98aa93 to
c2c6116
Compare
This was referenced Jul 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Close #11121
Requires status-im/status-go#3640
See the desired flow in the status-go PR
What does the PR do
addedmessages toaccepted@from system messagesAffected areas
Chat, Contacts, ActivityCenter
Screenshot of functionality (including design for comparison)