merge conflicts

webview-ui/src/components/settings/SettingsView.tsx

@@ -20,6 +20,7 @@ import ApiConfigurationSection from "./sections/ApiConfigurationSection"
 import GeneralSettingsSection from "./sections/GeneralSettingsSection"
 import BrowserSettingsSection from "./sections/BrowserSettingsSection"
 import DebugSection from "./sections/DebugSection"
+import AboutSection from "./sections/AboutSection"
 import { convertApiConfigurationToProtoApiConfiguration } from "@shared/proto-conversions/state/settings-conversion"
 import { convertChatSettingsToProtoChatSettings } from "@shared/proto-conversions/state/chat-settings-conversion"
 
@@ -806,20 +807,7 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 
 							{/* About Tab */}
 							{activeTab === "about" && (
-								<div>
-									{renderSectionHeader("about")}
-									<Section>
-										<div className="text-center text-[var(--vscode-descriptionForeground)] text-xs leading-[1.2] px-0 py-0 pr-2 pb-[15px] mt-auto">
-											<p className="break-words m-0 p-0">
-												If you have any questions or feedback, feel free to open an issue at{" "}
-												<VSCodeLink href="https://github.com/cline/cline" className="inline">
-													https://github.com/cline/cline
-												</VSCodeLink>
-											</p>
-											<p className="italic mt-[10px] mb-0 p-0">v{version}</p>
-										</div>
-									</Section>
-								</div>
+								<AboutSection version={version} renderSectionHeader={renderSectionHeader} />
 							)}
 						</TabContent>
 					)

webview-ui/src/components/settings/sections/AboutSection.tsx

@@ -0,0 +1,28 @@
+import Section from "../Section"
+import { VSCodeLink } from "@vscode/webview-ui-toolkit/react"
+
+interface AboutSectionProps {
+	version: string
+	renderSectionHeader: (tabId: string) => JSX.Element | null
+}
+
+const AboutSection = ({ version, renderSectionHeader }: AboutSectionProps) => {
+	return (
+		<div>
+			{renderSectionHeader("about")}
+			<Section>
+				<div className="text-center text-[var(--vscode-descriptionForeground)] text-xs leading-[1.2] px-0 py-0 pr-2 pb-[15px] mt-auto">
+					<p className="break-words m-0 p-0">
+						If you have any questions or feedback, feel free to open an issue at{" "}
+						<VSCodeLink href="https://github.com/cline/cline" className="inline">
+							https://github.com/cline/cline
+						</VSCodeLink>
+					</p>
+					<p className="italic mt-[10px] mb-0 p-0">v{version}</p>
+				</div>
+			</Section>
+		</div>
+	)
+}
+
+export default AboutSection