Merge branch 'master' into dependabot/npm_and_yarn/jest-26.6.3

package.json

@@ -20,9 +20,9 @@
     "react-native": "0.61.5",
     "react-native-gesture-handler": "^1.3.0",
     "react-native-linear-gradient": "^2.5.6",
-    "react-native-localize": "^2.0.2",
+    "react-native-localize": "^1.3.1",
     "react-native-vector-icons": "^6.6.0",
-    "react-navigation": "^3.11.1",
+    "react-navigation": "^4.4.4",
     "react-redux": "^7.1.1",
     "reactotron-react-native": "^5.0.0",
     "reactotron-redux": "^3.1.2",
@@ -49,8 +49,8 @@
     "eslint-plugin-react": "^7.14.3",
     "jest": "^26.6.3",
     "metro-react-native-babel-preset": "^0.56.0",
-    "prettier": "^1.18.2",
-    "react-test-renderer": "16.13.0"
+    "prettier": "^2.2.1",
+    "react-test-renderer": "16.9.0"
   },
   "jest": {
     "preset": "react-native"

yarn.lock

@@ -2964,18 +2964,13 @@ eslint-config-airbnb@^17.1.1:
     object.assign "^4.1.0"
     object.entries "^1.1.0"
 
-eslint-config-prettier@^6.10.1:
+eslint-config-prettier@^6.0.0, eslint-config-prettier@^6.10.1:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
   integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-config-prettier@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
-  integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==
-
 eslint-import-resolver-babel-plugin-root-import@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-plugin-root-import/-/eslint-import-resolver-babel-plugin-root-import-1.1.1.tgz#b060f1177557918389f7ed476e5b36a43854a381"
@@ -6522,10 +6517,10 @@ reactotron-core-client@2.8.10:
   resolved "https://registry.yarnpkg.com/reactotron-core-client/-/reactotron-core-client-2.8.10.tgz#798f2a7aa9fd7e18e7a510531a613e8ae3008eb0"
   integrity sha512-SYRO4OCutJzfWMnaULUGVyETZnMDCU5ECNflXyM3Z5Gnfxp/wV6d7jYonhfxHdpU/aGb4Eg15C22myOCXSu6HQ==
 
-reactotron-react-native@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/reactotron-react-native/-/reactotron-react-native-5.0.0.tgz#e495630927cb720940f5d8cc7d768f162b32c1a7"
-  integrity sha512-7nLrMkLXU9jiHymbB6oBqf8z+vww1AbDcUdMmLqX0obdIHyC8XJB0yRazWajKQC92kamkL+q2q4mH9HRSsYCEA==
+reactotron-react-native@^4.0.2:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/reactotron-react-native/-/reactotron-react-native-4.2.0.tgz#762a2152bb3ab607d64d594c1f1f74471c26b569"
+  integrity sha512-id+U1OuKpCbGK+cYiBv9NeDNmxkLUOdUzo0UGExhKmFpcvqn44uh/LNiR+/loCs2ABPaAFMdhQLZKJsWiAAUrA==
   dependencies:
     mitt "1.1.3"
     query-string "6.10.1"
@@ -8266,4 +8261,4 @@ yargs@^9.0.0:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    yargs-parser "^7.0.0"