Merge pull request #407 from newfold-labs/hotfix/orchid-fonts

Fix fonts for orchid shades and correct typography step issues
newfold-labs · Jan 11, 2024 · f8dc208 · f8dc208
2 parents 0ee2224 + 5b6bd47
commit f8dc208
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/OnboardingSPA/components/App/index.js b/src/OnboardingSPA/components/App/index.js
@@ -158,7 +158,7 @@ const App = () => {
 	function handleConditionalDesignStepsRoutes() {
 		if (
 			location?.pathname.includes( 'colors' ) ||
-			location?.pathname.includes( 'fonts' )
+			location?.pathname.includes( 'typography' )
 		) {
 			const updates = injectInAllSteps(
 				allSteps,

diff --git a/src/OnboardingSPA/components/Drawer/DrawerPanel/DesignFonts.js b/src/OnboardingSPA/components/Drawer/DrawerPanel/DesignFonts.js
@@ -85,17 +85,17 @@ const DesignFonts = () => {
 
 		if (
 			globalStylesCopy?.styles?.typography?.fontFamily &&
-			globalStylesCopy?.styles?.blocks[ 'core/heading' ]?.typography
-				?.fontFamily
+			globalStylesCopy?.styles?.blocks[ 'core/heading' ]
 		) {
 			globalStylesCopy.styles.typography.fontFamily =
 				fontPalettesCopy[ fontStyle ]?.styles?.typography?.fontFamily;
-			globalStylesCopy.styles.blocks[
-				'core/heading'
-			].typography.fontFamily =
-				fontPalettesCopy[ fontStyle ]?.styles.blocks[
-					'core/heading'
-				].typography.fontFamily;
+			globalStylesCopy.styles.blocks[ 'core/heading' ] = {
+				...globalStylesCopy.styles.blocks[ 'core/heading' ],
+				typography:
+					fontPalettesCopy[ fontStyle ]?.styles.blocks[
+						'core/heading'
+					].typography,
+			};
 		}
 
 		if (