diff --git a/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml b/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml index fbd1662672..4a7c3698d0 100644 --- a/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml +++ b/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml @@ -81,7 +81,7 @@ Item { parent.font.underline = false } onClicked: { - inviteFriendsPopup.open(); + Global.openPopup(inviteFriendsPopup) } } } @@ -95,8 +95,11 @@ Item { anchors.top: links.bottom } - InviteFriendsPopup { + Component { id: inviteFriendsPopup - rootStore: element.rootStore + InviteFriendsPopup { + rootStore: element.rootStore + destroyOnClose: true + } } } diff --git a/ui/imports/shared/popups/InviteFriendsPopup.qml b/ui/imports/shared/popups/InviteFriendsPopup.qml index 6ca17fc9da..283c75429e 100644 --- a/ui/imports/shared/popups/InviteFriendsPopup.qml +++ b/ui/imports/shared/popups/InviteFriendsPopup.qml @@ -4,9 +4,6 @@ import utils 1.0 StatusModal { id: root - anchors.centerIn: parent - - readonly property string getStatusText: qsTr("Get Status at https://status.im") property var rootStore @@ -14,11 +11,11 @@ StatusModal { height: 156 StatusDescriptionListItem { - subTitle: root.getStatusText - tooltip.text: qsTr("Copy to clipboard") + subTitle: qsTr("Get Status at %1").arg(Constants.externalStatusLinkWithHttps) + tooltip.text: qsTr("Copied!") asset.name: "copy" iconButton.onClicked: { - root.rootStore.copyToClipboard(Constants.statusLinkPrefix) + root.rootStore.copyToClipboard(Constants.downloadLink) tooltip.visible = !tooltip.visible } width: parent.width diff --git a/ui/imports/shared/views/NoFriendsRectangle.qml b/ui/imports/shared/views/NoFriendsRectangle.qml index 24465a5a5e..f9fc5647ba 100644 --- a/ui/imports/shared/views/NoFriendsRectangle.qml +++ b/ui/imports/shared/views/NoFriendsRectangle.qml @@ -41,6 +41,7 @@ Item { id: inviteFriendsPopup InviteFriendsPopup { rootStore: noContactsRect.rootStore + destroyOnClose: true } } } diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml index d5153e402e..f5da1530ba 100644 --- a/ui/imports/utils/Constants.qml +++ b/ui/imports/utils/Constants.qml @@ -922,6 +922,7 @@ QtObject { readonly property string userLinkPrefix: externalStatusLinkWithHttps + '/u/' readonly property string statusLinkPrefix: 'https://status.im/' readonly property string statusHelpLinkPrefix: `https://status.app/help/` + readonly property string downloadLink: "https://status.im/get" readonly property int maxUploadFiles: 5 readonly property double maxUploadFilesizeMB: 10