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 5c74935a80..7257304518 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 ba6227af87..f235ef5cfd 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 && (

{step.text}

{proceedingStates.map(lifecycleState => { @@ -228,8 +227,6 @@ class LifeCycle extends React.Component { ); })}
- ) : ( - '' ) } /> @@ -251,17 +248,13 @@ class LifeCycle extends React.Component { {selectedStatus}
- {lifecycle && - selectedStatus && - lifecycle[selectedStatus].isEndState ? ( + {lifecycle && selectedStatus && lifecycle[selectedStatus].isEndState && ( - ) : ( -
)} Reason