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

Open user profile from membership requests (#12950)

This commit is contained in:
Parvesh Monu 2021-12-24 20:27:30 +05:30 committed by GitHub
parent edbb06a7c3
commit 4588dafe02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/status_im/ui/components/emoji_thumbnail/preview.cljs
View File

@ -6,7 +6,8 @@
(defn emoji-thumbnail [emoji color size] (defn emoji-thumbnail [emoji color size]
(when-not (string/blank? emoji) (when-not (string/blank? emoji)
[react/view (styles/emoji-thumbnail-icon color size) [react/view (styles/emoji-thumbnail-icon color size)
[react/text {:style (styles/emoji-thumbnail-icon-text size)} emoji]])) [react/text {:style (styles/emoji-thumbnail-icon-text size)
:accessibility-label :thumbnail-emoji} emoji]]))
(defn emoji-thumbnail-touchable [emoji color size func] (defn emoji-thumbnail-touchable [emoji color size func]
(when-not (string/blank? emoji) (when-not (string/blank? emoji)

1
src/status_im/ui/components/emoji_thumbnail/styles.cljs
View File

@ -17,7 +17,6 @@
(defn emoji-thumbnail-icon-text [size] (defn emoji-thumbnail-icon-text [size]
{:font-size (emoji-utils/emoji-font-size size) {:font-size (emoji-utils/emoji-font-size size)
:line-height size :line-height size
:accessibility-label :thumbnail-emoji
:margin-top (emoji-utils/emoji-top-margin-for-vertical-alignment size)}) ;; Required for vertical alignment bug - Check function defination for more info :margin-top (emoji-utils/emoji-top-margin-for-vertical-alignment size)}) ;; Required for vertical alignment bug - Check function defination for more info

10
src/status_im/ui/screens/communities/requests_to_join.cljs
View File

@ -11,7 +11,8 @@
[status-im.ui.components.icons.icons :as icons] [status-im.ui.components.icons.icons :as icons]
[status-im.ui.components.topbar :as topbar] [status-im.ui.components.topbar :as topbar]
[status-im.i18n.i18n :as i18n] [status-im.i18n.i18n :as i18n]
[status-im.communities.core :as communities])) [status-im.communities.core :as communities]
[quo.components.animated.pressable :as animation]))
(defn hide-sheet-and-dispatch [event] (defn hide-sheet-and-dispatch [event]
(>evt [:bottom-sheet/hide]) (>evt [:bottom-sheet/hide])
@ -19,11 +20,11 @@
(defn request-actions [community-id request-id] (defn request-actions [community-id request-id]
[react/view {:flex-direction :row} [react/view {:flex-direction :row}
[react/touchable-highlight {:on-press #(re-frame/dispatch [:communities.ui/accept-request-to-join-pressed community-id request-id])} [animation/pressable {:on-press #(re-frame/dispatch [:communities.ui/accept-request-to-join-pressed community-id request-id])}
[icons/icon :main-icons/checkmark-circle {:width 35 [icons/icon :main-icons/checkmark-circle {:width 35
:height 35 :height 35
:color colors/green}]] :color colors/green}]]
[react/touchable-highlight {:on-press #(re-frame/dispatch [:communities.ui/decline-request-to-join-pressed community-id request-id])} [animation/pressable {:on-press #(re-frame/dispatch [:communities.ui/decline-request-to-join-pressed community-id request-id])}
[icons/icon :main-icons/cancel {:width 35 [icons/icon :main-icons/cancel {:width 35
:height 35 :height 35
:container-style {:margin-left 16} :container-style {:margin-left 16}
@ -41,7 +42,8 @@
:accessory (when can-manage-users? :accessory (when can-manage-users?
[request-actions community-id id]) [request-actions community-id id])
:icon [chat-icon/contact-icon-contacts-tab :icon [chat-icon/contact-icon-contacts-tab
(multiaccounts/displayed-photo member)]}])) (multiaccounts/displayed-photo member)]
:on-press #(re-frame/dispatch [:chat.ui/show-profile public-key])}]))
(defn requests-to-join [] (defn requests-to-join []
(let [{:keys [community-id]} (<sub [:get-screen-params])] (let [{:keys [community-id]} (<sub [:get-screen-params])]