From 18b77d090f9c20dbdc4e81f34d66e2ad4bf62196 Mon Sep 17 00:00:00 2001
From: Dimitri POSTOLOV <en3m@ya.ru>
Date: Thu, 26 May 2022 12:49:09 +0200
Subject: [PATCH] fix hive logo click, should redirect to current org (#107)

Co-authored-by: Kamil Kisiela <kamil.kisiela@gmail.com>
---
 packages/web/app/src/components/v2/hive-link.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/web/app/src/components/v2/hive-link.tsx b/packages/web/app/src/components/v2/hive-link.tsx
index 1ea71f8b7..0aaaef15a 100644
--- a/packages/web/app/src/components/v2/hive-link.tsx
+++ b/packages/web/app/src/components/v2/hive-link.tsx
@@ -3,10 +3,20 @@ import NextLink from 'next/link';
 import clsx from 'clsx';
 
 import { HiveLogo } from '@/components/v2/icon';
+import { useRouteSelector } from '@/lib/hooks/use-route-selector';
 
 export const HiveLink = ({ className }: { className?: string }): ReactElement => {
+  const router = useRouteSelector();
+  const orgId = router.organizationId;
+
   return (
-    <NextLink href="/" passHref>
+    <NextLink
+      href={
+        // orgId can be undefined on /404 route
+        orgId ? `/${orgId}` : '/'
+      }
+      passHref
+    >
       <a className={clsx('inline-flex items-center focus:ring', className)}>
         <HiveLogo />
         <div className="ml-2.5">