Merge branch 'master' into implement-apex-starkkey-recovery

l2beat · Jul 10, 2023 · c991471 · c991471
2 parents 266a30d + 4be7524
commit c991471
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,8 +5,7 @@
 	"name": "Node.js & PostgreSQL",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "app",
-	"workspaceFolder": "/workspace",
-
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
 	// Configure tool-specific properties.
 	"customizations": {

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -12,7 +12,7 @@ services:
         VARIANT: 16-bullseye
 
     volumes:
-      - ..:/workspace:cached
+      - ../..:/workspaces:cached
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity

diff --git a/packages/frontend/src/view/pages/ErrorPage.tsx b/packages/frontend/src/view/pages/ErrorPage.tsx
@@ -46,12 +46,7 @@ function ErrorPage(props: ErrorPageProps) {
   const errorMessage = getErrorMessages(props)
 
   return (
-    <Page
-      path="/"
-      description="Not found page"
-      context={props.context}
-      withoutSearch
-    >
+    <Page path="/" description="Not found page" context={props.context}>
       <ContentWrapper className="flex flex-1 flex-col items-center justify-center">
         <span className="text-[80px] font-extrabold  leading-tight text-brand md:text-[160px]">
           {props.statusCode}