summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-03-07 13:36:51 +0100
committerOskar Nyberg <oskar@mullvad.net>2022-03-07 14:33:00 +0100
commitd941c357c13ba950ecb9c4f7bef69d7e13e83648 (patch)
tree206b52ca38f14501fd44c553b354c1a7fe8c48d6
parent2ebec78b6a1aef8be562f4a984dbeaf97a378390 (diff)
downloadmullvadvpn-d941c357c13ba950ecb9c4f7bef69d7e13e83648.tar.xz
mullvadvpn-d941c357c13ba950ecb9c4f7bef69d7e13e83648.zip
Remove settings icon from error boundary
-rw-r--r--gui/src/renderer/components/ErrorBoundary.tsx2
-rw-r--r--gui/src/renderer/components/ErrorView.tsx5
2 files changed, 3 insertions, 4 deletions
diff --git a/gui/src/renderer/components/ErrorBoundary.tsx b/gui/src/renderer/components/ErrorBoundary.tsx
index d9f2bf370e..e3fdfdd6f6 100644
--- a/gui/src/renderer/components/ErrorBoundary.tsx
+++ b/gui/src/renderer/components/ErrorBoundary.tsx
@@ -41,7 +41,7 @@ export default class ErrorBoundary extends React.Component<IProps, IState> {
.split('%(email)s', 2);
reachBackMessage.splice(1, 0, <Email>{supportEmail}</Email>);
- return <ErrorView>{reachBackMessage}</ErrorView>;
+ return <ErrorView settingsUnavailable>{reachBackMessage}</ErrorView>;
} else {
return this.props.children;
}
diff --git a/gui/src/renderer/components/ErrorView.tsx b/gui/src/renderer/components/ErrorView.tsx
index 069e646e50..b233b46ede 100644
--- a/gui/src/renderer/components/ErrorView.tsx
+++ b/gui/src/renderer/components/ErrorView.tsx
@@ -31,15 +31,14 @@ const Subtitle = styled.span({
});
interface ErrorViewProps {
+ settingsUnavailable?: boolean;
children: React.ReactNode | React.ReactNode[];
}
export default function ErrorView(props: ErrorViewProps) {
return (
<Layout>
- <Header>
- <HeaderBarSettingsButton />
- </Header>
+ <Header>{!props.settingsUnavailable && <HeaderBarSettingsButton />}</Header>
<StyledContainer>
<Logo height={106} width={106} source="logo-icon" />
<Title height={18} source="logo-text" />