From 19750486dec1d3dc3a414a9be23eef02b9a88ce3 Mon Sep 17 00:00:00 2001
From: Thashmi-nil <nilupuleethash765@gmail.com>
Date: Thu, 30 Mar 2023 23:20:15 +0530
Subject: [PATCH] Add improvements

---
 .../carbon/device/mgt/core/config/ui/HubspotChat.java    | 9 ---------
 .../src/main/resources/conf/mdm-ui-config.xml            | 1 -
 2 files changed, 10 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/HubspotChat.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/HubspotChat.java
index 728176e1db..ec22d125a1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/HubspotChat.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/HubspotChat.java
@@ -25,7 +25,6 @@ public class HubspotChat {
     private String trackingUrl;
     private String accessToken;
     private String senderActorId;
-    private long channelAccountId;
 
     @XmlElement(name = "EnableHubspot")
     public boolean isEnableHubspot() {
@@ -61,12 +60,4 @@ public class HubspotChat {
     public void setSenderActorId(String senderActorId) {
         this.senderActorId = senderActorId;
     }
-    @XmlElement(name = "ChannelAccountId")
-    public long getChannelAccountId() {
-        return channelAccountId;
-    }
-
-    public void setChannelAccountId(long channelAccountId) {
-        this.channelAccountId = channelAccountId;
-    }
 }
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
index 4867c665c0..1c33bddfdb 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
@@ -31,7 +31,6 @@
         <!--  access token - whenever the access token will be rotated, needs to be changed this with the new token  -->
         <AccessToken>access_token</AccessToken>
         <SenderActorId>sender_actorId</SenderActorId>
-        <ChannelAccountId>channel_AccountId</ChannelAccountId>
     </HubspotChat>
     <Billing>
         <HideBillGenerationInSuperTenant>false</HideBillGenerationInSuperTenant>