File tree 2 files changed +20
-11
lines changed
quo2/components/notifications/toast
status_im2/contexts/activity_center
2 files changed +20
-11
lines changed Original file line number Diff line number Diff line change 1
1
(ns quo2.components.notifications.toast.view
2
- (:require [quo2.components.icon :as icon]
2
+ (:require [quo2.components.avatars.user-avatar.view :as user-avatar]
3
+ [quo2.components.icon :as icon]
3
4
[quo2.components.markdown.text :as text]
4
5
[quo2.components.notifications.count-down-circle :as count-down-circle]
5
6
[quo2.components.notifications.toast.style :as style]
60
61
61
62
(defn toast
62
63
[{:keys [icon icon-color title text action undo-duration undo-on-press container-style
63
- override-theme]}]
64
+ override-theme user ]}]
64
65
[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])
70
74
:title title
71
75
:text text
72
76
:right (if undo-duration
Original file line number Diff line number Diff line change 538
538
(not accepted)
539
539
(not dismissed))
540
540
(toasts/upsert cofx
541
- {:icon :placeholder
541
+ {:user (cond-> {:full-name name
542
+ :status-indicator? true
543
+ :online? nil
544
+ :size :small
545
+ :ring? false }
546
+
547
+ (:profile-picture message)
548
+ (assoc :identicon (:identicon message)))
542
549
:icon-color colors/primary-50-opa-40
543
550
:title (i18n/label :t/contact-request-sent-toast
544
551
{:name name})
549
556
accepted
550
557
(not dismissed))
551
558
(toasts/upsert cofx
552
- {:icon :placeholder
553
- :icon-color colors/primary-50-opa-40
559
+ {:icon-color colors/success-50-opa-40
554
560
:title (i18n/label :t/contact-request-accepted-toast
555
561
{:name (or name (:alias message))})})
556
-
557
562
:else
558
563
cofx))
559
564
{:db db}
You can’t perform that action at this time.
0 commit comments