fix(contacts): remove isContact, use isMutualContact or isAdded indead #6375
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
jrainville
requested review from
a team,
iurimatias,
noeliaSD,
Hbouaz and
osmaczko
and removed request for
a team and
iurimatias
jrainville
force-pushed
the
fix/contact-mutual
branch
from
e6cbe97
to
ee217af
Compare
osmaczko
requested changes
Jul 7, 2022
| @@ -32,7 +32,7 @@ type | |||
| colorId: int | |||
| colorHash: string | |||
| onlineStatus: OnlineStatus | |||
| isContact: bool | |||
| isMutualContact: bool | |||
There was a problem hiding this comment.
Suggested change
| isMutualContact: bool | |
| isContact: bool |
| @@ -12,7 +12,7 @@ type | |||
| ColorId | |||
| ColorHash | |||
| OnlineStatus | |||
| IsContact | |||
| IsMutualContact | |||
There was a problem hiding this comment.
Suggested change
| IsMutualContact | |
| IsContact |
| @@ -12,7 +12,7 @@ Item { | |||
| width: parent.width | |||
| height: childrenRect.height | |||
|
|
|||
| property bool isContact | |||
| property bool isContactAdded | |||
There was a problem hiding this comment.
Suggested change
| property bool isContactAdded | |
| property bool isUserAdded |
| @@ -55,7 +55,7 @@ Item { | |||
| property Timer timer: Timer { } | |||
| property var userList | |||
| property var contactDetails: Utils.getContactDetailsAsJson(root.activeChatId) | |||
| property bool isContact: root.contactDetails.isContact | |||
| property bool isContactAdded: root.contactDetails.isAdded | |||
There was a problem hiding this comment.
Suggested change
| property bool isContactAdded: root.contactDetails.isAdded | |
| property bool isUserAdded: root.userDetails.isAdded |
| @@ -177,7 +177,7 @@ StatusAppThreePanelLayout { | |||
| confirmationText: qsTr("Are you sure you want to remove this contact?") | |||
| onConfirmButtonClicked: { | |||
| let pk = chatColumn.contactToRemove | |||
| if (Utils.getContactDetailsAsJson(pk).isContact) { | |||
| if (Utils.getContactDetailsAsJson(pk).isAdded) { | |||
There was a problem hiding this comment.
(not required)
Suggested change
| if (Utils.getContactDetailsAsJson(pk).isAdded) { | |
| if (Utils.getUserDetailsAsJson(pk).isAdded) { |
we should probably create a separate task to fix status-desktup codebase naming in regards to contact vs user
jrainville
force-pushed
the
fix/contact-mutual
branch
from
ee217af
to
bb4fc3e
Compare
10 tasks
|
@osmaczko updated. |
Jenkins Builds
|
Great, thank you.
Of course, I haven't expected anything else! -> "we should probably create a separate task to fix status-desktup codebase naming in regards to contact vs user" |
osmaczko
approved these changes
Jul 8, 2022
elina2015
approved these changes
Jul 9, 2022
noeliaSD
approved these changes
Jul 11, 2022
Fixes #6220 Fixes the issue with the mutual contact icon showing when just added. It also does a huge cleanup of the codebase to remove isContact and replace it with either isAdded, when we care only about if we added, or isMutualContact if we want the contact to be mutual Also fixes an issue with the MessageContextMenu not reflecting the added state correctly.
jrainville
force-pushed
the
fix/contact-mutual
branch
from
bb4fc3e
to
715ea1c
Compare
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.
Fixes #6220
Fixes the issue with the mutual contact icon showing when just added.
It also does a huge cleanup of the codebase to remove isContact and replace it with either isAdded, when we care only about if we added, or isMutualContact if we want the contact to be mutual
Also fixes an issue with the MessageContextMenu not reflecting the added state correctly.
Asking for QA testing on this one, since it touches contacts all over the app. I made sure to double check my changes to make sure to use isAdded and isMutualContact appropriately, but the reason why I did this change is because
isContactwas used in both contexts, so it was confusing.Anyway, all that to say, make sure the contact list, states and other interactions still work as expected.