diff --git a/src/view/com/post-thread/PostThread.tsx b/src/view/com/post-thread/PostThread.tsx index a1e25a6a..6e387b8d 100644 --- a/src/view/com/post-thread/PostThread.tsx +++ b/src/view/com/post-thread/PostThread.tsx @@ -130,10 +130,16 @@ export const PostThread = observer(function PostThread({ // loading // = - if ((view.isLoading && !view.isRefreshing) || view.params.uri !== uri) { + if ( + !view.hasLoaded || + (view.isLoading && !view.isRefreshing) || + view.params.uri !== uri + ) { return ( - + + + ) } diff --git a/src/view/com/util/error/ErrorScreen.tsx b/src/view/com/util/error/ErrorScreen.tsx index c66ee790..dee62596 100644 --- a/src/view/com/util/error/ErrorScreen.tsx +++ b/src/view/com/util/error/ErrorScreen.tsx @@ -1,13 +1,13 @@ import React from 'react' -import {StyleSheet, TouchableOpacity, View} from 'react-native' +import {StyleSheet, View} from 'react-native' import { FontAwesomeIcon, FontAwesomeIconStyle, } from '@fortawesome/react-native-fontawesome' import {Text} from '../text/Text' -import {colors} from 'lib/styles' import {useTheme} from 'lib/ThemeContext' import {usePalette} from 'lib/hooks/usePalette' +import {Button} from '../forms/Button' import {CenteredView} from '../Views' export function ErrorScreen({ @@ -24,18 +24,18 @@ export function ErrorScreen({ testID?: string }) { const theme = useTheme() - const pal = usePalette('error') + const pal = usePalette('default') return ( @@ -43,34 +43,30 @@ export function ErrorScreen({ {title} - {message} + {message} {details && ( + style={[styles.details, pal.text, pal.viewLight]}> {details} )} {onPressTryAgain && ( - - + Try again - + )} @@ -115,11 +111,10 @@ const styles = StyleSheet.create({ marginBottom: 10, }, errorIcon: { - borderRadius: 30, + borderRadius: 25, width: 50, height: 50, alignItems: 'center', justifyContent: 'center', - marginRight: 5, }, }) diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx index cd6c72ff..4e4e3040 100644 --- a/src/view/screens/Profile.tsx +++ b/src/view/screens/Profile.tsx @@ -145,8 +145,7 @@ export const ProfileScreen = withAuthRequired( ) : uiState.profile.hasLoaded ? (