From fdb5eb6a6ea0c15ee46f71385ecff2542b5c69c9 Mon Sep 17 00:00:00 2001 From: Pritipriya Singh Date: Thu, 16 Nov 2023 16:04:00 +0530 Subject: [PATCH] fix: changed userAlice to pushUser --- .../src/lib/components/supportChat/AddressInfo.tsx | 8 ++++---- .../uiweb/src/lib/components/supportChat/Chat.tsx | 10 +++++----- .../src/lib/components/supportChat/ChatInput.tsx | 4 ++-- .../uiweb/src/lib/components/supportChat/Modal.tsx | 8 ++++---- packages/uiweb/src/lib/helpers/chat/chat.ts | 12 ++++++------ packages/uiweb/src/lib/hooks/useSDKSocket.ts | 8 ++++---- packages/uiweb/src/lib/types/index.ts | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/uiweb/src/lib/components/supportChat/AddressInfo.tsx b/packages/uiweb/src/lib/components/supportChat/AddressInfo.tsx index 300586c4f..353719d24 100644 --- a/packages/uiweb/src/lib/components/supportChat/AddressInfo.tsx +++ b/packages/uiweb/src/lib/components/supportChat/AddressInfo.tsx @@ -6,7 +6,7 @@ import { copyToClipboard, pCAIP10ToWallet } from '../../helpers'; import { CopySvg } from '../../icons/CopySvg'; export const AddressInfo: React.FC = () => { - const { supportAddress, env, theme, userAlice } = useContext(SupportChatPropsContext); + const { supportAddress, env, theme, pushUser } = useContext(SupportChatPropsContext); const [ensName, setEnsName] = useState(''); const [user, setUser] = useState({}); const [isCopied, setIsCopied] = useState(false); @@ -14,14 +14,14 @@ export const AddressInfo: React.FC = () => { useEffect(() => { const getUser = async () => { -if(userAlice){ - const user = await userAlice.info(); +if(pushUser){ + const user = await pushUser.info(); setUser(user); } }; getUser(); - }, [supportAddress, userAlice]); + }, [supportAddress, pushUser]); return ( diff --git a/packages/uiweb/src/lib/components/supportChat/Chat.tsx b/packages/uiweb/src/lib/components/supportChat/Chat.tsx index f8f012efc..c1caa964c 100644 --- a/packages/uiweb/src/lib/components/supportChat/Chat.tsx +++ b/packages/uiweb/src/lib/components/supportChat/Chat.tsx @@ -49,7 +49,7 @@ export type ButtonStyleProps = { const [toastType, setToastType] = useState<'error' | 'success'>(); const [chats, setChats] = useState([]); const [accountadd, setAccountadd] = useState(account) - const [userAlice, setUserAlice] = useState(null); + const [pushUser, setPushUser] = useState(null); const setChatsSorted = (chats: IMessageIPFS[]) => { const chatsWithNumericTimestamps = chats.map(item => ({ @@ -71,7 +71,7 @@ export type ButtonStyleProps = { account: accountadd, env, apiKey, - userAlice: userAlice!, + pushUser: pushUser!, supportAddress, signer }); @@ -80,7 +80,7 @@ export type ButtonStyleProps = { const chatPropsData = { account : accountadd, signer, - userAlice, + pushUser, supportAddress, greetingMsg, modalTitle, @@ -112,8 +112,8 @@ export type ButtonStyleProps = { ( async() =>{ if(Object.keys(signer || {}).length && accountadd){ - const userAlice = await PushAPI.initialize(signer!, {env: env , account:accountadd!}); - setUserAlice(userAlice) + const pushUser = await PushAPI.initialize(signer!, {env: env , account:accountadd!}); + setPushUser(pushUser) } } )() diff --git a/packages/uiweb/src/lib/components/supportChat/ChatInput.tsx b/packages/uiweb/src/lib/components/supportChat/ChatInput.tsx index df5c9fd2a..451a47ed4 100644 --- a/packages/uiweb/src/lib/components/supportChat/ChatInput.tsx +++ b/packages/uiweb/src/lib/components/supportChat/ChatInput.tsx @@ -13,7 +13,7 @@ export const ChatInput: React.FC = () => { const fileInputRef = useRef(null); const [filesUploading, setFileUploading] = useState(false); const [loading, setLoading] = useState(false); - const { account, env, supportAddress, apiKey, theme, userAlice } = + const { account, env, supportAddress, apiKey, theme, pushUser } = useContext(SupportChatPropsContext); const { @@ -40,7 +40,7 @@ export const ChatInput: React.FC = () => { setLoading(true); if (message.trim() !== '' && connectedUser) { - const sendResponse = await userAlice.chat.send(supportAddress ,{ + const sendResponse = await pushUser.chat.send(supportAddress ,{ type: 'Text', content: message, diff --git a/packages/uiweb/src/lib/components/supportChat/Modal.tsx b/packages/uiweb/src/lib/components/supportChat/Modal.tsx index d898aadc1..dbca82c0d 100644 --- a/packages/uiweb/src/lib/components/supportChat/Modal.tsx +++ b/packages/uiweb/src/lib/components/supportChat/Modal.tsx @@ -29,7 +29,7 @@ export const Modal: React.FC = () => { string | null >(null); const [wasLastListPresent, setWasLastListPresent] = useState(false); - const { supportAddress, userAlice, env, account, signer, greetingMsg, theme } = + const { supportAddress, pushUser, env, account, signer, greetingMsg, theme } = useContext(SupportChatPropsContext); const { chats, @@ -90,7 +90,7 @@ export const Modal: React.FC = () => { setLoading(true); const { chatsResponse, lastThreadHash, lastListPresent } = await getChats({ account, - userAlice, + pushUser, // pgpPrivateKey: connectedUser.privateKey, supportAddress, threadHash: lastThreadHashFetched!, @@ -109,7 +109,7 @@ export const Modal: React.FC = () => { if (!socketData.epnsSDKSocket?.connected) { socketData.epnsSDKSocket?.connect(); } - const user = await createUserIfNecessary({ account, signer, env, userAlice }); + const user = await createUserIfNecessary({ account, signer, env, pushUser }); setConnectedUser(user); setLoading(false); } catch (err:any) { @@ -132,7 +132,7 @@ export const Modal: React.FC = () => { useEffect(() => { getChatCall(); - }, [connectedUser, env, account,signer, supportAddress, userAlice]); + }, [connectedUser, env, account,signer, supportAddress, pushUser]); useEffect(() => { scrollToBottom(); diff --git a/packages/uiweb/src/lib/helpers/chat/chat.ts b/packages/uiweb/src/lib/helpers/chat/chat.ts index 63610f47d..aaf99d5d4 100644 --- a/packages/uiweb/src/lib/helpers/chat/chat.ts +++ b/packages/uiweb/src/lib/helpers/chat/chat.ts @@ -24,7 +24,7 @@ type HandleOnChatIconClickProps = { type GetChatsType = { pgpPrivateKey?: string; supportAddress: string; - userAlice: PushAPI; + pushUser: PushAPI; limit: number; threadHash?: string; env?: Env; @@ -41,10 +41,10 @@ export const handleOnChatIconClick = ({ export const createUserIfNecessary = async ( options: AccountEnvOptionsType ): Promise => { - const { account, signer, env = Constants.ENV.PROD, userAlice } = options || {}; + const { account, signer, env = Constants.ENV.PROD, pushUser } = options || {}; let connectedUser; - if(userAlice){ - connectedUser = await userAlice.info(); + if(pushUser){ + connectedUser = await pushUser.info(); } return { ...connectedUser, privateKey: connectedUser!.encryptedPrivateKey }; @@ -63,14 +63,14 @@ export const getChats = async ( account, pgpPrivateKey, supportAddress, - userAlice, + pushUser, threadHash = null, limit = 40, env = Constants.ENV.PROD, } = options || {}; - const chats = await userAlice?.chat.history( + const chats = await pushUser?.chat.history( supportAddress ); diff --git a/packages/uiweb/src/lib/hooks/useSDKSocket.ts b/packages/uiweb/src/lib/hooks/useSDKSocket.ts index 37e843b24..6545a7844 100644 --- a/packages/uiweb/src/lib/hooks/useSDKSocket.ts +++ b/packages/uiweb/src/lib/hooks/useSDKSocket.ts @@ -12,12 +12,12 @@ export type SDKSocketHookOptions = { env?: ENV, socketType?: 'chat' | 'notification', apiKey: string, - userAlice: PushAPI , + pushUser: PushAPI , supportAddress: string | null, signer: SignerType | null }; -export const useSDKSocket =({ account, env = ENV.PROD, socketType = 'chat',apiKey, userAlice, supportAddress, signer }: SDKSocketHookOptions) => { +export const useSDKSocket =({ account, env = ENV.PROD, socketType = 'chat',apiKey, pushUser, supportAddress, signer }: SDKSocketHookOptions) => { // const [epnsSDKSocket, setEpnsSDKSocket] = useState(null); const [messagesSinceLastConnection, setMessagesSinceLastConnection] = useState(''); @@ -82,7 +82,7 @@ export const useSDKSocket =({ account, env = ENV.PROD, socketType = 'chat',apiKe stream?.disconnect(); } const main = async () => { - const newstream = await userAlice.initStream( + const newstream = await pushUser.initStream( [ CONSTANTS.STREAM.CHAT, ], @@ -97,7 +97,7 @@ export const useSDKSocket =({ account, env = ENV.PROD, socketType = 'chat',apiKe } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [account, env, userAlice, supportAddress, signer, isSDKSocketConnected]); + }, [account, env, pushUser, supportAddress, signer, isSDKSocketConnected]); return { stream, diff --git a/packages/uiweb/src/lib/types/index.ts b/packages/uiweb/src/lib/types/index.ts index 87e44121d..f345c9f2b 100644 --- a/packages/uiweb/src/lib/types/index.ts +++ b/packages/uiweb/src/lib/types/index.ts @@ -37,7 +37,7 @@ export interface AccountEnvOptionsType { env?: ENV; account: string; signer: SignerType; - userAlice: PushAPI; + pushUser: PushAPI; } export interface ITheme {