1.6.1

Signed-off-by: Volodymyr Kozieiev <vkjr.sp@gmail.com>

VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

src/status_im/acquisition/advertiser.cljs

@@ -23,7 +23,7 @@
               (if (= decision :accept)
                 (gateway/handle-acquisition {:message    payload
                                              :method     "PATCH"
-                                             :url        (gateway/get-url :clicks referral)
+                                             :url        [:clicks referral]
                                              :on-success [::claim/success-starter-pack-claim]})
                 {::persistence/set-referrer-state :declined})
               (popover/hide-popover))))

src/status_im/acquisition/chat.cljs

@@ -32,5 +32,5 @@
               {:db (update db :acquisition dissoc :chat-referrer)}
               (gateway/handle-acquisition {:message    payload
                                            :method     "PATCH"
-                                           :url        (gateway/get-url :clicks referral)
+                                           :url        [:clicks referral]
                                            :on-success [::claim/success-starter-pack-claim]}))))

src/status_im/acquisition/claim.cljs

@@ -15,19 +15,19 @@
 (fx/defn add-tx-watcher
   {:events [::add-tx-watcher]}
   [cofx tx]
-  (transaction/watch-transaction cofx
+  (fx/merge cofx
-                                 tx
+            {::persistence/set-watch-tx tx}
-                                 {:trigger-fn (constantly true)
+            (transaction/watch-transaction tx
-                                  :on-trigger
+                                           {:trigger-fn (constantly true)
-                                  (fn []
+                                            :on-trigger
-                                    {:dispatch [::success-tx-received]})}))
+                                            (fn []
+                                              {:dispatch [::success-tx-received]})})))
 
 (fx/defn success-starter-pack-claim
   {:events [::success-starter-pack-claim]}
   [cofx {:keys [tx]}]
   (fx/merge cofx
-            {::persistence/set-watch-tx       tx
+            {::persistence/set-referrer-state (if tx :accepted :claimed)}
-             ::persistence/set-referrer-state (if tx :accepted :claimed)}
             (when tx
               (add-tx-watcher tx))
             (notifications/request-permission)))

src/status_im/acquisition/core.cljs

@@ -24,7 +24,7 @@
                               {:message    message
                                :on-success on-success
                                :method     "POST"
-                               :url        (gateway/get-url :registrations nil)}))
+                               :url        [:registrations nil]}))
 
 (re-frame/reg-fx
  ::get-referrer

src/status_im/acquisition/dapp.cljs

@@ -34,7 +34,7 @@
               (if (= decision :accept)
                 (gateway/handle-acquisition {:message    payload
                                              :method     "PATCH"
-                                             :url        (gateway/get-url :clicks referral)
+                                             :url        [:clicks referral]
                                              :on-success [::success-claim]})
                 {::persistence/set-referrer-state :declined})
               (popover/hide-popover))))

src/status_im/acquisition/gateway.cljs

@@ -1,25 +1,29 @@
 (ns status-im.acquisition.gateway
   (:require [re-frame.core :as re-frame]
             [status-im.utils.fx :as fx]
+            [status-im.ethereum.core :as ethereum]
             [status-im.i18n :as i18n]
             [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.waku.core :as waku]
             [status-im.utils.types :as types]))
 
-(def acquisition-gateway "https://test-referral.status.im")
+(def acquisition-gateway {:mainnet "https://get.status.im"
+                          :rinkeby "https://test-referral.status.im"})
 
-(def acquisition-routes {:clicks        (str acquisition-gateway "/clicks")
+(defn acquisition-routes [network type]
-                         :registrations (str acquisition-gateway "/registrations")})
+  (get {:clicks        (str (get acquisition-gateway network) "/clicks")
+        :registrations (str (get acquisition-gateway network) "/registrations")}
+       type))
 
 (def network-statuses {:initiated 1
                        :in-flight 2
                        :error     3
                        :success   4})
 
