Merge pull request #3061 from Automattic/trunk

Alpha release Apr 11
Automattic · Apr 11, 2024 · 709766a · 709766a
2 parents 2f9843a + a0ff261
commit 709766a
Show file tree

Hide file tree

Showing 8 changed files with 5,322 additions and 4,609 deletions.
diff --git a/assets/blocks/reader-registration/edit.js b/assets/blocks/reader-registration/edit.js
@@ -117,7 +117,7 @@ export default function ReaderRegistrationEdit( {
 	};
 
 	const isListSelected = listId => {
-		return ! listsCheckboxes.hasOwnProperty( listId ) || listsCheckboxes[ listId ];
+		return listsCheckboxes.hasOwnProperty( listId ) && listsCheckboxes[ listId ];
 	};
 	const toggleListCheckbox = listId => () => {
 		const newListsCheckboxes = { ...listsCheckboxes };

diff --git a/assets/components/src/autocomplete-tokenfield/index.js b/assets/components/src/autocomplete-tokenfield/index.js
@@ -158,16 +158,16 @@ class AutocompleteTokenField extends Component {
 						return;
 					}
 
+					const { validValues } = this.state;
 					const currentSuggestions = [ ...suggestions ];
-					const currentValidValues = {};
 
 					suggestions.forEach( suggestion => {
-						currentValidValues[ suggestion.value ] = suggestion.label;
+						validValues[ suggestion.value ] = suggestion.label;
 					} );
 
 					this.setState( {
 						suggestions: currentSuggestions,
-						validValues: currentValidValues,
+						validValues,
 						loading: false,
 					} );
 				} )

diff --git a/assets/wizards/engagement/views/newsletters/index.js b/assets/wizards/engagement/views/newsletters/index.js
@@ -348,8 +348,8 @@ export const SubscriptionLists = ( { lockedLists, onUpdate, initialProvider } )
 							toggleOnChange={ handleChange( index, 'active' ) }
 							toggleChecked={ list.active }
 							className={
-								list?.id && list.id.startsWith( 'group' )
-									? 'newspack-newsletters-group-list-item'
+								list?.id && ( list.id.startsWith( 'group' ) || list.id.startsWith( 'tag' ) )
+									? 'newspack-newsletters-sub-list-item'
 									: ''
 							}
 							actionText={

diff --git a/assets/wizards/engagement/views/newsletters/style.scss b/assets/wizards/engagement/views/newsletters/style.scss
@@ -1,3 +1,3 @@
-.newspack-newsletters-group-list-item {
+.newspack-newsletters-sub-list-item {
 	margin-left: 40px !important;
 }