From ac54a70c4e9bcba9ae47e98072033c1d836c9cdd Mon Sep 17 00:00:00 2001 From: Godfrain Jacques Date: Fri, 10 May 2024 08:57:06 -0700 Subject: [PATCH] fix: Permission created before making device a control node is not getting active (#14537) * chore: bump status-go * fix: mitigate permissions stuck in pending on control node promotion This PR fixes #14023 UI does NOT allow promoting to control node is no Owner token is present --- .../Communities/panels/OverviewSettingsFooter.qml | 2 ++ .../Communities/panels/OverviewSettingsPanel.qml | 8 +++++--- vendor/status-go | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ui/app/AppLayouts/Communities/panels/OverviewSettingsFooter.qml b/ui/app/AppLayouts/Communities/panels/OverviewSettingsFooter.qml index 1d9b67e5a4..08e08010c8 100644 --- a/ui/app/AppLayouts/Communities/panels/OverviewSettingsFooter.qml +++ b/ui/app/AppLayouts/Communities/panels/OverviewSettingsFooter.qml @@ -13,6 +13,7 @@ import utils 1.0 Control { id: root + property bool isPromoteSelfToControlNodeEnabled: false property bool isControlNode: true property string communityName: "" property string communityColor: "" @@ -45,6 +46,7 @@ Control { id: mainGrid columnSpacing: 16 rowSpacing: 16 + visible: root.isPromoteSelfToControlNodeEnabled StatusRoundIcon { id: icon diff --git a/ui/app/AppLayouts/Communities/panels/OverviewSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/OverviewSettingsPanel.qml index 92f54d6380..5aee7c151c 100644 --- a/ui/app/AppLayouts/Communities/panels/OverviewSettingsPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/OverviewSettingsPanel.qml @@ -58,6 +58,8 @@ StackLayout { property string pubsubTopic property string pubsubTopicKey + property bool isTokenDeployed: !!root.ownerToken && root.ownerToken.deployState === Constants.ContractTransactionStatus.Completed + // Community transfer ownership related props: required property bool isPendingOwnershipRequest signal finaliseOwnershipClicked @@ -198,9 +200,10 @@ StackLayout { communityColor: root.color isControlNode: root.isControlNode isPendingOwnershipRequest: root.isPendingOwnershipRequest + isPromoteSelfToControlNodeEnabled: root.isControlNode || root.isTokenDeployed onExportControlNodeClicked:{ - if(!!root.ownerToken && root.ownerToken.deployState === Constants.ContractTransactionStatus.Completed) { + if(root.isTokenDeployed) { root.exportControlNodeClicked() } else { Global.openPopup(transferOwnershipAlertPopup, { mode: TransferOwnershipAlertPopup.Mode.MoveControlNode }) @@ -208,8 +211,7 @@ StackLayout { } onImportControlNodeClicked: root.importControlNodeClicked() onFinaliseOwnershipTransferClicked: root.finaliseOwnershipClicked() - //TODO update once the domain changes - onLearnMoreClicked: Global.openLink(Constants.statusHelpLinkPrefix + "status-communities/about-the-control-node-in-status-communities") + onLearnMoreClicked: Global.openLink(Constants.statusHelpLinkPrefix + "communities/about-the-control-node-in-status-communities") } } diff --git a/vendor/status-go b/vendor/status-go index 5f4aab3121..d9170f043f 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 5f4aab3121a6ef2c0c6d25111500fd58c762b8fb +Subproject commit d9170f043f0e038a0ce376c86fd813aa7646ad67