Small revert to be on the safe side (#7932)

* Revert "fix autocomplete (#7930)"

This reverts commit f06a78017a92de96bb4df0812c5934023440df95.

* Revert "#6861: Use available space to make focus on Composer TextInput easier (copy) (#7836)"

This reverts commit e40656128d2fad41762ec1e7f022bc10fcdd25fc.

1 files changed, 3 insertions, 22 deletions

diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index 20fc1c65d..e0a31c139 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -1,12 +1,5 @@
 import React, {memo, useMemo} from 'react'
-import {
-  Image,
-  Pressable,
-  StyleProp,
-  StyleSheet,
-  View,
-  ViewStyle,
-} from 'react-native'
+import {Image, Pressable, StyleSheet, View} from 'react-native'
 import {Image as RNImage} from 'react-native-image-crop-picker'
 import Svg, {Circle, Path, Rect} from 'react-native-svg'
 import {ModerationUI} from '@atproto/api'
@@ -55,7 +48,6 @@ interface UserAvatarProps extends BaseUserAvatarProps {
   moderation?: ModerationUI
   usePlainRNImage?: boolean
   onLoad?: () => void
-  style?: StyleProp<ViewStyle>
 }
 
 interface EditableUserAvatarProps extends BaseUserAvatarProps {
@@ -189,7 +181,6 @@ let UserAvatar = ({
   moderation,
   usePlainRNImage = false,
   onLoad,
-  style,
 }: UserAvatarProps): React.ReactNode => {
   const pal = usePalette('default')
   const backgroundColor = pal.colors.backgroundLight
@@ -227,19 +218,9 @@ let UserAvatar = ({
     )
   }, [moderation?.alert, size, pal])
 
-  const containerStyle = useMemo(() => {
-    return [
-      {
-        width: size,
-        height: size,
-      },
-      style,
-    ]
-  }, [size, style])
-
   return avatar &&
     !((moderation?.blur && isAndroid) /* android crashes with blur */) ? (
-    <View style={containerStyle}>
+    <View style={{width: size, height: size}}>
       {usePlainRNImage ? (
         <Image
           accessibilityIgnoresInvertColors
@@ -268,7 +249,7 @@ let UserAvatar = ({
       {alert}
     </View>
   ) : (
-    <View style={containerStyle}>
+    <View style={{width: size, height: size}}>
       <DefaultAvatar type={type} shape={finalShape} size={size} />
       {alert}
     </View>