From 6fff99530fa1859c3e11802aecb370cf4af01b79 Mon Sep 17 00:00:00 2001
From: Tejaaswini Narendra
 <67053685+tejaaswini-narendra@users.noreply.github.com>
Date: Thu, 2 Jul 2020 08:40:24 +0530
Subject: [PATCH] Fix: "Manage users" button should close modal on settings
 page (#6)

---
 .../src/pages/organization/InviteUsersFromv2.tsx       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/client/src/pages/organization/InviteUsersFromv2.tsx b/app/client/src/pages/organization/InviteUsersFromv2.tsx
index c6218d8587..c181ebda72 100644
--- a/app/client/src/pages/organization/InviteUsersFromv2.tsx
+++ b/app/client/src/pages/organization/InviteUsersFromv2.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect } from "react";
 import styled from "styled-components";
+import { useLocation } from "react-router-dom";
 import TagListField from "components/editorComponents/form/fields/TagListField";
 import { reduxForm, SubmissionError } from "redux-form";
 import SelectField from "components/editorComponents/form/fields/SelectField";
@@ -124,7 +125,12 @@ const InviteUsersForm = (props: any) => {
     fetchUser,
     fetchAllRoles,
     valid,
+    onCancel,
   } = props;
+
+  const currentPath = useLocation().pathname;
+  const pathRegex = /(?:\/org\/)\w+(?:\/settings)/;
+
   useEffect(() => {
     fetchUser(props.orgId);
     fetchAllRoles(props.orgId);
@@ -184,7 +190,9 @@ const InviteUsersForm = (props: any) => {
         filled
         intent="primary"
         onClick={() => {
-          history.push(`/org/${props.orgId}/settings`);
+          pathRegex.test(currentPath)
+            ? onCancel()
+            : history.push(`/org/${props.orgId}/settings`);
         }}
       />
     </StyledForm>