Use original uri as translation source instead of destination

2021-05-25 18:41:54 +02:00 · 2021-05-25 18:41:54 +02:00 · 64cb47f7ab
parent f8366bb777
commit 64cb47f7ab
5 changed files with 213 additions and 76 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -371,7 +371,7 @@ PODS:
    - React-Core
  - react-native-netinfo (6.0.0):
    - React-Core
-  - react-native-pager-view (5.1.7):
+  - react-native-pager-view (5.1.9):
    - React-Core
  - react-native-safe-area-context (3.2.0):
    - React-Core
@ -482,7 +482,7 @@ PODS:
    - Yoga
  - RNScreens (3.2.0):
    - React-Core
-  - RNSentry (2.4.2):
+  - RNSentry (2.4.3):
    - React-Core
    - Sentry (= 6.1.4)
  - RNSVG (12.1.1):
@ -855,7 +855,7 @@ SPEC CHECKSUMS:
  react-native-blurhash: ec98d751a9cb9075cef0b9e3188244c517d6ab22
  react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
  react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d
-  react-native-pager-view: c60a26be051a4b88427f2475e173b5c112e98d17
+  react-native-pager-view: 14653de580178af7e65aa7e3fa08b4f243c86d4d
  react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
  react-native-segmented-control: 65df6cd0619b780b3843d574a72d4c7cec396097
  React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675
@ -876,7 +876,7 @@ SPEC CHECKSUMS:
  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
  RNReanimated: b8c8004b43446e3c2709fe64b2b41072f87428ad
  RNScreens: c277bfc4b5bb7c2fe977d19635df6f974f95dfd6
-  RNSentry: e86fb2e2fec0365644f4b582938bf66be515acce
+  RNSentry: 6f8f9ee7e4c939dcd35e5633b94d0e3782888e46
  RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
  SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
--- a/package.json
+++ b/package.json
@ -32,12 +32,12 @@
    "@react-native-community/masked-view": "0.1.11",
    "@react-native-community/netinfo": "6.0.0",
    "@react-native-community/segmented-control": "2.2.2",
-    "@react-navigation/bottom-tabs": "^5.11.10",
+    "@react-navigation/bottom-tabs": "^5.11.11",
    "@react-navigation/native": "^5.9.4",
    "@react-navigation/stack": "^5.14.5",
    "@reduxjs/toolkit": "^1.5.1",
-    "@sentry/react-native": "^2.4.2",
-    "@sharcoux/slider": "^5.2.1",
+    "@sentry/react-native": "^2.4.3",
+    "@sharcoux/slider": "^5.3.0",
    "axios": "^0.21.1",
    "expo": "^41.0.1",
    "expo-auth-session": "~3.2.3",
@ -58,7 +58,7 @@
    "expo-store-review": "~4.0.2",
    "expo-video-thumbnails": "~5.1.0",
    "expo-web-browser": "~9.1.0",
-    "i18next": "^20.2.2",
+    "i18next": "^20.3.0",
    "li": "^1.3.0",
    "lodash": "^4.17.21",
    "react": "17.0.2",
@ -72,7 +72,7 @@
    "react-native-flash-message": "^0.1.23",
    "react-native-gesture-handler": "~1.10.3",
    "react-native-htmlview": "^0.16.0",
-    "react-native-pager-view": "5.1.7",
+    "react-native-pager-view": "5.1.9",
    "react-native-reanimated": "~2.1.0",
    "react-native-safe-area-context": "3.2.0",
    "react-native-screens": "~3.2.0",
