6 files changed, 15 insertions, 15 deletions
diff --git a/src/view/com/composer/photos/SelectedPhotos.tsx b/src/view/com/composer/photos/SelectedPhotos.tsx
index c2a00ce53..d22f5d8c4 100644
--- a/src/view/com/composer/photos/SelectedPhotos.tsx
+++ b/src/view/com/composer/photos/SelectedPhotos.tsx
@@ -1,7 +1,7 @@
 import React, {useCallback} from 'react'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
-import Image from 'view/com/util/images/Image'
+import {Image} from 'expo-image'
 import {colors} from 'lib/styles'
 
 export const SelectedPhotos = ({
diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx
index 56d7e370a..d54b41506 100644
--- a/src/view/com/util/UserBanner.tsx
+++ b/src/view/com/util/UserBanner.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import {StyleSheet, View} from 'react-native'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {IconProp} from '@fortawesome/fontawesome-svg-core'
-import Image from 'view/com/util/images/Image'
+import {Image} from 'expo-image'
 import {colors} from 'lib/styles'
 import {
   openCamera,
diff --git a/src/view/com/util/images/AutoSizedImage.tsx b/src/view/com/util/images/AutoSizedImage.tsx
index ddb09ce39..17e3e809b 100644
--- a/src/view/com/util/images/AutoSizedImage.tsx
+++ b/src/view/com/util/images/AutoSizedImage.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import {
-  Image,
   StyleProp,
   StyleSheet,
   TouchableOpacity,
   View,
   ViewStyle,
 } from 'react-native'
+import {Image} from 'expo-image'
 import {clamp} from 'lib/numbers'
 import {useStores} from 'state/index'
 import {Dim} from 'lib/media/manip'
@@ -59,7 +59,7 @@ export function AutoSizedImage({
         onPressIn={onPressIn}
         delayPressIn={DELAY_PRESS_IN}
         style={[styles.container, style]}>
-        <Image style={[styles.image, {aspectRatio}]} source={{uri}} />
+        <Image style={[styles.image, {aspectRatio}]} source={uri} />
         {children}
       </TouchableOpacity>
     )
diff --git a/src/view/com/util/images/Image.tsx b/src/view/com/util/images/Image.tsx
index 8c95a581e..e3d0d7fcc 100644
--- a/src/view/com/util/images/Image.tsx
+++ b/src/view/com/util/images/Image.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
-import FastImage, {FastImageProps, Source} from 'react-native-fast-image'
-export default FastImage
-export type {OnLoadEvent, ImageStyle, Source} from 'react-native-fast-image'
+import {Image, ImageProps, ImageSource} from 'expo-image'
 
-export function HighPriorityImage({source, ...props}: FastImageProps) {
+interface HighPriorityImageProps extends ImageProps {
+  source: ImageSource
+}
+export function HighPriorityImage({source, ...props}: HighPriorityImageProps) {
   const updatedSource = {
     uri: typeof source === 'object' && source ? source.uri : '',
-    priority: FastImage.priority.high,
-  } as Source
-  return <FastImage source={updatedSource} {...props} />
+  } satisfies ImageSource
+  return <Image source={updatedSource} {...props} />
 }
diff --git a/src/view/com/util/images/ImageHorzList.tsx b/src/view/com/util/images/ImageHorzList.tsx
index bed13406c..40f1948d6 100644
--- a/src/view/com/util/images/ImageHorzList.tsx
+++ b/src/view/com/util/images/ImageHorzList.tsx
@@ -6,7 +6,7 @@ import {
   View,
   ViewStyle,
 } from 'react-native'
-import Image from 'view/com/util/images/Image'
+import {Image} from 'expo-image'
 
 export function ImageHorzList({
   uris,
diff --git a/src/view/com/util/images/ImageLayoutGrid.tsx b/src/view/com/util/images/ImageLayoutGrid.tsx
index a1c732649..83d98eec5 100644
--- a/src/view/com/util/images/ImageLayoutGrid.tsx
+++ b/src/view/com/util/images/ImageLayoutGrid.tsx
@@ -7,7 +7,7 @@ import {
   View,
   ViewStyle,
 } from 'react-native'
-import Image, {ImageStyle} from 'view/com/util/images/Image'
+import {Image, ImageStyle} from 'expo-image'
 
 export const DELAY_PRESS_IN = 500
 
@@ -73,7 +73,7 @@ function ImageLayoutGridInner({
   onPressIn?: (index: number) => void
   containerInfo: Dim
 }) {
-  const size1 = React.useMemo<StyleProp<ImageStyle>>(() => {
+  const size1 = React.useMemo<ImageStyle>(() => {
     if (type === 'three') {
       const size = (containerInfo.width - 10) / 3
       return {width: size, height: size, resizeMode: 'cover', borderRadius: 4}
@@ -82,7 +82,7 @@ function ImageLayoutGridInner({
       return {width: size, height: size, resizeMode: 'cover', borderRadius: 4}
     }
   }, [type, containerInfo])
-  const size2 = React.useMemo<StyleProp<ImageStyle>>(() => {
+  const size2 = React.useMemo<ImageStyle>(() => {
     if (type === 'three') {
       const size = ((containerInfo.width - 10) / 3) * 2 + 5
       return {width: size, height: size, resizeMode: 'cover', borderRadius: 4}