missed a spot

Author: ryan953

static/app/components/feedback/list/useMailboxCounts.tsx

@@ -5,9 +5,12 @@ import type {Organization} from 'sentry/types/organization';
 import {getApiUrl} from 'sentry/utils/api/getApiUrl';
 import {coaleseIssueStatsPeriodQuery} from 'sentry/utils/feedback/coaleseIssueStatsPeriodQuery';
 import {useApiQuery, type UseApiQueryResult} from 'sentry/utils/queryClient';
-import {decodeList, decodeScalar} from 'sentry/utils/queryString';
+import {decodeScalar} from 'sentry/utils/queryString';
 import type {RequestError} from 'sentry/utils/requestError/requestError';
-import {useLocationQuery} from 'sentry/utils/url/useLocationQuery';
+import {
+  useListQueryState,
+  useSearchQueryState,
+} from 'sentry/utils/url/useSentryQueryState';
 import {useLocation} from 'sentry/utils/useLocation';
 
 interface Props {
@@ -40,29 +43,22 @@ export function useMailboxCounts({
 
   const mailboxQuery = Object.values(MAILBOX);
 
-  const queryView = useLocationQuery({
-    fields: {
-      end: decodeScalar,
-      environment: decodeList,
-      field: decodeList,
-      project: decodeList,
-      query: mailboxQuery,
-      queryReferrer: 'feedback_mailbox_count',
-      start: decodeScalar,
-      statsPeriod: decodeScalar,
-      utc: decodeScalar,
-    },
-  });
+  const listQueryState = useListQueryState();
+  const searchQueryState = useSearchQueryState();
 
   const queryViewWithStatsPeriod = useMemo(
-    () =>
-      coaleseIssueStatsPeriodQuery({
-        defaultStatsPeriod: '0d',
+    () => ({
+      ...listQueryState,
+      ...searchQueryState,
+      queryReferrer: 'feedback_mailbox_count',
+      query: mailboxQuery,
+      ...coaleseIssueStatsPeriodQuery({
         listHeadTime,
         prefetch: false,
-        queryView,
+        statsPeriod: listQueryState.statsPeriod,
       }),
-    [listHeadTime, queryView]
+    }),
+    [listHeadTime, listQueryState, searchQueryState, mailboxQuery]
   );
 
   const result = useApiQuery<ApiReturnType>(

static/app/views/alerts/create.tsx

@@ -78,7 +78,7 @@ export default function Create() {
       !(aggregate && dataset && eventTypes) &&
       !createFromDuplicate
     ) {
-      router.replace(
+      navigate(
         normalizeUrl({
           ...location,
           pathname: makeAlertsPathname({
@@ -90,7 +90,8 @@ export default function Create() {
             ...DEFAULT_WIZARD_TEMPLATE,
             project: project.slug,
           },
-        })
+        }),
+        {replace: true}
       );
     }
   }, [
@@ -99,7 +100,7 @@ export default function Create() {
     dataset,
     eventTypes,
     createFromDuplicate,
-    router,
+    navigate,
     location,
     organization.slug,
     project.slug,

static/app/views/alerts/rules/metric/create.tsx

@@ -7,6 +7,7 @@ import {metric} from 'sentry/utils/analytics';
 import type {EventView} from 'sentry/utils/discover/eventView';
 import {decodeScalar} from 'sentry/utils/queryString';
 import {normalizeUrl} from 'sentry/utils/url/normalizeUrl';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {makeAlertsPathname} from 'sentry/views/alerts/pathnames';
 import {
   createDefaultRule,
@@ -37,8 +38,9 @@ type Props = {
  */
 export function MetricRulesCreate(props: Props) {
   const theme = useTheme();
+  const navigate = useNavigate();
   function handleSubmitSuccess(data: any) {
-    const {organization, project, router} = props;
+    const {organization, project} = props;
     const alertRuleId = data ? (data.id as string | undefined) : undefined;
 
     metric.endSpan({name: 'saveAlertRule'});
@@ -56,7 +58,7 @@ export function MetricRulesCreate(props: Props) {
           }),
           query: {project: project.id},
         };
-    router.push(normalizeUrl(target));
+    navigate(normalizeUrl(target));
   }
 
   const {

static/app/views/alerts/rules/metric/duplicate.tsx

@@ -9,6 +9,7 @@ import type {Project} from 'sentry/types/project';
 import type {EventView} from 'sentry/utils/discover/eventView';
 import {uniqueId} from 'sentry/utils/guid';
 import {normalizeUrl} from 'sentry/utils/url/normalizeUrl';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {makeAlertsPathname} from 'sentry/views/alerts/pathnames';
 import {
@@ -40,6 +41,7 @@ export function MetricRuleDuplicate({
   ...otherProps
 }: MetricRuleDuplicateProps) {
   const theme = useTheme();
+  const navigate = useNavigate();
   const organization = useOrganization();
   const duplicateRuleId: string = otherProps.location.query.duplicateRuleId;
   const {
@@ -68,7 +70,7 @@ export function MetricRuleDuplicate({
           }),
           query: {project: project.id},
         };
-    otherProps.router.push(normalizeUrl(target));
+    navigate(normalizeUrl(target));
   };
 
   if (isPending) {