Merge Setting and SW_Table branches into main, fix conflicts, and resolve TS build errors

src/components/Modal/HWModal.ts

@@ -1,6 +1,5 @@
 import { state } from '../../core/state';
 import { HardwareAsset } from '../../core/excelHandler';
-import { renderTable } from '../../views/AssetTableView';
 import { createIcons, Paperclip } from 'lucide';
 
 let currentAsset: HardwareAsset | null = null;