merge conflicts resolved

Author: Samuel Shrestha

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/BOMTableWrapper.tsx

@@ -11,8 +11,7 @@ import { useToast } from '../../../../hooks/toasts.hooks';
 import { useAssignMaterialToAssembly, useDeleteAssembly, useDeleteMaterial } from '../../../../hooks/bom.hooks';
 import LoadingIndicator from '../../../../components/LoadingIndicator';
 import EditMaterialModal from './MaterialForm/EditMaterialModal';
-import ContentCopyIcon from '@mui/icons-material/ContentCopy';
-import { Button, Link, Tooltip, Typography } from '@mui/material';
+import { Button, Link, Typography } from '@mui/material';
 import { bomBaseColDef } from '../../../../utils/bom.utils';
 import NERModal from '../../../../components/NERModal';
 import { renderStatusBOM } from './BOMTableCustomCells';
@@ -298,22 +297,10 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
       flex: 1.5,
       field: 'name',
       headerName: 'Name',
+      type: 'string',
       sortable: false,
       filterable: false,
-      hide: hideColumn[3],
-      renderCell: (params) => {
-        const material = materials.find((m) => m.materialId === params.row.materialId);
-        return (
-          <Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5 }}>
-            <Typography variant="body2">{params.value}</Typography>
-            {material?.isCopied && (
-              <Tooltip title="Copied from another BOM">
-                <ContentCopyIcon sx={{ fontSize: 14, color: 'warning.main' }} />
-              </Tooltip>
-            )}
-          </Box>
-        );
-      }
+      hide: hideColumn[3]
     },
     {
       ...bomBaseColDef,
@@ -427,4 +414,4 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
   );
 };
 
-export default BOMTableWrapper;
+export default BOMTableWrapper;

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/MaterialForm/MaterialFormView.tsx

@@ -91,7 +91,7 @@ const MaterialFormView: React.FC<MaterialFormViewProps> = ({
     setValue('linkUrl', m.linkUrl ?? '');
     setValue('quantity', m.quantity ?? undefined);
     setValue('unitName', m.unitName ?? undefined);
-    setValue('price', m.price ?? undefined);
+    setValue('price', m.price != null ? m.price / 100 : undefined);
     setValue('notes', m.notes ?? '');
     setValue('assemblyId', undefined);
 
@@ -548,6 +548,11 @@ const MaterialFormView: React.FC<MaterialFormViewProps> = ({
           </Box>
         </Grid>
       )}
+      <SelectMaterialToCopyModal
+        open={copyModalOpen}
+        onHide={() => setCopyModalOpen(false)}
+        onSelect={handleCopySelect}
+      />
     </NERFormModal>
   );
 };