Merge pull request #375 from tooot-app/main

Release v4.3
2022-08-19 12:23:55 +02:00 · 2022-08-19 12:23:55 +02:00 · b0064a8f70
parent ec67666629 d1a737eb51
commit b0064a8f70
17 changed files with 272 additions and 423 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -32,7 +32,7 @@ PODS:
    - EXJSONUtils
  - EXNotifications (0.16.1):
    - ExpoModulesCore
-  - Expo (46.0.7):
+  - Expo (46.0.8):
    - ExpoModulesCore
  - ExpoCrypto (11.0.0):
    - ExpoModulesCore
@ -42,7 +42,7 @@ PODS:
    - ExpoModulesCore
  - ExpoLocalization (13.1.0):
    - ExpoModulesCore
-  - ExpoModulesCore (0.11.3):
+  - ExpoModulesCore (0.11.4):
    - React-Core
    - ReactCommon/turbomodule/core
  - ExpoRandom (12.3.0):
@ -564,15 +564,15 @@ PODS:
    - React-RCTText
    - ReactCommon/turbomodule/core
    - Yoga
-  - RNScreens (3.15.0):
+  - RNScreens (3.16.0):
    - React-Core
    - React-RCTImage
-  - RNSentry (4.2.3):
+  - RNSentry (4.2.4):
    - React-Core
    - Sentry (= 7.23.0)
  - RNShareMenu (6.0.0):
    - React
-  - RNSVG (12.4.4):
+  - RNSVG (13.0.0):
    - React-Core
  - SDWebImage (5.13.2):
    - SDWebImage/Core (= 5.13.2)
@ -879,12 +879,12 @@ SPEC CHECKSUMS:
  EXJSONUtils: 2a74b8f40f1523cc3f92af99c91aa78201737a77
  EXManifests: b38dc61303f5eede990b4c8ecbfac32f82160e65
  EXNotifications: 9a2aa201deb19dfe1dbe0e370eeb2922de0d2422
-  Expo: 8cb51419dfec611e6125e09384669eb71d3c4c6d
+  Expo: 2322364db3fe1adaa179787edb7e1bc6e5159c78
  ExpoCrypto: e534314db0e1a17ae12b5140d529bd0c5efcbc6a
  ExpoHaptics: efe9e68e9dfe0d15c183c0c70a25f3874124ab9e
  ExpoKeepAwake: 0e8f18142e71bbf2c7f6aa66ebed249ba1420320
  ExpoLocalization: 63204f4b9d4f653469d266332ceaa6c6ac8a305d
-  ExpoModulesCore: 8303cc952788be09fc6eab62815d257016ae6dec
+  ExpoModulesCore: e281bb7b78ea47e227dd5af94d04b24d8b2e1255
  ExpoRandom: f9f1faa299a40733867f344d6b7bfa2d1f4ab04d
  ExpoWebBrowser: 5804ac42a8269d0e534bc4461993005f72535649
  EXScreenCapture: 23de056fdb02edd1fb8f147b0fd198c6d5cada3d
@ -955,10 +955,10 @@ SPEC CHECKSUMS:
  RNFastImage: 8e9b5b9e6df94d2e359c0a75a4745ad1311506fd
  RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
  RNReanimated: 2cf7451318bb9cc430abeec8d67693f9cf4e039c
-  RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
-  RNSentry: 6798624706227656d942849d593f89c8ca3bdde5
+  RNScreens: ee31ecdf23fe81e93c74feaa086cf173d758ab58
+  RNSentry: 7495ba091f09f12902d8cf916024efd99b058efe
  RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3
-  RNSVG: ecd661f380a07ba690c9c5929c475a44f432d674
+  RNSVG: 42a0c731b11179ebbd27a3eeeafa7201ebb476ff
  SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
  SDWebImageWebPCoder: 3dc350894112feab5375cfba9ce0986544a66a69
  Sentry: a0d4563fa4ddacba31fdcc35daaa8573d87224d6
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "name": "tooot",
  "versions": {
    "major": 4,
-    "minor": 2,
+    "minor": 3,
    "patch": 0
  },
  "description": "tooot app for Mastodon",
@ -42,10 +42,10 @@
    "@react-navigation/native-stack": "^6.7.0",
    "@react-navigation/stack": "^6.2.2",
    "@reduxjs/toolkit": "^1.8.4",
-    "@sentry/react-native": "^4.2.2",
+    "@sentry/react-native": "^4.2.4",
    "@sharcoux/slider": "^6.0.3",
    "axios": "^0.27.2",
-    "expo": "^46.0.7",
+    "expo": "^46.0.8",
    "expo-auth-session": "^3.7.1",
    "expo-av": "^12.0.4",
    "expo-constants": "^13.2.3",
@ -65,12 +65,12 @@
    "expo-updates": "^0.14.4",
    "expo-video-thumbnails": "^6.4.0",
    "expo-web-browser": "^11.0.0",
-    "i18next": "^21.9.0",
+    "i18next": "^21.9.1",
    "li": "^1.3.0",
    "lodash": "^4.17.21",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
-    "react-i18next": "^11.18.3",
+    "react-i18next": "^11.18.4",
    "react-intl": "^6.0.5",
    "react-native": "^0.69.4",
    "react-native-animated-spinkit": "^1.5.2",
@ -87,9 +87,9 @@
    "react-native-pager-view": "^5.4.25",
    "react-native-reanimated": "^2.9.1",
    "react-native-safe-area-context": "^4.3.1",
-    "react-native-screens": "^3.15.0",
+    "react-native-screens": "^3.16.0",
    "react-native-share-menu": "^6.0.0",
-    "react-native-svg": "^12.4.4",
+    "react-native-svg": "^13.0.0",
    "react-native-swipe-list-view": "^3.2.9",
    "react-native-tab-view": "^3.1.1",
    "react-query": "^3.39.2",
@ -106,7 +106,7 @@
    "@babel/preset-react": "^7.18.6",
    "@babel/preset-typescript": "^7.18.6",
    "@expo/config": "^7.0.1",
-    "@types/lodash": "^4.14.182",
+    "@types/lodash": "^4.14.184",
    "@types/react": "^18.0.17",
    "@types/react-dom": "^18.0.6",
    "@types/react-native": "^0.69.5",
@ -124,4 +124,4 @@
    "react-native-clean-project": "^4.0.1",
    "typescript": "^4.7.4"
  }