@ -90,38 +90,38 @@
    "valid-url": "^1.0.9"
  },
  "devDependencies": {
-    "@babel/core": "~7.14.2",
+    "@babel/core": "~7.14.3",
    "@babel/plugin-proposal-optional-chaining": "^7.14.2",
    "@babel/preset-typescript": "^7.13.0",
-    "@expo/config": "^3.3.40",
+    "@expo/config": "^3.3.42",
    "@jest/types": "^26.6.2",
    "@testing-library/jest-native": "^4.0.1",
    "@testing-library/react-hooks": "^5.1.2",
    "@testing-library/react-native": "^7.2.0",
    "@types/jest": "^26.0.23",
-    "@types/lodash": "^4.14.169",
-    "@types/react": "~17.0.5",
-    "@types/react-dom": "~17.0.4",
+    "@types/lodash": "^4.14.170",
+    "@types/react": "~17.0.6",
+    "@types/react-dom": "~17.0.5",
    "@types/react-native": "~0.64.5",
    "@types/react-navigation": "^3.4.0",
    "@types/react-redux": "^7.1.16",
    "@types/react-test-renderer": "^17.0.1",
    "@types/react-timeago": "^4.1.2",
    "@types/valid-url": "^1.0.3",
-    "@welldone-software/why-did-you-render": "^6.1.1",
+    "@welldone-software/why-did-you-render": "^6.1.4",
    "babel-jest": "~26.6.3",
    "babel-plugin-module-resolver": "^4.1.0",
    "babel-plugin-transform-remove-console": "^6.9.4",
    "chalk": "^4.1.1",
-    "dotenv": "^9.0.2",
+    "dotenv": "^10.0.0",
    "jest": "^26.6.3",
    "jest-expo": "^41.0.0",
    "nock": "^13.0.11",
-    "react-native-clean-project": "^3.6.3",
+    "react-native-clean-project": "^3.6.4",
    "react-navigation": "^4.4.4",
    "react-navigation-stack": "^2.10.4",
    "react-test-renderer": "^17.0.2",
    "typescript": "~4.2.4",
-    "uri-scheme": "^1.0.77"
+    "uri-scheme": "^1.0.79"
  }
 }
--- a/src/components/Timeline/Shared/Translate.tsx
+++ b/src/components/Timeline/Shared/Translate.tsx
@ -1,7 +1,6 @@
 import analytics from '@components/analytics'
 import { ParseHTML } from '@components/Parse'
 import { useTranslateQuery } from '@utils/queryHooks/translate'
-import { getInstanceUri } from '@utils/slices/instancesSlice'
 import { getSettingsLanguage } from '@utils/slices/settingsSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
@ -46,11 +45,9 @@ const TimelineTranslate = React.memo(
      }
    }

