chore(deps,rn) update navigation librarries to their latest versions

React Navigation v6.
2022-01-07 15:11:58 +01:00 · 2022-01-07 15:11:58 +01:00 · 61ae909ed5
parent 55e6cc027b
commit 61ae909ed5
18 changed files with 262 additions and 222 deletions
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@ -76,6 +76,7 @@ dependencies {
    implementation project(':react-native-immersive')
    implementation project(':react-native-keep-awake')
    implementation project(':react-native-masked-view_masked-view')
+    implementation project(':react-native-pager-view')
    implementation project(':react-native-performance')
    implementation project(':react-native-reanimated')
    implementation project(':react-native-safe-area-context')
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@ -181,6 +181,7 @@ class ReactInstanceManagerHolder {
                new com.facebook.react.shell.MainReactPackage(),
                new com.reactnativecommunity.clipboard.ClipboardPackage(),
                new com.reactnativecommunity.netinfo.NetInfoPackage(),
+                new com.reactnativepagerview.PagerViewPackage(),
                new com.oblador.performance.PerformancePackage(),
                new com.reactnativecommunity.slider.ReactSliderPackage(),
                new com.brentvatne.react.ReactVideoPackage(),
--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -29,6 +29,8 @@ include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
 include ':react-native-masked-view_masked-view'
 project(':react-native-masked-view_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-masked-view/masked-view/android')
+include ':react-native-pager-view'
+project(':react-native-pager-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-pager-view/android')
 include ':react-native-performance'
 project(':react-native-performance').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-performance/android')
 include ':react-native-reanimated'
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -291,6 +291,8 @@ PODS:
    - React
  - react-native-netinfo (7.1.7):
    - React-Core
+  - react-native-pager-view (5.4.9):
+    - React-Core
  - react-native-performance (2.1.0):
    - React-Core
  - react-native-safe-area-context (3.3.2):
@ -380,15 +382,16 @@ PODS:
    - React-Core
  - RNDeviceInfo (8.4.8):
    - React-Core
-  - RNGestureHandler (1.10.3):
+  - RNGestureHandler (2.1.0):
    - React-Core
  - RNGoogleSignin (7.0.4):
    - GoogleSignIn (~> 6.0.0)
    - React-Core
  - RNReanimated (1.13.3):
    - React-Core
-  - RNScreens (2.18.1):
+  - RNScreens (3.10.1):
    - React-Core
+    - React-RCTImage
  - RNSound (0.11.1):
    - React-Core
    - RNSound/Core (= 0.11.1)
@ -428,6 +431,7 @@ DEPENDENCIES:
  - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
  - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
  - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
+  - react-native-pager-view (from `../node_modules/react-native-pager-view`)
  - react-native-performance (from `../node_modules/react-native-performance/ios`)
  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
  - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
@ -524,6 +528,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-keep-awake"
  react-native-netinfo:
    :path: "../node_modules/@react-native-community/netinfo"
+  react-native-pager-view:
+    :path: "../node_modules/react-native-pager-view"
  react-native-performance:
    :path: "../node_modules/react-native-performance/ios"
  react-native-safe-area-context:
@ -628,6 +634,7 @@ SPEC CHECKSUMS:
  react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
  react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
  react-native-netinfo: 27f287f2d191693f3b9d01a4273137fcf91c3b5d
+  react-native-pager-view: 3ee7d4c7697fb3ef788346e834a60cca97ed8540
  react-native-performance: f4b6604a9d5a8a7407e34a82fab6c641d9a3ec12
  react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
  react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
@ -651,10 +658,10 @@ SPEC CHECKSUMS:
  RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
  RNDefaultPreference: 326860d42a681bfd7338c8f6d061cf58745bd860
  RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
-  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
+  RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a
  RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
  RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
-  RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
+  RNScreens: 522705f2e5c9d27efb17f24aceb2bf8335bc7b8e
  RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
  RNSVG: ce9d996113475209013317e48b05c21ee988d42e
  RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
--- a/package-lock.json
+++ b/package-lock.json
@ -41,11 +41,12 @@
        "@react-native-community/slider": "4.1.12",
        "@react-native-google-signin/google-signin": "7.0.4",
        "@react-native-masked-view/masked-view": "0.2.6",
-        "@react-navigation/bottom-tabs": "5.11.15",
-        "@react-navigation/drawer": "5.12.9",
-        "@react-navigation/material-top-tabs": "5.3.19",
-        "@react-navigation/native": "5.9.8",
-        "@react-navigation/stack": "5.14.9",
+        "@react-navigation/bottom-tabs": "6.0.9",
+        "@react-navigation/drawer": "6.1.8",
+        "@react-navigation/elements": "1.2.1",
+        "@react-navigation/material-top-tabs": "6.0.6",
+        "@react-navigation/native": "6.0.6",
+        "@react-navigation/stack": "6.0.11",
        "@svgr/webpack": "4.3.2",
        "@xmldom/xmldom": "0.7.5",
        "amplitude-js": "8.2.1",
@ -87,20 +88,21 @@
        "react-native-collapsible": "1.6.0",
        "react-native-default-preference": "github:kevinresol/react-native-default-preference#11bff5eb05cb04fd8d35b5e761eeee80525e8c6c",
        "react-native-device-info": "8.4.8",
-        "react-native-gesture-handler": "1.10.3",
+        "react-native-gesture-handler": "2.1.0",
        "react-native-get-random-values": "1.7.2",
        "react-native-immersive": "2.0.0",
        "react-native-keep-awake": "4.0.0",
+        "react-native-pager-view": "5.4.9",
        "react-native-paper": "4.11.1",
        "react-native-performance": "2.1.0",
        "react-native-reanimated": "1.13.3",
        "react-native-safe-area-context": "3.3.2",
-        "react-native-screens": "2.18.1",
+        "react-native-screens": "3.10.1",
        "react-native-sound": "0.11.1",
        "react-native-splash-screen": "3.3.0",
        "react-native-svg": "12.1.0",
        "react-native-svg-transformer": "1.0.0",
-        "react-native-tab-view": "2.16.0",
+        "react-native-tab-view": "3.1.1",
        "react-native-url-polyfill": "1.3.0",
        "react-native-video": "5.2.0",
        "react-native-watch-connectivity": "1.0.4",
@ -2117,11 +2119,14 @@
      }
    },
    "node_modules/@babel/plugin-transform-object-assign": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.2.0.tgz",
