diff --git a/src/api/marketplace/accounts/serializers.py b/src/api/marketplace/accounts/serializers.py index debc5d45..9d914e68 100644 --- 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 index 1d1a12e5..2be075f0 100644 --- 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 index aa23b03d..34035299 100644 --- 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 }) => (