From a3e0eb031c103dca9f4205ea1e226b9244f4d750 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Sun, 15 Sep 2019 22:38:07 +0530
Subject: [PATCH] Fix custom app loading issue

---
 .../wso2/carbon/device/application/mgt/core/util/APIUtil.java   | 1 +
 .../react-app/src/pages/dashboard/Dashboard.js                  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
index 21158781a0e..0829079e669 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
@@ -323,6 +323,7 @@ public class APIUtil {
             applicationReleaseDTO.setDescription(customAppReleaseWrapper.getDescription());
             applicationReleaseDTO.setReleaseType(customAppReleaseWrapper.getReleaseType());
             applicationReleaseDTO.setVersion(customAppReleaseWrapper.getVersion());
+            applicationReleaseDTO.setSupportedOsVersions(Constants.ANY);
             applicationReleaseDTO.setPackageName(customAppReleaseWrapper.getPackageName());
             applicationReleaseDTO.setPrice(customAppReleaseWrapper.getPrice());
             applicationReleaseDTO.setIsSharedWithAllTenants(customAppReleaseWrapper.getIsSharedWithAllTenants());
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js
index 7b0fdb14190..1ec219c8137 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js
@@ -90,6 +90,8 @@ class Dashboard extends React.Component {
                                         APP</Link></Menu.Item>
                                     <Menu.Item key="setting:3"><Link to="/publisher/add-new-app/web-clip">Web
                                         Clip</Link></Menu.Item>
+                                    <Menu.Item key="setting:3"><Link to="/publisher/add-new-app/custom-app">Custom
+                                        App</Link></Menu.Item>
                                 </SubMenu>
                                 <Menu.Item key="2"><Link to="/publisher/manage"><Icon
                                     type="control"/>Manage</Link></Menu.Item>