Merge branch 'develop' into 18874

Author: ibrkhalil

Diff for: src/quo/components/inputs/input/view.cljs

@@ -55,16 +55,17 @@
 
 (def ^:private custom-props
   "Custom properties that must be removed from properties map passed to InputText."
-  [:type :blur? :theme :error? :right-icon :left-icon :disabled? :small? :button
+  [:type :blur? :error? :right-icon :left-icon :disabled? :small? :button
    :label :char-limit :on-char-limit-reach :icon-name :multiline? :on-focus :on-blur
    :container-style])
 
 (defn- base-input
-  [{:keys [blur? theme error? right-icon left-icon disabled? small? button
+  [{:keys [blur? error? right-icon left-icon disabled? small? button
            label char-limit multiline? clearable? on-focus on-blur container-style
            on-change-text on-char-limit-reach weight default-value]
     :as   props}]
-  (let [[status set-status]    (rn/use-state :default)
+  (let [theme                  (quo.theme/use-theme-value)
+        [status set-status]    (rn/use-state :default)
         internal-on-focus      (rn/use-callback #(set-status :focus))
         internal-on-blur       (rn/use-callback #(set-status :default))
         [multiple-lines?

Diff for: src/react_native/core.cljs

@@ -25,10 +25,15 @@
 
 (defn image
   [{:keys [source] :as props}]
-  [image-native
-   (if (string? source)
-     (assoc props :source {:uri source})
-     props)])
+  (let [props (cond-> props
+                platform/ios?
+                (dissoc :resize-method)
+                (and (:style props) platform/ios?)
+                (update :style dissoc :resize-method))]
+    [image-native
+     (if (string? source)
+       (assoc props :source {:uri source})
+       props)]))
 
 (defn image-get-size
   [uri]

Diff for: src/status_im/contexts/profile/edit/bio/view.cljs

@@ -44,8 +44,7 @@
         [rn/view {:style {:gap 22}}
          [quo/text-combinations {:title (i18n/label :t/bio)}]
          [quo/input
-          {:theme           :dark
-           :blur?           true
+          {:blur?           true
            :multiline?      true
            :error?          (not (string/blank? @error-msg))
            :container-style {:margin-bottom -11}

Diff for: src/status_im/contexts/profile/edit/name/view.cljs

@@ -45,8 +45,7 @@
         [rn/view {:style {:gap 22}}
          [quo/text-combinations {:title (i18n/label :t/name)}]
          [quo/input
-          {:theme           :dark
-           :blur?           true
+          {:blur?           true
            :error?          (not (string/blank? @error-msg))
            :container-style {:margin-bottom -11}
            :default-value   @full-name

Diff for: src/status_im/contexts/syncing/setup_syncing/view.cljs

@@ -130,5 +130,5 @@
          [quo/divider-label {:tight? false} (i18n/label :t/have-a-sync-code?)]
          [quo/action-drawer
           [[{:icon     :i/scan
-             :on-press #(rf/dispatch [:navigate-to :scan-sync-code-page])
+             :on-press #(rf/dispatch [:open-modal :scan-sync-code-page])
              :label    (i18n/label :t/scan-or-enter-sync-code)}]]]]]])))