From 02d4618997ed3303929f56018c70e3082062edc3 Mon Sep 17 00:00:00 2001 From: Ajay Sivan Date: Tue, 26 Mar 2024 17:26:39 +0530 Subject: [PATCH] Remove 'Community admins will review your request' text from community overview screen (#19361) * Remove 'Community admins will review your request' text from community overview screen * Use the button label 'Request to join' for all communities * e2e: updated test --------- Co-authored-by: Yevheniia Berdnyk --- .../contexts/communities/overview/view.cljs | 15 ++++----------- .../critical/test_deep_and_universal_links.py | 3 +-- translations/en.json | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/status_im/contexts/communities/overview/view.cljs b/src/status_im/contexts/communities/overview/view.cljs index 6d6695f207..d67081f081 100644 --- a/src/status_im/contexts/communities/overview/view.cljs +++ b/src/status_im/contexts/communities/overview/view.cljs @@ -178,23 +178,16 @@ :container-style {:margin-horizontal 12 :margin-top 12 :margin-bottom 12} :disabled? (not can-request-access?) :icon-left (if can-request-access? :i/unlocked :i/locked)} - (i18n/label :t/join-open-community)]]))) + (i18n/label :t/request-to-join)]]))) (defn- join-community - [{:keys [id joined permissions can-request-access?] :as community}] + [{:keys [id joined permissions] :as community}] (let [pending? (rf/sub [:communities/my-pending-request-to-join id]) access-type (get-access-type (:access permissions)) unknown-access? (= access-type :unknown-access) invite-only? (= access-type :invite-only)] - [:<> - (when-not (or joined pending? invite-only? unknown-access?) - [token-requirements community]) - (when (and can-request-access? (not joined)) - [quo/text - {:size :paragraph-2 - :weight :regular - :style style/review-notice} - (i18n/label :t/community-admins-will-review-your-request)])])) + (when-not (or joined pending? invite-only? unknown-access?) + [token-requirements community]))) (defn- status-tag [community-id joined] diff --git a/test/appium/tests/critical/test_deep_and_universal_links.py b/test/appium/tests/critical/test_deep_and_universal_links.py index d45a28844c..0a67927118 100644 --- a/test/appium/tests/critical/test_deep_and_universal_links.py +++ b/test/appium/tests/critical/test_deep_and_universal_links.py @@ -128,8 +128,7 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase): community_url = "https://status.app/c/Ow==#zQ3shbmfT3hvh4mKa1v6uAjjyztQEroh8Mfn6Ckegjd7LT3XK" self.home.open_link_from_google_search_app(community_url, app_package) self.sign_in.sign_in() - if not self.home.element_by_translation_id( - "community-admins-will-review-your-request").is_element_displayed(10): + if not self.community_view.join_button.is_element_displayed(10): self.errors.append("Closed community was not requested to join by the url %s" % community_url) # ToDo: enable when https://github.com/status-im/status-mobile/issues/18074 is fixed diff --git a/translations/en.json b/translations/en.json index aa245be5b3..0b8f906f2e 100644 --- a/translations/en.json +++ b/translations/en.json @@ -235,7 +235,6 @@ "membership-title": "Membership requirement", "create-channel-title": "New channel", "edit-channel-title": "Edit channel", - "community-admins-will-review-your-request": "Community admins will review your request", "community-thumbnail-image": "Thumbnail image", "community-emoji-thumbnail-title": "Thumbnail", "community-thumbnail-upload": "Upload",