From ed824bdb0678bb0d2f16d8e4d68512dbf2e2b29d Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Thu, 28 Mar 2024 14:06:15 +0000 Subject: [PATCH] Check permissions even if there's an inflight request --- .../actions/addresses_for_permissions/events.cljs | 3 +-- .../actions/addresses_for_permissions/events_test.cljs | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs b/src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs index f509d2d7b6..e33c2ec2d7 100644 --- a/src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs +++ b/src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs @@ -79,7 +79,6 @@ ;; incorrect highest permission role. {:db (update db :communities/permissions-checks-for-selection dissoc community-id)} (let [{:keys [checking?]} (get-in db [:communities/permissions-checks-for-selection community-id])] - (when-not checking? {:db (assoc-in db [:communities/permissions-checks-for-selection community-id :checking?] true) :fx [[:json-rpc/call [{:method :wakuext_checkPermissionsToJoinCommunity @@ -87,7 +86,7 @@ :on-success [:communities/check-permissions-to-join-during-selection-success community-id] :on-error [:communities/check-permissions-to-join-during-selection-failure - community-id addresses]}]]]})))) + community-id addresses]}]]]}))) ;; This event should be used to check permissions temporarily because it won't ;; mutate the state `:communities/permissions-check` (used by many other diff --git a/src/status_im/contexts/communities/actions/addresses_for_permissions/events_test.cljs b/src/status_im/contexts/communities/actions/addresses_for_permissions/events_test.cljs index 6ae69760ac..8ce5c107fe 100644 --- a/src/status_im/contexts/communities/actions/addresses_for_permissions/events_test.cljs +++ b/src/status_im/contexts/communities/actions/addresses_for_permissions/events_test.cljs @@ -103,11 +103,4 @@ community-id] :on-error [:communities/check-permissions-to-join-during-selection-failure community-id addresses]}]]]} - (sut/check-permissions-to-join-for-selection cofx [community-id addresses]))))) - - (testing "when there are addresses to check permissions, but currently checking, then skip the check" - (let [addresses ["0xA"] - cofx {:db {:communities/permissions-checks-for-selection - {"other-comm-id" {} - community-id {:checking? true}}}}] - (is (nil? (sut/check-permissions-to-join-for-selection cofx [community-id addresses])))))) + (sut/check-permissions-to-join-for-selection cofx [community-id addresses]))))))