Fix issues due to JS object comparison and manipulation

Author: ulisesmac

src/react_native/fast_image.cljs

@@ -2,9 +2,9 @@
   (:require
     ["react-native-fast-image" :as FastImage]
     [clojure.string :as string]
-    [oops.core :as oops]
     [react-native.core :as rn]
-    [reagent.core :as reagent]))
+    [reagent.core :as reagent]
+    [utils.transforms :as transforms]))
 
 (defn- build-source
   [source]
@@ -14,12 +14,10 @@
     source))
 
 (defn- remove-port
-  [^js/Object source]
+  [source]
   (cond
-    (string? source)               (string/replace-first source #":\d+" "")
-    (.hasOwnProperty source "uri") (some-> source
-                                     (oops/oget "uri")
-                                     (string/replace-first #":\d+" ""))
+    (string? source) (string/replace-first source #":\d+" "")
+    (:uri source)    (some-> source :uri (string/replace-first #":\d+" ""))
     :else source))
 
 (defn- placeholder
@@ -61,13 +59,12 @@
 
 (defn- compare-props
   [old-props new-props]
-  ;; NOTE: We copy the object because during component tests the original is frozen
-  (let [old-source      (some-> old-props (oops/oget "source") remove-port)
-        new-source      (some-> new-props (oops/oget "source") remove-port)
-        old-other-props (js-delete (js/Object.assign #js {} old-props) "source")
-        new-other-props (js-delete (js/Object.assign #js {} new-props) "source")]
+  (let [old-props-clj (transforms/js->clj old-props)
+        new-props-clj (transforms/js->clj new-props)
+        old-source    (some-> old-props-clj :source remove-port)
+        new-source    (some-> new-props-clj :source remove-port)]
     (and (= old-source new-source)
-         (= old-other-props new-other-props))))
+         (= (dissoc old-props-clj :source) (dissoc new-props-clj :source)))))
 
 (def fast-image
   (-> internal-fast-image

src/status_im/common/standard_authentication/forgot_password_doc/view.cljs

@@ -10,14 +10,12 @@
   [quo/documentation-drawers
    {:title  (i18n/label :t/forgot-your-password-info-title)
     :shell? shell?}
-   [rn/view
-    {:style style/container}
+   [rn/view {:style style/container}
     [quo/text {:size :paragraph-2} (i18n/label :t/forgot-your-password-info-description)]
 
     [rn/view {:style style/step-container}
      [quo/step {:in-blur-view? shell?} 1]
-     [rn/view
-      {:style style/step-content}
+     [rn/view {:style style/step-content}
       [quo/text {:size :paragraph-2 :weight :semi-bold}
        (i18n/label :t/forgot-your-password-info-remove-app)]
       [quo/text {:size :paragraph-2} (i18n/label :t/forgot-your-password-info-remove-app-description)]]]
@@ -33,10 +31,8 @@
 
     [rn/view {:style style/step-container}
      [quo/step {:in-blur-view? shell?} 3]
-     [rn/view
-      {:style style/step-content}
-      [rn/view
-       {:style style/step-title}
+     [rn/view {:style style/step-content}
+      [rn/view {:style style/step-title}
        [quo/text {:size :paragraph-2} (str (i18n/label :t/sign-up) " ")]
        [quo/text {:size :paragraph-2 :weight :semi-bold}
         (i18n/label :t/forgot-your-password-info-signup-with-key)]]
@@ -45,8 +41,7 @@
 
     [rn/view {:style style/step-container}
      [quo/step {:in-blur-view? shell?} 4]
-     [rn/view
-      {:style style/step-content}
+     [rn/view {:style style/step-content}
       [quo/text {:size :paragraph-2 :weight :semi-bold}
        (i18n/label :t/forgot-your-password-info-create-new-password)]
       [quo/text {:size :paragraph-2}