Merge branch 'main' into nicer-error-hnadling

diff --cc package.json
Simple merge

diff --cc src/shared/components/app/navbar.tsx
index d92ec259443f144987968190c81e3d56514a030f,f9497c7b09c2d6dc1ad216c9912483132cf6cc10..d508c4abae7db2d9085a9eb2332aa9084b8f4aea
--- 1/src/shared/components/app/navbar.tsx
--- 2/src/shared/components/app/navbar.tsx
+++ b/src/shared/components/app/navbar.tsx
@@@ -612,4 -574,4 +612,4 @@@ export class Navbar extends Component<N
        });
      }
    }
--}
++}

diff --cc yarn.lock
Simple merge