-      "integrity": "sha512-nmE55cZBPFgUktbF2OuoZgPRadfxosLOpSgzEPYotKSls9J4pEPcembi8r78RU37Rph6UApCpNmsQA4QMWK9Ng==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.16.7.tgz",
+      "integrity": "sha512-R8mawvm3x0COTJtveuoqZIjNypn2FjfvXZr4pSQ8VhEFBuQGBz4XhHasZtHXjgXU4XptZ4HtGof3NoYc93ZH9Q==",
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
      },
      "peerDependencies": {
        "@babel/core": "^7.0.0-0"
@ -4542,30 +4547,31 @@
      }
    },
    "node_modules/@react-navigation/bottom-tabs": {
-      "version": "5.11.15",
-      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-5.11.15.tgz",
-      "integrity": "sha512-TBY419W6aN/HZg98xbVp5Bx1HEF5sXuHR5f55W6KMI4k2AvxlwelKD1wbfvEcX2iuQT0YUiiXsACRFUSECYhkw==",
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-6.0.9.tgz",
+      "integrity": "sha512-uRoq6Zd7lPNnLqNQkKC28eR62tpqcDeuakZU1sO8N46FtvrcTuNLoIlssrGty3GF7ALBIxCypn4A93t3nbmMrQ==",
      "dependencies": {
+        "@react-navigation/elements": "^1.2.1",
        "color": "^3.1.3",
-        "react-native-iphone-x-helper": "^1.3.0"
+        "warn-once": "^0.1.0"
      },
      "peerDependencies": {
-        "@react-navigation/native": "^5.0.5",
+        "@react-navigation/native": "^6.0.0",
        "react": "*",
        "react-native": "*",
-        "react-native-safe-area-context": ">= 0.6.0",
-        "react-native-screens": ">= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0"
+        "react-native-safe-area-context": ">= 3.0.0",
+        "react-native-screens": ">= 3.0.0"
      }
    },
    "node_modules/@react-navigation/core": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.16.1.tgz",
-      "integrity": "sha512-3AToC7vPNeSNcHFLd1h71L6u34hfXoRAS1CxF9Fc4uC8uOrVqcNvphpeFbE0O9Bw6Zpl0BnMFl7E5gaL3KGzNA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.1.0.tgz",
+      "integrity": "sha512-LyZqD/ZCXSK9+ES8KiH+0tU+7aL84jUw1N9OxZfEuns/OcnSXKC3sOO+9NQ9XRowB1wLUfJhmqZ8G8rUlg33fQ==",
      "dependencies": {
-        "@react-navigation/routers": "^5.7.4",
+        "@react-navigation/routers": "^6.1.0",
        "escape-string-regexp": "^4.0.0",
-        "nanoid": "^3.1.15",
-        "query-string": "^6.13.6",
+        "nanoid": "^3.1.23",
+        "query-string": "^7.0.0",
        "react-is": "^16.13.0"
      },
      "peerDependencies": {
@ -4584,9 +4590,9 @@
      }
    },
    "node_modules/@react-navigation/core/node_modules/query-string": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-      "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz",
+      "integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==",
      "dependencies": {
        "decode-uri-component": "^0.2.0",
        "filter-obj": "^1.1.0",
@ -4609,47 +4615,59 @@
      }
    },
    "node_modules/@react-navigation/drawer": {
-      "version": "5.12.9",
-      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-5.12.9.tgz",
-      "integrity": "sha512-SYb2BCEAn+BiEwC6WBfCzs1VlWD+ZdQbxmsim6vo1o+ndPW2e+kiq7FXKRs0vUXhQRZVl2oOB3vBn0c3YCllQg==",
+      "version": "6.1.8",
+      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.1.8.tgz",
+      "integrity": "sha512-kYE2EO5dianUuUcaYmAlYBcgtmvGm2fxWTQ5sn103cgPNidp4KBUR9ClkhF+btfRaHKq+8Ul5M6qvL0mBAv/Lg==",
      "dependencies": {
+        "@react-navigation/elements": "^1.2.1",
        "color": "^3.1.3",
-        "react-native-iphone-x-helper": "^1.3.0"
+        "warn-once": "^0.1.0"
      },
      "peerDependencies": {
-        "@react-navigation/native": "^5.0.5",
+        "@react-navigation/native": "^6.0.0",
        "react": "*",
        "react-native": "*",
        "react-native-gesture-handler": ">= 1.0.0",
        "react-native-reanimated": ">= 1.0.0",
-        "react-native-safe-area-context": ">= 0.6.0",
-        "react-native-screens": ">= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0"
+        "react-native-safe-area-context": ">= 3.0.0",
+        "react-native-screens": ">= 3.0.0"
+      }
+    },
+    "node_modules/@react-navigation/elements": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz",
+      "integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg==",
+      "peerDependencies": {
+        "@react-navigation/native": "^6.0.0",
+        "react": "*",
+        "react-native": "*",
+        "react-native-safe-area-context": ">= 3.0.0"
      }
    },
    "node_modules/@react-navigation/material-top-tabs": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@react-navigation/material-top-tabs/-/material-top-tabs-5.3.19.tgz",
