lint

src/legacy/status_im/ui/components/chat_icon/screen.cljs

@@ -12,8 +12,7 @@
     [re-frame.core :as re-frame.core]
     [react-native.core :as rn]
     [status-im.contexts.profile.utils :as profile.utils]
-    [utils.ens.core :as utils.ens]
+    [utils.ens.core :as utils.ens]))
-    [utils.image-server :as image-server]))
 
 ;;TODO REWORK THIS NAMESPACE
 
@@ -157,11 +156,9 @@
                                                      (styles/default-chat-icon-text size)
                                                      (styles/emoji-chat-icon-text size))}
                           override-styles)
-        img-config (:config photo-path)
+        photo-path (if (:fn photo-path)
-        photo-path (if img-config
                      ;; temp support new media server avatar for old component
-                     {:uri (image-server/get-image-uri
+                     {:uri ((:fn photo-path)
-                            img-config
                             {:size             size
                              :full-name        name
                              :font-size        (get-in styles [:default-chat-icon-text :font-size])

src/quo/components/avatars/user_avatar/view.cljs

@@ -8,7 +8,6 @@
     [react-native.core :as rn]
     [react-native.fast-image :as fast-image]
     [schema.core :as schema]
-    [utils.image-server :as image-server]
     utils.string))
 
 (defn initials-avatar
@@ -39,23 +38,23 @@
            online?           true
            ring?             true}
     :as   props}]
-  (let [theme           (quo.theme/use-theme)
+  (let [theme              (quo.theme/use-theme)
-        picture-config  (:config profile-picture)
+        full-name          (or full-name "Your Name")
-        full-name       (or full-name "Your Name")
         ;; image generated with `profile-picture-fn` is round cropped
         ;; no need to add border-radius for them
-        outer-styles    (style/outer size (not picture-config))
+        outer-styles       (style/outer size (not (:fn profile-picture)))
         ;; Once image is loaded, fast image re-renders view with the help of reagent atom,
         ;; But dynamic updates don't work when user-avatar is used inside hole-view
         ;; https://github.com/status-im/status-mobile/issues/15553
-        image-view      (if static? no-flicker-image/image fast-image/fast-image)
+        image-view         (if static? no-flicker-image/image fast-image/fast-image)
-        font-size       (get-in style/sizes [size :font-size])
+        font-size          (get-in style/sizes [size :font-size])
-        amount-initials (if (#{:xs :xxs :xxxs} size) 1 2)
+        amount-initials    (if (#{:xs :xxs :xxxs} size) 1 2)
-        sizes           (get style/sizes size)
+        sizes              (get style/sizes size)
-        indicator-color (get (style/indicator-color theme) (if online? :online :offline))]
+        indicator-color    (get (style/indicator-color theme) (if online? :online :offline))
+        profile-picture-fn (:fn profile-picture)]
 
     [rn/view {:style outer-styles :accessibility-label :user-avatar}
-     (if (and full-name (not (or picture-config profile-picture)))
+     (if (and full-name (not (or profile-picture-fn profile-picture)))
        ;; this is for things that's not user-avatar but are currently using user-avatar to render
        ;; the initials e.g. community avatar
        [initials-avatar props]
@@ -63,9 +62,8 @@
         {:accessibility-label :profile-picture
          :style outer-styles
          :source
-         (cond picture-config
+         (cond profile-picture-fn
-               {:uri (image-server/get-image-uri
+               {:uri (profile-picture-fn
-                      picture-config
                       {:length                   amount-initials
                        :full-name                full-name
                        :font-size                (:font-size (text/text-style {:size
@@ -78,7 +76,7 @@
                        :indicator-center-to-edge (when status-indicator?
                                                    (:status-indicator-center-to-edge sizes))
                        :indicator-color          indicator-color
-                       :theme                    theme
+                       :override-theme           theme
                        :color                    (:color style/initials-avatar-text)
                        :size                     (:width outer-styles)
                        :ring?                    ring?

src/quo/components/community/channel_actions/view.cljs

@@ -8,10 +8,9 @@
   [rn/view {:style (assoc container-style :flex-direction :row)}
    (map-indexed
     (fn [index action]
-      (when action
+      ^{:key index}
-        ^{:key index}
+      [:<>
-        [:<>
+       [channel-action/view action]
-         [channel-action/view action]
+       (when (not= action (last actions))
-         (when (not= action (last actions))
+         [rn/view {:width 16}])])
-           [rn/view {:style {:width 16}}])]))
     actions)])

src/react_native/core.cljs

@@ -199,6 +199,15 @@
   [handler deps]
   (react/useMemo handler (get-js-deps deps)))
 
+(defn delay-render
+  [content]
+  (let [[render? set-render] (use-state false)]
+    (use-mount
+     (fn []
+       (reagent/next-tick #(set-render true))))
+    (when render?
+      content)))
+
 (def layout-animation (.-LayoutAnimation ^js react-native))
 (def configure-next (.-configureNext ^js layout-animation))
 

src/schema/quo.cljs

@@ -3,9 +3,7 @@
     [quo.foundations.colors :as colors]
     [schema.registry :as registry]))
 
-(def ^:private ?customization-color (into [:enum :primary] colors/account-colors))
+(def ^:private ?profile-picture-fn-params
-
-(def ^:private ?profile-picture-options
   [:map
    [:length :int]
    [:full-name :string]
@@ -13,67 +11,22 @@
    [:indicator-size {:optional true} [:maybe :int]]
    [:indicator-color {:optional true} [:maybe :string]]
    [:indicator-center-to-edge {:optional true} [:maybe :int]]
-   [:theme :schema.common/theme]
+   [:override-theme :schema.common/theme]
+   [:background-color :string]
    [:color :string]
    [:size :int]
    [:ring? :boolean]
    [:ring-width :int]])
 
-(def ^:private ?account-image-uri-options
-  [:map
-   [:port :int]
-   [:ratio :double]
-   [:key-uid :string]
-   [:image-name :string]
-   [:theme :schema.common/theme]
-   [:override-ring? [:maybe :boolean]]])
-
-(def ^:private ?initials-image-uri-options
-  [:map
-   [:port :int]
-   [:ratio :double]
-   [:uppercase-ratio :double]
-   [:font-file :string]
-   [:theme :schema.common/theme]
-   [:customization-color ?customization-color]
-   [:key-uid {:optional true} [:maybe :string]]
-   [:public-key {:optional true} [:maybe :string]]
-   [:override-ring? {:optional true} [:maybe :boolean]]])
-
-(def ^:private ?contact-image-uri-options
-  [:map
-   [:port :int]
-   [:clock :int]
-   [:ratio :double]
-   [:image-name :string]
-   [:public-key :string]
-   [:theme :schema.common/theme]
-   [:override-ring? [:maybe :boolean]]])
-
-(def ^:private ?image-uri-config
-  [:multi {:dispatch :type}
-   [:account
-    [:map
-     [:type [:= :account]]
-     [:options ?account-image-uri-options]]]
-   [:contact
-    [:map
-     [:type [:= :contact]]
-     [:options ?contact-image-uri-options]]]
-   [:initials
-    [:map
-     [:type [:= :initials]]
-     [:options ?initials-image-uri-options]]]])
-
 (def ^:private ?profile-picture-source
   [:or
    :schema.common/image-source
    [:map
-    [:config ?image-uri-config]]])
+    [:fn [:=> [:cat ?profile-picture-fn-params] :string]]]])
+
+(def ^:private ?customization-color (into [:enum] colors/account-colors))
 
 (defn register-schemas
   []
-  (registry/register ::customization-color ?customization-color)
-  (registry/register ::image-uri-config ?image-uri-config)
   (registry/register ::profile-picture-source ?profile-picture-source)
-  (registry/register ::profile-picture-options ?profile-picture-options))
+  (registry/register ::customization-color ?customization-color))

src/status_im/common/controlled_input/utils.cljs

@@ -78,10 +78,9 @@
 
 (defn add-character
   [state character]
-  (if (can-add-character? state character)
+  (when (can-add-character? state character)
     (set-input-value state
-                     (normalize-value-as-numeric (input-value state) character))
+                     (normalize-value-as-numeric (input-value state) character))))
-    state))
 
 (defn delete-last
   [state]

src/status_im/common/home/actions/view.cljs

@@ -365,21 +365,23 @@
           :sub-label           nil
           :chevron?            false}))
 
+;; TODO(OmarBasem): to be implemented.
 (defn add-members-entry
-  [chat-id]
+  []
   (entry {:icon                :i/add-user
           :label               (i18n/label :t/add-members)
-          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members chat-id])
+          :on-press            #(js/alert "TODO: to be implemented")
           :danger?             false
           :accessibility-label :add-members
           :sub-label           nil
           :chevron?            false}))
 
+;; TODO(OmarBasem): to be implemented.
 (defn manage-members-entry
-  [chat-id]
+  []
   (entry {:icon                :i/add-user
           :label               (i18n/label :t/manage-members)
-          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members chat-id])
+          :on-press            #(js/alert "TODO: to be implemented")
           :danger?             false
           :accessibility-label :manage-members
           :sub-label           nil
@@ -433,8 +435,11 @@
         admin?          (get admins current-pub-key)]
     [(group-details-entry chat-id)
      (when inside-chat?
-       (when admin?
+       (if admin?
-         (manage-members-entry chat-id)))
+         (when config/show-not-implemented-features?
+           (manage-members-entry))
+         (when config/show-not-implemented-features?
+           (add-members-entry))))
      (when (and admin? inside-chat?)
        (when config/show-not-implemented-features?
          (edit-group-entry)))

src/status_im/contexts/chat/group_details/view.cljs

@@ -4,7 +4,6 @@
     [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
-    [react-native.gesture :as gesture]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
     [status-im.common.contact-list-item.view :as contact-list-item]
@@ -44,11 +43,12 @@
 
 (defn add-manage-members
   []
-  (let [selected-participants (rf/sub [:group-chat/selected-participants])
+  (let [selected-participants      (rf/sub [:group-chat/selected-participants])
-        deselected-members    (rf/sub [:group-chat/deselected-members])
+        deselected-members         (rf/sub [:group-chat/deselected-members])
-        chat-id               (rf/sub [:get-screen-params :group-add-manage-members])
+        chat-id                    (rf/sub [:get-screen-params :group-details])
-        group                 (rf/sub [:chats/chat-by-id chat-id])
+        {:keys [admins] :as group} (rf/sub [:chats/chat-by-id chat-id])
-        theme                 (quo.theme/use-theme)]
+        theme                      (quo.theme/use-theme)
+        admin?                     (get admins (rf/sub [:multiaccount/public-key]))]
     [rn/view {:flex 1 :margin-top 20}
      [rn/touchable-opacity
       {:on-press            #(rf/dispatch [:navigate-back])
@@ -59,8 +59,8 @@
       {:size   :heading-1
        :weight :semi-bold
        :style  {:margin-left 20}}
-      (i18n/label :t/manage-members)]
+      (i18n/label (if admin? :t/manage-members :t/add-members))]
-     [gesture/section-list
+     [rn/section-list
       {:key-fn                         :title
        :sticky-section-headers-enabled false
        :sections                       (rf/sub [:contacts/grouped-by-first-letter])
@@ -139,8 +139,7 @@
                 :customization-color color}}]
      [quo/channel-actions
       {:container-style style/actions-view
-       :actions         [{:big?                (not admin?)
+       :actions         [{:accessibility-label :pinned-messages
-                          :accessibility-label :pinned-messages
                           :label               (i18n/label :t/pinned-messages)
                           :customization-color color
                           :icon                :i/pin
@@ -156,17 +155,16 @@
                           :on-press            #(rf/dispatch [:chat.ui/mute chat-id (not muted)
                                                               (when-not muted
                                                                 constants/mute-till-unmuted)])}
-                         (when admin?
+                         {:accessibility-label :manage-members
-                           {:accessibility-label :manage-members
+                          :customization-color color
-                            :customization-color color
+                          :icon                :i/add-user
-                            :icon                :i/add-user
+                          :label               (i18n/label (if admin? :t/manage-members :t/add-members))
-                            :label               (i18n/label :t/manage-members)
+                          :counter-value       (count contacts)
-                            :counter-value       (count contacts)
+                          :on-press            (fn []
-                            :on-press            (fn []
+                                                 (rf/dispatch [:group/clear-added-participants])
-                                                   (rf/dispatch [:group/clear-added-participants])
+                                                 (rf/dispatch [:group/clear-removed-members])
-                                                   (rf/dispatch [:group/clear-removed-members])
+                                                 (rf/dispatch [:open-modal :group-add-manage-members
-                                                   (rf/dispatch [:open-modal :group-add-manage-members
+                                                               chat-id]))}]}]
-                                                                 chat-id]))})]}]
      [rn/section-list
       {:key-fn                         :title
        :sticky-section-headers-enabled false

src/status_im/contexts/profile/settings/view.cljs

@@ -15,12 +15,12 @@
 
 (defn- settings-item-view
   [data]
-  [rf/delay-render
+  (rn/delay-render
    [quo/category
     {:list-type       :settings
      :container-style {:padding-bottom 12}
      :blur?           true
-     :data            data}]])
+     :data            data}]))
 
 (defn scroll-handler
   [event scroll-y]
@@ -29,9 +29,9 @@
 
 (defn- footer
   [{:keys [bottom]} logout-press]
-  [rf/delay-render
+  (rn/delay-render
    [rn/view {:style (style/footer-container bottom)}
-    [quo/logout-button {:on-press logout-press}]]])
+    [quo/logout-button {:on-press logout-press}]]))
 
 (defn- get-item-layout
   [_ index]

src/status_im/subs/contact.cljs

@@ -8,10 +8,10 @@
     [status-im.common.pixel-ratio :as pixel-ratio]
     [status-im.constants :as constants]
     [status-im.contexts.profile.utils :as profile.utils]
-    [status-im.subs.chat.utils :as chat.utils]
     [utils.address :as address]
     [utils.collection]
-    [utils.i18n :as i18n]))
+    [utils.i18n :as i18n]
+    [utils.image-server :as image-server]))
 
 (defn query-chat-contacts
   [{:keys [contacts]} all-contacts query-fn]
@@ -44,40 +44,37 @@
         (reduce (fn [acc image]
                   (let [image-name (:type image)
                         clock      (:clock image)
-                        options    {:port port
+                        uri        (image-server/get-contact-image-uri-fn
-                                    :ratio pixel-ratio/ratio
+                                    {:port port
-                                    :public-key
+                                     :ratio pixel-ratio/ratio
-                                    public-key
+                                     :public-key
-                                    :image-name
+                                     public-key
-                                    image-name
+                                     :image-name
-                                    ; We pass the clock so that we reload the
+                                     image-name
-                                    ; image if the image is updated
+                                     ; We pass the clock so that we reload the
-                                    :clock
+                                     ; image if the image is updated
-                                    clock
+                                     :clock
-                                    :theme
+                                     clock
-                                    theme
+                                     :theme
-                                    :override-ring?
+                                     theme
-                                    (when ens-name false)}]
+                                     :override-ring?
-                    (assoc-in acc
+                                     (when ens-name false)})]
-                     [(keyword image-name) :config]
+                    (assoc-in acc [(keyword image-name) :fn] uri)))
-                     {:type    :contact
-                      :options options})))
                 images
                 (vals images))
 
         images (if (seq images)
                  images
                  {:thumbnail
-                  {:config {:type    :initials
+                  {:fn (image-server/get-initials-avatar-uri-fn
-                            :options {:port                port
+                        {:port                port
-                                      :ratio               pixel-ratio/ratio
+                         :ratio               pixel-ratio/ratio
-                                      :public-key          public-key
+                         :public-key          public-key
-                                      :override-ring?      (when ens-name false)
+                         :override-ring?      (when ens-name false)
-                                      :uppercase-ratio     (:uppercase-ratio
+                         :uppercase-ratio     (:uppercase-ratio constants/initials-avatar-font-conf)
-                                                            constants/initials-avatar-font-conf)
+                         :customization-color customization-color
-                                      :customization-color customization-color
+                         :theme               theme
-                                      :theme               theme
+                         :font-file           font-file})}})]
-                                      :font-file           font-file}}}})]
 
     (assoc contact :images images)))
 
@@ -154,7 +151,7 @@
  (fn [[members contacts]]
    (-> (reduce
         (fn [acc contact]
-          (let [first-char (first (:primary-name contact))]
+          (let [first-char (first (:alias contact))]
             (if (get acc first-char)
               (update-in acc [first-char :data] #(conj % contact))
               (assoc acc first-char {:title first-char :data [contact]}))))
@@ -168,7 +165,7 @@
  :<- [:contacts/active]
  (fn [active-contacts]
    (->> active-contacts
-        (sort-by :primary-name)
+        (sort-by :alias)
         (sort-by
          #(visibility-status-utils/visibility-status-order (:public-key %))))))
 
@@ -361,20 +358,9 @@
 (re-frame/reg-sub
  :contacts/group-members-sections
  (fn [[_ chat-id]]
-   [(re-frame/subscribe [:contacts/contacts-by-chat chat-id])
+   [(re-frame/subscribe [:contacts/contacts-by-chat chat-id])])
-    (re-frame/subscribe [:visibility-status-updates])
+ (fn [[members]]
-    (re-frame/subscribe [:multiaccount/public-key])
+   (let [admins  (filter :admin? members)
-    (re-frame/subscribe [:multiaccount/current-user-visibility-status])])
- (fn [[members status-updates current-user-public-key current-user-visibility-status]]
-   (let [members (map (fn [{:keys [public-key] :as member}]
-                        (assoc member
-                               :online?
-                               (chat.utils/online?
-                                (if (= public-key current-user-public-key)
-                                  (:status-type current-user-visibility-status)
-                                  (get-in status-updates [public-key :status-type])))))
-                      members)
-         admins  (filter :admin? members)
          online  (filter #(and (not (:admin? %)) (:online? %)) members)
          offline (filter #(and (not (:admin? %)) (not (:online? %))) members)]
      (vals (cond-> {}

src/status_im/subs/profile.cljs

@@ -10,6 +10,7 @@
     [status-im.common.pixel-ratio :as pixel-ratio]
     [status-im.constants :as constants]
     [status-im.contexts.profile.utils :as profile.utils]
+    [utils.image-server :as image-server]
     [utils.security.core :as security]))
 
 (re-frame/reg-sub
@@ -42,24 +43,23 @@
          image-name                                                 (-> images first :type)
          override-ring?                                             (when ens-name? false)]
      (when profile
-       {:config
+       {:fn
         (if image-name
-          {:type    :account
+          (image-server/get-account-image-uri-fn {:port           port
-           :options {:port           port
+                                                  :ratio          pixel-ratio/ratio
-                     :ratio          pixel-ratio/ratio
+                                                  :image-name     image-name
-                     :image-name     image-name
+                                                  :key-uid        target-key-uid
-                     :key-uid        target-key-uid
+                                                  :theme          theme
-                     :theme          theme
+                                                  :override-ring? override-ring?})
-                     :override-ring? override-ring?}}
+          (image-server/get-initials-avatar-uri-fn
-          {:type    :initials
+           {:port                port
-           :options {:port                port
+            :ratio               pixel-ratio/ratio
-                     :ratio               pixel-ratio/ratio
+            :key-uid             target-key-uid
-                     :key-uid             target-key-uid
+            :theme               theme
-                     :theme               theme
+            :uppercase-ratio     (:uppercase-ratio constants/initials-avatar-font-conf)
-                     :uppercase-ratio     (:uppercase-ratio constants/initials-avatar-font-conf)
+            :customization-color customization-color
-                     :customization-color customization-color
+            :override-ring?      override-ring?
-                     :override-ring?      override-ring?
+            :font-file           font-file}))}))))
-                     :font-file           font-file}})}))))
 
 ;; DEPRECATED
 ;; use `:profile/public-key` instead
@@ -244,31 +244,29 @@
         ens-name?                     (or ens-name? (seq ens-names))
         avatar-opts                   (assoc avatar-opts :override-ring? (when ens-name? false))
         images-with-uri               (mapv (fn [{key-uid :keyUid image-name :type :as image}]
-                                              (assoc image
+                                              (let [uri-fn (image-server/get-account-image-uri-fn
-                                                     :config
+                                                            (merge
-                                                     {:type    :account
+                                                             {:port       port
-                                                      :options (merge
+                                                              :ratio      pixel-ratio/ratio
-                                                                {:port       port
+                                                              :image-name image-name
-                                                                 :ratio      pixel-ratio/ratio
+                                                              :key-uid    key-uid
-                                                                 :image-name image-name
+                                                              :theme      theme}
-                                                                 :key-uid    key-uid
+                                                             avatar-opts))]
-                                                                 :theme      theme}
+                                                (assoc image :fn uri-fn)))
-                                                                avatar-opts)}))
                                             images)
         new-images                    (if (seq images-with-uri)
                                         images-with-uri
-                                        [{:config {:type    :initials
+                                        [{:fn (image-server/get-initials-avatar-uri-fn
-                                                   :options (merge
+                                               (merge {:port port
-                                                             {:port port
+                                                       :ratio pixel-ratio/ratio
-                                                              :ratio pixel-ratio/ratio
+                                                       :uppercase-ratio
-                                                              :uppercase-ratio
+                                                       (:uppercase-ratio
-                                                              (:uppercase-ratio
+                                                        constants/initials-avatar-font-conf)
-                                                               constants/initials-avatar-font-conf)
+                                                       :key-uid key-uid
-                                                              :key-uid key-uid
+                                                       :customization-color customization-color
-                                                              :customization-color customization-color
+                                                       :theme theme
-                                                              :theme theme
+                                                       :font-file font-file}
-                                                              :font-file font-file}
+                                                      avatar-opts))}])]
-                                                             avatar-opts)}}])]
     (assoc profile :images new-images)))
 
 (re-frame/reg-sub

src/utils/image_server.cljs

@@ -4,7 +4,6 @@
     [react-native.fs :as utils.fs]
     [react-native.platform :as platform]
     [schema.core :as schema]
-    [schema.quo]
     [utils.datetime :as datetime]))
 
 (def ^:const image-server-uri-prefix "https://localhost:")
@@ -55,7 +54,8 @@
     4))
 
 (defn get-account-image-uri
-  "fn to get the avatar uri when multiaccount has custom image set.
+  "fn to get the avatar uri when multiaccount has custom image set
+  not directly called, check `get-account-image-uri-fn`
 
   color formats (for all color options):
   #RRGGBB
@@ -67,8 +67,7 @@
   placeholder-avatar: pass image file path as `image-name`
 
   `indicator-size` is outer indicator radius
-  `indicator-size` - `indicator-border` is inner indicator radius
+  `indicator-size` - `indicator-border` is inner indicator radius"
-  `ring?` shows or hides ring for account with ens name"
   [{:keys [port public-key image-name key-uid size theme indicator-size
            indicator-border indicator-center-to-edge indicator-color ring?
            ring-width ratio]}]
@@ -101,8 +100,38 @@
    "&ringWidth="
    (* ring-width ratio)))
 
