Revert "Hide tooltip related to Storefront theme in Multi-Currency se…

…ttings when Storefront is not the active theme" This reverts commit 557b7d9.
Automattic · Oct 2, 2023 · 7354671 · 7354671
1 parent 557b7d9
commit 7354671
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 47 deletions.
diff --git a/changelog/2023-10-02-17-34-52-222632 b/changelog/2023-10-02-17-34-52-222632
diff --git a/client/multi-currency-setup/tasks/store-settings-task/index.js b/client/multi-currency-setup/tasks/store-settings-task/index.js
@@ -128,14 +128,14 @@ const StoreSettingsTask = () => {
 									) }
 								/>
 								<br />
-								<div className="wcpay-wizard-task__description-element is-muted-color">
-									{ __(
-										'A currency switcher is also available in your widgets.',
-										'woocommerce-payments'
-									) }
-								</div>
 							</>
 						) : null }
+						<div className="wcpay-wizard-task__description-element is-muted-color">
+							{ __(
+								'A currency switcher is also available in your widgets.',
+								'woocommerce-payments'
+							) }
+						</div>
 					</CardBody>
 				</Card>
 				<Button

diff --git a/client/multi-currency/multi-currency-settings/store-settings/index.js b/client/multi-currency/multi-currency-settings/store-settings/index.js
@@ -139,44 +139,35 @@ const StoreSettings = () => {
 								) }
 							</div>
 							{ storeSettings.site_theme === 'Storefront' ? (
-								<>
-									<CheckboxControl
-										checked={
-											isStorefrontSwitcherEnabledValue
-										}
-										onChange={
-											handleIsStorefrontSwitcherEnabledClick
-										}
-										data-testid={
-											'enable_storefront_switcher'
-										}
-										label={ __(
-											'Add a currency switcher to the Storefront theme on breadcrumb section.',
-											'woocommerce-payments'
-										) }
-									/>
-									<div className="multi-currency-settings__description">
-										{ createInterpolateElement(
-											sprintf(
-												/* translators: %s: url to the widgets page */
-												__(
-													'A currency switcher is also available in your widgets. ' +
-														'<linkToWidgets>Configure now</linkToWidgets>',
-													'woocommerce-payments'
-												),
-												'widgets.php'
-											),
-											{
-												// eslint-disable-next-line jsx-a11y/anchor-has-content
-												linkToWidgets: (
-													// eslint-disable-next-line jsx-a11y/anchor-has-content
-													<a href="widgets.php" />
-												),
-											}
-										) }
-									</div>
-								</>
+								<CheckboxControl
+									checked={ isStorefrontSwitcherEnabledValue }
+									onChange={
+										handleIsStorefrontSwitcherEnabledClick
+									}
+									data-testid={ 'enable_storefront_switcher' }
+									label={ __(
+										'Add a currency switcher to the Storefront theme on breadcrumb section.',
+										'woocommerce-payments'
+									) }
+								/>
 							) : null }
+							<div className="multi-currency-settings__description">
+								{ createInterpolateElement(
+									sprintf(
+										/* translators: %s: url to the widgets page */
+										__(
+											'A currency switcher is also available in your widgets. ' +
+												'<linkToWidgets>Configure now</linkToWidgets>',
+											'woocommerce-payments'
+										),
+										'widgets.php'
+									),
+									{
+										// eslint-disable-next-line jsx-a11y/anchor-has-content
+										linkToWidgets: <a href="widgets.php" />,
+									}
+								) }
+							</div>
 						</CardBody>
 						<PreviewModal
 							isPreviewModalOpen={ isPreviewModalOpen }