diff --git a/src/components/common/MenuTab.tsx b/src/components/common/MenuTab.tsx
index 564f20b..94a7d85 100644
--- a/src/components/common/MenuTab.tsx
+++ b/src/components/common/MenuTab.tsx
@@ -5,6 +5,8 @@ import ItemContainer from 'src/components/common/ItemContainer';
import Button from 'src/components/common/Button';
import { Plus } from 'src/assets';
import { useLocation, useNavigate } from 'react-router-dom';
+import GroupPopup from '../onboarding/GroupPopup';
+import React from 'react';
//
//
@@ -63,6 +65,7 @@ const MenuTab = ({ groups, drones, type }: MenuTabProps) => {
const location = useLocation();
const isTestDetailPage = location.pathname.includes('/test');
const isEstimatePage = location.pathname.includes('/estimate');
+ const [isPopupOpen, setIsPopupOpen] = React.useState(false);
const handleTabMenu = (url: string, id?: string) => {
navigate(url, { state: id });
@@ -268,28 +271,31 @@ const MenuTab = ({ groups, drones, type }: MenuTabProps) => {
};
return (
-
-
- {type === 'monitoring' ? renderDroneSearchTab() : null}
- {type === 'monitoring' ? renderDroneGroupTab() : null}
- {type === 'dashboard' ? renderDroneListTab() : null}
- {type === 'parts' ? renderPartsTab() : null}
- {type === 'trade' ? renderTradeTab() : null}
- {type === 'monitoring' ? (
-
-
+ <>
+
+
+ {type === 'monitoring' ? renderDroneSearchTab() : null}
+ {type === 'monitoring' ? renderDroneGroupTab() : null}
+ {type === 'dashboard' ? renderDroneListTab() : null}
+ {type === 'parts' ? renderPartsTab() : null}
+ {type === 'trade' ? renderTradeTab() : null}
+ {type === 'monitoring' ? (
+
+
+ {isPopupOpen && setIsPopupOpen(false)} />}
+ >
);
};
diff --git a/src/pages/EstimatePage.tsx b/src/pages/EstimatePage.tsx
index 1336c3b..e9eda2d 100644
--- a/src/pages/EstimatePage.tsx
+++ b/src/pages/EstimatePage.tsx
@@ -193,7 +193,8 @@ const EstimatePage = () => {
const sortedRepairCompanies = [...repairCompanies];
if (repairFilter === 'recommend') {
sortedRepairCompanies.sort(
- (a, b) => b.features.length - a.features.length
+ (a, b) =>
+ [...new Set(b.features)].length - [...new Set(a.features)].length
);
} else if (repairFilter === 'price') {
sortedRepairCompanies.sort((a, b) => a.minPrice - b.minPrice);