Merge pull request #493 from newfold-labs/fix/site-logo-data

Sitegen: Fix Site Logo Data
newfold-labs · Feb 28, 2024 · cbb1890 · cbb1890
2 parents a601bb0 + 97b963f
commit cbb1890
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/index.js b/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/index.js
@@ -71,7 +71,7 @@ const ImageUploaderWithText = ( { image, imageSetter } ) => {
 	const getContrastingColor = ( color ) => {
 		/* if the contrast value more than 150 it should have black bg, otherwise white */
 		const [ r, g, b ] = color.match( /\d+/g ).map( Number );
-		const contrastValue = ( 0.2126 * r ) + ( 0.7152 * g ) + ( 0.0722 * b );
+		const contrastValue = 0.2126 * r + 0.7152 * g + 0.0722 * b;
 		return contrastValue > 160 ? 'black' : 'white';
 	};
 
@@ -130,6 +130,8 @@ const ImageUploaderWithText = ( { image, imageSetter } ) => {
 		imageSetter( {
 			id: 0,
 			url: '',
+			fileName: '',
+			fileSize: 0,
 		} );
 		if ( inputRef?.current?.files.length > 0 ) {
 			inputRef.current.value = '';

diff --git a/src/OnboardingSPA/steps/SiteGen/SiteLogo/index.js b/src/OnboardingSPA/steps/SiteGen/SiteLogo/index.js
@@ -61,20 +61,20 @@ const SiteGenSiteLogo = () => {
 		setIsHeaderNavigationEnabled( true );
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
-		if ( currentData.data.siteLogo?.id !== 0 ) {
+		if ( currentData.sitegen.siteLogo?.id !== 0 ) {
 			setIsFooterNavAllowed( true );
-			return setSiteLogo( currentData.data.siteLogo );
+			return setSiteLogo( currentData.sitegen.siteLogo );
 		}
 		setIsFooterNavAllowed( false );
 		getEditedEntityRecord( 'root', 'site' );
 	}, [] );
 
 	const handleSiteLogo = ( siteLogoNew ) => {
 		const currentDataCopy = { ...currentData };
-		currentDataCopy.data.siteLogo.id = siteLogoNew.id;
-		currentDataCopy.data.siteLogo.url = siteLogoNew.url;
-		currentDataCopy.data.siteLogo.fileName = siteLogoNew.fileName;
-		currentDataCopy.data.siteLogo.fileSize = siteLogoNew.fileSize;
+		currentDataCopy.sitegen.siteLogo.id = siteLogoNew.id;
+		currentDataCopy.sitegen.siteLogo.url = siteLogoNew.url;
+		currentDataCopy.sitegen.siteLogo.fileName = siteLogoNew.fileName;
+		currentDataCopy.sitegen.siteLogo.fileSize = siteLogoNew.fileSize;
 		setCurrentOnboardingData( currentDataCopy );
 		setIsFooterNavAllowed( siteLogoNew.id !== 0 );
 		editEntityRecord( 'root', 'site', undefined, {