Fix permission screen & trailing zeros

status-im/status-go@c15f9e7...b7b7660

There were a few issues with the permission screen:
1) Wrong permission was displayed when able to join
2) If not able to join, we were showing both admin/member permissions
3) Trailing zeros in token amount

Author: cammellos

src/status_im/config.cljs

@@ -167,5 +167,5 @@
 
 (def default-kdf-iterations 3200)
 
-(def community-accounts-selection-enabled? (enabled? (get-config :ACCOUNT_SELECTION_ENABLED "0")))
+(def community-accounts-selection-enabled? true)
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))

src/status_im/contexts/communities/overview/view.cljs

@@ -110,66 +110,82 @@
    [rn/view
     [quo/icon :i/info {:no-color true}]]])
 
+(defn- network-not-supported
+  []
+  [quo/text (i18n/label :network-not-supported)])
+
+(defn- request-access-button
+  [id color]
+  [quo/button
+   {:on-press            (if config/community-accounts-selection-enabled?
+                           #(rf/dispatch [:open-modal :community-account-selection
+                                          {:community-id id}])
+                           #(rf/dispatch [:open-modal :community-requests-to-join {:id id}]))
+    :accessibility-label :show-request-to-join-screen-button
+    :customization-color color
+    :icon-left           :i/communities}
+   (i18n/label :t/request-to-join)])
+
 (defn- token-requirements
-  [{:keys [id color]}]
+  [{:keys [id color role-permissions?]}]
   (let [{:keys [can-request-access?
-                number-of-hold-tokens tokens
+                no-member-permission?
+                tokens
+                networks-not-supported?
                 highest-permission-role]} (rf/sub [:community/token-gated-overview id])
         highest-role-text
         (i18n/label
          (communities.utils/role->translation-key highest-permission-role :t/member))]
-    [rn/view {:style (style/token-gated-container)}
-     [rn/view
-      {:style {:padding-horizontal 12
-               :flex-direction     :row
-               :align-items        :center
-               :justify-content    :space-between
-               :flex               1}}
-      [quo/text {:weight :medium}
-       (if can-request-access?
-         (i18n/label :t/you-eligible-to-join-as {:role highest-role-text})
-         (i18n/label :t/you-not-eligible-to-join))]
-      [info-button]]
-     (when (pos? number-of-hold-tokens)
+    (cond
+
+      networks-not-supported?
+      [network-not-supported]
+
+      (or (not role-permissions?) no-member-permission?)
+      [request-access-button id color]
+
+      :else
+      [rn/view {:style (style/token-gated-container)}
+       [rn/view
+        {:style {:padding-horizontal 12
+                 :flex-direction     :row
+                 :align-items        :center
+                 :justify-content    :space-between
+                 :flex               1}}
+        [quo/text {:weight :medium}
+         (if (and can-request-access? highest-permission-role)
+           (i18n/label :t/you-eligible-to-join-as {:role highest-role-text})
+           (i18n/label :t/you-not-eligible-to-join))]
+        [info-button]]
        [quo/text {:style {:padding-horizontal 12 :padding-bottom 18} :size :paragraph-2}
         (if can-request-access?
-          (i18n/label :t/you-hold-number-of-hold-tokens-of-these
-                      {:number-of-hold-tokens number-of-hold-tokens})
-          (i18n/label :t/you-must-hold))])
-     [quo/token-requirement-list
-      {:tokens   tokens
-       :padding? true}]
-     [quo/button
-      {:on-press            (if config/community-accounts-selection-enabled?
-                              #(rf/dispatch [:open-modal :community-account-selection
-                                             {:community-id id}])
-                              #(rf/dispatch [:open-modal :community-requests-to-join {:id id}]))
-       :accessibility-label :join-community-button
-       :customization-color color
-       :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/you-hodl)
+          (i18n/label :t/you-must-hold))]
+       [quo/token-requirement-list
+        {:tokens   tokens
+         :padding? true}]
+       [quo/button
+        {:on-press            (if config/community-accounts-selection-enabled?
+                                #(rf/dispatch [:open-modal :community-account-selection
+                                               {:community-id id}])
+                                #(rf/dispatch [:open-modal :community-requests-to-join {:id id}]))
+         :accessibility-label :join-community-button
+         :customization-color color
+         :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)]])))
+
 
 (defn- join-community
-  [{:keys [id color joined permissions role-permissions? can-join?] :as community}]
+  [{:keys [id joined permissions role-permissions? can-join?] :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?)
-       (if role-permissions?
-         [token-requirements community]
-         [quo/button
-          {:on-press            (if config/community-accounts-selection-enabled?
-                                  #(rf/dispatch [:open-modal :community-account-selection
-                                                 {:community-id id}])
-                                  #(rf/dispatch [:open-modal :community-requests-to-join {:id id}]))
-           :accessibility-label :show-request-to-join-screen-button
-           :customization-color color
-           :icon-left           :i/communities}
-          (i18n/label :t/request-to-join)]))
+       [token-requirements community])
      (when (not (or pending? role-permissions? can-join?))
        [quo/text
         {:size   :paragraph-2

src/status_im/subs/communities.cljs

@@ -1,10 +1,10 @@
 (ns status-im.subs.communities
   (:require
     [clojure.string :as string]
-    [legacy.status-im.data-store.communities :as data-store]
     [legacy.status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils]
     [re-frame.core :as re-frame]
     [status-im.constants :as constants]
+    [status-im.contexts.wallet.common.utils :as wallet.utils]
     [utils.i18n :as i18n]))
 
 (re-frame/reg-sub
@@ -298,58 +298,42 @@
  (fn [collapsed-categories [_ community-id]]
    (get collapsed-categories community-id)))
 
-(defn- permission-id->permission-value
-  [token-permissions permission-id]
-  (get (into {} token-permissions) permission-id))
+
+(defn token-requirement->token
+  [checking-permissions?
+   token-images
+   {:keys [satisfied criteria]}]
+  (let [sym    (:symbol criteria)
+        amount (:amount criteria)]
+    {:symbol      sym
+     :sufficient? satisfied
+     :loading?    checking-permissions?
+     :amount      (wallet.utils/remove-trailing-zeroes amount)
+     :img-src     (get token-images sym)}))
 
 (re-frame/reg-sub
  :community/token-gated-overview
  (fn [[_ community-id]]
    [(re-frame/subscribe [:communities/community community-id])])
- (fn [[{:keys [token-permissions-check token-permissions checking-permissions? token-images]}] _]
-   (let [can-request-access? (:satisfied token-permissions-check)
-         highest-permission-role
-         (when can-request-access?
-           (->> token-permissions-check
-                :permissions
-                (reduce-kv
-                 (fn [highest-permission-role permission-id {:keys [criteria]}]
-                   (if-let [permission-type
-                            (and (first criteria)
-                                 (some #{(:type (permission-id->permission-value token-permissions
-                                                                                 permission-id))}
-                                       constants/community-role-permissions))]
-                     (if highest-permission-role
-                       (min highest-permission-role permission-type)
-                       permission-type)
-                     highest-permission-role))
-                 nil)))
-         highest-permission-role (if (and can-request-access? (nil? highest-permission-role))
-                                   constants/community-token-permission-become-member
-                                   highest-permission-role)]
+ (fn [[{:keys [token-permissions-check checking-permissions? token-images]}] _]
+   (let [highest-role            (:highestRole token-permissions-check)
+         networks-not-supported? (:networksNotSupported token-permissions-check)
+         lowest-role             (last (:roles token-permissions-check))
+         highest-permission-role (:type highest-role)
+         can-request-access?     (and (boolean highest-permission-role) (not networks-not-supported?))]
      {:can-request-access?     can-request-access?
       :highest-permission-role highest-permission-role
-      :number-of-hold-tokens   (reduce
-                                (fn [acc [_ {:keys [criteria]}]]
-                                  (reduce #(+ %1 (if %2 1 0)) acc criteria))
-                                0
-                                (:permissions token-permissions-check))
-      :tokens                  (->>
-                                 token-permissions
-                                 (filter (fn [[_ permission]]
-                                           (data-store/role-permission? permission)))
-                                 (map (fn [[perm-key {:keys [token_criteria]}]]
-                                        (let [check-criteria (get-in token-permissions-check
-                                                                     [:permissions perm-key :criteria])]
-                                          (map
-                                           (fn [{sym :symbol amount :amount} sufficient?]
-                                             {:symbol      sym
-                                              :sufficient? (when (seq check-criteria) sufficient?)
-                                              :loading?    checking-permissions?
-                                              :amount      amount
-                                              :img-src     (get token-images sym)})
-                                           token_criteria
-                                           (or check-criteria token_criteria))))))})))
+      :networks-not-supported? networks-not-supported?
+      :no-member-permission?   (and highest-permission-role
+                                    (not (-> token-permissions-check :highestRole :criteria)))
+      :tokens                  (map (fn [{:keys [tokenRequirement]}]
+                                      (map
+                                       (partial token-requirement->token
+                                                checking-permissions?
+                                                token-images)
+                                       tokenRequirement))
+                                    (or (:criteria highest-role)
+                                        (:criteria lowest-role)))})))
 
 (re-frame/reg-sub
  :community/images