Merge branch 'develop' into 17827

VERSION

@@ -1 +1 @@
-1.26.0
+1.25.0

src/status_im/chat/models/input.cljs

@@ -107,14 +107,15 @@
   [{:keys [db] :as cofx} message]
   (let [current-chat-id (:current-chat-id db)
         text            (get-in message [:content :text])]
-    {:db       (-> db
-                   (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
-                             message)
-                   (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
-                   (update-in [:chat/inputs current-chat-id :metadata]
-                              dissoc
-                              :sending-image))
-     :dispatch [:mention/to-input-field text current-chat-id]}))
+    {:db         (-> db
+                     (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
+                               message)
+                     (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
+                     (update-in [:chat/inputs current-chat-id :metadata]
+                                dissoc
+                                :sending-image))
+     :dispatch-n [[:chat.ui/set-chat-input-text nil current-chat-id]
+                  [:mention/to-input-field text current-chat-id]]}))
 
 (rf/defn show-contact-request-input
   "Sets reference to previous chat message and focuses on input"

src/status_im2/contexts/chat/composer/effects.cljs

@@ -109,8 +109,7 @@
    {:keys [edit]}]
   (rn/use-effect
    (fn []
-     (let [edit-text        (get-in edit [:content :text])
-           text-value-count (count @text-value)]
+     (let [edit-text (get-in edit [:content :text])]
        (when (and edit @input-ref)
          ;; A small setTimeout is necessary to ensure the statement is enqueued and will get executed
          ;; ASAP.
@@ -118,9 +117,7 @@
          (js/setTimeout #(.focus ^js @input-ref) 250)
          (.setNativeProps ^js @input-ref (clj->js {:text edit-text}))
          (reset! text-value edit-text)
-         (reset! saved-cursor-position (if (zero? text-value-count)
-                                         (count edit-text)
-                                         text-value-count)))))
+         (reset! saved-cursor-position (count edit-text)))))
    [(:message-id edit)]))
 
 (defn use-reply

src/status_im2/contexts/communities/overview/events.cljs

@@ -42,31 +42,26 @@
                                                community-id %])
                     :on-error   #(log/error "failed to request to join community" community-id %)}]})
 
-(defn request-to-join
-  [{:keys [db]} [{:keys [community-id password]}]]
-  (let [pub-key             (get-in db [:profile/profile :public-key])
-        addresses-to-reveal []]
-    {:fx [[:json-rpc/call
-           [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
-             :params     [pub-key community-id addresses-to-reveal]
-             :on-success [:communities/sign-data community-id password]
-             :on-error   [:communities/requested-to-join-error community-id]}]]]}))
-
 ;; Event to be called to request to join a community.
 ;; This event will generate the data to be signed and then call the sign-data event.
 ;; This is the only event that should be called from the UI.
-(rf/reg-event-fx :communities/request-to-join request-to-join)
+(rf/reg-event-fx :communities/request-to-join
+ (fn [{:keys [db]} [{:keys [community-id password]}]]
+   (let [pub-key             (get-in db [:profile/profile :public-key])
+         addresses-to-reveal []]
+     {:fx [[:json-rpc/call
+            [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
+              :params     [pub-key community-id addresses-to-reveal]
+              :on-success [:communities/sign-data community-id password]
+              :on-error   [:communities/requested-to-join-error community-id]}]]]})))
 
