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.

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

fix: yeet redundant error boundaries #1776

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions apps/extension/src/ui/apps/popup/Layout/PopupLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
import { useLocation } from "react-router-dom"

import { ScrollContainer } from "@talisman/components/ScrollContainer"
import { TalismanErrorBoundary } from "@talisman/components/TalismanErrorBoundary"
import { HandMonoLogo } from "@talisman/theme/logos"
import { api } from "@ui/api"

Expand Down Expand Up @@ -89,7 +88,7 @@ export const PopupLayout: FC<ContainerProps> = ({ className, children, ...props
{...props}
className={classNames("relative flex h-full w-full flex-col overflow-hidden", className)}
>
<TalismanErrorBoundary>{children}</TalismanErrorBoundary>
{children}
</main>
)
}
17 changes: 7 additions & 10 deletions apps/extension/src/ui/apps/popup/pages/Portfolio/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Route, Routes, useLocation } from "react-router-dom"

import { ScrollContainer } from "@talisman/components/ScrollContainer"
import { SuspenseTracker } from "@talisman/components/SuspenseTracker"
import { TalismanErrorBoundary } from "@talisman/components/TalismanErrorBoundary"
import { PortfolioContainer } from "@ui/domains/Portfolio/PortfolioContainer"
import BraveWarningPopupBanner from "@ui/domains/Settings/BraveWarning/BraveWarningPopupBanner"
import MigratePasswordAlert from "@ui/domains/Settings/MigratePasswordAlert"
Expand Down Expand Up @@ -51,15 +50,13 @@ const Content: FC<PropsWithChildren> = ({ children }) => {
export const Portfolio = () => (
<PortfolioContainer renderWhileLoading>
<div id="main" className="relative size-full overflow-hidden">
<TalismanErrorBoundary>
<Content>
<div className="flex size-full flex-col gap-4 py-8">
<PortfolioRoutes />
<BottomNav />
</div>
</Content>
<NavigationDrawer />
</TalismanErrorBoundary>
<Content>
<div className="flex size-full flex-col gap-4 py-8">
<PortfolioRoutes />
<BottomNav />
</div>
</Content>
<NavigationDrawer />
</div>
</PortfolioContainer>
)
Loading