Merge branch 'develop' into feat/replace-select-picker-v3

Author: shivani170

src/components/ApplicationGroup/AppGroupDetailsRoute.tsx

@@ -204,16 +204,19 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
         setAppGroupListData(result)
         setDescription(result.description)
         if (result.apps?.length) {
-            setAppListOptions(
-                result.apps
-                    .map((app): OptionType => {
-                        return {
-                            value: `${app.appId}`,
-                            label: app.appName,
-                        }
-                    })
-                    .sort(sortOptionsByLabel),
-            )
+            const _appListOptions = result.apps
+                .map((app): OptionType => {
+                    return {
+                        value: `${app.appId}`,
+                        label: app.appName,
+                    }
+                })
+                .sort(sortOptionsByLabel)
+
+            setAppListOptions(_appListOptions)
+            if (selectedGroupFilter.length) {
+                setSelectedAppList(_appListOptions.filter((app) => selectedGroupFilter[0].appIds.includes(+app.value)))
+            }
         }
         setAppListLoading(false)
     }