Merge branch 'develop' into issue-13832

status-im · Aug 31, 2022 · b160f34 · b160f34
2 parents 2e82219 + 70bf845
commit b160f34
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests
@@ -54,10 +54,10 @@ pipeline {
     stage('Checks') {
       parallel {
         stage('Lint') {
-          steps { sh "make lint > ${LOG_FILE}" }
+          steps { sh "make lint 2>&1 | tee ${LOG_FILE}" }
         }
         stage('Tests') {
-          steps { sh "make test >> ${LOG_FILE}" }
+          steps { sh "make test 2>&1 | tee -a ${LOG_FILE}" }
         }
       }
     }

diff --git a/src/status_im/chat/models/message.cljs b/src/status_im/chat/models/message.cljs
@@ -137,10 +137,11 @@
                [{:ms 100 :dispatch [:chat/add-senders-to-chat-users (vals senders)]}]))}))
 
 (defn reduce-js-statuses [db ^js message-js]
-  (let [chat-id (.-localChatId message-js)
+  (let [chat-id             (.-localChatId message-js)
         profile-initialized (get-in db [:pagination-info chat-id :messages-initialized?])
-        timeline-message (timeline-message? db chat-id)]
-    (if (or profile-initialized timeline-message)
+        timeline-message    (timeline-message? db chat-id)
+        old-message         (get-in db [:messages chat-id (.-id message-js)])]
+    (if (and (or profile-initialized timeline-message) (nil? old-message))
       (let [{:keys [message-id] :as message} (data-store.messages/<-rpc (types/js->clj message-js))]
         (cond-> db
           profile-initialized
@@ -233,4 +234,4 @@
   {:db (reduce (fn [acc current]
                  (update-in acc [:messages (:chatId current)] remove-cleared-message (:clearedAt current)))
                db
-               cleared-histories)})
+               cleared-histories)})
diff --git a/src/status_im/ethereum/macros.clj b/src/status_im/ethereum/macros.clj
@@ -24,19 +24,10 @@
 
 (defn network->icon [network]
   (let [s     (str "./resources/images/tokens/" (name network) "/0-native.png")
-        s-js  (str "." s)
-        image (gensym)]
+        s-js  (str "." s)]
     (if (.exists (io/file s))
-      `(let [~image (atom nil)]
-         (fn []
-           (or @~image
-               (reset! ~image (js/require ~s-js)))))
-      `(let [~image (atom nil)]
-         (fn []
-           (or
-            @~image
-            (reset! ~image
-                    (js/require "../resources/images/tokens/default-token.png"))))))))
+      `(js/require ~s-js)
+      `(js/require "../resources/images/tokens/default-token.png"))))
 
 (defmacro resolve-native-currency-icons
   "In react-native arguments to require must be static strings.

diff --git a/status-go-version.json b/status-go-version.json
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.107.0",
-    "commit-sha1": "86054875a4f0296ed38858553448dfe92c14da9c",
-    "src-sha256": "1mw6v20h20g1zy30qs97ys2dv5nggzvdbfmdfygwvf3fj018yklg"
+    "version": "v0.107.1",
+    "commit-sha1": "b87ecb206e5545c24abb6a36f616f8b4e030ed36",
+    "src-sha256": "0ilyhfiy93za9pskczj5abxk5g24pvjszf8bl7yi5cfxmvzpar3k"
 }