diff --git a/ui/app/AppLayouts/Profile/stores/ContactsStore.qml b/ui/app/AppLayouts/Profile/stores/ContactsStore.qml index 2834b6bb14..d1bf82dd9b 100644 --- a/ui/app/AppLayouts/Profile/stores/ContactsStore.qml +++ b/ui/app/AppLayouts/Profile/stores/ContactsStore.qml @@ -140,19 +140,21 @@ QtObject { } function getProfileContext(publicKey, isBridgedAccount = false) { const contactDetails = Utils.getContactDetailsAsJson(publicKey, true, true) + const isMe = publicKey === root.myPublicKey + if (!contactDetails) return { - profileType: getProfileType(publicKey, isBridgedAccount, false), + profileType: Utils.getProfileType(isMe, isBridgedAccount, false), trustStatus: Constants.trustStatus.unknown, - contactType: getContactType(Constants.ContactRequestState.None, false), + contactType: Utils.getContactType(Constants.ContactRequestState.None, false), ensVerified: false, onlineStatus: Constants.onlineStatus.unknown, hasLocalNickname: false } const isBlocked = contactDetails.isBlocked - const profileType = getProfileType(publicKey, isBridgedAccount, isBlocked) - const contactType = getContactType(contactDetails.contactRequestState, contactDetails.isContact) + const profileType = Utils.getProfileType(isMe, isBridgedAccount, isBlocked) + const contactType = Utils.getContactType(contactDetails.contactRequestState, contactDetails.isContact) const trustStatus = contactDetails.trustStatus const ensVerified = contactDetails.ensVerified const onlineStatus = contactDetails.onlineStatus @@ -160,26 +162,4 @@ QtObject { return { profileType, trustStatus, contactType, ensVerified, onlineStatus, hasLocalNickname } } - - function getProfileType(publicKey, isBridgedAccount, isBlocked) { - if (publicKey === root.myPublicKey) - return Constants.profileType.self - if (isBridgedAccount) - return Constants.profileType.bridged - - return isBlocked ? Constants.profileType.blocked - : Constants.profileType.regular - } - - function getContactType(contactRequestState, isContact) { - switch (contactRequestState) { - case Constants.ContactRequestState.Received: - return Constants.contactType.contactRequestReceived - case Constants.ContactRequestState.Sent: - return Constants.contactType.contactRequestSent - } - - return isContact ? Constants.contactType.contact - : Constants.contactType.nonContact - } } diff --git a/ui/imports/utils/Utils.qml b/ui/imports/utils/Utils.qml index cf0d33bbf1..1c26cb7a19 100644 --- a/ui/imports/utils/Utils.qml +++ b/ui/imports/utils/Utils.qml @@ -700,6 +700,28 @@ QtObject { xhr.send(); } + function getProfileType(isMe, isBridgedAccount, isBlocked) { + if (isMe) + return Constants.profileType.self + if (isBridgedAccount) + return Constants.profileType.bridged + + return isBlocked ? Constants.profileType.blocked + : Constants.profileType.regular + } + + function getContactType(contactRequestState, isContact) { + switch (contactRequestState) { + case Constants.ContactRequestState.Received: + return Constants.contactType.contactRequestReceived + case Constants.ContactRequestState.Sent: + return Constants.contactType.contactRequestSent + } + + return isContact ? Constants.contactType.contact + : Constants.contactType.nonContact + } + // BACKEND DEPENDENT PART // // Methods and properties below are intended to be refactored in various