+(defn get-account-image-uri-fn
+  "pass the result fn to user-avatar component as `:profile-picture`
+
+  use this fn in subs to set multiaccount `:images` as [{:fn ...}]
+  pass the image to user-avatar
+  user-avatar can fill the rest style related options
+
+  set `override-ring?` to a non-nil value to override `ring?`, mainly used to
+  hide ring for account with ens name
+
+  check `get-account-image-uri` for color formats"
+  [{:keys [port public-key key-uid image-name theme override-ring? ratio]}]
+  (fn [{:keys [size indicator-size indicator-border indicator-center-to-edge
+               indicator-color ring? ring-width override-theme]}]
+    (get-account-image-uri
+     {:port                     port
+      :image-name               image-name
+      :size                     size
+      :public-key               public-key
+      :ratio                    ratio
+      :key-uid                  key-uid
+      :theme                    (if (nil? override-theme) theme override-theme)
+      :indicator-size           indicator-size
+      :indicator-border         indicator-border
+      :indicator-center-to-edge indicator-center-to-edge
+      :indicator-color          indicator-color
+      :ring?                    (if (nil? override-ring?) ring? override-ring?)
+      :ring-width               ring-width})))
+
 (defn get-initials-avatar-uri
   "fn to get the avatar uri when account/contact/placeholder has no custom pic set
+  not directly called, check `get-account-initials-uri-fn`
 
   multiaccount: at least one of `key-uid`, `public-key` is required to render the ring
   contact: `public-key` is required to render the ring
@@ -110,7 +139,6 @@
   check `get-account-image-uri` for color formats
   check `get-font-file-ready` for `font-file`
 
-  `ring?` shows or hides ring for account with ens name
   `uppercase-ratio` is the uppercase-height/line-height for `font-file`"
   [{:keys [port public-key key-uid theme ring? length size customization-color
            color font-size font-file uppercase-ratio indicator-size
@@ -157,13 +185,56 @@
    "&ringWidth="
    (* ring-width ratio)))
 
-(defn get-contact-image-uri
+(schema/=> get-initials-avatar-uri
-  "check `get-account-image-uri` for color formats
+  [:=>
+   [:cat
+    [:map
+     [:theme :schema.common/theme]
+     [:color string?]
+     [:background-color {:optional true} [:maybe string?]]
+     [:size number?]
+     [:ratio float?]
+     [:uppercase-ratio number?]
+     [:customization-color :schema.common/customization-color]
+     [:font-size number?]
+     [:font-file string?]]]
+   [:string]])
+
+(defn get-initials-avatar-uri-fn
+  "return a fn that calls `get-account-initials-uri`
+  pass the fn to user-avatar component to fill the style related options
+
+  check `get-account-image-uri` for color formats
   check `get-font-file-ready` for `font-file`
 
-  `public-key` is required to render the ring
+  check `get-account-image-uri-fn` for `override-ring?`"
-  `ring?` shows or hides ring for account with ens name
+  [{:keys [port public-key key-uid theme override-ring? font-file ratio
-  `uppercase-ratio` is the uppercase-height/line-height for `font-file`"
+           uppercase-ratio customization-color]}]
+  (fn [{:keys [full-name length size font-size color indicator-size indicator-border
+               indicator-color indicator-center-to-edge ring? ring-width
+               override-theme]}]
+    (get-initials-avatar-uri
+     {:port                     port
+      :public-key               public-key
+      :ratio                    ratio
+      :key-uid                  key-uid
+      :full-name                full-name
+      :length                   length
+      :size                     size
+      :customization-color      customization-color
+      :theme                    (if (nil? override-theme) theme override-theme)
+      :ring?                    (if (nil? override-ring?) ring? override-ring?)
+      :ring-width               ring-width
+      :font-size                font-size
+      :color                    color
+      :font-file                font-file
+      :uppercase-ratio          uppercase-ratio
+      :indicator-size           indicator-size
+      :indicator-border         indicator-border
+      :indicator-center-to-edge indicator-center-to-edge
+      :indicator-color          indicator-color})))
+
+(defn get-contact-image-uri
   [{:keys [port public-key image-name clock theme indicator-size indicator-border
            indicator-center-to-edge indicator-color size ring? ring-width ratio]}]
   (str
@@ -193,6 +264,24 @@
    "&ringWidth="
    (* ring-width ratio)))
 
+(defn get-contact-image-uri-fn
+  [{:keys [port public-key image-name theme override-ring? clock ratio]}]
+  (fn [{:keys [size indicator-size indicator-border indicator-center-to-edge
+               indicator-color ring? ring-width override-theme]}]
+    (get-contact-image-uri {:port                     port
+                            :ratio                    ratio
+                            :image-name               image-name
+                            :public-key               public-key
+                            :size                     size
+                            :theme                    (if (nil? override-theme) theme override-theme)
+                            :clock                    clock
+                            :indicator-size           indicator-size
+                            :indicator-border         indicator-border
+                            :indicator-center-to-edge indicator-center-to-edge
+                            :indicator-color          indicator-color
+                            :ring?                    (if (nil? override-ring?) ring? override-ring?)
+                            :ring-width               ring-width})))
+
 (defn get-qr-image-uri-for-any-url
   [{:keys [url port qr-size error-level]}]
   (let [qr-url-base64          (js/btoa url)
@@ -210,24 +299,3 @@
                                     "&size="
                                     qr-size)]
     media-server-url))
-
-(defn get-image-uri
-  [{:keys [type options]}
-   profile-picture-options]
-  ((case type
-     :account  get-account-image-uri
-     :contact  get-contact-image-uri
-     :initials get-initials-avatar-uri
-     str)
-   (-> (merge options profile-picture-options)
-       (assoc :ring?
-              (if (nil? (:override-ring? options))
-                (:ring? profile-picture-options)
-                (:override-ring? options))))))
-
-(schema/=> get-image-uri
-  [:=>
-   [:cat
-    :schema.quo/image-uri-config
-    :schema.quo/profile-picture-options]
-   :string])

src/utils/re_frame.cljs

@@ -4,7 +4,6 @@
     [re-frame.core :as re-frame]
     [re-frame.interceptor :as interceptor]
     [re-frame.interop :as rf.interop]
-    [reagent.core :as reagent]
     [taoensso.timbre :as log]
     [utils.datetime :as datetime])
   (:refer-clojure :exclude [merge reduce]))
@@ -80,14 +79,6 @@
     (swap! handler-nesting-level dec)
     res))
 
-(defn delay-render
-  [_]
-  (let [render? (reagent/atom false)]
-    (js/setTimeout #(reset! render? true) 0)
-    (fn [content]
-      (when @render?
-        content))))
-
 (def sub (comp deref re-frame/subscribe))
 
 (def dispatch re-frame/dispatch)

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.179.15",
+    "version": "v0.179.13",
-    "commit-sha1": "7ba78cd6e97ba1180e2cbab9ad8fc1e666b92a73",
+    "commit-sha1": "f3f48654f54aebbb4949129f930fef648d8da8f9",
-    "src-sha256": "0gafxkha9mcdnl91w1f786ax0z3yqgl55qblw9xazhm7lpm44vgj"
+    "src-sha256": "09gcr6fgx6v4qdp83w0n2ynnlvwjqid477jgpqjk57l5wfrv2raq"
 }