Merge pull request #226 from Build-Squad/ENG-160-DropDown-bug-fix

Eng 160 drop down bug fix
Build-Squad · Mar 4, 2024 · 84881d8 · 84881d8
2 parents 8c86ad4 + 2a70978
commit 84881d8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/src/api/marketplace/accounts/serializers.py b/src/api/marketplace/accounts/serializers.py
@@ -113,7 +113,12 @@ def get_service_types(self, twitter_account):
 
         # Extract service types and prices
         service_data = [
-            {"serviceType": service.service_master.name, "price": service.price, "currencySymbol": service.currency.symbol}
+            {
+                "serviceType": service.service_master.name,
+                "price": service.price,
+                "currencySymbol": service.currency.symbol,
+                "packageStatus": Package.objects.filter(service_package_id=service)[0].status
+            }
             for service in services
         ]
 

diff --git a/src/ui/app/business/page.tsx b/src/ui/app/business/page.tsx
@@ -84,7 +84,9 @@ export default function BusinessHome() {
           twitterUsername: inf.user_name || "",
           profileUrl: inf.profile_image_url || "",
           services: inf.service_types
-            ? inf.service_types.map((service: any) => service.serviceType)
+            ? inf.service_types
+                .filter((service: any) => service.packageStatus == "published")
+                .map((service: any) => service.serviceType)
             : [],
 
           followers: formatTwitterFollowers(inf.followers_count),

diff --git a/src/ui/src/components/shared/customAutoComplete/index.tsx b/src/ui/src/components/shared/customAutoComplete/index.tsx
@@ -205,6 +205,7 @@ const CustomAutoComplete = ({
           />
         );
       }}
+      isOptionEqualToValue={isOptionEqualToValue}
       renderOption={(props, option, { selected }) => (
         <li {...props}>
           <Checkbox

diff --git a/src/ui/src/components/shared/filtersComponent/index.tsx b/src/ui/src/components/shared/filtersComponent/index.tsx
@@ -55,6 +55,9 @@ export default function FiltersComponent({
               return "";
             }
           }}
+          isOptionEqualToValue={(option: any, value: any) => {
+            return option.id === value.id;
+          }}
           size="medium"
         />
       );
@@ -84,6 +87,9 @@ export default function FiltersComponent({
               return "";
             }
           }}
+          isOptionEqualToValue={(option: any, value: any) => {
+            return option.id === value.id;
+          }}
           size="medium"
         />
       );
@@ -113,6 +119,9 @@ export default function FiltersComponent({
               return "";
             }
           }}
+          isOptionEqualToValue={(option: any, value: any) => {
+            return option.id === value.id;
+          }}
           size="medium"
         />
       );
@@ -142,6 +151,9 @@ export default function FiltersComponent({
               return "";
             }
           }}
+          isOptionEqualToValue={(option: any, value: any) => {
+            return option.id === value.id;
+          }}
           size="medium"
         />
       );