From 9b5793e70dfa45908efdc077332f88889faf588b Mon Sep 17 00:00:00 2001
From: Tibor Kollar <tbrkollar@gmail.com>
Date: Tue, 9 Jul 2024 11:10:58 +0200
Subject: [PATCH] fix:modify getCategory func for Matter and Zigbee mode

---
 src/components/ZclEndpointCard.vue | 16 ++++++++++++----
 src/util/common-mixin.js           | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/components/ZclEndpointCard.vue b/src/components/ZclEndpointCard.vue
index 8437e7ad5b..e1681dd4e3 100644
--- a/src/components/ZclEndpointCard.vue
+++ b/src/components/ZclEndpointCard.vue
@@ -182,10 +182,7 @@ limitations under the License.
               <strong>{{ parentEndpointIdentifier[endpointReference] }}</strong>
             </div>
           </q-item>
-          <q-item
-            class="row"
-            v-if="$store.state.zap.isProfileIdShown && enableProfileId"
-          >
+          <q-item class="row" v-if="showProfileId">
             <div class="col-6">
               <strong>Profile ID</strong>
             </div>
@@ -490,6 +487,17 @@ export default {
         return this.$store.state.zap.endpointView.profileId
       },
     },
+    showProfileId: {
+      get() {
+        if (
+          this.getDeviceCategory(this.deviceType[0]?.packageRef) !== 'matter' &&
+          this.$store.state.zap.isProfileIdShown &&
+          this.enableProfileId
+        ) {
+          return true
+        } else return false
+      },
+    },
     deviceId: {
       get() {
         return this.$store.state.zap.endpointTypeView.deviceIdentifier
diff --git a/src/util/common-mixin.js b/src/util/common-mixin.js
index 3939a645c0..41a1906d3b 100644
--- a/src/util/common-mixin.js
+++ b/src/util/common-mixin.js
@@ -318,15 +318,19 @@ export default {
      * @returns Returns a string value for category
      */
     getDeviceCategory(packageRef) {
-      let category = ''
-      let zclProperty =
-        this.$store.state.zap.selectedZapConfig.zclProperties.find(
-          (item) => item.id === packageRef && item.category
+      let zclProperty = ''
+      if (this.$store.state.zap.isMultiConfig) {
+        zclProperty =
+          this.$store.state.zap.selectedZapConfig.zclProperties.find(
+            (item) => item.id === packageRef && item.category
+          )
+        return zclProperty.category
+      } else {
+        zclProperty = this.$store.state.zap.packages.find(
+          (item) => item.pkg.id === packageRef && item.pkg.category
         )
-      if (zclProperty) {
-        category = zclProperty.category
+        return zclProperty.pkg?.category
       }
-      return category
     },
   },
 }