From 8ed7c15bdd1ac3758695f419f801c77cacb745eb Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 31 Oct 2019 13:34:44 +0530
Subject: [PATCH] Fix app offset issue in APPM Store UI

---
 .../src/components/new-app/subForms/NewAppDetailsForm.js   | 2 +-
 .../react-app/src/components/apps/AppList.js               | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js
index 1a0ac43127..36b5d4e79b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js
@@ -344,7 +344,7 @@ class NewAppDetailsForm extends React.Component {
                                     banner
                                     closable/>
                             )}
-                            <Form.Item {...formItemLayout} label="Unrestricted Roles">
+                            <Form.Item {...formItemLayout} label="Visible Roles">
                                 {getFieldDecorator('unrestrictedRoles', {
                                     rules: [],
                                     initialValue: []
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
index 5667cf3b9b..fb2bf14a58 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js
@@ -57,7 +57,12 @@ class AppList extends React.Component {
         if (prevProps.deviceType !== this.props.deviceType) {
             const {deviceType} = this.props;
             this.props.changeSelectedMenuItem(deviceType);
-            this.fetchData(deviceType);
+            this.fetchData(0, limit, res => {
+                this.setState({
+                    apps: res,
+                    loading: false
+                });
+            });
         }
     }