From 1dd64c4e19c779a9181aeb7128ff0c4e893828ee Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Mon, 6 Feb 2023 14:00:40 +0100
Subject: [PATCH 01/17] Fix link matching crashes

---
 package.json                    |  2 +-
 src/components/openLink.ts      | 10 +---------
 src/utils/helpers/urlMatcher.ts | 17 +++++++++++------
 src/utils/queryHooks/account.ts |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index d602f225..3264ce49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tooot",
-  "version": "4.8.7",
+  "version": "4.8.8",
   "description": "tooot for Mastodon",
   "author": "xmflsct <me@xmflsct.com>",
   "license": "GPL-3.0-or-later",
diff --git a/src/components/openLink.ts b/src/components/openLink.ts
index e5790c28..cf4e5f2f 100644
--- a/src/components/openLink.ts
+++ b/src/components/openLink.ts
@@ -46,17 +46,9 @@ const openLink = async (url: string, navigation?: any) => {
 
   // If an account can be found
   if (match?.account) {
-    if (!match.account._remote && match.account.id) {
-      handleNavigation('Tab-Shared-Account', { account: match.account.id })
-      return
-    }
-
     let response: Mastodon.Account | undefined = undefined
 
-    const queryKey: QueryKeyAccount = [
-      'Account',
-      { id: match.account.id, url: url, _remote: match.account._remote }
-    ]
+    const queryKey: QueryKeyAccount = ['Account', { url: url, _remote: match.account._remote }]
     const cache = queryClient.getQueryData<Mastodon.Status>(queryKey)
 
     if (cache) {
diff --git a/src/utils/helpers/urlMatcher.ts b/src/utils/helpers/urlMatcher.ts
index 9f70780a..eb3b91c5 100644
--- a/src/utils/helpers/urlMatcher.ts
+++ b/src/utils/helpers/urlMatcher.ts
@@ -9,7 +9,7 @@ export const urlMatcher = (
 ):
   | {
       domain: string
-      account?: Partial<Pick<Mastodon.Account, 'id' | 'acct' | '_remote'>>
+      account?: Partial<Pick<Mastodon.Account, 'acct' | '_remote'>>
       status?: Partial<Pick<Mastodon.Status, 'id' | '_remote'>>
     }
   | undefined => {
@@ -24,13 +24,18 @@ export const urlMatcher = (
   const _remote = parsed.hostname !== getAccountStorage.string('auth.domain')
 
   let statusId: string | undefined
-  let accountId: string | undefined
   let accountAcct: string | undefined
 
   const segments = parsed.pathname.split('/')
   const last = segments[segments.length - 1]
   const length = segments.length // there is a starting slash
 
+  const testAndAssignStatusId = (id: string) => {
+    if (!!parseInt(id)) {
+      statusId = id
+    }
+  }
+
   switch (last?.startsWith('@')) {
     case true:
       if (length === 2 || (length === 3 && segments[length - 2] === 'web')) {
@@ -45,14 +50,14 @@ export const urlMatcher = (
         if (nextToLast === 'statuses') {
           if (length === 4 && segments[length - 3] === 'web') {
             // https://social.xmflsct.com/web/statuses/105590085754428765 <- old
-            statusId = last
+            testAndAssignStatusId(last)
           } else if (
             length === 5 &&
             segments[length - 2] === 'statuses' &&
             segments[length - 4] === 'users'
           ) {
             // https://social.xmflsct.com/users/tooot/statuses/105590085754428765 <- default Mastodon
-            statusId = last
+            testAndAssignStatusId(last)
             // accountAcct = `@${segments[length - 3]}@${domain}`
           }
         } else if (
@@ -61,7 +66,7 @@ export const urlMatcher = (
         ) {
           // https://social.xmflsct.com/web/@tooot/105590085754428765 <- pretty Mastodon v3.5 and below
           // https://social.xmflsct.com/@tooot/105590085754428765 <- pretty Mastodon v4.0 and above
-          statusId = last
+          testAndAssignStatusId(last)
           // accountAcct = `${nextToLast}@${domain}`
         }
       }
@@ -70,7 +75,7 @@ export const urlMatcher = (
 
   return {
     domain,
-    ...((accountId || accountAcct) && { account: { id: accountId, acct: accountAcct, _remote } }),
+    ...(accountAcct && { account: { acct: accountAcct, _remote } }),
     ...(statusId && { status: { id: statusId, _remote } })
   }
 }
diff --git a/src/utils/queryHooks/account.ts b/src/utils/queryHooks/account.ts
index 61c2bfca..852336b3 100644
--- a/src/utils/queryHooks/account.ts
+++ b/src/utils/queryHooks/account.ts
@@ -25,7 +25,7 @@ const accountQueryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyA
     const match = urlMatcher(key.url)
 
     const domain = match?.domain
-    const id = key.id || match?.account?.id
+    const id = key.id
     const acct = key.acct || key.username || match?.account?.acct
 
     if (!key._local && domain) {

From 5d1459eba665116babc1b03f8b7693e4f45f2262 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Mon, 6 Feb 2023 18:58:55 +0100
Subject: [PATCH 02/17] Fix some toots not interactable

---
 src/screens/Tabs/Shared/Toot.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx
index fcd1384f..75f49ca6 100644
--- a/src/screens/Tabs/Shared/Toot.tsx
+++ b/src/screens/Tabs/Shared/Toot.tsx
@@ -248,7 +248,11 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
                     body: data.map(remote => {
                       const localMatch = old?.pages[0].body.find(local => local.uri === remote.uri)
                       if (localMatch) {
-                        return { ...localMatch, _level: remote._level }
+                        return {
+                          ...localMatch,
+                          _level: remote._level,
+                          key: `${localMatch.id}_remote`
+                        }
                       } else {
                         return appendRemote.status(remote)
                       }
@@ -275,6 +279,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
       ref={flRef}
       windowSize={5}
       data={query.data?.pages?.[0].body}
+      extraData={query.dataUpdatedAt}
       renderItem={({ item, index }) => {
         const prev = query.data?.pages[0].body[index - 1]?._level || 0
         const curr = item._level || 0

From be2c223142ab30ebc56c24a508a5ef8395ac0931 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Mon, 6 Feb 2023 19:07:22 +0100
Subject: [PATCH 03/17] Mark id on load

With the introduction of throttle, it is crucial to log on load otherwise there won't be much match after that
---
 src/components/Timeline/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Timeline/index.tsx b/src/components/Timeline/index.tsx
index b896e57f..96b3b926 100644
--- a/src/components/Timeline/index.tsx
+++ b/src/components/Timeline/index.tsx
@@ -160,7 +160,7 @@ const Timeline: React.FC<Props> = ({
             viewabilityConfig: {
               minimumViewTime: 300,
               itemVisiblePercentThreshold: 80,
-              waitForInteraction: true
+              waitForInteraction: false
             },
             onViewableItemsChanged: ({ viewableItems }) => {
               const marker = readMarker ? getAccountStorage.string(readMarker) : undefined

From f98b8946dc759f7c3445b63e0981bc63052fa45c Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Tue, 7 Feb 2023 13:56:50 +0100
Subject: [PATCH 04/17] Refine marker

---
 src/components/Timeline/index.tsx | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/components/Timeline/index.tsx b/src/components/Timeline/index.tsx
index 96b3b926..48da5cfe 100644
--- a/src/components/Timeline/index.tsx
+++ b/src/components/Timeline/index.tsx
@@ -138,10 +138,16 @@ const Timeline: React.FC<Props> = ({
 
   const latestMarker = useRef<string>()
   const updateMarkers = useCallback(
-    throttle(
-      () => readMarker && setAccountStorage([{ key: readMarker, value: latestMarker.current }]),
-      1000 * 15
-    ),
+    throttle(() => {
+      if (readMarker) {
+        const currentMarker = getAccountStorage.string(readMarker) || '0'
+        if ((latestMarker.current || '0') > currentMarker) {
+          setAccountStorage([{ key: readMarker, value: latestMarker.current }])
+        } else {
+          // setAccountStorage([{ key: readMarker, value: '105250709762254246' }])
+        }
+      }
+    }, 1000 * 15),
     []
   )
   readMarker &&
@@ -159,24 +165,14 @@ const Timeline: React.FC<Props> = ({
           {
             viewabilityConfig: {
               minimumViewTime: 300,
-              itemVisiblePercentThreshold: 80,
+              itemVisiblePercentThreshold: 10,
               waitForInteraction: false
             },
             onViewableItemsChanged: ({ viewableItems }) => {
-              const marker = readMarker ? getAccountStorage.string(readMarker) : undefined
-
               const firstItemId = viewableItems.filter(item => item.isViewable)[0]?.item.id
-              if (
-                !isFetchingPrev.value &&
-                !isRefetching &&
-                firstItemId &&
-                firstItemId > (marker || '0')
-              ) {
+              if (!isFetchingPrev.value && !isRefetching && firstItemId) {
                 latestMarker.current = firstItemId
                 updateMarkers()
-              } else {
-                // latestMarker.current = '105250709762254246'
-                // updateMarkers()
               }
             }
           }

From fd114ed0f02a472cb0520f5be088360534d1590f Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Tue, 7 Feb 2023 15:06:04 +0100
Subject: [PATCH 05/17] Check for Wildebeest's account ID format

---
 src/components/Timeline/Default.tsx           |  9 ++++-----
 src/components/Timeline/Notifications.tsx     |  9 ++++-----
 src/components/Timeline/Shared/Actions.tsx    |  8 ++++----
 src/components/Timeline/Shared/Context.tsx    |  2 +-
 src/components/Timeline/Shared/Poll.tsx       |  4 ++--
 src/components/contextMenu/account.ts         | 12 ++++++------
 src/components/contextMenu/status.ts          | 19 ++++++++++---------
 .../Shared/Account/Information/Actions.tsx    |  7 +++----
 src/utils/helpers/isMyAccount.ts              |  9 +++++++++
 9 files changed, 43 insertions(+), 36 deletions(-)
 create mode 100644 src/utils/helpers/isMyAccount.ts

diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
index 2ab6ae9f..b21a2e34 100644
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@@ -12,11 +12,11 @@ import TimelinePoll from '@components/Timeline/Shared/Poll'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { featureCheck } from '@utils/helpers/featureCheck'
+import { checkIsMyAccount } from '@utils/helpers/isMyAccount'
 import removeHTML from '@utils/helpers/removeHTML'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { usePreferencesQuery } from '@utils/queryHooks/preferences'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { useAccountStorage } from '@utils/storage/actions'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { Fragment, useRef, useState } from 'react'
@@ -63,10 +63,9 @@ const TimelineDefault: React.FC<Props> = ({
   const { colors } = useTheme()
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
-  const [accountId] = useAccountStorage.string('auth.account.id')
   const { data: preferences } = usePreferencesQuery()
 
-  const ownAccount = status.account?.id === accountId
+  const isMyAccount = checkIsMyAccount(status.account.id)
   const [spoilerExpanded, setSpoilerExpanded] = useState(
     preferences?.['reading:expand:spoilers'] || false
   )
@@ -136,7 +135,7 @@ const TimelineDefault: React.FC<Props> = ({
   const mStatus = menuStatus({ status, queryKey })
   const mInstance = menuInstance({ status, queryKey })
 
-  if (!ownAccount) {
+  if (!isMyAccount) {
     let filterResults: FilteredProps['filterResults'] = []
     const [filterRevealed, setFilterRevealed] = useState(false)
     const hasFilterServerSide = featureCheck('filter_server_side')
@@ -166,7 +165,7 @@ const TimelineDefault: React.FC<Props> = ({
       value={{
         queryKey,
         status,
-        ownAccount,
+        isMyAccount,
         spoilerHidden,
         rawContent,
         detectedLanguage,
diff --git a/src/components/Timeline/Notifications.tsx b/src/components/Timeline/Notifications.tsx
index 8f2ad75f..2c7f4892 100644
--- a/src/components/Timeline/Notifications.tsx
+++ b/src/components/Timeline/Notifications.tsx
@@ -12,10 +12,10 @@ import TimelinePoll from '@components/Timeline/Shared/Poll'
 import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import { featureCheck } from '@utils/helpers/featureCheck'
+import { checkIsMyAccount } from '@utils/helpers/isMyAccount'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
 import { usePreferencesQuery } from '@utils/queryHooks/preferences'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import { useAccountStorage } from '@utils/storage/actions'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { Fragment, useState } from 'react'
@@ -32,7 +32,6 @@ export interface Props {
 }
 
 const TimelineNotifications: React.FC<Props> = ({ notification, queryKey }) => {
-  const [accountId] = useAccountStorage.string('auth.account.id')
   const { data: preferences } = usePreferencesQuery()
 
   const status = notification.status?.reblog ? notification.status.reblog : notification.status
@@ -42,7 +41,7 @@ const TimelineNotifications: React.FC<Props> = ({ notification, queryKey }) => {
       : notification.status
       ? notification.status.account
       : notification.account
-  const ownAccount = notification.account?.id === accountId
+  const isMyAccount = checkIsMyAccount(notification.account?.id)
   const [spoilerExpanded, setSpoilerExpanded] = useState(
     preferences?.['reading:expand:spoilers'] || false
   )
@@ -109,7 +108,7 @@ const TimelineNotifications: React.FC<Props> = ({ notification, queryKey }) => {
   const mStatus = menuStatus({ status: notification.status, queryKey })
   const mInstance = menuInstance({ status: notification.status, queryKey })
 
-  if (!ownAccount) {
+  if (!isMyAccount) {
     let filterResults: FilteredProps['filterResults'] = []
     const [filterRevealed, setFilterRevealed] = useState(false)
     const hasFilterServerSide = featureCheck('filter_server_side')
@@ -140,7 +139,7 @@ const TimelineNotifications: React.FC<Props> = ({ notification, queryKey }) => {
       value={{
         queryKey,
         status,
-        ownAccount,
+        isMyAccount,
         spoilerHidden
       }}
     >
diff --git a/src/components/Timeline/Shared/Actions.tsx b/src/components/Timeline/Shared/Actions.tsx
index ec3dfdb7..3178e62a 100644
--- a/src/components/Timeline/Shared/Actions.tsx
+++ b/src/components/Timeline/Shared/Actions.tsx
@@ -22,7 +22,7 @@ import { Pressable, StyleSheet, View } from 'react-native'
 import StatusContext from './Context'
 
 const TimelineActions: React.FC = () => {
-  const { queryKey, status, ownAccount, highlighted, disableDetails } = useContext(StatusContext)
+  const { queryKey, status, isMyAccount, highlighted, disableDetails } = useContext(StatusContext)
   if (!queryKey || !status || disableDetails) return null
 
   const navigationState = useNavState()
@@ -182,7 +182,7 @@ const TimelineActions: React.FC = () => {
   const childrenReblog = () => {
     const color = (state: boolean) => (state ? colors.green : colors.secondary)
     const disabled =
-      status.visibility === 'direct' || (status.visibility === 'private' && !ownAccount)
+      status.visibility === 'direct' || (status.visibility === 'private' && !isMyAccount)
     return (
       <>
         <Icon
@@ -196,7 +196,7 @@ const TimelineActions: React.FC = () => {
             fontStyle='S'
             style={{
               color:
-                status.visibility === 'private' && !ownAccount
+                status.visibility === 'private' && !isMyAccount
                   ? colors.disabled
                   : color(status.reblogged),
               marginLeft: StyleConstants.Spacing.XS
@@ -258,7 +258,7 @@ const TimelineActions: React.FC = () => {
         onPress={onPressReblog}
         children={childrenReblog()}
         disabled={
-          status.visibility === 'direct' || (status.visibility === 'private' && !ownAccount)
+          status.visibility === 'direct' || (status.visibility === 'private' && !isMyAccount)
         }
       />
 
diff --git a/src/components/Timeline/Shared/Context.tsx b/src/components/Timeline/Shared/Context.tsx
index 2dbea5ae..4ab73b10 100644
--- a/src/components/Timeline/Shared/Context.tsx
+++ b/src/components/Timeline/Shared/Context.tsx
@@ -8,7 +8,7 @@ type StatusContextType = {
 
   status?: Mastodon.Status
 
-  ownAccount?: boolean
+  isMyAccount?: boolean
   spoilerHidden?: boolean
   rawContent?: React.MutableRefObject<string[]> // When highlighted, for translate, edit history
   detectedLanguage?: React.MutableRefObject<string>
diff --git a/src/components/Timeline/Shared/Poll.tsx b/src/components/Timeline/Shared/Poll.tsx
index 2229e505..4e8bf87b 100644
--- a/src/components/Timeline/Shared/Poll.tsx
+++ b/src/components/Timeline/Shared/Poll.tsx
@@ -21,7 +21,7 @@ import { Pressable, View } from 'react-native'
 import StatusContext from './Context'
 
 const TimelinePoll: React.FC = () => {
-  const { queryKey, status, ownAccount, spoilerHidden, disableDetails, highlighted } =
+  const { queryKey, status, isMyAccount, spoilerHidden, disableDetails, highlighted } =
     useContext(StatusContext)
   if (!queryKey || !status || !status.poll) return null
   const poll = status.poll
@@ -72,7 +72,7 @@ const TimelinePoll: React.FC = () => {
 
   const pollButton = () => {
     if (!poll.expired) {
-      if (!ownAccount && !poll.voted) {
+      if (!isMyAccount && !poll.voted) {
         return (
           <View style={{ marginRight: StyleConstants.Spacing.S }}>
             <Button
diff --git a/src/components/contextMenu/account.ts b/src/components/contextMenu/account.ts
index f2bda207..413d5e94 100644
--- a/src/components/contextMenu/account.ts
+++ b/src/components/contextMenu/account.ts
@@ -4,6 +4,7 @@ import { useNavigation } from '@react-navigation/native'
 import { NativeStackNavigationProp } from '@react-navigation/native-stack'
 import { useQueryClient } from '@tanstack/react-query'
 import apiInstance from '@utils/api/instance'
+import { checkIsMyAccount } from '@utils/helpers/isMyAccount'
 import { TabSharedStackParamList, useNavState } from '@utils/navigation/navigators'
 import { useAccountQuery } from '@utils/queryHooks/account'
 import {
@@ -15,7 +16,7 @@ import {
   MutationVarsTimelineUpdateAccountProperty,
   useTimelineMutation
 } from '@utils/queryHooks/timeline'
-import { getAccountStorage, getReadableAccounts, useAccountStorage } from '@utils/storage/actions'
+import { getAccountStorage, getReadableAccounts } from '@utils/storage/actions'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Alert, Platform } from 'react-native'
@@ -40,19 +41,18 @@ const menuAccount = ({
 
   const [enabled, setEnabled] = useState(openChange)
   useEffect(() => {
-    if (!ownAccount && enabled === false && openChange === true) {
+    if (!isMyAccount && enabled === false && openChange === true) {
       setEnabled(true)
     }
   }, [openChange, enabled])
   const { data: fetchedAccount } = useAccountQuery({ account, _local: true, options: { enabled } })
   const actualAccount = status?._remote ? fetchedAccount : account
+  const isMyAccount = checkIsMyAccount(actualAccount?.id)
   const { data, isFetched } = useRelationshipQuery({
     id: actualAccount?.id,
     options: { enabled: !!actualAccount?.id && enabled }
   })
 
-  const ownAccount = useAccountStorage.string('auth.account.id')['0'] === actualAccount?.id
-
   const queryClient = useQueryClient()
   const timelineMutation = useTimelineMutation({
     onSuccess: (_, params) => {
@@ -134,7 +134,7 @@ const menuAccount = ({
 
   if (!account) return []
 
-  if (!ownAccount && Platform.OS !== 'android' && type !== 'account') {
+  if (!isMyAccount && Platform.OS !== 'android' && type !== 'account') {
     menus[0].push({
       type: 'item',
       key: 'account-following',
@@ -165,7 +165,7 @@ const menuAccount = ({
     })
   }
 
-  if (!ownAccount) {
+  if (!isMyAccount) {
     menus[0].push({
       type: 'item',
       key: 'account-list',
diff --git a/src/components/contextMenu/status.ts b/src/components/contextMenu/status.ts
index ab804699..9357900e 100644
--- a/src/components/contextMenu/status.ts
+++ b/src/components/contextMenu/status.ts
@@ -4,6 +4,7 @@ import { NativeStackNavigationProp } from '@react-navigation/native-stack'
 import { useQueryClient } from '@tanstack/react-query'
 import apiInstance from '@utils/api/instance'
 import { featureCheck } from '@utils/helpers/featureCheck'
+import { checkIsMyAccount } from '@utils/helpers/isMyAccount'
 import { RootStackParamList, useNavState } from '@utils/navigation/navigators'
 import {
   MutationVarsTimelineUpdateStatusProperty,
@@ -57,9 +58,8 @@ const menuStatus = ({
 
   const menus: ContextMenu = []
 
-  const [accountId] = useAccountStorage.string('auth.account.id')
   const [accountAcct] = useAccountStorage.string('auth.account.acct')
-  const ownAccount = accountId === status.account?.id
+  const isMyAccount = checkIsMyAccount(status.account.id)
 
   const canEditPost = featureCheck('edit_post')
 
@@ -98,7 +98,7 @@ const menuStatus = ({
         },
         disabled: false,
         destructive: false,
-        hidden: !ownAccount || !canEditPost
+        hidden: !isMyAccount || !canEditPost
       },
       title: t('componentContextMenu:status.edit.action'),
       icon: 'square.and.pencil'
@@ -142,7 +142,7 @@ const menuStatus = ({
           ),
         disabled: false,
         destructive: true,
-        hidden: !ownAccount
+        hidden: !isMyAccount
       },
       title: t('componentContextMenu:status.deleteEdit.action'),
       icon: 'pencil.and.outline'
@@ -171,7 +171,7 @@ const menuStatus = ({
           ),
         disabled: false,
         destructive: true,
-        hidden: !ownAccount
+        hidden: !isMyAccount
       },
       title: t('componentContextMenu:status.delete.action'),
       icon: 'trash'
@@ -195,7 +195,7 @@ const menuStatus = ({
         disabled: false,
         destructive: false,
         hidden:
-          !ownAccount &&
+          !isMyAccount &&
           queryKey[1].page !== 'Notifications' &&
           !status.mentions?.find(
             mention => mention.acct === accountAcct && mention.username === accountAcct
@@ -224,7 +224,7 @@ const menuStatus = ({
           }),
         disabled: status.visibility !== 'public' && status.visibility !== 'unlisted',
         destructive: false,
-        hidden: !ownAccount
+        hidden: !isMyAccount
       },
       title: t('componentContextMenu:status.pin.action', {
         defaultValue: 'false',
@@ -236,8 +236,9 @@ const menuStatus = ({
       type: 'item',
       key: 'status-filter',
       props: {
-        // @ts-ignore
-        onSelect: () => navigation.navigate('Tab-Shared-Filter', { source: 'status', status, queryKey }),
+        onSelect: () =>
+          // @ts-ignore
+          navigation.navigate('Tab-Shared-Filter', { source: 'status', status, queryKey }),
         disabled: false,
         destructive: false,
         hidden: !('filtered' in status)
diff --git a/src/screens/Tabs/Shared/Account/Information/Actions.tsx b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
index 4291cfeb..a9948d9d 100644
--- a/src/screens/Tabs/Shared/Account/Information/Actions.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
@@ -2,7 +2,7 @@ import Button from '@components/Button'
 import menuAt from '@components/contextMenu/at'
 import { RelationshipOutgoing } from '@components/Relationship'
 import { useNavigation } from '@react-navigation/native'
-import { useAccountStorage } from '@utils/storage/actions'
+import { checkIsMyAccount } from '@utils/helpers/isMyAccount'
 import { StyleConstants } from '@utils/styles/constants'
 import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -56,12 +56,11 @@ const AccountInformationActions: React.FC = () => {
     )
   }
 
-  const [accountId] = useAccountStorage.string('auth.account.id')
-  const ownAccount = account?.id === accountId
+  const isMyAccount = checkIsMyAccount(account?.id)
 
   const mAt = menuAt({ account })
 
-  if (!ownAccount && account) {
+  if (!isMyAccount && account) {
     return (
       <View style={styles.base}>
         {relationship && !relationship.blocked_by ? (
diff --git a/src/utils/helpers/isMyAccount.ts b/src/utils/helpers/isMyAccount.ts
new file mode 100644
index 00000000..f204bc50
--- /dev/null
+++ b/src/utils/helpers/isMyAccount.ts
@@ -0,0 +1,9 @@
+import { getAccountStorage } from '@utils/storage/actions'
+
+export const checkIsMyAccount = (id?: Mastodon.Account['id']): boolean => {
+  if (!id) return false
+
+  const accountId = getAccountStorage.string('auth.account.id')
+  const accountDomain = getAccountStorage.string('auth.account.domain')
+  return accountId === id || `${accountId}@${accountDomain}` === id
+}

From 0b3d206190aa2ed15622e508d920eb7e7775f86e Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Tue, 7 Feb 2023 21:41:06 +0100
Subject: [PATCH 06/17] Fix #698

---
 src/components/Instance/index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Instance/index.tsx b/src/components/Instance/index.tsx
index efe90d19..ee92541f 100644
--- a/src/components/Instance/index.tsx
+++ b/src/components/Instance/index.tsx
@@ -78,7 +78,8 @@ const ComponentInstance: React.FC<Props> = ({
         clientId,
         clientSecret,
         scopes: variables.scopes,
-        redirectUri
+        redirectUri,
+        usePKCE: !['pawoo.net'].includes(domain)
       })
       await request.makeAuthUrlAsync(discovery)
 

From 8775a0cb2519bb91e98943fa03e29c6f0f8ab031 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Tue, 7 Feb 2023 22:19:39 +0100
Subject: [PATCH 07/17] Fix #697

---
 src/utils/storage/actions.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/utils/storage/actions.ts b/src/utils/storage/actions.ts
index 701219e6..9a322199 100644
--- a/src/utils/storage/actions.ts
+++ b/src/utils/storage/actions.ts
@@ -244,6 +244,12 @@ export const setAccount = async (account: string) => {
     return
   }
 
+  log('log', 'setAccount', `binding storage of ${account}`)
+  storage.account = temp
+  setGlobalStorage('account.active', account)
+  await queryClient.resetQueries()
+  queryClient.clear()
+
   await apiGeneral<Mastodon.Account>({
     method: 'get',
     domain,
@@ -254,15 +260,10 @@ export const setAccount = async (account: string) => {
   })
     .then(res => res.body)
     .then(async a => {
-      temp.set('auth.account.acct', a.acct)
-      temp.set('auth.account.avatar_static', a.avatar_static)
+      storage.account?.set('auth.account.acct', a.acct)
+      storage.account?.set('auth.account.avatar_static', a.avatar_static)
 
-      log('log', 'setAccount', `binding storage of ${account}`)
-      await queryClient.resetQueries()
-      queryClient.clear()
-
-      storage.account = temp
-      setGlobalStorage('account.active', account)
+      log('log', 'setAccount', 'update details')
     })
     .catch(async error => {
       if (error?.status && error.status == 401) {
@@ -302,7 +303,7 @@ export const removeAccount = async (account: string, warning: boolean = true) =>
     apiGeneral({
       method: 'post',
       domain: revokeDetails.domain,
-      url: '/oauth/revoke',
+      url: 'oauth/revoke',
       body: revokeDetails
     })
   }

From c1ebde8fe9a278f33967abb22ed9d50c35c1b507 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Tue, 7 Feb 2023 23:38:34 +0100
Subject: [PATCH 08/17] Fix #699

---
 src/components/Timeline/index.tsx | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/components/Timeline/index.tsx b/src/components/Timeline/index.tsx
index 48da5cfe..9319852c 100644
--- a/src/components/Timeline/index.tsx
+++ b/src/components/Timeline/index.tsx
@@ -60,6 +60,9 @@ const Timeline: React.FC<Props> = ({
   const { colors, theme } = useTheme()
   const { t } = useTranslation('componentTimeline')
 
+  const firstLoad = useSharedValue<boolean>(!readMarker || disableRefresh)
+  const shouldAutoFetch = useSharedValue<boolean>(!!readMarker && !disableRefresh)
+
   const { data, refetch, isFetching, isLoading, isRefetching, fetchNextPage, isFetchingNextPage } =
     useTimelineQuery({
       ...queryKey[1],
@@ -68,7 +71,13 @@ const Timeline: React.FC<Props> = ({
         notifyOnChangeProps: Platform.select({
           ios: ['dataUpdatedAt', 'isFetching'],
           android: ['dataUpdatedAt', 'isFetching', 'isLoading']
-        })
+        }),
+        onSuccess: () => {
+          if (!firstLoad.value) {
+            firstLoad.value = true
+            fetchingType.value = 1
+          }
+        }
       }
     })
 
@@ -90,6 +99,9 @@ const Timeline: React.FC<Props> = ({
     (curr, prev) => {
       if (curr !== null && prev === null) {
         notifiedFetchedNotice.value = false
+        if (curr === 0) {
+          shouldAutoFetch.value = false
+        }
       }
     },
     [fetchedCount]
@@ -122,6 +134,15 @@ const Timeline: React.FC<Props> = ({
     {
       onScroll: ({ contentOffset: { y } }) => {
         scrollY.value = y
+        if (
+          y < 300 &&
+          !isFetchingPrev.value &&
+          fetchingType.value === 0 &&
+          shouldAutoFetch.value &&
+          Platform.OS === 'ios'
+        ) {
+          fetchingType.value = 1
+        }
       },
       onEndDrag: ({ contentOffset: { y } }) => {
         if (!disableRefresh && !isFetching) {
@@ -129,6 +150,7 @@ const Timeline: React.FC<Props> = ({
             fetchingType.value = 2
           } else if (y <= SEPARATION_Y_1) {
             fetchingType.value = 1
+            shouldAutoFetch.value = true
           }
         }
       }

From 9259ee2995270bf1d4b047b56d5fa178002ea9ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 23:42:51 +0100
Subject: [PATCH 09/17] Bump http-cache-semantics from 4.1.0 to 4.1.1 (#696)

Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 29d1af40..14d4cece 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6721,9 +6721,9 @@ __metadata:
   linkType: hard
 
 "http-cache-semantics@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "http-cache-semantics@npm:4.1.0"
-  checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42
+  version: 4.1.1
+  resolution: "http-cache-semantics@npm:4.1.1"
+  checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
   languageName: node
   linkType: hard
 

From d1ed8a0d2a4fa7fef9064ecc7563e16e2a506f2e Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Wed, 8 Feb 2023 01:10:59 +0100
Subject: [PATCH 10/17] Test #700

---
 ...tive-fast-image-npm-8.6.3-03ee2d23c0.patch | 363 ------------------
 ios/Podfile.lock                              |  48 ++-
 package.json                                  |   4 +-
 src/components/Account.tsx                    |   2 +-
 src/components/AccountButton.tsx              |   2 +-
 src/components/Emojis/List.tsx                |   6 +-
 src/components/GracefullyImage.tsx            | 125 +++---
 src/components/Instance/index.tsx             |   3 +-
 src/components/Parse/Emojis.tsx               |   6 +-
 src/components/Timeline/Conversation.tsx      |   5 +-
 src/components/Timeline/Shared/Attachment.tsx |   2 -
 .../Timeline/Shared/Attachment/Audio.tsx      |  11 +-
 .../Timeline/Shared/Attachment/Image.tsx      |   7 +-
 .../Shared/Attachment/Unsupported.tsx         |   6 +-
 .../Timeline/Shared/Attachment/Video.tsx      |   7 +-
 src/components/Timeline/Shared/Avatar.tsx     |   5 +-
 src/components/Timeline/Shared/Card.tsx       |   3 +-
 src/screens/Announcements.tsx                 |  16 +-
 src/screens/Compose/DraftsList.tsx            |   4 +-
 .../Compose/Root/Footer/Attachments.tsx       |   6 +-
 src/screens/ImageViewer/index.tsx             |   9 +-
 .../Tabs/Shared/Account/Attachments.tsx       |  26 +-
 src/screens/Tabs/Shared/Account/Header.tsx    |   5 +-
 .../Shared/Account/Information/Avatar.tsx     |  18 +-
 src/screens/Tabs/index.tsx                    |   2 +-
 src/utils/api/helpers/connect.ts              |  17 +-
 yarn.lock                                     |  31 +-
 27 files changed, 176 insertions(+), 563 deletions(-)
 delete mode 100644 .yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch

diff --git a/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch b/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch
deleted file mode 100644
index 3d890062..00000000
--- a/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-diff --git a/RNFastImage.podspec b/RNFastImage.podspec
-index db0fada63fc06191f8620d336d244edde6c3dba3..9c22c36f6978530da21afe143324ff79b4e96454 100644
---- a/RNFastImage.podspec
-+++ b/RNFastImage.podspec
-@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
-   s.source_files  = "ios/**/*.{h,m}"
- 
-   s.dependency 'React-Core'
--  s.dependency 'SDWebImage', '~> 5.11.1'
--  s.dependency 'SDWebImageWebPCoder', '~> 0.8.4'
-+  s.dependency 'SDWebImage', '~> 5.15.0'
-+  s.dependency 'SDWebImageWebPCoder', '~> 0.9.1'
- end
-diff --git a/android/build.gradle b/android/build.gradle
-index 5b21cd59c40a5754f5d19c77e2a0eb0229925911..19d82f826e88125c5e6d87ee7c348fac621f548c 100644
---- a/android/build.gradle
-+++ b/android/build.gradle
-@@ -65,4 +65,5 @@ dependencies {
-     implementation "com.github.bumptech.glide:glide:${glideVersion}"
-     implementation "com.github.bumptech.glide:okhttp3-integration:${glideVersion}"
-     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
-+    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.12.0'
- }
-diff --git a/android/src/main/java/com/dylanvann/fastimage/FastImageEnterTransition.java b/android/src/main/java/com/dylanvann/fastimage/FastImageEnterTransition.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..55e3b4e0d463654f62d942ba05c2a5e51ae9d6d7
---- /dev/null
-+++ b/android/src/main/java/com/dylanvann/fastimage/FastImageEnterTransition.java
-@@ -0,0 +1,6 @@
-+package com.dylanvann.fastimage;
-+
-+public enum FastImageEnterTransition {
-+    TRANSITION_NONE,
-+    FADE_IN
-+}
-diff --git a/android/src/main/java/com/dylanvann/fastimage/FastImageTransitions.java b/android/src/main/java/com/dylanvann/fastimage/FastImageTransitions.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d764cc4b8d110f087120a4f0dc5d986754806dec
---- /dev/null
-+++ b/android/src/main/java/com/dylanvann/fastimage/FastImageTransitions.java
-@@ -0,0 +1,20 @@
-+package com.dylanvann.fastimage;
-+
-+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
-+import com.bumptech.glide.TransitionOptions;
-+import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
-+import android.view.animation.DecelerateInterpolator;
-+
-+public class FastImageTransitions {
-+    static final DecelerateInterpolator mInterpolator = new DecelerateInterpolator();
-+
-+    public static TransitionOptions getEnterTransition(FastImageEnterTransition transition, int duration) {
-+        switch (transition) {
-+            case FADE_IN:
-+                return DrawableTransitionOptions.withCrossFade(duration);
-+
-+            default:
-+                throw new JSApplicationIllegalArgumentException("FastImage, invalid enterTransition argument");
-+        }
-+    }
-+}
-\ No newline at end of file
-diff --git a/android/src/main/java/com/dylanvann/fastimage/FastImageViewConverter.java b/android/src/main/java/com/dylanvann/fastimage/FastImageViewConverter.java
-index 86ca00d018d7ded0edff733373d80976c8dbb961..e6220f57b38a3fe3ae9d5a75228f791e0ec978bb 100644
---- a/android/src/main/java/com/dylanvann/fastimage/FastImageViewConverter.java
-+++ b/android/src/main/java/com/dylanvann/fastimage/FastImageViewConverter.java
-@@ -50,6 +50,12 @@ class FastImageViewConverter {
-                 put("center", ScaleType.CENTER_INSIDE);
-             }};
- 
-+    private static final Map<String, FastImageEnterTransition> FAST_IMAGE_ENTER_TRANSITION_MAP =
-+            new HashMap<String, FastImageEnterTransition>() {{
-+                put("none", FastImageEnterTransition.TRANSITION_NONE);
-+                put("fadeIn", FastImageEnterTransition.FADE_IN);
-+            }};
-+
-     // Resolve the source uri to a file path that android understands.
-     static @Nullable
-     FastImageSource getImageSource(Context context, @Nullable ReadableMap source) {
-@@ -125,6 +131,10 @@ class FastImageViewConverter {
-         return getValueFromSource("cache", "immutable", FAST_IMAGE_CACHE_CONTROL_MAP, source);
-     }
- 
-+    static FastImageEnterTransition getEnterTransition(String propValue) {
-+        return getValue("enterTransition", "none", FAST_IMAGE_ENTER_TRANSITION_MAP, propValue);
-+    }
-+
-     private static Priority getPriority(ReadableMap source) {
-         return getValueFromSource("priority", "normal", FAST_IMAGE_PRIORITY_MAP, source);
-     }
-diff --git a/android/src/main/java/com/dylanvann/fastimage/FastImageViewManager.java b/android/src/main/java/com/dylanvann/fastimage/FastImageViewManager.java
-index c7a795471c8f8b48163c778836406bc5ead75dab..53b481547b44224e7791a8d3f39815c9c9a4be59 100644
---- a/android/src/main/java/com/dylanvann/fastimage/FastImageViewManager.java
-+++ b/android/src/main/java/com/dylanvann/fastimage/FastImageViewManager.java
-@@ -83,6 +83,17 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
-         view.setScaleType(scaleType);
-     }
- 
-+    @ReactProp(name = "enterTransition")
-+    public void setEnterTransition(FastImageViewWithUrl view, String enterTransition) {
-+        final FastImageEnterTransition transition = FastImageViewConverter.getEnterTransition(enterTransition);
-+        view.setEnterTransition(transition);
-+    }
-+
-+    @ReactProp(name = "transitionDuration")
-+    public void setTransitionDuration(FastImageViewWithUrl view, int transitionDuration) {
-+        view.setTransitionDuration(transitionDuration);
-+    }
-+
-     @Override
-     public void onDropViewInstance(@NonNull FastImageViewWithUrl view) {
-         // This will cancel existing requests.
-diff --git a/android/src/main/java/com/dylanvann/fastimage/FastImageViewWithUrl.java b/android/src/main/java/com/dylanvann/fastimage/FastImageViewWithUrl.java
-index 34fcf898d17d82fd52375e9028b71ad815b9b15b..fd57ac68de093d2a8ee53aeede45328c8d52aa39 100644
---- a/android/src/main/java/com/dylanvann/fastimage/FastImageViewWithUrl.java
-+++ b/android/src/main/java/com/dylanvann/fastimage/FastImageViewWithUrl.java
-@@ -30,6 +30,8 @@ class FastImageViewWithUrl extends AppCompatImageView {
-     private boolean mNeedsReload = false;
-     private ReadableMap mSource = null;
-     private Drawable mDefaultSource = null;
-+    private FastImageEnterTransition mEnterTransition = FastImageEnterTransition.TRANSITION_NONE;
-+    private int mTransitionDuration = 350;
- 
-     public GlideUrl glideUrl;
- 
-@@ -47,6 +49,14 @@ class FastImageViewWithUrl extends AppCompatImageView {
-         mDefaultSource = source;
-     }
- 
-+    public void setEnterTransition(@Nullable FastImageEnterTransition transition) {
-+        mEnterTransition = transition;
-+    }
-+
-+    public void setTransitionDuration(int duration) {
-+        mTransitionDuration = duration == 0 ? 350 : duration;
-+    }
-+
-     private boolean isNullOrEmpty(final String url) {
-         return url == null || url.trim().isEmpty();
-     }
-@@ -147,6 +157,10 @@ class FastImageViewWithUrl extends AppCompatImageView {
-             if (key != null)
-                 builder.listener(new FastImageRequestListener(key));
- 
-+            if (mEnterTransition != FastImageEnterTransition.TRANSITION_NONE) {
-+                builder.transition(FastImageTransitions.getEnterTransition(mEnterTransition, mTransitionDuration));
-+            }
-+
-             builder.into(this);
-         }
-     }
-diff --git a/dist/index.cjs.js b/dist/index.cjs.js
-index 2df6a29769978d8d947dfb50b422e1f56bd97fb6..f3904e20edac5f19cc26f41a4ff02eecd73ac627 100644
---- a/dist/index.cjs.js
-+++ b/dist/index.cjs.js
-@@ -9,6 +9,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
- var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
- var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
- 
-+const enterTransition = {
-+  none: 'none',
-+  fadeIn: 'fadeIn'
-+}
- const resizeMode = {
-   contain: 'contain',
-   cover: 'cover',
-@@ -115,6 +119,7 @@ const FastImageComponent = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PU
- }, props)));
- FastImageComponent.displayName = 'FastImage';
- const FastImage = FastImageComponent;
-+FastImage.enterTransition = enterTransition
- FastImage.resizeMode = resizeMode;
- FastImage.cacheControl = cacheControl;
- FastImage.priority = priority;
-diff --git a/dist/index.d.ts b/dist/index.d.ts
-index 5abb7c98b767cd0709b53f5ab2dd50c752a9377b..2da22817e3136673d40a177ae8c9fc2209f143d8 100644
---- a/dist/index.d.ts
-+++ b/dist/index.d.ts
-@@ -1,5 +1,10 @@
- import React from 'react';
- import { FlexStyle, LayoutChangeEvent, ShadowStyleIOS, StyleProp, TransformsStyle, ImageRequireSource, AccessibilityProps, ViewProps, ColorValue } from 'react-native';
-+export declare type EnterTransition = 'none' | 'fadeIn';
-+declare const enterTransition: {
-+    readonly none: "none";
-+    readonly fadeIn: "fadeIn";
-+};
- export declare type ResizeMode = 'contain' | 'cover' | 'stretch' | 'center';
- declare const resizeMode: {
-     readonly contain: "contain";
-@@ -57,6 +62,16 @@ export interface FastImageProps extends AccessibilityProps, ViewProps {
-     defaultSource?: ImageRequireSource;
-     resizeMode?: ResizeMode;
-     fallback?: boolean;
-+    /**
-+     * Transition durations.
-+     * @default none
-+     */
-+    enterTransition?: EnterTransition
-+    /**
-+     * Enter transition duration in ms.
-+     * @default 500ms
-+     */
-+    transitionDuration?: number
-     onLoadStart?(): void;
-     onProgress?(event: OnProgressEvent): void;
-     onLoad?(event: OnLoadEvent): void;
-@@ -91,6 +106,7 @@ export interface FastImageProps extends AccessibilityProps, ViewProps {
-     children?: React.ReactNode;
- }
- export interface FastImageStaticProperties {
-+    enterTransition: typeof enterTransition;
-     resizeMode: typeof resizeMode;
-     priority: typeof priority;
-     cacheControl: typeof cacheControl;
-diff --git a/dist/index.js b/dist/index.js
-index 58e0308bd44836aad3e4979b5c1151083956c295..5853b3b2fd05c91be8c70819fe6fc45606f26f8d 100644
---- a/dist/index.js
-+++ b/dist/index.js
-@@ -2,6 +2,10 @@ import _extends from '@babel/runtime/helpers/extends';
- import React, { forwardRef, memo } from 'react';
- import { NativeModules, StyleSheet, requireNativeComponent, Image, View, Platform } from 'react-native';
- 
-+const enterTransition = {
-+  none: 'none',
-+  fadeIn: 'fadeIn'
-+}
- const resizeMode = {
-   contain: 'contain',
-   cover: 'cover',
-@@ -57,6 +61,8 @@ function FastImageBase({
-   children,
-   // eslint-disable-next-line no-shadow
-   resizeMode = 'cover',
-+  enterTransition = 'none',
-+  transitionDuration = 350,
-   forwardedRef,
-   ...props
- }) {
-@@ -79,7 +85,9 @@ function FastImageBase({
-       onLoad: onLoad,
-       onError: onError,
-       onLoadEnd: onLoadEnd,
--      resizeMode: resizeMode
-+      resizeMode: resizeMode,
-+      enterTransition: enterTransition,
-+      transitionDuration: transitionDuration
-     })), children);
-   }
- 
-@@ -98,7 +106,9 @@ function FastImageBase({
-     onFastImageLoad: onLoad,
-     onFastImageError: onError,
-     onFastImageLoadEnd: onLoadEnd,
--    resizeMode: resizeMode
-+    resizeMode: resizeMode,
-+    enterTransition: enterTransition,
-+    transitionDuration: transitionDuration
-   })), children);
- }
- 
-@@ -108,6 +118,7 @@ const FastImageComponent = /*#__PURE__*/forwardRef((props, ref) => /*#__PURE__*/
- }, props)));
- FastImageComponent.displayName = 'FastImage';
- const FastImage = FastImageComponent;
-+FastImage.enterTransition = enterTransition
- FastImage.resizeMode = resizeMode;
- FastImage.cacheControl = cacheControl;
- FastImage.priority = priority;
-diff --git a/ios/FastImage/FFFastImageView.h b/ios/FastImage/FFFastImageView.h
-index e52fca79882ad2a678487a46b2fe158427e06f3a..6c9c41b0b1a3c967a3715a24bb692447b76ef365 100644
---- a/ios/FastImage/FFFastImageView.h
-+++ b/ios/FastImage/FFFastImageView.h
-@@ -7,6 +7,7 @@
- #import <React/RCTResizeMode.h>
- 
- #import "FFFastImageSource.h"
-+#import "FFFastImageViewManager.h"
- 
- @interface FFFastImageView : SDAnimatedImageView
- 
-@@ -16,6 +17,8 @@
- @property (nonatomic, copy) RCTDirectEventBlock onFastImageLoad;
- @property (nonatomic, copy) RCTDirectEventBlock onFastImageLoadEnd;
- @property (nonatomic, assign) RCTResizeMode resizeMode;
-+@property (nonatomic, assign) FFFEnterTransition enterTransition;
-+@property (nonatomic, assign) NSTimeInterval transitionDuration;
- @property (nonatomic, strong) FFFastImageSource *source;
- @property (nonatomic, strong) UIImage *defaultSource;
- @property (nonatomic, strong) UIColor *imageColor;
-diff --git a/ios/FastImage/FFFastImageView.m b/ios/FastImage/FFFastImageView.m
-index f7100815e652539b29b1fa70ff1477c5f5db08dc..ecb79eafe566fe52090adada3cdf16eb10a67513 100644
---- a/ios/FastImage/FFFastImageView.m
-+++ b/ios/FastImage/FFFastImageView.m
-@@ -71,6 +71,18 @@ - (void) setImageColor: (UIColor*)imageColor {
-     }
- }
- 
-+- (void) setTransitionDuration: (NSTimeInterval)transitionDuration {
-+   self.sd_imageTransition.duration = transitionDuration;
-+}
-+
-+- (void) setEnterTransition: (FFFEnterTransition)enterTransition {
-+    switch (enterTransition) {
-+        case FFFFadeIn:
-+            self.sd_imageTransition = SDWebImageTransition.fadeTransition;
-+            break;
-+    }
-+}
-+
- - (UIImage*) makeImage: (UIImage*)image withTint: (UIColor*)color {
-     UIImage* newImage = [image imageWithRenderingMode: UIImageRenderingModeAlwaysTemplate];
-     UIGraphicsBeginImageContextWithOptions(image.size, NO, newImage.scale);
-diff --git a/ios/FastImage/FFFastImageViewManager.h b/ios/FastImage/FFFastImageViewManager.h
-index 8ba6020e2c6e5757ed778d00e3f43a6ff4c1d50a..a269669301ea00ef3c2714123d17e822094635d6 100644
---- a/ios/FastImage/FFFastImageViewManager.h
-+++ b/ios/FastImage/FFFastImageViewManager.h
-@@ -1,5 +1,10 @@
- #import <React/RCTViewManager.h>
- 
-+typedef NS_ENUM(NSInteger, FFFEnterTransition) {
-+    FFFTransitionNone,
-+    FFFFadeIn,
-+};
-+
- @interface FFFastImageViewManager : RCTViewManager
- 
- @end
-diff --git a/ios/FastImage/FFFastImageViewManager.m b/ios/FastImage/FFFastImageViewManager.m
-index 84ca94e26e546d4d139dabca6c3efd0a890eda63..2184bac31f0d547e6119356bb4fc7931be87446d 100644
---- a/ios/FastImage/FFFastImageViewManager.m
-+++ b/ios/FastImage/FFFastImageViewManager.m
-@@ -13,6 +13,8 @@ - (FFFastImageView*)view {
- }
- 
- RCT_EXPORT_VIEW_PROPERTY(source, FFFastImageSource)
-+RCT_EXPORT_VIEW_PROPERTY(enterTransition, FFFEnterTransition)
-+RCT_EXPORT_VIEW_PROPERTY(transitionDuration, NSTimeInterval)
- RCT_EXPORT_VIEW_PROPERTY(defaultSource, UIImage)
- RCT_EXPORT_VIEW_PROPERTY(resizeMode, RCTResizeMode)
- RCT_EXPORT_VIEW_PROPERTY(onFastImageLoadStart, RCTDirectEventBlock)
-diff --git a/ios/FastImage/RCTConvert+FFFastImage.m b/ios/FastImage/RCTConvert+FFFastImage.m
-index 43f8922157655a7497f56a3909ef6b2a886f07d8..0705f8e05f44f3053e7239fcc9a30d986e7aaab7 100644
---- a/ios/FastImage/RCTConvert+FFFastImage.m
-+++ b/ios/FastImage/RCTConvert+FFFastImage.m
-@@ -1,5 +1,6 @@
- #import "RCTConvert+FFFastImage.h"
- #import "FFFastImageSource.h"
-+#import "FFFastImageViewManager.h"
- 
- @implementation RCTConvert (FFFastImage)
- 
-@@ -15,6 +16,11 @@ @implementation RCTConvert (FFFastImage)
-                                        @"cacheOnly": @(FFFCacheControlCacheOnly),
-                                        }), FFFCacheControlImmutable, integerValue);
- 
-+RCT_ENUM_CONVERTER(FFFEnterTransition, (@{
-+                                          @"none": @(FFFTransitionNone),
-+                                          @"fadeIn": @(FFFFadeIn),
-+                                          }), FFFTransitionNone, integerValue);
-+
- + (FFFastImageSource *)FFFastImageSource:(id)json {
-     if (!json) {
-         return nil;
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d82e3a1d..08e90796 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -22,6 +22,12 @@ PODS:
     - ExpoModulesCore
   - ExpoHaptics (12.1.0):
     - ExpoModulesCore
+  - ExpoImage (1.0.0-beta.6):
+    - ExpoModulesCore
+    - SDWebImage (~> 5.15.0)
+    - SDWebImageAVIFCoder (~> 0.9.4)
+    - SDWebImageSVGCoder (~> 1.6.1)
+    - SDWebImageWebPCoder (~> 0.9.1)
   - ExpoKeepAwake (11.0.1):
     - ExpoModulesCore
   - ExpoLocalization (14.0.0):
@@ -58,7 +64,16 @@ PODS:
   - fmt (6.2.1)
   - glog (0.3.5)
   - hermes-engine (0.70.7)
+  - libaom (2.0.2):
+    - libvmaf
+  - libavif (0.10.1):
+    - libavif/libaom (= 0.10.1)
+  - libavif/core (0.10.1)
+  - libavif/libaom (0.10.1):
+    - libaom (>= 2.0.0)
+    - libavif/core
   - libevent (2.1.12)
+  - libvmaf (2.2.0)
   - libwebp (1.2.4):
     - libwebp/demux (= 1.2.4)
     - libwebp/mux (= 1.2.4)
@@ -299,8 +314,6 @@ PODS:
     - glog
   - react-native-blur (4.3.0):
     - React-Core
-  - react-native-blurhash (1.1.10):
-    - React-Core
   - react-native-cameraroll (5.2.3):
     - React-Core
   - react-native-image-picker (5.0.1):
@@ -401,10 +414,6 @@ PODS:
     - React-Core
   - RNCClipboard (1.11.1):
     - React-Core
-  - RNFastImage (8.6.3):
-    - React-Core
-    - SDWebImage (~> 5.15.0)
-    - SDWebImageWebPCoder (~> 0.9.1)
   - RNGestureHandler (2.9.0):
     - React-Core
   - RNReanimated (2.14.4):
@@ -447,6 +456,11 @@ PODS:
   - SDWebImage (5.15.0):
     - SDWebImage/Core (= 5.15.0)
   - SDWebImage/Core (5.15.0)
+  - SDWebImageAVIFCoder (0.9.5):
+    - libavif (>= 0.9.1)
+    - SDWebImage (~> 5.10)
+  - SDWebImageSVGCoder (1.6.1):
+    - SDWebImage/Core (~> 5.6)
   - SDWebImageWebPCoder (0.9.1):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.13)
@@ -467,6 +481,7 @@ DEPENDENCIES:
   - Expo (from `../node_modules/expo`)
   - ExpoCrypto (from `../node_modules/expo-crypto/ios`)
   - ExpoHaptics (from `../node_modules/expo-haptics/ios`)
+  - ExpoImage (from `../node_modules/expo-image/ios`)
   - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoLocalization (from `../node_modules/expo-localization/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
@@ -500,7 +515,6 @@ DEPENDENCIES:
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
-  - react-native-blurhash (from `../node_modules/react-native-blurhash`)
   - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-ios-context-menu (from `../node_modules/react-native-ios-context-menu`)
@@ -527,7 +541,6 @@ DEPENDENCIES:
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
-  - RNFastImage (from `../node_modules/react-native-fast-image`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
@@ -539,11 +552,16 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - fmt
+    - libaom
+    - libavif
     - libevent
+    - libvmaf
     - libwebp
     - MMKV
     - MMKVCore
     - SDWebImage
+    - SDWebImageAVIFCoder
+    - SDWebImageSVGCoder
     - SDWebImageWebPCoder
     - Sentry
     - Swime
@@ -573,6 +591,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-crypto/ios"
   ExpoHaptics:
     :path: "../node_modules/expo-haptics/ios"
+  ExpoImage:
+    :path: "../node_modules/expo-image/ios"
   ExpoKeepAwake:
     :path: "../node_modules/expo-keep-awake/ios"
   ExpoLocalization:
@@ -635,8 +655,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/logger"
   react-native-blur:
     :path: "../node_modules/@react-native-community/blur"
-  react-native-blurhash:
-    :path: "../node_modules/react-native-blurhash"
   react-native-cameraroll:
     :path: "../node_modules/@react-native-camera-roll/camera-roll"
   react-native-image-picker:
@@ -689,8 +707,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-async-storage/async-storage"
   RNCClipboard:
     :path: "../node_modules/@react-native-clipboard/clipboard"
-  RNFastImage:
-    :path: "../node_modules/react-native-fast-image"
   RNGestureHandler:
     :path: "../node_modules/react-native-gesture-handler"
   RNReanimated:
@@ -719,6 +735,7 @@ SPEC CHECKSUMS:
   Expo: b9fa98bf260992312ee3c424400819fb9beadafe
   ExpoCrypto: 6eb2a5ede7d95b7359a5f0391ee0c5d2ecd144b3
   ExpoHaptics: 129d3f8d44c2205adcdf8db760602818463d5437
+  ExpoImage: 748f2b8d3974f1d51c7706fd61057b93241738aa
   ExpoKeepAwake: 69b59d0a8d2b24de9f82759c39b3821fec030318
   ExpoLocalization: e202d1e2a4950df17ac8d0889d65a1ffd7532d7e
   ExpoModulesCore: 485dff3a59b036a33b6050c0a5aea3cf1037fdd1
@@ -735,7 +752,10 @@ SPEC CHECKSUMS:
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: 566e656aa95456a3f3f739fd76ea9a9656f2633f
+  libaom: 9bb51e0f8f9192245e3ca2a1c9e4375d9cbccc52
+  libavif: e242998ccec1c83bcba0bbdc256f460ad5077348
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
+  libvmaf: 8d61aabc2f4ed3e6591cf7406fa00a223ec11289
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   MMKV: 7f34558bbb5a33b0eaefae2de4b6a20a2ffdad6f
   MMKVCore: ddf41b9d9262f058419f9ba7598719af56c02cd3
@@ -755,7 +775,6 @@ SPEC CHECKSUMS:
   React-jsinspector: 1c34fea1868136ecde647bc11fae9266d4143693
   React-logger: e9f407f9fdf3f3ce7749ae6f88affe63e8446019
   react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
-  react-native-blurhash: add4df9a937b4e021a24bc67a0714f13e0bd40b7
   react-native-cameraroll: 5b25d0be40185d02e522bf2abf8a1ba4e8faa107
   react-native-image-picker: 8cb4280e2c1efc3daeb2d9d597f9429a60472e40
   react-native-ios-context-menu: e529171ba760a1af7f2ef0729f5a7f4d226171c5
@@ -782,7 +801,6 @@ SPEC CHECKSUMS:
   ReactCommon: 0253d197eaa7f6689dcd3e7d5360449ab93e10df
   RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
   RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd
-  RNFastImage: bd611b5635f1e0f43c8ccf597b1ef6ee0d0f966d
   RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
   RNReanimated: 6668b0587bebd4b15dd849b99e5a9c70fc12ed95
   RNScreens: ea4cd3a853063cda19a4e3c28d2e52180c80f4eb
@@ -790,6 +808,8 @@ SPEC CHECKSUMS:
   RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3
   RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902
   SDWebImage: 9bec4c5cdd9579e1f57104735ee0c37df274d593
+  SDWebImageAVIFCoder: d759e21cf4efb640cc97250566aa556ad8bb877c
+  SDWebImageSVGCoder: 6fc109f9c2a82ab44510fff410b88b1a6c271ee8
   SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0
   Sentry: 4c9babff9034785067c896fd580b1f7de44da020
   Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
diff --git a/package.json b/package.json
index 3264ce49..37ddb719 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "expo-crypto": "^12.1.0",
     "expo-file-system": "^15.1.1",
     "expo-haptics": "^12.1.0",
+    "expo-image": "^1.0.0-beta.6",
     "expo-linking": "^3.3.0",
     "expo-localization": "^14.0.0",
     "expo-notifications": "^0.17.0",
@@ -70,8 +71,6 @@
     "react-i18next": "^12.1.4",
     "react-intl": "^6.2.7",
     "react-native": "^0.70.7",
-    "react-native-blurhash": "^1.1.10",
-    "react-native-fast-image": "^8.6.3",
     "react-native-flash-message": "^0.4.0",
     "react-native-gesture-handler": "~2.9.0",
     "react-native-image-picker": "^5.0.1",
@@ -116,7 +115,6 @@
   },
   "packageManager": "yarn@3.3.1",
   "resolutions": {
-    "react-native-fast-image@^8.6.3": "patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch",
     "expo-av@^13.0.2": "patch:expo-av@npm%3A13.0.2#./.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch",
     "react-native-share-menu@^6.0.0": "patch:react-native-share-menu@npm%3A6.0.0#./.yarn/patches/react-native-share-menu-npm-6.0.0-f1094c3204.patch",
     "@types/react-native-share-menu@^5.0.2": "patch:@types/react-native-share-menu@npm%3A5.0.2#./.yarn/patches/@types-react-native-share-menu-npm-5.0.2-373df17ecc.patch",
diff --git a/src/components/Account.tsx b/src/components/Account.tsx
index da062c03..b0b9fdba 100644
--- a/src/components/Account.tsx
+++ b/src/components/Account.tsx
@@ -38,7 +38,7 @@ const ComponentAccount: React.FC<PropsWithChildren & Props> = ({ account, props,
         <>
           <View style={{ flex: 1, flexDirection: 'row', alignItems: 'center' }}>
             <GracefullyImage
-              uri={{ original: account.avatar, static: account.avatar_static }}
+              sources={{ default: { uri: account.avatar }, static: { uri: account.avatar_static } }}
               style={{
                 width: StyleConstants.Avatar.S,
                 height: StyleConstants.Avatar.S,
diff --git a/src/components/AccountButton.tsx b/src/components/AccountButton.tsx
index 662d1b14..9e481745 100644
--- a/src/components/AccountButton.tsx
+++ b/src/components/AccountButton.tsx
@@ -40,7 +40,7 @@ const AccountButton: React.FC<Props> = ({ account, additionalActions }) => {
       }}
     >
       <GracefullyImage
-        uri={{ original: account.avatar_static }}
+        sources={{ default: { uri: account.avatar_static } }}
         dimension={{
           width: StyleConstants.Font.Size.L,
           height: StyleConstants.Font.Size.L
diff --git a/src/components/Emojis/List.tsx b/src/components/Emojis/List.tsx
index 56418778..3d69205b 100644
--- a/src/components/Emojis/List.tsx
+++ b/src/components/Emojis/List.tsx
@@ -8,6 +8,7 @@ import { getAccountStorage, setAccountStorage } from '@utils/storage/actions'
 import { StyleConstants } from '@utils/styles/constants'
 import layoutAnimation from '@utils/styles/layoutAnimation'
 import { useTheme } from '@utils/styles/ThemeManager'
+import { Image } from 'expo-image'
 import { chunk } from 'lodash'
 import React, { useContext, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -19,7 +20,6 @@ import {
   TextInput,
   View
 } from 'react-native'
-import FastImage from 'react-native-fast-image'
 import EmojisContext from './Context'
 
 const EmojisList = () => {
@@ -129,9 +129,7 @@ const EmojisList = () => {
               }}
               style={{ padding: StyleConstants.Spacing.S }}
             >
-              <FastImage
-                enterTransition='fadeIn'
-                transitionDuration={60}
+              <Image
                 accessibilityLabel={t('common:customEmoji.accessibilityLabel', {
                   emoji: emoji.shortcode
                 })}
diff --git a/src/components/GracefullyImage.tsx b/src/components/GracefullyImage.tsx
index 66c3445a..e161e9ce 100644
--- a/src/components/GracefullyImage.tsx
+++ b/src/components/GracefullyImage.tsx
@@ -1,36 +1,26 @@
 import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
 import { connectMedia } from '@utils/api/helpers/connect'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useEffect, useState } from 'react'
-import {
-  AccessibilityProps,
-  Image,
-  Pressable,
-  StyleProp,
-  StyleSheet,
-  View,
-  ViewStyle
-} from 'react-native'
-import { Blurhash } from 'react-native-blurhash'
-import FastImage, { ImageStyle } from 'react-native-fast-image'
-
-// blurhas -> if blurhash, show before any loading succeed
-// original -> load original
-// original, remote -> if original failed, then remote
-// preview, original -> first show preview, then original
-// preview, original, remote -> first show preview, then original, if original failed, then remote
+import { Image, ImageSource, ImageStyle } from 'expo-image'
+import React, { useState } from 'react'
+import { AccessibilityProps, Pressable, StyleProp, View, ViewStyle } from 'react-native'
 
 export interface Props {
   accessibilityLabel?: AccessibilityProps['accessibilityLabel']
   accessibilityHint?: AccessibilityProps['accessibilityHint']
 
   hidden?: boolean
-  uri: { preview?: string; original?: string; remote?: string; static?: string }
-  blurhash?: string
+  sources: {
+    preview?: ImageSource
+    default?: ImageSource
+    remote?: ImageSource
+    static?: ImageSource
+    blurhash?: string
+  }
   dimension?: { width: number; height: number }
   onPress?: () => void
   style?: StyleProp<ViewStyle>
-  imageStyle?: StyleProp<ImageStyle>
+  imageStyle?: ImageStyle
   // For image viewer when there is no image size available
   setImageDimensions?: React.Dispatch<
     React.SetStateAction<{
@@ -39,49 +29,30 @@ export interface Props {
     }>
   >
   dim?: boolean
+  enableLiveTextInteraction?: boolean
 }
 
 const GracefullyImage = ({
   accessibilityLabel,
   accessibilityHint,
   hidden = false,
-  uri,
-  blurhash,
+  sources,
   dimension,
   onPress,
   style,
   imageStyle,
   setImageDimensions,
-  dim
+  dim,
+  enableLiveTextInteraction = false
 }: Props) => {
   const { reduceMotionEnabled } = useAccessibility()
-  const { colors, theme } = useTheme()
-  const [imageLoaded, setImageLoaded] = useState(false)
+  const { theme } = useTheme()
 
-  const [currentUri, setCurrentUri] = useState<string | undefined>(uri.original || uri.remote)
-  const source: { uri?: string } = {
-    uri: reduceMotionEnabled && uri.static ? uri.static : currentUri
-  }
-  useEffect(() => {
-    if (
-      (uri.original ? currentUri !== uri.original : true) &&
-      (uri.remote ? currentUri !== uri.remote : true)
-    ) {
-      setCurrentUri(uri.original || uri.remote)
-    }
-  }, [currentUri, uri.original, uri.remote])
-
-  const blurhashView = () => {
-    if (hidden || !imageLoaded) {
-      if (blurhash) {
-        return <Blurhash decodeAsync blurhash={blurhash} style={styles.placeholder} />
-      } else {
-        return <View style={[styles.placeholder, { backgroundColor: colors.shimmerDefault }]} />
-      }
-    } else {
-      return null
-    }
-  }
+  const [currentSource, setCurrentSource] = useState<ImageSource | undefined>(
+    sources.default || sources.remote
+  )
+  const source: ImageSource | undefined =
+    reduceMotionEnabled && sources.static ? sources.static : currentSource
 
   return (
     <Pressable
@@ -91,50 +62,40 @@ const GracefullyImage = ({
       style={[style, dimension]}
       {...(onPress ? (hidden ? { disabled: true } : { onPress }) : { disabled: true })}
     >
-      {uri.preview && !imageLoaded ? (
-        <FastImage
-          source={connectMedia({ uri: uri.preview })}
-          enterTransition='fadeIn'
-          transitionDuration={60}
-          style={[styles.placeholder]}
-        />
-      ) : null}
-      <FastImage
-        source={connectMedia(source)}
-        enterTransition={!blurhash && !uri.preview ? 'fadeIn' : 'none'}
-        transitionDuration={60}
-        style={[{ flex: 1 }, imageStyle]}
-        onLoad={() => {
-          setImageLoaded(true)
-          if (setImageDimensions && source.uri) {
-            Image.getSize(source.uri, (width, height) => setImageDimensions({ width, height }))
+      <Image
+        placeholder={sources.blurhash || connectMedia(sources.preview)}
+        source={hidden ? undefined : connectMedia(source)}
+        transition={{ duration: 100 }}
+        style={{ flex: 1, ...imageStyle }}
+        onLoad={event => {
+          if (setImageDimensions && event.source) {
+            setImageDimensions(event.source)
           }
         }}
         onError={() => {
-          if (uri.original && uri.original === currentUri && uri.remote) {
-            setCurrentUri(uri.remote)
+          if (
+            sources.default?.uri &&
+            sources.default?.uri === currentSource?.uri &&
+            sources.remote
+          ) {
+            setCurrentSource(sources.remote)
           }
         }}
+        enableLiveTextInteraction={enableLiveTextInteraction}
       />
-      {blurhashView()}
       {dim && theme !== 'light' ? (
         <View
-          style={[
-            styles.placeholder,
-            { backgroundColor: 'black', opacity: theme === 'dark_lighter' ? 0.18 : 0.36 }
-          ]}
+          style={{
+            width: '100%',
+            height: '100%',
+            position: 'absolute',
+            backgroundColor: 'black',
+            opacity: theme === 'dark_lighter' ? 0.18 : 0.36
+          }}
         />
       ) : null}
     </Pressable>
   )
 }
 
-const styles = StyleSheet.create({
-  placeholder: {
-    width: '100%',
-    height: '100%',
-    position: 'absolute'
-  }
-})
-
 export default GracefullyImage
diff --git a/src/components/Instance/index.tsx b/src/components/Instance/index.tsx
index ee92541f..f4fba00f 100644
--- a/src/components/Instance/index.tsx
+++ b/src/components/Instance/index.tsx
@@ -19,12 +19,13 @@ import {
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import * as AuthSession from 'expo-auth-session'
+import { Image } from 'expo-image'
 import * as Random from 'expo-random'
 import * as WebBrowser from 'expo-web-browser'
 import { debounce } from 'lodash'
 import React, { RefObject, useCallback, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import { Alert, Image, KeyboardAvoidingView, Platform, TextInput, View } from 'react-native'
+import { Alert, KeyboardAvoidingView, Platform, TextInput, View } from 'react-native'
 import { ScrollView } from 'react-native-gesture-handler'
 import { fromByteArray } from 'react-native-quick-base64'
 import parse from 'url-parse'
diff --git a/src/components/Parse/Emojis.tsx b/src/components/Parse/Emojis.tsx
index ec5362ff..fd616fbd 100644
--- a/src/components/Parse/Emojis.tsx
+++ b/src/components/Parse/Emojis.tsx
@@ -5,9 +5,9 @@ import { useGlobalStorage } from '@utils/storage/actions'
 import { StyleConstants } from '@utils/styles/constants'
 import { adaptiveScale } from '@utils/styles/scaling'
 import { useTheme } from '@utils/styles/ThemeManager'
+import { Image } from 'expo-image'
 import React from 'react'
 import { ColorValue, Platform, TextStyle } from 'react-native'
-import FastImage from 'react-native-fast-image'
 
 const regexEmoji = new RegExp(/(:[A-Za-z0-9_]+:)/)
 
@@ -77,8 +77,8 @@ const ParseEmojis: React.FC<Props> = ({
                 return (
                   <CustomText key={emojiShortcode + i}>
                     {i === 0 ? ' ' : undefined}
-                    <FastImage
-                      source={connectMedia({ uri: uri.trim() })}
+                    <Image
+                      source={connectMedia({ uri })}
                       style={{
                         width: adaptedFontsize,
                         height: adaptedFontsize,
diff --git a/src/components/Timeline/Conversation.tsx b/src/components/Timeline/Conversation.tsx
index 182fde47..2e2e16fd 100644
--- a/src/components/Timeline/Conversation.tsx
+++ b/src/components/Timeline/Conversation.tsx
@@ -79,7 +79,10 @@ const TimelineConversation: React.FC<Props> = ({ conversation, queryKey, highlig
             {conversation.accounts.slice(0, 4).map(account => (
               <GracefullyImage
                 key={account.id}
-                uri={{ original: account.avatar, static: account.avatar_static }}
+                sources={{
+                  default: { uri: account.avatar },
+                  static: { uri: account.avatar_static }
+                }}
                 dimension={{
                   width: StyleConstants.Avatar.M,
                   height:
diff --git a/src/components/Timeline/Shared/Attachment.tsx b/src/components/Timeline/Shared/Attachment.tsx
index 73a181d1..a10fb3dd 100644
--- a/src/components/Timeline/Shared/Attachment.tsx
+++ b/src/components/Timeline/Shared/Attachment.tsx
@@ -9,7 +9,6 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import { RootStackParamList } from '@utils/navigation/navigators'
 import { usePreferencesQuery } from '@utils/queryHooks/preferences'
 import { StyleConstants } from '@utils/styles/constants'
-import layoutAnimation from '@utils/styles/layoutAnimation'
 import React, { useContext, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Pressable, View } from 'react-native'
@@ -207,7 +206,6 @@ const TimelineAttachment = () => {
               content={t('shared.attachment.sensitive.button')}
               overlay
               onPress={() => {
-                layoutAnimation()
                 setSensitiveShown(false)
                 haptics('Light')
               }}
diff --git a/src/components/Timeline/Shared/Attachment/Audio.tsx b/src/components/Timeline/Shared/Attachment/Audio.tsx
index 18970ede..ca78968d 100644
--- a/src/components/Timeline/Shared/Attachment/Audio.tsx
+++ b/src/components/Timeline/Shared/Attachment/Audio.tsx
@@ -7,7 +7,6 @@ import { useTheme } from '@utils/styles/ThemeManager'
 import { Audio } from 'expo-av'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { AppState, AppStateStatus, StyleSheet, View } from 'react-native'
-import { Blurhash } from 'react-native-blurhash'
 import AttachmentAltText from './AltText'
 import { aspectRatio } from './dimensions'
 
@@ -72,19 +71,23 @@ const AttachmentAudio: React.FC<Props> = ({ total, index, sensitiveShown, audio
       <View style={styles.overlay}>
         {sensitiveShown ? (
           audio.blurhash ? (
-            <Blurhash
-              blurhash={audio.blurhash}
+            <GracefullyImage
+              sources={{ blurhash: audio.blurhash }}
               style={{
                 width: '100%',
                 height: '100%'
               }}
+              dim
             />
           ) : null
         ) : (
           <>
             {audio.preview_url ? (
               <GracefullyImage
-                uri={{ original: audio.preview_url, remote: audio.preview_remote_url }}
+                sources={{
+                  default: { uri: audio.preview_url },
+                  remote: { uri: audio.preview_remote_url }
+                }}
                 style={styles.background}
                 dim
               />
diff --git a/src/components/Timeline/Shared/Attachment/Image.tsx b/src/components/Timeline/Shared/Attachment/Image.tsx
index 902bfcce..55cfdabb 100644
--- a/src/components/Timeline/Shared/Attachment/Image.tsx
+++ b/src/components/Timeline/Shared/Attachment/Image.tsx
@@ -35,8 +35,11 @@ const AttachmentImage = ({
         <GracefullyImage
           accessibilityLabel={image.description}
           hidden={sensitiveShown}
-          uri={{ original: image.preview_url, remote: image.remote_url }}
-          blurhash={image.blurhash}
+          sources={{
+            default: { uri: image.preview_url },
+            remote: { uri: image.remote_url },
+            blurhash: image.blurhash
+          }}
           onPress={() => navigateToImagesViewer(image.id)}
           style={{ aspectRatio: aspectRatio({ total, index, ...image.meta?.original }) }}
           dim
diff --git a/src/components/Timeline/Shared/Attachment/Unsupported.tsx b/src/components/Timeline/Shared/Attachment/Unsupported.tsx
index 7fa9d89d..9ab3bb92 100644
--- a/src/components/Timeline/Shared/Attachment/Unsupported.tsx
+++ b/src/components/Timeline/Shared/Attachment/Unsupported.tsx
@@ -1,4 +1,5 @@
 import Button from '@components/Button'
+import GracefullyImage from '@components/GracefullyImage'
 import openLink from '@components/openLink'
 import CustomText from '@components/Text'
 import { StyleConstants } from '@utils/styles/constants'
@@ -6,7 +7,6 @@ import { useTheme } from '@utils/styles/ThemeManager'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { View } from 'react-native'
-import { Blurhash } from 'react-native-blurhash'
 import AttachmentAltText from './AltText'
 import { aspectRatio } from './dimensions'
 
@@ -33,8 +33,8 @@ const AttachmentUnsupported: React.FC<Props> = ({ total, index, sensitiveShown,
       }}
     >
       {attachment.blurhash ? (
-        <Blurhash
-          blurhash={attachment.blurhash}
+        <GracefullyImage
+          sources={{ blurhash: attachment.blurhash }}
           style={{
             position: 'absolute',
             width: '100%',
diff --git a/src/components/Timeline/Shared/Attachment/Video.tsx b/src/components/Timeline/Shared/Attachment/Video.tsx
index e186d5da..373cfca4 100644
--- a/src/components/Timeline/Shared/Attachment/Video.tsx
+++ b/src/components/Timeline/Shared/Attachment/Video.tsx
@@ -1,4 +1,5 @@
 import Button from '@components/Button'
+import GracefullyImage from '@components/GracefullyImage'
 import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
 import { connectMedia } from '@utils/api/helpers/connect'
 import { useAccountStorage, useGlobalStorage } from '@utils/storage/actions'
@@ -8,7 +9,6 @@ import { Platform } from 'expo-modules-core'
 import * as ScreenOrientation from 'expo-screen-orientation'
 import React, { useRef, useState } from 'react'
 import { Pressable, View } from 'react-native'
-import { Blurhash } from 'react-native-blurhash'
 import AttachmentAltText from './AltText'
 import { aspectRatio } from './dimensions'
 
@@ -120,7 +120,10 @@ const AttachmentVideo: React.FC<Props> = ({
       >
         {sensitiveShown ? (
           video.blurhash ? (
-            <Blurhash blurhash={video.blurhash} style={{ width: '100%', height: '100%' }} />
+            <GracefullyImage
+              sources={{ blurhash: video.blurhash }}
+              style={{ width: '100%', height: '100%' }}
+            />
           ) : null
         ) : !gifv || (gifv && (reduceMotionEnabled || !shouldAutoplayGifv)) ? (
           <Button
diff --git a/src/components/Timeline/Shared/Avatar.tsx b/src/components/Timeline/Shared/Avatar.tsx
index 2357fa40..ff80d0ab 100644
--- a/src/components/Timeline/Shared/Avatar.tsx
+++ b/src/components/Timeline/Shared/Avatar.tsx
@@ -33,7 +33,10 @@ const TimelineAvatar: React.FC<Props> = ({ account }) => {
       onPress={() =>
         !disableOnPress && navigation.push('Tab-Shared-Account', { account: actualAccount })
       }
-      uri={{ original: actualAccount.avatar, static: actualAccount.avatar_static }}
+      sources={{
+        default: { uri: actualAccount.avatar },
+        static: { uri: actualAccount.avatar_static }
+      }}
       dimension={
         disableDetails || isConversation
           ? {
diff --git a/src/components/Timeline/Shared/Card.tsx b/src/components/Timeline/Shared/Card.tsx
index 55f7285a..2f7adac7 100644
--- a/src/components/Timeline/Shared/Card.tsx
+++ b/src/components/Timeline/Shared/Card.tsx
@@ -82,8 +82,7 @@ const TimelineCard: React.FC = () => {
       <>
         {status.card?.image ? (
           <GracefullyImage
-            uri={{ original: status.card.image }}
-            blurhash={status.card.blurhash}
+            sources={{ default: { uri: status.card.image }, blurhash: status.card.blurhash }}
             style={{ flexBasis: StyleConstants.Font.LineHeight.M * 5 }}
             imageStyle={{ borderTopLeftRadius: 6, borderBottomLeftRadius: 6 }}
             dim
diff --git a/src/screens/Announcements.tsx b/src/screens/Announcements.tsx
index 70e50c80..adfe42c6 100644
--- a/src/screens/Announcements.tsx
+++ b/src/screens/Announcements.tsx
@@ -1,4 +1,5 @@
 import Button from '@components/Button'
+import GracefullyImage from '@components/GracefullyImage'
 import haptics from '@components/haptics'
 import { Loading } from '@components/Loading'
 import { ParseHTML } from '@components/Parse'
@@ -6,7 +7,6 @@ import RelativeTime from '@components/RelativeTime'
 import CustomText from '@components/Text'
 import { BlurView } from '@react-native-community/blur'
 import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
-import { connectMedia } from '@utils/api/helpers/connect'
 import { RootStackScreenProps } from '@utils/navigation/navigators'
 import { useAnnouncementMutation, useAnnouncementQuery } from '@utils/queryHooks/announcement'
 import { StyleConstants } from '@utils/styles/constants'
@@ -22,7 +22,6 @@ import {
   StyleSheet,
   View
 } from 'react-native'
-import FastImage from 'react-native-fast-image'
 import { FlatList, ScrollView } from 'react-native-gesture-handler'
 import { SafeAreaView } from 'react-native-safe-area-context'
 
@@ -139,12 +138,13 @@ const ScreenAnnouncements: React.FC<RootStackScreenProps<'Screen-Announcements'>
                 }
               >
                 {reaction.url ? (
-                  <FastImage
-                    source={connectMedia({
-                      uri: reduceMotionEnabled ? reaction.static_url : reaction.url
-                    })}
-                    style={{
-                      width: StyleConstants.Font.LineHeight.M + 3,
+                  <GracefullyImage
+                    sources={{
+                      default: { uri: reaction.url },
+                      static: { uri: reaction.static_url }
+                    }}
+                    dimension={{
+                      width: StyleConstants.Font.LineHeight.M,
                       height: StyleConstants.Font.LineHeight.M
                     }}
                   />
diff --git a/src/screens/Compose/DraftsList.tsx b/src/screens/Compose/DraftsList.tsx
index 265768df..fba9e684 100644
--- a/src/screens/Compose/DraftsList.tsx
+++ b/src/screens/Compose/DraftsList.tsx
@@ -9,10 +9,10 @@ import { ScreenComposeStackScreenProps } from '@utils/navigation/navigators'
 import { getAccountStorage, setAccountStorage, useAccountStorage } from '@utils/storage/actions'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
+import { Image } from 'expo-image'
 import React, { useContext, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Dimensions, Modal, Pressable, View } from 'react-native'
-import FastImage from 'react-native-fast-image'
 import ComposeContext from './utils/createContext'
 import { formatText } from './utils/processText'
 import { ComposeStateDraft, ExtendedAttachment } from './utils/types'
@@ -140,7 +140,7 @@ const ComposeDraftsList: React.FC<ScreenComposeStackScreenProps<'Screen-Compose-
                     }}
                   >
                     {item.attachments.uploads.map((attachment, index) => (
-                      <FastImage
+                      <Image
                         key={index}
                         style={{
                           width:
diff --git a/src/screens/Compose/Root/Footer/Attachments.tsx b/src/screens/Compose/Root/Footer/Attachments.tsx
index b4496616..d1db2c3a 100644
--- a/src/screens/Compose/Root/Footer/Attachments.tsx
+++ b/src/screens/Compose/Root/Footer/Attachments.tsx
@@ -11,10 +11,10 @@ import { featureCheck } from '@utils/helpers/featureCheck'
 import { StyleConstants } from '@utils/styles/constants'
 import layoutAnimation from '@utils/styles/layoutAnimation'
 import { useTheme } from '@utils/styles/ThemeManager'
+import { Image } from 'expo-image'
 import React, { RefObject, useContext, useEffect, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlatList, Pressable, StyleSheet, View } from 'react-native'
-import FastImage from 'react-native-fast-image'
 import ComposeContext from '../../utils/createContext'
 import { ExtendedAttachment } from '../../utils/types'
 import chooseAndUploadAttachment from './addAttachment'
@@ -104,9 +104,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
           width: calculateWidth(item)
         }}
       >
-        <FastImage
-          enterTransition='fadeIn'
-          transitionDuration={60}
+        <Image
           style={{ width: '100%', height: '100%' }}
           source={
             item.local?.thumbnail
diff --git a/src/screens/ImageViewer/index.tsx b/src/screens/ImageViewer/index.tsx
index 0c20d95f..2831b24f 100644
--- a/src/screens/ImageViewer/index.tsx
+++ b/src/screens/ImageViewer/index.tsx
@@ -193,10 +193,10 @@ const ScreenImagesViewer = ({
                     }}
                   >
                     <GracefullyImage
-                      uri={{
-                        preview: item.preview_url,
-                        remote: item.remote_url,
-                        original: item.url
+                      sources={{
+                        preview: { uri: item.preview_url, width: item.width, height: item.height },
+                        default: { uri: item.url, width: item.width, height: item.height },
+                        remote: { uri: item.remote_url, width: item.width, height: item.height }
                       }}
                       dimension={{
                         width:
@@ -208,6 +208,7 @@ const ScreenImagesViewer = ({
                             ? WINDOW_HEIGHT
                             : (WINDOW_WIDTH / imageWidth) * imageHeight
                       }}
+                      enableLiveTextInteraction
                     />
                   </View>
                 }
diff --git a/src/screens/Tabs/Shared/Account/Attachments.tsx b/src/screens/Tabs/Shared/Account/Attachments.tsx
index e374a1ef..deb5cc5a 100644
--- a/src/screens/Tabs/Shared/Account/Attachments.tsx
+++ b/src/screens/Tabs/Shared/Account/Attachments.tsx
@@ -82,15 +82,25 @@ const AccountAttachments: React.FC = () => {
           } else {
             return (
               <GracefullyImage
-                uri={{
-                  original:
-                    item.media_attachments[0]?.preview_url || item.media_attachments[0]?.url,
-                  remote: item.media_attachments[0]?.remote_url
+                sources={{
+                  preview: {
+                    uri: item.media_attachments[0]?.preview_url,
+                    width: item.media_attachments[0]?.meta?.small?.width,
+                    height: item.media_attachments[0]?.meta?.small?.height
+                  },
+                  default: {
+                    uri: item.media_attachments[0]?.url,
+                    width: item.media_attachments[0]?.meta?.original?.width,
+                    height: item.media_attachments[0]?.meta?.original?.height
+                  },
+                  remote: {
+                    uri: item.media_attachments[0]?.remote_url,
+                    width: item.media_attachments[0]?.meta?.original?.width,
+                    height: item.media_attachments[0]?.meta?.original?.height
+                  },
+                  blurhash: item.media_attachments[0]?.blurhash
                 }}
-                blurhash={
-                  item.media_attachments[0] && (item.media_attachments[0].blurhash || undefined)
-                }
-                dimension={{ width: width, height: width }}
+                dimension={{ width, height: width }}
                 style={{ marginLeft: StyleConstants.Spacing.Global.PagePadding }}
                 onPress={() => navigation.push('Tab-Shared-Toot', { toot: item })}
                 dim
diff --git a/src/screens/Tabs/Shared/Account/Header.tsx b/src/screens/Tabs/Shared/Account/Header.tsx
index f2ba64c6..ce209c74 100644
--- a/src/screens/Tabs/Shared/Account/Header.tsx
+++ b/src/screens/Tabs/Shared/Account/Header.tsx
@@ -1,6 +1,5 @@
 import GracefullyImage from '@components/GracefullyImage'
 import navigationRef from '@utils/navigation/navigationRef'
-import { useGlobalStorage } from '@utils/storage/actions'
 import React, { useContext } from 'react'
 import { Dimensions, Image } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
@@ -11,11 +10,9 @@ const AccountHeader: React.FC = () => {
 
   const topInset = useSafeAreaInsets().top
 
-  useGlobalStorage.string('account.active')
-
   return (
     <GracefullyImage
-      uri={{ original: account?.header, static: account?.header_static }}
+      sources={{ default: { uri: account?.header }, static: { uri: account?.header_static } }}
       style={{ height: Dimensions.get('window').width / 3 + topInset }}
       onPress={() => {
         if (account) {
diff --git a/src/screens/Tabs/Shared/Account/Information/Avatar.tsx b/src/screens/Tabs/Shared/Account/Information/Avatar.tsx
index 265368d8..ad6dbdf9 100644
--- a/src/screens/Tabs/Shared/Account/Information/Avatar.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Avatar.tsx
@@ -3,7 +3,6 @@ import { useNavigation } from '@react-navigation/native'
 import { StackNavigationProp } from '@react-navigation/stack'
 import navigationRef from '@utils/navigation/navigationRef'
 import { TabLocalStackParamList } from '@utils/navigation/navigators'
-import { useAccountStorage } from '@utils/storage/actions'
 import { StyleConstants } from '@utils/styles/constants'
 import React, { useContext } from 'react'
 import AccountContext from '../Context'
@@ -13,20 +12,13 @@ const AccountInformationAvatar: React.FC = () => {
 
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
-  const [accountAvatarStatic] = useAccountStorage.string('auth.account.avatar_static')
-
   return (
     <GracefullyImage
-      key={account?.avatar}
-      style={{
-        borderRadius: 8,
-        overflow: 'hidden',
-        width: StyleConstants.Avatar.L,
-        height: StyleConstants.Avatar.L
-      }}
-      uri={{
-        original: account?.avatar || (pageMe ? accountAvatarStatic : undefined),
-        static: account?.avatar_static || (pageMe ? accountAvatarStatic : undefined)
+      style={{ borderRadius: 8, overflow: 'hidden' }}
+      dimension={{ width: StyleConstants.Avatar.L, height: StyleConstants.Avatar.L }}
+      sources={{
+        default: { uri: account?.avatar },
+        static: { uri: account?.avatar_static }
       }}
       onPress={() => {
         if (account) {
diff --git a/src/screens/Tabs/index.tsx b/src/screens/Tabs/index.tsx
index f703ee06..0d5b4499 100644
--- a/src/screens/Tabs/index.tsx
+++ b/src/screens/Tabs/index.tsx
@@ -52,7 +52,7 @@ const ScreenTabs = () => {
               return (
                 <View style={{ flexDirection: 'row', alignItems: 'center' }}>
                   <GracefullyImage
-                    uri={{ original: avatarStatic }}
+                    sources={{ default: { uri: avatarStatic } }}
                     dimension={{ width: size, height: size }}
                     style={{
                       borderRadius: size,
diff --git a/src/utils/api/helpers/connect.ts b/src/utils/api/helpers/connect.ts
index 22472c74..ebc7d66c 100644
--- a/src/utils/api/helpers/connect.ts
+++ b/src/utils/api/helpers/connect.ts
@@ -81,19 +81,18 @@ export const CONNECT_DOMAIN = (index?: number) =>
     development: 'connect-development.tooot.app'
   })
 
-export const connectMedia = ({
-  uri
-}: {
+export const connectMedia = (args?: {
   uri?: string
 }): { uri?: string; headers?: { 'x-tooot-domain': string } } => {
   if (GLOBAL.connect) {
-    if (uri) {
-      const host = parse(uri).host
+    if (args?.uri) {
+      const host = parse(args.uri).host
       return {
-        uri: uri.replace(
+        ...args,
+        uri: args.uri.replace(
           host,
           CONNECT_DOMAIN(
-            uri
+            args.uri
               .split('')
               .map(i => i.charCodeAt(0))
               .reduce((a, b) => a + b, 0) %
@@ -103,10 +102,10 @@ export const connectMedia = ({
         headers: { 'x-tooot-domain': host }
       }
     } else {
-      return { uri }
+      return { ...args }
     }
   } else {
-    return { uri }
+    return { ...args }
   }
 }
 
diff --git a/yarn.lock b/yarn.lock
index 14d4cece..03bcc5cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5706,6 +5706,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-image@npm:^1.0.0-beta.6":
+  version: 1.0.0-beta.6
+  resolution: "expo-image@npm:1.0.0-beta.6"
+  peerDependencies:
+    expo: "*"
+  checksum: d874d6779db813166a682be6f4c4ee3e101be90121376963946db85bcbef71f50bc027b18d5e07b4ca6a03337597a60df2cc2cfed66661149ec7cf53d6b6bae9
+  languageName: node
+  linkType: hard
+
 "expo-keep-awake@npm:~11.0.1":
   version: 11.0.1
   resolution: "expo-keep-awake@npm:11.0.1"
@@ -9639,26 +9648,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-fast-image@npm:8.6.3":
-  version: 8.6.3
-  resolution: "react-native-fast-image@npm:8.6.3"
-  peerDependencies:
-    react: ^17 || ^18
-    react-native: ">=0.60.0"
-  checksum: 29289cb6b2eae0983c8922b22e2d9de3be07322bb7991c5def19f95eadefaedb0e308ff0b38cc1d0444e8bd4fe94a7621a99a2d3d9298100bcb60b3144677234
-  languageName: node
-  linkType: hard
-
-"react-native-fast-image@patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch::locator=tooot%40workspace%3A.":
-  version: 8.6.3
-  resolution: "react-native-fast-image@patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch::version=8.6.3&hash=1a9a6d&locator=tooot%40workspace%3A."
-  peerDependencies:
-    react: ^17 || ^18
-    react-native: ">=0.60.0"
-  checksum: 4b2c6b2d6fc461f26936ff5033acccf7aef15f9d176ea835d09c87bee83accbb6c2b98a2435ad019a305c0751aa43040c153a6d5735664ace31e64aad0b2bc61
-  languageName: node
-  linkType: hard
-
 "react-native-flash-message@npm:^0.4.0":
   version: 0.4.0
   resolution: "react-native-flash-message@npm:0.4.0"
@@ -11432,6 +11421,7 @@ __metadata:
     expo-crypto: ^12.1.0
     expo-file-system: ^15.1.1
     expo-haptics: ^12.1.0
+    expo-image: ^1.0.0-beta.6
     expo-linking: ^3.3.0
     expo-localization: ^14.0.0
     expo-notifications: ^0.17.0
@@ -11454,7 +11444,6 @@ __metadata:
     react-native: ^0.70.7
     react-native-blurhash: ^1.1.10
     react-native-clean-project: ^4.0.1
-    react-native-fast-image: ^8.6.3
     react-native-flash-message: ^0.4.0
     react-native-gesture-handler: ~2.9.0
     react-native-image-picker: ^5.0.1

From 11ac2bd51d8e4b5990588bae3323da2fd7c2bffb Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Wed, 8 Feb 2023 01:30:35 +0100
Subject: [PATCH 11/17] Update yarn.lock

---
 yarn.lock | 662 ++++++++++++++++++++++++++----------------------------
 1 file changed, 324 insertions(+), 338 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 03bcc5cd..9942ff7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -34,36 +34,13 @@ __metadata:
   linkType: hard
 
 "@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.20.1, @babel/compat-data@npm:^7.20.5":
-  version: 7.20.10
-  resolution: "@babel/compat-data@npm:7.20.10"
-  checksum: 6ed6c1bb6fc03c225d63b8611788cd976107d1692402b560ebffbf1fa53e63705f8625bb12e12d17ce7f7af34e61e1ca96c77858aac6f57010045271466200c0
+  version: 7.20.14
+  resolution: "@babel/compat-data@npm:7.20.14"
+  checksum: 6c9efe36232094e4ad0b70d165587f21ca718e5d011f7a52a77a18502a7524e90e2855aa5a2e086395bcfd21bd2c7c99128dcd8d9fdffe94316b72acf5c66f2c
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0":
-  version: 7.20.7
-  resolution: "@babel/core@npm:7.20.7"
-  dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.20.7
-    "@babel/helper-compilation-targets": ^7.20.7
-    "@babel/helper-module-transforms": ^7.20.7
-    "@babel/helpers": ^7.20.7
-    "@babel/parser": ^7.20.7
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.20.7
-    "@babel/types": ^7.20.7
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.1
-    semver: ^6.3.0
-  checksum: f2714f15db24425145ca70b838adcd945aba7d1358ca2513615db6c3bdaebe5f8e4162c4c6c30f8dcab42bf634b0055d150414c0ecf52a3341bb5da3dde2d987
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.20.12":
+"@babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.20.12":
   version: 7.20.12
   resolution: "@babel/core@npm:7.20.12"
   dependencies:
@@ -87,13 +64,13 @@ __metadata:
   linkType: hard
 
 "@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/generator@npm:7.20.7"
+  version: 7.20.14
+  resolution: "@babel/generator@npm:7.20.14"
   dependencies:
     "@babel/types": ^7.20.7
     "@jridgewell/gen-mapping": ^0.3.2
     jsesc: ^2.5.1
-  checksum: 84b6983ffdb50c80c1c2e3f3c32617a7133d8effd1065f3e0f9bba188a7d54ab42a4dd5e42b61b843c65f9dd1aa870036ff0f848ebd42707aaa8a2b6d31d04f5
+  checksum: 5f6aa2d86af26e76d276923a5c34191124a119b16ee9ccc34aef654a7dec84fbd7d2daed2e6458a6a06bf87f3661deb77c9fea59b8f67faff5c90793c96d76d6
   languageName: node
   linkType: hard
 
@@ -131,9 +108,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.20.5, @babel/helper-create-class-features-plugin@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.20.7"
+"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.20.12, @babel/helper-create-class-features-plugin@npm:^7.20.5, @babel/helper-create-class-features-plugin@npm:^7.20.7":
+  version: 7.20.12
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.20.12"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.18.6
     "@babel/helper-environment-visitor": ^7.18.9
@@ -141,10 +118,11 @@ __metadata:
     "@babel/helper-member-expression-to-functions": ^7.20.7
     "@babel/helper-optimise-call-expression": ^7.18.6
     "@babel/helper-replace-supers": ^7.20.7
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0
     "@babel/helper-split-export-declaration": ^7.18.6
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: fdbbfb532fc800a30b7c9d56203b80824f67dbc1acf1a2f52429e6e1ad0a3cd086c5c53031d78e8e23a5201018ecb23dc2d8cc955b2bd72c5338654d5679f847
+  checksum: 1e9ed4243b75278fa24deb40dc62bf537b79307987223a2d2d2ae5abf7ba6dc8435d6e3bb55d52ceb30d3e1eba88e7eb6a1885a8bb519e5cfc3e9dedb97d43e6
   languageName: node
   linkType: hard
 
@@ -229,23 +207,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.6, @babel/helper-module-transforms@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/helper-module-transforms@npm:7.20.7"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-simple-access": ^7.20.2
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/helper-validator-identifier": ^7.19.1
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.20.7
-    "@babel/types": ^7.20.7
-  checksum: fea1b43df6b2b673d51ee1ff1f15e7a2849eacf504dd51ff192f5259ffc5b978c0a3264426a94ce416fd9fc18355f85815eefb4c59da7d5f8e9e7fc2e8bef644
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-transforms@npm:^7.20.11":
+"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.20.11":
   version: 7.20.11
   resolution: "@babel/helper-module-transforms@npm:7.20.11"
   dependencies:
@@ -366,13 +328,13 @@ __metadata:
   linkType: hard
 
 "@babel/helpers@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/helpers@npm:7.20.7"
+  version: 7.20.13
+  resolution: "@babel/helpers@npm:7.20.13"
   dependencies:
     "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.20.7
+    "@babel/traverse": ^7.20.13
     "@babel/types": ^7.20.7
-  checksum: 3fb10df3510ba7116a180d5fd983d0f558f7a65c3d599385dba991bff66b74174c88881bc12c2b3cf7284294fcac5b301ded49a8b0098bdf2ef61d0cad8010db
+  checksum: d62076fa834f342798f8c3fd7aec0870cc1725d273d99e540cbaa8d6c3ed10258228dd14601c8e66bfeabbb9424c3b31090ecc467fe855f7bd72c4734df7fb09
   languageName: node
   linkType: hard
 
@@ -387,12 +349,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/parser@npm:7.20.7"
+"@babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.20.13, @babel/parser@npm:^7.20.7":
+  version: 7.20.15
+  resolution: "@babel/parser@npm:7.20.15"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 25b5266e3bd4be837092685f6b7ef886f1308ff72659a24342eb646ae5014f61ed1771ce8fc20636c890fcae19304fc72c069564ca6075207b7fbf3f75367275
+  checksum: 1d0f47ca67ff2652f1c0ff1570bed8deccbc4b53509e7cd73476af9cc7ed23480c99f1179bd6d0be01612368b92b39e206d330ad6054009d699934848a89298b
   languageName: node
   linkType: hard
 
@@ -460,17 +422,17 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-proposal-decorators@npm:^7.12.9":
-  version: 7.20.7
-  resolution: "@babel/plugin-proposal-decorators@npm:7.20.7"
+  version: 7.20.13
+  resolution: "@babel/plugin-proposal-decorators@npm:7.20.13"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.20.7
+    "@babel/helper-create-class-features-plugin": ^7.20.12
     "@babel/helper-plugin-utils": ^7.20.2
     "@babel/helper-replace-supers": ^7.20.7
     "@babel/helper-split-export-declaration": ^7.18.6
     "@babel/plugin-syntax-decorators": ^7.19.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0de9134d71a60b165df9b6e66b7c270fb2fa940ad28d7672e5c73fe5e4300a798cbb28d845477e3265a356d5254758735f28d13452f448dd12988ea299cf7e16
+  checksum: 445723b410627d52ab2d195589eb9fe5fbd66a00ebfc9bedcf63b6cbfdfc42e163d77ac391f8738ab9f632779e6f2aa427fe468fbbd6661177ef0cdca735a7d5
   languageName: node
   linkType: hard
 
@@ -892,13 +854,13 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-block-scoping@npm:^7.0.0, @babel/plugin-transform-block-scoping@npm:^7.20.2":
-  version: 7.20.9
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.20.9"
+  version: 7.20.15
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.20.15"
   dependencies:
     "@babel/helper-plugin-utils": ^7.20.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e240a93ad9bab54fdf3cced7133099f2c3282d7b9e30d80dbb378e33f99f30a86875fec7c5c66693d583f6762393f0987cf90b501f9f820cecec7e165f5dc6cd
+  checksum: 1dddf7be578306837074cb5059f8408af0b1c0bfcf922ed920d4aa65d08fb7c6e6129ca254e9879c4c6d2a6be4937111551f51922e8b0e071ed16eb6564a4dbb
   languageName: node
   linkType: hard
 
@@ -1038,41 +1000,41 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-modules-amd@npm:^7.19.6":
-  version: 7.20.7
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.20.7"
+  version: 7.20.11
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.20.11"
   dependencies:
-    "@babel/helper-module-transforms": ^7.20.7
+    "@babel/helper-module-transforms": ^7.20.11
     "@babel/helper-plugin-utils": ^7.20.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f205f57124b963ef500eb2185ee1b2e930f8188483a398db0263df513bd55aeeaa7ea47b28401b430cf9b2552aac2cad7acd40ba62e7bdc34dd6f1c7e5770022
+  checksum: 23665c1c20c8f11c89382b588fb9651c0756d130737a7625baeaadbd3b973bc5bfba1303bedffa8fb99db1e6d848afb01016e1df2b69b18303e946890c790001
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-modules-commonjs@npm:^7.0.0, @babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.19.6":
-  version: 7.20.7
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.20.7"
+  version: 7.20.11
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.20.11"
   dependencies:
-    "@babel/helper-module-transforms": ^7.20.7
+    "@babel/helper-module-transforms": ^7.20.11
     "@babel/helper-plugin-utils": ^7.20.2
     "@babel/helper-simple-access": ^7.20.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 874215007f9c733fd95e49dd81b173c0c585953f37df4ac6b9147c42268c56259ce1f002805e7e8464999fdcf8dd91e1e09d72f087538d2da2528cb3b1723654
+  checksum: ddd0623e2ad4b5c0faaa0ae30d3407a3fa484d911c968ed33cfb1b339ac3691321c959db60b66dc136dbd67770fff586f7e48a7ce0d7d357f92d6ef6fb7ed1a7
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-modules-systemjs@npm:^7.19.6":
-  version: 7.19.6
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.19.6"
+  version: 7.20.11
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.20.11"
   dependencies:
     "@babel/helper-hoist-variables": ^7.18.6
-    "@babel/helper-module-transforms": ^7.19.6
-    "@babel/helper-plugin-utils": ^7.19.0
+    "@babel/helper-module-transforms": ^7.20.11
+    "@babel/helper-plugin-utils": ^7.20.2
     "@babel/helper-validator-identifier": ^7.19.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8526431cc81ea3eb232ad50862d0ed1cbb422b5251d14a8d6610d0ca0617f6e75f35179e98eb1235d0cccb980120350b9f112594e5646dd45378d41eaaf87342
+  checksum: 4546c47587f88156d66c7eb7808e903cf4bb3f6ba6ac9bc8e3af2e29e92eb9f0b3f44d52043bfd24eb25fa7827fd7b6c8bfeac0cac7584e019b87e1ecbd0e673
   languageName: node
   linkType: hard
 
@@ -1190,8 +1152,8 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-react-jsx@npm:^7.0.0, @babel/plugin-transform-react-jsx@npm:^7.12.17":
-  version: 7.20.7
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.20.7"
+  version: 7.20.13
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.20.13"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.18.6
     "@babel/helper-module-imports": ^7.18.6
@@ -1200,7 +1162,7 @@ __metadata:
     "@babel/types": ^7.20.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 13ecbd1da582177f76ebd74d685947e703a3dcf8bd39cbc62784253201c6f7a667f3573932f6f20602dbcaf077451bf9dd3571892e3ccf4c7176add6358cd641
+  checksum: b1daaa9b093ab59f71572dde7ad05ed3490433a47de103fc866f60347da55fa7fe84cf9b4c9fa22917517d52f70ab5e05ec631bba1c348733c0d8ebbd7de8c68
   languageName: node
   linkType: hard
 
@@ -1300,15 +1262,15 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-typescript@npm:^7.18.6, @babel/plugin-transform-typescript@npm:^7.5.0":
-  version: 7.20.7
-  resolution: "@babel/plugin-transform-typescript@npm:7.20.7"
+  version: 7.20.13
+  resolution: "@babel/plugin-transform-typescript@npm:7.20.13"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.20.7
+    "@babel/helper-create-class-features-plugin": ^7.20.12
     "@babel/helper-plugin-utils": ^7.20.2
     "@babel/plugin-syntax-typescript": ^7.20.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ca569a1b8001e7e8971874656091789c6b3209f155c91c56bce82b545e43d09d156b4fcf2f0dfcdf7911a2c546c7090c2aff167a5692443f6f0382b358c233e0
+  checksum: 0b0c3a3e53268d4feb35eb17d57873f2488392e404a0b32735d51c49b08462dc738ebd860f0ff3a3dc5cd1b1fa70340bb6c072239c86afca635831b930593b3b
   languageName: node
   linkType: hard
 
@@ -1477,11 +1439,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.8.4":
-  version: 7.20.7
-  resolution: "@babel/runtime@npm:7.20.7"
+  version: 7.20.13
+  resolution: "@babel/runtime@npm:7.20.13"
   dependencies:
     regenerator-runtime: ^0.13.11
-  checksum: 4629ce5c46f06cca9cfb9b7fc00d48003335a809888e2b91ec2069a2dcfbfef738480cff32ba81e0b7c290f8918e5c22ddcf2b710001464ee84ba62c7e32a3a3
+  checksum: 09b7a97a05c80540db6c9e4ddf8c5d2ebb06cae5caf3a87e33c33f27f8c4d49d9c67a2d72f1570e796045288fad569f98a26ceba0c4f5fad2af84b6ad855c4fb
   languageName: node
   linkType: hard
 
@@ -1496,9 +1458,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7":
-  version: 7.20.10
-  resolution: "@babel/traverse@npm:7.20.10"
+"@babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.13, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7":
+  version: 7.20.13
+  resolution: "@babel/traverse@npm:7.20.13"
   dependencies:
     "@babel/code-frame": ^7.18.6
     "@babel/generator": ^7.20.7
@@ -1506,29 +1468,11 @@ __metadata:
     "@babel/helper-function-name": ^7.19.0
     "@babel/helper-hoist-variables": ^7.18.6
     "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/parser": ^7.20.7
+    "@babel/parser": ^7.20.13
     "@babel/types": ^7.20.7
     debug: ^4.1.0
     globals: ^11.1.0
-  checksum: 8e36dfc76b8f7aafa01b98130c0257e3148eb7132e4b599be565bddae5faec7e20a0f92786a829a8d962a0bf5652fe0019cadd85716d70d140785dec640ff6f7
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12":
-  version: 7.20.12
-  resolution: "@babel/traverse@npm:7.20.12"
-  dependencies:
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.20.7
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.19.0
-    "@babel/helper-hoist-variables": ^7.18.6
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/parser": ^7.20.7
-    "@babel/types": ^7.20.7
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: d758b355ab4f1e87984524b67785fa23d74e8a45d2ceb8bcf4d5b2b0cd15ee160db5e68c7078808542805774ca3802e2eafb1b9638afa4cd7f9ecabd0ca7fd56
+  checksum: 30ca6e0bd18233fda48fa09315efd14dfc61dcf5b8fa3712b343bfc61b32bc63b5e85ea1773cc9576c9b293b96f46b4589aaeb0a52e1f3eeac4edc076d049fc7
   languageName: node
   linkType: hard
 
@@ -1679,6 +1623,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/config-plugins@npm:~6.0.0":
+  version: 6.0.0
+  resolution: "@expo/config-plugins@npm:6.0.0"
+  dependencies:
+    "@expo/config-types": ^48.0.0
+    "@expo/json-file": ~8.2.37
+    "@expo/plist": ^0.0.20
+    "@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
+  checksum: bc3598c38ecef4c673c654632284068f093c33a71725e7f35c889936ffacd92477674c76e13501668f7535d90a8c4629ea727994a7fc3aee380e28ce49cf3604
+  languageName: node
+  linkType: hard
+
 "@expo/config-types@npm:^47.0.0":
   version: 47.0.0
   resolution: "@expo/config-types@npm:47.0.0"
@@ -1686,6 +1653,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/config-types@npm:^48.0.0":
+  version: 48.0.0
+  resolution: "@expo/config-types@npm:48.0.0"
+  checksum: 11c4b0bb5c1b4a8623c26ed5766297568385cf8e6b1444aa606c62306ea8dd5d8ecee4b52e8ba82dcaf749ffca5cde750afeef5a7a01750bca2360987f26e686
+  languageName: node
+  linkType: hard
+
 "@expo/config@npm:7.0.3, @expo/config@npm:^7.0.3, @expo/config@npm:~7.0.2":
   version: 7.0.3
   resolution: "@expo/config@npm:7.0.3"
@@ -1705,6 +1679,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/config@npm:~8.0.0":
+  version: 8.0.0
+  resolution: "@expo/config@npm:8.0.0"
+  dependencies:
+    "@babel/code-frame": ~7.10.4
+    "@expo/config-plugins": ~6.0.0
+    "@expo/config-types": ^48.0.0
+    "@expo/json-file": ^8.2.37
+    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
+  checksum: 9c4d6a05599319cc42f8828092d3164c3825043dec628d8c7cdb5ee283237f24fd9e657892b608a770774372e0e64101821773095e082d10c61d321f51868668
+  languageName: node
+  linkType: hard
+
 "@expo/configure-splash-screen@npm:^0.6.0":
   version: 0.6.0
   resolution: "@expo/configure-splash-screen@npm:0.6.0"
@@ -1807,7 +1800,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/json-file@npm:8.2.36, @expo/json-file@npm:^8.2.35":
+"@expo/json-file@npm:8.2.36":
   version: 8.2.36
   resolution: "@expo/json-file@npm:8.2.36"
   dependencies:
@@ -1818,6 +1811,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/json-file@npm:^8.2.35, @expo/json-file@npm:^8.2.37, @expo/json-file@npm:~8.2.37":
+  version: 8.2.37
+  resolution: "@expo/json-file@npm:8.2.37"
+  dependencies:
+    "@babel/code-frame": ~7.10.4
+    json5: ^2.2.2
+    write-file-atomic: ^2.3.0
+  checksum: f04e71654c5b3491bbb7088a02d64acf8e7750369fd48f4d55c64ff4372b5396bdef05a8eff51955e0b098e0069e63281f3c40dc6d3b71aec62295861b1236a6
+  languageName: node
+  linkType: hard
+
 "@expo/metro-config@npm:~0.5.0, @expo/metro-config@npm:~0.5.1":
   version: 0.5.2
   resolution: "@expo/metro-config@npm:0.5.2"
@@ -1845,10 +1849,10 @@ __metadata:
   linkType: hard
 
 "@expo/package-manager@npm:~0.0.53":
-  version: 0.0.57
-  resolution: "@expo/package-manager@npm:0.0.57"
+  version: 0.0.58
+  resolution: "@expo/package-manager@npm:0.0.58"
   dependencies:
-    "@expo/json-file": 8.2.36
+    "@expo/json-file": ^8.2.37
     "@expo/spawn-async": ^1.5.0
     ansi-regex: ^5.0.0
     chalk: ^4.0.0
@@ -1858,7 +1862,7 @@ __metadata:
     rimraf: ^3.0.2
     split: ^1.0.1
     sudo-prompt: 9.1.1
-  checksum: 07c7541b57e8ca2341d5436b91e35757139ae3c7a7e50d6db4845ff4cb7a32e964a89c08bd0bec9e89a6914769b59116fcd97d25f32c66a6cb1db45ac0bde91a
+  checksum: 8f63c6c4768e273a202b1d905e2ed64a994c141c58e3b489502eb858ca1a85c860a80c7c34ebffaff6fdad4baa06d1b0345a187702779ed9fd7f17bfb9d43c88
   languageName: node
   linkType: hard
 
@@ -1873,6 +1877,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/plist@npm:^0.0.20":
+  version: 0.0.20
+  resolution: "@expo/plist@npm:0.0.20"
+  dependencies:
+    "@xmldom/xmldom": ~0.7.7
+    base64-js: ^1.2.3
+    xmlbuilder: ^14.0.0
+  checksum: 74dea791f86ca29541e94c00d7e0d044b1ccb7947a6f62b18569a85baa4572190c0cbd0973bf97eec9b5f207f45ebb55b8975bd200e5933b237e4d2d2dc12194
+  languageName: node
+  linkType: hard
+
 "@expo/prebuild-config@npm:5.0.7":
   version: 5.0.7
   resolution: "@expo/prebuild-config@npm:5.0.7"
@@ -2417,20 +2432,20 @@ __metadata:
   linkType: hard
 
 "@radix-ui/react-context-menu@npm:^2.0.1":
-  version: 2.1.0
-  resolution: "@radix-ui/react-context-menu@npm:2.1.0"
+  version: 2.1.1
+  resolution: "@radix-ui/react-context-menu@npm:2.1.1"
   dependencies:
     "@babel/runtime": ^7.13.10
     "@radix-ui/primitive": 1.0.0
     "@radix-ui/react-context": 1.0.0
-    "@radix-ui/react-menu": 2.0.1
+    "@radix-ui/react-menu": 2.0.2
     "@radix-ui/react-primitive": 1.0.1
     "@radix-ui/react-use-callback-ref": 1.0.0
     "@radix-ui/react-use-controllable-state": 1.0.0
   peerDependencies:
     react: ^16.8 || ^17.0 || ^18.0
     react-dom: ^16.8 || ^17.0 || ^18.0
-  checksum: a702d3d577e513ca262c60162d0774b4644f8badb1703ea941ffe08b480a38687f4bcf20c26fd67ba8f187453c4ba7e28b27834cf5d49da6b05fbc53ec6b6052
+  checksum: 75d637302acad45de4f58ce792068ffc15fba126b1867960e13fbbdcebe302aaaad2a90f7e0e57b858ad55f937b5a8d46d3013fabe6b11afe91ae451ac7a6e80
   languageName: node
   linkType: hard
 
@@ -2474,21 +2489,21 @@ __metadata:
   linkType: hard
 
 "@radix-ui/react-dropdown-menu@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@radix-ui/react-dropdown-menu@npm:2.0.1"
+  version: 2.0.2
+  resolution: "@radix-ui/react-dropdown-menu@npm:2.0.2"
   dependencies:
     "@babel/runtime": ^7.13.10
     "@radix-ui/primitive": 1.0.0
     "@radix-ui/react-compose-refs": 1.0.0
     "@radix-ui/react-context": 1.0.0
     "@radix-ui/react-id": 1.0.0
-    "@radix-ui/react-menu": 2.0.1
+    "@radix-ui/react-menu": 2.0.2
     "@radix-ui/react-primitive": 1.0.1
     "@radix-ui/react-use-controllable-state": 1.0.0
   peerDependencies:
     react: ^16.8 || ^17.0 || ^18.0
     react-dom: ^16.8 || ^17.0 || ^18.0
-  checksum: 3f24e4708df93a516d38e305b22d354da03f3171f69dee9511ea63a396bdb4ff4def03083fe52f7b959334f12cc39df4f7e76a13de6ff09e743ba725f6310131
+  checksum: 2f96874845dcfe3a6259eef12172b28b84cba7469279c49e2a749c97e62d2138f1ba5b950e1b1141f64bda897fae769e2412e1a932b4761ab45ed0a0cd4ebfd3
   languageName: node
   linkType: hard
 
@@ -2530,9 +2545,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-menu@npm:2.0.1":
-  version: 2.0.1
-  resolution: "@radix-ui/react-menu@npm:2.0.1"
+"@radix-ui/react-menu@npm:2.0.2":
+  version: 2.0.2
+  resolution: "@radix-ui/react-menu@npm:2.0.2"
   dependencies:
     "@babel/runtime": ^7.13.10
     "@radix-ui/primitive": 1.0.0
@@ -2544,11 +2559,11 @@ __metadata:
     "@radix-ui/react-focus-guards": 1.0.0
     "@radix-ui/react-focus-scope": 1.0.1
     "@radix-ui/react-id": 1.0.0
-    "@radix-ui/react-popper": 1.0.1
+    "@radix-ui/react-popper": 1.1.0
     "@radix-ui/react-portal": 1.0.1
     "@radix-ui/react-presence": 1.0.0
     "@radix-ui/react-primitive": 1.0.1
-    "@radix-ui/react-roving-focus": 1.0.1
+    "@radix-ui/react-roving-focus": 1.0.2
     "@radix-ui/react-slot": 1.0.1
     "@radix-ui/react-use-callback-ref": 1.0.0
     aria-hidden: ^1.1.1
@@ -2556,13 +2571,13 @@ __metadata:
   peerDependencies:
     react: ^16.8 || ^17.0 || ^18.0
     react-dom: ^16.8 || ^17.0 || ^18.0
-  checksum: dbe436bb29b9d3b6b2b7d60283c18bf1e42dfbe8402685a0cc446336343bb656cf9bfc39b957e7603e778cbd28affc7e96c62e437a2681d4dd8314f46002c468
+  checksum: af8ce3dd970601da08b62b6f0cbef7d67fc21f73879b455c7d6a45e61ec80c3ac0b29a988da08e0a578725b82ca0eb529fb85e675aff01d5d0d0ab6aa3d6d4bd
   languageName: node
   linkType: hard
 
-"@radix-ui/react-popper@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-popper@npm:1.0.1"
+"@radix-ui/react-popper@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@radix-ui/react-popper@npm:1.1.0"
   dependencies:
     "@babel/runtime": ^7.13.10
     "@floating-ui/react-dom": 0.7.2
@@ -2570,6 +2585,7 @@ __metadata:
     "@radix-ui/react-compose-refs": 1.0.0
     "@radix-ui/react-context": 1.0.0
     "@radix-ui/react-primitive": 1.0.1
+    "@radix-ui/react-use-callback-ref": 1.0.0
     "@radix-ui/react-use-layout-effect": 1.0.0
     "@radix-ui/react-use-rect": 1.0.0
     "@radix-ui/react-use-size": 1.0.0
@@ -2577,7 +2593,7 @@ __metadata:
   peerDependencies:
     react: ^16.8 || ^17.0 || ^18.0
     react-dom: ^16.8 || ^17.0 || ^18.0
-  checksum: 8216f8fd5ee5de41206ec89a7c66152f55a8d6ba905f8a2575581f3d42e8a032c3dd66b1529c813f3addc9178e1d13d4262ac25296fd395f8361fcfb160590d4
+  checksum: 1e73fb1aa4337b0c9cb165e40b68716cfeae76490bc97ce3a75daafae1f1bbd54547c8dcae180fb7553032fc695b221c84cc19ae40020be216fb987ed6726dc9
   languageName: node
   linkType: hard
 
@@ -2621,9 +2637,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-roving-focus@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-roving-focus@npm:1.0.1"
+"@radix-ui/react-roving-focus@npm:1.0.2":
+  version: 1.0.2
+  resolution: "@radix-ui/react-roving-focus@npm:1.0.2"
   dependencies:
     "@babel/runtime": ^7.13.10
     "@radix-ui/primitive": 1.0.0
@@ -2638,7 +2654,7 @@ __metadata:
   peerDependencies:
     react: ^16.8 || ^17.0 || ^18.0
     react-dom: ^16.8 || ^17.0 || ^18.0
-  checksum: a8f1d22086622d7439b36ee5d38c6eb412bb99e71fa6986c25ed4506528ac48f32cbc06ed329bc7844fc9c9d402dec06e749b6272bef3ea26688620ad6b11fad
+  checksum: 93e260b91198cc9b0b2a05d1e7c8c83a06c7c1b80a46d3088c3fb39a776238128c8b7e6061a5d9726246f75283321fd0858181e51a475a295dd2f3059f513f49
   languageName: node
   linkType: hard
 
@@ -3462,9 +3478,9 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 18.11.17
-  resolution: "@types/node@npm:18.11.17"
-  checksum: 1933afd068d5c75c068c6c4df6d10edb3b0b2bb6503d544e2f0496ac007c90596e6a5e284a8ef032451bc16f871b7e46719d7d2bea60e9b25d13a77d52161cac
+  version: 18.13.0
+  resolution: "@types/node@npm:18.13.0"
+  checksum: 4ea10f8802848b01672bce938f678b6774ca2cee0c9774f12275ab064ae07818419c3e2e41d6257ce7ba846d1ea26c63214aa1dfa4166fa3746291752b8c6416
   languageName: node
   linkType: hard
 
@@ -3514,18 +3530,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:16 || 17 || 18":
-  version: 18.0.26
-  resolution: "@types/react@npm:18.0.26"
-  dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-  checksum: b62f0ea3cdfa68e106391728325057ad36f1bde7ba2dfae029472c47e01e482bc77c6ba4f1dad59f3f04ee81cb597618ff7c30a33c157c0a20462b6dd6aa2d4d
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:^18.0.27":
+"@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:^18.0.27":
   version: 18.0.27
   resolution: "@types/react@npm:18.0.27"
   dependencies:
@@ -3565,20 +3570,20 @@ __metadata:
   linkType: hard
 
 "@types/yargs@npm:^15.0.0":
-  version: 15.0.14
-  resolution: "@types/yargs@npm:15.0.14"
+  version: 15.0.15
+  resolution: "@types/yargs@npm:15.0.15"
   dependencies:
     "@types/yargs-parser": "*"
-  checksum: 8e358aeb8f0c3758e59e2b8fcfdee5627ab2fe3d92f50f380503d966c7f33287be3322155516a50d27727fde1ad3878f48f60cd6648439126d4b0bbb1a1153ed
+  checksum: 3420f6bcc508a895ef91858f8e6de975c710e4498cf6ed293f1174d3f1ad56edb4ab8481219bf6190f64a3d4115fab1d13ab3edc90acd54fba7983144040e446
   languageName: node
   linkType: hard
 
 "@types/yargs@npm:^16.0.0":
-  version: 16.0.4
-  resolution: "@types/yargs@npm:16.0.4"
+  version: 16.0.5
+  resolution: "@types/yargs@npm:16.0.5"
   dependencies:
     "@types/yargs-parser": "*"
-  checksum: caa21d2c957592fe2184a8368c8cbe5a82a6c2e2f2893722e489f842dc5963293d2f3120bc06fe3933d60a3a0d1e2eb269649fd6b1947fe1820f8841ba611dd9
+  checksum: 22697f7cc8aa32dcc10981a87f035e183303a58351c537c81fb450270d5c494b1d918186210e445b0eb2e4a8b34a8bda2a595f346bdb1c9ed2b63d193cb00430
   languageName: node
   linkType: hard
 
@@ -3617,7 +3622,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@xmldom/xmldom@npm:~0.7.0":
+"@xmldom/xmldom@npm:~0.7.0, @xmldom/xmldom@npm:~0.7.7":
   version: 0.7.9
   resolution: "@xmldom/xmldom@npm:0.7.9"
   checksum: 66e37b7800132f891b885b2eceeeebc53f60b69789da10276f1584256b963d79a28c7ae2071bc53a9cd842d9b03554c761b2701fe8036d6052f26bcd0ae8f2bb
@@ -3992,13 +3997,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "axios@npm:1.2.4"
+  version: 1.3.2
+  resolution: "axios@npm:1.3.2"
   dependencies:
     follow-redirects: ^1.15.0
     form-data: ^4.0.0
     proxy-from-env: ^1.1.0
-  checksum: 3454248d72028d69e90e348542140136c1226b448529e78beae5b88e65d6c67f85a3d0eb49f089b338cb54f173671b585c95ef3339f3cb28286eb2878fe47880
+  checksum: 9791af75a6df137b15ef45d13ad11eb357b3860d2496347ee18778db9d0abc2320362a4452f1e070e3160f1dbcc518fcefdc9e005be097e7db39acb22cf608e5
   languageName: node
   linkType: hard
 
@@ -4074,9 +4079,9 @@ __metadata:
   linkType: hard
 
 "babel-plugin-react-native-web@npm:~0.18.2":
-  version: 0.18.10
-  resolution: "babel-plugin-react-native-web@npm:0.18.10"
-  checksum: e5ffc55ea44ace0b7b0d89b5d3e5d84a08244fb30cc79581c45f41639574f393f090a1ad0ac98d094bbec1ed0300c7b69c638bdab3356394d1b3255e81be562b
+  version: 0.18.12
+  resolution: "babel-plugin-react-native-web@npm:0.18.12"
+  checksum: 9770341df1011b0e8e9b6a24bc18c05678c7d8b8db7d64e2cf56ab66b9c2988404902543ee7c4e222ed751faa865b4907ad5fac6f6ae6a38fbe16a50aa5975bd
   languageName: node
   linkType: hard
 
@@ -4243,25 +4248,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bplist-creator@npm:0.1.0":
-  version: 0.1.0
-  resolution: "bplist-creator@npm:0.1.0"
+"bplist-creator@npm:0.1.1":
+  version: 0.1.1
+  resolution: "bplist-creator@npm:0.1.1"
   dependencies:
     stream-buffers: 2.2.x
-  checksum: d4ccd88ea16c9d50c2e99f484a5f5bed34d172f6f704463585c0c9c993fd01ddb5b30d6ef486dd9393ffba3c686727f6296e8adf826ce01705bd3741477ce955
+  checksum: b0d40d1d1623f1afdbb575cfc8075d742d2c4f0eb458574be809e3857752d1042a39553b3943d2d7f505dde92bcd43e1d7bdac61c9cd44475d696deb79f897ce
   languageName: node
   linkType: hard
 
-"bplist-parser@npm:0.3.1":
-  version: 0.3.1
-  resolution: "bplist-parser@npm:0.3.1"
-  dependencies:
-    big-integer: 1.6.x
-  checksum: 7cabc5beadb7530f100cfdcce2b2f1d5d1674309b20f281b9b376022b2de55e86904598f1fd67254ec7f6ac1b74d67dc92c3445eb4cef5dec21c36c58d4a1106
-  languageName: node
-  linkType: hard
-
-"bplist-parser@npm:^0.3.1":
+"bplist-parser@npm:0.3.2, bplist-parser@npm:^0.3.1":
   version: 0.3.2
   resolution: "bplist-parser@npm:0.3.2"
   dependencies:
@@ -4317,16 +4313,16 @@ __metadata:
   linkType: hard
 
 "browserslist@npm:^4.21.3, browserslist@npm:^4.21.4":
-  version: 4.21.4
-  resolution: "browserslist@npm:4.21.4"
+  version: 4.21.5
+  resolution: "browserslist@npm:4.21.5"
   dependencies:
-    caniuse-lite: ^1.0.30001400
-    electron-to-chromium: ^1.4.251
-    node-releases: ^2.0.6
-    update-browserslist-db: ^1.0.9
+    caniuse-lite: ^1.0.30001449
+    electron-to-chromium: ^1.4.284
+    node-releases: ^2.0.8
+    update-browserslist-db: ^1.0.10
   bin:
     browserslist: cli.js
-  checksum: 4af3793704dbb4615bcd29059ab472344dc7961c8680aa6c4bb84f05340e14038d06a5aead58724eae69455b8fade8b8c69f1638016e87e5578969d74c078b79
+  checksum: 9755986b22e73a6a1497fd8797aedd88e04270be33ce66ed5d85a1c8a798292a65e222b0f251bafa1c2522261e237d73b08b58689d4920a607e5a53d56dc4706
   languageName: node
   linkType: hard
 
@@ -4526,10 +4522,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.30001400":
-  version: 1.0.30001441
-  resolution: "caniuse-lite@npm:1.0.30001441"
-  checksum: 0f5aa8f7ea4d165e88e0d1eaa44564c5bfee66641f265a1fd959e74f0a7e6bc0207db6c28e2fb63dc8b2cd23e0e3cee06c4f372de11c93c57ff5ff4207962c3f
+"caniuse-lite@npm:^1.0.30001449":
+  version: 1.0.30001450
+  resolution: "caniuse-lite@npm:1.0.30001450"
+  checksum: 511b360bfc907b2e437699364cf96b83507bc45043926450056642332bcd6f65a1e72540c828534ae15e0ac906e3e9af46cb2bb84458dd580bc31478e9dce282
   languageName: node
   linkType: hard
 
@@ -4590,9 +4586,9 @@ __metadata:
   linkType: hard
 
 "ci-info@npm:^3.2.0, ci-info@npm:^3.3.0":
-  version: 3.7.0
-  resolution: "ci-info@npm:3.7.0"
-  checksum: 6e5df0250382ff3732703b36b958d2d892dd3c481f9671666f96c2ab7888be744bc4dca81395be958dcb828502d94f18fa9aa8901c5a3c9923cda212df02724c
+  version: 3.7.1
+  resolution: "ci-info@npm:3.7.1"
+  checksum: 72d93d5101ea1c186511277fbd8d06ae8a6e028cc2fb94361e92bf735b39c5ebd192e8d15a66ff8c4e3ed569f87c2f844e96f90e141b2de5c649f77ec34ff601
   languageName: node
   linkType: hard
 
@@ -4829,16 +4825,16 @@ __metadata:
   linkType: hard
 
 "commander@npm:^9.4.0":
-  version: 9.4.1
-  resolution: "commander@npm:9.4.1"
-  checksum: bfb18e325a5bdf772763c2213d5c7d9e77144d944124e988bcd8e5e65fb6d45d5d4e86b09155d0f2556c9a59c31e428720e57968bcd050b2306e910a0bf3cf13
+  version: 9.5.0
+  resolution: "commander@npm:9.5.0"
+  checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade
   languageName: node
   linkType: hard
 
-"commander@npm:~2.13.0":
-  version: 2.13.0
-  resolution: "commander@npm:2.13.0"
-  checksum: b23e2de09428e3852e881c3e265c70438ca038c834744479b72dde0bbc570f45c7f1ea2feea27fbe26382d2cbf6fb7b1963d7dee2c08b3f4adc95dbc45d977f5
+"commander@npm:~2.14.1":
+  version: 2.14.1
+  resolution: "commander@npm:2.14.1"
+  checksum: 26bd49febeac8efabb7488fb5a4a2480b04bc4c4eef3c50da93eead72959f7a5232d003deda5b9761937205721274e80108f6d1d2b45ae7a8387cfb92031084e
   languageName: node
   linkType: hard
 
@@ -4930,9 +4926,9 @@ __metadata:
   linkType: hard
 
 "content-type@npm:~1.0.4":
-  version: 1.0.4
-  resolution: "content-type@npm:1.0.4"
-  checksum: 3d93585fda985d1554eca5ebd251994327608d2e200978fdbfba21c0c679914d5faf266d17027de44b34a72c7b0745b18584ecccaa7e1fdfb6a68ac7114f12e0
+  version: 1.0.5
+  resolution: "content-type@npm:1.0.5"
+  checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766
   languageName: node
   linkType: hard
 
@@ -4951,11 +4947,11 @@ __metadata:
   linkType: hard
 
 "core-js-compat@npm:^3.25.1":
-  version: 3.26.1
-  resolution: "core-js-compat@npm:3.26.1"
+  version: 3.27.2
+  resolution: "core-js-compat@npm:3.27.2"
   dependencies:
     browserslist: ^4.21.4
-  checksum: f222bce0002eae405327d68286e1d566037e8ac21906a47d7ecd15858adca7b12e82140db11dc43c8cc1fc066c5306120f3c27bfb2d7dbc2d20a72a2d90d38dc
+  checksum: 4574d4507de8cba9a75e37401b3ca6e5908ab066ec717e3b34866d25f623e1aa614fb886e10973be64a6250f325dcba6809e4fae4ed43375cc3e4276c5514c13
   languageName: node
   linkType: hard
 
@@ -5356,10 +5352,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.251":
-  version: 1.4.284
-  resolution: "electron-to-chromium@npm:1.4.284"
-  checksum: be496e9dca6509dbdbb54dc32146fc99f8eb716d28a7ee8ccd3eba0066561df36fc51418d8bd7cf5a5891810bf56c0def3418e74248f51ea4a843d423603d10a
+"electron-to-chromium@npm:^1.4.284":
+  version: 1.4.288
+  resolution: "electron-to-chromium@npm:1.4.288"
+  checksum: 312e1210f62c6bb593d1f57a15a1c64729e6a5edeacecc5d28dfb21f1a78ed3fac11805a0749a4e68f1fe1536229bf9d7bca36e1f34303369248a749a78aec1f
   languageName: node
   linkType: hard
 
@@ -5614,23 +5610,23 @@ __metadata:
   linkType: hard
 
 "expo-av@npm:^13.1.0":
-  version: 13.1.0
-  resolution: "expo-av@npm:13.1.0"
+  version: 13.2.0
+  resolution: "expo-av@npm:13.2.0"
   peerDependencies:
     expo: "*"
-  checksum: 97d5a11b7d136f12c59f3f152ce7125a3ac629ae416ae80c3e7b9ae51d332f0a59eb1536b29f4c72aa46cb9204613d615281760ceec92a297f79360ac00cf642
+  checksum: b03a2d7f71f1439ca12a02a232a704f5b42a7775962df3df28052490ba10ee69a343f75ff262ba55726a016406cdab8b18204db9846f78c276aa531b505aab18
   languageName: node
   linkType: hard
 
 "expo-constants@npm:^14.1.0":
-  version: 14.1.0
-  resolution: "expo-constants@npm:14.1.0"
+  version: 14.2.0
+  resolution: "expo-constants@npm:14.2.0"
   dependencies:
-    "@expo/config": ~7.0.2
+    "@expo/config": ~8.0.0
     uuid: ^3.3.2
   peerDependencies:
     expo: "*"
-  checksum: 294272cbc576b0778ce0384e132bd88a6eee54dcbf8b8e9b2a731f3402b91db1aee92940d8a0bd21392761b9d7cde7c1c3887c2c5a7af1323823b0666183938b
+  checksum: ad963283e3913b69a4a61aa0002e9b0651efc58d028a624cdc9fe5b09d888a83326e8198a81c421f9e6d29dc66a9c55edf05ff70e5c88b2311ba668b55dc433d
   languageName: node
   linkType: hard
 
@@ -5647,13 +5643,13 @@ __metadata:
   linkType: hard
 
 "expo-crypto@npm:^12.1.0":
-  version: 12.1.0
-  resolution: "expo-crypto@npm:12.1.0"
+  version: 12.2.0
+  resolution: "expo-crypto@npm:12.2.0"
   dependencies:
     base64-js: ^1.3.0
   peerDependencies:
     expo: "*"
-  checksum: d767f825333494a45af75640f229965b5d6a7d6ec2c56a93225f7f122f8aefe33a054e6c1b55ccd1eda884180a14fbcf68fbf0c171ce89cdb0019a5896105f13
+  checksum: d28d420dcf0688f3e2ccad75f1262feaa5030a26adcb4ecbdc8111221bb93d6fbaa2d33596ae853ae38f585f9f8d62933bef9132bf17ca0ff8ec74068f6b24bb
   languageName: node
   linkType: hard
 
@@ -5675,7 +5671,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo-file-system@npm:^15.1.1, expo-file-system@npm:~15.1.0, expo-file-system@npm:~15.1.1":
+"expo-file-system@npm:^15.1.1":
+  version: 15.2.0
+  resolution: "expo-file-system@npm:15.2.0"
+  dependencies:
+    uuid: ^3.4.0
+  peerDependencies:
+    expo: "*"
+  checksum: 1ac3c55a2dd62d1e13b2ab4ecfb05481eec5ae504fb06185f39eb5420a4a93ce335c43e947b9a5824444a4e3cb21985607fec480162a7f4a665ab56723b44cb8
+  languageName: node
+  linkType: hard
+
+"expo-file-system@npm:~15.1.0, expo-file-system@npm:~15.1.1":
   version: 15.1.1
   resolution: "expo-file-system@npm:15.1.1"
   dependencies:
@@ -5698,11 +5705,11 @@ __metadata:
   linkType: hard
 
 "expo-haptics@npm:^12.1.0":
-  version: 12.1.0
-  resolution: "expo-haptics@npm:12.1.0"
+  version: 12.2.0
+  resolution: "expo-haptics@npm:12.2.0"
   peerDependencies:
     expo: "*"
-  checksum: e4de0210c3029fc366468a924d857c66e1aa6c9517a493895b65e7ba78c6bf5832a78fcf53bdf274b89ff8ab2f607a8c78ac95b40e42a6a586dc205acf66fc73
+  checksum: 27c5dde404d2cd6c9c595f009ca1fa82b303ab16ba72ac95cdda31ce673ce8525a4ddfe7d004869e308f1e4bf578bb8ac53bd35447e104093b6350b6d9006dac
   languageName: node
   linkType: hard
 
@@ -5738,13 +5745,13 @@ __metadata:
   linkType: hard
 
 "expo-localization@npm:^14.0.0":
-  version: 14.0.0
-  resolution: "expo-localization@npm:14.0.0"
+  version: 14.1.0
+  resolution: "expo-localization@npm:14.1.0"
   dependencies:
     rtl-detect: ^1.0.2
   peerDependencies:
     expo: "*"
-  checksum: b1107fec3ce98386b21a1ed3adad279559cc24d07403ff32e4253e337f1018a115b265d471f374f76515c3ca6b0b73e132eff7783f51bd248908da3ca3c269a6
+  checksum: 9087b476627ffc4faafb27e617053100807aea8f1876a83e64337cd9ba901fc078cdb9daac5d02d31440f9ecf3ab05451887b86e9b2b2a1f0f8b6ceeb2c41da5
   languageName: node
   linkType: hard
 
@@ -5793,40 +5800,40 @@ __metadata:
   linkType: hard
 
 "expo-random@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "expo-random@npm:13.0.0"
+  version: 13.1.0
+  resolution: "expo-random@npm:13.1.0"
   dependencies:
     base64-js: ^1.3.0
   peerDependencies:
     expo: "*"
-  checksum: 4f6207b4a5c855a95ba2db8a2553bf14a73b16407c30286dee8c6ef943bbdfd8a0521b6302aa0b6003c3d62d384d87ed846170ea1acd30b03047e687dc795f6f
+  checksum: e9f99083cd0a80f5ab12d99b47e59d6d24cb973f7df2bf0b93290659822e4b0978e1ba8b666d14a34a10c83802267abd9b87ef910518f43eaf516e05f59ee717
   languageName: node
   linkType: hard
 
 "expo-screen-capture@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "expo-screen-capture@npm:5.0.0"
+  version: 5.1.0
+  resolution: "expo-screen-capture@npm:5.1.0"
   peerDependencies:
     expo: "*"
-  checksum: e293af098987ab90b7c2c94d6bec67d7f8da0483822620c7224a85918011c5a5f91f66a0f770dfa3a130825fa8b2dde300781926db477e00cb540dfed3012020
+  checksum: 091328b4fd1c4b73f1879e03bee82ada836649191e114d97153689ac77326263e89ea5b624301c9f8983a00e8d5bca097713827a8341b838d223b28f696627e0
   languageName: node
   linkType: hard
 
 "expo-screen-orientation@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "expo-screen-orientation@npm:5.0.1"
+  version: 5.1.0
+  resolution: "expo-screen-orientation@npm:5.1.0"
   peerDependencies:
     expo: "*"
-  checksum: 7ede30533a8c492f82b58c3b8be110b6373ffcc2cbe273299d9f15d9aa943d678d8aaffb3d2565780b45d1d5a2a1ddea54d813fc84c06e30e3cfd59abbd8e30e
+  checksum: fd2f58bec6c7fdc847054aeb080f675c63383750f5181dcde80f258a0463433e10ac4878e945c62c4a619b8f54f18eb1af29138fc9b0d199fb923c56dbfa9e93
   languageName: node
   linkType: hard
 
 "expo-secure-store@npm:^12.0.0":
-  version: 12.0.0
-  resolution: "expo-secure-store@npm:12.0.0"
+  version: 12.1.0
+  resolution: "expo-secure-store@npm:12.1.0"
   peerDependencies:
     expo: "*"
-  checksum: 47d72b0bdd9e900e4b2a4d348e79ec6fd0a1c7d1ae7933f7bb237341cea4dbe461a5ebd92f3682859769318b96c3244d776d4324af35e49d6f7d8f430e20d40c
+  checksum: 25ea2d1aa1e16f428c9ef8868c0dce5325fdbd061f701417222ed1fc785759d2584cfffcec5d0d57dc05381d51103fa6b87d587196253a00b1677c8a357a63d0
   languageName: node
   linkType: hard
 
@@ -5843,20 +5850,20 @@ __metadata:
   linkType: hard
 
 "expo-store-review@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "expo-store-review@npm:6.1.0"
+  version: 6.2.0
+  resolution: "expo-store-review@npm:6.2.0"
   peerDependencies:
     expo: "*"
-  checksum: 8f7766ce138d205b8a7b1ad809c7c5f538a0988069d9464299db33ebbaccd755815b7a7e098fbf0d7ab7e5b59bed9fc3bc8946161ceb13a16a7cc64085950611
+  checksum: 2b9c610cc1969d9f18bd2afccc3e1d47d347362189bf61be917b86a6eb62343ca5c88f365730f39af5e559315f46c9faa4388e3b32c5fc1fc13e2e10efeb9dde
   languageName: node
   linkType: hard
 
 "expo-video-thumbnails@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "expo-video-thumbnails@npm:7.1.0"
+  version: 7.2.0
+  resolution: "expo-video-thumbnails@npm:7.2.0"
   peerDependencies:
     expo: "*"
-  checksum: 4d127a286b4a89eed0222035c25eb6c49ec58ddfe6ecadebcd1e28e3e933615cb3ec1e29e52b4b82dd44ed204059a71a4cdf4fafbcbdc5cd51b3cd317b1d89af
+  checksum: e8925d9b263fdd172baa1357b9189016de4e0bcf0397c2320c9a218c94db167f3649332415715a074d6aa6e3df7330498f7997832bace577d86c7aebd59193bc
   languageName: node
   linkType: hard
 
@@ -5974,11 +5981,11 @@ __metadata:
   linkType: hard
 
 "fastq@npm:^1.6.0":
-  version: 1.14.0
-  resolution: "fastq@npm:1.14.0"
+  version: 1.15.0
+  resolution: "fastq@npm:1.15.0"
   dependencies:
     reusify: ^1.0.4
-  checksum: da2c05ec1446ef77b8ba2b76619c90d483404f5087e71e77469fbee797280a1f4ef26a63be15b2377198bc20d09fdf25c7d6e1e492a1e568a29dfdd9bcb7538c
+  checksum: 0170e6bfcd5d57a70412440b8ef600da6de3b2a6c5966aeaf0a852d542daff506a0ee92d6de7679d1de82e644bce69d7a574a6c93f0b03964b5337eed75ada1a
   languageName: node
   linkType: hard
 
@@ -6151,9 +6158,9 @@ __metadata:
   linkType: hard
 
 "flow-parser@npm:0.*":
-  version: 0.196.3
-  resolution: "flow-parser@npm:0.196.3"
-  checksum: 8c9bdc6669c7a9f61c5914c493042dee747acd3c6a42be448d93d4d668250332ccab5ca709676a72b0a57fd941ab0e212bb15d88cefd3c14cc7f74f412f798e2
+  version: 0.199.1
+  resolution: "flow-parser@npm:0.199.1"
+  checksum: c0c16aa4510af17dc8644eb9e6108bb223f23971569529389c56502fd4521ac9f04384277165b2adccabedf5d577fdf49e34323ac9a44cdd092d6dc139c987df
   languageName: node
   linkType: hard
 
@@ -6393,13 +6400,13 @@ __metadata:
   linkType: hard
 
 "get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "get-intrinsic@npm:1.1.3"
+  version: 1.2.0
+  resolution: "get-intrinsic@npm:1.2.0"
   dependencies:
     function-bind: ^1.1.1
     has: ^1.0.3
     has-symbols: ^1.0.3
-  checksum: 152d79e87251d536cf880ba75cfc3d6c6c50e12b3a64e1ea960e73a3752b47c69f46034456eae1b0894359ce3bc64c55c186f2811f8a788b75b638b06fab228a
+  checksum: 78fc0487b783f5c58cf2dccafc3ae656ee8d2d8062a8831ce4a95e7057af4587a1d4882246c033aca0a7b4965276f4802b45cc300338d1b77a73d3e3e3f4877d
   languageName: node
   linkType: hard
 
@@ -6490,20 +6497,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.1":
-  version: 8.0.3
-  resolution: "glob@npm:8.0.3"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^5.0.1
-    once: ^1.3.0
-  checksum: 50bcdea19d8e79d8de5f460b1939ffc2b3299eac28deb502093fdca22a78efebc03e66bf54f0abc3d3d07d8134d19a32850288b7440d77e072aa55f9d33b18c5
-  languageName: node
-  linkType: hard
-
-"glob@npm:^8.0.3":
+"glob@npm:^8.0.1, glob@npm:^8.0.3":
   version: 8.1.0
   resolution: "glob@npm:8.1.0"
   dependencies:
@@ -7577,13 +7571,13 @@ __metadata:
   linkType: hard
 
 "json5@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json5@npm:1.0.1"
+  version: 1.0.2
+  resolution: "json5@npm:1.0.2"
   dependencies:
     minimist: ^1.2.0
   bin:
     json5: lib/cli.js
-  checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3
+  checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7
   languageName: node
   linkType: hard
 
@@ -7596,15 +7590,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.2.1":
-  version: 2.2.2
-  resolution: "json5@npm:2.2.2"
-  bin:
-    json5: lib/cli.js
-  checksum: 9a878d66b72157b073cf0017f3e5d93ec209fa5943abcb38d37a54b208917c166bd473c26a24695e67a016ce65759aeb89946592991f8f9174fb96c8e2492683
-  languageName: node
-  linkType: hard
-
 "jsonfile@npm:^2.1.0":
   version: 2.4.0
   resolution: "jsonfile@npm:2.4.0"
@@ -8415,11 +8400,11 @@ __metadata:
   linkType: hard
 
 "minimatch@npm:^5.0.1":
-  version: 5.1.2
-  resolution: "minimatch@npm:5.1.2"
+  version: 5.1.6
+  resolution: "minimatch@npm:5.1.6"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: 32ffda25b9fb8270a1c1beafdb7489dc0e411af553495136509a945691f63c9b6b000eeeaaf8bffe3efa609c1d6d3bc0f5a106f6c3443b5c05da649100ded964
+  checksum: 7564208ef81d7065a370f788d337cd80a689e981042cb9a1d0e6580b6c6a8c9279eba80010516e258835a988363f99f54a6f711a315089b8b42694f5da9d0d77
   languageName: node
   linkType: hard
 
@@ -8500,11 +8485,9 @@ __metadata:
   linkType: hard
 
 "minipass@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "minipass@npm:4.0.0"
-  dependencies:
-    yallist: ^4.0.0
-  checksum: 7a609afbf394abfcf9c48e6c90226f471676c8f2a67f07f6838871afb03215ede431d1433feffe1b855455bcb13ef0eb89162841b9796109d6fed8d89790f381
+  version: 4.0.3
+  resolution: "minipass@npm:4.0.3"
+  checksum: a09f405e2f380ae7f6ee0cbb53b45c1fcc1b6c70fc3896f4d20649d92a10e61892c57bd9960a64cedf6c90b50022cb6c195905b515039c335b423202f99e6f18
   languageName: node
   linkType: hard
 
@@ -8689,7 +8672,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:2.6.7, node-fetch@npm:^2.0.0-alpha.8, node-fetch@npm:^2.2.0, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7":
+"node-fetch@npm:2.6.7":
   version: 2.6.7
   resolution: "node-fetch@npm:2.6.7"
   dependencies:
@@ -8703,6 +8686,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-fetch@npm:^2.0.0-alpha.8, node-fetch@npm:^2.2.0, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7":
+  version: 2.6.9
+  resolution: "node-fetch@npm:2.6.9"
+  dependencies:
+    whatwg-url: ^5.0.0
+  peerDependencies:
+    encoding: ^0.1.0
+  peerDependenciesMeta:
+    encoding:
+      optional: true
+  checksum: acb04f9ce7224965b2b59e71b33c639794d8991efd73855b0b250921382b38331ffc9d61bce502571f6cc6e11a8905ca9b1b6d4aeb586ab093e2756a1fd190d0
+  languageName: node
+  linkType: hard
+
 "node-forge@npm:^1.2.1, node-forge@npm:^1.3.1":
   version: 1.3.1
   resolution: "node-forge@npm:1.3.1"
@@ -8737,10 +8734,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.6":
-  version: 2.0.8
-  resolution: "node-releases@npm:2.0.8"
-  checksum: b1ab02c0d5d8e081bf9537232777a7a787dc8fef07f70feabe70a344599b220fe16462f746ac30f3eed5a58549445ad69368964d12a1f8b3b764f6caab7ba34a
+"node-releases@npm:^2.0.8":
+  version: 2.0.10
+  resolution: "node-releases@npm:2.0.10"
+  checksum: d784ecde25696a15d449c4433077f5cce620ed30a1656c4abf31282bfc691a70d9618bae6868d247a67914d1be5cc4fde22f65a05f4398cdfb92e0fc83cadfbc
   languageName: node
   linkType: hard
 
@@ -8874,9 +8871,9 @@ __metadata:
   linkType: hard
 
 "object-inspect@npm:^1.9.0":
-  version: 1.12.2
-  resolution: "object-inspect@npm:1.12.2"
-  checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2
+  version: 1.12.3
+  resolution: "object-inspect@npm:1.12.3"
+  checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
   languageName: node
   linkType: hard
 
@@ -9555,8 +9552,8 @@ __metadata:
   linkType: hard
 
 "react-i18next@npm:^12.1.4":
-  version: 12.1.4
-  resolution: "react-i18next@npm:12.1.4"
+  version: 12.1.5
+  resolution: "react-i18next@npm:12.1.5"
   dependencies:
     "@babel/runtime": ^7.20.6
     html-parse-stringify: ^3.0.1
@@ -9568,13 +9565,13 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 6f0f8a47f0bf7da2c9ac383c88b6ef02446d9d1aa2609cfcc98d8a28999da85361f065fbe7f7f4af910df4e8d53af7879db4b9cd681274d582fc7bdd1b07813b
+  checksum: 90f151dfef237eee4e24d5ca6ddac45869b5025b9173b3cf0403afbc794a448d5ba429105c88e6a539cea1e8ec3f6e18df46d8bee78e7918d79305aa9ec585cb
   languageName: node
   linkType: hard
 
 "react-intl@npm:^6.2.7":
-  version: 6.2.7
-  resolution: "react-intl@npm:6.2.7"
+  version: 6.2.8
+  resolution: "react-intl@npm:6.2.8"
   dependencies:
     "@formatjs/ecma402-abstract": 1.14.3
     "@formatjs/icu-messageformat-parser": 2.2.0
@@ -9592,7 +9589,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c842bec10a78b88e53b54170bcd7819ec4f324abf18400f6a66049f4f78af587064fbb156b0f04e0a02d4b60407dcce713c2140b266a41762c6b8a5a54a7627d
+  checksum: e7e4956e71bc12cc915ff1bbc967ae1a5b9b58af7aef9a8290683c3ec6f785ed7e4917798f5a4cff5d490bfdf43f6249eec401c733819a5d72e8a3af2b119871
   languageName: node
   linkType: hard
 
@@ -9617,16 +9614,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-blurhash@npm:^1.1.10":
-  version: 1.1.10
-  resolution: "react-native-blurhash@npm:1.1.10"
-  peerDependencies:
-    react: ">=16.8.1"
-    react-native: ">=0.60.0-rc.0 <1.0.x"
-  checksum: 5f462ceb4dd28af6f92c4c1a2828a8d78355be8fb65564892070afe52771aa4a166367882fbb6ae612ee1d0b464e1103cde494cb151bb9e2d5f3b7cdcaa2d89b
-  languageName: node
-  linkType: hard
-
 "react-native-clean-project@npm:^4.0.1":
   version: 4.0.1
   resolution: "react-native-clean-project@npm:4.0.1"
@@ -9708,11 +9695,11 @@ __metadata:
   linkType: hard
 
 "react-native-iphone-screen-helper@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "react-native-iphone-screen-helper@npm:2.0.2"
+  version: 2.0.3
+  resolution: "react-native-iphone-screen-helper@npm:2.0.3"
   peerDependencies:
     react-native: ">=0.42.0"
-  checksum: f80e06cd65824ebb056a2704d7734940fc7ac5c6b8ac2d8648942926c1e0f9d9e28bd343ff388150570acacae3c0b2d332edbab09059e747edfdfef7fb284348
+  checksum: 99e00eb611b744d106911f0483350dd76306314284ba43412cf0efcd9478bb05186fa030b471d5e44d409ee1b5e8d705c4ede8d32bf6b26ff6f30c2d6e4478aa
   languageName: node
   linkType: hard
 
@@ -9727,12 +9714,12 @@ __metadata:
   linkType: hard
 
 "react-native-mmkv@npm:^2.5.1":
-  version: 2.5.1
-  resolution: "react-native-mmkv@npm:2.5.1"
+  version: 2.6.1
+  resolution: "react-native-mmkv@npm:2.6.1"
   peerDependencies:
     react: "*"
-    react-native: "*"
-  checksum: 6f0cf484e71d8069c9b3cdb57b76eafaca40aa75f359beb6959c77d0ef66d0481d4459b1ffa94640170ce4744e337fefb38b8ccf6e1a3c3663561ede5f7a2c20
+    react-native: ">=0.71.0"
+  checksum: c73959d10e102a08bbde6a8dd041840a680faa8ef411125431afe63fdce38bf5f58cbd3985f8ef63832b8f5c0279ca39d7cd4a2ca1bde172a23eb74e644af5e0
   languageName: node
   linkType: hard
 
@@ -10650,9 +10637,9 @@ __metadata:
   linkType: hard
 
 "shell-quote@npm:^1.6.1, shell-quote@npm:^1.7.3":
-  version: 1.7.4
-  resolution: "shell-quote@npm:1.7.4"
-  checksum: 2874ea9c1a7c3ebfc9ec5734a897e16533d0d06f2e4cddc22ba3d1cab5cdc07d0f825364c1b1e39abe61236f44d8e60e933c7ad7349ce44de4f5dddc7b4354e9
+  version: 1.8.0
+  resolution: "shell-quote@npm:1.8.0"
+  checksum: 6ef7c5e308b9c77eedded882653a132214fa98b4a1512bb507588cf6cd2fc78bfee73e945d0c3211af028a1eabe09c6a19b96edd8977dc149810797e93809749
   languageName: node
   linkType: hard
 
@@ -10675,13 +10662,13 @@ __metadata:
   linkType: hard
 
 "simple-plist@npm:^1.1.0":
-  version: 1.3.1
-  resolution: "simple-plist@npm:1.3.1"
+  version: 1.4.0
+  resolution: "simple-plist@npm:1.4.0"
   dependencies:
-    bplist-creator: 0.1.0
-    bplist-parser: 0.3.1
+    bplist-creator: 0.1.1
+    bplist-parser: 0.3.2
     plist: ^3.0.5
-  checksum: 3890b49db544096e6f35f53268901112be859c44b187528979f1a67e604b5b48b4cd6e5d6ee9e2e32aeb1e2535fe93e1cb102e2cf2bf5a37200d8884cb65b918
+  checksum: fa8086f6b781c289f1abad21306481dda4af6373b32a5d998a70e53c2b7218a1d21ebb5ae3e736baae704c21d311d3d39d01d0e6a2387eda01b4020b9ebd909e
   languageName: node
   linkType: hard
 
@@ -11442,7 +11429,6 @@ __metadata:
     react-i18next: ^12.1.4
     react-intl: ^6.2.7
     react-native: ^0.70.7
-    react-native-blurhash: ^1.1.10
     react-native-clean-project: ^4.0.1
     react-native-flash-message: ^0.4.0
     react-native-gesture-handler: ~2.9.0
@@ -11497,9 +11483,9 @@ __metadata:
   linkType: hard
 
 "tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.1.0, tslib@npm:^2.4.0":
-  version: 2.4.1
-  resolution: "tslib@npm:2.4.1"
-  checksum: 19480d6e0313292bd6505d4efe096a6b31c70e21cf08b5febf4da62e95c265c8f571f7b36fcc3d1a17e068032f59c269fab3459d6cd3ed6949eafecf64315fca
+  version: 2.5.0
+  resolution: "tslib@npm:2.5.0"
+  checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
   languageName: node
   linkType: hard
 
@@ -11592,14 +11578,14 @@ __metadata:
   linkType: hard
 
 "uglify-es@npm:^3.1.9":
-  version: 3.3.9
-  resolution: "uglify-es@npm:3.3.9"
+  version: 3.3.10
+  resolution: "uglify-es@npm:3.3.10"
   dependencies:
-    commander: ~2.13.0
+    commander: ~2.14.1
     source-map: ~0.6.1
   bin:
     uglifyjs: bin/uglifyjs
-  checksum: f2de133ba71f05aca442db2c31a2f2614201e5b540948f022f5b53cd39b6b1b43a7db7cc2aa9917383bbb26e8043947fce35867cd1edcf2444854cb7fae0fa99
+  checksum: 22b028b6454c4d684c76617e9ac5b8da0e56611b32cd5d89e797225d6f1022f697a5642d9084319436df3aed462225749f8287d37bf67dccda1ac9d0365dd950
   languageName: node
   linkType: hard
 
@@ -11738,7 +11724,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.9":
+"update-browserslist-db@npm:^1.0.10":
   version: 1.0.10
   resolution: "update-browserslist-db@npm:1.0.10"
   dependencies:

From 724cd766472528f1f6ba60ecea1f26704623170d Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Wed, 8 Feb 2023 01:33:12 +0100
Subject: [PATCH 12/17] Bump deps

---
 ios/Podfile.lock | 48 ++++++++++++++++++++++++------------------------
 package.json     |  2 +-
 yarn.lock        | 12 ++++++------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 08e90796..4f7f6b9f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -3,14 +3,14 @@ PODS:
   - DoubleConversion (1.1.6)
   - EXApplication (5.0.1):
     - ExpoModulesCore
-  - EXAV (13.1.0):
+  - EXAV (13.2.0):
     - ExpoModulesCore
     - ReactCommon/turbomodule/core
-  - EXConstants (14.1.0):
+  - EXConstants (14.2.0):
     - ExpoModulesCore
   - EXErrorRecovery (4.0.1):
     - ExpoModulesCore
-  - EXFileSystem (15.1.1):
+  - EXFileSystem (15.2.0):
     - ExpoModulesCore
   - EXFont (11.0.1):
     - ExpoModulesCore
@@ -18,9 +18,9 @@ PODS:
     - ExpoModulesCore
   - Expo (47.0.13):
     - ExpoModulesCore
-  - ExpoCrypto (12.1.0):
+  - ExpoCrypto (12.2.0):
     - ExpoModulesCore
-  - ExpoHaptics (12.1.0):
+  - ExpoHaptics (12.2.0):
     - ExpoModulesCore
   - ExpoImage (1.0.0-beta.6):
     - ExpoModulesCore
@@ -30,25 +30,25 @@ PODS:
     - SDWebImageWebPCoder (~> 0.9.1)
   - ExpoKeepAwake (11.0.1):
     - ExpoModulesCore
-  - ExpoLocalization (14.0.0):
+  - ExpoLocalization (14.1.0):
     - ExpoModulesCore
   - ExpoModulesCore (1.1.1):
     - React-Core
     - ReactCommon/turbomodule/core
-  - ExpoRandom (13.0.0):
+  - ExpoRandom (13.1.0):
     - ExpoModulesCore
-  - ExpoStoreReview (6.1.0):
+  - ExpoStoreReview (6.2.0):
     - ExpoModulesCore
-  - ExpoVideoThumbnails (7.1.0):
+  - ExpoVideoThumbnails (7.2.0):
     - ExpoModulesCore
   - ExpoWebBrowser (12.0.0):
     - ExpoModulesCore
-  - EXScreenCapture (5.0.0):
+  - EXScreenCapture (5.1.0):
     - ExpoModulesCore
-  - EXScreenOrientation (5.0.1):
+  - EXScreenOrientation (5.1.0):
     - ExpoModulesCore
     - React-Core
-  - EXSecureStore (12.0.0):
+  - EXSecureStore (12.1.0):
     - ExpoModulesCore
   - EXSplashScreen (0.17.5):
     - ExpoModulesCore
@@ -726,26 +726,26 @@ SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   EXApplication: 034b1c40a8e9fe1bff76a1e511ee90dff64ad834
-  EXAV: 4b92292fb107520a25956bea940a94a3bb4911ca
-  EXConstants: 44f7d347d0432a66f469d0ce1dc4e3a0ca1b8b2d
+  EXAV: 1242c4c206fc522058a2749019064e979a4c0b76
+  EXConstants: 397186c7e312c33eb1ab85fa1f434dc123778136
   EXErrorRecovery: ae43433feb0608a64dc5b1c8363b3e7769a9ea24
-  EXFileSystem: 60602b6eefa6873f97172c684b7537c9760b50d6
+  EXFileSystem: d9fea7fe7a4390a0ef226cac33958de9178388b9
   EXFont: 319606bfe48c33b5b5063fb0994afdc496befe80
   EXNotifications: babce2a87b7922051354fcfe7a74dd279b7e272a
   Expo: b9fa98bf260992312ee3c424400819fb9beadafe
-  ExpoCrypto: 6eb2a5ede7d95b7359a5f0391ee0c5d2ecd144b3
-  ExpoHaptics: 129d3f8d44c2205adcdf8db760602818463d5437
+  ExpoCrypto: 98c71864077c4d0fe798a6a5aee1a8c1294cef85
+  ExpoHaptics: 97c532f311c3e638c14a6134f23564d007b76de4
   ExpoImage: 748f2b8d3974f1d51c7706fd61057b93241738aa
   ExpoKeepAwake: 69b59d0a8d2b24de9f82759c39b3821fec030318
-  ExpoLocalization: e202d1e2a4950df17ac8d0889d65a1ffd7532d7e
+  ExpoLocalization: 28ce7cfa174a752f7ace84189710f1385373655b
   ExpoModulesCore: 485dff3a59b036a33b6050c0a5aea3cf1037fdd1
-  ExpoRandom: 58b7e0a5fe1adf1cb6dc1cbe503a6fe9524f36ce
-  ExpoStoreReview: 713336ff504db3a6983475bf7c67519cc5efc86f
-  ExpoVideoThumbnails: 424db02cedfbbe2d498bcb2712ea4ba8a9dcb453
+  ExpoRandom: d8fc05d0d071485b06a97ab2a78cb7f8082052cd
+  ExpoStoreReview: e96ba0690ea21dc5d341cfafd0b26bac7bc974f5
+  ExpoVideoThumbnails: 865fa65f2b4f006ff02ef9e3e9c10370d9442d0a
   ExpoWebBrowser: 073e50f16669d498fb49063b9b7fe780b24f7fda
-  EXScreenCapture: d9f1ec31042dfef109290d06c2b4789b7444d16d
-  EXScreenOrientation: 07e5aeff07bce09a2b214981e612d87fd7719997
-  EXSecureStore: daec0117c922a67c658cb229152a9e252e5c1750
+  EXScreenCapture: bcf94c8199cd1876166e384b2398ff519a8ef7ee
+  EXScreenOrientation: d43067a93e75234a7ce5154e2759fff2238dbfd5
+  EXSecureStore: ec150f49b22269022c6184f1711abb05fe98d72d
   EXSplashScreen: 3e989924f61a8dd07ee4ea584c6ba14be9b51949
   FBLazyVector: a6454570f573a0f6f1d397e5a95c13e8e45d1700
   FBReactNativeSpec: 09e8dfba44487e5dc4882a9f5318cde67549549c
diff --git a/package.json b/package.json
index 37ddb719..cc378172 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "react-native-image-picker": "^5.0.1",
     "react-native-ios-context-menu": "^1.15.3",
     "react-native-language-detection": "^0.2.2",
-    "react-native-mmkv": "^2.5.1",
+    "react-native-mmkv": "~2.5.1",
     "react-native-pager-view": "^6.1.2",
     "react-native-quick-base64": "^2.0.5",
     "react-native-reanimated": "^2.14.4",
diff --git a/yarn.lock b/yarn.lock
index 9942ff7f..4f04e9c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9713,13 +9713,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-mmkv@npm:^2.5.1":
-  version: 2.6.1
-  resolution: "react-native-mmkv@npm:2.6.1"
+"react-native-mmkv@npm:~2.5.1":
+  version: 2.5.1
+  resolution: "react-native-mmkv@npm:2.5.1"
   peerDependencies:
     react: "*"
-    react-native: ">=0.71.0"
-  checksum: c73959d10e102a08bbde6a8dd041840a680faa8ef411125431afe63fdce38bf5f58cbd3985f8ef63832b8f5c0279ca39d7cd4a2ca1bde172a23eb74e644af5e0
+    react-native: "*"
+  checksum: 6f0cf484e71d8069c9b3cdb57b76eafaca40aa75f359beb6959c77d0ef66d0481d4459b1ffa94640170ce4744e337fefb38b8ccf6e1a3c3663561ede5f7a2c20
   languageName: node
   linkType: hard
 
@@ -11435,7 +11435,7 @@ __metadata:
     react-native-image-picker: ^5.0.1
     react-native-ios-context-menu: ^1.15.3
     react-native-language-detection: ^0.2.2
-    react-native-mmkv: ^2.5.1
+    react-native-mmkv: ~2.5.1
     react-native-pager-view: ^6.1.2
     react-native-quick-base64: ^2.0.5
     react-native-reanimated: ^2.14.4

From 48481a4cd5474dfcda65215dc4579dd291f4d4fb Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Wed, 8 Feb 2023 19:22:20 +0100
Subject: [PATCH 13/17] Improve auto fetch

---
 src/App.tsx                          |  5 +----
 src/components/Instance/index.tsx    |  6 +++---
 src/components/Timeline/index.tsx    | 24 +++++++++++++++---------
 src/screens/Tabs/Me/Push.tsx         |  4 ++--
 src/screens/Tabs/Me/Settings/App.tsx |  2 +-
 src/utils/api/general.ts             |  2 +-
 src/utils/api/helpers/connect.ts     |  2 +-
 src/utils/api/helpers/index.ts       |  2 +-
 src/utils/api/instance.ts            |  2 +-
 src/utils/storage/index.ts           |  4 ++++
 10 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 32072655..89748fed 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -11,6 +11,7 @@ import log from '@utils/startup/log'
 import netInfo from '@utils/startup/netInfo'
 import push from '@utils/startup/push'
 import sentry from '@utils/startup/sentry'
+import { GLOBAL } from '@utils/storage'
 import { getGlobalStorage, setAccount, setGlobalStorage } from '@utils/storage/actions'
 import { migrateFromAsyncStorage, versionStorageGlobal } from '@utils/storage/migrations/toMMKV'
 import ThemeManager from '@utils/styles/ThemeManager'
@@ -24,10 +25,6 @@ import { enableFreeze } from 'react-native-screens'
 import i18n from './i18n'
 import Screens from './screens'
 
-export const GLOBAL: { connect?: boolean } = {
-  connect: undefined
-}
-
 Platform.select({
   android: LogBox.ignoreLogs(['Setting a timer for a long period of time'])
 })
diff --git a/src/components/Instance/index.tsx b/src/components/Instance/index.tsx
index f4fba00f..d9997133 100644
--- a/src/components/Instance/index.tsx
+++ b/src/components/Instance/index.tsx
@@ -19,8 +19,8 @@ import {
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import * as AuthSession from 'expo-auth-session'
+import * as Crypto from 'expo-crypto'
 import { Image } from 'expo-image'
-import * as Random from 'expo-random'
 import * as WebBrowser from 'expo-web-browser'
 import { debounce } from 'lodash'
 import React, { RefObject, useCallback, useState } from 'react'
@@ -162,7 +162,7 @@ const ComponentInstance: React.FC<Props> = ({
               'admin.sign_up': false,
               'admin.report': false
             },
-            key: fromByteArray(Random.getRandomBytes(16))
+            key: fromByteArray(Crypto.getRandomBytes(16))
           },
           page_local: {
             showBoosts: true,
@@ -233,7 +233,7 @@ const ComponentInstance: React.FC<Props> = ({
         <View style={{ flexDirection: 'row' }}>
           <Image
             source={require('assets/images/welcome.png')}
-            style={{ resizeMode: 'contain', flex: 1, aspectRatio: 16 / 9 }}
+            style={{ flex: 1, aspectRatio: 16 / 9 }}
           />
         </View>
       ) : null}
diff --git a/src/components/Timeline/index.tsx b/src/components/Timeline/index.tsx
index 9319852c..13ff0573 100644
--- a/src/components/Timeline/index.tsx
+++ b/src/components/Timeline/index.tsx
@@ -134,15 +134,6 @@ const Timeline: React.FC<Props> = ({
     {
       onScroll: ({ contentOffset: { y } }) => {
         scrollY.value = y
-        if (
-          y < 300 &&
-          !isFetchingPrev.value &&
-          fetchingType.value === 0 &&
-          shouldAutoFetch.value &&
-          Platform.OS === 'ios'
-        ) {
-          fetchingType.value = 1
-        }
       },
       onEndDrag: ({ contentOffset: { y } }) => {
         if (!disableRefresh && !isFetching) {
@@ -157,6 +148,21 @@ const Timeline: React.FC<Props> = ({
     },
     [isFetching]
   )
+  useAnimatedReaction(
+    () => scrollY.value < 600,
+    (curr, prev) => {
+      if (
+        curr === true &&
+        prev === false &&
+        !isFetchingPrev.value &&
+        fetchingType.value === 0 &&
+        shouldAutoFetch.value &&
+        Platform.OS === 'ios'
+      ) {
+        fetchingType.value = 1
+      }
+    }
+  )
 
   const latestMarker = useRef<string>()
   const updateMarkers = useCallback(
diff --git a/src/screens/Tabs/Me/Push.tsx b/src/screens/Tabs/Me/Push.tsx
index 14acb6b1..3fdf1fe7 100644
--- a/src/screens/Tabs/Me/Push.tsx
+++ b/src/screens/Tabs/Me/Push.tsx
@@ -16,8 +16,8 @@ import { setAccountStorage, useAccountStorage, useGlobalStorage } from '@utils/s
 import { StyleConstants } from '@utils/styles/constants'
 import layoutAnimation from '@utils/styles/layoutAnimation'
 import { useTheme } from '@utils/styles/ThemeManager'
+import * as Crypto from 'expo-crypto'
 import * as Notifications from 'expo-notifications'
-import * as Random from 'expo-random'
 import * as WebBrowser from 'expo-web-browser'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -173,7 +173,7 @@ const TabMePush: React.FC = () => {
                       // Fix a bug for some users of v4.8.0
                       let authKey = push.key
                       if (push.key?.length <= 10) {
-                        authKey = fromByteArray(Random.getRandomBytes(16))
+                        authKey = fromByteArray(Crypto.getRandomBytes(16))
                       }
                       // Turning on
                       const randomPath = (Math.random() + 1).toString(36).substring(2)
diff --git a/src/screens/Tabs/Me/Settings/App.tsx b/src/screens/Tabs/Me/Settings/App.tsx
index 82584399..642dee40 100644
--- a/src/screens/Tabs/Me/Settings/App.tsx
+++ b/src/screens/Tabs/Me/Settings/App.tsx
@@ -5,13 +5,13 @@ import { LOCALES } from '@i18n/locales'
 import { useNavigation } from '@react-navigation/native'
 import { connectVerify } from '@utils/api/helpers/connect'
 import { androidActionSheetStyles } from '@utils/helpers/androidActionSheetStyles'
+import { GLOBAL } from '@utils/storage'
 import { useGlobalStorage } from '@utils/storage/actions'
 import { useTheme } from '@utils/styles/ThemeManager'
 import * as Localization from 'expo-localization'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Linking, Platform } from 'react-native'
-import { GLOBAL } from '../../../../App'
 import { mapFontsizeToName } from '../SettingsFontsize'
 
 const SettingsApp: React.FC = () => {
diff --git a/src/utils/api/general.ts b/src/utils/api/general.ts
index 2dd214d5..9da3fc4c 100644
--- a/src/utils/api/general.ts
+++ b/src/utils/api/general.ts
@@ -1,5 +1,5 @@
+import { GLOBAL } from '@utils/storage'
 import axios from 'axios'
-import { GLOBAL } from '../../App'
 import { ctx, handleError, PagedResponse, parseHeaderLinks, userAgent } from './helpers'
 import { CONNECT_DOMAIN } from './helpers/connect'
 
diff --git a/src/utils/api/helpers/connect.ts b/src/utils/api/helpers/connect.ts
index ebc7d66c..a84601ef 100644
--- a/src/utils/api/helpers/connect.ts
+++ b/src/utils/api/helpers/connect.ts
@@ -1,9 +1,9 @@
 import { mapEnvironment } from '@utils/helpers/checkEnvironment'
+import { GLOBAL } from '@utils/storage'
 import { setGlobalStorage } from '@utils/storage/actions'
 import axios from 'axios'
 import parse from 'url-parse'
 import { userAgent } from '.'
-import { GLOBAL } from '../../../App'
 
 const list = [
   'n61owz4leck',
diff --git a/src/utils/api/helpers/index.ts b/src/utils/api/helpers/index.ts
index ff796526..c65ec17c 100644
--- a/src/utils/api/helpers/index.ts
+++ b/src/utils/api/helpers/index.ts
@@ -1,10 +1,10 @@
 import * as Sentry from '@sentry/react-native'
+import { GLOBAL } from '@utils/storage'
 import { setGlobalStorage } from '@utils/storage/actions'
 import chalk from 'chalk'
 import Constants from 'expo-constants'
 import { Platform } from 'react-native'
 import parse from 'url-parse'
-import { GLOBAL } from '../../../App'
 
 const userAgent = {
   'User-Agent': `tooot/${Constants.expoConfig?.version} ${Platform.OS}/${Platform.Version}`
diff --git a/src/utils/api/instance.ts b/src/utils/api/instance.ts
index ea91d425..7b6c115a 100644
--- a/src/utils/api/instance.ts
+++ b/src/utils/api/instance.ts
@@ -1,7 +1,7 @@
+import { GLOBAL } from '@utils/storage'
 import { getAccountDetails } from '@utils/storage/actions'
 import { StorageGlobal } from '@utils/storage/global'
 import axios, { AxiosRequestConfig } from 'axios'
-import { GLOBAL } from '../../App'
 import { ctx, handleError, PagedResponse, parseHeaderLinks, userAgent } from './helpers'
 import { CONNECT_DOMAIN } from './helpers/connect'
 
diff --git a/src/utils/storage/index.ts b/src/utils/storage/index.ts
index d27cc26f..3b8bca51 100644
--- a/src/utils/storage/index.ts
+++ b/src/utils/storage/index.ts
@@ -4,3 +4,7 @@ import { MMKV } from 'react-native-mmkv'
 export const storage: { global: MMKV; account?: MMKV } = { global: new MMKV(), account: undefined }
 
 export const secureStorage = createSecureStore()
+
+export const GLOBAL: { connect?: boolean } = {
+  connect: undefined
+}

From 0185335138fe82ccb48691589031c0db6745c763 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Wed, 8 Feb 2023 21:41:16 +0100
Subject: [PATCH 14/17] Fix image viewer placeholder

---
 src/components/GracefullyImage.tsx | 3 ++-
 src/screens/ImageViewer/index.tsx  | 6 +++---
 src/screens/Tabs/index.tsx         | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/GracefullyImage.tsx b/src/components/GracefullyImage.tsx
index e161e9ce..23ce899f 100644
--- a/src/components/GracefullyImage.tsx
+++ b/src/components/GracefullyImage.tsx
@@ -63,9 +63,10 @@ const GracefullyImage = ({
       {...(onPress ? (hidden ? { disabled: true } : { onPress }) : { disabled: true })}
     >
       <Image
+        placeholderContentFit='cover'
         placeholder={sources.blurhash || connectMedia(sources.preview)}
         source={hidden ? undefined : connectMedia(source)}
-        transition={{ duration: 100 }}
+        transition={{ duration: 80 }}
         style={{ flex: 1, ...imageStyle }}
         onLoad={event => {
           if (setImageDimensions && event.source) {
diff --git a/src/screens/ImageViewer/index.tsx b/src/screens/ImageViewer/index.tsx
index 2831b24f..5438b16e 100644
--- a/src/screens/ImageViewer/index.tsx
+++ b/src/screens/ImageViewer/index.tsx
@@ -194,9 +194,9 @@ const ScreenImagesViewer = ({
                   >
                     <GracefullyImage
                       sources={{
-                        preview: { uri: item.preview_url, width: item.width, height: item.height },
-                        default: { uri: item.url, width: item.width, height: item.height },
-                        remote: { uri: item.remote_url, width: item.width, height: item.height }
+                        preview: { uri: item.preview_url },
+                        default: { uri: item.url },
+                        remote: { uri: item.remote_url }
                       }}
                       dimension={{
                         width:
diff --git a/src/screens/Tabs/index.tsx b/src/screens/Tabs/index.tsx
index 0d5b4499..77700c5d 100644
--- a/src/screens/Tabs/index.tsx
+++ b/src/screens/Tabs/index.tsx
@@ -52,6 +52,7 @@ const ScreenTabs = () => {
               return (
                 <View style={{ flexDirection: 'row', alignItems: 'center' }}>
                   <GracefullyImage
+                    key={accountActive}
                     sources={{ default: { uri: avatarStatic } }}
                     dimension={{ width: size, height: size }}
                     style={{

From 4864f6cd5c1c4a4c0a41fd19a7e9666103aabd72 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Thu, 9 Feb 2023 14:11:54 +0100
Subject: [PATCH 15/17] Fix #701

---
 src/screens/Tabs/Me/Push.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/screens/Tabs/Me/Push.tsx b/src/screens/Tabs/Me/Push.tsx
index 3fdf1fe7..727e0998 100644
--- a/src/screens/Tabs/Me/Push.tsx
+++ b/src/screens/Tabs/Me/Push.tsx
@@ -164,11 +164,10 @@ const TabMePush: React.FC = () => {
                         url: `push/unsubscribe/${pushPath}`
                       })
 
+                      setAccountStorage([{ key: 'push', value: { ...push, global: false } }])
                       if (Platform.OS === 'android') {
                         Notifications.deleteNotificationChannelGroupAsync(accountFull)
                       }
-
-                      setAccountStorage([{ key: 'push', value: { ...push, global: false } }])
                     } else {
                       // Fix a bug for some users of v4.8.0
                       let authKey = push.key
@@ -182,7 +181,7 @@ const TabMePush: React.FC = () => {
 
                       const body: {
                         subscription: any
-                        alerts: Mastodon.PushSubscription['alerts']
+                        data: { alerts: Mastodon.PushSubscription['alerts'] }
                       } = {
                         subscription: {
                           endpoint,
@@ -192,7 +191,7 @@ const TabMePush: React.FC = () => {
                             auth: authKey
                           }
                         },
-                        alerts: push.alerts
+                        data: { alerts: push.alerts }
                       }
 
                       const res = await apiInstance<Mastodon.PushSubscription>({
@@ -239,7 +238,6 @@ const TabMePush: React.FC = () => {
                       setAccountStorage([
                         { key: 'push', value: { ...push, global: true, key: authKey } }
                       ])
-
                       if (Platform.OS === 'android') {
                         setChannels(true)
                       }

From eecd871d65d5600456338c6c7d06abd9db70874c Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Thu, 9 Feb 2023 14:19:50 +0100
Subject: [PATCH 16/17] Fix avatar not updated

---
 src/screens/Tabs/index.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/screens/Tabs/index.tsx b/src/screens/Tabs/index.tsx
index 77700c5d..36fcfab5 100644
--- a/src/screens/Tabs/index.tsx
+++ b/src/screens/Tabs/index.tsx
@@ -50,9 +50,8 @@ const ScreenTabs = () => {
               return <Icon name='bell' size={size} color={color} />
             case 'Tab-Me':
               return (
-                <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+                <View key={avatarStatic} style={{ flexDirection: 'row', alignItems: 'center' }}>
                   <GracefullyImage
-                    key={accountActive}
                     sources={{ default: { uri: avatarStatic } }}
                     dimension={{ width: size, height: size }}
                     style={{

From 2097dceda7e1c8777e3e062f0723aba9cef189ab Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Thu, 9 Feb 2023 14:36:46 +0100
Subject: [PATCH 17/17] New Crowdin updates (#694)

* New translations timeline.json (Spanish)

* New translations timeline.json (Catalan)

* New translations timeline.json (Basque)

* New translations timeline.json (Ukrainian)

* New translations common.json (Norwegian)

* New translations instance.json (Norwegian)

* New translations parse.json (Norwegian)

* New translations relationship.json (Norwegian)

* New translations timeline.json (Norwegian)

* New translations imageViewer.json (Norwegian)

* New translations announcements.json (Norwegian)

* New translations compose.json (Norwegian)

* New translations screens.json (Norwegian)

* New translations tabs.json (Norwegian)

* New translations mediaSelector.json (Norwegian)

* New translations emojis.json (Norwegian)

* New translations contextMenu.json (Norwegian)

* New translations accountSelection.json (Norwegian)

* New translations common.json (Norwegian)

* New translations common.json (Norwegian)

* New translations instance.json (Norwegian)

* New translations parse.json (Norwegian)

* New translations relationship.json (Norwegian)

* New translations timeline.json (Norwegian)

* New translations imageViewer.json (Norwegian)

* New translations announcements.json (Norwegian)

* New translations compose.json (Norwegian)

* New translations screens.json (Norwegian)

* New translations tabs.json (Norwegian)

* New translations parse.json (Norwegian)

* New translations timeline.json (Norwegian)

* New translations compose.json (Norwegian)

* New translations screens.json (Norwegian)

* New translations tabs.json (Norwegian)

* New translations mediaSelector.json (Norwegian)

* New translations emojis.json (Norwegian)

* New translations contextMenu.json (Norwegian)

* New translations accountSelection.json (Norwegian)

* New translations timeline.json (Korean)

* New translations compose.json (Korean)

* New translations tabs.json (Korean)

* New translations contextMenu.json (Korean)

* New translations tabs.json (Japanese)

* New translations tabs.json (Korean)

* New translations timeline.json (Japanese)

* New translations tabs.json (Japanese)

* New translations timeline.json (German)
---
 src/i18n/ca/components/timeline.json      |   2 +-
 src/i18n/de/components/timeline.json      |   2 +-
 src/i18n/es/components/timeline.json      |   2 +-
 src/i18n/eu/components/timeline.json      |   2 +-
 src/i18n/ja/components/timeline.json      |   6 +-
 src/i18n/ja/screens/tabs.json             |  58 +--
 src/i18n/ko/components/contextMenu.json   |  16 +-
 src/i18n/ko/components/timeline.json      |   8 +-
 src/i18n/ko/screens/compose.json          |   2 +-
 src/i18n/ko/screens/tabs.json             | 102 ++---
 src/i18n/no/common.json                   |  32 ++
 src/i18n/no/components/contextMenu.json   | 106 +++++
 src/i18n/no/components/emojis.json        |   3 +
 src/i18n/no/components/instance.json      |  27 ++
 src/i18n/no/components/mediaSelector.json |  10 +
 src/i18n/no/components/parse.json         |   8 +
 src/i18n/no/components/relationship.json  |  16 +
 src/i18n/no/components/timeline.json      | 168 ++++++++
 src/i18n/no/screens.json                  |  17 +
 src/i18n/no/screens/accountSelection.json |   6 +
 src/i18n/no/screens/announcements.json    |  10 +
 src/i18n/no/screens/compose.json          | 171 ++++++++
 src/i18n/no/screens/imageViewer.json      |  16 +
 src/i18n/no/screens/tabs.json             | 475 ++++++++++++++++++++++
 src/i18n/uk/components/timeline.json      |   2 +-
 25 files changed, 1166 insertions(+), 101 deletions(-)
 create mode 100644 src/i18n/no/common.json
 create mode 100644 src/i18n/no/components/contextMenu.json
 create mode 100644 src/i18n/no/components/emojis.json
 create mode 100644 src/i18n/no/components/instance.json
 create mode 100644 src/i18n/no/components/mediaSelector.json
 create mode 100644 src/i18n/no/components/parse.json
 create mode 100644 src/i18n/no/components/relationship.json
 create mode 100644 src/i18n/no/components/timeline.json
 create mode 100644 src/i18n/no/screens.json
 create mode 100644 src/i18n/no/screens/accountSelection.json
 create mode 100644 src/i18n/no/screens/announcements.json
 create mode 100644 src/i18n/no/screens/compose.json
 create mode 100644 src/i18n/no/screens/imageViewer.json
 create mode 100644 src/i18n/no/screens/tabs.json

diff --git a/src/i18n/ca/components/timeline.json b/src/i18n/ca/components/timeline.json
index e545e6ef..fea1da9c 100644
--- a/src/i18n/ca/components/timeline.json
+++ b/src/i18n/ca/components/timeline.json
@@ -33,7 +33,7 @@
       "poll": "S'ha acabat una enquesta en què havies participat",
       "reblog": {
         "default": "{{name}} ha impulsat",
-        "myself": "",
+        "myself": "He impulsat",
         "notification": "{{name}} ha impulsat la teva publicació"
       },
       "update": "L'impuls ha sigut editat",
diff --git a/src/i18n/de/components/timeline.json b/src/i18n/de/components/timeline.json
index 46bd5aa8..1ce2dca2 100644
--- a/src/i18n/de/components/timeline.json
+++ b/src/i18n/de/components/timeline.json
@@ -33,7 +33,7 @@
       "poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
       "reblog": {
         "default": "{{name}} hat geboostet",
-        "myself": "",
+        "myself": "Von mir geboosted",
         "notification": "{{name}} hat deinen Tröt geboostet"
       },
       "update": "Boost wurde bearbeitet",
diff --git a/src/i18n/es/components/timeline.json b/src/i18n/es/components/timeline.json
index 867f724d..2b3543a0 100644
--- a/src/i18n/es/components/timeline.json
+++ b/src/i18n/es/components/timeline.json
@@ -33,7 +33,7 @@
       "poll": "Una encuesta en la que has votado ha terminado",
       "reblog": {
         "default": "{{name}} ha impulsado",
-        "myself": "",
+        "myself": "He impulsado",
         "notification": "{{name}} ha impulsado tu toot"
       },
       "update": "El impulso ha sido editado",
diff --git a/src/i18n/eu/components/timeline.json b/src/i18n/eu/components/timeline.json
index 82b68e3e..73885ce1 100644
--- a/src/i18n/eu/components/timeline.json
+++ b/src/i18n/eu/components/timeline.json
@@ -33,7 +33,7 @@
       "poll": "Erantzun zenuen inkesta bat amaitu da",
       "reblog": {
         "default": "{{name}}-(e)k bultzatu du",
-        "myself": "",
+        "myself": "Bultzatu dut",
         "notification": "{{name}}-(e)k zure tuta bultzatu du"
       },
       "update": "Bultzada editatua izan da",
diff --git a/src/i18n/ja/components/timeline.json b/src/i18n/ja/components/timeline.json
index cb03b729..b6572d4b 100644
--- a/src/i18n/ja/components/timeline.json
+++ b/src/i18n/ja/components/timeline.json
@@ -19,8 +19,8 @@
     "refetch": "更新",
     "fetching": "新しいトゥートを取得しています...",
     "fetched": {
-      "none": "",
-      "found": ""
+      "none": "新しいトゥートはありません",
+      "found": "{{count}}トゥートを取得"
     }
   },
   "shared": {
@@ -33,7 +33,7 @@
       "poll": "アンケートが終了しました",
       "reblog": {
         "default": "{{name}}さんがブースト",
-        "myself": "",
+        "myself": "ブーストしました",
         "notification": "{{name}}さんがあなたのトゥートをブーストしました"
       },
       "update": "ブーストしたトゥートが編集されました",
diff --git a/src/i18n/ja/screens/tabs.json b/src/i18n/ja/screens/tabs.json
index 86ef8e34..a9991e07 100644
--- a/src/i18n/ja/screens/tabs.json
+++ b/src/i18n/ja/screens/tabs.json
@@ -73,13 +73,13 @@
         "name": "設定"
       },
       "preferencesFilters": {
-        "name": ""
+        "name": "すべてのコンテンツフィルター"
       },
       "preferencesFilterAdd": {
         "name": "フィルターを作成"
       },
       "preferencesFilterEdit": {
-        "name": ""
+        "name": "フィルターを編集"
       },
       "profile": {
         "name": "プロフィールを編集"
@@ -136,7 +136,7 @@
     },
     "preferences": {
       "visibility": {
-        "title": "",
+        "title": "デフォルトの投稿の表示",
         "options": {
           "public": "公開",
           "unlisted": "未収載",
@@ -144,40 +144,40 @@
         }
       },
       "sensitive": {
-        "title": ""
+        "title": "メディアを常に閲覧注意としてマークする"
       },
       "media": {
-        "title": "",
+        "title": "メディアの表示",
         "options": {
-          "default": "",
-          "show_all": "",
-          "hide_all": ""
+          "default": "閲覧注意としてマークされたメディアを隠す",
+          "show_all": "メディアを常に表示する",
+          "hide_all": "メディアを常に隠す"
         }
       },
       "spoilers": {
-        "title": ""
+        "title": "閲覧注意としてマークされたトゥートを常に展開する"
       },
       "autoplay_gifs": {
-        "title": ""
+        "title": "トゥートでGIFを自動再生"
       },
       "filters": {
-        "title": "",
-        "content": ""
+        "title": "コンテンツフィルター",
+        "content": "{{count}} がアクティブです"
       },
       "web_only": {
-        "title": "",
-        "description": ""
+        "title": "アップデート設定",
+        "description": "以下の設定は、web UI を使用してのみ更新できます"
       }
     },
     "preferencesFilters": {
       "expired": "期限切れ",
-      "keywords_one": "",
-      "keywords_other": "",
-      "statuses_one": "",
-      "statuses_other": "",
-      "context": "",
+      "keywords_one": "{{count}}件のキーワード",
+      "keywords_other": "{{count}}件のキーワード",
+      "statuses_one": "{{count}}トゥート",
+      "statuses_other": "{{count}}トゥート",
+      "context": "<0 />で適用",
       "contexts": {
-        "home": "",
+        "home": "フォロー中とリスト",
         "notifications": "通知",
         "public": "連合",
         "thread": "会話",
@@ -196,22 +196,22 @@
         "604800": "1週間後",
         "18144000": "1ヶ月後"
       },
-      "context": "",
+      "context": "適用：",
       "contexts": {
-        "home": "",
+        "home": "フォロー中とリスト",
         "notifications": "通知",
         "public": "連合タイムライン",
-        "thread": "",
-        "account": ""
+        "thread": "会話表示",
+        "account": "プロフィール表示"
       },
-      "action": "",
+      "action": "一致した時",
       "actions": {
         "warn": "",
-        "hide": ""
+        "hide": "完全に非表示にする"
       },
-      "keywords": "",
+      "keywords": "これらのキーワードと一致",
       "keyword": "キーワード",
-      "statuses": ""
+      "statuses": "これらのトゥートと一致"
     },
     "profile": {
       "feedback": {
@@ -401,7 +401,7 @@
     },
     "filter": {
       "name": "フィルターに追加",
-      "existed": ""
+      "existed": "フィルター内に存在"
     },
     "history": {
       "name": "編集履歴"
diff --git a/src/i18n/ko/components/contextMenu.json b/src/i18n/ko/components/contextMenu.json
index 1cc2c541..5f37cdc5 100644
--- a/src/i18n/ko/components/contextMenu.json
+++ b/src/i18n/ko/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "사용자 팔로우",
       "action_true": "사용자 팔로우 해제"
     },
-    "inLists": "",
+    "inLists": "사용자를 포함한 리스트 ...",
     "showBoosts": {
       "action_false": "사용자의 부스트 보이기",
       "action_true": "사용자의 부스트 숨기기"
@@ -16,12 +16,12 @@
       "action_true": "사용자 뮤트 해제"
     },
     "followAs": {
-      "trigger": "",
+      "trigger": "특정 계정에서 팔로우 ...",
       "succeed_default": "@{{source}} 계정에서 @{{target}} 계정을 팔로우 했어요.",
       "succeed_locked": "@{{source}} 계정에서 @{{target}} 계정의 팔로우 승인을 요청했어요.",
       "failed": "특정 계정에서 팔로우"
     },
-    "blockReport": "",
+    "blockReport": "차단 및 신고",
     "block": {
       "action_false": "사용자 차단",
       "action_true": "사용자 차단 해제",
@@ -56,11 +56,11 @@
   },
   "hashtag": {
     "follow": {
-      "action_false": "",
-      "action_true": ""
+      "action_false": "팔로우",
+      "action_true": "팔로우 해제"
     },
     "filter": {
-      "action": ""
+      "action": "해시태그 필터 ..."
     }
   },
   "share": {
@@ -99,8 +99,8 @@
       "action_true": "툿 고정 해제"
     },
     "filter": {
-      "action_false": "",
-      "action_true": ""
+      "action_false": "툿 필터 ...",
+      "action_true": "필터 관리 ..."
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ko/components/timeline.json b/src/i18n/ko/components/timeline.json
index 63edae76..88b4bacc 100644
--- a/src/i18n/ko/components/timeline.json
+++ b/src/i18n/ko/components/timeline.json
@@ -17,10 +17,10 @@
   "refresh": {
     "fetchPreviousPage": "이 시점에 이어서 불러오기",
     "refetch": "최신 내용 불러오기",
-    "fetching": "",
+    "fetching": "새로운 툿 불러오는 중 ...",
     "fetched": {
-      "none": "",
-      "found": ""
+      "none": "새로운 툿이 없어요",
+      "found": "새로운 툿 {{count}}개를 불러왔어요"
     }
   },
   "shared": {
@@ -33,7 +33,7 @@
       "poll": "내가 참여한 투표가 끝났어요",
       "reblog": {
         "default": "{{name}} 님이 부스트했어요",
-        "myself": "",
+        "myself": "내가 부스트함",
         "notification": "{{name}} 님이 내 툿을 부스트했어요"
       },
       "update": "부스트한 툿이 수정됨",
diff --git a/src/i18n/ko/screens/compose.json b/src/i18n/ko/screens/compose.json
index cea4473f..d4e109ab 100644
--- a/src/i18n/ko/screens/compose.json
+++ b/src/i18n/ko/screens/compose.json
@@ -5,7 +5,7 @@
         "title": "작성을 취소할까요?",
         "buttons": {
           "save": "임시 저장",
-          "delete": "임시 저장한 내용 삭제"
+          "delete": "작성중인 내용 삭제"
         }
       }
     },
diff --git a/src/i18n/ko/screens/tabs.json b/src/i18n/ko/screens/tabs.json
index d53fa998..a3b539e9 100644
--- a/src/i18n/ko/screens/tabs.json
+++ b/src/i18n/ko/screens/tabs.json
@@ -70,16 +70,16 @@
         "name": "푸시 알림"
       },
       "preferences": {
-        "name": ""
+        "name": "설정"
       },
       "preferencesFilters": {
-        "name": ""
+        "name": "콘텐츠 필터"
       },
       "preferencesFilterAdd": {
-        "name": ""
+        "name": "필터 만들기"
       },
       "preferencesFilterEdit": {
-        "name": ""
+        "name": "필터 편집"
       },
       "profile": {
         "name": "프로필 편집"
@@ -136,81 +136,81 @@
     },
     "preferences": {
       "visibility": {
-        "title": "",
+        "title": "공개 범위 기본값",
         "options": {
-          "public": "",
-          "unlisted": "",
-          "private": ""
+          "public": "공개",
+          "unlisted": "공개 타임라인에 비표시",
+          "private": "팔로워만"
         }
       },
       "sensitive": {
-        "title": ""
+        "title": "민감한 미디어 표시를 기본값으로 사용"
       },
       "media": {
-        "title": "",
+        "title": "미디어 표시",
         "options": {
-          "default": "",
-          "show_all": "",
-          "hide_all": ""
+          "default": "민감한 미디어 숨기기",
+          "show_all": "모든 미디어 표시",
+          "hide_all": "모든 미디어 숨기기"
         }
       },
       "spoilers": {
-        "title": ""
+        "title": "스포일러 경고가 있는 툿 자동으로 펼치기"
       },
       "autoplay_gifs": {
-        "title": ""
+        "title": "툿에 포함된 GIF 자동 재생"
       },
       "filters": {
-        "title": "",
-        "content": ""
+        "title": "콘텐츠 필터",
+        "content": "{{count}}개 활성화"
       },
       "web_only": {
-        "title": "",
-        "description": ""
+        "title": "추가 설정",
+        "description": "일부 설정은 웹 UI에서만 변경할 수 있어요"
       }
     },
     "preferencesFilters": {
-      "expired": "",
-      "keywords_one": "",
-      "keywords_other": "",
-      "statuses_one": "",
-      "statuses_other": "",
-      "context": "",
+      "expired": "만료됨",
+      "keywords_one": "{{count}}개의 단어",
+      "keywords_other": "{{count}}개의 단어",
+      "statuses_one": "{{count}}개의 툿",
+      "statuses_other": "{{count}}개의 툿",
+      "context": "<0 />에 적용됨",
       "contexts": {
-        "home": "",
-        "notifications": "",
-        "public": "",
-        "thread": "",
-        "account": ""
+        "home": "팔로우와 리스트",
+        "notifications": "알림",
+        "public": "연합",
+        "thread": "대화",
+        "account": "프로필"
       }
     },
     "preferencesFilter": {
-      "name": "",
-      "expiration": "",
+      "name": "이름",
+      "expiration": "만료일",
       "expirationOptions": {
-        "0": "",
-        "1800": "",
-        "3600": "",
-        "43200": "",
-        "86400": "",
-        "604800": "",
-        "18144000": ""
+        "0": "만료하지 않음",
+        "1800": "30분 후",
+        "3600": "1시간 후",
+        "43200": "12시간 후",
+        "86400": "1일 후",
+        "604800": "1주일 후",
+        "18144000": "1개월 후"
       },
-      "context": "",
+      "context": "적용할 대상",
       "contexts": {
-        "home": "",
-        "notifications": "",
-        "public": "",
-        "thread": "",
-        "account": ""
+        "home": "팔로우와 리스트",
+        "notifications": "알림",
+        "public": "연합 타임라인",
+        "thread": "대화 내용",
+        "account": "프로필 내용"
       },
-      "action": "",
+      "action": "필터 동작",
       "actions": {
-        "warn": "",
-        "hide": ""
+        "warn": "내용만 가리고 펼쳐볼 수 있게 하기",
+        "hide": "완전히 숨기기"
       },
-      "keywords": "",
-      "keyword": "",
+      "keywords": "필터할 단어",
+      "keyword": "단어",
       "statuses": ""
     },
     "profile": {
@@ -400,7 +400,7 @@
       "name": "<0 /><1>의 미디어</1>"
     },
     "filter": {
-      "name": "",
+      "name": "필터에 추가",
       "existed": ""
     },
     "history": {
diff --git a/src/i18n/no/common.json b/src/i18n/no/common.json
new file mode 100644
index 00000000..d0015fe1
--- /dev/null
+++ b/src/i18n/no/common.json
@@ -0,0 +1,32 @@
+{
+  "buttons": {
+    "OK": "OK",
+    "apply": "Bruk",
+    "cancel": "Avbryt",
+    "discard": "Forkast",
+    "continue": "Fortsett",
+    "create": "Opprett",
+    "delete": "Slett",
+    "done": "Fullført",
+    "confirm": "Bekreft"
+  },
+  "customEmoji": {
+    "accessibilityLabel": "Tilpasset emoji {{emoji}}"
+  },
+  "message": {
+    "success": {
+      "message": "{{function}} var vellykket"
+    },
+    "warning": {
+      "message": ""
+    },
+    "error": {
+      "message": "{{function}} feilet, vennligst prøv igjen"
+    }
+  },
+  "separator": ", ",
+  "discard": {
+    "title": "Endringene er ikke lagret",
+    "message": "Dine endringer er ikke lagret. Angrer du på endringene?"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/components/contextMenu.json b/src/i18n/no/components/contextMenu.json
new file mode 100644
index 00000000..ec1cb3ac
--- /dev/null
+++ b/src/i18n/no/components/contextMenu.json
@@ -0,0 +1,106 @@
+{
+  "accessibilityHint": "Handlinger for tut, for eksempel dens bruker, tut selv",
+  "account": {
+    "title": "Brukerhandlinger",
+    "following": {
+      "action_false": "Følg bruker",
+      "action_true": "Slutt å følge"
+    },
+    "inLists": "Lister som inneholder bruker ...",
+    "showBoosts": {
+      "action_false": "Vis brukerens booster",
+      "action_true": "Skjul brukernes booster"
+    },
+    "mute": {
+      "action_false": "Demp bruker",
+      "action_true": "Opphev demping av bruker"
+    },
+    "followAs": {
+      "trigger": "Følg som ...",
+      "succeed_default": "Følger nå @{{target}} med @{{source}}",
+      "succeed_locked": "Sendt følge forespørsel til @{{target}} med {{source}}, venter på godkjenning",
+      "failed": "Følg som"
+    },
+    "blockReport": "Blokker og rapporter",
+    "block": {
+      "action_false": "Blokker bruker",
+      "action_true": "Fjern blokkering av brukker",
+      "alert": {
+        "title": "Bekreft blokkering av @{{username}}?"
+      }
+    },
+    "reports": {
+      "action": "Rapporter og blokker bruker",
+      "alert": {
+        "title": "Bekreft blokkering av @{{username}}?"
+      }
+    }
+  },
+  "at": {
+    "direct": "Direktemelding",
+    "public": "Offentlig melding"
+  },
+  "copy": {
+    "action": "Kopier tut",
+    "succeed": "Kopiert"
+  },
+  "instance": {
+    "title": "Instansaktivitet",
+    "block": {
+      "action": "Blokker instans {{instance}}",
+      "alert": {
+        "title": "Bekreft blokkering av @{{instance}}?",
+        "message": "For det meste kan du dempe eller blokkere visse brukere.\n\nEtter at du har blokkert, vil alt innholdet fra denne forekomsten bli fjernet!"
+      }
+    }
+  },
+  "hashtag": {
+    "follow": {
+      "action_false": "Følg",
+      "action_true": "Slutt å følge"
+    },
+    "filter": {
+      "action": "Filtrer emnet ..."
+    }
+  },
+  "share": {
+    "status": {
+      "action": "Del tut"
+    },
+    "account": {
+      "action": "Del bruker"
+    }
+  },
+  "status": {
+    "title": "Tut handlinger",
+    "edit": {
+      "action": "Rediger tut"
+    },
+    "delete": {
+      "action": "Slett tut",
+      "alert": {
+        "title": "Bekreft sletting?",
+        "message": "Alle booster og favoritter blir slettet, inkludert alle svar."
+      }
+    },
+    "deleteEdit": {
+      "action": "Slett tut og repost",
+      "alert": {
+        "title": "Bekreft sletting og repost?",
+        "message": "Alle booster og favoritter blir slettet, inkludert alle svar."
+      }
+    },
+    "mute": {
+      "action_false": "Demp tut og svar",
+      "action_true": "Avdemp tut og svar"
+    },
+    "pin": {
+      "action_false": "Fest tut",
+      "action_true": "Avfest tut"
+    },
+    "filter": {
+      "action_false": "Filtrer tut...",
+      "action_true": "Behandle filtere..."
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/components/emojis.json b/src/i18n/no/components/emojis.json
new file mode 100644
index 00000000..130ccc74
--- /dev/null
+++ b/src/i18n/no/components/emojis.json
@@ -0,0 +1,3 @@
+{
+  "frequentUsed": "Ofte brukt"
+}
\ No newline at end of file
diff --git a/src/i18n/no/components/instance.json b/src/i18n/no/components/instance.json
new file mode 100644
index 00000000..3f1eb3ab
--- /dev/null
+++ b/src/i18n/no/components/instance.json
@@ -0,0 +1,27 @@
+{
+  "server": {
+    "textInput": {
+      "placeholder": "Instansens domene"
+    },
+    "whitelisted": "Dette kan være en hvitelistet forekomst som tooot ikke kan hente data fra før du logger inn.",
+    "button": "Logg inn",
+    "information": {
+      "name": "Navn",
+      "accounts": "Brukere",
+      "statuses": "Tuter",
+      "domains": "Universum"
+    },
+    "disclaimer": {
+      "base": "Innlogging bruker systemnettleser mens du logger inn på, din kontoinformasjon vil ikke være synlig for toot-appen."
+    },
+    "terms": {
+      "base": "Ved å logge inn godtar du <0>retningslinjer for personvern</0> og <1>vilkårene for bruk</1>."
+    }
+  },
+  "update": {
+    "alert": {
+      "title": "Logget på denne instansen",
+      "message": "Du kan logge inn på en annen konto, og beholde eksisterende pålogging"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/components/mediaSelector.json b/src/i18n/no/components/mediaSelector.json
new file mode 100644
index 00000000..a0f2d362
--- /dev/null
+++ b/src/i18n/no/components/mediaSelector.json
@@ -0,0 +1,10 @@
+{
+  "title": "Velg mediekilde",
+  "message": "Media EXIF-data er ikke lastet opp",
+  "options": {
+    "image": "Last opp bilder",
+    "image_max": "Last opp bilder (maks {{max}})",
+    "video": "Last opp video",
+    "video_max": "Last opp video (maks {{max}})"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/components/parse.json b/src/i18n/no/components/parse.json
new file mode 100644
index 00000000..1d5db752
--- /dev/null
+++ b/src/i18n/no/components/parse.json
@@ -0,0 +1,8 @@
+{
+  "HTML": {
+    "accessibilityHint": "Trykk for å utvide eller skjule innhold",
+    "expanded": "{{hint}}{{moreLines}}",
+    "moreLines": " ({{count}} flere linjer)",
+    "defaultHint": "Lang tut"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/components/relationship.json b/src/i18n/no/components/relationship.json
new file mode 100644
index 00000000..bc3ddb1b
--- /dev/null
+++ b/src/i18n/no/components/relationship.json
@@ -0,0 +1,16 @@
+{
+  "follow": {
+    "function": "Følg bruker"
+  },
+  "block": {
+    "function": "Blokker bruker"
+  },
+  "button": {
+    "error": "Feil med lasting",
+    "blocked_by": "Blokkert av bruker",
+    "blocking": "Fjern blokkering",
+    "following": "Slutt å følge",
+    "requested": "Avbryt forespørsel",
+    "default": "Følg"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/components/timeline.json b/src/i18n/no/components/timeline.json
new file mode 100644
index 00000000..a3831316
--- /dev/null
+++ b/src/i18n/no/components/timeline.json
@@ -0,0 +1,168 @@
+{
+  "empty": {
+    "error": {
+      "message": "Lasting mislyktes",
+      "button": "Prøv igjen"
+    },
+    "success": {
+      "message": "Tidslinjen er tom"
+    }
+  },
+  "end": {
+    "message": "Slutt, hva med en kopp med <0 />"
+  },
+  "lookback": {
+    "message": "Sist lest"
+  },
+  "refresh": {
+    "fetchPreviousPage": "Nyere herfra",
+    "refetch": "Til nyeste",
+    "fetching": "Henter nyere tuter ...",
+    "fetched": {
+      "none": "Ingen nyere tut",
+      "found": "Hentet {{count}} tuter"
+    }
+  },
+  "shared": {
+    "actioned": {
+      "pinned": "Festet",
+      "favourite": "{{name}} favoriserte din tut",
+      "status": "{name} la nettopp ut",
+      "follow": "{{name}} følger deg",
+      "follow_request": "{{name}} ba om å følge deg",
+      "poll": "En avstemming du har stemt på er avsluttet",
+      "reblog": {
+        "default": "{{name}} boostet",
+        "myself": "Jeg boostet",
+        "notification": "{{name}} boostet ditt tut"
+      },
+      "update": "Reblogg har blitt redigert",
+      "admin.sign_up": "{{name}} ble med i instansen",
+      "admin.report": "{{name}} rapportert:"
+    },
+    "actions": {
+      "reply": {
+        "accessibilityLabel": "Svar på tut"
+      },
+      "reblogged": {
+        "accessibilityLabel": "Boost denne tut",
+        "function": "Boost tut",
+        "options": {
+          "title": "Velg synlighet for boost",
+          "public": "Offentlig boost",
+          "unlisted": "Fjern boost"
+        }
+      },
+      "favourited": {
+        "accessibilityLabel": "Legge tut til dine favoritter",
+        "function": "Favoritt tut"
+      },
+      "bookmarked": {
+        "accessibilityLabel": "Legg tut til bokmerker",
+        "function": "Bokmerk tut"
+      },
+      "openReport": "Åpne rapport"
+    },
+    "actionsUsers": {
+      "reblogged_by": {
+        "accessibilityLabel": "{{count}} brukere har boostet tuten",
+        "accessibilityHint": "Trykk for å bli kjent med brukerne",
+        "text": "$t(screenTabs:shared.users.statuses.reblogged_by)"
+      },
+      "favourited_by": {
+        "accessibilityLabel": "{{count}} brukere har boostet tuten",
+        "accessibilityHint": "Trykk for å bli kjent med brukerne",
+        "text": "$t(screenTabs:shared.users.statuses.favourited_by)"
+      },
+      "history": {
+        "accessibilityLabel": "Tut har blitt redigert {{count}} ganger",
+        "accessibilityHint": "Trykk for å vise hele redigeringsloggen",
+        "text_one": "{{count}} rediger",
+        "text_other": "{{count}} redigeringer"
+      }
+    },
+    "attachment": {
+      "sensitive": {
+        "button": "Vis sensitivt media"
+      },
+      "unsupported": {
+        "text": "Feil med lasting",
+        "button": "Prøv ekstern lenke"
+      },
+      "altText": "Alternativ tekst"
+    },
+    "avatar": {
+      "accessibilityLabel": "Profilbilde av {{name}}",
+      "accessibilityHint": "Trykk for å gå til {{name}} sin side"
+    },
+    "content": {
+      "expandHint": "Skjult innhold"
+    },
+    "filtered": {
+      "reveal": "Vis likevel",
+      "match_v1": "Filtrert: {{phrase}}.",
+      "match_v2_one": "Filtrert av {{filters}}.",
+      "match_v2_other": "Filtrert med {{count}} filtre, {{filters}}."
+    },
+    "fullConversation": "Vis samtaler",
+    "translate": {
+      "default": "Oversett",
+      "succeed": "Oversatt med {{provider}} fra {{source}}",
+      "failed": "Oversettelse feilet",
+      "source_not_supported": "dette språket er ikke støttet",
+      "target_not_supported": "Dette språket er ikke støttet"
+    },
+    "header": {
+      "shared": {
+        "account": {
+          "name": {
+            "accessibilityHint": "Brukerens visningsnavn"
+          },
+          "account": {
+            "accessibilityHint": "Brukerkonto"
+          }
+        },
+        "application": "med {{application}}",
+        "edited": {
+          "accessibilityLabel": "Tut redigert"
+        },
+        "muted": {
+          "accessibilityLabel": "Tut er dempet"
+        },
+        "replies": "Svar <0 />",
+        "visibility": {
+          "direct": {
+            "accessibilityLabel": "Tut er en direkte melding"
+          },
+          "private": {
+            "accessibilityLabel": "Tut er kun synlig for følgere"
+          }
+        }
+      },
+      "conversation": {
+        "withAccounts": "Med",
+        "delete": {
+          "function": "Slett direkte melding"
+        }
+      }
+    },
+    "poll": {
+      "meta": {
+        "button": {
+          "vote": "Stem",
+          "refresh": "Oppdater"
+        },
+        "count": {
+          "voters_one": "{{count}} bruker har stemt",
+          "voters_other": "{{count}} bruker har stemt",
+          "votes_one": "%{count} stemme",
+          "votes_other": "%{count} stemmer"
+        },
+        "expiration": {
+          "expired": "Avstemning utløpt",
+          "until": "Utløper <0 />"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/screens.json b/src/i18n/no/screens.json
new file mode 100644
index 00000000..d9d04655
--- /dev/null
+++ b/src/i18n/no/screens.json
@@ -0,0 +1,17 @@
+{
+  "screenshot": {
+    "title": "Personvernbeskyttelse",
+    "message": "Vennligst ikke avslør brukerens identitet, som f. eks. brukernavn, profilbilde, osv. Tusen takk!"
+  },
+  "localCorrupt": {
+    "message": "Din økt er utløpt, vennligst logg inn igjen"
+  },
+  "pushError": {
+    "message": "Feil ved push-tjeneste",
+    "description": "Vennligst aktiver push-varsling i innstillingene"
+  },
+  "shareError": {
+    "imageNotSupported": "Bildetype {{type}} støttes ikke",
+    "videoNotSupported": "Videotype {{type}} støttes ikke"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/screens/accountSelection.json b/src/i18n/no/screens/accountSelection.json
new file mode 100644
index 00000000..4de9b316
--- /dev/null
+++ b/src/i18n/no/screens/accountSelection.json
@@ -0,0 +1,6 @@
+{
+  "heading": "Del tut...",
+  "content": {
+    "select_account": "Velg konto"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/screens/announcements.json b/src/i18n/no/screens/announcements.json
new file mode 100644
index 00000000..9ec00941
--- /dev/null
+++ b/src/i18n/no/screens/announcements.json
@@ -0,0 +1,10 @@
+{
+  "heading": "Kunngjøringer",
+  "content": {
+    "published": "Publisert <0 />",
+    "button": {
+      "read": "Les",
+      "unread": "Merk som lest"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/screens/compose.json b/src/i18n/no/screens/compose.json
new file mode 100644
index 00000000..74587cff
--- /dev/null
+++ b/src/i18n/no/screens/compose.json
@@ -0,0 +1,171 @@
+{
+  "heading": {
+    "left": {
+      "alert": {
+        "title": "Avbryte redigering?",
+        "buttons": {
+          "save": "Lagre utkast",
+          "delete": "Slett utkast"
+        }
+      }
+    },
+    "right": {
+      "button": {
+        "default": "Tut",
+        "conversation": "Tut DM",
+        "reply": "Tut svar",
+        "deleteEdit": "Tut",
+        "edit": "Tut",
+        "share": "Tut"
+      },
+      "alert": {
+        "default": {
+          "title": "Tut mislyktes",
+          "button": "Prøv igjen"
+        },
+        "removeReply": {
+          "title": "Svar på tut ble ikke funnet",
+          "description": "Svarte tut kan ha blitt slettet. Vil du fjerne det fra din referanse?",
+          "confirm": "Fjern referanse"
+        }
+      }
+    }
+  },
+  "content": {
+    "root": {
+      "header": {
+        "postingAs": "Tuter som @{{acct}}@{{domain}}",
+        "spoilerInput": {
+          "placeholder": "Spoiler advarsel"
+        },
+        "textInput": {
+          "placeholder": "Hva tenker du på",
+          "keyboardImage": {
+            "exceedMaximum": {
+              "title": "Maksimalt antall vedlegg nådd"
+            }
+          }
+        }
+      },
+      "footer": {
+        "attachments": {
+          "sensitive": "Merk vedlegg som følsomt",
+          "remove": {
+            "accessibilityLabel": "Fjern opplastet vedlegg, nummer {{attachment}}"
+          },
+          "edit": {
+            "accessibilityLabel": "Rediger opplastet vedlegg, nummer {{attachment}}"
+          },
+          "upload": {
+            "accessibilityLabel": "Last opp flere vedlegg"
+          }
+        },
+        "emojis": {
+          "accessibilityHint": "Trykk for å legge til emoji"
+        },
+        "poll": {
+          "option": {
+            "placeholder": {
+              "accessibilityLabel": "Avstemningsvalg {{index}}",
+              "single": "Ett valg",
+              "multiple": "Flere valg"
+            }
+          },
+          "quantity": {
+            "reduce": {
+              "accessibilityLabel": "Reduser valg til {{amount}}",
+              "accessibilityHint": "Minimum antall valg nådd, har {{amount}}"
+            },
+            "increase": {
+              "accessibilityLabel": "Reduser valg til {{amount}}",
+              "accessibilityHint": "Maksimum antall valg nådd, har {{amount}}"
+            }
+          },
+          "multiple": {
+            "heading": "Valg type",
+            "options": {
+              "single": "Ett valg",
+              "multiple": "Flere valg"
+            }
+          },
+          "expiration": {
+            "heading": "Gyldighet",
+            "options": {
+              "300": "5 minutter",
+              "1800": "30 minutter",
+              "3600": "1 time",
+              "21600": "6 timer",
+              "86400": "1 dag",
+              "259200": "3 dager",
+              "604800": "7 dager"
+            }
+          }
+        }
+      },
+      "actions": {
+        "attachment": {
+          "accessibilityLabel": "Last opp vedlegg",
+          "accessibilityHint": "Avstemmingsfunksjonen blir deaktivert når der er noen vedlegg",
+          "failed": {
+            "alert": {
+              "title": "Opplasting feilet",
+              "button": "Prøv igjen"
+            }
+          }
+        },
+        "poll": {
+          "accessibilityLabel": "Legg til avstemning",
+          "accessibilityHint": "Vedlegg vil bli deaktivert når avstemningen er aktiv"
+        },
+        "visibility": {
+          "accessibilityLabel": "Tut-synlighet er {{visibility}}",
+          "title": "Tut-synlighet",
+          "options": {
+            "public": "Offentlig",
+            "unlisted": "Uoppført",
+            "private": "Kun følgere",
+            "direct": "Direktemelding"
+          }
+        },
+        "spoiler": {
+          "accessibilityLabel": "Spoiler"
+        },
+        "emoji": {
+          "accessibilityLabel": "Legg til emoji",
+          "accessibilityHint": "Åpne emoji-valgpanel, sveip horisontalt for å endre side"
+        }
+      },
+      "drafts_one": "Utkast ({{count}})",
+      "drafts_other": "Utkast ({{count}})"
+    },
+    "editAttachment": {
+      "header": {
+        "title": "Rediger vedlegg",
+        "right": {
+          "accessibilityLabel": "Lagre redigering av vedlegg",
+          "failed": {
+            "title": "Redigering mislyktes",
+            "button": "Prøv igjen"
+          }
+        }
+      },
+      "content": {
+        "altText": {
+          "heading": "Beskriv media for synshemmede",
+          "placeholder": "Du kan legge til en beskrivelse, noen ganger kalt alt-tekst, på dine medier slik at de er tilgjengelige for enda flere mennesker, også for dem som er blinde eller svaksynte.\n\nGode beskrivelser er konkret, men presenterer hva som er i dine medier nøyaktig nok til å forstå konteksten."
+        }
+      }
+    },
+    "draftsList": {
+      "header": {
+        "title": "Utkast"
+      },
+      "warning": "Utkast lagres bare lokalt, og kan ved uhell gå tapt. Bruk ikke utkast til langtidslagring.",
+      "content": {
+        "accessibilityHint": "Lagret utkast, trykk for å redigere dette utkastet",
+        "textEmpty": "Innhold er tomt"
+      },
+      "checkAttachment": "Sjekker vedlegg på serveren..."
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/screens/imageViewer.json b/src/i18n/no/screens/imageViewer.json
new file mode 100644
index 00000000..9f249ba5
--- /dev/null
+++ b/src/i18n/no/screens/imageViewer.json
@@ -0,0 +1,16 @@
+{
+  "content": {
+    "actions": {
+      "accessibilityLabel": "Flere handlinger med dette bildet",
+      "accessibilityHint": "Du kan lagre eller dele dette bildet"
+    },
+    "options": {
+      "save": "Lagre bilde",
+      "share": "Del bilde"
+    },
+    "save": {
+      "succeed": "Bilde lagret",
+      "failed": "Lagring av bilde feilet"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/no/screens/tabs.json b/src/i18n/no/screens/tabs.json
new file mode 100644
index 00000000..33c3b3e3
--- /dev/null
+++ b/src/i18n/no/screens/tabs.json
@@ -0,0 +1,475 @@
+{
+  "tabs": {
+    "local": {
+      "name": "Følger",
+      "options": {
+        "showBoosts": "Vis booster",
+        "showReplies": "Vis svar"
+      }
+    },
+    "public": {
+      "segments": {
+        "federated": "Føderert",
+        "local": "Lokal",
+        "trending": "Populært"
+      }
+    },
+    "notifications": {
+      "name": "Varsler"
+    }
+  },
+  "common": {
+    "search": {
+      "accessibilityLabel": "Søk",
+      "accessibilityHint": "Søk etter emneknagger, brukere eller tuter"
+    }
+  },
+  "notifications": {
+    "filters": {
+      "accessibilityLabel": "Filter",
+      "accessibilityHint": "Filtrer viste varslingstyper",
+      "title": "Vis varsler"
+    }
+  },
+  "me": {
+    "stacks": {
+      "bookmarks": {
+        "name": "Bokmerker"
+      },
+      "conversations": {
+        "name": "Direktemeldinger"
+      },
+      "favourites": {
+        "name": "Favoritter"
+      },
+      "followedTags": {
+        "name": "Fulgte emneknagger"
+      },
+      "fontSize": {
+        "name": "Skriftstørrelse for tut"
+      },
+      "language": {
+        "name": "Språk"
+      },
+      "list": {
+        "name": "Liste: {{list}}"
+      },
+      "listAccounts": {
+        "name": "Brukere i listen: {{list}}"
+      },
+      "listAdd": {
+        "name": "Opprett liste"
+      },
+      "listEdit": {
+        "name": "Rediger detaljer"
+      },
+      "lists": {
+        "name": "Lister"
+      },
+      "push": {
+        "name": "Pushvarsling"
+      },
+      "preferences": {
+        "name": "Brukervalg"
+      },
+      "preferencesFilters": {
+        "name": "Alle innholdsfiltre"
+      },
+      "preferencesFilterAdd": {
+        "name": "Opprett Filter"
+      },
+      "preferencesFilterEdit": {
+        "name": "Rediger Filter"
+      },
+      "profile": {
+        "name": "Rediger Profil"
+      },
+      "profileName": {
+        "name": "Rediger visningsnavn"
+      },
+      "profileNote": {
+        "name": "Rediger beskrivelse"
+      },
+      "profileFields": {
+        "name": "Rediger metadata"
+      },
+      "settings": {
+        "name": "Appinnstillinger"
+      },
+      "switch": {
+        "name": "Bytt konto"
+      }
+    },
+    "fontSize": {
+      "demo": "<p>Dette er en demotut😊. Du kan velge flere alternativer nedenfor.<br /><br />Denne innstillingen påvirker bare hovedinnholdet i tuter, men ikke andre skriftstørrelser.</p>",
+      "sizes": {
+        "S": "S",
+        "M": "M - Standard",
+        "L": "L",
+        "XL": "XL",
+        "XXL": "XXL"
+      }
+    },
+    "listAccounts": {
+      "heading": "Administrer brukere",
+      "error": "Slett bruker fra listen",
+      "empty": "Ingen bruker lagt til i denne listen"
+    },
+    "listEdit": {
+      "heading": "Rediger detaljer",
+      "title": "Emne",
+      "repliesPolicy": {
+        "heading": "Vis svar:",
+        "options": {
+          "none": "Ingen",
+          "list": "Medlemmer fra listen",
+          "followed": "Enhver fulgt bruker"
+        }
+      }
+    },
+    "listDelete": {
+      "heading": "Slett liste",
+      "confirm": {
+        "title": "Slett listen \"{{list}}\"?",
+        "message": "Denne handlingen kan ikke gjenopprettes."
+      }
+    },
+    "preferences": {
+      "visibility": {
+        "title": "Standard synlighet for post",
+        "options": {
+          "public": "Offentlig",
+          "unlisted": "Uoppført",
+          "private": "Kun følgere"
+        }
+      },
+      "sensitive": {
+        "title": "Marker alltid media som sensitivt"
+      },
+      "media": {
+        "title": "Visning av media",
+        "options": {
+          "default": "Skjul media som er merket som sensitivt",
+          "show_all": "Vis alltid media",
+          "hide_all": "Skjul alltid media"
+        }
+      },
+      "spoilers": {
+        "title": "Utvid alltid tuter som er merket med innholdsadvarsler"
+      },
+      "autoplay_gifs": {
+        "title": "Autostart GIF i tuter"
+      },
+      "filters": {
+        "title": "Innholdsfiltre",
+        "content": "{{count}} aktive"
+      },
+      "web_only": {
+        "title": "Oppdater innstillinger",
+        "description": "Innstillingene nedenfor kan kun oppdateres ved hjelp av web-grensesnittet"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "Utløpt",
+      "keywords_one": "{{count}} nøkkelord",
+      "keywords_other": "{{count}} nøkkelord",
+      "statuses_one": "{{count}} tut",
+      "statuses_other": "{{count}} tut",
+      "context": "Gjelder i <0 />",
+      "contexts": {
+        "home": "følgende og lister",
+        "notifications": "varsler",
+        "public": "føderert",
+        "thread": "samtale",
+        "account": "profil"
+      }
+    },
+    "preferencesFilter": {
+      "name": "Navn",
+      "expiration": "Utløper",
+      "expirationOptions": {
+        "0": "Aldri",
+        "1800": "Etter 30 minutter",
+        "3600": "Etter 1 time",
+        "43200": "Etter 12 timer",
+        "86400": "Etter 1 dag",
+        "604800": "Etter 1 uke",
+        "18144000": "Etter 1 måned"
+      },
+      "context": "Gjelder i",
+      "contexts": {
+        "home": "Følgende og lister",
+        "notifications": "Varsel",
+        "public": "Føderert tidlinje",
+        "thread": "Samtalevisning",
+        "account": "Profil visning"
+      },
+      "action": "Når samsvarende",
+      "actions": {
+        "warn": "Kollapset, men kan vises",
+        "hide": "Skjult fullstendig"
+      },
+      "keywords": "Treff for disse nøkkelordene",
+      "keyword": "Nøkkelord",
+      "statuses": "Treff disse tutene"
+    },
+    "profile": {
+      "feedback": {
+        "succeed": "{{type}} oppdatert",
+        "failed": "{{type}} oppdatering feilet, prøv igjen"
+      },
+      "root": {
+        "name": {
+          "title": "Visningsnavn"
+        },
+        "avatar": {
+          "title": "Profilbilde",
+          "description": "Vil bli nedskalert til 400 x 400 px"
+        },
+        "header": {
+          "title": "Fane",
+          "description": "Vil bli nedskalert til 1500x500px"
+        },
+        "note": {
+          "title": "Beskrivelse"
+        },
+        "fields": {
+          "title": "Metadata",
+          "total_one": "{{count}} felt",
+          "total_other": "{{count}} felt"
+        },
+        "lock": {
+          "title": "Lås konto",
+          "description": "Krever at du godkjenner følgere manuelt"
+        },
+        "bot": {
+          "title": "Bot konto",
+          "description": "Denne kontoen utfører i hovedsak automatiserte handlinger og blir kanskje ikke holdt øye med"
+        }
+      },
+      "fields": {
+        "group": "Gruppe {{index}}",
+        "label": "Etikett",
+        "content": "Innhold"
+      },
+      "mediaSelectionFailed": "Bildebehandling mislyktes. Vennligst prøv igjen."
+    },
+    "push": {
+      "notAvailable": "Din telefon støtter ikke tooot's push-varsling",
+      "enable": {
+        "direct": "Aktiver push-varsler",
+        "settings": "Aktiver i innstillinger"
+      },
+      "missingServerKey": {
+        "message": "Feil på tjener for push-tjeneste",
+        "description": "Vennligst kontakt din serveradministrator for å konfigurere push-støtte"
+      },
+      "global": {
+        "heading": "Aktiver for {{acct}}",
+        "description": "Meldinger blir sendt gjennom toot's server"
+      },
+      "decode": {
+        "heading": "Meldingsdetaljer",
+        "description": "Meldinger sendt gjennom toots server er kryptert, men du kan velge å dekode meldingen på serveren. Vår server er åpen kildekode og har ingen logging."
+      },
+      "default": {
+        "heading": "Standard"
+      },
+      "follow": {
+        "heading": "Ny følger"
+      },
+      "follow_request": {
+        "heading": "Følgerforespørsel"
+      },
+      "favourite": {
+        "heading": "Favorisert"
+      },
+      "reblog": {
+        "heading": "Boostet"
+      },
+      "mention": {
+        "heading": "Nevnte deg"
+      },
+      "poll": {
+        "heading": "Oppdateringer om avstemning"
+      },
+      "status": {
+        "heading": "Tut fra påmeldte brukere"
+      },
+      "update": {
+        "heading": "%s er redigert"
+      },
+      "admin.sign_up": {
+        "heading": "Administrer: registrer deg"
+      },
+      "admin.report": {
+        "heading": "Administrer: rapporter"
+      },
+      "howitworks": "Lær hvordan ruting virker"
+    },
+    "root": {
+      "announcements": {
+        "content": {
+          "unread": "{{amount}} ulest",
+          "read": "Alt lest",
+          "empty": "Ingen"
+        }
+      },
+      "push": {
+        "content_true": "Aktivert",
+        "content_false": "Deaktivert"
+      },
+      "logout": {
+        "button": "Logg ut",
+        "alert": {
+          "title": "Logge ut?",
+          "message": "Etter å ha logget ut, må du logge på igjen",
+          "buttons": {
+            "logout": "Logg ut"
+          }
+        }
+      }
+    },
+    "settings": {
+      "theme": {
+        "heading": "Utseende",
+        "options": {
+          "auto": "Som system",
+          "light": "Lyst tema",
+          "dark": "Mørkt tema"
+        }
+      },
+      "darkTheme": {
+        "heading": "Mørkt tema",
+        "options": {
+          "lighter": "Standard",
+          "darker": "Helt svart"
+        }
+      },
+      "browser": {
+        "heading": "Åpning av lenke",
+        "options": {
+          "internal": "I appen",
+          "external": "Bruk nettleser"
+        }
+      },
+      "autoplayGifv": {
+        "heading": "Autostart GIF i tuter"
+      },
+      "feedback": {
+        "heading": "Funksjonsforespørsler"
+      },
+      "support": {
+        "heading": "Støtt tooot"
+      },
+      "contact": {
+        "heading": "Kontakt tooot"
+      },
+      "version": "Versjon v{{version}}",
+      "instanceVersion": "Mastodon versjon v{{version}}"
+    },
+    "switch": {
+      "existing": "Velg fra innlogget",
+      "new": "Logg inn på instans"
+    }
+  },
+  "shared": {
+    "account": {
+      "actions": {
+        "accessibilityLabel": "Handlinger for bruker {{user}}",
+        "accessibilityHint": "Du kan dempe, blokkere, rapportere eller dele denne brukeren"
+      },
+      "followed_by": " følger deg",
+      "moved": "Bruker flyttet",
+      "created_at": "Ble med: {{date}}",
+      "summary": {
+        "statuses_count": "{{count}} tut"
+      },
+      "toots": {
+        "default": "Tuter",
+        "all": "Tuter og svar"
+      },
+      "suspended": "Konto suspendert av moderatorene på serveren din"
+    },
+    "accountInLists": {
+      "name": "Lister av @{{username}}",
+      "inLists": "I liste",
+      "notInLists": "Andre lister"
+    },
+    "attachments": {
+      "name": "<0 /><1>'s media</1>"
+    },
+    "filter": {
+      "name": "Legg til filter",
+      "existed": "Finnes i disse filtrene"
+    },
+    "history": {
+      "name": "Rediger historikk"
+    },
+    "report": {
+      "name": "Rapporter {{acct}}",
+      "report": "Rapporter",
+      "forward": {
+        "heading": "Anonymt videresendt til ekstern server {{instance}}"
+      },
+      "reasons": {
+        "heading": "Hva skjer med denne kontoen?",
+        "spam": "Det er søppelpost",
+        "other": "Det er noe annet",
+        "violation": "Det bryter serverregler"
+      },
+      "comment": {
+        "heading": "Noe annet du vil legge til?"
+      },
+      "violatedRules": {
+        "heading": "Det bryter serverregler"
+      }
+    },
+    "search": {
+      "header": {
+        "prefix": "Søker",
+        "placeholder": "etter..."
+      },
+      "empty": {
+        "general": "Angi nøkkelord for å søke etter <bold>$t(screenTabs:shared.search.sections.accounts)</bold>、<bold>$t(screenTabs:shared.search.sections.hashtags)</bold> eller <bold>$t(screenTabs:shared.search.sections.statuses)</bold>",
+        "advanced": {
+          "header": "Avansert søk",
+          "example": {
+            "account": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)",
+            "hashtag": "$t(shared.search.header.prefix) $t(shared.search.sections.hashtags)",
+            "statusLink": "$t(shared.search.header.prefix) $t(shared.search.sections.statuses)",
+            "accountLink": "$t(shared.search.header.prefix) $t(shared.search.sections.accounts)"
+          }
+        },
+        "trending": {
+          "tags": "Populære emner"
+        }
+      },
+      "sections": {
+        "accounts": "Bruker",
+        "hashtags": "Emneknagg",
+        "statuses": "Tut"
+      },
+      "notFound": "Finner ikke <bold>{{searchTerm}}</bold> relatert til {{type}}",
+      "noResult": "Kan ikke finne noe, vennligst prøv et annet begrep"
+    },
+    "toot": {
+      "name": "Diskusjoner",
+      "remoteFetch": {
+        "title": "Inneholder eksternt innhold",
+        "message": "Føderert innhold er ikke alltid tilgjengelig på lokal forekomst. Dette innholdet hentes fra ekstern forekomst og merkes. Du kan samhandle med disse innholdet som vanlig."
+      }
+    },
+    "users": {
+      "accounts": {
+        "following": "Følger {{count}}",
+        "followers": "{{count}} følgere"
+      },
+      "statuses": {
+        "reblogged_by": "{{count}} boostet",
+        "favourited_by": "{{count}} som favoritt"
+      },
+      "resultIncomplete": "Resultater fra en ekstern instans er ufullstendig"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/uk/components/timeline.json b/src/i18n/uk/components/timeline.json
index 8d0eab16..f611d424 100644
--- a/src/i18n/uk/components/timeline.json
+++ b/src/i18n/uk/components/timeline.json
@@ -33,7 +33,7 @@
       "poll": "Опитування, у якому ви голосували, закінчилося",
       "reblog": {
         "default": "{{name}} передмухує",
-        "myself": "",
+        "myself": "Передмухнуто мною",
         "notification": "{{name}} передмухує ваш дмух"
       },
       "update": "Передмух був відредагований",