Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Tab Screen Error Fallback #1248

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Improve Tab Screen Error Fallback #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dacd2f
default to showing the js stack
msalcala11 Jul 10, 2024
bc2a4a6
add a way to navigate to settings via the home tab fallback screen
msalcala11 Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions src/navigation/tabs/TabScreenErrorFallback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,32 @@ import React, {useState} from 'react';
import {useTranslation} from 'react-i18next';
import {Linking, ScrollView} from 'react-native';
import ErrorBoundary from 'react-native-error-boundary';
import {TouchableOpacity} from 'react-native-gesture-handler';
import {useNavigation} from '@react-navigation/native';
import {NativeStackScreenProps} from '@react-navigation/native-stack';
import styled from 'styled-components/native';
import {
ScreenContainer,
ScreenGutter,
WIDTH,
} from '../../components/styled/Containers';
import styled from 'styled-components/native';
import {H3, Link, Paragraph, TextAlign} from '../../components/styled/Text';
import TabContainer from './TabContainer';
import {ShopScreens, ShopStackParamList} from './shop/ShopStack';
import {BillGroupParamList, BillScreens} from './shop/bill/BillGroup';
import {CardHomeScreenProps} from '../card/screens/CardHome';
import {HeaderContainer, HeaderLeftContainer} from './home/components/Styled';
import {H3, Link, Paragraph, TextAlign} from '../../components/styled/Text';
import WarningSvg from '../../../assets/img/warning.svg';
import Icons from '../wallet/components/WalletIcons';
import {Grey, LightBlack, Slate10} from '../../styles/colors';

interface TabsScreenErrorFallbackOptions {
includeHeader?: boolean;
}
interface TabsScreenErrorFallbackProps {
error?: Error;
stackTrace?: string;
options?: TabsScreenErrorFallbackOptions;
}

const TabScreenContainer = styled(ScreenContainer)`
Expand Down Expand Up @@ -63,10 +72,22 @@ const ErrorMessageContainer = styled.View`
const TabScreenErrorFallback: React.FC<TabsScreenErrorFallbackProps> = ({
error,
stackTrace,
options,
}) => {
const {t} = useTranslation();
const navigation = useNavigation();
return (
<ScreenContainer>
<TabContainer>
{options?.includeHeader ? (
<HeaderContainer>
<HeaderLeftContainer>
<TouchableOpacity
onPress={() => navigation.navigate('SettingsHome')}>
<Icons.HomeSettings />
</TouchableOpacity>
</HeaderLeftContainer>
</HeaderContainer>
) : null}
<ScrollView contentContainerStyle={{flex: 1}}>
<TabScreenContainer>
<TabScreenErrorBody>
Expand All @@ -80,22 +101,22 @@ const TabScreenErrorFallback: React.FC<TabsScreenErrorFallbackProps> = ({
Linking.openURL('https://bitpay.com/request-help/wizard')
}>
{t('contact BitPay Support')}
</Link>{' '}
and provide the error message below.
</Link>
, and provide the error message below.
</Paragraph>
</TextAlign>
<ErrorBox>
<ErrorMessageContainer>
<Paragraph>{error?.message || ''}</Paragraph>
</ErrorMessageContainer>
<StackTraceContainer>
<StackTrace>{stackTrace || ''}</StackTrace>
<StackTrace>{error?.stack || stackTrace || ''}</StackTrace>
</StackTraceContainer>
</ErrorBox>
</TabScreenErrorBody>
</TabScreenContainer>
</ScrollView>
</ScreenContainer>
</TabContainer>
);
};

Expand All @@ -106,12 +127,17 @@ type TabScreenProps =

export const withErrorFallback = <T extends TabScreenProps>(
TabScreen: React.FC<T>,
options: TabsScreenErrorFallbackOptions = {},
) => {
return function TabScreenWithFallback(props: T) {
const [error, setError] = useState<Error>();
const [stackTrace, setStackTrace] = useState<string>();
const fallbackComponent = () => (
<TabScreenErrorFallback error={error} stackTrace={stackTrace} />
<TabScreenErrorFallback
error={error}
stackTrace={stackTrace}
options={options}
/>
);
return (
<ErrorBoundary
Expand Down
2 changes: 1 addition & 1 deletion src/navigation/tabs/home/HomeRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,4 +318,4 @@ const HomeRoot = () => {
);
};

export default withErrorFallback(HomeRoot);
export default withErrorFallback(HomeRoot, {includeHeader: true});