status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <ie.berdnyk@gmail.com>
This commit is contained in:
Ajay Sivan 2024-03-26 17:26:39 +05:30 committed by GitHub
parent fd4d64c53e
commit 02d4618997
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/status_im/contexts/communities/overview/view.cljs
View File

@ -178,23 +178,16 @@
:container-style {:margin-horizontal 12 :margin-top 12 :margin-bottom 12} :container-style {:margin-horizontal 12 :margin-top 12 :margin-bottom 12}
:disabled? (not can-request-access?) :disabled? (not can-request-access?)
:icon-left (if can-request-access? :i/unlocked :i/locked)} :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 (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]) (let [pending? (rf/sub [:communities/my-pending-request-to-join id])
access-type (get-access-type (:access permissions)) access-type (get-access-type (:access permissions))
unknown-access? (= access-type :unknown-access) unknown-access? (= access-type :unknown-access)
invite-only? (= access-type :invite-only)] invite-only? (= access-type :invite-only)]
[:<> (when-not (or joined pending? invite-only? unknown-access?)
(when-not (or joined pending? invite-only? unknown-access?) [token-requirements community])))
[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)])]))
(defn- status-tag (defn- status-tag
[community-id joined] [community-id joined]

3
test/appium/tests/critical/test_deep_and_universal_links.py
View File

@ -128,8 +128,7 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
community_url = "https://status.app/c/Ow==#zQ3shbmfT3hvh4mKa1v6uAjjyztQEroh8Mfn6Ckegjd7LT3XK" community_url = "https://status.app/c/Ow==#zQ3shbmfT3hvh4mKa1v6uAjjyztQEroh8Mfn6Ckegjd7LT3XK"
self.home.open_link_from_google_search_app(community_url, app_package) self.home.open_link_from_google_search_app(community_url, app_package)
self.sign_in.sign_in() self.sign_in.sign_in()
if not self.home.element_by_translation_id( if not self.community_view.join_button.is_element_displayed(10):
"community-admins-will-review-your-request").is_element_displayed(10):
self.errors.append("Closed community was not requested to join by the url %s" % community_url) 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 # ToDo: enable when https://github.com/status-im/status-mobile/issues/18074 is fixed

1
translations/en.json
View File

@ -235,7 +235,6 @@
"membership-title": "Membership requirement", "membership-title": "Membership requirement",
"create-channel-title": "New channel", "create-channel-title": "New channel",
"edit-channel-title": "Edit channel", "edit-channel-title": "Edit channel",
"community-admins-will-review-your-request": "Community admins will review your request",
"community-thumbnail-image": "Thumbnail image", "community-thumbnail-image": "Thumbnail image",
"community-emoji-thumbnail-title": "Thumbnail", "community-emoji-thumbnail-title": "Thumbnail",
"community-thumbnail-upload": "Upload", "community-thumbnail-upload": "Upload",