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

Fixed an issue where back button on new wallet page causes GUI to stall #2471

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Fixed an issue where back button on new wallet page causes GUI to stall #2471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/core/src/components/LayoutHero/LayoutHero.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const StyledBody = styled(Scrollbar)`

export type LayoutHeroProps = {
children?: ReactNode;
back?: boolean;
back?: boolean | string;
outlet?: boolean;
};

Expand All @@ -43,7 +43,7 @@ export default function LayoutHero(props: LayoutHeroProps) {
{back && (
<Box sx={{ position: 'fixed', top: 0 }}>
<Toolbar>
<Link to="-1">
<Link to={back === true ? '-1' : back}>
<ArrowBackIosIcon fontSize="large" color="secondary" />
</Link>
</Toolbar>
Expand Down
2 changes: 1 addition & 1 deletion packages/gui/src/components/app/AppRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function AppRouter() {
<Route element={<LayoutHero outlet />}>
<Route index element={<SelectKey />} />
</Route>
<Route element={<LayoutHero back outlet />}>
<Route element={<LayoutHero back="/" outlet />}>
<Route path="wallet/add" element={<WalletAdd />} />
<Route path="wallet/import" element={<WalletImport />} />
</Route>
Expand Down