From c94f23a710151497bdcf9c23951d8d0d0e7fb6c7 Mon Sep 17 00:00:00 2001
From: palash-signoz <palash@signoz.io>
Date: Wed, 4 May 2022 23:19:49 +0530
Subject: [PATCH] chore: reset password is updated for the user id not the
 logged in user id (#1082)

---
 .../OrganizationSettings/EditMembersDetails/index.tsx     | 8 +++-----
 .../src/container/OrganizationSettings/Members/index.tsx  | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx b/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx
index efe4689217..9b3dfcfde2 100644
--- a/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx
+++ b/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx
@@ -4,10 +4,7 @@ import getResetPasswordToken from 'api/user/getResetPasswordToken';
 import ROUTES from 'constants/routes';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { useCopyToClipboard } from 'react-use';
-import { AppState } from 'store/reducers';
-import AppReducer from 'types/reducer/app';
 import { ROLES } from 'types/roles';
 
 import { InputGroup, SelectDrawer, Title } from './styles';
@@ -21,11 +18,11 @@ function EditMembersDetails({
 	setEmailAddress,
 	setName,
 	setRole,
+	id,
 }: EditMembersDetailsProps): JSX.Element {
 	const [passwordLink, setPasswordLink] = useState<string>('');
 
 	const { t } = useTranslation(['common']);
-	const { user } = useSelector<AppState, AppReducer>((state) => state.app);
 	const [isLoading, setIsLoading] = useState<boolean>(false);
 	const [state, copyToClipboard] = useCopyToClipboard();
 
@@ -62,7 +59,7 @@ function EditMembersDetails({
 		try {
 			setIsLoading(true);
 			const response = await getResetPasswordToken({
-				userId: user?.userId || '',
+				userId: id || '',
 			});
 
 			if (response.statusCode === 200) {
@@ -164,6 +161,7 @@ interface EditMembersDetailsProps {
 	setEmailAddress: React.Dispatch<React.SetStateAction<string>>;
 	setName: React.Dispatch<React.SetStateAction<string>>;
 	setRole: React.Dispatch<React.SetStateAction<ROLES>>;
+	id: string;
 }
 
 export default EditMembersDetails;
diff --git a/frontend/src/container/OrganizationSettings/Members/index.tsx b/frontend/src/container/OrganizationSettings/Members/index.tsx
index 966f876aaf..5951fb038b 100644
--- a/frontend/src/container/OrganizationSettings/Members/index.tsx
+++ b/frontend/src/container/OrganizationSettings/Members/index.tsx
@@ -208,6 +208,7 @@ function UserFunction({
 						setEmailAddress,
 						setName: setUpdatedName,
 						setRole,
+						id,
 					}}
 				/>
 			</Modal>