-(defn get-url [type referral]
+(defn get-url [network [type referral]]
   (if (= type :clicks)
-    (str (get acquisition-routes :clicks) "/" referral)
+    (str (acquisition-routes network :clicks) "/" referral)
-    (get acquisition-routes :registrations)))
+    (acquisition-routes network :registrations)))
 
 (fx/defn handle-error
   {:events [::on-error]}
@@ -32,7 +36,8 @@
 (fx/defn handle-acquisition
   {:events [::handle-acquisition]}
   [{:keys [db] :as cofx} {:keys [message on-success method url]}]
-  (let [msg (types/clj->json message)]
+  (let [msg     (types/clj->json message)
+        network (ethereum/chain-keyword db)]
     {:db             (assoc-in db [:acquisition :network-status]
                                (get network-statuses :initiated))
      ::json-rpc/call [{:method     (json-rpc/call-ext-method (waku/enabled? cofx) "signMessageWithChatKey")
@@ -42,7 +47,7 @@
                                                         {:chat-key   (get-in db [:multiaccount :public-key])
                                                          :message    msg
                                                          :method     method
-                                                         :url        url
+                                                         :url        (get-url network url)
                                                          :on-success on-success} %])}]}))
 (fx/defn call-acquisition-gateway
   {:events [::call-acquisition-gateway]}
@@ -67,15 +72,16 @@
                                (re-frame/dispatch [::on-error (:error (types/json->clj (get error :response-body)))]))}}))
 
 (fx/defn get-referrer
-  [cofx referrer on-success handled-error handle-error]
+  [{:keys [db]} referrer on-success handled-error handle-error]
-  {:http-get {:url        (get-url :clicks referrer)
+  (let [network (ethereum/chain-keyword db)]
-              :on-success (fn [response]
+    {:http-get {:url        (get-url network [:clicks referrer])
-                            (re-frame/dispatch (on-success (types/json->clj response))))
+                :on-success (fn [response]
-              :on-error   (fn [response]
+                              (re-frame/dispatch (on-success (types/json->clj response))))
-                            (let [error (types/json->clj response)]
+                :on-error   (fn [response]
-                              (if (handled-error error)
+                              (let [error (types/json->clj response)]
-                                (handle-error error)
+                                (if (handled-error error)
-                                (re-frame/dispatch [::on-error (:error error)]))))}})
+                                  (handle-error error)
+                                  (re-frame/dispatch [::on-error (:error error)]))))}}))
 (re-frame/reg-sub
  ::network-status
  (fn [db]

src/status_im/acquisition/persistance.cljs

@@ -44,10 +44,11 @@
 (re-frame/reg-fx
  ::set-watch-tx
  (fn [tx]
-   (-> ^js async-storage
+   (when tx
-       (.setItem tx-store-key tx)
+     (-> ^js async-storage
-       (.catch (fn [error]
+         (.setItem tx-store-key tx)
-                 (log/error "[async-storage]" error))))))
+         (.catch (fn [error]
+                   (log/error "[async-storage]" error)))))))
 
 (re-frame/reg-fx
  ::chat-initalized!

src/status_im/chat/constants.cljs

@@ -12,3 +12,5 @@
   {1 2000
    2 5000
    3 10000})
+
+(def max-text-size 4096)

src/status_im/ui/screens/chat/components/input.cljs

@@ -6,6 +6,7 @@
             [quo.design-system.colors :as colors]
             [status-im.ui.screens.chat.components.style :as styles]
             [status-im.ui.screens.chat.components.reply :as reply]
+            [status-im.chat.constants :as chat.constants]
             [status-im.utils.utils :as utils.utils]
             [quo.components.animated.pressable :as pressable]
             [quo.animated :as animated]
@@ -86,6 +87,7 @@
                    :auto-focus             false
                    :on-focus               #(set-active-panel nil)
                    :on-change              #(on-text-change (.-text ^js (.-nativeEvent ^js %)))
+                   :max-length             chat.constants/max-text-size
                    :placeholder-text-color (:text-02 @colors/theme)
                    :placeholder            (if cooldown-enabled?
                                              (i18n/label :cooldown/text-input-disabled)

status-go-version.json

@@ -2,7 +2,7 @@
     "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.56.9",
+    "version": "v0.56.10",
-    "commit-sha1": "435eacecb587571887ef547d78f82d67f026db28",
+    "commit-sha1": "b7a7f2187fbcccd00a278b9bb0b5e639db1bd645",
-    "src-sha256": "0nk4fn7avj5yqsbvc3yjb2hdfhswxsvyvmxcgf0g3rr9rdhm7m19"
+    "src-sha256": "0cclwk2x1x1v241gmdgrvrg19xmsbibislkjmax3m51j9grn43bz"
 }