From b3d355b5cb7227b7c4ffc31fcd9d4fad9ab0a748 Mon Sep 17 00:00:00 2001 From: Allen Benny Date: Tue, 9 Apr 2024 11:48:05 +0530 Subject: [PATCH 1/3] Fix Issues :sleeping: --- src/OnboardingSPA/components/StateHandlers/Design/index.js | 7 +++++++ src/OnboardingSPA/steps/SiteGen/Preview/index.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/OnboardingSPA/components/StateHandlers/Design/index.js b/src/OnboardingSPA/components/StateHandlers/Design/index.js index 09849556c..58edd5683 100644 --- a/src/OnboardingSPA/components/StateHandlers/Design/index.js +++ b/src/OnboardingSPA/components/StateHandlers/Design/index.js @@ -106,6 +106,13 @@ const DesignStateHandler = ( { window.location.reload(); } break; + case THEME_STATUS_NOT_ACTIVE: + if ( false === render ) { + // When render is false add this condition because + // handleRender() func does not run here and theme is not activated. + expediteInstall(); + } + break; default: updateThemeStatus( themeStatus ); } diff --git a/src/OnboardingSPA/steps/SiteGen/Preview/index.js b/src/OnboardingSPA/steps/SiteGen/Preview/index.js index d95c54be4..02829dc0f 100644 --- a/src/OnboardingSPA/steps/SiteGen/Preview/index.js +++ b/src/OnboardingSPA/steps/SiteGen/Preview/index.js @@ -307,7 +307,7 @@ const SiteGenPreview = () => { const content = getContents(); return ( - +
From d162be0ff5bf47aff9448aab141726dd31a0929a Mon Sep 17 00:00:00 2001 From: Allen Benny Date: Tue, 9 Apr 2024 13:24:56 +0530 Subject: [PATCH 2/3] Fix Cypress --- src/OnboardingSPA/steps/TheFork/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/OnboardingSPA/steps/TheFork/index.js b/src/OnboardingSPA/steps/TheFork/index.js index 2133c0ed0..32461e7fa 100644 --- a/src/OnboardingSPA/steps/TheFork/index.js +++ b/src/OnboardingSPA/steps/TheFork/index.js @@ -64,7 +64,10 @@ const TheFork = () => { const handleExperimentVersion = async () => { let theForkExperimentVersion = 0; - if ( currentData.sitegen.theForkExperimentVersion !== 0 ) { + if ( + currentData.sitegen.theForkExperimentVersion && + currentData.sitegen.theForkExperimentVersion !== 0 + ) { // Use an existing experiment version if it exists setExperimentVersion( currentData.sitegen.theForkExperimentVersion From 4d429d0c725d81c43cc63a48850e46d7ebd600fc Mon Sep 17 00:00:00 2001 From: Allen Benny Date: Tue, 9 Apr 2024 13:51:08 +0530 Subject: [PATCH 3/3] Update index.js --- src/OnboardingSPA/steps/TheFork/index.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/OnboardingSPA/steps/TheFork/index.js b/src/OnboardingSPA/steps/TheFork/index.js index 32461e7fa..2133c0ed0 100644 --- a/src/OnboardingSPA/steps/TheFork/index.js +++ b/src/OnboardingSPA/steps/TheFork/index.js @@ -64,10 +64,7 @@ const TheFork = () => { const handleExperimentVersion = async () => { let theForkExperimentVersion = 0; - if ( - currentData.sitegen.theForkExperimentVersion && - currentData.sitegen.theForkExperimentVersion !== 0 - ) { + if ( currentData.sitegen.theForkExperimentVersion !== 0 ) { // Use an existing experiment version if it exists setExperimentVersion( currentData.sitegen.theForkExperimentVersion