From 33e086046851dfbe7e06a004d02b1c3f050fcd6a Mon Sep 17 00:00:00 2001
From: KevIsDev <zennerd404@gmail.com>
Date: Mon, 2 Jun 2025 11:39:49 +0100
Subject: [PATCH] fix: resolve conflicts

---
 app/components/chat/AssistantMessage.tsx | 130 ++++++++++++-----------
 app/components/chat/BaseChat.tsx         |   2 +-
 app/components/chat/Markdown.tsx         |   4 +-
 3 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/app/components/chat/AssistantMessage.tsx b/app/components/chat/AssistantMessage.tsx
index 7ed2840c..022b4fbe 100644
--- a/app/components/chat/AssistantMessage.tsx
+++ b/app/components/chat/AssistantMessage.tsx
@@ -83,76 +83,78 @@ export const AssistantMessage = memo(
 
     return (
       <div className="overflow-hidden w-full">
-        <div className=" flex gap-2 items-center text-sm text-bolt-elements-textSecondary mb-2">
-          {(codeContext || chatSummary) && (
-            <Popover side="right" align="start" trigger={<div className="i-ph:info" />}>
-              {chatSummary && (
-                <div className="max-w-chat">
-                  <div className="summary max-h-96 flex flex-col">
-                    <h2 className="border border-bolt-elements-borderColor rounded-md p4">Summary</h2>
-                    <div style={{ zoom: 0.7 }} className="overflow-y-auto m4">
-                      <Markdown>{chatSummary}</Markdown>
-                    </div>
-                  </div>
-                  {codeContext && (
-                    <div className="code-context flex flex-col p4 border border-bolt-elements-borderColor rounded-md">
-                      <h2>Context</h2>
-                      <div className="flex gap-4 mt-4 bolt" style={{ zoom: 0.6 }}>
-                        {codeContext.map((x) => {
-                          const normalized = normalizedFilePath(x);
-                          return (
-                            <Fragment key={normalized}>
-                              <code
-                                className="bg-bolt-elements-artifacts-inlineCode-background text-bolt-elements-artifacts-inlineCode-text px-1.5 py-1 rounded-md text-bolt-elements-item-contentAccent hover:underline cursor-pointer"
-                                onClick={(e) => {
-                                  e.preventDefault();
-                                  e.stopPropagation();
-                                  openArtifactInWorkbench(normalized);
-                                }}
-                              >
-                                {normalized}
-                              </code>
-                            </Fragment>
-                          );
-                        })}
+        <>
+          <div className=" flex gap-2 items-center text-sm text-bolt-elements-textSecondary mb-2">
+            {(codeContext || chatSummary) && (
+              <Popover side="right" align="start" trigger={<div className="i-ph:info" />}>
+                {chatSummary && (
+                  <div className="max-w-chat">
+                    <div className="summary max-h-96 flex flex-col">
+                      <h2 className="border border-bolt-elements-borderColor rounded-md p4">Summary</h2>
+                      <div style={{ zoom: 0.7 }} className="overflow-y-auto m4">
+                        <Markdown>{chatSummary}</Markdown>
                       </div>
                     </div>
+                    {codeContext && (
+                      <div className="code-context flex flex-col p4 border border-bolt-elements-borderColor rounded-md">
+                        <h2>Context</h2>
+                        <div className="flex gap-4 mt-4 bolt" style={{ zoom: 0.6 }}>
+                          {codeContext.map((x) => {
+                            const normalized = normalizedFilePath(x);
+                            return (
+                              <Fragment key={normalized}>
+                                <code
+                                  className="bg-bolt-elements-artifacts-inlineCode-background text-bolt-elements-artifacts-inlineCode-text px-1.5 py-1 rounded-md text-bolt-elements-item-contentAccent hover:underline cursor-pointer"
+                                  onClick={(e) => {
+                                    e.preventDefault();
+                                    e.stopPropagation();
+                                    openArtifactInWorkbench(normalized);
+                                  }}
+                                >
+                                  {normalized}
+                                </code>
+                              </Fragment>
+                            );
+                          })}
+                        </div>
+                      </div>
+                    )}
+                  </div>
+                )}
+                <div className="context"></div>
+              </Popover>
+            )}
+            <div className="flex w-full items-center justify-between">
+              {usage && (
+                <div>
+                  Tokens: {usage.totalTokens} (prompt: {usage.promptTokens}, completion: {usage.completionTokens})
+                </div>
+              )}
+              {(onRewind || onFork) && messageId && (
+                <div className="flex gap-2 flex-col lg:flex-row ml-auto">
+                  {onRewind && (
+                    <WithTooltip tooltip="Revert to this message">
+                      <button
+                        onClick={() => onRewind(messageId)}
+                        key="i-ph:arrow-u-up-left"
+                        className="i-ph:arrow-u-up-left text-xl text-bolt-elements-textSecondary hover:text-bolt-elements-textPrimary transition-colors"
+                      />
+                    </WithTooltip>
+                  )}
+                  {onFork && (
+                    <WithTooltip tooltip="Fork chat from this message">
+                      <button
+                        onClick={() => onFork(messageId)}
+                        key="i-ph:git-fork"
+                        className="i-ph:git-fork text-xl text-bolt-elements-textSecondary hover:text-bolt-elements-textPrimary transition-colors"
+                      />
+                    </WithTooltip>
                   )}
                 </div>
               )}
-              <div className="context"></div>
-            </Popover>
-          )}
-          <div className="flex w-full items-center justify-between">
-            {usage && (
-              <div>
-                Tokens: {usage.totalTokens} (prompt: {usage.promptTokens}, completion: {usage.completionTokens})
-              </div>
-            )}
-            {(onRewind || onFork) && messageId && (
-              <div className="flex gap-2 flex-col lg:flex-row ml-auto">
-                {onRewind && (
-                  <WithTooltip tooltip="Revert to this message">
-                    <button
-                      onClick={() => onRewind(messageId)}
-                      key="i-ph:arrow-u-up-left"
-                      className="i-ph:arrow-u-up-left text-xl text-bolt-elements-textSecondary hover:text-bolt-elements-textPrimary transition-colors"
-                    />
-                  </WithTooltip>
-                )}
-                {onFork && (
-                  <WithTooltip tooltip="Fork chat from this message">
-                    <button
-                      onClick={() => onFork(messageId)}
-                      key="i-ph:git-fork"
-                      className="i-ph:git-fork text-xl text-bolt-elements-textSecondary hover:text-bolt-elements-textPrimary transition-colors"
-                    />
-                  </WithTooltip>
-                )}
-              </div>
-            )}
+            </div>
           </div>
-        </div>
+        </>
         <Markdown append={append} chatMode={chatMode} setChatMode={setChatMode} model={model} provider={provider} html>
           {content}
         </Markdown>
diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index 97c9314f..1d1803fd 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -370,8 +370,8 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
                         append={append}
                         chatMode={chatMode}
                         setChatMode={setChatMode}
-                        model={model}
                         provider={provider}
+                        model={model}
                       />
                     ) : null;
                   }}
diff --git a/app/components/chat/Markdown.tsx b/app/components/chat/Markdown.tsx
index 82118451..3471c733 100644
--- a/app/components/chat/Markdown.tsx
+++ b/app/components/chat/Markdown.tsx
@@ -151,7 +151,7 @@ export const Markdown = memo(
                           type: 'text',
                           text: `[Model: ${model}]\n\n[Provider: ${provider?.name}]\n\n${message}`,
                         },
-                      ] as any, // Type assertion to bypass compiler check
+                      ] as any,
                       role: 'user',
                     });
                     console.log('Message appended:', message);
@@ -164,7 +164,7 @@ export const Markdown = memo(
                           type: 'text',
                           text: `[Model: ${model}]\n\n[Provider: ${provider?.name}]\n\n${message}`,
                         },
-                      ] as any, // Type assertion to bypass compiler check
+                      ] as any,
                       role: 'user',
                     });
                   } else if (type === 'link' && typeof href === 'string') {