upgrade rn-camera

status-im · Mar 29, 2019 · 96f637f · 96f637f
1 parent 430c800
commit 96f637f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -152,6 +152,7 @@ android {
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86-64"
         }
+        missingDimensionStrategy 'react-native-camera', 'general'
     }
     /**
      * Arbitrary project metadata

diff --git a/mobile_files/package.json.orig b/mobile_files/package.json.orig
@@ -35,7 +35,7 @@
     "react-dom": "16.4.2",
     "react-native": "git+https://github.com/status-im/react-native.git#status-v0.59.2",
     "react-native-background-timer": "2.1.0-alpha.6",
-    "react-native-camera": "git+https://github.com/status-im/react-native-camera.git#v1.1.5-1-status",
+    "react-native-camera": "^2.1.1",
     "react-native-config": "git+https://github.com/status-im/react-native-config.git#0.11.2-1",
     "react-native-crypto": "2.1.1",
     "react-native-dialogs": "1.0.2",

diff --git a/mobile_files/yarn.lock b/mobile_files/yarn.lock
@@ -3865,7 +3865,7 @@ lodash@^3.10.0:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -5197,12 +5197,12 @@ react-native-background-timer@2.1.0-alpha.6:
   resolved "https://registry.yarnpkg.com/react-native-background-timer/-/react-native-background-timer-2.1.0-alpha.6.tgz#f8495a9c44d80295c088b09c59d88fdf0a8d6ecd"
   integrity sha512-2J87AlGjDsfujxdEGXJxqYpSVyNrgcfwqh0PDwesQoOCqmiIkLA7N0tLE4joB9N0oYMraIteFYaiUu8jJdO7oA==
 
-"react-native-camera@git+https://github.com/status-im/react-native-camera.git#v1.1.5-1-status":
-  version "1.1.5"
-  resolved "git+https://github.com/status-im/react-native-camera.git#6de8c8d1ba28906ab014d717a33a7b6f73c433c5"
+react-native-camera@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/react-native-camera/-/react-native-camera-2.1.1.tgz#437cc62613b386d648baabc4b77147ab33d84558"
+  integrity sha512-lcsV4Pt7Ex402Zof3EYaBhLxytU3wefyxpoSCvQyZ1LligdAmsYwyCZeODj1Otcjuxw3gH/skgr0rl/kRPOq8g==
   dependencies:
-    lodash "^4.17.4"
-    prop-types "^15.5.10"
+    prop-types "^15.6.2"
 
 "react-native-config@git+https://github.com/status-im/react-native-config.git#0.11.2-1":
   version "0.11.2"

diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs
@@ -8,7 +8,8 @@
             [status-im.ui.components.status-bar.view :as status-bar]
             [status-im.ui.components.toolbar.view :as toolbar]
             [status-im.ui.screens.qr-scanner.styles :as styles]
-            [status-im.ui.components.toolbar.actions :as actions]))
+            [status-im.ui.components.toolbar.actions :as actions]
+            [status-im.utils.platform :as platform]))
 
 (defview qr-scanner-toolbar [title identifier]
   [react/view