Merge branch 'develop' into milad/19743-remove-send-in-watch-only

status-im · May 9, 2024 · 663fccf · 663fccf
2 parents 59850e9 + ab19140
commit 663fccf
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/status_im/subs/profile.cljs b/src/status_im/subs/profile.cljs
@@ -279,7 +279,12 @@
  :<- [:initials-avatar-font-file]
  :<- [:theme]
  (fn [[profile ens-names port font-file theme] [_ avatar-opts]]
-   (replace-multiaccount-image-uri profile ens-names port font-file avatar-opts theme)))
+   ;; Right after logout, this subscription is recomputed, but the sub
+   ;; `:profile/profile` output will always be nil. We skip any further
+   ;; processing because it's wasteful and because it will trigger a schema
+   ;; error.
+   (when profile
+     (replace-multiaccount-image-uri profile ens-names port font-file avatar-opts theme))))
 
 (re-frame/reg-sub
  :profile/image