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

Jump to bottom

Fix: Error boundary renders switch network modal on error #336

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix: Error boundary renders switch network modal on error #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47585c3
fix: remove getDerivedStateFromError due to side effect
gratestas Jan 18, 2023
843b073
fix: remove inner error boundary
gratestas Jan 18, 2023
4eeaab4
refactor: add switch chain modal to chain-change-watcher
gratestas Jan 18, 2023
a6626a3
fix: add conditioal render during drizzle loading
gratestas Jan 18, 2023
b0f45d9
Merge branch 'master' into feat/switch-network-modal
gratestas Jan 18, 2023
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
138 changes: 65 additions & 73 deletions src/bootstrap/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import { ChainIdProvider } from "../hooks/use-chain-id";
import { ArchonInitializer } from "./archon";
import ChainChangeWatcher from "./chain-change-watcher";
import drizzle, { DrizzleProvider, Initializer, useDrizzle } from "./drizzle";
import ErrorBoundary from "../components/error-boundary";
import SwitchChainFallback from "../components/error-fallback/switch-chain";

export default function App() {
const [isMenuClosed, setIsMenuClosed] = useState(true);
Expand All @@ -28,81 +26,75 @@ export default function App() {
<link href="https://fonts.googleapis.com/css?family=Roboto:400,400i,500,500i,700,700i" rel="stylesheet" />
</Helmet>
<DrizzleProvider drizzle={drizzle}>
<Initializer
error={<C404 Web3 />}
loadingContractsAndAccounts={<C404 Web3 />}
loadingWeb3={<StyledSpin tip="Connecting to your Web3 provider." />}
>
<Initializer error={<C404 Web3 />} loadingWeb3={<StyledSpin tip="Connecting to your Web3 provider." />}>
<DrizzleChainIdProvider>
<ChainChangeWatcher>
<ErrorBoundary fallback={SwitchChainFallback}>
<ArchonInitializer>
<BrowserRouter>
<ArchonInitializer>
<BrowserRouter>
<Layout>
<StyledLayoutSider
breakpoint="md"
collapsedWidth="0"
collapsed={isMenuClosed}
onClick={() => setIsMenuClosed((previousState) => !previousState)}
>
<Menu theme="dark">{MenuItems}</Menu>
</StyledLayoutSider>
<Layout>
<StyledLayoutSider
breakpoint="md"
collapsedWidth="0"
collapsed={isMenuClosed}
onClick={() => setIsMenuClosed((previousState) => !previousState)}
>
<Menu theme="dark">{MenuItems}</Menu>
</StyledLayoutSider>
<Layout>
<StyledLayoutHeader>
<Row>
<StyledLogoCol lg={4} md={4} sm={12} xs={0}>
<LogoNavLink to="/">
<Logo />
</LogoNavLink>
</StyledLogoCol>
<Col lg={14} md={12} xs={0} style={{ padding: "0 16px" }}>
<StyledMenu mode="horizontal" theme="dark">
{MenuItems}
</StyledMenu>
</Col>
<StyledTrayCol lg={6} md={8} sm={12} xs={24}>
<StyledTray>
<AccountStatus />
<NotificationSettings settings={settings} />
</StyledTray>
</StyledTrayCol>
</Row>
</StyledLayoutHeader>
<StyledLayoutContent>
<Switch>
<Route exact path="/">
<Home />
</Route>
<Route exact path="/courts">
<Courts />
</Route>
<Route exact path="/cases">
<Cases />
</Route>
<Route exact path="/cases/:ID">
<Case />
</Route>
<Route exact path="/tokens">
<Tokens />
</Route>
<Route exact path="/convert-pnk">
<ConvertPnk />
</Route>
<Route path="*">
<C404 />
</Route>
</Switch>
</StyledLayoutContent>
<Footer />
<StyledClickaway
isMenuClosed={isMenuClosed}
onClick={isMenuClosed ? null : () => setIsMenuClosed(true)}
/>
</Layout>
<StyledLayoutHeader>
<Row>
<StyledLogoCol lg={4} md={4} sm={12} xs={0}>
<LogoNavLink to="/">
<Logo />
</LogoNavLink>
</StyledLogoCol>
<Col lg={14} md={12} xs={0} style={{ padding: "0 16px" }}>
<StyledMenu mode="horizontal" theme="dark">
{MenuItems}
</StyledMenu>
</Col>
<StyledTrayCol lg={6} md={8} sm={12} xs={24}>
<StyledTray>
<AccountStatus />
<NotificationSettings settings={settings} />
</StyledTray>
</StyledTrayCol>
</Row>
</StyledLayoutHeader>
<StyledLayoutContent>
<Switch>
<Route exact path="/">
<Home />
</Route>
<Route exact path="/courts">
<Courts />
</Route>
<Route exact path="/cases">
<Cases />
</Route>
<Route exact path="/cases/:ID">
<Case />
</Route>
<Route exact path="/tokens">
<Tokens />
</Route>
<Route exact path="/convert-pnk">
<ConvertPnk />
</Route>
<Route path="*">
<C404 />
</Route>
</Switch>
</StyledLayoutContent>
<Footer />
<StyledClickaway
isMenuClosed={isMenuClosed}
onClick={isMenuClosed ? null : () => setIsMenuClosed(true)}
/>
</Layout>
</BrowserRouter>
</ArchonInitializer>
</ErrorBoundary>
</Layout>
</BrowserRouter>
</ArchonInitializer>
</ChainChangeWatcher>
</DrizzleChainIdProvider>
</Initializer>
Expand Down
10 changes: 7 additions & 3 deletions src/bootstrap/chain-change-watcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import { useEffect } from "react";
import React, { useEffect } from "react";
import t from "prop-types";
import useChainId from "../hooks/use-chain-id";
import usePrevious from "../hooks/use-previous";
import SwitchChainFallback from "../components/error-fallback/switch-chain";
import { isSupportedChain } from "../api/side-chain";

export default function ChainChangeWatcher({ children }) {
useReloadOnChainChanged();
const chainId = useChainId();
const isSupported = isSupportedChain(chainId);

return children;
useReloadOnChainChanged();
return !isSupported ? <SwitchChainFallback /> : children;
}

ChainChangeWatcher.propTypes = {
Expand Down
2 changes: 2 additions & 0 deletions src/components/account-status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export default function AccountStatus() {
account: drizzleState.accounts[0],
}));

if (account === VIEW_ONLY_ADDRESS) return <></>;

return (
<AccountDetailsPopup
pinakion
Expand Down
3 changes: 0 additions & 3 deletions src/components/error-boundary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ export default class ErrorBoundary extends Component {
this.state = { hasError: false, error: null, errorInfo: null };
}

static getDerivedStateFromError = () => {
return { hasError: true };
};
componentDidCatch(error, errorInfo) {
withScope((scope) => {
Object.keys(errorInfo).forEach((key) => {
Expand Down