+ {
+ sprintf(
+ /* translators: %s: Analytics property ID */
+ __( 'Looks like you’re using Google Analytics. Your Analytics property %s is already set up in your Google Tag Manager configuration, so Site Kit will switch to using Google Tag Manager for Analytics.', 'google-site-kit' ),
+ singleAnalyticsPropertyID
+ )
+ }
+
+ );
+ }
+
+ // If the Analytics module is not active, and selected containers reference a singular property ID,
+ // recommend continuing with Analytics setup.
+ if ( ! analyticsModuleActive && singleAnalyticsPropertyID ) {
+ return (
+
+ { __( 'Looks like you’re already using Google Analytics within your Google Tag Manager configuration. Activate the Google Analytics module in Site Kit to see relevant insights in your dashboard.', 'google-site-kit' ) }
+
+ );
+ }
if ( hasExistingTag ) {
return
diff --git a/assets/js/modules/tagmanager/components/setup/SetupFormInstructions.js b/assets/js/modules/tagmanager/components/setup/SetupFormInstructions.js
deleted file mode 100644
index 89d852eda04..00000000000
--- a/assets/js/modules/tagmanager/components/setup/SetupFormInstructions.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Tag Manager Setup Form Instructions component.
- *
- * Site Kit by Google, Copyright 2020 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * WordPress dependencies
- */
-import { __, sprintf } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import Data from 'googlesitekit-data';
-import { STORE_NAME as CORE_MODULES } from '../../../../googlesitekit/modules/datastore/constants';
-import { STORE_NAME } from '../../datastore/constants';
-import { STORE_NAME as MODULES_ANALYTICS } from '../../../analytics/datastore/constants';
-import ErrorText from '../../../../components/error-text';
-import { FormInstructions } from '../common';
-const { useSelect } = Data;
-
-export default function SetupFormInstructions() {
- const singleAnalyticsPropertyID = useSelect( ( select ) => select( STORE_NAME ).getSingleAnalyticsPropertyID() );
- const hasMultipleAnalyticsPropertyIDs = useSelect( ( select ) => select( STORE_NAME ).hasMultipleAnalyticsPropertyIDs() );
- const analyticsPropertyID = useSelect( ( select ) => select( MODULES_ANALYTICS ).getPropertyID() );
- const analyticsModuleActive = useSelect( ( select ) => select( CORE_MODULES ).isModuleActive( 'analytics' ) );
-
- if ( [ singleAnalyticsPropertyID, hasMultipleAnalyticsPropertyIDs, analyticsPropertyID, analyticsModuleActive ].includes( undefined ) ) {
- return
;
- }
-
- // Multiple property IDs implies secondary AMP where selected containers don't reference the same Analytics property ID.
- if ( hasMultipleAnalyticsPropertyIDs ) {
- const message = __( 'Looks like you’re already using Google Analytics within your Google Tag Manager configurations. However, the configured Analytics tags reference different property IDs. You need to configure the same Analytics property in both containers.', 'google-site-kit' );
-
- return
;
- }
-
- if ( analyticsModuleActive && singleAnalyticsPropertyID ) {
- // If the selected containers reference a different property ID
- // than is currently set in the Analytics module, display an error explaining why the user is blocked.
- if ( singleAnalyticsPropertyID !== analyticsPropertyID ) {
- /* translators: %1$s: Tag Manager Analytics property ID, %2$s: Analytics property ID */
- const message = __( 'Looks like you’re already using Google Analytics within your Google Tag Manager configuration. However, its Analytics property %1$s is different from the Analytics property %2$s, which is currently selected in the plugin. You need to configure the same Analytics property in both places.', 'google-site-kit' );
-
- return
;
- }
- // If the Analytics property ID in the container(s) matches
- // the property ID configured for the Analytics module,
- // inform the user that Tag Manager will take over outputting the tag/snippet.
- return (
-
- {
- sprintf(
- /* translators: %s: Analytics property ID */
- __( 'Looks like you’re using Google Analytics. Your Analytics property %s is already set up in your Google Tag Manager configuration, so Site Kit will switch to using Google Tag Manager for Analytics.', 'google-site-kit' ),
- singleAnalyticsPropertyID
- )
- }
-
- );
- }
-
- // If the Analytics module is not active, and selected containers reference a singular property ID,
- // recommend continuing with Analytics setup.
- if ( ! analyticsModuleActive && singleAnalyticsPropertyID ) {
- return (
-
- { __( 'Looks like you’re already using Google Analytics within your Google Tag Manager configuration. Activate the Google Analytics module in Site Kit to see relevant insights in your dashboard.', 'google-site-kit' ) }
-
- );
- }
-
- return
;
-}
diff --git a/assets/js/modules/tagmanager/components/setup/index.js b/assets/js/modules/tagmanager/components/setup/index.js
index e1613b17837..9dea5cfff80 100644
--- a/assets/js/modules/tagmanager/components/setup/index.js
+++ b/assets/js/modules/tagmanager/components/setup/index.js
@@ -18,5 +18,4 @@
export { default as SetupErrorNotice } from './SetupErrorNotice';
export { default as SetupForm } from './SetupForm';
-export { default as SetupFormInstructions } from './SetupFormInstructions';
export { default as SetupMain } from './SetupMain';