-      "integrity": "sha512-I7bEF99THxxcY7kCUZ5pPmwXr6kgo6L2sg3P1YJo+CcBWSGvGiHyNbZXNs15HuKRuFvEuueChNV9n8QuKBWbDA==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/@react-navigation/material-top-tabs/-/material-top-tabs-6.0.6.tgz",
+      "integrity": "sha512-kbm/0jndRVeGdAgOd4NcDSdSQiYeA7fkctCKbPxe3mT36j9qOqpfHfmd2dbv/VbNCngdTtZ3/+QMxTIViZGy7g==",
      "dependencies": {
-        "color": "^3.1.3"
+        "color": "^3.1.3",
+        "warn-once": "^0.1.0"
      },
      "peerDependencies": {
-        "@react-navigation/native": "^5.0.5",
+        "@react-navigation/native": "^6.0.0",
        "react": "*",
        "react-native": "*",
-        "react-native-gesture-handler": ">= 1.0.0",
-        "react-native-reanimated": ">= 1.0.0",
-        "react-native-tab-view": ">= 2.0.0"
+        "react-native-pager-view": ">= 4.0.0",
+        "react-native-tab-view": ">= 3.0.0"
      }
    },
    "node_modules/@react-navigation/native": {
-      "version": "5.9.8",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.9.8.tgz",
-      "integrity": "sha512-DNbcDHXQPSFDLn51kkVVJjT3V7jJy2GztNYZe/2bEg29mi5QEcHHcpifjMCtyFKntAOWzKlG88UicIQ17UEghg==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.6.tgz",
+      "integrity": "sha512-XzL7YPsaRRQgdCQSXbA8PJWLN2I4lhUUvSFoKQPNO4DS6y8eqZI1V8COPYlJg8+tsetGV5J8jt+jVjWL7h6ZrQ==",
      "dependencies": {
-        "@react-navigation/core": "^5.16.1",
+        "@react-navigation/core": "^6.1.0",
        "escape-string-regexp": "^4.0.0",
-        "nanoid": "^3.1.15"
+        "nanoid": "^3.1.23"
      },
      "peerDependencies": {
        "react": "*",
@ -4668,29 +4686,29 @@
      }
    },
    "node_modules/@react-navigation/routers": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.7.4.tgz",
-      "integrity": "sha512-0N202XAqsU/FlE53Nmh6GHyMtGm7g6TeC93mrFAFJOqGRKznT0/ail+cYlU6tNcPA9AHzZu1Modw1eoDINSliQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
+      "integrity": "sha512-8xJL+djIzpFdRW/sGlKojQ06fWgFk1c5jER9501HYJ12LF5DIJFr/tqBI2TJ6bk+y+QFu0nbNyeRC80OjRlmkA==",
      "dependencies": {
-        "nanoid": "^3.1.15"
+        "nanoid": "^3.1.23"
      }
    },
    "node_modules/@react-navigation/stack": {
-      "version": "5.14.9",
-      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-5.14.9.tgz",
-      "integrity": "sha512-DuvrT9P+Tz8ezZLQYxORZqOGqO+vEufaxlW1hSLw1knLD4jNxkz8TJDXtfKwaz//9gb43UhTNccNM02vm7iPqQ==",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.0.11.tgz",
+      "integrity": "sha512-Osc2mXi0Zh/u92HRCceDqVfVnypTa2sZgYMJDU+vDhHz38negtbCG+cjje6nApSjwC5WTVhYP4OoD5WBSh51+g==",
      "dependencies": {
+        "@react-navigation/elements": "^1.2.1",
        "color": "^3.1.3",
-        "react-native-iphone-x-helper": "^1.3.0"
+        "warn-once": "^0.1.0"
      },
      "peerDependencies": {
-        "@react-native-community/masked-view": ">= 0.1.0",
-        "@react-navigation/native": "^5.0.5",
+        "@react-navigation/native": "^6.0.0",
        "react": "*",
        "react-native": "*",
        "react-native-gesture-handler": ">= 1.0.0",
-        "react-native-safe-area-context": ">= 0.6.0",
-        "react-native-screens": ">= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0"
+        "react-native-safe-area-context": ">= 3.0.0",
+        "react-native-screens": ">= 3.0.0"
      }
    },
    "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
@ -7240,22 +7258,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/cross-fetch": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
-      "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
-      "dependencies": {
-        "node-fetch": "2.6.1"
-      }
-    },
-    "node_modules/cross-fetch/node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      }
-    },
    "node_modules/cross-spawn": {
      "version": "6.0.5",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@ -15178,6 +15180,17 @@
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
    },
+    "node_modules/react-freeze": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.0.tgz",
+      "integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0"
+      }
+    },
    "node_modules/react-i18next": {
      "version": "10.11.4",
      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-10.11.4.tgz",
@ -15305,31 +15318,17 @@
      }
    },
    "node_modules/react-native-gesture-handler": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.10.3.tgz",
