Load in default view by default

static/app/utils/withSavedSearches.tsx

@@ -2,6 +2,7 @@ import type {SavedSearch} from 'sentry/types/group';
 import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
+import {useFetchGroupSearchViews} from 'sentry/views/issueList/queries/useFetchGroupSearchViews';
 import {useFetchSavedSearchesForOrg} from 'sentry/views/issueList/queries/useFetchSavedSearchesForOrg';
 import {useSelectedSavedSearch} from 'sentry/views/issueList/utils/useSelectedSavedSearch';
 
@@ -15,6 +16,9 @@ type InjectedSavedSearchesProps = {
 /**
  * HOC to provide saved search data to class components.
  * When possible, use the hooks directly instead.
+ *
+ * Note: this HOC will be completely removed when issue views is GA'd, but until then
+ * we have to augment it to support both saved searches and issue views.
  */
 function withSavedSearches<P extends InjectedSavedSearchesProps>(
   WrappedComponent: React.ComponentType<P>
@@ -29,6 +33,12 @@ function withSavedSearches<P extends InjectedSavedSearchesProps>(
       },
       {enabled: !organization.features.includes('issue-stream-custom-views')}
     );
+    const {data: groupSearchViews, isPending: areViewsPending} = useFetchGroupSearchViews(
+      {
+        orgSlug: organization.slug,
+      },
+      {enabled: organization.features.includes('issue-stream-custom-views')}
+    );
 
     const params = useParams();
     const selectedSavedSearch = useSelectedSavedSearch();
@@ -38,10 +48,15 @@ function withSavedSearches<P extends InjectedSavedSearchesProps>(
         {...(props as P)}
         savedSearches={props.savedSearches ?? savedSearches}
         savedSearchLoading={
-          !organization.features.includes('issue-stream-custom-views') &&
-          (props.savedSearchLoading ?? isPending)
+          organization.features.includes('issue-stream-custom-views')
+            ? areViewsPending
+            : props.savedSearchLoading ?? isPending
+        }
+        savedSearch={
+          organization.features.includes('issue-stream-custom-views') && groupSearchViews
+            ? groupSearchViews[0]
+            : props.savedSearch ?? selectedSavedSearch
         }
-        savedSearch={props.savedSearch ?? selectedSavedSearch}
         selectedSearchId={params.searchId ?? null}
       />
     );

static/app/views/issueList/overview.tsx

@@ -317,10 +317,7 @@ class IssueListOverview extends Component<Props, State> {
     savedSearch,
     location,
   }: Pick<Props, 'savedSearch' | 'location'>): string {
-    if (
-      !this.props.organization.features.includes('issue-stream-custom-views') &&
-      savedSearch
-    ) {
+    if (savedSearch) {
       return savedSearch.query;
     }