-}
+}
--- a/patches/expo-modules-core+0.11.3.patch
+++ b/patches/expo-modules-core+0.11.3.patch
@ -1,27 +0,0 @@
-diff --git a/node_modules/expo-modules-core/android/build.gradle b/node_modules/expo-modules-core/android/build.gradle
-index a57c367..13b4427 100644
--- a/node_modules/expo-modules-core/android/build.gradle
-+++ b/node_modules/expo-modules-core/android/build.gradle
-@@ -422,18 +422,16 @@ task prepareFolly(dependsOn: [downloadFolly], type: Copy) {
- }
- // END FOLLy
- 
-task prepareHermes() {
-+task prepareHermes(dependsOn: createNativeDepsDirectories, type: Copy) {
-   if (!FOR_HERMES) {
-     return
-   }
- 
-   def soFiles = zipTree(HERMES_AAR).matching({ it.include "**/*.so" })
- 
-  copy {
-    from soFiles
-    from "$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/first-party/hermes/Android.mk"
-    into "$thirdPartyNdkDir/hermes"
-  }
-+  from soFiles
-+  from "$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/first-party/hermes/Android.mk"
-+  into "$thirdPartyNdkDir/hermes"
- }
- 
- task prepareThirdPartyNdkHeaders(dependsOn: [prepareBoost, prepareDoubleConversion, prepareFolly, prepareHermes]) {}
--- a/src/components/ContextMenu/account.ts
+++ b/src/components/ContextMenu/account.ts
@ -32,7 +32,7 @@ const contextMenuAccount = ({
  const { t } = useTranslation('componentContextMenu')

  const queryClient = useQueryClient()
-  const mutateion = useTimelineMutation({
+  const mutation = useTimelineMutation({
    onSuccess: (_, params) => {
      queryClient.refetchQueries(['Relationship', { id: accountId }])
      const theParams = params as MutationVarsTimelineUpdateAccountProperty
@ -65,8 +65,8 @@ const contextMenuAccount = ({
          err.data &&
          err.data.error &&
          typeof err.data.error === 'string' && {
-            description: err.data.error
-          })
+          description: err.data.error
+        })
      })
    },
    onSettled: () => {
@ -117,7 +117,7 @@ const contextMenuAccount = ({
      analytics('timeline_shared_headeractions_account_mute_press', {
        page: queryKey && queryKey[1].page
      })
-      mutateion.mutate({
+      mutation.mutate({
        type: 'updateAccountProperty',
        queryKey,
        id: accountId,
@ -128,18 +128,18 @@ const contextMenuAccount = ({
      analytics('timeline_shared_headeractions_account_block_press', {
        page: queryKey && queryKey[1].page
      })
-      mutateion.mutate({
+      mutation.mutate({
        type: 'updateAccountProperty',
        queryKey,
        id: accountId,
        payload: { property: 'block', currentValue: relationship?.blocking }
      })
    }
-    if (actions[index].id === 'account-report') {
+    if (actions[index].id === 'account-reports') {
      analytics('timeline_shared_headeractions_account_reports_press', {
        page: queryKey && queryKey[1].page
      })
-      mutateion.mutate({
+      mutation.mutate({
        type: 'updateAccountProperty',
        queryKey,
        id: accountId,
--- a/src/components/ContextMenu/status.ts
+++ b/src/components/ContextMenu/status.ts
@ -54,13 +54,13 @@ const contextMenuStatus = ({
        message: t('common:message.error.message', {
          function: t(`status.${theFunction}.action`)
        }),
-        ...(err.status &&
+        ...(err?.status &&
          typeof err.status === 'number' &&
          err.data &&
          err.data.error &&
          typeof err.data.error === 'string' && {
-            description: err.data.error
-          })
+          description: err.data.error
+        })
      })
      queryClient.setQueryData(queryKey, oldData)
    }
@ -70,7 +70,7 @@ const contextMenuStatus = ({
    getInstanceAccount,
    (prev, next) => prev.id === next.id
  )
-  const ownAccount = instanceAccount?.id === status?.account.id
+  const ownAccount = instanceAccount?.id === status?.account?.id

  if (ownAccount) {
    const accountMenuItems: ContextMenuAction[] = [
--- a/src/components/Header/Center.tsx
+++ b/src/components/Header/Center.tsx
@ -22,12 +22,7 @@ const HeaderCenter: React.FC<Props> = ({
  const { colors } = useTheme()

  return (
-    <View
-      style={{
-        flexDirection: 'row',
-        alignItems: 'center'
-      }}
-    >
+    <View style={{ flexDirection: 'row', alignItems: 'center' }}>
      <CustomText
        style={{
          color: inverted ? colors.primaryOverlay : colors.primaryDefault
@ -38,15 +33,13 @@ const HeaderCenter: React.FC<Props> = ({
        children={content}
        {...(onPress && { onPress })}
      />
-      {dropdown ? (
-        <Icon
-          name='ChevronDown'
-          size={StyleConstants.Font.Size.M}
-          color={colors.primaryDefault}
-          style={{ marginLeft: StyleConstants.Spacing.XS }}
-          strokeWidth={3}
-        />
-      ) : null}
+      <Icon
+        name='ChevronDown'
+        size={StyleConstants.Font.Size.M}
+        color={colors.primaryDefault}
+        style={{ marginLeft: StyleConstants.Spacing.XS, opacity: dropdown ? undefined : 0 }}
+        strokeWidth={3}
+      />
    </View>
  )
 }
--- a/src/i18n/vi/components/contextMenu.json
+++ b/src/i18n/vi/components/contextMenu.json
@ -15,8 +15,8 @@
    }
  },
  "copy": {
-    "action": "",
-    "succeed": ""
+    "action": "Sao chép tút",
+    "succeed": "Đã sao chép"
  },
  "instance": {
    "title": "Hành động máy chủ",
--- a/src/i18n/vi/components/parse.json
+++ b/src/i18n/vi/components/parse.json
@ -1,8 +1,8 @@
 {
  "HTML": {
-    "accessibilityHint": "",
+    "accessibilityHint": "Nhấn để mở rộng hoặc thu gọn nội dung",
    "expanded": "{{hint}}{{totalLines}}",
-    "totalLines": "",
-    "defaultHint": ""
+    "totalLines": " ({{count}} dòng)",
+    "defaultHint": "Tút dài"
  }
 }
--- a/src/i18n/vi/screens/accountSelection.json
+++ b/src/i18n/vi/screens/accountSelection.json
@ -1,6 +1,6 @@
 {
-  "heading": "",
+  "heading": "Chia sẻ tới...",
  "content": {
-    "select_account": ""
+    "select_account": "Chọn tài khoản"
  }
 }
--- a/src/i18n/vi/screens/tabs.json
+++ b/src/i18n/vi/screens/tabs.json
@ -146,7 +146,7 @@
        "label": "Nhãn",
        "content": "Nội dung"
      },
-      "mediaSelectionFailed": ""
+      "mediaSelectionFailed": "Xử lý không thành công. Vui lòng thử lại."
    },
    "push": {
      "notAvailable": "Điện thoại của bạn chưa bật thông báo đẩy",
--- a/src/screens/Compose/EditAttachment.tsx
+++ b/src/screens/Compose/EditAttachment.tsx
@ -18,44 +18,32 @@ const ComposeEditAttachment: React.FC<ScreenComposeStackScreenProps<
  },
  navigation
 }) => {
-  const { t } = useTranslation('screenCompose')
+    const { t } = useTranslation('screenCompose')

-  const headerLeft = useCallback(
-    () => (
-      <HeaderLeft
-        type='icon'
-        content='ChevronDown'
-        onPress={() => navigation.goBack()}
-      />
-    ),
-    []
-  )
-
-  const children = useCallback(
-    () => <ComposeEditAttachmentRoot index={index} />,
-    []
-  )
-
-  return (
-    <KeyboardAvoidingView
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      style={{ flex: 1 }}
-    >
-      <SafeAreaView style={{ flex: 1 }} edges={['left', 'right', 'bottom']}>
-        <Stack.Navigator>
-          <Stack.Screen
-            name='Screen-Compose-EditAttachment-Root'
-            children={children}
-            options={{
-              headerLeft,
-              headerRight: () => <ComposeEditAttachmentSubmit index={index} />,
-              title: t('content.editAttachment.header.title')
-            }}
-          />
-        </Stack.Navigator>
-      </SafeAreaView>
-    </KeyboardAvoidingView>
-  )
-}
+    return (
+      <KeyboardAvoidingView
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        style={{ flex: 1 }}
+      >
+        <SafeAreaView style={{ flex: 1 }} edges={['left', 'right', 'bottom']}>
+          <Stack.Navigator>
+            <Stack.Screen
+              name='Screen-Compose-EditAttachment-Root'
+              children={() => <ComposeEditAttachmentRoot index={index} />}
+              options={{
+                headerLeft: () => <HeaderLeft
+                  type='icon'
+                  content='ChevronDown'
+                  onPress={() => navigation.goBack()}
+                />,
+                headerRight: () => <ComposeEditAttachmentSubmit index={index} />,
+                title: t('content.editAttachment.header.title')
+              }}
+            />
+          </Stack.Navigator>
+        </SafeAreaView>
+      </KeyboardAvoidingView>
+    )
+  }

 export default ComposeEditAttachment
--- a/src/screens/Compose/EditAttachment/Image.tsx
+++ b/src/screens/Compose/EditAttachment/Image.tsx
@ -5,16 +5,14 @@ import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Dimensions, Image, View } from 'react-native'
-import { PanGestureHandler } from 'react-native-gesture-handler'
+import { Gesture, GestureDetector } from 'react-native-gesture-handler'
 import Animated, {
  Extrapolate,
  interpolate,
  runOnJS,
-  useAnimatedGestureHandler,
  useAnimatedStyle,
  useSharedValue
 } from 'react-native-reanimated'
-import Svg, { Circle, G, Path } from 'react-native-svg'
 import ComposeContext from '../utils/createContext'

 export interface Props {
@ -30,30 +28,19 @@ const ComposeEditAttachmentImage: React.FC<Props> = ({ index }) => {
  const theAttachmentRemote = composeState.attachments.uploads[index].remote!
  const theAttachmentLocal = composeState.attachments.uploads[index].local

+  const windowWidth = Dimensions.get('window').width
+
  const imageWidthBase =
    theAttachmentRemote?.meta?.original?.aspect < 1
-      ? Dimensions.get('screen').width *
-        theAttachmentRemote?.meta?.original?.aspect
-      : Dimensions.get('screen').width
-  const padding = (Dimensions.get('screen').width - imageWidthBase) / 2
+      ? windowWidth * theAttachmentRemote?.meta?.original?.aspect
+      : windowWidth
  const imageDimensionis = {
    width: imageWidthBase,
    height:
      imageWidthBase /
-      ((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.original
-        ?.aspect || 1)
+      ((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.original?.aspect || 1)
  }

-  const panX = useSharedValue(
-    (((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.focus?.x || 0) *
-      imageDimensionis.width) /
-      2
-  )
-  const panY = useSharedValue(
-    (((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.focus?.y || 0) *
-      imageDimensionis.height) /
-      2
-  )
  const updateFocus = ({ x, y }: { x: number; y: number }) => {
    composeDispatch({
      type: 'attachment/edit',
@ -70,46 +57,50 @@ const ComposeEditAttachmentImage: React.FC<Props> = ({ index }) => {
    })
  }

-  type PanContext = {
-    startX: number
-    startY: number
-  }
-  const onGestureEvent = useAnimatedGestureHandler({
-    onStart: (_, context: PanContext) => {
-      context.startX = panX.value
-      context.startY = panY.value
-    },
-    onActive: ({ translationX, translationY }, context: PanContext) => {
-      panX.value = context.startX + translationX
-      panY.value = context.startY + translationY
-    },
-    onEnd: ({ translationX, translationY }, context: PanContext) => {
-      runOnJS(updateFocus)({
-        x: (context.startX + translationX) / (imageDimensionis.width / 2),
-        y: (context.startY + translationY) / (imageDimensionis.height / 2)
-      })
-    }
+  const pan = useSharedValue({
+    x:
+      (((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.focus?.x || 0) *
+        imageDimensionis.width) /
+      2,
+    y:
+      (((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.focus?.y || 0) *
+        imageDimensionis.height) /
+      2
  })
+  const start = useSharedValue({ x: 0, y: 0 })
+  const gesture = Gesture.Pan()
+    .onBegin(() => {
+      start.value = pan.value
+    })
+    .onUpdate(e => {
+      pan.value = {
+        x: e.translationX + start.value.x,
+        y: e.translationY + start.value.y
+      }
+    })
+    .onEnd(() => {
+      runOnJS(updateFocus)({
+        x: pan.value.x / (imageDimensionis.width / 2),
+        y: pan.value.y / (imageDimensionis.height / 2)
+      })
+    })
+    .onFinalize(() => {
+      start.value = pan.value
+    })
  const styleTransform = useAnimatedStyle(() => {
    return {
      transform: [
        {
          translateX: interpolate(
-            panX.value,
-            [
-              -imageDimensionis.width / 2 + padding,
-              imageDimensionis.width / 2 + padding
-            ],
-            [
-              -imageDimensionis.width / 2 + padding,
-              imageDimensionis.width / 2 + padding
-            ],
+            pan.value.x,
+            [-imageDimensionis.width / 2, imageDimensionis.width / 2],
+            [-imageDimensionis.width / 2, imageDimensionis.width / 2],
            Extrapolate.CLAMP
          )
        },
        {
          translateY: interpolate(
-            panY.value,
+            pan.value.y,
            [-imageDimensionis.height / 2, imageDimensionis.height / 2],
            [-imageDimensionis.height / 2, imageDimensionis.height / 2],
            Extrapolate.CLAMP
@ -128,47 +119,41 @@ const ComposeEditAttachmentImage: React.FC<Props> = ({ index }) => {
            height: imageDimensionis.height
          }}
          source={{
-            uri: theAttachmentLocal?.uri
-              ? theAttachmentLocal.uri
-              : theAttachmentRemote?.preview_url
+            uri: theAttachmentLocal?.uri ? theAttachmentLocal.uri : theAttachmentRemote?.preview_url
          }}
        />
-        <PanGestureHandler onGestureEvent={onGestureEvent}>
+        <GestureDetector gesture={gesture}>
          <Animated.View
            style={[
              styleTransform,
              {
+                width: windowWidth * 2,
+                height: imageDimensionis.height * 2,
                position: 'absolute',
-                top: -500 + imageDimensionis.height / 2,
-                left: -500 + imageDimensionis.width / 2
+                left: -windowWidth / 2,
+                top: -imageDimensionis.height / 2,
+                backgroundColor: colors.backgroundOverlayInvert,
+                flexDirection: 'row',
+                alignItems: 'center',
+                justifyContent: 'center'
              }
            ]}
-          >
-            <Svg width='1000' height='1000' viewBox='0 0 1000 1000'>
-              <G stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'>
-                <G>
-                  <Path
-                    d='M1000,0 L1000,1000 L0,1000 L0,0 L1000,0 Z M500,475 C486.192881,475 475,486.192881 475,500 C475,513.807119 486.192881,525 500,525 C513.807119,525 525,513.807119 525,500 C525,486.192881 513.807119,475 500,475 Z'
-                    fill={colors.backgroundOverlayInvert}
-                  />
-                  <Circle
-                    stroke={colors.primaryOverlay}
-                    stroke-width='2'
-                    cx='500'
-                    cy='500'
-                    r='24'
-                  />
-                  <Circle
-                    fill={colors.primaryOverlay}
-                    cx='500'
-                    cy='500'
-                    r='2'
-                  />
-                </G>
-              </G>
-            </Svg>
-          </Animated.View>
-        </PanGestureHandler>
+            children={
+              <View
+                style={{
+                  width: 48,
+                  height: 48,
+                  borderRadius: 24,
+                  borderWidth: 2,
+                  borderColor: colors.primaryOverlay,
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                  justifyContent: 'center'
+                }}
+              />
+            }
+          />
+        </GestureDetector>
      </View>
      {screenReaderEnabled ? null : (
        <CustomText
--- a/src/screens/Compose/EditAttachment/Root.tsx
+++ b/src/screens/Compose/EditAttachment/Root.tsx
@ -2,7 +2,7 @@ import CustomText from '@components/Text'
 import AttachmentVideo from '@components/Timeline/Shared/Attachment/Video'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useContext, useMemo, useRef } from 'react'
+import React, { useContext, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ScrollView, StyleSheet, TextInput, View } from 'react-native'
 import ComposeContext from '../utils/createContext'
@ -18,7 +18,7 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
  const { composeState, composeDispatch } = useContext(ComposeContext)
  const theAttachment = composeState.attachments.uploads[index].remote!

-  const mediaDisplay = useMemo(() => {
+  const mediaDisplay = () => {
    if (theAttachment) {
      switch (theAttachment.type) {
        case 'image':
@ -34,10 +34,10 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
              video={
                video.local
                  ? ({
-                      url: video.local.uri,
-                      preview_url: video.local.thumbnail,
-                      blurhash: video.remote?.blurhash
-                    } as Mastodon.AttachmentVideo)
+                    url: video.local.uri,
+                    preview_url: video.local.thumbnail,
+                    blurhash: video.remote?.blurhash
+                  } as Mastodon.AttachmentVideo)
                  : (video.remote as Mastodon.AttachmentVideo)
              }
            />
@ -45,22 +45,13 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
      }
    }
    return null
-  }, [])
-
-  const onChangeText = (e: any) =>
-    composeDispatch({
-      type: 'attachment/edit',
-      payload: {
-        ...theAttachment,
-        description: e
-      }
-    })
+  }

  const scrollViewRef = useRef<ScrollView>(null)

  return (
    <ScrollView ref={scrollViewRef}>
-      {mediaDisplay}
+      {mediaDisplay()}
      <View style={{ padding: StyleConstants.Spacing.Global.PagePadding }}>
        <CustomText
          fontStyle='M'
@ -86,7 +77,14 @@ const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
          autoCorrect={false}
          maxLength={1500}
          multiline
-          onChangeText={onChangeText}
+          onChangeText={(e) =>
+            composeDispatch({
+              type: 'attachment/edit',
+              payload: {
+                ...theAttachment,
+                description: e
+              }
+            })}
          placeholder={t('content.editAttachment.content.altText.placeholder')}
          placeholderTextColor={colors.secondary}
          scrollEnabled
--- a/src/screens/Tabs/Local.tsx
+++ b/src/screens/Tabs/Local.tsx
@ -3,10 +3,7 @@ import { HeaderCenter, HeaderRight } from '@components/Header'
 import Timeline from '@components/Timeline'
 import TimelineDefault from '@components/Timeline/Default'
 import { createNativeStackNavigator } from '@react-navigation/native-stack'
-import {
-  ScreenTabsScreenProps,
-  TabLocalStackParamList
-} from '@utils/navigation/navigators'
+import { ScreenTabsScreenProps, TabLocalStackParamList } from '@utils/navigation/navigators'
 import { useListsQuery } from '@utils/queryHooks/lists'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import layoutAnimation from '@utils/styles/layoutAnimation'
@ -26,10 +23,7 @@ const TabLocal = React.memo(
      layoutAnimation()
    }, [lists?.length])

-    const [queryKey, setQueryKey] = useState<QueryKeyTimeline>([
-      'Timeline',
-      { page: 'Following' }
-    ])
+    const [queryKey, setQueryKey] = useState<QueryKeyTimeline>(['Timeline', { page: 'Following' }])

    return (
      <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
@ -51,9 +45,7 @@ const TabLocal = React.memo(
                        ...lists.map(list => ({
                          id: list.id,
                          title: list.title,
-                          disabled:
-                            queryKey[1].page === 'List' &&
-                            queryKey[1].list === list.id
+                          disabled: queryKey[1].page === 'List' && queryKey[1].list === list.id
                        }))
                      ]
                    : undefined
@ -68,8 +60,7 @@ const TabLocal = React.memo(
                    dropdown={(lists?.length ?? 0) > 0}
                    content={
                      queryKey[1].page === 'List' && queryKey[1].list?.length
-                        ? lists?.find(list => list.id === queryKey[1].list)
-                            ?.title
+                        ? lists?.find(list => list.id === queryKey[1].list)?.title
                        : t('tabs.local.name')
                    }
                  />
@ -96,9 +87,7 @@ const TabLocal = React.memo(
              queryKey={queryKey}
              lookback='Following'
              customProps={{
-                renderItem: ({ item }) => (
-                  <TimelineDefault item={item} queryKey={queryKey} />
-                )
+                renderItem: ({ item }) => <TimelineDefault item={item} queryKey={queryKey} />
              }}
            />
          )}
--- a/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
+++ b/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
@ -38,26 +38,26 @@ const ProfileAvatarHeader: React.FC<Props> = ({ type, messageRef }) => {
              ? { width: 400, height: 400 }
              : { width: 1500, height: 500 }
        })
-        if (!image[0].uri) {
+        if (image[0].uri) {
+          mutation.mutate({
+            theme,
+            messageRef,
+            message: {
+              text: `me.profile.root.${type}.title`,
+              succeed: true,
+              failed: true
+            },
+            type,
+            data: image[0].uri
+          })
+        } else {
          displayMessage({
            ref: messageRef,
            message: t('screenTabs:me.profile.mediaSelectionFailed'),
            theme: theme,
            type: 'error'
          })
-          return
        }
-        mutation.mutate({
-          theme,
-          messageRef,
-          message: {
-            text: `me.profile.root.${type}.title`,
-            succeed: true,
-            failed: true
-          },
-          type,
-          data: image[0].uri
-        })
      }}
    />
  )
--- a/src/startup/dev.ts
+++ b/src/startup/dev.ts
@ -5,12 +5,12 @@ import log from './log'

 const dev = () => {
  if (__DEV__) {
-    log('log', 'devs', 'initializing wdyr')
-    const whyDidYouRender = require('@welldone-software/why-did-you-render')
-    whyDidYouRender(React, {
-      trackHooks: true,
-      hotReloadBufferMs: 1000
-    })
+    // log('log', 'devs', 'initializing wdyr')
+    // const whyDidYouRender = require('@welldone-software/why-did-you-render')
+    // whyDidYouRender(React, {
+    //   trackHooks: true,
+    //   hotReloadBufferMs: 1000
+    // })
  }
 }

--- a/yarn.lock
+++ b/yarn.lock
@ -1104,16 +1104,16 @@
    mv "~2"
    safe-json-stringify "~1"

-"@expo/cli@0.2.9":
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.2.9.tgz#5d1bf563dd63b7c14fc7796d7fbb018a17f22f2e"
-  integrity sha512-CUWtHH5yYEgEA4nf/k7LYW39FKORIB94ROvG+wuxZC4b5IrJs6DAsoFgunqUFFQZ7Jga2XPyx5+d27n2Ez3LCA==
+"@expo/cli@0.2.10":
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.2.10.tgz#2f65cfe82e7ae3858f1b5520b43d952eea008a85"
+  integrity sha512-JioL++q56rzyj7s84dQXp9/nURl3aoDQ6SU9pXtiXfAnqpQRM03vx3UxcK5epYU5rYBJYuR+vGX2B+ZEzgDwPw==
  dependencies:
    "@babel/runtime" "^7.14.0"
    "@expo/code-signing-certificates" "^0.0.2"
    "@expo/config" "~7.0.1"
    "@expo/config-plugins" "~5.0.1"
-    "@expo/dev-server" "~0.1.110"
+    "@expo/dev-server" "~0.1.119"
    "@expo/devcert" "^1.0.0"
    "@expo/json-file" "^8.2.35"
    "@expo/metro-config" "~0.3.18"
@ -1178,28 +1178,7 @@
    node-forge "^1.2.1"
    nullthrows "^1.1.1"

-"@expo/config-plugins@~5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-5.0.0.tgz#19f699aafa5809756b9be055189a14842f8da7ae"
-  integrity sha512-Bgjgv64f/XqpXXKPAoGhc5dbmuJB8eOBkhV6FMI/RMP06HfL7EQvXgcBBoJThLAZVyd29XikFgaCvABt/NavxQ==
-  dependencies:
-    "@expo/config-types" "^46.0.0"
-    "@expo/json-file" "8.2.36"
-    "@expo/plist" "0.0.18"
-    "@expo/sdk-runtime-versions" "^1.0.0"
-    "@react-native/normalize-color" "^2.0.0"
-    chalk "^4.1.2"
-    debug "^4.3.1"
-    find-up "~5.0.0"
-    getenv "^1.0.0"
-    glob "7.1.6"
-    resolve-from "^5.0.0"
-    semver "^7.3.5"
-    slash "^3.0.0"
-    xcode "^3.0.1"
-    xml2js "0.4.23"
-
-"@expo/config-plugins@~5.0.1":
+"@expo/config-plugins@~5.0.0", "@expo/config-plugins@~5.0.1":
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-5.0.1.tgz#66bc8d15785bdcd3598e466344f8c0518390179d"
  integrity sha512-1OfnsOrfeSkB0VZfT01UjQ5Uq6p+yYbq8yNkj0e99K/6NLHpyvIxj+5tZIV0nQXgkOcqBIABL2uA7lwB8CkaBQ==
@ -1221,28 +1200,11 @@
    xml2js "0.4.23"

 "@expo/config-types@^46.0.0", "@expo/config-types@^46.0.1":
-  version "46.0.1"
-  resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-46.0.1.tgz#ba5d6197222039de13aefdf0171d24b027781cd0"
-  integrity sha512-LQWGDagQ0YXGSJyLomNDZrYXj/cUP+wczs9y2M8MB9UDoSU6dbLRMiSX0FMhhKKdxBK0p92VQxZyqOzGpIYfSw==
+  version "46.0.2"
+  resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-46.0.2.tgz#191f225ebfcbe624868ddc40efae79593f948dd8"
+  integrity sha512-PXkmOgNwRyBfgVT1HmFZhfh3Qm7WKKyV6mk3/5HJ/LzPh1t+Zs2JrWX8U2YncTLV1QzV7nV8tnkyvszzqnZEzQ==

-"@expo/config@7.0.0", "@expo/config@~7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@expo/config/-/config-7.0.0.tgz#0289d4cadff48eaed33683384c41ae9a90bb8b00"
-  integrity sha512-4807iau5gTcCAMUDWxsXfBX4E3embZJREO9c098GiRgAvCBc7PCqdGs9jEAKakCxmPbMGBURL17rKYAsHtZuQw==
-  dependencies:
-    "@babel/code-frame" "~7.10.4"
-    "@expo/config-plugins" "~5.0.0"
-    "@expo/config-types" "^46.0.0"
-    "@expo/json-file" "8.2.36"
-    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"
-    sucrase "^3.20.0"
-
-"@expo/config@7.0.1", "@expo/config@^7.0.1", "@expo/config@~7.0.1":
+"@expo/config@7.0.1", "@expo/config@^7.0.1", "@expo/config@~7.0.0", "@expo/config@~7.0.1":
  version "7.0.1"
  resolved "https://registry.yarnpkg.com/@expo/config/-/config-7.0.1.tgz#d8e2e5410bb0b8e305690bbc76e6bb76f6a6de31"
  integrity sha512-4lu0wr45XXJ2MXiLAm2+fmOyy/jjqF3NuDm92fO6nuulRzEEvTP4w3vsibJ690rT81ohtvhpruKhkRs0wSjKWA==
@ -1273,13 +1235,13 @@
    xcode "^3.0.0"
    xml-js "^1.6.11"

-"@expo/dev-server@~0.1.110":
-  version "0.1.118"
-  resolved "https://registry.yarnpkg.com/@expo/dev-server/-/dev-server-0.1.118.tgz#9f148565b2cadce5fd7c4481f540a9fd3bd39fc4"
-  integrity sha512-nFwIP/sW/1ERCkPFPcSBF9d7C9zU+J5XAKPwpMRiPRIkwIsqdJUL80exzafqL8Qgwhsim/LPvTQlpSTiQJPqMA==
+"@expo/dev-server@~0.1.119":
+  version "0.1.119"
+  resolved "https://registry.yarnpkg.com/@expo/dev-server/-/dev-server-0.1.119.tgz#d85036d8ddfd5668fd50ef373616b55580dc7670"
+  integrity sha512-DcVnj4/YA+b+Ljsz2qffHHN5LbouXFKeE9ER0Yjq5vIb2moV1q3U6LezndFLCf42Uev7C2vSa8YCcP3WOpxuMw==
  dependencies:
    "@expo/bunyan" "4.0.0"
-    "@expo/metro-config" "0.3.21"
+    "@expo/metro-config" "~0.3.18"
    "@expo/osascript" "2.0.33"
    body-parser "1.19.0"
    chalk "^4.0.0"
@ -1354,21 +1316,7 @@
    json5 "^1.0.1"
    write-file-atomic "^2.3.0"

-"@expo/metro-config@0.3.21", "@expo/metro-config@~0.3.18":
-  version "0.3.21"
-  resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.3.21.tgz#f0ac853aa43291b678a26d9f3d7b5f873ed794dc"
-  integrity sha512-z3vaB+He/hvO3F65hdpmYjB2y969UtzB8u7M1y91AURDemsMT82xri7fjNxx6R4EVNzhr5a3PG93kArEDnuBfw==
-  dependencies:
-    "@expo/config" "7.0.0"
-    "@expo/json-file" "8.2.36"
-    chalk "^4.1.0"
-    debug "^4.3.2"
-    find-yarn-workspace-root "~2.0.0"
-    getenv "^1.0.0"
-    resolve-from "^5.0.0"
-    sucrase "^3.20.0"
-
-"@expo/metro-config@~0.3.19":
+"@expo/metro-config@~0.3.18", "@expo/metro-config@~0.3.19":
  version "0.3.22"
  resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.3.22.tgz#fa4a0729ec8ecbc9c9fb79c63ecc66a299505c82"
  integrity sha512-R81sLbaeUBjN8IXcxiVx7GcpSj8z7szILl1b5yJDb38WdIFwxhrseA5wXaTT1yMhI+59w6n99T2qtFV2yD5qYA==
@ -1415,23 +1363,7 @@
    base64-js "^1.2.3"
    xmlbuilder "^14.0.0"

-"@expo/prebuild-config@~5.0.0":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-5.0.2.tgz#f4670f2482feee3ab3d4acc336b99c13ce0979dd"
-  integrity sha512-EYVdPSnZTArC60g1C7ZTt0wFD6EQA23us7JcETae9y2KVdYQwQ+KF8okPJwlqVtMqk3Yaa6jpIXbzdxmHS+2ew==
-  dependencies:
-    "@expo/config" "7.0.0"
-    "@expo/config-plugins" "~5.0.0"
-    "@expo/config-types" "^46.0.0"
-    "@expo/image-utils" "0.3.20"
-    "@expo/json-file" "8.2.36"
-    debug "^4.3.1"
-    fs-extra "^9.0.0"
-    resolve-from "^5.0.0"
-    semver "7.3.2"
-    xml2js "0.4.23"
-
-"@expo/prebuild-config@~5.0.3":
+"@expo/prebuild-config@~5.0.0", "@expo/prebuild-config@~5.0.3":
  version "5.0.3"
  resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-5.0.3.tgz#f475797a592f074b5a66f02aef27c6c14c54591e"
  integrity sha512-G4j1H3WFjRaiQ+FgFNULrnIm7RsQyjc4xp6lLTP2ydBv79wO3x8wAdeZvaZh7eOkfu9BESpQzACT1uuJTag5jg==
@ -1713,9 +1645,9 @@
  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==

 "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
-  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
+  integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
  dependencies:
    "@jridgewell/resolve-uri" "^3.0.3"
    "@jridgewell/sourcemap-codec" "^1.4.10"
@ -1803,10 +1735,10 @@
    execa "^1.0.0"
    prompts "^2.4.0"

-"@react-native-community/cli-config@^8.0.4":
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-8.0.4.tgz#40e9e4e12ba70a6e12d1e777373af6fa1ac2e4e6"
-  integrity sha512-0vcrIETka1Tr0blr0AjVkoP/1yynvarJQXi8Yry/XB3BLenrkUFxolqqA3Ff55KFQ7t1IzAuFtfuVZs25LvyDQ==
+"@react-native-community/cli-config@^8.0.6":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-8.0.6.tgz#041eee7dd8fdef595bf7a3f24228c173bf294a44"
+  integrity sha512-mjVpVvdh8AviiO8xtqeX+BkjqE//NMDnISwsLWSJUfNCwTAPmdR8PGbhgP5O4hWHyJ3WkepTopl0ya7Tfi3ifw==
  dependencies:
    "@react-native-community/cli-tools" "^8.0.4"
    cosmiconfig "^5.1.0"
@ -1821,13 +1753,13 @@
  dependencies:
    serve-static "^1.13.1"

-"@react-native-community/cli-doctor@^8.0.4":
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-8.0.4.tgz#9216867f0d8590868dc5b8035f62bbcac68b3254"
-  integrity sha512-Blw/66qwoEoKrtwn3O9iTtXbt4YWlwqNse5BJeRDzlSdutWTX4PgJu/34gyvOHGysNlrf+GYkeyqqxI/y0s07A==
+"@react-native-community/cli-doctor@^8.0.6":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-8.0.6.tgz#954250155ab2f3a66a54821e071bc4a631d2dfff"
+  integrity sha512-ZQqyT9mJMVeFEVIwj8rbDYGCA2xXjJfsQjWk2iTRZ1CFHfhPSUuUiG8r6mJmTinAP9t+wYcbbIYzNgdSUKnDMw==
  dependencies:
-    "@react-native-community/cli-config" "^8.0.4"
-    "@react-native-community/cli-platform-ios" "^8.0.4"
+    "@react-native-community/cli-config" "^8.0.6"
+    "@react-native-community/cli-platform-ios" "^8.0.6"
    "@react-native-community/cli-tools" "^8.0.4"
    chalk "^4.1.2"
    command-exists "^1.2.8"
@ -1869,10 +1801,10 @@
    logkitty "^0.7.1"
    slash "^3.0.0"

-"@react-native-community/cli-platform-ios@^8.0.4":
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-8.0.4.tgz#15225c09a1218a046f11165a54bf14b59dad7020"
-  integrity sha512-7Jdptedfg/J0Xo2rQbJ4jmo+PMYOiIiRcNDCSI5dBcNkQfSq4MMYUnKQx5DdZHgrfxE0O1vE4iNmJdd4wePz8w==
+"@react-native-community/cli-platform-ios@^8.0.4", "@react-native-community/cli-platform-ios@^8.0.6":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-8.0.6.tgz#ab80cd4eb3014b8fcfc9bd1b53ec0a9f8e5d1430"
+  integrity sha512-CMR6mu/LVx6JVfQRDL9uULsMirJT633bODn+IrYmrwSz250pnhON16We8eLPzxOZHyDjm7JPuSgHG3a/BPiRuQ==
  dependencies:
    "@react-native-community/cli-tools" "^8.0.4"
    chalk "^4.1.2"
@ -1938,14 +1870,14 @@
    joi "^17.2.1"

 "@react-native-community/cli@^8.0.4":
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-8.0.5.tgz#902a13b5336508f7989fddf39e6bf85b63a66de9"
-  integrity sha512-X0AMNK+sKDJQX8eQRkqgddJsZPWlHgLryX7O9usj78UFEK8VqVYtpv08piWecfAhC2mZU4/Lww4bKu9uJ1rdyQ==
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-8.0.6.tgz#7aae37843ab8e44b75c477c1de69f4c902e599ef"
+  integrity sha512-E36hU/if3quQCfJHGWVkpsCnwtByRCwORuAX0r6yr1ebKktpKeEO49zY9PAu/Z1gfyxCtgluXY0HfRxjKRFXTg==
  dependencies:
    "@react-native-community/cli-clean" "^8.0.4"
-    "@react-native-community/cli-config" "^8.0.4"
+    "@react-native-community/cli-config" "^8.0.6"
    "@react-native-community/cli-debugger-ui" "^8.0.0"
-    "@react-native-community/cli-doctor" "^8.0.4"
+    "@react-native-community/cli-doctor" "^8.0.6"
    "@react-native-community/cli-hermes" "^8.0.5"
    "@react-native-community/cli-plugin-metro" "^8.0.4"
    "@react-native-community/cli-server-api" "^8.0.4"
@ -2185,10 +2117,10 @@
    "@sentry/utils" "7.7.0"
    "@sentry/wizard" "1.2.17"

-"@sentry/react-native@^4.2.2":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-4.2.3.tgz#3542917639a35dfe1403d7eee8c0eb21f119998f"
-  integrity sha512-I0IdNlgrTqR0z0nEMzI2xTWcAzraZRhqoBm+6ltLhGLX5/0tADVNiW/431nSta5xknSvc3EGpZZJ/gsv4CS8ZQ==
+"@sentry/react-native@^4.2.4":
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-4.2.4.tgz#f4641135681c178e91e832663448b264bd9cce52"
+  integrity sha512-GXP6XxFOBC58eojuUjFZ2u+u/bDNV1DD0+7TAlqNHvgjsr8/FPN0ZysewdFjFDvf9wrJsJcWpPeQd+IqddVzQg==
  dependencies:
    "@sentry/browser" "7.9.0"
    "@sentry/cli" "1.74.4"
@ -2352,15 +2284,15 @@
  dependencies:
    "@types/istanbul-lib-report" "*"

-"@types/lodash@^4.14.182":
-  version "4.14.182"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
-  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+"@types/lodash@^4.14.184":
+  version "4.14.184"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.184.tgz#23f96cd2a21a28e106dc24d825d4aa966de7a9fe"
+  integrity sha512-RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q==

 "@types/node@*":
-  version "18.6.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.4.tgz#fd26723a8a3f8f46729812a7f9b4fc2d1608ed39"
-  integrity sha512-I4BD3L+6AWiUobfxZ49DlU43gtI+FTHSv9pE2Zekg6KjMpre4ByusaljW3vYSLJrvQ1ck1hUaeVu8HVlY3vzHg==
+  version "18.7.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.6.tgz#31743bc5772b6ac223845e18c3fc26f042713c83"
+  integrity sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A==

 "@types/prop-types@*":
  version "15.7.5"
@ -2403,16 +2335,7 @@
  dependencies:
    "@types/react" "*"

-"@types/react@*", "@types/react@16 || 17 || 18":
-  version "18.0.15"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.15.tgz#d355644c26832dc27f3e6cbf0c4f4603fc4ab7fe"
-  integrity sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
-"@types/react@^18.0.17":
+"@types/react@*", "@types/react@16 || 17 || 18", "@types/react@^18.0.17":
  version "18.0.17"
  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4"
  integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==
@ -3132,9 +3055,9 @@ camelcase@^6.0.0:
  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==

 caniuse-lite@^1.0.30001370:
-  version "1.0.30001374"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz#3dab138e3f5485ba2e74bd13eca7fe1037ce6f57"
-  integrity sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==
+  version "1.0.30001378"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz#3d2159bf5a8f9ca093275b0d3ecc717b00f27b67"
+  integrity sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==

 caseless@^0.12.0:
  version "0.12.0"
@ -3543,9 +3466,9 @@ dag-map@~1.0.0:
  integrity sha512-+LSAiGFwQ9dRnRdOeaj7g47ZFJcOUPukAP8J3A3fuZ1g9Y44BG+P1sgApjLXTQPOzC4+7S9Wr8kXsfpINM4jpw==

 dayjs@^1.8.15:
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.4.tgz#3b3c10ca378140d8917e06ebc13a4922af4f433e"
-  integrity sha512-Zj/lPM5hOvQ1Bf7uAvewDaUcsJoI6JmNqmHhHl3nyumwe0XHwt8sWdOVAPACJzCebL8gQCi+K49w7iKWnGwX9g==
+  version "1.11.5"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.5.tgz#00e8cc627f231f9499c19b38af49f56dc0ac5e93"
+  integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==

 debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
  version "2.6.9"
@ -3772,9 +3695,9 @@ ee-first@1.1.1:
  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==

 electron-to-chromium@^1.4.202:
-  version "1.4.211"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz#afaa8b58313807501312d598d99b953568d60f91"
-  integrity sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A==
+  version "1.4.225"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz#3e27bdd157cbaf19768141f2e0f0f45071e52338"
+  integrity sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw==

 emoji-regex@^8.0.0:
  version "8.0.0"
@ -4111,10 +4034,10 @@ expo-modules-autolinking@0.10.2:
    find-up "^5.0.0"
    fs-extra "^9.1.0"

-expo-modules-core@0.11.3:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-0.11.3.tgz#3f6d4831f7f97bb8bdda54c84edc06585c3ecaca"
-  integrity sha512-1it+0fxugTWkof3E5vY23jZrl+ULy8d7OyUKL3+nTxTq98wGJdg9VellT18WvvS2YfKqLzYl31fkQsxFz5rRLA==
+expo-modules-core@0.11.4:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-0.11.4.tgz#6b7a27bb212f3fbf7d6803f747f6491aa73a2a09"
+  integrity sha512-8dEYICk7hUi1GPz5hWm8dBuZDGc+4Tm7zDhSIhKApo5jY/5vB4Bk+fjPo693iWn6pp3+XBHT8Ri8rJ3G7wH1vQ==
  dependencies:
    compare-versions "^3.4.0"
    invariant "^2.2.4"
@ -4205,13 +4128,13 @@ expo-web-browser@^11.0.0, expo-web-browser@~11.0.0:
  dependencies:
    compare-urls "^2.0.0"

-expo@^46.0.7:
-  version "46.0.7"
-  resolved "https://registry.yarnpkg.com/expo/-/expo-46.0.7.tgz#ab4dd82584f18758777178bdf60d6098715c4b28"
-  integrity sha512-vBn3/K2CxIVQvHUA6t1qn3ewsJvUvs5xTMFa7wbf275fj5OoiVTfH3qpbkj6K5msN6dMOQ7MqMjrsDmTnMrgqA==
+expo@^46.0.8:
+  version "46.0.8"
+  resolved "https://registry.yarnpkg.com/expo/-/expo-46.0.8.tgz#0a0d10514fa7fa6e56bdb53a7a5e566f9383a195"
+  integrity sha512-emhBCx+eE/9pJt9VX3QMj1tSwF/xstzQzNhjp4hPs0HYY7m1IQZElgN7DLnCQlBEM6xwtADSPVaqZBmSRzhaMQ==
  dependencies:
    "@babel/runtime" "^7.14.0"
-    "@expo/cli" "0.2.9"
+    "@expo/cli" "0.2.10"
    "@expo/vector-icons" "^13.0.0"
    babel-preset-expo "~9.2.0"
    cross-spawn "^6.0.5"
@ -4222,7 +4145,7 @@ expo@^46.0.7:
    expo-font "~10.2.0"
    expo-keep-awake "~10.2.0"
    expo-modules-autolinking "0.10.2"
-    expo-modules-core "0.11.3"
+    expo-modules-core "0.11.4"
    fbemitter "^3.0.0"
    getenv "^1.0.0"
    invariant "^2.2.4"
@ -4421,9 +4344,9 @@ find-yarn-workspace-root@^2.0.0, find-yarn-workspace-root@~2.0.0:
    micromatch "^4.0.2"

 flow-parser@0.*:
-  version "0.184.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.184.0.tgz#45faed0a40fa554d24550c35ec7889b86b360c9b"
-  integrity sha512-+RAHizWmCnfnAWX1yD3fSdWRYCMhGiiqZSbHNU38MQxYc8XdTBoFB3ZpL1MEPG6yy/Yb3hg9w9eIf0DNlU8epQ==
+  version "0.185.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.185.0.tgz#56bde60805bad19b2934ebfc50c9485e5c5424f9"
+  integrity sha512-VWpXjEbQbIGQvB6CyWwx56wMioGZ6w2s8qJlFiuE3S7D8O+xE5t988i1u2TGFO5TLSzQPUhfIOzPpLYA93H9Jg==

 flow-parser@^0.121.0:
  version "0.121.0"
@ -4875,10 +4798,10 @@ https-proxy-agent@^5.0.0:
    agent-base "6"
    debug "4"

-i18next@^21.9.0:
-  version "21.9.0"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.0.tgz#b63ebb0d4e1b23709951ca4774dc19d2ffac9553"
-  integrity sha512-B+6/yd7rCpJidyPuBaEApUECx7G8Ai6+tqYhrChsY4MmQqJhG7qJ4eT6Lm1OnRhieVelEtfxh4aAQktdNVZtDA==
+i18next@^21.9.1:
+  version "21.9.1"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.9.1.tgz#9e3428990f5b2cc9ac1b98dd025f3e411c368249"
+  integrity sha512-ITbDrAjbRR73spZAiu6+ex5WNlHRr1mY+acDi2ioTHuUiviJqSz269Le1xHAf0QaQ6GgIHResUhQNcxGwa/PhA==
  dependencies:
    "@babel/runtime" "^7.17.2"

@ -6495,9 +6418,9 @@ object-visit@^1.0.0:
    isobject "^3.0.0"

 object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.3.tgz#d36b7700ddf0019abb6b1df1bb13f6445f79051f"
-  integrity sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
  dependencies:
    call-bind "^1.0.2"
    define-properties "^1.1.4"
@ -7023,10 +6946,10 @@ react-freeze@^1.0.0:
  resolved "https://registry.yarnpkg.com/react-freeze/-/react-freeze-1.0.3.tgz#5e3ca90e682fed1d73a7cb50c2c7402b3e85618d"
  integrity sha512-ZnXwLQnGzrDpHBHiC56TXFXvmolPeMjTn1UOm610M4EXGzbEDR7oOIyS2ZiItgbs6eZc4oU/a0hpk8PrcKvv5g==

-react-i18next@^11.18.3:
-  version "11.18.3"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.3.tgz#50211810bcc9fdea2d70c8aefdfff5f1eb39a923"
-  integrity sha512-EttTX31HbqzZymUM3SIrMPuvamfSXFZVsDHm/ZAqoDfTLjhzlwyxqfbDNxcKNAGOi2mjZaXfR7hSNMlvLNpB/g==
+react-i18next@^11.18.4:
+  version "11.18.4"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.4.tgz#b3c35ac4c4657b05d599b036536d7b2c0331e248"
+  integrity sha512-gK/AylAQC5DvCD5YLNCHW4PNzpCfrWIyVAXbSMl+/5QXzlDP8VdBoqE2s2niGHB+zIXwBV9hRXbDrVuupbgHcg==
  dependencies:
    "@babel/runtime" "^7.14.5"
    html-parse-stringify "^3.0.1"
@ -7177,10 +7100,10 @@ react-native-safe-area-context@^4.3.1:
  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.3.1.tgz#5cf97b25b395e0d09bc1f828920cd7da0d792ade"
  integrity sha512-cEr7fknJCToTrSyDCVNg0GRdRMhyLeQa2NZwVCuzEQcWedOw/59ExomjmzCE4rxrKXs6OJbyfNtFRNyewDaHuA==

-react-native-screens@^3.15.0:
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.15.0.tgz#78e42c8df72851b1ff235ddf5434b961ae123ca5"
-  integrity sha512-ezC5TibsUYyqPuuHpZoM3iEl6bRzCVBMJeGaFkn7xznuOt1VwkZVub0BvafIEYR/+AQC/RjxzMSQPs1qal0+wA==
+react-native-screens@^3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.16.0.tgz#34fe23f4b386c2a4bf29a33b915c81f3ebf60ba7"
+  integrity sha512-h87K/r6Oj4VQkDiICorG8/4LscQfBfFwPCluAW4zmbQILSZGc/NWqWSFV1mOQlpDrqOsc1DohBmnsmV6imMkbQ==
  dependencies:
    react-freeze "^1.0.0"
    warn-once "^0.1.0"
@ -7190,10 +7113,10 @@ react-native-share-menu@^6.0.0:
  resolved "https://registry.yarnpkg.com/react-native-share-menu/-/react-native-share-menu-6.0.0.tgz#0398dd4537ca1138b774fcbff9b05a88c8329cf6"
  integrity sha512-KdmRnqjI/B2MigSxGmhbYJ3WMJxKXj+0c47ANcVZ/PTzc2vtz6d1r4KQJgkBImXgNC+vowpuD2UGdPllxadr2A==

-react-native-svg@^12.4.4:
-  version "12.4.4"
-  resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-12.4.4.tgz#2ba684eaea9a7402fbbe0ed9737e77284631d00e"
-  integrity sha512-LpcNlEVCURexqPAvQ9ne8KrPVfYz0wIDygwud8VMRmXLezysXzyQN/DTsjm1BO9lIfYp55WQsr3u3yW/vk6iiA==
+react-native-svg@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-13.0.0.tgz#a26d28446aeb7e4bed7e1bb1cb42f2eb5462e652"
+  integrity sha512-CkWB8BYGjvmGiLqqJRHfTH8/Q5tJyhltUYCmi20sqOCbjfTR5dkQUUafV0oUOhvK2lS+zuB9Dpf1Beo92rls5Q==
  dependencies:
    css-select "^5.1.0"
    css-tree "^1.1.3"
@ -8619,9 +8542,9 @@ walker@^1.0.7:
    makeerror "1.0.12"

 warn-once@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/warn-once/-/warn-once-0.1.0.tgz#4f58d89b84f968d0389176aa99e0cf0f14ffd4c8"
-  integrity sha512-recZTSvuaH/On5ZU5ywq66y99lImWqzP93+AiUo9LUwG8gXHW+LJjhOd6REJHm7qb0niYqrEQJvbHSQfuJtTqA==
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/warn-once/-/warn-once-0.1.1.tgz#952088f4fb56896e73fd4e6a3767272a3fccce43"
+  integrity sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q==

 wcwidth@^1.0.1:
  version "1.0.1"