-      "integrity": "sha512-cBGMi1IEsIVMgoox4RvMx7V2r6bNKw0uR1Mu1o7NbuHS6BRSVLq0dP34l2ecnPlC+jpWd3le6Yg1nrdCjby2Mw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.1.0.tgz",
+      "integrity": "sha512-vF4yEUrV5GMBioTkvf5Le1l3N/52dSLBnNMFC+kZ4hssnRoXB0hEQ0ReUkZckRB5L3nbHBhAyjySEtFPx4nyEA==",
      "dependencies": {
        "@egjs/hammerjs": "^2.0.17",
-        "fbjs": "^3.0.0",
        "hoist-non-react-statics": "^3.3.0",
        "invariant": "^2.2.4",
+        "lodash": "^4.17.21",
        "prop-types": "^15.7.2"
      }
    },
-    "node_modules/react-native-gesture-handler/node_modules/fbjs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz",
-      "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==",
-      "dependencies": {
-        "cross-fetch": "^3.0.4",
-        "fbjs-css-vars": "^1.0.0",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.18"
-      }
-    },
    "node_modules/react-native-get-random-values": {
      "version": "1.7.2",
      "resolved": "https://registry.npmjs.org/react-native-get-random-values/-/react-native-get-random-values-1.7.2.tgz",
@ -15362,6 +15361,15 @@
      "resolved": "https://registry.npmjs.org/react-native-keep-awake/-/react-native-keep-awake-4.0.0.tgz",
      "integrity": "sha512-0Fotox+eLXQooeibVs3P60yASYUWjtRw9MZNmbuHt5UZQrgUrAKsE4jm7gTr4tPU1m1RkwGzcgUFpcOkh/ec7g=="
    },
+    "node_modules/react-native-pager-view": {
+      "version": "5.4.9",
+      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-5.4.9.tgz",
+      "integrity": "sha512-D6tzxpwMGdl6CXgtskGWhKRc5cJakCazESRGt7PkqnpyiH3N35ft1KmR82pCSQetAFlytFiToeu3a/dG5CELvA==",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
    "node_modules/react-native-paper": {
      "version": "4.11.1",
      "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.11.1.tgz",
@ -15422,9 +15430,13 @@
      }
    },
    "node_modules/react-native-screens": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.18.1.tgz",
-      "integrity": "sha512-r5WZLpmx2hHjC1RgMdPq5YpSU9tEhBpUaZ5M1SUtNIONyiLqQVxabhRCINdebIk4depJiIl7yw2Q85zJyeX6fw==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.10.1.tgz",
+      "integrity": "sha512-ZF/XHnRsuinvDY1XiCWLXxoUoSf+NgsAes2SZfX9rFQQcv128zmh/+19SSavGrSf6rQNzqytEMdRGI6yr4Gbjw==",
+      "dependencies": {
+        "react-freeze": "^1.0.0",
+        "warn-once": "^0.1.0"
+      },
      "peerDependencies": {
        "react": "*",
        "react-native": "*"
@ -15893,14 +15905,13 @@
      }
    },
    "node_modules/react-native-tab-view": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-2.16.0.tgz",
-      "integrity": "sha512-ac2DmT7+l13wzIFqtbfXn4wwfgtPoKzWjjZyrK1t+T8sdemuUvD4zIt+UImg03fu3s3VD8Wh/fBrIdcqQyZJWg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-3.1.1.tgz",
+      "integrity": "sha512-M5pRN6utQfytKWoKlKVzg5NbkYu308qNoW1khGTtEOTs1k14p2dHJ/BWOJoJYHKbPVUyZldbG9MFT7gUl4YHnw==",
      "peerDependencies": {
        "react": "*",
        "react-native": "*",
-        "react-native-gesture-handler": "*",
-        "react-native-reanimated": "*"
+        "react-native-pager-view": "*"
      }
    },
    "node_modules/react-native-url-polyfill": {
@ -18862,6 +18873,11 @@
        "makeerror": "1.0.12"
      }
    },
+    "node_modules/warn-once": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.0.tgz",
+      "integrity": "sha512-recZTSvuaH/On5ZU5ywq66y99lImWqzP93+AiUo9LUwG8gXHW+LJjhOd6REJHm7qb0niYqrEQJvbHSQfuJtTqA=="
+    },
    "node_modules/warning": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
@ -21772,11 +21788,11 @@
      }
    },
    "@babel/plugin-transform-object-assign": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.2.0.tgz",
