Fix imports and rename setisDirty

Automattic · Sep 15, 2024 · 0554da1 · 0554da1
1 parent 47001e5
commit 0554da1
Show file tree

Hide file tree

Showing 22 changed files with 41 additions and 40 deletions.
diff --git a/client/settings/fraud-protection/advanced-settings/cards/order-items-threshold.tsx b/client/settings/fraud-protection/advanced-settings/cards/order-items-threshold.tsx
@@ -37,7 +37,7 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
 		protectionSettingsUI,
 		setProtectionSettingsUI,
 		setProtectionSettingsChanged,
-		setisDirty,
+		setIsDirty,
 	} = useContext( FraudPreventionSettingsContext );
 
 	const settingUI = useMemo(
@@ -100,7 +100,7 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
 						type="number"
 						onChange={ ( value ) => {
 							setMinItemsCount( value );
-							setisDirty( true );
+							setIsDirty( true );
 						} }
 						onKeyDown={ ( e ) =>
 							/^[+-.,e]$/m.test( e.key ) && e.preventDefault()
@@ -127,7 +127,7 @@ const OrderItemsThresholdCustomForm: React.FC< OrderItemsThresholdCustomFormProp
 						value={ maxItemsCount }
 						onChange={ ( value ) => {
 							setMaxItemsCount( value );
-							setisDirty( true );
+							setIsDirty( true );
 						} }
 						onKeyDown={ ( e ) =>
 							/^[+-.,e]$/m.test( e.key ) && e.preventDefault()

diff --git a/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx b/client/settings/fraud-protection/advanced-settings/cards/purchase-price-threshold.tsx
@@ -56,7 +56,7 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
 		protectionSettingsUI,
 		setProtectionSettingsUI,
 		setProtectionSettingsChanged,
-		setisDirty,
+		setIsDirty,
 	} = useContext( FraudPreventionSettingsContext );
 
 	const settingUI = useMemo(
@@ -114,7 +114,7 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
 						value={ minAmount.toString() }
 						onChange={ ( val ) => {
 							setMinAmount( Number( val ) );
-							setisDirty( true );
+							setIsDirty( true );
 						} }
 						help={ __(
 							'Leave blank for no limit',
@@ -136,7 +136,7 @@ const PurchasePriceThresholdCustomForm: React.FC< PurchasePriceThresholdCustomFo
 						value={ maxAmount.toString() }
 						onChange={ ( val ) => {
 							setMaxAmount( Number( val ) );
-							setisDirty( true );
+							setIsDirty( true );
 						} }
 						help={ __(
 							'Leave blank for no limit',

diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/address-mismatch.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/address-mismatch.test.tsx
@@ -34,7 +34,7 @@ describe( 'Address mismatch card', () => {
 		setProtectionSettingsUI: setSettings,
 		protectionSettingsChanged: false,
 		setProtectionSettingsChanged: jest.fn(),
-		setisDirty: jest.fn(),
+		setIsDirty: jest.fn(),
 	};
 	test( 'renders correctly', () => {
 		settings.address_mismatch.enabled = false;

diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/avs-mismatch.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/avs-mismatch.test.tsx
@@ -42,7 +42,7 @@ describe( 'AVS mismatch card', () => {
 			setProtectionSettingsUI: setSettings,
 			protectionSettingsChanged: false,
 			setProtectionSettingsChanged: jest.fn(),
-			setisDirty: jest.fn(),
+			setIsDirty: jest.fn(),
 		};
 		const { container } = render(
 			<FraudPreventionSettingsContext.Provider value={ contextValue }>
@@ -71,7 +71,7 @@ describe( 'AVS mismatch card', () => {
 			setProtectionSettingsUI: setSettings,
 			protectionSettingsChanged: false,
 			setProtectionSettingsChanged: jest.fn(),
-			setisDirty: jest.fn(),
+			setIsDirty: jest.fn(),
 		};
 		const { container } = render(
 			<FraudPreventionSettingsContext.Provider value={ contextValue }>

diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/cvc-verification.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/cvc-verification.test.tsx
@@ -42,7 +42,7 @@ describe( 'CVC verification card', () => {
 			setProtectionSettingsUI: setSettings,
 			protectionSettingsChanged: false,
 			setProtectionSettingsChanged: jest.fn(),
-			setisDirty: jest.fn(),
+			setIsDirty: jest.fn(),
 		};
 		const { container } = render(
 			<FraudPreventionSettingsContext.Provider value={ contextValue }>
@@ -74,7 +74,7 @@ describe( 'CVC verification card', () => {
 			setProtectionSettingsUI: setSettings,
 			protectionSettingsChanged: false,
 			setProtectionSettingsChanged: jest.fn(),
-			setisDirty: jest.fn(),
+			setIsDirty: jest.fn(),
 		};
 		const { container } = render(
 			<FraudPreventionSettingsContext.Provider value={ contextValue }>

diff --git a/.../settings/fraud-protection/advanced-settings/cards/test/international-ip-address.test.tsx b/.../settings/fraud-protection/advanced-settings/cards/test/international-ip-address.test.tsx
@@ -44,7 +44,7 @@ describe( 'International IP address card', () => {
 		protectionSettingsChanged: false,
 		setProtectionSettingsChanged: jest.fn(),
 		isDirty: false,
-		setisDirty: jest.fn(),
+		setIsDirty: jest.fn(),
 	};
 	global.wcSettings = {
 		admin: {

diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/ip-address-mismatch.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/ip-address-mismatch.test.tsx
@@ -40,7 +40,7 @@ describe( 'International billing address card', () => {
 		setProtectionSettingsUI: setSettings,
 		protectionSettingsChanged: false,
 		setProtectionSettingsChanged: jest.fn(),
-		setisDirty: jest.fn(),
+		setIsDirty: jest.fn(),
 	};
 	global.wcSettings = {
 		admin: {

diff --git a/client/settings/fraud-protection/advanced-settings/cards/test/order-items-threshold.test.tsx b/client/settings/fraud-protection/advanced-settings/cards/test/order-items-threshold.test.tsx
@@ -39,7 +39,7 @@ describe( 'Order items threshold card', () => {
 		setProtectionSettingsUI: setSettings,
 		protectionSettingsChanged: false,
 		setProtectionSettingsChanged: jest.fn(),
-		setisDirty: jest.fn(),
+		setIsDirty: jest.fn(),
 	};
 	test( 'renders correctly', () => {
 		const { container } = render(

diff --git a/.../settings/fraud-protection/advanced-settings/cards/test/purchase-price-threshold.test.tsx b/.../settings/fraud-protection/advanced-settings/cards/test/purchase-price-threshold.test.tsx
@@ -67,7 +67,7 @@ describe( 'Purchase price threshold card', () => {
 		setProtectionSettingsUI: setSettings,
 		protectionSettingsChanged: false,
 		setProtectionSettingsChanged: jest.fn(),
-		setisDirty: jest.fn(),
+		setIsDirty: jest.fn(),
 	};
 	test( 'renders correctly', () => {
 		const { container } = render(

diff --git a/client/settings/fraud-protection/advanced-settings/context.ts b/client/settings/fraud-protection/advanced-settings/context.ts
@@ -9,7 +9,7 @@ const FraudPreventionSettingsContext = createContext( {
 	setProtectionSettingsUI: () => null,
 	protectionSettingsChanged: false,
 	setProtectionSettingsChanged: () => false,
-	setisDirty: () => null,
+	setIsDirty: () => null,
 } as FraudPreventionSettingsContextType );
 
 export default FraudPreventionSettingsContext;
diff --git a/client/settings/fraud-protection/advanced-settings/index.tsx b/client/settings/fraud-protection/advanced-settings/index.tsx
@@ -102,7 +102,7 @@ const SaveFraudProtectionSettingsButton: React.FC = ( { children } ) => {
 };
 
 const FraudProtectionAdvancedSettingsPage: React.FC = () => {
-	const [ isDirty, setisDirty ] = useState( false );
+	const [ isDirty, setIsDirty ] = useState( false );
 
 	const { saveSettings, isLoading, isSaving } = useSettings() as SettingsHook;
 
@@ -344,7 +344,7 @@ const FraudProtectionAdvancedSettingsPage: React.FC = () => {
 				setProtectionSettingsUI,
 				protectionSettingsChanged,
 				setProtectionSettingsChanged,
-				setisDirty,
+				setIsDirty,
 			} }
 		>
 			<SettingsLayout displayBanner={ false }>

diff --git a/client/settings/fraud-protection/advanced-settings/rule-toggle.tsx b/client/settings/fraud-protection/advanced-settings/rule-toggle.tsx
@@ -58,7 +58,7 @@ const FraudProtectionRuleToggle: React.FC< FraudProtectionRuleToggleProps > = (
 		protectionSettingsUI,
 		setProtectionSettingsUI,
 		setProtectionSettingsChanged,
-		setisDirty,
+		setIsDirty,
 	} = useContext( FraudPreventionSettingsContext );
 
 	const { isFRTReviewFeatureActive } = wcpaySettings;
@@ -101,7 +101,7 @@ const FraudProtectionRuleToggle: React.FC< FraudProtectionRuleToggleProps > = (
 
 	const handleToggleChange = () => {
 		setToggleState( ( value ) => ! value );
-		setisDirty( true );
+		setIsDirty( true );
 	};
 
 	if ( ! protectionSettingsUI ) {

diff --git a/client/settings/fraud-protection/advanced-settings/test/allow-countries-notice.test.tsx b/client/settings/fraud-protection/advanced-settings/test/allow-countries-notice.test.tsx
@@ -19,7 +19,7 @@ const mockContext = {
 	protectionSettingsChanged: false,
 	setProtectionSettingsUI: jest.fn(),
 	setProtectionSettingsChanged: jest.fn(),
-	setisDirty: jest.fn(),
+	setIsDirty: jest.fn(),
 };
 
 declare const global: {

diff --git a/client/settings/fraud-protection/advanced-settings/test/rule-toggle.test.tsx b/client/settings/fraud-protection/advanced-settings/test/rule-toggle.test.tsx
@@ -26,7 +26,7 @@ interface mockContext {
 	protectionSettingsChanged: boolean;
 	setProtectionSettingsUI: jest.Mock;
 	setProtectionSettingsChanged: jest.Mock;
-	setisDirty: jest.Mock;
+	setIsDirty: jest.Mock;
 }
 
 describe( 'Fraud protection rule toggle tests', () => {
@@ -44,7 +44,7 @@ describe( 'Fraud protection rule toggle tests', () => {
 		protectionSettingsChanged: false,
 		setProtectionSettingsUI: jest.fn(),
 		setProtectionSettingsChanged: jest.fn(),
-		setisDirty: jest.fn(),
+		setIsDirty: jest.fn(),
 	};
 
 	beforeEach( () => {
@@ -58,7 +58,7 @@ describe( 'Fraud protection rule toggle tests', () => {
 			protectionSettingsChanged: false,
 			setProtectionSettingsUI: jest.fn(),
 			setProtectionSettingsChanged: jest.fn(),
-			setisDirty: jest.fn(),
+			setIsDirty: jest.fn(),
 		};
 	} );
 

diff --git a/client/settings/fraud-protection/interfaces.ts b/client/settings/fraud-protection/interfaces.ts
@@ -36,7 +36,7 @@ export interface FraudPreventionSettingsContextType {
 	setProtectionSettingsUI: ( settings: ProtectionSettingsUI ) => void;
 	protectionSettingsChanged: boolean;
 	setProtectionSettingsChanged: Dispatch< SetStateAction< boolean > >;
-	setisDirty: Dispatch< SetStateAction< boolean > >;
+	setIsDirty: Dispatch< SetStateAction< boolean > >;
 }
 
 export interface FraudProtectionSettingsSingleCheck {

diff --git a/multi-currency/client/context.js b/multi-currency/client/context.js
@@ -7,7 +7,7 @@ import { createContext } from 'react';
 
 const MultiCurrencySettingsContext = createContext( {
 	isDirty: false,
-	setisDirty: () => null,
+	setIsDirty: () => null,
 } );
 
 export default MultiCurrencySettingsContext;
diff --git a/multi-currency/client/index.js b/multi-currency/client/index.js
@@ -32,7 +32,7 @@ const MultiCurrencySettingsPage = () => {
 		setCurrencyCodeToShowSettingsFor( null );
 	};
 
-	const [ isDirty, setisDirty ] = useState( false );
+	const [ isDirty, setIsDirty ] = useState( false );
 
 	return (
 		<MultiCurrencySettingsContext.Provider
@@ -42,7 +42,7 @@ const MultiCurrencySettingsPage = () => {
 				openSingleCurrencySettings: handleOpenSingleCurrencySettings,
 				closeSingleCurrencySettings: handleCloseSingleCurrencySettings,
 				isDirty,
-				setisDirty,
+				setIsDirty,
 			} }
 		>
 			{ ! isSingleCurrencyScreenOpen ? (

diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/index.js
@@ -67,13 +67,13 @@ const EnabledCurrencies = () => {
 	} = useEnabledCurrencies();
 	const classBase = 'wcpay-multi-currency';
 
-	const { setisDirty } = useContext( MultiCurrencySettingsContext );
+	const { setIsDirty } = useContext( MultiCurrencySettingsContext );
 
 	const handleDeleteClick = ( code ) => {
 		const newCurrencies = Object.keys( enabledCurrencies );
 		newCurrencies.splice( newCurrencies.indexOf( code ), 1 );
 		submitEnabledCurrenciesUpdate( newCurrencies );
-		setisDirty( true );
+		setIsDirty( true );
 	};
 
 	const enabledKeys = enabledCurrencies

diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/modal.js
@@ -25,12 +25,12 @@ import EnabledCurrenciesModalCheckbox from './modal-checkbox';
 import { ConfirmationModal } from 'multi-currency/interface/components';
 import Search from 'multi-currency/components/search';
 import './style.scss';
-import MultiCurrencySettingsContext from '../../context';
+import MultiCurrencySettingsContext from 'multi-currency/context';
 
 // TODO: This works when saving, but list does not refresh.
 // TODO: Should we reset selected currencies on modal close?
 const EnabledCurrenciesModal = ( { className } ) => {
-	const { setisDirty } = useContext( MultiCurrencySettingsContext );
+	const { setIsDirty } = useContext( MultiCurrencySettingsContext );
 
 	const availableCurrencies = useAvailableCurrencies();
 	const availableCurrencyCodes = Object.keys( availableCurrencies );
@@ -124,7 +124,7 @@ const EnabledCurrenciesModal = ( { className } ) => {
 		newCurrencies.push( defaultCurrencyCode );
 		newCurrencies.sort();
 		submitEnabledCurrenciesUpdate( newCurrencies );
-		setisDirty( true );
+		setIsDirty( true );
 	};
 
 	const handleCurrenciesListWidth = () => {

diff --git a/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js b/multi-currency/client/settings/multi-currency/enabled-currencies-list/test/index.js
@@ -191,7 +191,7 @@ const containerContext = {
 	openSingleCurrencySettings: jest.fn(),
 	closeSingleCurrencySettings: jest.fn(),
 	isDirty: false,
-	setisDirty: jest.fn(),
+	setIsDirty: jest.fn(),
 };
 
 const getContainer = () => {

diff --git a/multi-currency/client/settings/multi-currency/store-settings/index.js b/multi-currency/client/settings/multi-currency/store-settings/index.js
@@ -71,7 +71,7 @@ const StoreSettings = () => {
 
 	const [ isPreviewModalOpen, setPreviewModalOpen ] = useState( false );
 
-	const { isDirty, setisDirty } = useContext( MultiCurrencySettingsContext );
+	const { isDirty, setIsDirty } = useContext( MultiCurrencySettingsContext );
 
 	useEffect( () => {
 		if ( Object.keys( storeSettings ).length ) {
@@ -90,12 +90,12 @@ const StoreSettings = () => {
 
 	const handleIsAutomaticSwitchEnabledClick = ( value ) => {
 		setIsAutomaticSwitchEnabledValue( value );
-		setisDirty( true );
+		setIsDirty( true );
 	};
 
 	const handleIsStorefrontSwitcherEnabledClick = ( value ) => {
 		setIsStorefrontSwitcherEnabledValue( value );
-		setisDirty( true );
+		setIsDirty( true );
 	};
 
 	const saveSettings = () => {
@@ -105,6 +105,7 @@ const StoreSettings = () => {
 			isStorefrontSwitcherEnabledValue
 		);
 		setIsSavingSettings( false );
+		setIsDirty( false );
 	};
 
 	return (

diff --git a/multi-currency/client/settings/multi-currency/store-settings/test/index.test.js b/multi-currency/client/settings/multi-currency/store-settings/test/index.test.js
@@ -9,7 +9,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
  */
 import { useStoreSettings } from 'multi-currency/data';
 import StoreSettings from '..';
-import MultiCurrencySettingsContext from '../../../context';
+import MultiCurrencySettingsContext from 'multi-currency/context';
 
 jest.mock( 'multi-currency/data', () => ( {
 	useStoreSettings: jest.fn(),
@@ -21,7 +21,7 @@ const containerContext = {
 	openSingleCurrencySettings: jest.fn(),
 	closeSingleCurrencySettings: jest.fn(),
 	isDirty: false,
-	setisDirty: jest.fn().mockImplementation( ( value ) => {
+	setIsDirty: jest.fn().mockImplementation( ( value ) => {
 		containerContext.isDirty = value;
 	} ),
 };
@@ -79,7 +79,7 @@ describe( 'Multi-Currency store settings', () => {
 	test( 'store settings are saved with continue button click', () => {
 		createContainer();
 		const { submitStoreSettingsUpdate } = useStoreSettings();
-		containerContext.setisDirty( true );
+		containerContext.setIsDirty( true );
 		fireEvent.click(
 			screen.getByRole( 'button', {
 				name: /Save changes/,