Skip to content

Commit 51e4745

Browse files
committed
dont display previous state when checking
1 parent ae08cb1 commit 51e4745

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/quo/components/drawers/bottom_actions/view.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
:style {:color (colors/theme-colors colors/danger-50 colors/danger-60 theme)}}
5454
error-message]])
5555

56-
(when (= description :top)
56+
(when (and (= description :top) role)
5757
[rn/view
5858
{:style style/description-top}
5959
[text/text

src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs

+6-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
(rf/dispatch [:communities/get-permissioned-balances id])
6262
(fn []
6363
(let [{:keys [name color images]} (rf/sub [:communities/community id])
64-
{:keys [highest-permission-role]} (rf/sub [:community/token-gated-overview id])
64+
{:keys [checking?
65+
highest-permission-role]} (rf/sub [:community/token-gated-overview id])
6566
accounts (rf/sub [:wallet/accounts-without-watched-accounts])
6667
selected-addresses (rf/sub [:communities/selected-permission-addresses id])
6768
share-all-addresses? (rf/sub [:communities/share-all-addresses? id])
@@ -105,7 +106,8 @@
105106
{:actions :two-actions
106107
:button-one-label (i18n/label :t/confirm-changes)
107108
:button-one-props {:customization-color color
108-
:disabled? (or (empty? selected-addresses)
109+
:disabled? (or checking?
110+
(empty? selected-addresses)
109111
(not highest-permission-role)
110112
(not unsaved-address-changes?))
111113
:on-press (fn []
@@ -123,9 +125,10 @@
123125
(not highest-permission-role))
124126
:top-error
125127
:top)
126-
:role (role-keyword highest-permission-role)
128+
:role (when-not checking? (role-keyword highest-permission-role))
127129
:error-message (cond
128130
(empty? selected-addresses) (i18n/label :t/no-addresses-selected)
129131
(not highest-permission-role) (i18n/label
130132
:t/addresses-dont-contain-tokens-needed)
131133
:else nil)}]]))))
134+

src/status_im/subs/communities.cljs

+1
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@
330330
highest-permission-role (:type highest-role)
331331
can-request-access? (and (boolean highest-permission-role) (not networks-not-supported?))]
332332
{:can-request-access? can-request-access?
333+
:checking? checking?
333334
:highest-permission-role highest-permission-role
334335
:networks-not-supported? networks-not-supported?
335336
:no-member-permission? (and highest-permission-role

0 commit comments

Comments
 (0)