-      "integrity": "sha512-nmE55cZBPFgUktbF2OuoZgPRadfxosLOpSgzEPYotKSls9J4pEPcembi8r78RU37Rph6UApCpNmsQA4QMWK9Ng==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.16.7.tgz",
+      "integrity": "sha512-R8mawvm3x0COTJtveuoqZIjNypn2FjfvXZr4pSQ8VhEFBuQGBz4XhHasZtHXjgXU4XptZ4HtGof3NoYc93ZH9Q==",
      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.16.7"
      }
    },
    "@babel/plugin-transform-object-super": {
@ -23617,23 +23633,24 @@
      "integrity": "sha512-303CxmetUmgiX9NSUxatZkNh9qTYYdiM8xkGf9I3Uj20U3eGY3M78ljeNQ4UVCJA+FNGS5nC1dtS9GjIqvB4dg=="
    },
    "@react-navigation/bottom-tabs": {
-      "version": "5.11.15",
-      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-5.11.15.tgz",
-      "integrity": "sha512-TBY419W6aN/HZg98xbVp5Bx1HEF5sXuHR5f55W6KMI4k2AvxlwelKD1wbfvEcX2iuQT0YUiiXsACRFUSECYhkw==",
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/@react-navigation/bottom-tabs/-/bottom-tabs-6.0.9.tgz",
+      "integrity": "sha512-uRoq6Zd7lPNnLqNQkKC28eR62tpqcDeuakZU1sO8N46FtvrcTuNLoIlssrGty3GF7ALBIxCypn4A93t3nbmMrQ==",
      "requires": {
+        "@react-navigation/elements": "^1.2.1",
        "color": "^3.1.3",
-        "react-native-iphone-x-helper": "^1.3.0"
+        "warn-once": "^0.1.0"
      }
    },
    "@react-navigation/core": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.16.1.tgz",
-      "integrity": "sha512-3AToC7vPNeSNcHFLd1h71L6u34hfXoRAS1CxF9Fc4uC8uOrVqcNvphpeFbE0O9Bw6Zpl0BnMFl7E5gaL3KGzNA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.1.0.tgz",
+      "integrity": "sha512-LyZqD/ZCXSK9+ES8KiH+0tU+7aL84jUw1N9OxZfEuns/OcnSXKC3sOO+9NQ9XRowB1wLUfJhmqZ8G8rUlg33fQ==",
      "requires": {
-        "@react-navigation/routers": "^5.7.4",
+        "@react-navigation/routers": "^6.1.0",
        "escape-string-regexp": "^4.0.0",
-        "nanoid": "^3.1.15",
-        "query-string": "^6.13.6",
+        "nanoid": "^3.1.23",
+        "query-string": "^7.0.0",
        "react-is": "^16.13.0"
      },
      "dependencies": {
@ -23643,9 +23660,9 @@
          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
        },
        "query-string": {
-          "version": "6.14.1",
-          "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-          "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz",
+          "integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==",
          "requires": {
            "decode-uri-component": "^0.2.0",
            "filter-obj": "^1.1.0",
@ -23661,30 +23678,37 @@
      }
    },
    "@react-navigation/drawer": {
-      "version": "5.12.9",
-      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-5.12.9.tgz",
-      "integrity": "sha512-SYb2BCEAn+BiEwC6WBfCzs1VlWD+ZdQbxmsim6vo1o+ndPW2e+kiq7FXKRs0vUXhQRZVl2oOB3vBn0c3YCllQg==",
+      "version": "6.1.8",
+      "resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.1.8.tgz",
+      "integrity": "sha512-kYE2EO5dianUuUcaYmAlYBcgtmvGm2fxWTQ5sn103cgPNidp4KBUR9ClkhF+btfRaHKq+8Ul5M6qvL0mBAv/Lg==",
      "requires": {
+        "@react-navigation/elements": "^1.2.1",
        "color": "^3.1.3",
-        "react-native-iphone-x-helper": "^1.3.0"
+        "warn-once": "^0.1.0"
      }
    },
+    "@react-navigation/elements": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz",
+      "integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg=="
+    },
    "@react-navigation/material-top-tabs": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@react-navigation/material-top-tabs/-/material-top-tabs-5.3.19.tgz",
-      "integrity": "sha512-I7bEF99THxxcY7kCUZ5pPmwXr6kgo6L2sg3P1YJo+CcBWSGvGiHyNbZXNs15HuKRuFvEuueChNV9n8QuKBWbDA==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/@react-navigation/material-top-tabs/-/material-top-tabs-6.0.6.tgz",
+      "integrity": "sha512-kbm/0jndRVeGdAgOd4NcDSdSQiYeA7fkctCKbPxe3mT36j9qOqpfHfmd2dbv/VbNCngdTtZ3/+QMxTIViZGy7g==",
      "requires": {
-        "color": "^3.1.3"
+        "color": "^3.1.3",
+        "warn-once": "^0.1.0"
      }
    },
    "@react-navigation/native": {
-      "version": "5.9.8",
-      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.9.8.tgz",
-      "integrity": "sha512-DNbcDHXQPSFDLn51kkVVJjT3V7jJy2GztNYZe/2bEg29mi5QEcHHcpifjMCtyFKntAOWzKlG88UicIQ17UEghg==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.0.6.tgz",
+      "integrity": "sha512-XzL7YPsaRRQgdCQSXbA8PJWLN2I4lhUUvSFoKQPNO4DS6y8eqZI1V8COPYlJg8+tsetGV5J8jt+jVjWL7h6ZrQ==",
      "requires": {
-        "@react-navigation/core": "^5.16.1",
+        "@react-navigation/core": "^6.1.0",
        "escape-string-regexp": "^4.0.0",
-        "nanoid": "^3.1.15"
+        "nanoid": "^3.1.23"
      },
      "dependencies": {
        "escape-string-regexp": {
@ -23695,20 +23719,21 @@
      }
    },
    "@react-navigation/routers": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.7.4.tgz",
-      "integrity": "sha512-0N202XAqsU/FlE53Nmh6GHyMtGm7g6TeC93mrFAFJOqGRKznT0/ail+cYlU6tNcPA9AHzZu1Modw1eoDINSliQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
+      "integrity": "sha512-8xJL+djIzpFdRW/sGlKojQ06fWgFk1c5jER9501HYJ12LF5DIJFr/tqBI2TJ6bk+y+QFu0nbNyeRC80OjRlmkA==",
      "requires": {
-        "nanoid": "^3.1.15"
+        "nanoid": "^3.1.23"
      }
    },
    "@react-navigation/stack": {
-      "version": "5.14.9",
-      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-5.14.9.tgz",
-      "integrity": "sha512-DuvrT9P+Tz8ezZLQYxORZqOGqO+vEufaxlW1hSLw1knLD4jNxkz8TJDXtfKwaz//9gb43UhTNccNM02vm7iPqQ==",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.0.11.tgz",
+      "integrity": "sha512-Osc2mXi0Zh/u92HRCceDqVfVnypTa2sZgYMJDU+vDhHz38negtbCG+cjje6nApSjwC5WTVhYP4OoD5WBSh51+g==",
      "requires": {
+        "@react-navigation/elements": "^1.2.1",
        "color": "^3.1.3",
-        "react-native-iphone-x-helper": "^1.3.0"
+        "warn-once": "^0.1.0"
      }
    },
    "@svgr/babel-plugin-add-jsx-attribute": {
@ -25769,21 +25794,6 @@
        "parse-json": "^4.0.0"
      }
    },
