Merge pull request #479 from status-im/bug/#471

Fix command/request message locking

src/status_im/chat/handlers.cljs

@@ -318,7 +318,11 @@
   [{:keys [current-chat-id] :as db} [_ _ id]]
   (let [chat-id          (or id current-chat-id)
         messages         (get-in db [:chats chat-id :messages])
-        db'              (assoc db :current-chat-id chat-id)
+        command?         (= :command (get-in db [:edit-mode chat-id]))
+        db'              (-> db
+                             (assoc :current-chat-id chat-id)
+                             (update-in [:animations :to-response-height chat-id]
+                                        #(if command? % 0)))
         commands-loaded? (if js/goog.DEBUG
                            false
                            (get-in db [:chats chat-id :commands-loaded]))]

src/status_im/db.cljs

@@ -45,7 +45,8 @@
 
              :sync-state                 :done
              :sync-listener              nil
-             :status-module-initialized? js/goog.DEBUG})
+             :status-module-initialized? js/goog.DEBUG
+             :edit-mode                  {}})
 
 (defn chat-staged-commands-path [chat-id]
   [:chats chat-id :staged-commands])

src/status_im/handlers.cljs

@@ -51,7 +51,8 @@
 
 (register-handler :initialize-account-db
   (fn [db _]
-    (assoc db :current-chat-id console-chat-id)))
+    (assoc db :current-chat-id console-chat-id
+              :edit-mode nil)))
 
 (register-handler :initialize-account
   (u/side-effect!