[#16703] The display name is not resolved in chats for user sender after relogin (#16704)

VERSION

@@ -1 +1 @@
-1.23.0
+1.24.0

src/status_im/multiaccounts/core.cljs

@@ -39,10 +39,11 @@
       (contact.db/public-key->new-contact identity)))
 
 (defn contact-two-names-by-identity
-  [contact current-multiaccount identity]
-  (let [me? (= (:public-key current-multiaccount) identity)]
+  [contact profile identity]
+  (let [me? (= (:public-key profile) identity)]
     (if me?
-      [(or (:preferred-name current-multiaccount)
+      [(or (:preferred-name profile)
+           (:display-name profile)
            (:primary-name contact)
            (gfycat/generate-gfy identity))]
       [(:primary-name contact) (:secondary-name contact)])))

src/status_im2/constants.cljs

@@ -14,7 +14,9 @@
 (def ^:const content-type-gap 10)
 (def ^:const content-type-contact-request 11) ;; TODO: temp, will be removed
 (def ^:const content-type-system-pinned-message 14)
-(def ^:const content-type-system-mutual-state-update 15)
+(def ^:const content-type-system-message-mutual-event-sent 15)
+(def ^:const content-type-system-message-mutual-event-accepted 16)
+(def ^:const content-type-system-message-mutual-event-removed 17)
 
 ;; Not implemented in status-go, only used for testing/ui work
 (def ^:const content-type-gif 100)

src/status_im2/contexts/chat/messages/list/view.cljs

@@ -253,7 +253,10 @@
   [{:keys [type value content-type] :as message-data} _ _
    {:keys [context keyboard-shown?]}]
   ;;TODO temporary hide mutual-state-updates https://github.com/status-im/status-mobile/issues/16254
-  (when (not= content-type constants/content-type-system-mutual-state-update)
+  (when-not (#{constants/content-type-system-message-mutual-event-sent
+               constants/content-type-system-message-mutual-event-accepted
+               constants/content-type-system-message-mutual-event-removed}
+             content-type)
     [rn/view
      (add-inverted-y-android {:background-color (colors/theme-colors colors/white colors/neutral-95)})
      (cond

src/status_im2/contexts/communities/discover/view.cljs

@@ -28,12 +28,12 @@
         cover {:uri (get-in (:images item) [:banner :uri])}]
     (if (= view-type :card-view)
       [quo/community-card-view-item (assoc item :width width :cover cover)
-       #(rf/dispatch [:navigate-to :community-overview (:id item)])]
+       #(rf/dispatch [:communities/navigate-to-community (:id item)])]
       [quo/community-list-item
        {:on-press      (fn []
                          (rf/dispatch [:communities/load-category-states (:id item)])
                          (rf/dispatch [:dismiss-keyboard])
-                         (rf/dispatch [:navigate-to :community-overview (:id item)]))
+                         (rf/dispatch [:communities/navigate-to-community (:id item)]))
         :on-long-press #(rf/dispatch
                          [:show-bottom-sheet
                           {:content (fn []
@@ -141,12 +141,12 @@
             (merge community
                    (get mock-community-item-data :data)
                    {:cover cover})
-            #(rf/dispatch [:navigate-to :community-overview (:id community)])]
+            #(rf/dispatch [:communities/navigate-to-community (:id community)])]
            [quo/community-list-item
             {:on-press      (fn []
                               (rf/dispatch [:communities/load-category-states (:id community)])
                               (rf/dispatch [:dismiss-keyboard])
-                              (rf/dispatch [:navigate-to :community-overview (:id community)]))
+                              (rf/dispatch [:communities/navigate-to-community (:id community)]))
              :on-long-press #(js/alert "TODO: to be implemented")}
             (merge community
                    (get mock-community-item-data :data))])]))

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.162.1",
-    "commit-sha1": "dfdaa72208a3a90b69293c3d37b40f1831324047",
-    "src-sha256": "01jz9b75775c25yl65rkgvkssis3w0fzlsdhm74qja997r2sc34l"
+    "version": "v0.162.3",
+    "commit-sha1": "b2e56f5d2d22d7299a049f70127b415fae4da75a",
+    "src-sha256": "0pz8ins5gz3f19syhi5rxz4j7115lakvw90yci85ci1k7rrhjxjk"
 }