-(defn sign-data
-  [_ [community-id password sign-params]]
-  (let [addresses-to-reveal (map :account sign-params)]
-    {:fx [[:json-rpc/call
-           [{:method     "wakuext_signData"
-             :params     [(map #(assoc % :password password) sign-params)]
-             :on-success [:communities/request-to-join-with-signatures community-id addresses-to-reveal]
-             :on-error   [:communities/requested-to-join-error community-id]}]]]}))
-
-(rf/reg-event-fx :communities/sign-data sign-data)
+(rf/reg-event-fx :communities/sign-data
+ (fn [_ [community-id password sign-params]]
+   {:fx [[:json-rpc/call
+          [{:method     "wakuext_signData"
+            :params     [(map #(assoc % :password password) sign-params)]
+            :on-success [:communities/request-to-join-with-signatures community-id]
+            :on-error   [:communities/requested-to-join-error community-id]}]]]}))
 
 (rf/reg-event-fx :communities/requested-to-join-error
  (fn [{:keys [db]} [community-id error]]
@@ -76,19 +71,11 @@
                :event        :communities/requested-to-join-error})
    {:db (assoc-in db [:password-authentication :error] error)}))
 
-(defn request-to-join-with-signatures
-  [_ [community-id addresses-to-reveal signatures]]
-  {:fx [[:json-rpc/call
-         [{:method      "wakuext_requestToJoinCommunity"
-           :params      [{:communityId       community-id
-                          :signatures        signatures
-                          :addressesToReveal addresses-to-reveal
-                          ;; NOTE: At least one airdrop address is required.
-                          ;; This is a temporary solution while the address
-                          ;; selection feature is not implemented in mobile.
-                          :airdropAddress    (first addresses-to-reveal)}]
-           :js-response true
-           :on-success  [:communities/requested-to-join]
-           :on-error    [:communities/requested-to-join-error community-id]}]]]})
-
-(rf/reg-event-fx :communities/request-to-join-with-signatures request-to-join-with-signatures)
+(rf/reg-event-fx :communities/request-to-join-with-signatures
+ (fn [_ [community-id signatures]]
+   {:fx [[:json-rpc/call
+          [{:method      "wakuext_requestToJoinCommunity"
+            :params      [{:communityId community-id :signatures signatures}]
+            :js-response true
+            :on-success  [:communities/requested-to-join]
+            :on-error    [:communities/requested-to-join-error community-id]}]]]}))

src/status_im2/contexts/communities/overview/events_test.cljs

@@ -1,53 +0,0 @@
-(ns status-im2.contexts.communities.overview.events-test
-  (:require [cljs.test :refer [deftest is]]
-            [native-module.core :as native-module]
-            [status-im2.contexts.communities.overview.events :as sut]))
-
-(def password (native-module/sha3 "password123"))
-(def community-id "0x99")
-(def account-pub-key "0x1")
-
-(deftest request-to-join-test
-  (let [cofx     {:db {:profile/profile {:public-key account-pub-key}}}
-        expected {:fx [[:json-rpc/call
-                        [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
-                          :params     [account-pub-key community-id []]
-                          :on-success [:communities/sign-data community-id password]
-                          :on-error   [:communities/requested-to-join-error community-id]}]]]}]
-    (is (= expected
-           (sut/request-to-join cofx
-                                [{:community-id community-id
-                                  :password     password}])))))
-
-(deftest sign-data-test
-  (let [cofx                {:db {}}
-        sign-params         [{:data "123" :account account-pub-key}
-                             {:data "456" :account "0x2"}]
-        addresses-to-reveal [account-pub-key "0x2"]
-        expected            {:fx
-                             [[:json-rpc/call
-                               [{:method     "wakuext_signData"
-                                 :params     [[{:data "123" :account account-pub-key :password password}
-                                               {:data "456" :account "0x2" :password password}]]
-                                 :on-success [:communities/request-to-join-with-signatures
-                                              community-id addresses-to-reveal]
-                                 :on-error   [:communities/requested-to-join-error community-id]}]]]}]
-    (is (= expected
-           (sut/sign-data cofx [community-id password sign-params])))))
-
-(deftest request-to-join-with-signatures-test
-  (let [cofx                {:db {}}
-        addresses-to-reveal [account-pub-key "0x2"]
-        signatures          ["11111" "222222"]
-        expected            {:fx [[:json-rpc/call
-                                   [{:method      "wakuext_requestToJoinCommunity"
-                                     :params      [{:communityId       community-id
-                                                    :signatures        signatures
-                                                    :addressesToReveal addresses-to-reveal
-                                                    :airdropAddress    "0x1"}]
-                                     :js-response true
-                                     :on-success  [:communities/requested-to-join]
-                                     :on-error    [:communities/requested-to-join-error
-                                                   community-id]}]]]}]
-    (is (= expected
-           (sut/request-to-join-with-signatures cofx [community-id addresses-to-reveal signatures])))))

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "debug/revert-logout",
-    "commit-sha1": "cdb4bb30af634776cafaed25f1586684ffe39ed9",
-    "src-sha256": "1zcxfk07ldllmwv7vr9ki1w2lgx3jd6i5kw8mq5c3pgiclw84gn5"
+    "version": "v0.171.11",
+    "commit-sha1": "8a4c2d8d2f17117aa0a00338e83b0f753ebf1328",
+    "src-sha256": "160qnl9dsl1ypvqg9w6z8wps4fvgq3qxi16piymhrlzgssdwkz8h"
 }