fix: merge conflicts

Author: mikaoelitiana

apps/studio/src/modules/add-site/components/create-site-form.tsx

@@ -12,7 +12,7 @@ import { SupportedPHPVersion, SupportedPHPVersions } from '@studio/common/types/
 import { Icon, SelectControl, Notice } from '@wordpress/components';
 import { createInterpolateElement } from '@wordpress/element';
 import { __, sprintf, _n } from '@wordpress/i18n';
-import { tip, cautionFilled, chevronRight, chevronDown, chevronLeft } from '@wordpress/icons';
+import { cautionFilled, chevronRight, chevronDown, chevronLeft } from '@wordpress/icons';
 import { useI18n } from '@wordpress/react-i18n';
 import { FormEvent, useState, useEffect, useCallback, useMemo, useRef, RefObject } from 'react';
 import Button from 'src/components/button';
@@ -59,107 +59,6 @@ interface CreateSiteFormProps {
 	formRef?: RefObject< HTMLFormElement >;
 }
 
-interface FormPathInputComponentProps {
-	value: string;
-	onClick: () => void;
-	error?: string;
-	doesPathContainWordPress: boolean;
-	id?: string;
-}
-
-interface SiteFormErrorProps {
-	error?: string;
-	tipMessage?: string;
-	className?: string;
-}
-
-const SiteFormError = ( { error, tipMessage = '', className = '' }: SiteFormErrorProps ) => {
-	return (
-		( error || tipMessage ) && (
-			<div
-				id={ error ? 'error-message' : 'tip-message' }
-				role="alert"
-				aria-atomic="true"
-				className={ cx(
-					'flex items-start gap-1 text-xs',
-					error ? 'text-red-500' : 'text-frame-text-secondary',
-					className
-				) }
-			>
-				<Icon
-					className={ cx(
-						'shrink-0 basis-4',
-						error ? 'fill-red-500' : 'fill-frame-text-secondary'
-					) }
-					icon={ error ? cautionFilled : tip }
-					width={ 16 }
-					height={ 16 }
-				/>
-				<p>{ error ? error : __( tipMessage ) }</p>
-			</div>
-		)
-	);
-};
-
-function FormPathInputComponent( {
-	value,
-	onClick,
-	error,
-	doesPathContainWordPress,
-	id,
-}: FormPathInputComponentProps ) {
-	const { __ } = useI18n();
-	return (
-		<div className="flex flex-col gap-2">
-			<button
-				aria-invalid={ !! error }
-				/**
-				 * The below `aria-describedby` presumes the error message always
-				 * relates to the local path input, which is true currently as it is the
-				 * only data validation in place. If we ever introduce additional data
-				 * validation we need to expand the robustness of this
-				 * `aria-describedby` attribute so that it only targets relevant error
-				 * messages.
-				 */
-				aria-describedby={ error ? 'site-path-error' : undefined }
-				type="button"
-				aria-label={ `${ value }, ${ __( 'Select different local path' ) }` }
-				className={ cx(
-					'flex flex-row items-stretch rounded-sm border border-frame-border focus:border-frame-theme focus:shadow-[0_0_0_0.5px] focus:shadow-frame-theme outline-none transition-shadow transition-linear duration-100 [&_.local-path-icon]:focus:border-l-frame-theme [&:disabled]:cursor-not-allowed',
-					error && 'border-red-500 [&_.local-path-icon]:border-l-red-500'
-				) }
-				data-testid="select-path-button"
-				onClick={ onClick }
-				id={ id }
-			>
-				<div
-					aria-hidden="true"
-					tabIndex={ -1 }
-					className="w-full text-left pl-3 py-3 min-h-10"
-					onChange={ () => {} }
-				>
-					{ value }
-				</div>
-				<div
-					aria-hidden="true"
-					className="local-path-icon flex items-center py-[9px] px-2.5 self-center"
-				>
-					<FolderIcon className="text-frame-text-secondary" />
-				</div>
-			</button>
-			<SiteFormError
-				error={ error }
-				tipMessage={
-					doesPathContainWordPress
-						? __( 'The existing WordPress site at this path will be added.' )
-						: ''
-				}
-			/>
-			<input type="hidden" data-testid="local-path-input" value={ value } />
-		</div>
-	);
-}
-
 export const CreateSiteForm = ( {
 	defaultValues = {},
 	onSelectPath,

apps/studio/src/modules/user-settings/components/preferences-tab.tsx

@@ -3,13 +3,9 @@ import { useI18n } from '@wordpress/react-i18n';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import Button from 'src/components/button';
 import { FormPathInputComponent } from 'src/components/form-path-input';
-import { useFeatureFlags } from 'src/hooks/use-feature-flags';
 import { isWindowsStore } from 'src/lib/app-globals';
 import { getIpcApi } from 'src/lib/get-ipc-api';
 import { ColorSchemePicker } from 'src/modules/user-settings/components/color-scheme-picker';
-import { McpSettings } from 'src/modules/mcp/components/mcp-settings';
-import { getIpcApi } from 'src/lib/get-ipc-api';
-import { McpSettings } from 'src/modules/mcp/components/mcp-settings';
 import { EditorPicker } from 'src/modules/user-settings/components/editor-picker';
 import { LanguagePicker } from 'src/modules/user-settings/components/language-picker';
 import { StudioCliToggle } from 'src/modules/user-settings/components/studio-cli-toggle';

apps/studio/src/storage/user-data.ts

@@ -161,7 +161,7 @@ type UserDataSafeKeys =
 	| 'preferredTerminal'
 	| 'preferredEditor'
 	| 'betaFeatures'
-	| 'colorScheme';
+	| 'colorScheme'
 	| 'defaultSiteDirectory';
 
 type PartialUserDataWithSafeKeysToUpdate = Partial< Pick< UserData, UserDataSafeKeys > >;

apps/studio/src/tests/ipc-handlers.test.ts

@@ -5,9 +5,7 @@ import { IpcMainInvokeEvent } from 'electron';
 import fs from 'fs';
 import { normalize } from 'path';
 import * as Sentry from '@sentry/electron/main';
-import { bumpStat } from '@studio/common/lib/bump-stat';
 import { recursiveCopyDirectory } from '@studio/common/lib/fs-utils';
-import { StatsGroup, StatsMetric } from '@studio/common/types/stats';
 import { readFile } from 'atomically';
 import { vi } from 'vitest';
 import {