Move away further from Calypso

packages/help-center/src/components/help-center-article-fetching-content.tsx

@@ -1,8 +1,8 @@
 /* eslint-disable no-restricted-imports */
 import { useLocale } from '@automattic/i18n-utils';
 import { useEffect } from 'react';
-import { SUPPORT_BLOG_ID } from 'calypso/blocks/inline-help/constants';
 import useSupportArticleAlternatesQuery from 'calypso/data/support-article-alternates/use-support-article-alternates-query';
+import { SUPPORT_BLOG_ID } from '../constants';
 import { usePostByKey } from '../hooks/use-post-by-key';
 import ArticleContent from './help-center-article-content';
 import './help-center-article-content.scss';

packages/help-center/src/components/help-center-contact-form.tsx

@@ -13,12 +13,12 @@ import { Button, TextControl, CheckboxControl, Tip } from '@wordpress/components
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { Icon, info } from '@wordpress/icons';
+import { getQueryArgs } from '@wordpress/url';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { useDebounce } from 'use-debounce';
 import { decodeEntities, preventWidows } from 'calypso/lib/formatting';
 import { isWcMobileApp } from 'calypso/lib/mobile-app';
-import { getQueryArgs } from 'calypso/lib/query-args';
 /**
  * Internal Dependencies
  */
@@ -353,7 +353,7 @@ export const HelpCenterContactForm = ( props: HelpCenterContactFormProps ) => {
 						`Plan: ${ productId } - ${ productName } (${ productTerm })`,
 					];
 
-					if ( getQueryArgs()?.ref === 'woocommerce-com' ) {
+					if ( getQueryArgs( window.location.href )?.ref === 'woocommerce-com' ) {
 						ticketMeta.push(
 							`Created during store setup on ${
 								isWcMobileApp() ? 'Woo mobile app' : 'Woo browser'

packages/help-center/src/components/help-center-search-results.tsx

@@ -24,11 +24,11 @@ import { debounce } from 'lodash';
 import PropTypes from 'prop-types';
 import { Fragment, useEffect, useMemo } from 'react';
 import { useDebounce } from 'use-debounce';
-import { useHelpSearchQuery } from 'calypso/data/help/use-help-search-query';
 import { decodeEntities, preventWidows } from 'calypso/lib/formatting';
 import { useHelpCenterContext } from '../contexts/HelpCenterContext';
 import { useAdminResults } from '../hooks/use-admin-results';
 import { useContextBasedSearchMapping } from '../hooks/use-context-based-search-mapping';
+import { useHelpSearchQuery } from '../hooks/use-help-search-query';
 import { useSiteIntent } from '../hooks/use-site-intent';
 import PlaceholderLines from './placeholder-lines';
 import type { SearchResult } from '../types';

packages/help-center/src/constants.ts

@@ -0,0 +1 @@
+export const SUPPORT_BLOG_ID = 9619154;