upstream pull fixes

Himanshu-Singh-Chauhan · Himanshu-Singh-Chauhan · commit 85f9d570ed34 · 2025-02-13T17:21:25.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -386,7 +386,7 @@
 		"typescript": "^5.4.5",
 		"@react-dev-inspector/middleware": "^2.0.1",
 		"dotenv": "^16.4.7",
-		"react-dev-inspector": "^2.0.1",
+		"react-dev-inspector": "^2.0.1"
 	},
 	"lint-staged": {
 		"*.{js,jsx,ts,tsx,json,css,md}": [
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
@@ -1708,7 +1708,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		await this.updateGlobalState("requestyModelId", requestyModelId)
 		await this.updateGlobalState("requestyModelInfo", requestyModelInfo)
 		await this.updateGlobalState("modelTemperature", modelTemperature)
-		await this.updateGlobalState("pearai-token", PEARAI_TOKEN)
 		await this.updateGlobalState("pearaiBaseUrl", PEARAI_URL)
 		await this.updateGlobalState("pearaiModelId", pearaiModelId)
 		await this.updateGlobalState("pearaiModelInfo", pearaiModelInfo)
diff --git a/src/extension.ts b/src/extension.ts
@@ -1,5 +1,5 @@
 import * as vscode from "vscode"
-
+import delay from "delay"
 import { ClineProvider } from "./core/webview/ClineProvider"
 import { createClineAPI } from "./exports"
 import "./utils/path" // Necessary to have access to String.prototype.toPosix.
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
@@ -55,7 +55,7 @@ export interface ExtensionMessage {
 		| "promptsButtonClicked"
 		| "didBecomeVisible"
 		| "updatePearAIAuth"
-	invoke?: "sendMessage" | "primaryButtonClick" | "secondaryButtonClick"
+	invoke?: "sendMessage" | "primaryButtonClick" | "secondaryButtonClick" | "setChatBoxMessage"
 	state?: ExtensionState
 	images?: string[]
 	ollamaModels?: string[]
diff --git a/tsconfig.json b/tsconfig.json
@@ -10,7 +10,7 @@
 		"noFallthroughCasesInSwitch": true,
 		"noImplicitOverride": true,
 		"noImplicitReturns": true,
-		"noUnusedLocals": false,
+		"noUnusedLocals": true,
 		"resolveJsonModule": true,
 		"rootDir": ".",
 		"skipLibCheck": true,
diff --git a/webview-ui/.eslintrc.json b/webview-ui/.eslintrc.json
@@ -1,3 +1,6 @@
 {
-	"extends": "react-app"
+	"extends": "react-app",
+	"rules": {
+		"@typescript-eslint/no-unused-vars": "off"
+	}
 }
diff --git a/webview-ui/package-lock.json b/webview-ui/package-lock.json
diff --git a/webview-ui/src/App.tsx b/webview-ui/src/App.tsx
@@ -90,7 +90,7 @@ const AppContent = () => {
 					isHidden={showSettings || showHistory || showMcp || showPrompts}
 					showAnnouncement={false}
 					hideAnnouncement={() => {
-						true
+						setShowAnnouncement(false)
 					}}
 				/>
 			</>
diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
@@ -1019,7 +1019,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 									<img src={splashIcon} alt="..." />
 									<div className="w-[300px] flex-col justify-start items-start gap-5 inline-flex">
 										<div className="flex flex-col text-left">
-											<div className="text-2xl">PearAI Coding Agent</div>
+											<div className="text-2xl">PearAI Coding Agesdfasfnt</div>
 											<div className="h-[18px] opacity-50 text-xs leading-[18px]">
 												Powered by Roo Code / Cline
 											</div>
diff --git a/webview-ui/src/components/ui/index.ts b/webview-ui/src/components/ui/index.ts
@@ -4,3 +4,4 @@ export * from "./dialog"
 export * from "./dropdown-menu"
 export * from "./popover"
 export * from "./tooltip"
+export * from "./pearaiindex"
diff --git a/webview-ui/src/components/ui/pearaiindex.tsx b/webview-ui/src/components/ui/pearaiindex.tsx
@@ -112,7 +112,7 @@ export function parseColorForHex(colorVar: string): string {
 	return hex
 }
 
-export const Button = styled.button`
+export const PrimaryActionButton = styled.button`
 	padding: 10px 12px;
 	margin: 8px 0;
 	border-radius: ${defaultBorderRadius};

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`{`
`2`		`- "extends": "react-app"`
	`2`	`+ "extends": "react-app",`
	`3`	`+ "rules": {`
	`4`	`+ "@typescript-eslint/no-unused-vars": "off"`
	`5`	`+ }`
`3`	`6`	`}`