From 9ad27133d02e1a6a1cbb157bce596fd5ca84906e Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Wed, 8 May 2024 13:09:51 -0400
Subject: [PATCH] fix: make button active as soon as the permission to join
 check resolves

---
 .../shared/popups/CommunityMembershipSetupDialog.qml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/imports/shared/popups/CommunityMembershipSetupDialog.qml b/ui/imports/shared/popups/CommunityMembershipSetupDialog.qml
index 576dba0162..6fb4f07b5d 100644
--- a/ui/imports/shared/popups/CommunityMembershipSetupDialog.qml
+++ b/ui/imports/shared/popups/CommunityMembershipSetupDialog.qml
@@ -90,20 +90,20 @@ StatusStackModal {
             if (root.isInvitationPending)
                 return true
 
-            if (root.requirementsCheckPending || !root.joinPermissionsCheckSuccessful)
+            if (root.requirementsCheckPending && !root.joinPermissionsCheckSuccessful)
                 return false
 
-            if (d.accessType !== Constants.communityChatOnRequestAccess)
+            if (root.joinPermissionsCheckSuccessful || d.accessType !== Constants.communityChatOnRequestAccess)
                 return true
 
             return d.eligibleToJoinAs !== PermissionTypes.Type.None
         }
-        loading: root.requirementsCheckPending && !root.isInvitationPending
+        loading: root.requirementsCheckPending && !root.joinPermissionsCheckSuccessful && !root.isInvitationPending
         tooltip.text: {
             if (interactive)
                 return ""
 
-            if (root.requirementsCheckPending)
+            if (root.requirementsCheckPending && !root.joinPermissionsCheckSuccessful)
                 return qsTr("Requirements check pending")
 
             if (!root.joinPermissionsCheckSuccessful)