-    const instanceUri = useSelector(getInstanceUri)
    const [enabled, setEnabled] = useState(false)
    const { refetch, data, isLoading, isSuccess, isError } = useTranslateQuery({
-      instance: instanceUri!,
-      id: status.id,
+      uri: status.uri,
      source: status.language,
      target: settingsLanguage,
      text,
--- a/src/utils/queryHooks/translate.ts
+++ b/src/utils/queryHooks/translate.ts
@ -13,8 +13,7 @@ type Translations = {
 export type QueryKeyTranslate = [
  'Translate',
  {
-    instance: string
-    id: string
+    uri: string
    source: string
    target: string
    text: string[]
@ -31,16 +30,22 @@ const queryFunction = async ({ queryKey }: { queryKey: QueryKeyTranslate }) => {
    return Promise.reject()
  }

-  const { instance, id, source, target, text } = queryKey[1]
+  const { uri, source, target, text } = queryKey[1]
+
+  const uriEncoded = Buffer.from(uri.replace(/https?:\/\//, ''))
+    .toString('base64')
+    .replace('+', '-')
+    .replace('/', '_')
+    .replace(/=+$/, '')
+  const original = Buffer.from(JSON.stringify({ source, text })).toString(
+    'base64'
+  )

  const res = await apiGeneral<Translations>({
    domain: TRANSLATE_SERVER,
    method: 'get',
-    url: `v1/translate/${instance}/${id}/${target}`,
-    headers: {
-      key,
-      original: Buffer.from(JSON.stringify({ source, text })).toString('base64')
-    }
+    url: `v1/translate/${uriEncoded}/${target}`,
+    headers: { key, original }
  })
  return res.body
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -64,17 +64,17 @@
    semver "^6.3.0"
    source-map "^0.5.0"

-"@babel/core@~7.14.2":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.2.tgz#54e45334ffc0172048e5c93ded36461d3ad4c417"
-  integrity sha512-OgC1mON+l4U4B4wiohJlQNUU3H73mpTyYY3j/c8U9dr9UagGGSm+WFpzjy/YLdoyjiG++c1kIDgxCo/mLwQJeQ==
+"@babel/core@~7.14.3":
+  version "7.14.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38"
+  integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==
  dependencies:
    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.14.2"
+    "@babel/generator" "^7.14.3"
    "@babel/helper-compilation-targets" "^7.13.16"
    "@babel/helper-module-transforms" "^7.14.2"
    "@babel/helpers" "^7.14.0"
-    "@babel/parser" "^7.14.2"
+    "@babel/parser" "^7.14.3"
    "@babel/template" "^7.12.13"
    "@babel/traverse" "^7.14.2"
    "@babel/types" "^7.14.2"
@ -103,6 +103,15 @@
    jsesc "^2.5.1"
    source-map "^0.5.0"

+"@babel/generator@^7.14.3":
+  version "7.14.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"
+  integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==
+  dependencies:
+    "@babel/types" "^7.14.2"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.12.13":
  version "7.12.13"
  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
@ -344,6 +353,11 @@
  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.2.tgz#0c1680aa44ad4605b16cbdcc5c341a61bde9c746"
  integrity sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==

+"@babel/parser@^7.14.3":
+  version "7.14.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz#9b530eecb071fd0c93519df25c5ff9f14759f298"
+  integrity sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
  version "7.13.12"
  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
@ -1277,12 +1291,32 @@
    xcode "^3.0.1"
    xml2js "^0.4.23"

+"@expo/config-plugins@1.0.32":
+  version "1.0.32"
+  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-1.0.32.tgz#abf4ab24a1cfd53e824fefdf15f727687491a856"
+  integrity sha512-goQoBvWYq1fk/jdDYYioN5gYlEhmPVRP6Y9jxmCLTHoHhZHSI+Pl5BXidUqVNdE2XFhoiz9yLbjQrGgYFPXuwQ==
+  dependencies:
+    "@expo/config-types" "^40.0.0-beta.2"
+    "@expo/configure-splash-screen" "0.4.0"
+    "@expo/image-utils" "0.3.14"
+    "@expo/json-file" "8.2.30"
+    "@expo/plist" "0.0.13"
+    find-up "~5.0.0"
+    fs-extra "9.0.0"
+    getenv "^1.0.0"
+    glob "7.1.6"
+    resolve-from "^5.0.0"
+    slash "^3.0.0"
+    slugify "^1.3.4"
+    xcode "^3.0.1"
+    xml2js "^0.4.23"
+
 "@expo/config-types@^40.0.0-beta.2":
  version "40.0.0-beta.2"
  resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-40.0.0-beta.2.tgz#4fea4ef5654d02218b02b0b3772529a9ce5b0471"
  integrity sha512-t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg==

-"@expo/config@3.3.40", "@expo/config@^3.2.3", "@expo/config@^3.3.18", "@expo/config@^3.3.35", "@expo/config@^3.3.40":
+"@expo/config@3.3.40", "@expo/config@^3.2.3", "@expo/config@^3.3.18", "@expo/config@^3.3.35":
  version "3.3.40"
  resolved "https://registry.yarnpkg.com/@expo/config/-/config-3.3.40.tgz#5f9807826591c343801951cc4beb86a219024c2b"
  integrity sha512-a3zl/x0BW/cey3elL8DGFuBtnTcNH3KAeYHqDxfYNk/Xj5ZqtMTWoukC8ES4WBvzt38NtMCDEEca4RiUIxS4uQ==
@ -1302,6 +1336,26 @@
    semver "7.3.2"
    slugify "^1.3.4"

+"@expo/config@^3.3.42":
+  version "3.3.42"
+  resolved "https://registry.yarnpkg.com/@expo/config/-/config-3.3.42.tgz#668d3d47112e562ad9265ebafa3db0063369cff8"
+  integrity sha512-BLFp9JvMHkBFutwKM+o9RhvmdllSyQpswvY9974Y8gjYsO5/BXfvT5J0GyUt1bdtqGyA8dlfo5jew/mtkeStRA==
+  dependencies:
+    "@babel/core" "7.9.0"
+    "@babel/plugin-proposal-class-properties" "~7.12.13"
+    "@babel/preset-env" "~7.12.13"
+    "@babel/preset-typescript" "~7.12.13"
+    "@expo/config-plugins" "1.0.32"
+    "@expo/config-types" "^40.0.0-beta.2"
+    "@expo/json-file" "8.2.30"
+    fs-extra "9.0.0"
+    getenv "^1.0.0"
+    glob "7.1.6"
+    require-from-string "^2.0.2"
+    resolve-from "^5.0.0"
+    semver "7.3.2"
+    slugify "^1.3.4"
+
 "@expo/configure-splash-screen@0.3.4":
  version "0.3.4"
  resolved "https://registry.yarnpkg.com/@expo/configure-splash-screen/-/configure-splash-screen-0.3.4.tgz#b91d8f08fd96272bd3d7aaa9b51d6189b932c7cc"
@ -1318,6 +1372,20 @@
    xcode "^3.0.0"
    xml-js "^1.6.11"

+"@expo/configure-splash-screen@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@expo/configure-splash-screen/-/configure-splash-screen-0.4.0.tgz#dad43fccae4525e32ec25d22c7338b2c3cbf6170"
+  integrity sha512-IDPnr2/DW1tYpDHqedFYNCDzRTf9HYinWFQ7fOelNZLuOCMoErLbSStA5zfkv46o69AgcCpteqgKHSoxsIBz5g==
+  dependencies:
+    color-string "^1.5.3"
+    commander "^5.1.0"
+    fs-extra "^9.0.0"
+    glob "^7.1.6"
+    lodash "^4.17.15"
+    pngjs "^5.0.0"
+    xcode "^3.0.0"
+    xml-js "^1.6.11"
+
 "@expo/image-utils@0.3.13", "@expo/image-utils@^0.3.10":
  version "0.3.13"
  resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.13.tgz#cba070a61ce89e6c113b8e6afd5655cb83da6377"
@ -1335,6 +1403,23 @@
    semver "7.3.2"
    tempy "0.3.0"

+"@expo/image-utils@0.3.14":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.14.tgz#eea0d59c5845e8b19504011c20afd837c5d044c5"
+  integrity sha512-n+JkLZ71CWuNKLVVsPTzMGRwmbeKiVQw/2b99Ro7znCKzJy3tyE5T2C6WBvYh/5h/hjg8TqEODjXXWucRIzMXA==
+  dependencies:
+    "@expo/spawn-async" "1.5.0"
+    chalk "^4.0.0"
+    fs-extra "9.0.0"
+    getenv "^1.0.0"
+    jimp "0.12.1"
+    mime "^2.4.4"
+    node-fetch "^2.6.0"
+    parse-png "^2.1.0"
+    resolve-from "^5.0.0"
+    semver "7.3.2"
+    tempy "0.3.0"
+
 "@expo/json-file@8.2.29":
  version "8.2.29"
  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.2.29.tgz#5e66c4c1dc531a583fe654d99fe417246d91741d"
@ -1345,6 +1430,16 @@
    json5 "^1.0.1"
    write-file-atomic "^2.3.0"

+"@expo/json-file@8.2.30":
+  version "8.2.30"
+  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.2.30.tgz#bd855b6416b5c3af7e55b43f6761c1e7d2b755b0"
+  integrity sha512-vrgGyPEXBoFI5NY70IegusCSoSVIFV3T3ry4tjJg1MFQKTUlR7E0r+8g8XR6qC705rc2PawaZQjqXMAVtV6s2A==
+  dependencies:
+    "@babel/code-frame" "~7.10.4"
+    fs-extra "9.0.0"
+    json5 "^1.0.1"
+    write-file-atomic "^2.3.0"
+
 "@expo/metro-config@^0.1.16", "@expo/metro-config@^0.1.63":
  version "0.1.66"
  resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.1.66.tgz#5e9634333929ba7aee5b866b6e13eabd5ce029d2"
@ -1364,6 +1459,15 @@
    xmlbuilder "^14.0.0"
    xmldom "~0.5.0"

+"@expo/plist@0.0.13":
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.0.13.tgz#700a48d9927aa2b0257c613e13454164e7371a96"
+  integrity sha512-zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw==
+  dependencies:
+    base64-js "^1.2.3"
+    xmlbuilder "^14.0.0"
+    xmldom "~0.5.0"
+
 "@expo/react-native-action-sheet@^3.9.0":
  version "3.9.0"
  resolved "https://registry.yarnpkg.com/@expo/react-native-action-sheet/-/react-native-action-sheet-3.9.0.tgz#6f94f21fc1948e473589adb28cc4db7e48cee5bf"
@ -2248,10 +2352,10 @@
  resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-1.0.0.tgz#05bb0031533598f9458cf65a502b8df0eecae780"
  integrity sha512-0jbp4RxjYopTsIdLl+/Fy2TiwVYHy4mgeu07DG4b/LyM0OS/+lPP5c9sbnt/AMlnF6qz2JRZpPpGw1eMNS6A4w==

-"@react-navigation/bottom-tabs@^5.11.10":
-  version "5.11.10"
-  resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-5.11.10.tgz#9c20618caba8a1c33ddf8daa6ccb34c51ab9b1c3"
-  integrity sha512-vMdVhvUk4dfyVymh5pbWkQQhW2FoN13Aousuk9dktQx1XPQ/cUVEnB4De8SkxeHJE6mkr3JNk3G5kvodLpfaog==
+"@react-navigation/bottom-tabs@^5.11.11":
+  version "5.11.11"
+  resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-5.11.11.tgz#ad4dfee4316522d8c05b5a8ad460f597bddb9e3c"
+  integrity sha512-hThj6Vfw+ITzAVj5TgLEoxkVEcBD+gYeieWOe6FryBRgokgKNCzFQzqArJ5UCmNMxklNH0rstJfcdyHflLuPtw==
  dependencies:
    color "^3.1.3"
    react-native-iphone-x-helper "^1.3.0"
@ -2429,7 +2533,7 @@
    "@sentry/types" "6.3.6"
    tslib "^1.9.3"

-"@sentry/react-native@^2.2.1", "@sentry/react-native@^2.4.2":
+"@sentry/react-native@^2.2.1":
  version "2.4.2"
  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-2.4.2.tgz#82095e33a2dcd7720c2f71f35f02329ab7351547"
  integrity sha512-+GAH2cdbZBz+EJOpBGAvVRl2jExLYrZ/gfmHnew3NYGlE/77GX1KQGJ+sKLA6xnPtXjcC7tJ13uvbQD6cltZnQ==
@ -2444,6 +2548,21 @@
    "@sentry/utils" "6.2.1"
    "@sentry/wizard" "^1.2.2"

+"@sentry/react-native@^2.4.3":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-2.4.3.tgz#b8e922f46635275aaf7e28742a01a520b4aa8b90"
+  integrity sha512-kraiH2bkxOVis25S2Jq+Bjumh8s/GyeJlKis4AqQml28o6Ck3QbMFWWsyuuLJEuee6rkUBqPUoY+8NTp56GCNA==
+  dependencies:
+    "@sentry/browser" "6.2.1"
+    "@sentry/core" "6.2.1"
+    "@sentry/hub" "6.2.1"
+    "@sentry/integrations" "6.2.1"
+    "@sentry/react" "6.2.1"
+    "@sentry/tracing" "6.2.1"
+    "@sentry/types" "6.2.1"
+    "@sentry/utils" "6.2.1"
+    "@sentry/wizard" "^1.2.2"
+
 "@sentry/react@6.2.1":
  version "6.2.1"
  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.2.1.tgz#26587f3f47e9699003b04ac558d8aa8a2b7416d7"
@ -2509,10 +2628,10 @@
    xcode "3.0.1"
    yargs "^16.2.0"

-"@sharcoux/slider@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@sharcoux/slider/-/slider-5.2.1.tgz#6db39b348bfc20d8c6511f47a6b4d94f7d7d8f08"
-  integrity sha512-NF30QNcaD+W9DWttWK+sIbH6b9pPClbGswfSmnJHQB2dZsOUVsaSEPS6nX7ZSmuBFNrnxHaOlaxZPuIWFOHyOg==
+"@sharcoux/slider@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@sharcoux/slider/-/slider-5.3.0.tgz#095ff9fd9301aedb05483db8bed94c09cdda5660"
+  integrity sha512-JxEBoNXlFRvBsb5ZvAl8lp5cNa8rg9/umtufxbnqf4HBegqXGz1BaHSQwHtZJSW6XvD2SucciTNu1Cl8Fa9x9w==

 "@sideway/address@^4.1.0":
  version "4.1.2"
@ -2664,10 +2783,10 @@
    jest-diff "^26.0.0"
    pretty-format "^26.0.0"

-"@types/lodash@^4.14.169":
-  version "4.14.169"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.169.tgz#83c217688f07a4d9ef8f28a3ebd1d318f6ff4cbb"
-  integrity sha512-DvmZHoHTFJ8zhVYwCLWbQ7uAbYQEk52Ev2/ZiQ7Y7gQGeV9pjBqjnQpECMHfKS1rCYAhMI7LHVxwyZLZinJgdw==
+"@types/lodash@^4.14.170":
+  version "4.14.170"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.170.tgz#0d67711d4bf7f4ca5147e9091b847479b87925d6"
+  integrity sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==

 "@types/node@*":
  version "15.0.2"
@ -2694,13 +2813,20 @@
  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==

-"@types/react-dom@>=16.9.0", "@types/react-dom@~17.0.4":
+"@types/react-dom@>=16.9.0":
  version "17.0.4"
  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.4.tgz#d65159a847aca2a0fc87a7544a2f8fece8754d04"
  integrity sha512-Wb6rlnPJfqbhpkvYN39y1NM/pOGGPzzIRquu0RdUMvTwgXNvASFO7pdtrtvyxGTQNb9wzBaQxXAWDdEqegZw2A==
  dependencies:
    "@types/react" "*"

+"@types/react-dom@~17.0.5":
+  version "17.0.5"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.5.tgz#df44eed5b8d9e0b13bb0cd38e0ea6572a1231227"
+  integrity sha512-ikqukEhH4H9gr4iJCmQVNzTB307kROe3XFfHAOTxOXPOw7lAoEXnM5KWTkzeANGL5Ce6ABfiMl/zJBYNi7ObmQ==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-native@~0.64.5":
  version "0.64.5"
  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.64.5.tgz#219738b52b2e372ec057d3c8f20fbd6c37b245cd"
@ -2739,7 +2865,7 @@
  dependencies:
    "@types/react" "*"

-"@types/react@*", "@types/react@>=16.9.0", "@types/react@~17.0.5":
+"@types/react@*", "@types/react@>=16.9.0":
  version "17.0.5"
  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.5.tgz#3d887570c4489011f75a3fc8f965bf87d09a1bea"
  integrity sha512-bj4biDB9ZJmGAYTWSKJly6bMr4BLUiBrx9ujiJEoP9XIDY9CTaPGxE5QWN/1WjpPLzYF7/jRNnV2nNxNe970sw==
@ -2748,6 +2874,15 @@
    "@types/scheduler" "*"
    csstype "^3.0.2"

+"@types/react@~17.0.6":
+  version "17.0.6"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.6.tgz#0ec564566302c562bf497d73219797a5e0297013"
+  integrity sha512-u/TtPoF/hrvb63LdukET6ncaplYsvCvmkceasx8oG84/ZCsoLxz9Z/raPBP4lTAiWW1Jb889Y9svHmv8R26dWw==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/scheduler@*":
  version "0.16.1"
  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
@ -2801,10 +2936,10 @@
  dependencies:
    invariant "^2.2.4"

-"@welldone-software/why-did-you-render@^6.1.1":
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-6.1.1.tgz#3dcf66620fcafbf79e5260bd6ace5e51254055ac"
-  integrity sha512-BMFp33T4MC27qvCWsI1SqwZCxIlxoQXsPQFdGLDsPSg7sgoWX4Gzj0+hlKVrWrCBiIxi7gP2JcS9IK6CZzk8mg==
+"@welldone-software/why-did-you-render@^6.1.4":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-6.1.4.tgz#5a82ae7cb3e665851f945e71c1fd3cf2581e1732"
+  integrity sha512-DZ6vCjUdN4JvthDl4ejusDmIhz7LFZ4OgpOJtepQZWJN1JcNIM8nvFCwSiu+8yhVLcsBsGBurlVpsa4TpdVfJw==
  dependencies:
    lodash "^4"

@ -4264,10 +4399,10 @@ domutils@^1.5.1, domutils@^1.7.0:
    dom-serializer "0"
    domelementtype "1"

-dotenv@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
-  integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
+dotenv@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==

 ecc-jsbn@~0.1.1:
  version "0.1.2"
@ -5469,10 +5604,10 @@ human-signals@^1.1.1:
  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==

-i18next@^20.2.2:
-  version "20.2.2"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-20.2.2.tgz#175644829dcf35546ba8c174583acfe449e4ef1a"
-  integrity sha512-uWCv9LzKpe+OwvnKKrb8CbJwgAhasQofD58cB0PQ6bTPXEl5PlItl5C4esmY8HtriLu9nrjc2Hi0IfYv3Fy8BQ==
+i18next@^20.3.0:
+  version "20.3.0"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-20.3.0.tgz#9558b431241fb1dbbd445174391ede65d0a68ed9"
+  integrity sha512-eFv4aQvaGykp48mI4JEaCcoD/j4zoYjFnDYhChe3ukwvbHx3q4mKZlB8YnmhYrHQR5FopLlCrzcSuY0ZWfiakA==
  dependencies:
    "@babel/runtime" "^7.12.0"

@ -8630,10 +8765,10 @@ react-native-blurhash@^1.1.4:
  resolved "https://registry.yarnpkg.com/react-native-blurhash/-/react-native-blurhash-1.1.4.tgz#820afd0ef1cea3b1d322d0448f92964286b85843"
  integrity sha512-lQFDVzrRGU0r3kC7I66MEiGKlzMeRVUm5Jt50rGZnXkm+kLK+LQDOwqEGxxn2Y2OMoDylzrccdX7mP9bf5BnLA==

-react-native-clean-project@^3.6.3:
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/react-native-clean-project/-/react-native-clean-project-3.6.3.tgz#ad43b8e1491512f285b7f455ac56db3328b5a65f"
-  integrity sha512-sBbv+Zl05O9LfQqamLu2Crb//W/d8+l59TICF8nKxQ0nJsvear06a1CB2+FaO3rCrPNHiSjDDNXZ/D6muHTUkw==
+react-native-clean-project@^3.6.4:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/react-native-clean-project/-/react-native-clean-project-3.6.4.tgz#7589fffe82a184f1bcc0554d6a95c7bac4b1e9ef"
+  integrity sha512-bQij/EktcOb9VnEUg+UaC4bePWlGeqsLk0dyCJyQmHc4s1Cw7lo+cnnFVbuyFnjT0sEMSkDvDF0/rLD6437XMw==

 react-native-codegen@^0.0.6:
  version "0.0.6"
@ -8686,10 +8821,10 @@ react-native-iphone-x-helper@^1.3.0:
  resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
  integrity sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg==

-react-native-pager-view@5.1.7:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-5.1.7.tgz#9ca5807e39801fc1135709ef6d495773eafa784e"
-  integrity sha512-mb7xa0XnMlNXrIE422vWKPBVlt0GBP21744zT8yEv6Xe/0aAM/dsDugD3dy9z4vybyp2yszAzw9XP0bIsfS6LA==
+react-native-pager-view@5.1.9:
+  version "5.1.9"
+  resolved "https://registry.yarnpkg.com/react-native-pager-view/-/react-native-pager-view-5.1.9.tgz#54dafe0ec459018c925ce319fb22df0f83d08d6c"
+  integrity sha512-cwBhjhr+n+VI3UHOGJg2bq9GHO/KmMuke/QH5T+hPdnS/wems5g4J96A8c+EjRCLuUrU1uSS0UQO4ONQN+5kfg==

 react-native-reanimated@~2.1.0:
  version "2.1.0"
@ -10265,10 +10400,10 @@ uri-js@^4.2.2:
  dependencies:
    punycode "^2.1.0"

-uri-scheme@^1.0.77:
-  version "1.0.77"
-  resolved "https://registry.yarnpkg.com/uri-scheme/-/uri-scheme-1.0.77.tgz#5e0704b48a397a1d02a000045011cce572df4653"
-  integrity sha512-bhVQC3Q5wv3BOGxjCWltCWjz4XNfFFpKgdsI0knDXq1zWs6IuHGXLAmV5X+QhXDDjrFrbUEmrv0eKNv15vKdKw==
+uri-scheme@^1.0.79:
+  version "1.0.79"
+  resolved "https://registry.yarnpkg.com/uri-scheme/-/uri-scheme-1.0.79.tgz#2057daa461267f84a9d49d80a0f6db0471393a38"
+  integrity sha512-x4mfjXdgWrTIy3FBZI3MDHRcLk3RODEywpKubT9oXmn4ruMhL852PQJOthi3mjgalz0nKF6aTB7udZhyJccf2w==

 urix@^0.1.0:
  version "0.1.0"