Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed video call chatid issue #1441

Closed
wants to merge 7 commits into from
Closed

fixed video call chatid issue #1441

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a1acb44
fixed video call chatid issue
mishramonalisha76 Mar 6, 2024
2c30be0
PGP private key is visible and getChatId() is also fixed
abhishek-01k Mar 14, 2024
0af74aa
added selected chat
mishramonalisha76 Mar 19, 2024
5792be1
added selected chat
mishramonalisha76 Mar 19, 2024
6b21274
account changed to caipaccount
abhishek-01k Mar 21, 2024
1a5a6e4
Replace videoObject with ref and update restapi ver
madhur-push Mar 21, 2024
824b803
Export videoObjectRef from VideoCallContext
madhur-push Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 29 additions & 25 deletions src/components/chat/w2wChat/chatBox/ChatBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import useToast from 'hooks/useToast';
import { Context } from 'modules/chat/ChatModule';
import { AppContext as ContextType } from 'types/chat';
import HandwaveIcon from '../../../../assets/chat/handwave.svg';
import { caip10ToWallet } from '../../../../helpers/w2w';
import { caip10ToWallet, walletToCAIP10 } from '../../../../helpers/w2w';
import { checkIfGroup, getGroupImage } from '../../../../helpers/w2w/groupChat';

import { AppContext } from 'contexts/AppContext';
Expand Down Expand Up @@ -81,30 +81,10 @@ const ChatBox = ({ showGroupInfoModal }): JSX.Element => {
//resolve web3 names
useResolveWeb3Name(!isGroup ? currentChat?.wallets?.split(',')[0].toString() : null);

// get web3 name
let ensName = '';
if (!isGroup && currentChat?.wallets?.split(',')[0].toString()) {
const walletLowercase = currentChat.wallets.includes(':nft')
? caip10ToWallet(
currentChat?.wallets
.replace(/eip155:\d+:/, 'eip155:')
.split(':nft')[0]
.toString()
.toLowerCase()
)
: caip10ToWallet(currentChat?.wallets?.split(',')[0].toString())?.toLowerCase();
const checksumWallet = ethers.utils.getAddress(walletLowercase);
ensName = web3NameList[checksumWallet];
}

const navigate = useNavigate();
const location = useLocation();
useEffect(() => {
// if ens is resolved, update browse to match ens name is it doesn't match
if (ensName && location.pathname !== `/chat/${ensName}`) {
// lastly, set navigation for dynamic linking
navigate(`/chat/${ensName}`, { replace: true });
}
}, [ensName]);


useEffect(() => {
setIsGroup(false);
Expand Down Expand Up @@ -136,6 +116,30 @@ const ChatBox = ({ showGroupInfoModal }): JSX.Element => {


};
// get web3 name
console.debug(getChatId())
let ensName = '';
if (!isGroup && (getChatId())) {
const walletLowercase = getChatId().includes(':nft')
? caip10ToWallet(
(getChatId())
.replace(/eip155:\d+:/, 'eip155:')
.split(':nft')[0]
.toString()
.toLowerCase()
)
: caip10ToWallet(getChatId())?.toLowerCase();
console.debug(walletLowercase)
const checksumWallet = ethers.utils.getAddress(walletLowercase);
ensName = web3NameList[checksumWallet];
}
useEffect(() => {
// if ens is resolved, update browse to match ens name is it doesn't match
if (ensName && location.pathname !== `/chat/${ensName}`) {
// lastly, set navigation for dynamic linking
navigate(`/chat/${ensName}`, { replace: true });
}
}, [ensName]);
const handleCloseSuccessSnackbar = (event?: React.SyntheticEvent | Event, reason?: string): void => {
if (reason === 'clickaway') {
return;
Expand All @@ -147,9 +151,9 @@ const ChatBox = ({ showGroupInfoModal }): JSX.Element => {
videoObject?.setData((oldData) => {
return produce(oldData, (draft) => {
draft.local.address = account;
draft.incoming[0].address = caip10ToWallet(currentChat.wallets.toString());
draft.incoming[0].address = caip10ToWallet((getChatId()).toString());
draft.incoming[0].status = PushAPI.VideoCallStatus.INITIALIZED;
draft.meta.chatId = currentChat.chatId;
// draft.meta.chatId = currentChat.chatId;
});
});
};
Expand Down
Loading