Merge branch 'develop' into milad/15948

status-im · Jun 12, 2023 · 3149330 · 3149330
2 parents 47ab91e + a1d9f45
commit 3149330
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/status_im/mailserver/core.cljs b/src/status_im/mailserver/core.cljs
@@ -126,7 +126,7 @@
          (not (:mailserver/current-request db)))
     {:db            (assoc db :mailserver/current-request true)
      :json-rpc/call [{:method      "wakuext_requestAllHistoricMessagesWithRetries"
-                      :params      []
+                      :params      [false]
                       :js-response true
                       :on-success  #(do
                                       (log/info "fetched historical messages")

diff --git a/src/status_im2/constants.cljs b/src/status_im2/constants.cljs
@@ -331,3 +331,5 @@
 (def ^:const auth-method-biometric "biometric")
 (def ^:const auth-method-biometric-prepare "biometric-prepare")
 (def ^:const auth-method-none "none")
+
+(def ^:const image-description-in-lightbox? false)
diff --git a/src/status_im2/contexts/chat/lightbox/bottom_view.cljs b/src/status_im2/contexts/chat/lightbox/bottom_view.cljs
@@ -6,7 +6,8 @@
     [status-im2.contexts.chat.lightbox.style :as style]
     [utils.re-frame :as rf]
     [status-im2.contexts.chat.lightbox.animations :as anim]
-    [status-im2.contexts.chat.lightbox.constants :as c]))
+    [status-im2.contexts.chat.lightbox.constants :as c]
+    [status-im2.constants :as constants]))
 
 (defn get-small-item-layout
   [_ index]
@@ -56,7 +57,8 @@
       :start  {:x 0 :y 1}
       :end    {:x 0 :y 0}
       :style  (style/gradient-container insets animations derived)}
-     [rn/text {:style style/text-style} text]
+     (when constants/image-description-in-lightbox?
+       [rn/text {:style style/text-style} text])
      [rn/flat-list
       {:ref                               #(reset! (:small-list-ref props) %)
        :key-fn                            :message-id

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.156.1",
-    "commit-sha1": "9e0a12cb32bf8921ba7b5c923f743bb7119fab96",
-    "src-sha256": "0yx8dcxrig1qkna7kfqpjh5ry33ybdmqh31x42jg4wlb9nm2jnw8"
+    "version": "v0.157.2",
+    "commit-sha1": "47711c4f15d0ebb4665cc121f17184b183f4d2df",
+    "src-sha256": "1w0marsyq8gk2dv4qi4xxplgm67iw6sif7n551jdypbl01i1s17w"
 }