From 0d9dbe5962a88dad6ac91347787a5885d928268f Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Sun, 7 Jan 2024 13:02:46 +0000 Subject: [PATCH] Fix chat avatars and numeric displays --- .../EncryptedChat/EncryptedSocketChat/index.tsx | 8 +++++++- .../EncryptedChat/EncryptedTurtleChat/index.tsx | 8 +++++++- .../EncryptedChat/MessageCard/index.tsx | 16 ++++++++++++---- .../components/TradeBox/EncryptedChat/index.tsx | 17 ++++++++--------- .../src/components/TradeBox/Prompts/Chat.tsx | 7 +++---- 5 files changed, 37 insertions(+), 19 deletions(-) diff --git a/frontend/src/components/TradeBox/EncryptedChat/EncryptedSocketChat/index.tsx b/frontend/src/components/TradeBox/EncryptedChat/EncryptedSocketChat/index.tsx index 06a823f1..7f6e5ea3 100644 --- a/frontend/src/components/TradeBox/EncryptedChat/EncryptedSocketChat/index.tsx +++ b/frontend/src/components/TradeBox/EncryptedChat/EncryptedSocketChat/index.tsx @@ -29,6 +29,8 @@ interface Props { status: number; userNick: string; takerNick: string; + takerHashId: string; + makerHashId: string; messages: EncryptedChatMessage[]; setMessages: (messages: EncryptedChatMessage[]) => void; baseUrl: string; @@ -41,6 +43,8 @@ const EncryptedSocketChat: React.FC = ({ status, userNick, takerNick, + makerHashId, + takerHashId, messages, setMessages, baseUrl, @@ -315,7 +319,9 @@ const EncryptedSocketChat: React.FC = ({ message={message} isTaker={isTaker} userConnected={userConnected} - baseUrl={baseUrl} + takerNick={takerNick} + takerHashId={takerHashId} + makerHashId={makerHashId} /> ); diff --git a/frontend/src/components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx b/frontend/src/components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx index e6238549..3d4e9eaa 100644 --- a/frontend/src/components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx +++ b/frontend/src/components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx @@ -25,6 +25,8 @@ interface Props { order: Order; userNick: string; takerNick: string; + takerHashId: string; + makerHashId: string; chatOffset: number; messages: EncryptedChatMessage[]; setMessages: (messages: EncryptedChatMessage[]) => void; @@ -42,6 +44,8 @@ const EncryptedTurtleChat: React.FC = ({ order, userNick, takerNick, + takerHashId, + makerHashId, chatOffset, messages, setMessages, @@ -311,7 +315,9 @@ const EncryptedTurtleChat: React.FC = ({ message={message} isTaker={isTaker} userConnected={userConnected} - baseUrl={baseUrl} + takerNick={takerNick} + takerHashId={takerHashId} + makerHashId={makerHashId} /> ); diff --git a/frontend/src/components/TradeBox/EncryptedChat/MessageCard/index.tsx b/frontend/src/components/TradeBox/EncryptedChat/MessageCard/index.tsx index 3391ce10..e14a1f82 100644 --- a/frontend/src/components/TradeBox/EncryptedChat/MessageCard/index.tsx +++ b/frontend/src/components/TradeBox/EncryptedChat/MessageCard/index.tsx @@ -13,12 +13,21 @@ import { type EncryptedChatMessage } from '..'; interface Props { message: EncryptedChatMessage; + takerNick: string; + takerHashId: string; + makerHashId: string; isTaker: boolean; userConnected: boolean; - baseUrl: string; } -const MessageCard: React.FC = ({ message, isTaker, userConnected, baseUrl }) => { +const MessageCard: React.FC = ({ + message, + isTaker, + userConnected, + takerNick, + takerHashId, + makerHashId, +}) => { const [showPGP, setShowPGP] = useState(false); const { t } = useTranslation(); const theme = useTheme(); @@ -34,8 +43,7 @@ const MessageCard: React.FC = ({ message, isTaker, userConnected, baseUrl avatar={ } diff --git a/frontend/src/components/TradeBox/EncryptedChat/index.tsx b/frontend/src/components/TradeBox/EncryptedChat/index.tsx index 8c349c80..a0460006 100644 --- a/frontend/src/components/TradeBox/EncryptedChat/index.tsx +++ b/frontend/src/components/TradeBox/EncryptedChat/index.tsx @@ -6,9 +6,6 @@ import EncryptedTurtleChat from './EncryptedTurtleChat'; interface Props { order: Order; status: number; - takerNick: string; - makerNick: string; - userNick: string; chatOffset: number; baseUrl: string; messages: EncryptedChatMessage[]; @@ -34,8 +31,6 @@ export interface ServerMessage { const EncryptedChat: React.FC = ({ order, - takerNick, - userNick, chatOffset, baseUrl, setMessages, @@ -49,8 +44,10 @@ const EncryptedChat: React.FC = ({ messages={messages} setMessages={setMessages} order={order} - takerNick={takerNick} - userNick={userNick} + takerNick={order.taker_nick} + takerHashId={order.taker_hash_id} + makerHashId={order.maker_hash_id} + userNick={order.ur_nick} chatOffset={chatOffset} baseUrl={baseUrl} turtleMode={turtleMode} @@ -62,8 +59,10 @@ const EncryptedChat: React.FC = ({ messages={messages} setMessages={setMessages} order={order} - takerNick={takerNick} - userNick={userNick} + takerNick={order.taker_nick} + takerHashId={order.taker_hash_id} + makerHashId={order.maker_hash_id} + userNick={order.ur_nick} baseUrl={baseUrl} turtleMode={turtleMode} setTurtleMode={setTurtleMode} diff --git a/frontend/src/components/TradeBox/Prompts/Chat.tsx b/frontend/src/components/TradeBox/Prompts/Chat.tsx index 0a8c90f7..5bf6958f 100644 --- a/frontend/src/components/TradeBox/Prompts/Chat.tsx +++ b/frontend/src/components/TradeBox/Prompts/Chat.tsx @@ -50,7 +50,9 @@ export const ChatPrompt = ({ const [text, setText] = useState(''); const currencyCode: string = currencies[`${order.currency}`]; - const amount: string = pn(parseFloat(order.amount ?? 0).toFixed(order.currency === 1000 ? 8 : 4)); + const amount: string = pn( + Number(parseFloat(order.amount ?? 0).toFixed(order.currency === 1000 ? 8 : 4)), + ); const disputeCountdownRenderer = function ({ hours, @@ -133,9 +135,6 @@ export const ChatPrompt = ({ status={order.status} chatOffset={order.chat_last_index} order={order} - takerNick={order.taker_nick} - makerNick={order.maker_nick} - userNick={order.ur_nick} baseUrl={baseUrl} messages={messages} setMessages={setMessages}