From 6175beb40a20211301384816cdf069f7d421ed30 Mon Sep 17 00:00:00 2001 From: Boris Melnik Date: Fri, 21 Oct 2022 14:27:08 +0300 Subject: [PATCH] feat(Communities): Add checking access type in Welcome modal Part of: #7072 --- ui/app/AppLayouts/Chat/views/CommunityColumnView.qml | 1 + ui/imports/shared/popups/CommunityIntroDialog.qml | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml b/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml index 8710278859..a12820ba96 100644 --- a/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml +++ b/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml @@ -133,6 +133,7 @@ Item { name: communityData.name introMessage: communityData.introMessage imageSrc: communityData.image + accessType: communityData.access onJoined: root.store.requestToJoinCommunity(communityData.id, root.store.userProfileInst.name) } diff --git a/ui/imports/shared/popups/CommunityIntroDialog.qml b/ui/imports/shared/popups/CommunityIntroDialog.qml index 32048c743c..16aa588fac 100644 --- a/ui/imports/shared/popups/CommunityIntroDialog.qml +++ b/ui/imports/shared/popups/CommunityIntroDialog.qml @@ -3,6 +3,8 @@ import QtQuick.Controls 2.14 import QtQuick.Layouts 1.1 import QtQml.Models 2.14 +import utils 1.0 + import StatusQ.Core 0.1 import StatusQ.Core.Theme 0.1 import StatusQ.Controls 0.1 @@ -14,6 +16,7 @@ StatusDialog { property string name property string introMessage + property int accessType property url imageSrc signal joined @@ -23,7 +26,9 @@ StatusDialog { footer: StatusDialogFooter { rightButtons: ObjectModel { StatusButton { - text: qsTr("Join %1").arg(root.name) + text: root.accessType === Constants.communityChatOnRequestAccess + ? qsTr("Request to join %1").arg(root.name) + : qsTr("Join %1").arg(root.name) enabled: checkBox.checked onClicked: { root.joined()