status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix signals not passing the callback 

Fixes #8038

We added a callback arg to the signals, but signals do not support default args. You need to pass the exact number of args.
This commit is contained in:
Jonathan Rainville 2022-10-25 13:15:44 -04:00 committed by Lukáš Tinkl
parent cea4945cba
commit afaf7717e8
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/AppLayouts/Chat/panels/communities/CommunityWelcomeBannerPanel.qml
View File

@ -89,7 +89,8 @@ Rectangle {
anchors.topMargin: Style.current.padding
onClicked: {
Global.openInviteFriendsToCommunityPopup(root.activeCommunity,
root.communitySectionModule)
root.communitySectionModule,
null)
}
}

6
ui/app/AppLayouts/Chat/views/CommunityColumnView.qml
View File

@ -192,7 +192,8 @@ Item {
enabled: communityData.canManageUsers && adminPopupMenu.showInviteButton
onTriggered: {
Global.openInviteFriendsToCommunityPopup(root.communityData,
root.communitySectionModule)
root.communitySectionModule,
null)
}
}
}
@ -267,7 +268,8 @@ Item {
enabled: communityData.canManageUsers
onTriggered: {
Global.openInviteFriendsToCommunityPopup(root.communityData,
root.communitySectionModule)
root.communitySectionModule,
null)
}
}
}

3
ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml
View File

@ -209,7 +209,8 @@ StatusSectionLayout {
onInviteNewPeopleClicked: {
Global.openInviteFriendsToCommunityPopup(root.community,
root.chatCommunitySectionModule)
root.chatCommunitySectionModule,
null)
}
onAirdropTokensClicked: { /* TODO in future */ }

3
ui/app/AppLayouts/Profile/views/CommunitiesView.qml
View File

@ -69,7 +69,8 @@ SettingsContentBase {
onInviteFriends: {
Global.openInviteFriendsToCommunityPopup(communityData,
root.profileSectionStore.communitiesProfileModule)
root.profileSectionStore.communitiesProfileModule,
null)
}
}

2
ui/app/AppLayouts/Profile/views/ContactsView.qml
View File

@ -207,7 +207,7 @@ SettingsContentBase {
}
onShowVerificationRequest: {
Global.openIncomingIDRequestPopup(publicKey)
Global.openIncomingIDRequestPopup(publicKey, null)
}
}

3
ui/app/mainui/AppMain.qml
View File

@ -383,7 +383,8 @@ Item {
enabled: model.canManageUsers
onTriggered: {
Global.openInviteFriendsToCommunityPopup(model,
communityContextMenu.chatCommunitySectionModule)
communityContextMenu.chatCommunitySectionModule,
null)
}
}

12
ui/imports/shared/views/chat/MessageContextMenuView.qml
View File

@ -61,7 +61,7 @@ StatusPopupMenu {
readonly property bool isContact: {
return root.selectedUserPublicKey !== "" && !!contactDetails.isContact
}
readonly property bool isBlockedContact: !!d.contactDetails && d.contactDetails.isBlocked
readonly property bool isBlockedContact: (!!d.contactDetails && d.contactDetails.isBlocked) || false
readonly property int outgoingVerificationStatus: {
if (root.selectedUserPublicKey === "" || root.isMe || !root.isContact) {
@ -197,7 +197,7 @@ StatusPopupMenu {
: Constants.trustStatus.unknown
isContact: root.isContact
isCurrentUser: root.isMe
userIsEnsVerified: !!d.contactDetails && d.contactDetails.ensVerified
userIsEnsVerified: (!!d.contactDetails && d.contactDetails.ensVerified) || false
}
Item {
@ -256,7 +256,7 @@ StatusPopupMenu {
enabled: root.isProfile && !root.isMe && !root.isContact
&& !root.isBlockedContact && !root.hasPendingContactRequest
onTriggered: {
Global.openContactRequestPopup(root.selectedUserPublicKey)
Global.openContactRequestPopup(root.selectedUserPublicKey, null)
root.close()
}
}
@ -269,7 +269,7 @@ StatusPopupMenu {
&& root.outgoingVerificationStatus === Constants.verificationStatus.unverified
&& !root.hasReceivedVerificationRequestFrom
onTriggered: {
Global.openSendIDRequestPopup(root.selectedUserPublicKey)
Global.openSendIDRequestPopup(root.selectedUserPublicKey, null)
root.close()
}
}
@ -286,9 +286,9 @@ StatusPopupMenu {
|| root.isVerificationRequestSent)
onTriggered: {
if (hasReceivedVerificationRequestFrom) {
Global.openIncomingIDRequestPopup(root.selectedUserPublicKey)
Global.openIncomingIDRequestPopup(root.selectedUserPublicKey, null)
} else if (root.isVerificationRequestSent) {
Global.openOutgoingIDRequestPopup(root.selectedUserPublicKey)
Global.openOutgoingIDRequestPopup(root.selectedUserPublicKey, null)
}
root.close()