-    "cross-fetch": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
-      "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
-      "requires": {
-        "node-fetch": "2.6.1"
-      },
-      "dependencies": {
-        "node-fetch": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
-        }
-      }
-    },
    "cross-spawn": {
      "version": "6.0.5",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@ -31982,6 +31992,11 @@
        }
      }
    },
+    "react-freeze": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.0.tgz",
+      "integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw=="
+    },
    "react-i18next": {
      "version": "10.11.4",
      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-10.11.4.tgz",
@ -32124,31 +32139,15 @@
      "integrity": "sha512-92676ZWHZHsPM/EW1ulgb2MuVfjYfMWRTWMbLcrCsipkcMaZ9Traz5mpsnCS7KZpsOksnvUinzDIjsct2XGc6Q=="
    },
    "react-native-gesture-handler": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.10.3.tgz",
-      "integrity": "sha512-cBGMi1IEsIVMgoox4RvMx7V2r6bNKw0uR1Mu1o7NbuHS6BRSVLq0dP34l2ecnPlC+jpWd3le6Yg1nrdCjby2Mw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.1.0.tgz",
+      "integrity": "sha512-vF4yEUrV5GMBioTkvf5Le1l3N/52dSLBnNMFC+kZ4hssnRoXB0hEQ0ReUkZckRB5L3nbHBhAyjySEtFPx4nyEA==",
      "requires": {
        "@egjs/hammerjs": "^2.0.17",
-        "fbjs": "^3.0.0",
        "hoist-non-react-statics": "^3.3.0",
        "invariant": "^2.2.4",
+        "lodash": "^4.17.21",
        "prop-types": "^15.7.2"
-      },
-      "dependencies": {
-        "fbjs": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz",
-          "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==",
-          "requires": {
-            "cross-fetch": "^3.0.4",
-            "fbjs-css-vars": "^1.0.0",
-            "loose-envify": "^1.0.0",
-            "object-assign": "^4.1.0",
-            "promise": "^7.1.1",
-            "setimmediate": "^1.0.5",
-            "ua-parser-js": "^0.7.18"
-          }
-        }
      }
    },
    "react-native-get-random-values": {
@ -32174,6 +32173,11 @@
      "resolved": "https://registry.npmjs.org/react-native-keep-awake/-/react-native-keep-awake-4.0.0.tgz",
      "integrity": "sha512-0Fotox+eLXQooeibVs3P60yASYUWjtRw9MZNmbuHt5UZQrgUrAKsE4jm7gTr4tPU1m1RkwGzcgUFpcOkh/ec7g=="
    },
+    "react-native-pager-view": {
+      "version": "5.4.9",
+      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-5.4.9.tgz",
+      "integrity": "sha512-D6tzxpwMGdl6CXgtskGWhKRc5cJakCazESRGt7PkqnpyiH3N35ft1KmR82pCSQetAFlytFiToeu3a/dG5CELvA=="
+    },
    "react-native-paper": {
      "version": "4.11.1",
      "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-4.11.1.tgz",
@ -32220,9 +32224,13 @@
      "integrity": "sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q=="
    },
    "react-native-screens": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.18.1.tgz",
-      "integrity": "sha512-r5WZLpmx2hHjC1RgMdPq5YpSU9tEhBpUaZ5M1SUtNIONyiLqQVxabhRCINdebIk4depJiIl7yw2Q85zJyeX6fw=="
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.10.1.tgz",
+      "integrity": "sha512-ZF/XHnRsuinvDY1XiCWLXxoUoSf+NgsAes2SZfX9rFQQcv128zmh/+19SSavGrSf6rQNzqytEMdRGI6yr4Gbjw==",
+      "requires": {
+        "react-freeze": "^1.0.0",
+        "warn-once": "^0.1.0"
+      }
    },
    "react-native-sound": {
      "version": "0.11.1",
@ -32484,9 +32492,9 @@
      }
    },
    "react-native-tab-view": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-2.16.0.tgz",
