Merge branch 'develop' into 17377-17378

status-im · Sep 22, 2023 · 5974f07 · 5974f07
2 parents ab63478 + 7543dc9
commit 5974f07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/quo2/components/avatars/user_avatar/view.cljs b/src/quo2/components/avatars/user_avatar/view.cljs
@@ -39,7 +39,7 @@
    :background-color intials avatar background color
    :color            intials avatar text color
    :size             intials avatar radius
-   :ring?            render ident ring around avatar?}
+   :ring?            render ident ring around avatar? NOTE: this option may not work if override-ring? is not nil}
 
   supported color formats:
   #RRGGBB

diff --git a/src/status_im2/subs/profile.cljs b/src/status_im2/subs/profile.cljs
@@ -247,8 +247,9 @@
    (pos? (count (get multiaccount :images)))))
 
 (defn- replace-multiaccount-image-uri
-  [multiaccount port font-file avatar-opts]
+  [multiaccount ens-names port font-file avatar-opts]
   (let [{:keys [key-uid ens-name? images]} multiaccount
+        ens-name?                          (or ens-name? (seq ens-names))
         theme                              (theme/get-theme)
         avatar-opts                        (assoc avatar-opts :override-ring? (when ens-name? false))
         images-with-uri                    (mapv (fn [{key-uid :keyUid image-name :type :as image}]
@@ -273,10 +274,11 @@
 (re-frame/reg-sub
  :profile/multiaccount
  :<- [:profile/profile]
+ :<- [:ens/names]
  :<- [:mediaserver/port]
  :<- [:initials-avatar-font-file]
- (fn [[multiaccount port font-file] [_ avatar-opts]]
-   (replace-multiaccount-image-uri multiaccount port font-file avatar-opts)))
+ (fn [[multiaccount ens-names port font-file] [_ avatar-opts]]
+   (replace-multiaccount-image-uri multiaccount ens-names port font-file avatar-opts)))
 
 (re-frame/reg-sub
  :profile/login-profile