diff --git a/apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts b/apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts
index e17fbf2001..002d00a6fc 100644
--- a/apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts
+++ b/apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts
@@ -17,7 +17,7 @@ export type NameAndBranchStatus = {
 
 export type BranchStatus =
 	| {
-			type: 'empty' | 'integrated' | 'safelyUpdatable';
+			type: 'empty' | 'integrated' | 'saflyUpdatable';
 	  }
 	| {
 			type: 'conflicted';
@@ -34,7 +34,7 @@ export function stackFullyIntegrated(stackStatus: StackStatus): boolean {
 }
 
 export type TreeStatus = {
-	type: 'empty' | 'conflicted' | 'safelyUpdatable';
+	type: 'empty' | 'conflicted' | 'saflyUpdatable';
 };
 
 export type StackStatusInfo = { stack: VirtualBranch; status: StackStatus };
diff --git a/packages/ui/src/lib/Textarea.svelte b/packages/ui/src/lib/Textarea.svelte
index 85925f5667..4d0995bd9e 100644
--- a/packages/ui/src/lib/Textarea.svelte
+++ b/packages/ui/src/lib/Textarea.svelte
@@ -1,18 +1,12 @@
 <script lang="ts" module>
-	export interface Props {
-		id?: string;
+	export interface Props extends HTMLTextareaAttributes {
 		textBoxEl?: HTMLTextAreaElement;
 		label?: string;
 		value?: string;
-		placeholder?: string;
-		disabled?: boolean;
 		fontWeight?: 'regular' | 'bold' | 'semibold';
 		fontSize?: number;
 		minRows?: number;
 		maxRows?: number;
-		autofocus?: boolean;
-		spellcheck?: boolean;
-		autocomplete?: string;
 		class?: string;
 		flex?: string;
 		padding?: {
@@ -27,22 +21,12 @@
 		borderBottom?: boolean;
 		borderLeft?: boolean;
 		unstyled?: boolean;
-		oninput?: (e: Event & { currentTarget: EventTarget & HTMLTextAreaElement }) => void;
-		onchange?: (e: Event & { currentTarget: EventTarget & HTMLTextAreaElement }) => void;
-		onfocus?: (
-			this: void,
-			e: FocusEvent & { currentTarget: EventTarget & HTMLTextAreaElement }
-		) => void;
-		onblur?: (
-			this: void,
-			e: FocusEvent & { currentTarget: EventTarget & HTMLTextAreaElement }
-		) => void;
-		onkeydown?: (e: KeyboardEvent & { currentTarget: EventTarget & HTMLTextAreaElement }) => void;
 	}
 </script>
 
 <script lang="ts">
 	import { pxToRem } from '$lib/utils/pxToRem';
+	import type { HTMLTextareaAttributes } from 'svelte/elements';
 
 	let {
 		id,
diff --git a/packages/ui/src/stories/textarea/textareaDemo.svelte b/packages/ui/src/stories/textarea/textareaDemo.svelte
index ff9a3f1a53..fb006b0001 100644
--- a/packages/ui/src/stories/textarea/textareaDemo.svelte
+++ b/packages/ui/src/stories/textarea/textareaDemo.svelte
@@ -11,7 +11,7 @@
 		changableValue = `## ☕️ Reasoning ## 🧢 Chang sdf sdf sdfsdf sdfsfsd ## 📌 Todos`;
 	}
 
-	function handleDescriptionKeyDown(e: KeyboardEvent & { currentTarget: HTMLTextAreaElement }) {
+	function handleDescriptionKeyDown(e: KeyboardEvent) {
 		if (e.key === 'Escape') {
 			console.log('keyboard', e.key);
 			e.preventDefault();