Merge remote-tracking branch 'upstream/main' into refactor/typescript

# Conflicts:
#	src/common/component/ForwardModal/index.tsx
#	src/common/component/GoogleLoginButton.tsx
#	src/common/component/ManageMembers.tsx
#	src/routes/settingChannel/Overview.tsx
#	src/routes/settingChannel/index.tsx
This commit is contained in:
HD
2022-06-29 17:04:22 +08:00
44 changed files with 207 additions and 292 deletions
+3 -2
View File
@@ -9,6 +9,7 @@ import ReactionPicker from "./ReactionPicker";
import Tooltip from "../Tooltip";
import { useReactMessageMutation } from "../../../app/services/message";
import addEmojiIcon from "../../../assets/icons/add.emoji.svg?url";
import { useAppSelector } from "../../../app/store";
const StyledWrapper = styled.span`
position: relative;
@@ -129,9 +130,9 @@ const ReactionDetails = ({ uids = [], emoji, index }) => {
};
export default function Reaction({ mid, reactions = null }) {
const [reactWithEmoji] = useReactMessageMutation();
const { currUid } = useSelector((store) => {
const { currUid } = useAppSelector((store) => {
return {
currUid: store.authData.uid
currUid: store.authData.user?.uid
};
});
const handleReact = (emoji) => {
@@ -41,7 +41,7 @@ export default function ReactionPicker({ mid, hidePicker }) {
const { reactionData, currUid } = useAppSelector((store) => {
return {
reactionData: store.reactionMessage[mid] || {},
currUid: store.authData.uid
currUid: store.authData.user?.uid
};
});
// useOutsideClick(wrapperRef, hidePicker);
@@ -22,7 +22,7 @@ export default function useMessageOperation({ mid, context, contextId }: Params)
from_uid: store.message[mid]?.from_uid,
content_type: store.message[mid]?.content_type,
properties: store.message[mid]?.properties,
currUid: store.authData.uid
currUid: store.authData.user?.uid
};
});
const { canPin, pins, unpinMessage, isUnpinSuccess } = usePinMessage(