Merge branch 'develop' into milad/18751-fix-wrong-validation-in-send-…

…screen

src/status_im/common/qr_codes/view.cljs

@@ -33,7 +33,7 @@
   (let [qr-media-server-uri (image-server/get-qr-image-uri-for-any-url
                              {:url         url
                               :port        (rf/sub [:mediaserver/port])
-                              :qr-size     (or (int size) 400)
+                              :qr-size     (or (and size (int size)) 400)
                               :error-level :highest})]
     [quo/qr-code
      (assoc props

src/status_im/contexts/profile/settings/list_items.cljs

@@ -48,19 +48,19 @@
      :blur?       true
      :action      :arrow}]
    [{:title       (i18n/label :t/syncing)
-     :on-press    #(rf/dispatch [:navigate-to :settings-syncing])
+     :on-press    #(rf/dispatch [:open-modal :settings-syncing])
      :image-props :i/syncing
      :image       :icon
      :blur?       true
      :action      :arrow}
     {:title       (i18n/label :t/notifications)
-     :on-press    #(rf/dispatch [:navigate-to :notifications])
+     :on-press    #(rf/dispatch [:open-modal :notifications])
      :image-props :i/activity-center
      :image       :icon
      :blur?       true
      :action      :arrow}
     {:title       (i18n/label :t/appearance)
-     :on-press    #(rf/dispatch [:navigate-to :appearance])
+     :on-press    #(rf/dispatch [:open-modal :appearance])
      :image-props :i/light
      :image       :icon
      :blur?       true
@@ -78,28 +78,28 @@
      :blur?       true
      :action      :arrow}
     {:title       (i18n/label :t/advanced)
-     :on-press    #(rf/dispatch [:navigate-to :advanced-settings])
+     :on-press    #(rf/dispatch [:open-modal :advanced-settings])
      :image-props :i/settings
      :image       :icon
      :blur?       true
      :action      :arrow}]
    ;; temporary link to legacy settings
    [{:title       "Legacy settings"
-     :on-press    #(rf/dispatch [:navigate-to :my-profile])
+     :on-press    #(rf/dispatch [:open-modal :my-profile])
      :action      :arrow
      :image       :icon
      :blur?       true
      :image-props :i/toggle}
     (when config/quo-preview-enabled?
       {:title       "Quo preview"
-       :on-press    #(rf/dispatch [:navigate-to :quo-preview])
+       :on-press    #(rf/dispatch [:open-modal :quo-preview])
        :action      :arrow
        :image       :icon
        :blur?       true
        :image-props :i/light})
     (when config/quo-preview-enabled?
       {:title       "Feature Flags"
-       :on-press    #(rf/dispatch [:navigate-to :feature-flags])
+       :on-press    #(rf/dispatch [:open-modal :feature-flags])
        :action      :arrow
        :image       :icon
        :blur?       true

src/status_im/contexts/syncing/syncing_devices_list/style.cljs

@@ -2,8 +2,10 @@
   (:require
     [quo.foundations.colors :as colors]))
 
-(def container-main
+(defn container-main
+  [top]
   {:background-color colors/neutral-95
+   :padding-top      top
    :flex             1})
 
 (def page-container

src/status_im/contexts/syncing/syncing_devices_list/view.cljs

@@ -3,6 +3,7 @@
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
+    [react-native.safe-area :as safe-area]
     [status-im.contexts.syncing.device.view :as device]
     [status-im.contexts.syncing.syncing-devices-list.style :as style]
     [utils.i18n :as i18n]
@@ -11,14 +12,15 @@
 (defn view
   []
   (let [devices                                   (rf/sub [:pairing/installations])
+        insets                                    (safe-area/get-insets)
         devices-with-button                       (map #(assoc % :show-button? true) devices)
         user-device                               (first devices-with-button)
         other-devices                             (rest devices-with-button)
         profile-color                             (rf/sub [:profile/customization-color])
         {:keys [paired-devices unpaired-devices]} (group-by
                                                    #(if (:enabled? %) :paired-devices :unpaired-devices)
                                                    other-devices)]
-    [rn/view {:style style/container-main}
+    [rn/view {:style (style/container-main (:top insets))}
      [quo/page-nav
       {:type       :no-title
        :background :blur

src/status_im/navigation/screens.cljs

@@ -167,7 +167,7 @@
      :component settings/view}
 
     {:name      :settings-syncing
-     :options   (merge options/dark-screen {:insets {:top? true}})
+     :options   options/transparent-modal-screen-options
      :component settings-syncing/view}
 
     {:name      :settings-setup-syncing
@@ -425,7 +425,7 @@
     ;; Settings
 
     {:name      :settings-password
-     :options   options/transparent-screen-options
+     :options   options/transparent-modal-screen-options
      :component settings-password/view}]
 
    (when js/goog.DEBUG

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.175.1",
-    "commit-sha1": "cba3ac570337404e71da0db424d658b6c29f7ad9",
-    "src-sha256": "186hpv6lcj4189aa67jvg62gij1z5q42j1qxijijvf3kqnvd4lmq"
+    "version": "v0.175.3",
+    "commit-sha1": "23ee898754f71341dc53e71657ef0633165f7bd3",
+    "src-sha256": "0zabdfpplzwi0dmb650cdvhrn3z7zqz70f261b3cyaxc68hc117w"
 }

test/appium/tests/critical/chats/test_public_chat_browsing.py

@@ -502,6 +502,7 @@ def test_community_one_image_send_reply(self):
 
     @marks.testrail_id(702840)
     def test_community_emoji_send_copy_paste_reply(self):
+        self.channel_1.navigate_back_to_chat_view()
         emoji_name = random.choice(list(emoji.EMOJI_UNICODE))
         emoji_unicode = emoji.EMOJI_UNICODE[emoji_name]
         emoji_message = emoji.emojize(emoji_name)

test/appium/views/base_element.py

@@ -87,7 +87,11 @@ def find_elements(self):
         return self.driver.find_elements(self.by, self.locator)
 
     def click(self):
-        self.find_element().click()
+        element = self.find_element()
+        try:
+            element.click()
+        except AttributeError:
+            raise Exception("Element: %s\n Element type: %s" % (element, type(element)))
         self.driver.info('Tap on found: %s' % self.name)
         return self.navigate()
 
@@ -102,7 +106,11 @@ def click_until_presence_of_element(self, desired_element, attempts=4):
             desired_element.name, desired_element.by, desired_element.locator))
         while not desired_element.is_element_displayed(1) and counter <= attempts:
             try:
-                self.find_element().click()
+                el = self.find_element()
+                try:
+                    el.click()
+                except AttributeError:
+                    raise Exception("Element: %s\n Element type: %s" % (el, type(el)))
                 return self.navigate()
             except (NoSuchElementException, TimeoutException):
                 counter += 1