From bbfcfa19293c45a99a44feb1931ce749c6b6fae0 Mon Sep 17 00:00:00 2001
From: Chamath Sandaru <sandaruchamath@gmail.com>
Date: Fri, 7 May 2021 04:21:15 +0530
Subject: [PATCH 1/3] Fix the routing issue in integration admin menu

---
 client/views/admin/integrations/IntegrationsPage.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/client/views/admin/integrations/IntegrationsPage.js b/client/views/admin/integrations/IntegrationsPage.js
index 907590d92c9b8..9e7cc1b100cd7 100644
--- a/client/views/admin/integrations/IntegrationsPage.js
+++ b/client/views/admin/integrations/IntegrationsPage.js
@@ -18,12 +18,6 @@ function IntegrationsPage() {
 	}, [router]);
 
 	const context = useRouteParameter('context');
-	useEffect(() => {
-		if (!context) {
-			router.push({ context: 'webhook-incoming' });
-		}
-	}, [context, router]);
-
 	const showTable = !['zapier', 'bots'].includes(context);
 
 	const goToIncoming = useCallback(() => router.push({ context: 'webhook-incoming' }), [router]);

From e73ca059fdf11623ca3bdef3c1b3b441a48c71c9 Mon Sep 17 00:00:00 2001
From: Chamath Sandaru <sandaruchamath@gmail.com>
Date: Fri, 7 May 2021 04:28:41 +0530
Subject: [PATCH 2/3] Remove unused imports

---
 client/views/admin/integrations/IntegrationsPage.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/views/admin/integrations/IntegrationsPage.js b/client/views/admin/integrations/IntegrationsPage.js
index 9e7cc1b100cd7..22d4e366e0372 100644
--- a/client/views/admin/integrations/IntegrationsPage.js
+++ b/client/views/admin/integrations/IntegrationsPage.js
@@ -1,5 +1,5 @@
 import { Button, ButtonGroup, Icon, Tabs } from '@rocket.chat/fuselage';
-import React, { useEffect, useCallback } from 'react';
+import React, { useCallback } from 'react';
 
 import Page from '../../../components/Page';
 import { useRoute, useRouteParameter } from '../../../contexts/RouterContext';
@@ -18,6 +18,7 @@ function IntegrationsPage() {
 	}, [router]);
 
 	const context = useRouteParameter('context');
+
 	const showTable = !['zapier', 'bots'].includes(context);
 
 	const goToIncoming = useCallback(() => router.push({ context: 'webhook-incoming' }), [router]);

From ba8468671c361a358fd3edcba76752d3cd7b5d0c Mon Sep 17 00:00:00 2001
From: dougfabris <deefabris@gmail.com>
Date: Thu, 27 May 2021 10:10:56 -0300
Subject: [PATCH 3/3] fix: missing default tab selected when context is empty

---
 client/views/admin/integrations/IntegrationsPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/views/admin/integrations/IntegrationsPage.js b/client/views/admin/integrations/IntegrationsPage.js
index 22d4e366e0372..e84ab9f60bad4 100644
--- a/client/views/admin/integrations/IntegrationsPage.js
+++ b/client/views/admin/integrations/IntegrationsPage.js
@@ -36,7 +36,7 @@ function IntegrationsPage() {
 				</ButtonGroup>
 			</Page.Header>
 			<Tabs>
-				<Tabs.Item selected={context === 'webhook-incoming'} onClick={goToIncoming}>
+				<Tabs.Item selected={!context || context === 'webhook-incoming'} onClick={goToIncoming}>
 					{t('Incoming')}
 				</Tabs.Item>
 				<Tabs.Item selected={context === 'webhook-outgoing'} onClick={goToOutgoing}>