Merge branch 'develop' into 14620

src/status_im/chat/models/input.cljs

@@ -49,9 +49,10 @@
         cursor      (+ at-sign-idx (count name) 2)]
     (rf/merge
      cofx
-     {:db (-> db
-              (assoc-in [:chats/cursor chat-id] cursor)
-              (assoc-in [:chats/mention-suggestions chat-id] nil))}
+     {:db                   (-> db
+                                (assoc-in [:chats/cursor chat-id] cursor)
+                                (assoc-in [:chats/mention-suggestions chat-id] nil))
+      :set-text-input-value [chat-id new-text text-input-ref]}
      (set-chat-input-text new-text chat-id)
      ;; NOTE(rasom): Some keyboards do not react on selection property passed to
      ;; text input (specifically Samsung keyboard with predictive text set on).

src/status_im/ui2/screens/chat/composer/input.cljs

@@ -175,6 +175,7 @@
          :editable                 (not cooldown-enabled?)
          :blur-on-submit           false
          :auto-focus               false
+         :default-value            initial-value
          :on-focus                 #(set-active-panel nil)
          :max-length               chat.constants/max-text-size
          :placeholder-text-color   (:text-02 @quo.colors/theme)
@@ -194,14 +195,15 @@
          (partial on-change last-text-change timeout-id mentionable-users refs chat-id sending-image)
          :on-text-input            (partial on-text-input mentionable-users chat-id)}
         input-with-mentions (rf/sub [:chat/input-with-mentions])
-        children            (if mentions-enabled?
-                              (map-indexed
-                               (fn [index [type text]]
-                                 ^{:key (str index "_" type "_" text)}
-                                 [rn/text (when (= type :mention) {:style {:color colors/primary-50}})
-                                  text])
-                               input-with-mentions)
-                              (get @input-texts chat-id))]
+        children            (fn []
+                              (if mentions-enabled?
+                                (map-indexed
+                                 (fn [index [_ text]]
+                                   ^{:key (str index "_" type "_" text)}
+                                   [rn/text (when (= type :mention) {:style {:color colors/primary-50}})
+                                    text])
+                                 input-with-mentions)
+                                (get @input-texts chat-id)))]
     (reset! text-input-ref (:text-input-ref refs))
     ;when ios implementation for selectable-text-input is ready, we need remove this condition and use
     ;selectable-text-input directly.
@@ -222,7 +224,8 @@
 
 (defn update-input-text
   [{:keys [text-input chat-id]} text]
-  (on-text-change text chat-id))
+  (on-text-change text chat-id)
+  (.setNativeProps ^js text-input (clj->js {:text text})))
 
 (re-frame/reg-fx
  :set-text-input-value
@@ -335,7 +338,7 @@
                                   (oops/ocall manager :startActionMode text-input-handle))))
 
       :reagent-render
-      (fn [chat-id {:keys [style ref on-selection-change] :as props} children]
+      (fn [_]
         (let [ref                 #(do (reset! text-input-ref %)
                                        (when ref
                                          (quo.react/set-ref-val! ref %)))

src/status_im/ui2/screens/chat/composer/style.cljs

@@ -94,7 +94,7 @@
    :border-radius    7
    :background-color colors/neutral-50
    :position         :absolute
-   :top              -7
+   :top              (if platform/android? 0 -7)
    :right            -7
    :justify-content  :center
    :align-items      :center})