From 3f80b38e4a4837a06e0819409449c0cdfdc60991 Mon Sep 17 00:00:00 2001 From: Allen Benny Date: Mon, 26 Dec 2022 17:13:15 +0530 Subject: [PATCH] Revert "Added State Handler" This reverts commit 91bdda1b05b5984a5f3a702bccb73104d7fedfa5. --- .../StepTax/Sidebar/LearnMore/contents.js | 10 +++---- .../StepTax/Sidebar/LearnMore/index.js | 27 +++++++------------ .../Sidebar/LearnMore/contents.js | 6 ++++- .../Sidebar/LearnMore/index.js | 21 ++++++--------- 4 files changed, 26 insertions(+), 38 deletions(-) diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/contents.js b/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/contents.js index e1060349a..97243eda6 100644 --- a/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/contents.js +++ b/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/contents.js @@ -3,17 +3,15 @@ import { __, sprintf } from '@wordpress/i18n'; import { translations } from '../../../../../../utils/locales/translations'; import { institution } from '@wordpress/icons'; -const getContents = ( - brandName, - techSupportLink, - fullServiceCreativeTeamLink -) => { +const getContents = ( brandName, techSupportLink, fullServiceCreativeTeamLink ) => { return { introduction: { heading: __( 'Tax Info', 'wp-module-onboarding' ), subheading: sprintf( /* translators: 1: Site 2: Brand 3: Site */ - __( 'A %s that does taxes in one click. That’s pretty novel.' ), + __( + 'A %s that does taxes in one click. That’s pretty novel.' + ), translations( 'site' ), brandName, translations( 'Site' ) diff --git a/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/index.js b/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/index.js index f6bb548a1..97db95436 100644 --- a/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/index.js +++ b/src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/index.js @@ -34,24 +34,15 @@ const StepIntroPanel = lazy( () => ); const LearnMore = () => { - const { brandName, techSupportLink, fullServiceCreativeTeamLink } = - useSelect( ( select ) => { - return { - brandName: select( nfdOnboardingStore ).getNewfoldBrandName(), - techSupportLink: - select( nfdOnboardingStore ).getTechSupportUrl(), - fullServiceCreativeTeamLink: - select( - nfdOnboardingStore - ).getfullServiceCreativeTeamUrl(), - }; - } ); + const { brandName, techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => { + return { + brandName: select( nfdOnboardingStore ).getNewfoldBrandName(), + techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(), + fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(), + }; + } ); - const content = getContents( - brandName, - techSupportLink, - fullServiceCreativeTeamLink - ); + const content = getContents( brandName, techSupportLink, fullServiceCreativeTeamLink ); return (
@@ -70,7 +61,7 @@ const LearnMore = () => { - window.open( content.help.fullService.link, '_blank' ) + ( window.open( content.help.fullService.link, '_blank') ) } /> { + return { introduction: { heading: __( 'WordPress Experience', 'wp-module-onboarding' ), @@ -23,7 +24,10 @@ const getContents = ( techSupportLink, fullServiceCreativeTeamLink ) => { information: { headingWithDescriptions: [ { - heading: __( 'Why we ask', 'wp-module-onboarding' ), + heading: __( + 'Why we ask', + 'wp-module-onboarding' + ), description: __( `We use this to help offer the best WordPress setup, features and suggestions for your site.`, 'wp-module-onboarding' diff --git a/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/Sidebar/LearnMore/index.js b/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/Sidebar/LearnMore/index.js index cb7537e79..e903ab9c5 100644 --- a/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/Sidebar/LearnMore/index.js +++ b/src/OnboardingSPA/pages/Steps/GetStarted/GetStartedExperience/Sidebar/LearnMore/index.js @@ -34,18 +34,13 @@ const StepIntroPanel = lazy( () => ); const LearnMore = () => { - const { techSupportLink, fullServiceCreativeTeamLink } = useSelect( - ( select ) => { - return { - techSupportLink: - select( nfdOnboardingStore ).getTechSupportUrl(), - fullServiceCreativeTeamLink: - select( - nfdOnboardingStore - ).getfullServiceCreativeTeamUrl(), - }; - } - ); + + const { techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => { + return { + techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(), + fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(), + }; + } ); const content = getContents( techSupportLink, fullServiceCreativeTeamLink ); @@ -66,7 +61,7 @@ const LearnMore = () => { - window.open( content.help.fullService.link, '_blank' ) + ( window.open( content.help.fullService.link, '_blank') ) } />