-      "integrity": "sha512-ac2DmT7+l13wzIFqtbfXn4wwfgtPoKzWjjZyrK1t+T8sdemuUvD4zIt+UImg03fu3s3VD8Wh/fBrIdcqQyZJWg=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-3.1.1.tgz",
+      "integrity": "sha512-M5pRN6utQfytKWoKlKVzg5NbkYu308qNoW1khGTtEOTs1k14p2dHJ/BWOJoJYHKbPVUyZldbG9MFT7gUl4YHnw=="
    },
    "react-native-url-polyfill": {
      "version": "1.3.0",
@ -34731,6 +34739,11 @@
        "makeerror": "1.0.12"
      }
    },
+    "warn-once": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.0.tgz",
+      "integrity": "sha512-recZTSvuaH/On5ZU5ywq66y99lImWqzP93+AiUo9LUwG8gXHW+LJjhOd6REJHm7qb0niYqrEQJvbHSQfuJtTqA=="
+    },
    "warning": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
--- a/package.json
+++ b/package.json
@ -46,11 +46,12 @@
    "@react-native-community/slider": "4.1.12",
    "@react-native-google-signin/google-signin": "7.0.4",
    "@react-native-masked-view/masked-view": "0.2.6",
-    "@react-navigation/bottom-tabs": "5.11.15",
-    "@react-navigation/drawer": "5.12.9",
-    "@react-navigation/material-top-tabs": "5.3.19",
-    "@react-navigation/native": "5.9.8",
-    "@react-navigation/stack": "5.14.9",
+    "@react-navigation/bottom-tabs": "6.0.9",
+    "@react-navigation/drawer": "6.1.8",
+    "@react-navigation/elements": "1.2.1",
+    "@react-navigation/material-top-tabs": "6.0.6",
+    "@react-navigation/native": "6.0.6",
+    "@react-navigation/stack": "6.0.11",
    "@svgr/webpack": "4.3.2",
    "@xmldom/xmldom": "0.7.5",
    "amplitude-js": "8.2.1",
@ -92,20 +93,21 @@
    "react-native-collapsible": "1.6.0",
    "react-native-default-preference": "github:kevinresol/react-native-default-preference#11bff5eb05cb04fd8d35b5e761eeee80525e8c6c",
    "react-native-device-info": "8.4.8",
-    "react-native-gesture-handler": "1.10.3",
+    "react-native-gesture-handler": "2.1.0",
    "react-native-get-random-values": "1.7.2",
    "react-native-immersive": "2.0.0",
    "react-native-keep-awake": "4.0.0",
+    "react-native-pager-view": "5.4.9",
    "react-native-paper": "4.11.1",
    "react-native-performance": "2.1.0",
    "react-native-reanimated": "1.13.3",
    "react-native-safe-area-context": "3.3.2",
-    "react-native-screens": "2.18.1",
+    "react-native-screens": "3.10.1",
    "react-native-sound": "0.11.1",
    "react-native-splash-screen": "3.3.0",
    "react-native-svg": "12.1.0",
    "react-native-svg-transformer": "1.0.0",
-    "react-native-tab-view": "2.16.0",
+    "react-native-tab-view": "3.1.1",
    "react-native-url-polyfill": "1.3.0",
    "react-native-video": "5.2.0",
    "react-native-watch-connectivity": "1.0.4",
--- a/patches/react-native-gesture-handler+2.1.0.patch
+++ b/patches/react-native-gesture-handler+2.1.0.patch
@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native-gesture-handler/android/build.gradle b/node_modules/react-native-gesture-handler/android/build.gradle
+index 8afc3d5..4b1f721 100644
+--- a/node_modules/react-native-gesture-handler/android/build.gradle
+++ b/node_modules/react-native-gesture-handler/android/build.gradle
+@@ -26,7 +26,7 @@ def shouldUseCommonInterfaceFromReanimated() {
+         def json = new JsonSlurper().parseText(inputFile.text)
+         def reanimatedVersion = json.version as String
+         def (major, minor, patch) = reanimatedVersion.tokenize('.')
+-        return Integer.parseInt(minor) >= 3
+        return Integer.parseInt(major) >= 2 && Integer.parseInt(minor) >= 3
+     } else {
+         return false
+     }
--- a/react/features/base/modal/components/JitsiKeyboardAvoidingView.js
+++ b/react/features/base/modal/components/JitsiKeyboardAvoidingView.js
@ -1,6 +1,6 @@
 // @flow

-import { useHeaderHeight } from '@react-navigation/stack';
+import { useHeaderHeight } from '@react-navigation/elements';
 import React, { useEffect, useState } from 'react';
 import {
    KeyboardAvoidingView,
--- a/react/features/chat/components/native/ChatAndPolls.js
+++ b/react/features/chat/components/native/ChatAndPolls.js
@ -27,7 +27,7 @@ const ChatAndPolls = () => {
                height: clientHeight,
                width: clientWidth
            }}
