Fetch all support articles from the same endpoint

client/blocks/inline-help/style.scss

@@ -278,7 +278,7 @@
 			flex-grow: 2;
 		}
 
-		.gridicon {
+		.gridicon, svg {
 			align-self: baseline;
 			color: var( --color-neutral-light );
 			flex-shrink: 0;

client/me/help/help-contact-form/index.jsx

@@ -36,33 +36,33 @@ import { generateSubjectFromMessage } from './utils';
 
 import './style.scss';
 
-const trackSibylClick = ( event, helpLink ) =>
+const trackArticleClick = ( event, helpLink ) =>
 	composeAnalytics(
 		bumpStat( 'sibyl_question_clicks', helpLink.id ),
 		recordTracksEventAction( 'calypso_sibyl_question_click', {
 			question_id: helpLink.id,
 		} )
 	);
 
-const trackSibylFirstClick = ( event, helpLink ) =>
+const trackArticleFirstClick = ( event, helpLink ) =>
 	composeAnalytics(
 		recordTracksEventAction( 'calypso_sibyl_first_question_click', {
 			question_id: helpLink.id,
 		} )
 	);
 
-const trackSupportAfterSibylClick = () =>
+const trackSupportAfterArticleClick = () =>
 	composeAnalytics( recordTracksEventAction( 'calypso_sibyl_support_after_question_click' ) );
 
-const trackSupportWithSibylSuggestions = ( query, suggestions ) =>
+const trackSupportWithArticleSuggestions = ( query, suggestions ) =>
 	composeAnalytics(
 		recordTracksEventAction( 'calypso_sibyl_support_with_suggestions_showing', {
 			query,
 			suggestions,
 		} )
 	);
 
-const trackSupportWithoutSibylSuggestions = ( query ) =>
+const trackSupportWithoutArticleSuggestions = ( query ) =>
 	composeAnalytics(
 		recordTracksEventAction( 'calypso_sibyl_support_without_suggestions_showing', { query } )
 	);
@@ -112,7 +112,7 @@ export class HelpContactForm extends PureComponent {
 	state = this.props.valueLink.value || {
 		message: '',
 		subject: '',
-		sibylClicked: false,
+		articleClicked: false,
 		userDeclaresNoSite: false,
 		userDeclaresUnableToSeeSite: this.props.siteCount === 0,
 		userDeclaredUrl: '',
@@ -151,7 +151,7 @@ export class HelpContactForm extends PureComponent {
 		} );
 	};
 
-	getSibylQuery = () => this.state.message.trim();
+	getArticleQuery = () => this.state.message.trim();
 
 	doRequestSite = () => {
 		if ( resemblesUrl( this.state.userDeclaredUrl ) ) {
@@ -183,7 +183,7 @@ export class HelpContactForm extends PureComponent {
 	requestSite = debounce( this.doRequestSite, 500 );
 
 	doQandASearch = () => {
-		const query = this.getSibylQuery();
+		const query = this.getArticleQuery();
 
 		if ( '' === query ) {
 			this.setState( { qanda: [] } );
@@ -214,23 +214,23 @@ export class HelpContactForm extends PureComponent {
 				}
 				this.setState( {
 					qanda: Array.isArray( qanda ) ? qanda : [],
-					// only keep sibylClicked true if the user is seeing the same set of questions
+					// only keep articleClicked true if the user is seeing the same set of questions
 					// we don't want to track "questions -> question click -> different questions -> support click",
-					// so we need to set sibylClicked to false here if the questions have changed
-					sibylClicked: this.state.sibylClicked && sameQuestionsReturned,
+					// so we need to set articleClicked to false here if the questions have changed
+					articleClicked: this.state.articleClicked && sameQuestionsReturned,
 				} );
 			} )
-			.catch( () => this.setState( { qanda: [], sibylClicked: false } ) );
+			.catch( () => this.setState( { qanda: [], articleClicked: false } ) );
 	};
 
 	debouncedQandA = debounce( this.doQandASearch, 500 );
 
 	trackSibylClick = ( event, helpLink ) => {
-		if ( ! this.state.sibylClicked ) {
-			this.props.trackSibylFirstClick( event, helpLink );
+		if ( ! this.state.articleClicked ) {
+			this.props.trackArticleFirstClick( event, helpLink );
 		}
-		this.props.trackSibylClick( event, helpLink );
-		this.setState( { sibylClicked: true } );
+		this.props.trackArticleClick( event, helpLink );
+		this.setState( { articleClicked: true } );
 	};
 
 	/**
@@ -319,17 +319,17 @@ export class HelpContactForm extends PureComponent {
 			} );
 		}
 
-		if ( this.state.sibylClicked ) {
+		if ( this.state.articleClicked ) {
 			// track that the user had clicked a Sibyl result, but still contacted support
-			this.props.trackSupportAfterSibylClick();
-			this.setState( { sibylClicked: false } );
+			this.props.trackSupportAfterArticleClick();
+			this.setState( { articleClicked: false } );
 		}
 
 		if ( this.state.qanda.length === 0 ) {
-			this.props.trackSupportWithoutSibylSuggestions( this.getSibylQuery() );
+			this.props.trackSupportWithoutArticleSuggestions( this.getArticleQuery() );
 		} else {
-			this.props.trackSupportWithSibylSuggestions(
-				this.getSibylQuery(),
+			this.props.trackSupportWithArticleSuggestions(
+				this.getArticleQuery(),
 				this.state.qanda.map( ( { id, title } ) => `${ id } - ${ title }` ).join( ' / ' )
 			);
 		}
@@ -474,7 +474,7 @@ export class HelpContactForm extends PureComponent {
 					</h2>
 					<InlineHelpCompactResults
 						helpLinks={ this.state.qanda }
-						onClick={ this.trackSibylClick }
+						onClick={ this.trackArticleClick }
 					/>
 					<FormButton disabled={ ! this.canSubmitForm() } type="button" onClick={ this.submitForm }>
 						{ buttonLabel }
@@ -628,7 +628,7 @@ export class HelpContactForm extends PureComponent {
 						header={ translate( 'Do you want the answer to any of these questions?' ) }
 						helpLinks={ this.state.qanda }
 						iconTypeDescription="book"
-						onClick={ this.trackSibylClick }
+						onClick={ this.trackArticleClick }
 						compact
 					/>
 				) }
@@ -675,11 +675,11 @@ const mapDispatchToProps = {
 	onChangeSite: selectSiteId,
 	recordTracksEventAction,
 	requestSite,
-	trackSibylClick,
-	trackSibylFirstClick,
-	trackSupportAfterSibylClick,
-	trackSupportWithSibylSuggestions,
-	trackSupportWithoutSibylSuggestions,
+	trackArticleClick,
+	trackArticleFirstClick,
+	trackSupportAfterArticleClick,
+	trackSupportWithArticleSuggestions,
+	trackSupportWithoutArticleSuggestions,
 };
 
 export default connect( mapStateToProps, mapDispatchToProps )( localize( HelpContactForm ) );

packages/calypso-e2e/src/secrets/secrets-manager.ts

@@ -113,7 +113,7 @@ export class SecretsManager {
 							'This also may mean the typings for the secrets are stale and need updating.\n\n' +
 							'Details:\n' +
 							`\tInvalid or missing key: ${ fullKeyPath }\n` +
-							`\tExpected type: ${ typeof reference[ key ] }`
+							`\tExpected type: ${ typeof reference[ key ] }, got ${ typeof target[ key ] }`
 					);
 				}