From 8fd6c075058f73685579e82544689b1e4325f0b5 Mon Sep 17 00:00:00 2001
From: Duong Pham <tanphamhaiduong@gmail.com>
Date: Wed, 19 Aug 2020 11:58:46 +0700
Subject: [PATCH] fix: #2372 sentry error type error when invite member

---
 .../src/core/private-route-wrapper.tsx                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/developer-portal/src/core/private-route-wrapper.tsx b/packages/developer-portal/src/core/private-route-wrapper.tsx
index 0b26928105..6243177dd3 100644
--- a/packages/developer-portal/src/core/private-route-wrapper.tsx
+++ b/packages/developer-portal/src/core/private-route-wrapper.tsx
@@ -31,16 +31,11 @@ export const PrivateRouteWrapper: React.FunctionComponent<PrivateRouteWrapperPro
   const location = useLocation()
   const currentUri = `${location.pathname}${location.search}`
   const isRoot = connectInternalRedirect === '/'
-  const hasReadWelcome = Boolean(getCookieString(COOKIE_DEVELOPER_FIRST_TIME_LOGIN_COMPLETE))
 
   if (!connectSession) {
     return null
   }
 
-  if (!hasReadWelcome && location.pathname === Routes.APPS) {
-    return <Redirect to={Routes.WELCOME} />
-  }
-
   if (
     (connectInternalRedirect && currentUri !== connectInternalRedirect) ||
     (currentUri === connectInternalRedirect && isRoot)
@@ -49,6 +44,11 @@ export const PrivateRouteWrapper: React.FunctionComponent<PrivateRouteWrapperPro
     return <Redirect to={redirectUri} />
   }
 
+  const hasReadWelcome = Boolean(getCookieString(COOKIE_DEVELOPER_FIRST_TIME_LOGIN_COMPLETE))
+  if (!hasReadWelcome && location.pathname === Routes.APPS) {
+    return <Redirect to={Routes.WELCOME} />
+  }
+
   return (
     <AppNavContainer>
       {showMenu && <Menu />}