newspack-components 2.1.0 → 2.2.1

package/src/wizard/index.js

@@ -14,7 +14,15 @@ import { category } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { Footer, Notice, Button, NewspackIcon, TabbedNavigation, PluginInstaller } from '../';
+import {
+	Footer,
+	Notice,
+	Button,
+	NewspackIcon,
+	TabbedNavigation,
+	PluginInstaller,
+	HandoffMessage,
+} from '../';
 import Router from '../proxied-imports/router';
 import registerStore, { WIZARD_STORE_NAMESPACE } from './store';
 import { useWizardData } from './store/utils';
@@ -66,7 +74,6 @@ const Wizard = ( {
 
 	return (
 		<>
-			<WizardError />
 			<div
 				className={ classnames(
 					isLoading ? 'newspack-wizard__is-loading' : 'newspack-wizard__is-loaded',
@@ -98,7 +105,12 @@ const Wizard = ( {
 						</div>
 					</div>
 
-					{ displayedSections.length > 1 && <TabbedNavigation items={ displayedSections } /> }
+					{ displayedSections.length > 1 && (
+						<TabbedNavigation items={ displayedSections }>
+							<WizardError />
+						</TabbedNavigation>
+					) }
+					<HandoffMessage />
 
 					<Switch>
 						{ displayedSections.map( ( section, index ) => {

package/src/wizard/store/index.js

@@ -1,7 +1,9 @@
 /**
  * External dependencies.
  */
-import { set, get, isEmpty } from 'lodash';
+import set from 'lodash/set';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
 
 /**
  * WordPress dependencies.
@@ -70,7 +72,7 @@ const actions = {
 			data: payloadPath ? get( wizardState, payloadPath ) : wizardState,
 			isQuietFetch: true,
 		} );
-		if ( ! isEmpty( updatedData ) ) {
+		if ( ! isEmpty( updatedData ) && ! updatedData.error ) {
 			return actions.setAPIDataForWizard( { slug, data: updatedData } );
 		}
 	},
@@ -99,6 +101,10 @@ const store = createReduxStore( WIZARD_STORE_NAMESPACE, {
 				isQuietLoading: Boolean( action.payload.isQuietFetch ),
 			} );
 			return apiFetch( action.payload )
+				.then( data => {
+					dispatch( WIZARD_STORE_NAMESPACE ).setError( null );
+					return data;
+				} )
 				.catch( error => {
 					dispatch( WIZARD_STORE_NAMESPACE ).setError( error );
 					return { error };