-            tabBarOptions = {{
+            screenOptions = {{
                ...chatTabBarOptions
            }}>
            <ChatTab.Screen
--- a/react/features/conference/components/native/ConferenceNavigationContainer.js
+++ b/react/features/conference/components/native/ConferenceNavigationContainer.js
@ -64,7 +64,9 @@ const ConferenceNavigationContainer = () => {
                theme = { navigationContainerTheme }>
                <ConferenceStack.Navigator
                    initialRouteName = { screen.conference.main }
-                    mode = 'modal'>
+                    screenOptions = {{
+                        presentation: 'modal'
+                    }}>
                    <ConferenceStack.Screen
                        component = { Conference }
                        name = { screen.conference.main }
--- a/react/features/conference/components/native/ConferenceNavigatorScreenOptions.js
+++ b/react/features/conference/components/native/ConferenceNavigatorScreenOptions.js
@ -164,12 +164,12 @@ export const lobbyScreenOptions = {
 * Tab bar options for chat screen.
 */
 export const chatTabBarOptions = {
-    activeTintColor: BaseTheme.palette.screen01Header,
-    labelStyle: {
+    tabBarActiveTintColor: BaseTheme.palette.screen01Header,
+    tabBarLabelStyle: {
        fontSize: BaseTheme.typography.labelRegular.fontSize
    },
-    inactiveTintColor: BaseTheme.palette.field02Disabled,
-    indicatorStyle: {
+    tabBarInactiveTintColor: BaseTheme.palette.field02Disabled,
+    tabBarIndicatorStyle: {
        backgroundColor: BaseTheme.palette.screen01Header
    }
 };
--- a/react/features/conference/components/native/routes.js
+++ b/react/features/conference/components/native/routes.js
@ -1,4 +1,5 @@
 export const screen = {
+    root: 'Root',
    welcome: {
        main: 'Home',
        tabs: {
--- a/react/features/welcome/components/RootNavigationContainer.js
+++ b/react/features/welcome/components/RootNavigationContainer.js
@ -38,16 +38,16 @@ const RootNavigationContainer = ({ isWelcomePageAvailable }: Props) => (
            ref = { rootNavigationRef }
            theme = { navigationContainerTheme }>
            <RootStack.Navigator
-                initialRouteName = { screen.welcome.main }>
+                initialRouteName = { screen.root }>
                {
                    isWelcomePageAvailable
                        ? <RootStack.Screen
                            component = { WelcomePageNavigationContainer }
-                            name = { screen.welcome.main }
+                            name = { screen.root }
                            options = { drawerNavigatorScreenOptions } />
                        : <RootStack.Screen
                            component = { BlankPage }
-                            name = { screen.welcome.main } />
+                            name = { screen.root } />
                }
                <RootStack.Screen
                    component = { DialInSummary }
--- a/react/features/welcome/components/WelcomePageNavigationContainer.js
+++ b/react/features/welcome/components/WelcomePageNavigationContainer.js
@ -19,7 +19,7 @@ import TermsView from '../components/terms/components/TermsView';
 import CustomDrawerContent from './CustomDrawerContent';
 import WelcomePage from './WelcomePage.native';
 import { drawerContentOptions } from './constants';
-import styles from './styles';
+

 const DrawerStack = createDrawerNavigator();

@ -31,8 +31,7 @@ const WelcomePageNavigationContainer = () => {
        <DrawerStack.Navigator
            /* eslint-disable-next-line react/jsx-no-bind */
            drawerContent = { props => <CustomDrawerContent { ...props } /> }
-            drawerContentOptions = { drawerContentOptions }
-            drawerStyle = { styles.drawerStyle }>
+            screenOptions = { drawerContentOptions }>
            <DrawerStack.Screen
                component = { WelcomePage }
                name = { screen.welcome.main }
--- a/react/features/welcome/components/WelcomePageTabs.js
+++ b/react/features/welcome/components/WelcomePageTabs.js
@ -39,7 +39,10 @@ const WelcomePageTabs = ({ disabled }: Props) => {

    return (
        <WelcomePage.Navigator
-            tabBarOptions = { tabBarOptions }>
+            screenOptions = {{
+                headerShown: false,
+                ...tabBarOptions
+            }}>
            <WelcomePage.Screen
                name = { screen.welcome.tabs.recent }
                options = { recentListTabBarOptions }>
--- a/react/features/welcome/components/constants.js
+++ b/react/features/welcome/components/constants.js
@ -4,9 +4,13 @@ import BaseTheme from '../../base/ui/components/BaseTheme';


 export const drawerContentOptions = {
-    activeBackgroundColor: BaseTheme.palette.ui12,
-    activeTintColor: BaseTheme.palette.screen01Header,
-    labelStyle: {
+    drawerActiveBackgroundColor: BaseTheme.palette.ui12,
+    drawerActiveTintColor: BaseTheme.palette.screen01Header,
+    drawerLabelStyle: {
        marginLeft: BaseTheme.spacing[2]
+    },
+    drawerStyle: {
+        backgroundColor: BaseTheme.palette.ui12,
+        width: '54%'
    }
 };
--- a/react/features/welcome/components/styles.js
+++ b/react/features/welcome/components/styles.js
@ -81,14 +81,6 @@ export default {
        fontSize: 14
    },

-    /**
-     * Drawer style.
-     */
-    drawerStyle: {
-        backgroundColor: BaseTheme.palette.ui12,
-        width: '54%'
-    },
-
    /**
     * The style of the display name label in the side bar.
     */
--- a/react/features/welcome/constants.js
+++ b/react/features/welcome/constants.js
@ -10,12 +10,12 @@ import TabIcon from './components/TabIcon';
 export const INACTIVE_TAB_COLOR = BaseTheme.palette.tab01Disabled;

 export const tabBarOptions = {
-    activeTintColor: BaseTheme.palette.icon01,
-    inactiveTintColor: INACTIVE_TAB_COLOR,
-    labelStyle: {
+    tabBarActiveTintColor: BaseTheme.palette.icon01,
+    tabBarInactiveTintColor: INACTIVE_TAB_COLOR,
+    tabBarLabelStyle: {
        fontSize: 12
    },
-    style: {
+    tabBarStyle: {
        backgroundColor: BaseTheme.palette.screen01Header
    }
 };