From a43bc8877e9363477d3ead25a4ddab0a1ce23b94 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Fri, 31 Jan 2025 09:45:41 -0500 Subject: [PATCH] Revert "Fix boolean logic for cost, apiReqCancelReason (they are never null)" This reverts commit b5340915f73ed7340c33a0c9b03c9648a88e73a4. --- webview-ui/src/components/chat/ChatRow.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx index cb4649a..ffa340e 100644 --- a/webview-ui/src/components/chat/ChatRow.tsx +++ b/webview-ui/src/components/chat/ChatRow.tsx @@ -183,28 +183,26 @@ export const ChatRowContent = ({ ) return [ - apiReqCancelReason ? ( + apiReqCancelReason !== null ? ( apiReqCancelReason === "user_cancelled" ? ( getIconSpan("error", cancelledColor) ) : ( getIconSpan("error", errorColor) ) - ) : cost ? ( + ) : cost !== null ? ( getIconSpan("check", successColor) ) : apiRequestFailedMessage ? ( getIconSpan("error", errorColor) ) : ( ), - apiReqCancelReason ? ( + apiReqCancelReason !== null ? ( apiReqCancelReason === "user_cancelled" ? ( API Request Cancelled ) : ( - - API Streaming Failed ({JSON.stringify(apiReqCancelReason)}) - + API Streaming Failed ) - ) : cost ? ( + ) : cost !== null ? ( API Request ) : apiRequestFailedMessage ? ( API Request Failed @@ -512,7 +510,9 @@ export const ChatRowContent = ({ style={{ ...headerStyle, marginBottom: - (!cost && apiRequestFailedMessage) || apiReqStreamingFailedMessage ? 10 : 0, + (cost === null && apiRequestFailedMessage) || apiReqStreamingFailedMessage + ? 10 + : 0, justifyContent: "space-between", cursor: "pointer", userSelect: "none", @@ -530,7 +530,7 @@ export const ChatRowContent = ({ - {((!cost && apiRequestFailedMessage) || apiReqStreamingFailedMessage) && ( + {((cost === null && apiRequestFailedMessage) || apiReqStreamingFailedMessage) && ( <>

{apiRequestFailedMessage || apiReqStreamingFailedMessage}