From c8b939f95ffb4c2df3f98e9d9bdce2a29d3b5f8c Mon Sep 17 00:00:00 2001
From: Thomas Roberts <thomas.roberts@automattic.com>
Date: Tue, 7 Nov 2023 18:29:44 +0000
Subject: [PATCH] Update imports of Checkbox Control

---
 .../payment-methods/payment-method-card.tsx                    | 2 +-
 .../blocks/checkout/inner-blocks/checkout-terms-block/edit.tsx | 2 +-
 .../checkout/inner-blocks/checkout-terms-block/frontend.tsx    | 2 +-
 assets/js/blocks/checkout/order-notes/index.tsx                | 3 +--
 packages/checkout/components/checkbox-control/index.tsx        | 2 +-
 packages/checkout/components/index.ts                          | 2 +-
 packages/components/checkbox-list/index.tsx                    | 3 +--
 packages/components/index.ts                                   | 1 +
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/assets/js/blocks/cart-checkout-shared/payment-methods/payment-method-card.tsx b/assets/js/blocks/cart-checkout-shared/payment-methods/payment-method-card.tsx
index ed32a66c6fd..71c12900ebe 100644
--- a/assets/js/blocks/cart-checkout-shared/payment-methods/payment-method-card.tsx
+++ b/assets/js/blocks/cart-checkout-shared/payment-methods/payment-method-card.tsx
@@ -3,7 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { useEditorContext } from '@woocommerce/base-context';
-import { CheckboxControl } from '@woocommerce/blocks-checkout';
+import { CheckboxControl } from '@woocommerce/blocks-components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { CHECKOUT_STORE_KEY, PAYMENT_STORE_KEY } from '@woocommerce/block-data';
 
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/edit.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/edit.tsx
index 2ba5e0e462b..3fda91777ef 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/edit.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/edit.tsx
@@ -7,7 +7,7 @@ import {
 	RichText,
 	InspectorControls,
 } from '@wordpress/block-editor';
-import { CheckboxControl } from '@woocommerce/blocks-checkout';
+import { CheckboxControl } from '@woocommerce/blocks-components';
 import {
 	PanelBody,
 	ToggleControl,
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/frontend.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/frontend.tsx
index 46ffce5c4cc..b5a2f52dd2a 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/frontend.tsx
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-terms-block/frontend.tsx
@@ -4,7 +4,7 @@
 import { __ } from '@wordpress/i18n';
 import classnames from 'classnames';
 import { useState, useEffect } from '@wordpress/element';
-import { CheckboxControl } from '@woocommerce/blocks-checkout';
+import { CheckboxControl } from '@woocommerce/blocks-components';
 import { useCheckoutSubmit } from '@woocommerce/base-context/hooks';
 import { withInstanceId } from '@wordpress/compose';
 import { useDispatch, useSelect } from '@wordpress/data';
diff --git a/assets/js/blocks/checkout/order-notes/index.tsx b/assets/js/blocks/checkout/order-notes/index.tsx
index cace83c8c65..910d55d2e54 100644
--- a/assets/js/blocks/checkout/order-notes/index.tsx
+++ b/assets/js/blocks/checkout/order-notes/index.tsx
@@ -3,8 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
-import { CheckboxControl } from '@woocommerce/blocks-checkout';
-import { Textarea } from '@woocommerce/blocks-components';
+import { CheckboxControl, Textarea } from '@woocommerce/blocks-components';
 
 interface CheckoutOrderNotesProps {
 	disabled: boolean;
diff --git a/packages/checkout/components/checkbox-control/index.tsx b/packages/checkout/components/checkbox-control/index.tsx
index 31bb0ac1963..b62cfd10777 100644
--- a/packages/checkout/components/checkbox-control/index.tsx
+++ b/packages/checkout/components/checkbox-control/index.tsx
@@ -1 +1 @@
-export { CheckboxControl } from '../../../../components/checkbox-control';
+export { CheckboxControl } from '../../../components/checkbox-control';
diff --git a/packages/checkout/components/index.ts b/packages/checkout/components/index.ts
index 198e4677359..1b660522f9c 100644
--- a/packages/checkout/components/index.ts
+++ b/packages/checkout/components/index.ts
@@ -8,7 +8,7 @@ export { default as Panel } from './panel';
 export { default as Button } from './button';
 export { default as Label } from './label';
 export { default as StoreNoticesContainer } from './store-notices-container';
-export { default as CheckboxControl } from './checkbox-control';
+export { CheckboxControl } from './checkbox-control';
 export {
 	default as ValidatedTextInput,
 	ValidatedTextInputHandle,
diff --git a/packages/components/checkbox-list/index.tsx b/packages/components/checkbox-list/index.tsx
index 9166bdad61b..ca7a2c847e9 100644
--- a/packages/components/checkbox-list/index.tsx
+++ b/packages/components/checkbox-list/index.tsx
@@ -4,13 +4,12 @@
 import { __, _n, sprintf } from '@wordpress/i18n';
 import { Fragment, useMemo, useState } from '@wordpress/element';
 import classNames from 'classnames';
-import { CheckboxControl } from '@woocommerce/blocks-checkout';
 
 /**
  * Internal dependencies
  */
 import './style.scss';
-
+import { CheckboxControl } from '../checkbox-control';
 interface CheckboxListOptions {
 	label: React.ReactNode;
 	value: string;
diff --git a/packages/components/index.ts b/packages/components/index.ts
index 5d4730bf63a..cae225d3c49 100644
--- a/packages/components/index.ts
+++ b/packages/components/index.ts
@@ -1,3 +1,4 @@
+export { default as CheckboxControl } from './checkbox-control';
 export { default as CheckboxList } from './checkbox-list';
 export { Chip, RemovableChip } from './chip';
 export { default as FormStep } from './form-step';