From da51c4b270749d1cd97f12de2df620709c105be5 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Thu, 5 Oct 2017 17:49:04 +0530
Subject: [PATCH] Fixed table rendering issue.

---
 .../src/components/Application/ApplicationListing.jsx      | 4 ++--
 .../Application/Edit/GenenralInfo/GeneralInfo.jsx          | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
index c89ad7b10b..a3e5d3571c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
@@ -223,11 +223,11 @@ class ApplicationListing extends Component {
                     {this.headers.map(header => {
                         if (header.data_id === "applicationName") {
                             return (
-                                <Col xs="5"><FormattedMessage id={header.locale} defaultMessage={header.label}/></Col>)
+                                <Col xs="5">{header.label}</Col>)
                         } else if (header.data_id === "image") {
                             return (<Col xs="1">{header.label}</Col>)
                         }
-                        return (<Col><FormattedMessage id={header.locale} defaultMessage={header.label}/></Col>)
+                        return (<Col>{header.label}</Col>)
                     })}
                 </Row>
                 <hr/>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/GenenralInfo/GeneralInfo.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/GenenralInfo/GeneralInfo.jsx
index 3a1188a6f9..8e252a01d8 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/GenenralInfo/GeneralInfo.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/GenenralInfo/GeneralInfo.jsx
@@ -44,12 +44,7 @@ class GeneralInfo extends Component {
                             <Label for="app-title">
                                 <FormattedMessage id="Title" defaultMessage="Title"/>*
                             </Label>
-                            <Input
-                                required
-                                type="text"
-                                name="appName"
-                                id="app-title"
-                            />
+                            <Input required type="text" name="appName" id="app-title"/>
                         </FormGroup>
                         <FormGroup>
                             <Label for="app-title">