From 404b1b11a9dd9a3d7e27d5f93dcd51139ebd6add Mon Sep 17 00:00:00 2001
From: shamalka <shamalkanavod95@gmail.com>
Date: Thu, 4 Jun 2020 13:17:22 +0530
Subject: [PATCH] Improve description

---
 .../react-app/public/conf/config.json                 |  4 ++--
 .../Apps/scenes/Release/components/LifeCycle/index.js | 11 ++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json
index 5c74935a803..72573045182 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json
@@ -47,7 +47,7 @@
     },
     "IN-REVIEW": {
       "title": "In-Review",
-      "text": "This state can be applied when the application is being reviewed by approvers.\n You can only proceed to one of the following states:",
+      "text": "In this state the application is being reviewed by approvers. You can move from this state to APPROVED state if it is approved by reviewers. Otherwise, you can move the application into either REJECTED state or CREATED state based on the feedback getting by reviewers.",
       "icon": "audit",
       "step": 1
     },
@@ -83,7 +83,7 @@
     },
     "RETIRED": {
       "title": "Retired",
-      "text": "The final state of an application, where no transition of states will be allowed after this.\n You can only proceed to one of the following states:",
+      "text": "The final state of an application, where no transition of states will be allowed after this.",
       "icon": "rest",
       "step": 7
     }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js
index ba6227af870..f235ef5cfda 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js
@@ -177,7 +177,6 @@ class LifeCycle extends React.Component {
     } = this.state;
     const { lifecycle } = this.props;
     let proceedingStates = [];
-
     if (
       lifecycle !== null &&
       lifecycle.hasOwnProperty(currentStatus) &&
@@ -211,7 +210,7 @@ class LifeCycle extends React.Component {
                 title={step.title}
                 disabled={current !== step.step}
                 description={
-                  current === step.step ? (
+                  current === step.step && (
                     <div style={{ width: 400 }}>
                       <p>{step.text}</p>
                       {proceedingStates.map(lifecycleState => {
@@ -228,8 +227,6 @@ class LifeCycle extends React.Component {
                         );
                       })}
                     </div>
-                  ) : (
-                    ''
                   )
                 }
               />
@@ -251,17 +248,13 @@ class LifeCycle extends React.Component {
             <Tag color="blue">{selectedStatus}</Tag>
           </Text>
           <br />
-          {lifecycle &&
-          selectedStatus &&
-          lifecycle[selectedStatus].isEndState ? (
+          {lifecycle && selectedStatus && lifecycle[selectedStatus].isEndState && (
             <Alert
               message="In this state application becomes completely obsolete. Be careful,
               this process cannot be undone."
               banner
               style={{ marginTop: 5 }}
             />
-          ) : (
-            <div />
           )}
           <Divider orientation="left">Reason</Divider>
           <ReactQuill