_

src/status_im/events.cljs

@@ -189,16 +189,24 @@
   (when-not (get-in db [:pagination-info constants/timeline-chat-id :messages-initialized?])
     (chat/preload-chat-data cofx constants/timeline-chat-id)))
 
+(defonce initial-focus (atom true))
+
 (fx/defn on-will-focus
   {:events [:screens/on-will-focus]
    :interceptors [anon-metrics/interceptor]}
   [cofx view-id]
   (fx/merge cofx
-            (if (= :chat view-id)
+            (cond
+              (= :chat view-id)
               {::async-storage/set! {:chat-id (get-in cofx [:db :current-chat-id])}}
+
+              @initial-focus
               (do
-                (js/alert "reset chat id")
-                {::async-storage/set! {:chat-id nil}}))
+                (reset! initial-focus false)
+                {})
+
+              :else
+              {::async-storage/set! {:chat-id nil}})
             #(case view-id
                :keycard-settings (keycard/settings-screen-did-load %)
                :reset-card (keycard/reset-card-screen-did-load %)