swap react-native-mail fork with patch (#19688)

## Summary

This commit swaps the fork of react-native-mail with a patch.

needed for : https://github.com/status-im/status-mobile/issues/18138

## Review & Test notes

Verify if mailing logs still works.

## Platforms
- iOS
- Android

status: ready

.env.e2e

@@ -35,3 +35,5 @@ LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=1
+DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000
+DELETE_MESSAGE_UNDO_TIME_LIMIT=10000

ios/Podfile.lock

@@ -881,7 +881,9 @@ PODS:
     - React-Core
   - react-native-blur (4.3.3):
     - React-Core
-  - react-native-cameraroll (5.10.0):
+  - react-native-cameraroll (7.5.2):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core
   - react-native-config (1.5.0):
     - react-native-config/App (= 1.5.0)
@@ -1475,7 +1477,7 @@ SPEC CHECKSUMS:
   react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
   react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
-  react-native-cameraroll: 4701ae7c3dbcd3f5e9e150ca17f250a276154b35
+  react-native-cameraroll: af8eec1e585d053ff485d98ec837f9a8a11b5745
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
   react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3

package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "1.19.3",
-    "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
+    "@react-native-camera-roll/camera-roll": "7.5.2",
     "@react-native-clipboard/clipboard": "1.13.2",
     "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
     "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status",
@@ -48,7 +48,7 @@
     "react-native-keychain": "8.1.2",
     "react-native-linear-gradient": "^2.8.0",
     "react-native-lottie-splash-screen": "^1.0.1",
-    "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#refs/tags/v6.1.2-status",
+    "react-native-mail": "6.1.1",
     "react-native-navigation": "7.38.3",
     "react-native-orientation-locker": "^1.5.0",
     "react-native-permissions": "3.8.0",
@@ -94,7 +94,6 @@
     "prettier": "^2.8.8",
     "process": "0.11.10",
     "react-test-renderer": "18.1.0",
-    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "2.26.2"
   },
   "binary": {

patches/CameraRoll.ts.patch

@@ -0,0 +1,22 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.re8kHerusA/CameraRoll.ts	2024-04-16 15:17:12.942432000 +0200
++++ ./node_modules/@react-native-camera-roll/camera-roll/src/CameraRoll.ts	2024-04-16 15:17:42.455250986 +0200
+@@ -239,6 +239,19 @@
+   }
+ 
+   /**
++   * Returns total iOS image count
++   */
++  static getPhotosCountiOS(): Promise<number> {
++    return RNCCameraRoll.getPhotosCountiOS('');
++  }
++  /**
++   * Returns favorites and their count iOS
++   */
++  static getFavoritesiOS(): Promise<Album> {
++    return RNCCameraRoll.getFavoritesiOS('');
++  }
++
++  /**
+    * Saves the photo or video to the camera roll or photo library, and returns the URI of the newly created asset.
+    *
+    * @deprecated `save(...)` is deprecated - use `saveAsset(...)` instead.

patches/NativeCameraRollModule.ts.patch

@@ -0,0 +1,11 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.juxTO1BeCM/NativeCameraRollModule.ts	2024-04-16 15:21:28.379979000 +0200
++++ ./node_modules/@react-native-camera-roll/camera-roll/src/NativeCameraRollModule.ts	2024-04-16 15:21:40.490391291 +0200
+@@ -81,6 +81,8 @@
+   getPhotos(params: Object): Promise<PhotoIdentifiersPage>;
+   getAlbums(params: Object): Promise<Album[]>;
+   deletePhotos(photoUris: Array<string>): Promise<void>;
++  getPhotosCountiOS(arg: string): Promise<number>;
++  getFavoritesiOS(arg: string): Promise<Album>;
+   getPhotoByInternalID(
+     internalID: string,
+     options: Object,

patches/RNCCameraRoll.mm.patch

@@ -0,0 +1,56 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.O0mkyjqnsy/RNCCameraRoll.mm	2024-04-16 15:26:23.070258000 +0200
++++ ./node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm	2024-04-16 15:26:32.664996066 +0200
+@@ -955,6 +955,53 @@
+     return [albumTitles copy];
+ }
+ 
++RCT_EXPORT_METHOD(getPhotosCountiOS:(NSString *)blank
++                  resolve:(RCTPromiseResolveBlock)resolve
++                  reject:(RCTPromiseRejectBlock)reject)
++{
++    __block NSInteger intTotalCount=0;
++    PHFetchOptions *allPhotosOptions = [PHFetchOptions new];
++    allPhotosOptions.predicate = [NSPredicate predicateWithFormat:@"mediaType == %d ",PHAssetMediaTypeImage];
++    PHFetchResult *allPhotosResult = [PHAsset fetchAssetsWithOptions:allPhotosOptions];
++    intTotalCount+=allPhotosResult.count;
++
++    resolve(@(intTotalCount));
++}
++
++RCT_EXPORT_METHOD(getFavoritesiOS:(NSString *)blank
++                  resolve:(RCTPromiseResolveBlock)resolve
++                  reject:(RCTPromiseRejectBlock)reject)
++{
++    __block NSInteger intTotalCount=0;
++    PHFetchOptions *fetchOptions = [PHFetchOptions new];
++    NSString *format = @"(favorite == true)";
++    fetchOptions.predicate = [NSPredicate predicateWithFormat:format];
++    PHFetchResult<PHAsset *> *const assetsFetchResult = [PHAsset fetchAssetsWithOptions:fetchOptions];
++    PHAsset *imageAsset = [assetsFetchResult firstObject];
++    NSMutableArray * result = [NSMutableArray new];
++
++    for (PHAsset* asset in assetsFetchResult) {
++        NSArray *resources = [PHAssetResource assetResourcesForAsset:asset ];
++        if ([resources count] < 1) continue;
++        NSString *orgFilename = ((PHAssetResource*)resources[0]).originalFilename;
++        NSString *uit = ((PHAssetResource*)resources[0]).uniformTypeIdentifier;
++        NSString *mimeType = (NSString *)CFBridgingRelease(UTTypeCopyPreferredTagWithClass((__bridge CFStringRef _Nonnull)(uit), kUTTagClassMIMEType));
++        CFStringRef extension = UTTypeCopyPreferredTagWithClass((__bridge CFStringRef _Nonnull)(uit), kUTTagClassFilenameExtension);
++        [result addObject:@{
++            @"width": @([asset pixelWidth]),
++            @"height": @([asset pixelHeight]),
++            @"filename": orgFilename ?: @"",
++            @"mimeType": mimeType ?: @"",
++            @"id": [asset localIdentifier],
++            @"creationDate": [asset creationDate],
++            @"uri": [NSString stringWithFormat:@"ph://%@", [asset localIdentifier]],
++            @"duration": @([asset duration])
++        }];
++    }
++    [result addObject:@{@"count": @(assetsFetchResult.count)}];
++    resolve(result);
++}
++
+ static void checkPhotoLibraryConfig()
+ {
+ #if RCT_DEV

patches/react-native-mail-build.gradle.patch

@@ -0,0 +1,15 @@
+--- /tmp/tmp-status-mobile-6e854428f/tmp.PSruc8WtHx/build.gradle	2024-04-17 11:08:46.857319000 +0200
++++ ./node_modules/react-native-mail/android/build.gradle	2024-04-17 11:09:22.935436792 +0200
+@@ -1,7 +1,11 @@
+ apply plugin: 'com.android.library'
+ 
++def safeExtGet(prop, fallback) {
++    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
++}
++
+ android {
+-    compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : 23
++    compileSdkVersion safeExtGet('compileSdkVersion', 30)
+     buildToolsVersion project.hasProperty('buildToolsVersion') ? project.buildToolsVersion : "23.0.1"
+ 
+     defaultConfig {

src/quo/components/buttons/button/view.cljs

@@ -28,9 +28,9 @@
     :theme :light/:dark
    only icon
    [button {:icon-only? true} :i/close-circle]"
-  [{:keys [on-press on-long-press disabled? type background size icon-left icon-right icon-top
-           customization-color accessibility-label icon-only? container-style inner-style
-           pressed? on-press-in on-press-out allow-multiple-presses?]
+  [{:keys [on-press on-long-press disabled? type background size icon-left icon-left-color icon-right
+           icon-right-color icon-top icon-top-color customization-color accessibility-label icon-only?
+           container-style inner-style pressed? on-press-in on-press-out allow-multiple-presses?]
     :or   {type                :primary
            size                40
            customization-color (if (= type :primary) :blue nil)}}
@@ -94,7 +94,7 @@
           [quo.icons/icon icon-top
            {:container-style {:margin-bottom 2
                               :opacity       (when disabled? 0.3)}
-            :color           icon-color
+            :color           (or icon-top-color icon-color)
             :size            icon-size}]])
        (when icon-left
          [rn/view
@@ -103,7 +103,7 @@
                     :icon-size icon-size
                     :disabled? disabled?})}
           [quo.icons/icon icon-left
-           {:color icon-color
+           {:color (or icon-left-color icon-color)
             :size  icon-size}]])
        [rn/view
         (cond
@@ -130,5 +130,5 @@
                     :icon-size icon-size
                     :disabled? disabled?})}
           [quo.icons/icon icon-right
-           {:color icon-color
+           {:color (or icon-right-color icon-color)
             :size  icon-size}]])]]]))

src/quo/components/empty_state/empty_state/styles.cljs

@@ -7,8 +7,14 @@
    :align-items :center})
 
 (def image
-  {:width  80
-   :height 80})
+  {:width  72
+   :height 72})
+
+(def image-container
+  {:width           80
+   :height          80
+   :align-items     :center
+   :justify-content :center})
 
 (def text-container
   {:margin-top  12

src/quo/components/empty_state/empty_state/view.cljs

@@ -15,9 +15,10 @@
   [rn/view {:style (merge styles/container container-style)}
    (if placeholder?
      [rn/view {:style styles/image-placeholder}]
-     [fast-image/fast-image
-      {:style  styles/image
-       :source image}])
+     [rn/view {:style styles/image-container}
+      [fast-image/fast-image
+       {:style  styles/image
+        :source image}]])
    [rn/view {:style styles/text-container}
     [text/text
      {:style           (styles/title blur?)

src/quo/components/wallet/network_link/view.cljs

@@ -8,7 +8,6 @@
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [react-native.svg :as svg]
-    [reagent.core :as reagent]
     [schema.core :as schema]))
 
 (defn- circle
@@ -36,116 +35,117 @@
      :stroke-width "1"}]])
 
 (defn link-linear
-  []
-  (let [container-width (reagent/atom 100)]
-    (fn [{:keys [source theme]}]
-      (let [stroke-color (colors/resolve-color source theme)
-            fill-color   (colors/theme-colors colors/white colors/neutral-90 theme)]
-        [rn/view
-         {:style     style/link-linear-container
-          :on-layout (fn [e]
-                       (reset! container-width
-                         (oget e :nativeEvent :layout :width)))}
-         [line stroke-color @container-width]
-         [rn/view {:style style/left-circle-container}
-          [circle fill-color stroke-color]]
-         [rn/view {:style style/right-circle-container}
-          [circle fill-color stroke-color]]]))))
+  [{:keys [source theme]}]
+  (let [[container-width
+         set-container-width] (rn/use-state 100)
+        stroke-color          (colors/resolve-color source theme)
+        fill-color            (colors/theme-colors colors/white colors/neutral-90 theme)
+        on-layout             (rn/use-callback #(set-container-width
+                                                 (oget % :nativeEvent :layout :width)))]
+    [rn/view
+     {:style     style/link-linear-container
+      :on-layout on-layout}
+     [line stroke-color container-width]
+     [rn/view {:style style/left-circle-container}
+      [circle fill-color stroke-color]]
+     [rn/view {:style style/right-circle-container}
+      [circle fill-color stroke-color]]]))
 
 (defn link-1x
-  []
-  (let [container-width (reagent/atom 100)
-        stroke-color    "url(#gradient)"]
-    (fn [{:keys [source destination theme]}]
-      (let [source-color      (colors/resolve-color source theme)
-            destination-color (colors/resolve-color destination theme)
-            fill-color        (colors/theme-colors colors/white colors/neutral-90 theme)
-            view-box          (str "0 0 " @container-width " 58")
-            side-lines-path   (helpers/calculate-side-lines-path-1x @container-width)
-            central-transform (helpers/calculate-transform @container-width)]
-        [rn/view
-         {:style     style/link-1x-container
-          :on-layout (fn [e]
-                       (reset! container-width
-                         (oget e :nativeEvent :layout :width)))}
-         [svg/svg
-          {:xmlns    "http://www.w3.org/2000/svg"
-           :height   "100%"
-           :width    "100%"
-           :view-box view-box
-           :fill     :none}
-          [svg/path
-           {:d      (:left side-lines-path)
-            :stroke source-color}]
-          [svg/path
-           {:d
-            "M63 1L53.6356 1C42.5899 1 33.6356 9.9543 33.6356 21L33.6356 37C33.6356 48.0457 24.6813 57 13.6356 57L2.85889e-05 57"
-            :transform central-transform
-            :stroke stroke-color}]
-          [svg/path
-           {:d      (:right side-lines-path)
-            :stroke destination-color}]
-          [svg/defs
-           [svg/linear-gradient
-            {:id             "gradient"
-             :x1             "72.271"
-             :x2             "82.385"
-             :y1             "5"
-             :y2             "34.155"
-             :gradient-units "userSpaceOnUse"}
-            [svg/stop {:stop-color (colors/resolve-color destination theme)}]
-            [svg/stop {:offset "1" :stop-color (colors/resolve-color source theme)}]]]]
-         [rn/view {:style style/bottom-left-circle-container}
-          [circle fill-color source-color]]
-         [rn/view {:style style/top-right-circle-container}
-          [circle fill-color destination-color]]]))))
+  [{:keys [source destination theme]}]
+  (let [[container-width
+         set-container-width] (rn/use-state 100)
+        stroke-color          "url(#gradient)"
+        source-color          (colors/resolve-color source theme)
+        destination-color     (colors/resolve-color destination theme)
+        fill-color            (colors/theme-colors colors/white colors/neutral-90 theme)
+        view-box              (str "0 0 " container-width " 58")
+        side-lines-path       (helpers/calculate-side-lines-path-1x container-width)
+        central-transform     (helpers/calculate-transform container-width)
+        on-layout             (rn/use-callback #(set-container-width
+                                                 (oget % :nativeEvent :layout :width)))]
+    [rn/view
+     {:style     style/link-1x-container
+      :on-layout on-layout}
+     [svg/svg
+      {:xmlns    "http://www.w3.org/2000/svg"
+       :height   "100%"
+       :width    "100%"
+       :view-box view-box
+       :fill     :none}
+      [svg/path
+       {:d      (:left side-lines-path)
+        :stroke source-color}]
+      [svg/path
+       {:d
+        "M63 1L53.6356 1C42.5899 1 33.6356 9.9543 33.6356 21L33.6356 37C33.6356 48.0457 24.6813 57 13.6356 57L2.85889e-05 57"
+        :transform central-transform
+        :stroke stroke-color}]
+      [svg/path
+       {:d      (:right side-lines-path)
+        :stroke destination-color}]
+      [svg/defs
+       [svg/linear-gradient
+        {:id             "gradient"
+         :x1             "72.271"
+         :x2             "82.385"
+         :y1             "5"
+         :y2             "34.155"
+         :gradient-units "userSpaceOnUse"}
+        [svg/stop {:stop-color (colors/resolve-color destination theme)}]
+        [svg/stop {:offset "1" :stop-color (colors/resolve-color source theme)}]]]]
+     [rn/view {:style style/bottom-left-circle-container}
+      [circle fill-color source-color]]
+     [rn/view {:style style/top-right-circle-container}
+      [circle fill-color destination-color]]]))
 
 (defn link-2x
-  []
-  (let [container-width (reagent/atom 100)
-        stroke-color    "url(#gradient)"]
-    (fn [{:keys [source destination theme]}]
-      (let [source-color      (colors/resolve-color source theme)
-            destination-color (colors/resolve-color destination theme)
-            fill-color        (colors/theme-colors colors/white colors/neutral-90 theme)
-            view-box          (str "0 0 " @container-width " 114")
-            side-lines-path   (helpers/calculate-side-lines-path-2x @container-width)
-            central-transform (helpers/calculate-transform @container-width)]
-        [rn/view
-         {:style     style/link-2x-container
-          :on-layout #(reset! container-width
-                        (oget % :nativeEvent :layout :width))}
-         [svg/svg
-          {:xmlns    "http://www.w3.org/2000/svg"
-           :height   "100%"
-           :width    "100%"
-           :view-box view-box
-           :fill     :none}
-          [svg/path
-           {:d      (:left side-lines-path)
-            :stroke source-color}]
-          [svg/path
-           {:d
-            "M62.9999 1L53.6356 1C42.5899 1 33.6356 9.9543 33.6356 21L33.6356 93C33.6356 104.046 24.6813 113 13.6356 113L5.71778e-05 113"
-            :transform central-transform
-            :stroke stroke-color}]
-          [svg/path
-           {:d      (:right side-lines-path)
-            :stroke destination-color}]
-          [svg/defs
-           [svg/linear-gradient
-            {:id             "gradient"
-             :x1             "72.2711"
-             :y1             "5.00001"
-             :x2             "102.867"
-             :y2             "49.0993"
-             :gradient-units "userSpaceOnUse"}
-            [svg/stop {:stop-color (colors/resolve-color destination theme)}]
-            [svg/stop {:offset "1" :stop-color (colors/resolve-color source theme)}]]]]
-         [rn/view {:style style/bottom-left-circle-container}
-          [circle fill-color source-color]]
-         [rn/view {:style style/top-right-circle-container}
-          [circle fill-color destination-color]]]))))
+  [{:keys [source destination theme]}]
+  (let [[container-width
+         set-container-width] (rn/use-state 100)
+        stroke-color          "url(#gradient)"
+        source-color          (colors/resolve-color source theme)
+        destination-color     (colors/resolve-color destination theme)
+        fill-color            (colors/theme-colors colors/white colors/neutral-90 theme)
+        view-box              (str "0 0 " container-width " 114")
+        side-lines-path       (helpers/calculate-side-lines-path-2x container-width)
+        central-transform     (helpers/calculate-transform container-width)
+        on-layout             (rn/use-callback #(set-container-width
+                                                 (oget % :nativeEvent :layout :width)))]
+    [rn/view
+     {:style     style/link-2x-container
+      :on-layout on-layout}
+     [svg/svg
+      {:xmlns    "http://www.w3.org/2000/svg"
+       :height   "100%"
+       :width    "100%"
+       :view-box view-box
+       :fill     :none}
+      [svg/path
+       {:d      (:left side-lines-path)
+        :stroke source-color}]
+      [svg/path
+       {:d
+        "M62.9999 1L53.6356 1C42.5899 1 33.6356 9.9543 33.6356 21L33.6356 93C33.6356 104.046 24.6813 113 13.6356 113L5.71778e-05 113"
+        :transform central-transform
+        :stroke stroke-color}]
+      [svg/path
+       {:d      (:right side-lines-path)
+        :stroke destination-color}]
+      [svg/defs
+       [svg/linear-gradient
+        {:id             "gradient"
+         :x1             "72.2711"
+         :y1             "5.00001"
+         :x2             "102.867"
+         :y2             "49.0993"
+         :gradient-units "userSpaceOnUse"}
+        [svg/stop {:stop-color (colors/resolve-color destination theme)}]
+        [svg/stop {:offset "1" :stop-color (colors/resolve-color source theme)}]]]]
+     [rn/view {:style style/bottom-left-circle-container}
+      [circle fill-color source-color]]
+     [rn/view {:style style/top-right-circle-container}
+      [circle fill-color destination-color]]]))
 
 (defn- view-internal
   [{:keys [shape container-style] :as props}]

src/status_im/common/json_rpc/events.cljs

@@ -40,13 +40,15 @@
   params: sequence - A positional sequence of zero or more arguments.
 
   on-success/on-error: function/vector (optional) - When a function, it will be
-  called with the transformed response as the sole argument. When a vector, it
-  is expected to be a valid re-frame event vector, and the event will be
-  dispatched with the transformed response conj'ed at the end.
+  called with the transformed response and id (request-id) as the argument.
+  When a vector, it is expected to be a valid re-frame event vector, and the event
+  will be dispatched with the transformed response and id conj'ed at the end.
 
   js-response: boolean - When non-nil, the successful response will not be
   recursively converted to Clojure data structures. Default: nil.
 
+  id: (optional) - id passed while making the RPC call will be returned in response
+
   number-of-retries: integer - The maximum number of retries in case of failure.
   Default: nil.
 
@@ -56,14 +58,14 @@
   Note that on-error is optional, but if not provided, a default implementation
   will be used.
   "
-  [{:keys [method params on-success on-error js-response] :as arg}]
+  [{:keys [method params on-success on-error js-response id] :as arg}]
   (let [params   (or params [])
         on-error (or on-error
                      (on-error-retry call arg)
                      #(log/warn :json-rpc/error method :error % :params params))]
     (native-module/call-private-rpc
      (transforms/clj->json {:jsonrpc "2.0"
-                            :id      1
+                            :id      (or id 1)
                             :method  method
                             :params  params})
      (fn [raw-response]
@@ -79,12 +81,13 @@
                  (rf/dispatch (conj on-error error))
                  (on-error error)))
              (when on-success
-               (let [result (if js-response
-                              (.-result response-js)
-                              (transforms/js->clj (.-result response-js)))]
+               (let [result     (if js-response
+                                  (.-result response-js)
+                                  (transforms/js->clj (.-result response-js)))
+                     request-id (.-id response-js)]
                  (if (vector? on-success)
-                   (rf/dispatch (conj on-success result))
-                   (on-success result)))))))))))
+                   (rf/dispatch (conj on-success result request-id))
+                   (on-success result request-id)))))))))))
 
 (re-frame/reg-fx
  :json-rpc/call

src/status_im/config.cljs

@@ -2,6 +2,7 @@
   (:require
     [clojure.string :as string]
     [react-native.config :as react-native-config]
+    [status-im.constants :as constants]
     [utils.ens.core :as utils.ens]
     [utils.ethereum.chain :as chain]))
 
@@ -70,6 +71,18 @@
 ; currently not supported in status-go
 (def enable-remove-profile-picture? false)
 
+(defn env-variable->int
+  [env-var-name default-value]
+  (js/parseInt (get-config env-var-name default-value)))
+
+(def delete-message-for-me-undo-time-limit-ms
+  (env-variable->int :DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT
+                     constants/delete-message-for-me-undo-time-limit-ms))
+
+(def delete-message-undo-time-limit-ms
+  (env-variable->int :DELETE_MESSAGE_UNDO_TIME_LIMIT
+                     constants/delete-message-undo-time-limit-ms))
+
 (def verify-transaction-chain-id (js/parseInt (get-config :VERIFY_TRANSACTION_CHAIN_ID "1")))
 (def verify-transaction-url
   (if (= :mainnet (chain/chain-id->chain-keyword verify-transaction-chain-id))

src/status_im/contexts/chat/messenger/menus/pinned_messages/style.cljs

@@ -8,13 +8,13 @@
    :margin-bottom      (when-not community? 12)})
 
 (def community-tag-container
-  {:margin-horizontal 20 :margin-top 4 :margin-bottom 12})
+  {:margin-horizontal 20
+   :margin-top        4
+   :margin-bottom     12})
 
 (def no-pinned-messages-container
   {:justify-content :center
-   :align-items     :center
-   :margin          12
-   :margin-bottom   (when platform/android? 12)})
+   :align-items     :center})
 
 (def list-footer
   {:height (when platform/android? 12)})

src/status_im/contexts/chat/messenger/messages/content/view.cljs

@@ -51,7 +51,7 @@
     [rn/view {:padding-top 4 :width 32}]))
 
 (defn author
-  [{:keys [response-to
+  [{:keys [content
            compressed-key
            last-in-group?
            pinned-by
@@ -61,7 +61,7 @@
    show-reactions?
    in-reaction-and-action-menu?
    show-user-info?]
-  (when (or (and (seq response-to) quoted-message)
+  (when (or (and (seq (:response-to content)) quoted-message)
             last-in-group?
             pinned-by
             show-user-info?

src/status_im/contexts/chat/messenger/messages/drawers/view.cljs

@@ -7,6 +7,7 @@
     [react-native.gesture :as gesture]
     [reagent.core :as reagent]
     [status-im.common.contact-list-item.view :as contact-list-item]
+    [status-im.config :as config]
     [status-im.constants :as constants]
     [status-im.contexts.chat.messenger.composer.reply.view :as reply]
     [status-im.contexts.chat.messenger.messages.drawers.style :as style]
@@ -140,7 +141,7 @@
                    (rf/dispatch
                     [:hide-bottom-sheet])
                    (rf/dispatch [:chat.ui/delete-message-for-me message-data
-                                 constants/delete-message-for-me-undo-time-limit-ms]))
+                                 config/delete-message-for-me-undo-time-limit-ms]))
 
        :label    (i18n/label :t/delete-for-me)
        :icon     :i/delete
@@ -155,7 +156,7 @@
        :on-press (fn []
                    (rf/dispatch [:hide-bottom-sheet])
                    (rf/dispatch [:chat.ui/delete-message message-data
-                                 constants/delete-message-undo-time-limit-ms]))
+                                 config/delete-message-undo-time-limit-ms]))
        :label    (i18n/label :t/delete-for-everyone)
        :icon     :i/delete
        :id       :delete-for-all}])))

src/status_im/contexts/chat/messenger/messages/pin/events.cljs

@@ -130,6 +130,9 @@
   [cofx chat-id]
   (navigation/show-bottom-sheet
    cofx
-   {:content (fn [] [pinned-messages-menu/view
-                     {:chat-id                     chat-id
-                      :disable-message-long-press? (not= :chat (get-in cofx [:db :view-id]))}])}))
+   {:padding-bottom-override 21
+    :content                 (fn [] [pinned-messages-menu/view
+                                     {:chat-id                     chat-id
+                                      :disable-message-long-press? (not= :chat
+                                                                         (get-in cofx
+                                                                                 [:db :view-id]))}])}))

src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs

@@ -73,19 +73,25 @@
 
 (defn check-permissions-to-join-for-selection
   [{:keys [db]} [community-id addresses]]
-  (if (empty? addresses)
-    ;; When there are no addresses we can't just check permissions, otherwise
-    ;; status-go will consider all possible addresses and the user will see the
-    ;; incorrect highest permission role.
-    {:db (update db :communities/permissions-checks-for-selection dissoc community-id)}
-    {:db (assoc-in db [:communities/permissions-checks-for-selection community-id :checking?] true)
-     :fx [[:json-rpc/call
-           [{:method     :wakuext_checkPermissionsToJoinCommunity
-             :params     [{:communityId community-id :addresses addresses}]
-             :on-success [:communities/check-permissions-to-join-during-selection-success
-                          community-id]
-             :on-error   [:communities/check-permissions-to-join-during-selection-failure
-                          community-id addresses]}]]]}))
+  (let [request-id (rand-int 10000000)]
+    (if (empty? addresses)
+      ;; When there are no addresses we can't just check permissions, otherwise
+      ;; status-go will consider all possible addresses and the user will see the
+      ;; incorrect highest permission role.
+      {:db (update db :communities/permissions-checks-for-selection dissoc community-id)}
+      {:db (update-in db
+                      [:communities/permissions-checks-for-selection community-id]
+                      assoc
+                      :checking?         true
+                      :latest-request-id request-id)
+       :fx [[:json-rpc/call
+             [{:method     :wakuext_checkPermissionsToJoinCommunity
+               :params     [{:communityId community-id :addresses addresses}]
+               :id         request-id
+               :on-success [:communities/check-permissions-to-join-during-selection-success
+                            community-id]
+               :on-error   [:communities/check-permissions-to-join-during-selection-failure
+                            community-id addresses]}]]]})))
 
 ;; This event should be used to check permissions temporarily because it won't
 ;; mutate the state `:communities/permissions-check` (used by many other
@@ -94,12 +100,14 @@
  check-permissions-to-join-for-selection)
 
 (rf/reg-event-fx :communities/check-permissions-to-join-during-selection-success
- (fn [{:keys [db]} [community-id result]]
-   {:db (assoc-in db
-         [:communities/permissions-checks-for-selection community-id]
-         {:checking?                  false
-          :based-on-client-selection? true
-          :check                      result})}))
+ (fn [{:keys [db]} [community-id result request-id]]
+   (when (= (get-in db [:communities/permissions-checks-for-selection community-id :latest-request-id])
+            request-id)
+     {:db (assoc-in db
+           [:communities/permissions-checks-for-selection community-id]
+           {:checking?                  false
+            :based-on-client-selection? true
+            :check                      result})})))
 
 (rf/reg-event-fx :communities/check-permissions-to-join-during-selection-failure
  (fn [_ [community-id addresses error]]

src/status_im/contexts/onboarding/new_to_status/view.cljs

@@ -49,12 +49,13 @@
                                  [:screen/onboarding.enter-seed-phrase
                                   :screen/onboarding.new-to-status]])}]
       [rn/view {:style style/space-between-suboptions}]
-      [quo/small-option-card
-       {:variant  :icon
-        :title    (i18n/label :t/use-keycard)
-        :subtitle (i18n/label :t/use-keycard-subtitle)
-        :image    (resources/get-image :use-keycard)
-        :on-press #(js/alert "TODO: to be implemented")}]]]))
+      (when config/show-not-implemented-features?
+        [quo/small-option-card
+         {:variant  :icon
+          :title    (i18n/label :t/use-keycard)
+          :subtitle (i18n/label :t/use-keycard-subtitle)
+          :image    (resources/get-image :use-keycard)
+          :on-press #(js/alert "TODO: to be implemented")}])]]))
 
 (defn getting-started-doc
   []

src/status_im/contexts/shell/qr_reader/view.cljs

@@ -71,13 +71,10 @@
 (defn on-qr-code-scanned
   [scanned-text]
   (cond
-    (text-for-url-path? scanned-text router/community-with-data-path)
-    ;; TODO: https://github.com/status-im/status-mobile/issues/18743
-    nil
-
-    (text-for-url-path? scanned-text router/channel-path)
-    ;; TODO: https://github.com/status-im/status-mobile/issues/18743
-    nil
+    (or
+     (text-for-url-path? scanned-text router/community-with-data-path)
+     (text-for-url-path? scanned-text router/channel-path))
+    (debounce/debounce-and-dispatch [:universal-links/handle-url scanned-text] 300)
 
     (text-for-url-path? scanned-text router/user-with-data-path)
     (let [address (extract-id scanned-text)]

src/status_im/contexts/wallet/collectible/view.cljs

@@ -1,6 +1,7 @@
 (ns status-im.contexts.wallet.collectible.view
   (:require
     [quo.core :as quo]
+    [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [react-native.svg :as svg]
@@ -36,10 +37,13 @@
      :icon-left       :i/send}
     (i18n/label :t/send)]
    [quo/button
-    {:container-style style/opensea-button
-     :type            :outline
-     :size            40
-     :icon-left       :i/opensea}
+    {:container-style  style/opensea-button
+     :type             :outline
+     :size             40
+     :icon-left        :i/opensea
+     :icon-left-color  (colors/theme-colors colors/neutral-100 colors/neutral-40)
+     :icon-right       :i/external
+     :icon-right-color (colors/theme-colors colors/neutral-50 colors/neutral-40)}
     (i18n/label :t/opensea)]])
 
 (def tabs-data

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.179.4",
-    "commit-sha1": "d246699c5e1c19b3f905a6c10c3526d2004de273",
-    "src-sha256": "0gnnx70g8g8yhn29qj58if91fflgl0q2ry0wipzvvpdxd07hpxin"
+    "version": "v0.179.5",
+    "commit-sha1": "a39c01d7fe1ac60dc2a34bb16d550f09c64d3a3d",
+    "src-sha256": "0g53nqkhpyzy9iwz9lfh2qq8s5wrfa69lic29ps0qb92h0ac428l"
 }

test/appium/support/base_test_report.py

@@ -51,7 +51,8 @@ class BaseTestReport:
             'name': test.name,
             'geth_paths': geth_paths,
             'testruns': list(),
-            'group_name': test.group_name
+            'group_name': test.group_name,
+            'secured': test.secured
         }
         for testrun in test.testruns:
             test_dict['testruns'].append(testrun.__dict__)
@@ -75,7 +76,8 @@ class BaseTestReport:
                                         geth_paths=test_data['geth_paths'],
                                         testruns=testruns,
                                         testrail_case_id=test_data['testrail_case_id'],
-                                        grop_name=test_data['group_name']))
+                                        grop_name=test_data['group_name'],
+                                        secured=test_data['secured']))
         return tests
 
     def get_tests_by_status(self):
@@ -106,7 +108,7 @@ class BaseTestReport:
     @staticmethod
     def get_jenkins_link_to_rerun_e2e(branch_name="develop", pr_id="", tr_case_ids=""):
         return 'https://ci.status.im/job/status-mobile/job/e2e/job/status-app-prs-rerun/parambuild/' \
-               '?BRANCH_NAME=%s&PR_ID=%s&TR_CASE_IDS=%s' % (branch_name, pr_id, tr_case_ids)
+               '?BRANCH_NAME=%s&PR_ID=%s&APK_URL=%s.apk&TR_CASE_IDS=%s' % (branch_name, pr_id, pr_id, tr_case_ids)
 
     def get_sauce_final_screenshot_url(self, job_id):
         return 'https://media.giphy.com/media/9M5jK4GXmD5o1irGrF/giphy.gif'

test/appium/support/github_report.py

@@ -76,13 +76,19 @@ class GithubHtmlReport(BaseTestReport):
         from tests import pytest_config_global
         pr_id = pytest_config_global['pr_number']
 
+        from github import Github
+        from conftest import github_token
+        branch_name = Github(github_token).get_user('status-im').get_repo('status-mobile').get_pull(int(pr_id)).head.ref
+
         if not_executed_tests:
             html += "<li><a href=\"%s\">Rerun not executed tests</a></li>" % self.get_jenkins_link_to_rerun_e2e(
+                branch_name=branch_name,
                 pr_id=pr_id,
                 tr_case_ids=','.join([str(i) for i in tests]))
 
         if failed_tests:
             html += "<li><a href=\"%s\">Rerun failed tests</a></li>" % self.get_jenkins_link_to_rerun_e2e(
+                branch_name=branch_name,
                 pr_id=pr_id,
                 tr_case_ids=','.join([str(test.testrail_case_id) for test in tests]))
 
@@ -141,7 +147,7 @@ class GithubHtmlReport(BaseTestReport):
             else:
                 html += "\n\n```\n%s\n```\n\n" % error.replace("[[", "<b>[[").replace("]]", "]]</b>")
             html += "<br/><br/>"
-        if last_testrun.jobs:
+        if last_testrun.jobs and not test.secured:
             html += self.build_device_sessions_html(last_testrun)
         html += "</td></tr>"
         return html
@@ -158,8 +164,8 @@ class GithubHtmlReport(BaseTestReport):
                         self.get_sauce_job_url(job_id, test_run.first_commands[job_id])
             else:
                 html += "<li><a href=\"%s\">Steps, video, logs</a></li>" % self.get_sauce_job_url(job_id)
-            if test_run.error:
-                html += "<li><a href=\"%s\">Failure screenshot</a></li>" % self.get_sauce_final_screenshot_url(job_id)
+            # if test_run.error:
+            #     html += "<li><a href=\"%s\">Failure screenshot</a></li>" % self.get_sauce_final_screenshot_url(job_id)
             html += "</ul></p>"
         html += "</ul></p>"
         return html

test/appium/support/test_data.py

@@ -2,12 +2,13 @@ from typing import Dict
 
 
 class SingleTestData(object):
-    def __init__(self, name, testruns, testrail_case_id, geth_paths, grop_name):
+    def __init__(self, name, testruns, testrail_case_id, geth_paths, grop_name, secured):
         self.testrail_case_id = testrail_case_id
         self.name = name
         self.testruns = testruns
         self.geth_paths = geth_paths
         self.group_name = grop_name
+        self.secured = secured
 
     class TestRunData(object):
         def __init__(self, steps, jobs, error, first_commands: Dict[str, int], xfail):
@@ -27,11 +28,11 @@ class TestSuiteData(object):
         self.current_test = None
         self.tests = list()
 
-    def set_current_test(self, test_name, testrail_case_id):
+    def set_current_test(self, test_name, testrail_case_id, secured):
         existing_test = next((test for test in self.tests if test.name == test_name), None)
         if existing_test:
             self.current_test = existing_test
         else:
-            test = SingleTestData(test_name, list(), testrail_case_id, list(), None)
+            test = SingleTestData(test_name, list(), testrail_case_id, list(), None, secured)
             self.tests.append(test)
             self.current_test = test

test/appium/support/testrail_report.py

@@ -187,10 +187,14 @@ class TestrailReport(BaseTestReport):
                 test_steps += step + "\n"
             for i, device in enumerate(last_testrun.jobs):
                 if last_testrun.first_commands:
-                    devices += "# [Device %d](%s) \n" % (
-                        i + 1, self.get_sauce_job_url(job_id=device, first_command=last_testrun.first_commands[device]))
+                    first_command = last_testrun.first_commands[device]
                 else:
-                    devices += "# [Device %d](%s) \n" % (i + 1, self.get_sauce_job_url(job_id=device))
+                    first_command = 0
+                try:
+                    devices += "# [Device %d](%s) \n" % (i + 1, self.get_sauce_job_url(job_id=device,
+                                                                                       first_command=first_command))
+                except KeyError:
+                    devices += "# Device %s: SauceLabs session was not found \n" % (i + 1)
             comment = str()
             if test.group_name:
                 comment += "# Class: %s \n" % test.group_name

test/appium/tests/conftest.py

@@ -338,6 +338,8 @@ def pytest_runtest_makereport(item, call):
             error = error.replace(re.findall(failure_pattern, report.longreprtext)[0], '')
         return error
 
+    secured_test = "secured" in item.keywords._markers or "secured" in item.parent.keywords._markers
+
     if report.when == 'setup':
         is_group = "xdist_group" in item.keywords._markers or "xdist_group" in item.parent.keywords._markers
         error_intro, error = 'Test setup failed:', ''
@@ -345,7 +347,8 @@ def pytest_runtest_makereport(item, call):
         if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and (
                 str([mark.args[0] for mark in item.iter_markers(name='testrail_id')][0]) in str(case_ids_set))):
             if '[NOTRUN]' in report.wasxfail:
-                test_suite_data.set_current_test(item.name, testrail_case_id=get_testrail_case_id(item))
+                test_suite_data.set_current_test(test_name=item.name, testrail_case_id=get_testrail_case_id(item),
+                                                 secured=secured_test)
                 test_suite_data.current_test.create_new_testrun()
                 if is_group:
                     test_suite_data.current_test.group_name = item.instance.__class__.__name__
@@ -429,7 +432,8 @@ def pytest_runtest_setup(item):
     if run_testrail_ids:
         if str(testrail_id) not in list(run_testrail_ids.split(",")):
             pytest.skip("test requires testrail case id %s" % testrail_id)
-    test_suite_data.set_current_test(item.name, testrail_case_id=get_testrail_case_id(item))
+    secured = bool([mark for mark in item.iter_markers(name='secured')])
+    test_suite_data.set_current_test(test_name=item.name, testrail_case_id=get_testrail_case_id(item), secured=secured)
     test_suite_data.current_test.create_new_testrun()
 
 

test/appium/tests/critical/test_wallet.py

@@ -13,6 +13,7 @@ from views.sign_in_view import SignInView
 
 @pytest.mark.xdist_group(name="new_four_2")
 @marks.new_ui_critical
+@marks.secured
 class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
 
     def prepare_devices(self):

test/appium/tests/marks.py

@@ -12,3 +12,4 @@ flaky = pytest.mark.flaky
 upgrade = pytest.mark.upgrade
 skip = pytest.mark.skip
 xfail = pytest.mark.xfail
+secured = pytest.mark.secured

yarn.lock

@@ -2576,9 +2576,10 @@
   dependencies:
     merge-options "^3.0.4"
 
-"@react-native-camera-roll/camera-roll@git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1":
-  version "5.10.0"
-  resolved "git+https://github.com/status-im/react-native-camera-roll.git#174f8c6ad88e5bad9d9bd207f42173e567ec3138"
+"@react-native-camera-roll/camera-roll@7.5.2":
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/@react-native-camera-roll/camera-roll/-/camera-roll-7.5.2.tgz#2b248a835fbb8b53d04fc0c2957adba1474d9c99"
+  integrity sha512-XiVIrW17EFXrFzqB48q6cQOaYeVnw0iC3tH+Jhl+MAHDYGLJp+ulzxCNNwngaMvnVAA5Q2mUMzRocUiJPy8q0g==
 
 "@react-native-clipboard/clipboard@1.13.2":
   version "1.13.2"
@@ -3357,23 +3358,6 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-aria-query@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.7.1.tgz#26cbb5aff64144b0a825be1846e0b16cfa00b11e"
-  integrity sha1-Jsu1r/ZBRLCoJb4YRuCxbPoAsR4=
-  dependencies:
-    ast-types-flow "0.0.7"
-    commander "^2.11.0"
-
-array-includes@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    is-string "^1.0.5"
-
 asap@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
@@ -3397,11 +3381,6 @@ assert@^1.1.1, assert@^1.4.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-ast-types-flow@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
-  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
-
 ast-types@0.15.2:
   version "0.15.2"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d"
@@ -3431,13 +3410,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-axobject-query@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-0.1.0.tgz#62f59dbc59c9f9242759ca349960e7a2fe3c36c0"
-  integrity sha1-YvWdvFnJ+SQnWco0mWDnov48NsA=
-  dependencies:
-    ast-types-flow "0.0.7"
-
 babel-core@^7.0.0-bridge.0:
   version "7.0.0-bridge.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
@@ -4107,7 +4079,7 @@ command-exists@^1.2.8:
   resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69"
   integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==
 
-commander@^2.11.0, commander@^2.20.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -4368,11 +4340,6 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
   integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
-damerau-levenshtein@^1.0.0:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791"
-  integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==
-
 date-fns@^2.29.1:
   version "2.29.3"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
@@ -4467,13 +4434,6 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
-define-properties@^1.1.2, define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -4635,11 +4595,6 @@ emittery@^0.13.1:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
   integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
-emoji-regex@^6.1.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
-  integrity sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==
-
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -4699,32 +4654,6 @@ errorhandler@^1.5.1:
     accepts "~1.3.7"
     escape-html "~1.0.3"
 
-es-abstract@^1.17.0, es-abstract@^1.17.5:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 es6-error@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
@@ -4760,19 +4689,6 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-plugin-jsx-a11y@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz#5c96bb5186ca14e94db1095ff59b3e2bd94069b1"
-  integrity sha512-5I9SpoP7gT4wBFOtXT8/tXNPYohHBVfyVfO17vkbC7r9kEIxYJF12D3pKqhk8+xnk12rfxKClS3WCFpVckFTPQ==
-  dependencies:
-    aria-query "^0.7.0"
-    array-includes "^3.0.3"
-    ast-types-flow "0.0.7"
-    axobject-query "^0.1.0"
-    damerau-levenshtein "^1.0.0"
-    emoji-regex "^6.1.0"
-    jsx-ast-utils "^1.4.0"
-
 esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -5229,11 +5145,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
 has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -5522,11 +5433,6 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-callable@^1.1.4, is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
-
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -5548,11 +5454,6 @@ is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
 is-decimal@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
@@ -5645,13 +5546,6 @@ is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
-  dependencies:
-    has "^1.0.3"
-
 is-stream@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -5662,18 +5556,6 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
-is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -6454,11 +6336,6 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsx-ast-utils@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
-  integrity sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=
-
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -6561,11 +6438,6 @@ lodash@4.17.x, lodash@^4.17.10, lodash@^4.17.21, lodash@^4.17.4:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-lodash@^3.10.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-  integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
-
 lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -7313,26 +7185,6 @@ object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
-
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -8082,9 +7934,10 @@ react-native-lottie-splash-screen@^1.0.1:
     lottie-ios "3.2.3"
     lottie-react-native "^5.1.3"
 
-"react-native-mail@git+https://github.com/status-im/react-native-mail.git#refs/tags/v6.1.2-status":
+react-native-mail@6.1.1:
   version "6.1.1"
-  resolved "git+https://github.com/status-im/react-native-mail.git#6d28780dfe156dfed87d8a4ceba520cc7db019c5"
+  resolved "https://registry.yarnpkg.com/react-native-mail/-/react-native-mail-6.1.1.tgz#f1b1f8034c84d2510a93e4a2a795f0db5a13595e"
+  integrity sha512-pTs180wwyh7hN/iyTC9SfOX579U4YhDlHOLxi47IGvhPJENqO/QFdBq+wWKxyhNqdQuVSy+LoeIxLreWnIeYmg==
 
 react-native-navigation@7.38.3:
   version "7.38.3"
@@ -8588,21 +8441,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-"rn-snoopy@git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status":
-  version "2.0.2"
-  resolved "git+https://github.com/status-im/rn-snoopy.git#f23dc13469c6c2a694649f658cdc1d1eaf8def64"
-  dependencies:
-    eslint-plugin-jsx-a11y "5.1.1"
-    lodash "^3.10.0"
-    rxjs "5.5.2"
-
-rxjs@5.5.2:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.2.tgz#28d403f0071121967f18ad665563255d54236ac3"
-  integrity sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==
-  dependencies:
-    symbol-observable "^1.0.1"
-
 rxjs@^7.0.0:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
@@ -9003,40 +8841,6 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.trimend@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
-string.prototype.trimleft@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimstart "^1.0.0"
-
-string.prototype.trimright@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimend "^1.0.0"
-
-string.prototype.trimstart@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string_decoder@^1.0.0, string_decoder@^1.0.3, string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -9164,11 +8968,6 @@ svg-arc-to-cubic-bezier@^3.0.0:
   resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz#390c450035ae1c4a0104d90650304c3bc814abe6"
   integrity sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==
 
-symbol-observable@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
 tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"