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

Chia-Network · Sep 4, 2024 · 5dc835f · 5dc835f
1 parent 912d530
commit 5dc835f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/core/src/components/LayoutHero/LayoutHero.tsx b/packages/core/src/components/LayoutHero/LayoutHero.tsx
@@ -29,7 +29,7 @@ const StyledBody = styled(Scrollbar)`
 
 export type LayoutHeroProps = {
   children?: ReactNode;
-  back?: boolean;
+  back?: boolean | string;
   outlet?: boolean;
 };
 
@@ -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>

diff --git a/packages/gui/src/components/app/AppRouter.tsx b/packages/gui/src/components/app/AppRouter.tsx
@@ -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>