fix: Wrong user photo when opening the action sheet to start a call (#5033)
* fix wrong video conf user photo * move hook outside
This commit is contained in:
parent
61fe9dbb1e
commit
7abd52a6e3
|
@ -6,33 +6,55 @@ import i18n from '../../../../i18n';
|
||||||
import { getSubscriptionByRoomId } from '../../../../lib/database/services/Subscription';
|
import { getSubscriptionByRoomId } from '../../../../lib/database/services/Subscription';
|
||||||
import { useAppSelector } from '../../../../lib/hooks';
|
import { useAppSelector } from '../../../../lib/hooks';
|
||||||
import { getRoomAvatar, getUidDirectMessage } from '../../../../lib/methods/helpers';
|
import { getRoomAvatar, getUidDirectMessage } from '../../../../lib/methods/helpers';
|
||||||
|
import { Services } from '../../../../lib/services';
|
||||||
import { useTheme } from '../../../../theme';
|
import { useTheme } from '../../../../theme';
|
||||||
import { useActionSheet } from '../../../ActionSheet';
|
import { useActionSheet } from '../../../ActionSheet';
|
||||||
import AvatarContainer from '../../../Avatar';
|
import AvatarContainer from '../../../Avatar';
|
||||||
import Button from '../../../Button';
|
import Button from '../../../Button';
|
||||||
import { CustomIcon } from '../../../CustomIcon';
|
import { CustomIcon } from '../../../CustomIcon';
|
||||||
import { BUTTON_HIT_SLOP } from '../../../message/utils';
|
|
||||||
import StatusContainer from '../../../Status';
|
import StatusContainer from '../../../Status';
|
||||||
|
import { BUTTON_HIT_SLOP } from '../../../message/utils';
|
||||||
import useStyle from './styles';
|
import useStyle from './styles';
|
||||||
|
|
||||||
|
const useUserData = (rid: string) => {
|
||||||
|
const [user, setUser] = useState({ username: '', avatar: '', uid: '', type: '' });
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
const room = await getSubscriptionByRoomId(rid);
|
||||||
|
if (room) {
|
||||||
|
const uid = (await getUidDirectMessage(room)) as string;
|
||||||
|
const avt = getRoomAvatar(room);
|
||||||
|
setUser({ uid, username: room?.name || '', avatar: avt, type: room?.t || '' });
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
const result = await Services.getUserInfo(rid);
|
||||||
|
if (result.success) {
|
||||||
|
setUser({
|
||||||
|
username: result.user.name || result.user.username,
|
||||||
|
avatar: result.user.username,
|
||||||
|
uid: result.user._id,
|
||||||
|
type: 'd'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
//
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return user;
|
||||||
|
};
|
||||||
|
|
||||||
export default function StartACallActionSheet({ rid, initCall }: { rid: string; initCall: Function }): React.ReactElement {
|
export default function StartACallActionSheet({ rid, initCall }: { rid: string; initCall: Function }): React.ReactElement {
|
||||||
const style = useStyle();
|
const style = useStyle();
|
||||||
const { colors } = useTheme();
|
const { colors } = useTheme();
|
||||||
const [user, setUser] = useState({ username: '', avatar: '', uid: '' });
|
|
||||||
const [mic, setMic] = useState(true);
|
const [mic, setMic] = useState(true);
|
||||||
const [cam, setCam] = useState(false);
|
const [cam, setCam] = useState(false);
|
||||||
const username = useAppSelector(state => state.login.user.username);
|
const username = useAppSelector(state => state.login.user.username);
|
||||||
|
|
||||||
const { hideActionSheet } = useActionSheet();
|
const { hideActionSheet } = useActionSheet();
|
||||||
|
const user = useUserData(rid);
|
||||||
useEffect(() => {
|
|
||||||
(async () => {
|
|
||||||
const room = await getSubscriptionByRoomId(rid);
|
|
||||||
const uid = (await getUidDirectMessage(room)) as string;
|
|
||||||
const avt = getRoomAvatar(room);
|
|
||||||
setUser({ uid, username: room?.name || '', avatar: avt });
|
|
||||||
})();
|
|
||||||
}, [rid]);
|
|
||||||
|
|
||||||
const handleColor = (enabled: boolean) => (enabled ? colors.conferenceCallEnabledIcon : colors.conferenceCallDisabledIcon);
|
const handleColor = (enabled: boolean) => (enabled ? colors.conferenceCallEnabledIcon : colors.conferenceCallDisabledIcon);
|
||||||
|
|
||||||
|
@ -58,7 +80,7 @@ export default function StartACallActionSheet({ rid, initCall }: { rid: string;
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
<View style={style.actionSheetUsernameContainer}>
|
<View style={style.actionSheetUsernameContainer}>
|
||||||
<AvatarContainer text={user.avatar} size={36} />
|
<AvatarContainer text={user.avatar} size={36} rid={rid} type={user.type} />
|
||||||
<StatusContainer size={16} id={user.uid} style={{ marginLeft: 8, marginRight: 6 }} />
|
<StatusContainer size={16} id={user.uid} style={{ marginLeft: 8, marginRight: 6 }} />
|
||||||
<Text style={style.actionSheetUsername} numberOfLines={1}>
|
<Text style={style.actionSheetUsername} numberOfLines={1}>
|
||||||
{user.username}
|
{user.username}
|
||||||
|
|
Loading…
Reference in New Issue