ColdBreeze/ColdBreeze-chat-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove contact redirect

Browse Source
This commit is contained in:
zerosoul
2022-06-05 12:59:43 +08:00
parent 5c6aed7165
commit 334175b21c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/hook/useContactOperation.js
+4 -4
View File
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
// import { ContentTypes } from "../../../app/config"; // import { ContentTypes } from "../../../app/config";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { useNavigate } from "react-router-dom"; import { useNavigate, useMatch } from "react-router-dom";
import { hideAll } from "tippy.js"; import { hideAll } from "tippy.js";
import { useRemoveMembersMutation } from "../../app/services/channel"; import { useRemoveMembersMutation } from "../../app/services/channel";
import { useLazyDeleteContactQuery } from "../../app/services/contact"; import { useLazyDeleteContactQuery } from "../../app/services/contact";
@@ -10,7 +10,7 @@ import useCopy from "./useCopy";
export default function useContactOperation({ uid, cid }) { export default function useContactOperation({ uid, cid }) {
const [passedUid, setPassedUid] = useState(undefined); const [passedUid, setPassedUid] = useState(undefined);
const isUserDetailPath = useMatch(`/contacts/${uid}`);
const [ const [
removeUser, removeUser,
{ isSuccess: removeUserSuccess }, { isSuccess: removeUserSuccess },
@@ -36,11 +36,11 @@ export default function useContactOperation({ uid, cid }) {
useEffect(() => { useEffect(() => {
if (removeSuccess || removeUserSuccess) { if (removeSuccess || removeUserSuccess) {
toast.success("Remove Successfully"); toast.success("Remove Successfully");
if (removeUserSuccess) { if (removeUserSuccess && isUserDetailPath) {
navigateTo(`/contacts`); navigateTo(`/contacts`);
} }
} }
}, [removeSuccess, removeUserSuccess]); }, [removeSuccess, removeUserSuccess, isUserDetailPath]);
const handleRemoveFromChannel = (id) => { const handleRemoveFromChannel = (id) => {
const isNumber = !Number.isNaN(+id); const isNumber = !Number.isNaN(+id);
const finalId = isNumber ? id || passedUid : passedUid; const finalId = isNumber ? id || passedUid : passedUid;