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(@communities): remove totally the toggle for experimental feature 

fixes #6175
This commit is contained in:
Anthony Laibe 2022-06-21 11:00:54 +02:00 committed by Iuri Matias
parent c2555a7650
commit 2112135c6f
2 changed files with 20 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/AppLayouts/Profile/panels/MenuPanel.qml
View File

@ -64,7 +64,8 @@ Column {
onClicked: root.menuItemClicked(model) onClicked: root.menuItemClicked(model)
visible: { visible: {
(model.subsection !== Constants.settingsSubsection.browserSettings && model.subsection !== Constants.settingsSubsection.wallet) || (model.subsection !== Constants.settingsSubsection.browserSettings && model.subsection !== Constants.settingsSubsection.wallet) ||
(model.subsection === Constants.settingsSubsection.browserSettings && root.browserMenuItemEnabled) || (model.subsection === Constants.settingsSubsection.browserSettings && root.browserMenuItemEnabled) ||
(model.subsection === Constants.settingsSubsection.communitiesSettings) ||
(model.subsection === Constants.settingsSubsection.wallet && root.walletMenuItemEnabled) (model.subsection === Constants.settingsSubsection.wallet && root.walletMenuItemEnabled)
} }
badge.value: { badge.value: {

69
ui/imports/shared/views/chat/InvitationBubbleView.qml
View File

@ -51,30 +51,6 @@ Item {
} }
} }
Component {
id: confirmationPopupComponent
ConfirmationDialog {
property string settingsProp: ""
property var onConfirmed: (function(){})
showCancelButton: true
//% "This feature is experimental and is meant for testing purposes by core contributors and the community. It's not meant for real use and makes no claims of security or integrity of funds or data. Use at your own risk."
confirmationText: qsTrId("this-feature-is-experimental-and-is-meant-for-testing-purposes-by-core-contributors-and-the-community--it-s-not-meant-for-real-use-and-makes-no-claims-of-security-or-integrity-of-funds-or-data--use-at-your-own-risk-")
//% "I understand"
confirmButtonLabel: qsTrId("i-understand")
onConfirmButtonClicked: {
onConfirmed()
close()
}
onCancelButtonClicked: {
close()
}
onClosed: {
destroy()
}
}
}
Component { Component {
id: communityIntroDialog id: communityIntroDialog
@ -291,36 +267,27 @@ Item {
enabled: true enabled: true
text: qsTr("Unsupported state") text: qsTr("Unsupported state")
onClicked: { onClicked: {
let error
let onBtnClick = function(){ if (rectangleBubble.state === "joined") {
let error root.store.setActiveCommunity(communityId);
return
if (rectangleBubble.state === "joined") { }
root.store.setActiveCommunity(communityId); if (rectangleBubble.state === "unjoined") {
return Global.openPopup(communityIntroDialog, { joinMethod: () => {
} let error = root.store.joinCommunity(communityId)
if (rectangleBubble.state === "unjoined") { if (error) joiningError.showError(error)
Global.openPopup(communityIntroDialog, { joinMethod: () => { } });
let error = root.store.joinCommunity(communityId) }
if (error) joiningError.showError(error) else if (rectangleBubble.state === "requestToJoin") {
} }); Global.openPopup(communityIntroDialog, { joinMethod: () => {
} let error = root.store.requestToJoinCommunity(communityId, userProfile.name)
else if (rectangleBubble.state === "requestToJoin") { if (error) joiningError.showError(error)
Global.openPopup(communityIntroDialog, { joinMethod: () => { else rectangleBubble.isPendingRequest = root.store.isCommunityRequestPending(communityId)
let error = root.store.requestToJoinCommunity(communityId, userProfile.name) } });
if (error) joiningError.showError(error)
else rectangleBubble.isPendingRequest = root.store.isCommunityRequestPending(communityId)
} });
}
if (error) joiningError.showError(error)
} }
if (localAccountSensitiveSettings.communitiesEnabled) { if (error) joiningError.showError(error)
onBtnClick();
} else {
Global.openPopup(confirmationPopupComponent, { onConfirmed: onBtnClick });
}
} }
MessageDialog { MessageDialog {