Skip to content

Commit 600fe6e

Browse files
committed
[#15210] Show user avatar in contact request toast
1 parent 05b8dd5 commit 600fe6e

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

src/quo2/components/notifications/toast/view.cljs

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(ns quo2.components.notifications.toast.view
2-
(:require [quo2.components.icon :as icon]
2+
(:require [quo2.components.avatars.user-avatar :as user-avatar]
3+
[quo2.components.icon :as icon]
34
[quo2.components.markdown.text :as text]
45
[quo2.components.notifications.count-down-circle :as count-down-circle]
56
[quo2.components.notifications.toast.style :as style]
@@ -60,13 +61,16 @@
6061

6162
(defn toast
6263
[{:keys [icon icon-color title text action undo-duration undo-on-press container-style
63-
override-theme]}]
64+
override-theme user]}]
6465
[toast-container
65-
{:left (when icon
66-
[icon/icon icon
67-
(cond-> (style/icon override-theme)
68-
icon-color
69-
(assoc :color icon-color))])
66+
{:left (cond icon
67+
[icon/icon icon
68+
(cond-> (style/icon override-theme)
69+
icon-color
70+
(assoc :color icon-color))]
71+
72+
user
73+
[user-avatar/user-avatar user])
7074
:title title
7175
:text text
7276
:right (if undo-duration

src/status_im2/contexts/activity_center/events.cljs

+7-3
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,15 @@
549549
accepted
550550
(not dismissed))
551551
(toasts/upsert cofx
552-
{:icon :placeholder
553-
:icon-color colors/primary-50-opa-40
552+
{:user {:full-name name
553+
:profile-picture (:identicon message)
554+
:status-indicator? true
555+
:online? nil
556+
:size :small
557+
:ring? false}
558+
:icon-color colors/success-50-opa-40
554559
:title (i18n/label :t/contact-request-accepted-toast
555560
{:name (or name (:alias message))})})
556-
557561
:else
558562
cofx))
559563
{:db db}

0 commit comments

Comments
 (0)