@automattic/newspack-blocks 3.0.4 → 3.0.5

package/includes/class-modal-checkout.php

@@ -51,6 +51,8 @@ final class Modal_Checkout {
 		add_filter( 'wcs_place_subscription_order_text', [ __CLASS__, 'order_button_text' ], 1 );
 		add_filter( 'woocommerce_order_button_text', [ __CLASS__, 'order_button_text' ] );
 		add_filter( 'option_woocommerce_subscriptions_order_button_text', [ __CLASS__, 'order_button_text' ] );
+		add_action( 'option_woocommerce_default_customer_address', [ __CLASS__, 'ensure_base_default_customer_address' ] );
+		add_action( 'default_option_woocommerce_default_customer_address', [ __CLASS__, 'ensure_base_default_customer_address' ] );
 
 		/** Custom handling for registered users. */
 		add_filter( 'woocommerce_checkout_customer_id', [ __CLASS__, 'associate_existing_user' ] );
@@ -996,6 +998,46 @@ final class Modal_Checkout {
 		return $text;
 	}
 
+	/**
+	 * Force option for base country for new customers if unset and billing country optional while state is required
+	 * unless the NEWSPACK_PREVENT_FORCE_BASE_DEFAULT_CUSTOMER_ADDRESS constant is set.
+	 *
+	 * If this option is empty AND billing state is set as a required field AND billing country is not,
+	 * validation of the state value will fail during modal checkout.
+	 *
+	 * See Default Customer Location in: https://woo.com/document/configuring-woocommerce-settings/#general-options
+	 *
+	 * @param string $option_value The value of the default customer address option.
+	 *
+	 * @return string Option value.
+	 */
+	public static function ensure_base_default_customer_address( $option_value ) {
+		// If the option is set, we're good.
+		if ( ! empty( $option_value ) ) {
+			return $option_value;
+		}
+
+		// Only in modal checkout.
+		if ( ! self::is_modal_checkout() ) {
+			return $option_value;
+		}
+
+		// Escape hatch in case we want the standard behavior even in modal checkout.
+		if ( defined( 'NEWSPACK_PREVENT_FORCE_BASE_DEFAULT_CUSTOMER_ADDRESS' ) && NEWSPACK_PREVENT_FORCE_BASE_DEFAULT_CUSTOMER_ADDRESS ) {
+			return $option_value;
+		}
+
+		// If billing state is required but billing country is not, we need to ensure a default location is set.
+		if ( defined( '\Newspack\Donations::DONATION_BILLING_FIELDS_OPTION' ) ) {
+			$billing_fields = get_option( \Newspack\Donations::DONATION_BILLING_FIELDS_OPTION, [] );
+			if ( ! in_array( 'billing_country', $billing_fields, true ) && in_array( 'billing_state', $billing_fields, true ) ) {
+				return 'base';
+			}
+		}
+
+		return $option_value;
+	}
+
 	/**
 	 * If a reader tries to make a purchase with an email address that
 	 * has been previously registered, automatically associate the transaction

package/includes/class-newspack-blocks-api.php

@@ -278,8 +278,6 @@ class Newspack_Blocks_API {
 			$GLOBALS['post'] = $post; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 			setup_postdata( $post );
 
-			$post_date_gmt = '0000-00-00 00:00:00' === $post->post_date_gmt ? get_gmt_from_date( $post->post_date ) : $post->post_date_gmt;
-
 			// phpcs:disable WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
 			$excerpt = apply_filters( 'get_the_excerpt', $post->post_excerpt, $post );
 			$excerpt = apply_filters( 'the_excerpt', $excerpt );
@@ -288,19 +286,20 @@ class Newspack_Blocks_API {
 
 			$meta = new WP_REST_Post_Meta_Fields( 'post' );
 			$data = [
-				'author'         => (int) $post->post_author,
-				'content'        => [
+				'author'              => (int) $post->post_author,
+				'content'             => [
 					'rendered' => post_password_required( $post ) ? '' : $content,
 				],
-				'date_gmt'       => mysql_to_rfc3339( $post_date_gmt ),
-				'date'           => mysql_to_rfc3339( $post->post_date ),
-				'excerpt'        => [
+				'date'                => Newspack_Blocks::get_displayed_post_date( $post ),
+				'date_formatted'      => Newspack_Blocks::get_formatted_displayed_post_date( $post ),
+				'article_meta_footer' => Newspack_Blocks::get_article_meta_footer( $post ),
+				'excerpt'             => [
 					'rendered' => post_password_required( $post ) ? '' : $excerpt,
 				],
-				'featured_media' => (int) get_post_thumbnail_id( $post->ID ),
-				'id'             => $post->ID,
-				'meta'           => $meta->get_value( $post->ID, $request ),
-				'title'          => [
+				'featured_media'      => (int) get_post_thumbnail_id( $post->ID ),
+				'id'                  => $post->ID,
+				'meta'                => $meta->get_value( $post->ID, $request ),
+				'title'               => [
 					'rendered' => get_the_title( $post->ID ),
 				],
 			];

package/includes/class-newspack-blocks.php

@@ -1544,6 +1544,49 @@ class Newspack_Blocks {
 		];
 	}
 
+	/**
+	 * Get post date to be displayed.
+	 *
+	 * @param WP_Post $post Post object.
+	 * @return string Date string.
+	 */
+	public static function get_displayed_post_date( $post = null ) {
+		if ( $post === null ) {
+			$post = get_post();
+		}
+		return apply_filters( 'newspack_blocks_displayed_post_date', mysql_to_rfc3339( $post->post_date ), $post );
+	}
+
+	/**
+	 * Get post date to be displayed, formatted.
+	 *
+	 * @param WP_Post $post Post object.
+	 * @return string Formatted date.
+	 */
+	public static function get_formatted_displayed_post_date( $post = null ) {
+		if ( $post === null ) {
+			$post = get_post();
+		}
+		$date = self::get_displayed_post_date( $post );
+		$date_formatted = ( new DateTime( $date ) )->format( get_option( 'date_format' ) );
+		return apply_filters( 'newspack_blocks_formatted_displayed_post_date', $date_formatted, $post );
+	}
+
+	/**
+	 * Get article meta footer.
+	 *
+	 * @param WP_Post $post Post object.
+	 */
+	public static function get_article_meta_footer( $post = null ) {
+		if ( $post === null ) {
+			$post = get_post();
+		}
+		$meta_footer = apply_filters( 'newspack_blocks_article_meta_footer', '', $post );
+		if ( strlen( $meta_footer ) > 0 ) {
+			return '<span style="margin: 0 6px;" class="newspack_blocks__article-meta-footer__separator">|</span>' . $meta_footer;
+		}
+	}
+
 	/**
 	 * Get a formatted HTML string containing amount and frequency of a donation.
 	 *

package/includes/plugins/class-the-events-calendar.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * The Events Calendar integration class.
+ *
+ * @package Newspack
+ */
+
+namespace Newspack_Blocks;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Main class.
+ */
+class The_Events_Calendar {
+	/**
+	 * Initialize hooks and filters.
+	 */
+	public static function init() {
+		add_filter( 'tribe_events_register_event_type_args', [ __CLASS__, 'register_event_type_args' ] );
+		add_filter( 'newspack_blocks_displayed_post_date', [ __CLASS__, 'get_displayed_post_date' ], 10, 2 );
+		add_filter( 'newspack_blocks_formatted_displayed_post_date', [ __CLASS__, 'get_formatted_displayed_post_date' ], 10, 2 );
+		add_filter( 'newspack_blocks_article_meta_footer', [ __CLASS__, 'get_article_meta_footer' ], 10, 2 );
+	}
+
+	/**
+	 * Enable Newspack Blocks support for The Events Calendar.
+	 *
+	 * @param array $args The post type args.
+	 */
+	public static function register_event_type_args( $args ) {
+		$args['supports'][] = 'newspack_blocks';
+		return $args;
+	}
+
+	/**
+	 * Get the displayed post date.
+	 *
+	 * @param string  $date The date.
+	 * @param WP_Post $post The post object.
+	 */
+	public static function get_displayed_post_date( $date, $post ) {
+		if ( $post->post_type === 'tribe_events' ) {
+			return mysql_to_rfc3339( get_post_meta( $post->ID, '_EventStartDate', true ) );
+		}
+		return $date;
+	}
+
+	/**
+	 * Get the formatted displayed post date.
+	 *
+	 * @param string  $date The date.
+	 * @param WP_Post $post The post object.
+	 */
+	public static function get_formatted_displayed_post_date( $date, $post ) {
+		if ( $post->post_type === 'tribe_events' && function_exists( 'tribe_events_event_schedule_details' ) ) {
+			try {
+				$html = tribe_events_event_schedule_details( $post );
+				return wp_strip_all_tags( $html );
+			} catch ( \Throwable $th ) {
+				return $date;
+			}
+		}
+		return $date;
+	}
+
+	/**
+	 * Get the article meta footer.
+	 *
+	 * @param string  $footer The footer.
+	 * @param WP_Post $post   The post object.
+	 */
+	public static function get_article_meta_footer( $footer, $post ) {
+		if ( $post->post_type === 'tribe_events' && function_exists( 'tribe_get_venue' ) ) {
+			$venue = tribe_get_venue( $post );
+			if ( ! $venue ) {
+				return $footer;
+			}
+			return $footer . '<span class="newspack-blocks__tec-venue">' . $venue . '</span>';
+		}
+		return $footer;
+	}
+}
+The_Events_Calendar::init();

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         3.0.4
+ * Version:         3.0.5
  *
  * @package         Newspack_Blocks
  */
@@ -15,13 +15,15 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '3.0.4' );
+define( 'NEWSPACK_BLOCKS__VERSION', '3.0.5' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-patterns.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-modal-checkout.php';
 
+require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/plugins/class-the-events-calendar.php';
+
 // REST Controller for Articles Block.
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'src/blocks/homepage-articles/class-wp-rest-newspack-articles-controller.php';
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "3.0.4",
+	"version": "3.0.5",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.7.2",
@@ -10,7 +10,7 @@
 		"@types/lodash.debounce": "^4.0.9",
 		"eslint": "^7.32.0",
 		"fetch-mock-jest": "^1.5.1",
-		"html-entities": "^2.4.0",
+		"html-entities": "^2.5.2",
 		"identity-obj-proxy": "^3.0.0",
 		"lint-staged": "^15.2.2",
 		"newspack-scripts": "^5.3.0",

package/src/blocks/author-profile/class-wp-rest-newspack-authors-controller.php

@@ -84,12 +84,13 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 		// Total number of users and guest authors.
 		$guest_author_total = 0;
 		$user_total         = 0;
-		$guest_authors = [];
-		$linked_guest_authors = [];
+		$guest_authors      = [];
+		$users              = [];
 
 		// Get Co-authors guest authors.
 		if ( $is_guest_author ) {
-			$guest_author_args = [
+			$unlinked_guest_authors = [];
+			$guest_author_args      = [
 				'post_type'      => 'guest-author',
 				'posts_per_page' => $per_page,
 				'offset'         => $offset,
@@ -98,44 +99,44 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 			if ( $search && ! $author_id ) {
 				$guest_author_args['s'] = $search;
 			}
+
 			if ( $author_id ) {
 				$guest_author_args['p'] = $author_id;
 			}
+
 			if ( $include ) {
 				$guest_author_args['post__in']            = $include;
 				$guest_author_args['ignore_sticky_posts'] = true;
 			}
 
-			$guest_authors      = get_posts( $guest_author_args );
-			$guest_author_total = count( $guest_authors );
-		}
+			$guest_authors = get_posts( $guest_author_args );
+
+			// If we are searching for a specific ID we want to return the guest author regardless of if it is linked or not.
+			if ( ! $author_id ) {
+				foreach ( $guest_authors as $ga ) {
+					$linked_guest_author = get_post_meta( $ga->ID, 'cap-linked_account', true );
+
+					if ( $linked_guest_author ) {
+						continue;
+					}
 
-		foreach ( $guest_authors as $ga ) {
-			$linked_guest_author = get_post_meta( $ga->ID, 'cap-linked_account', true );
+					$unlinked_guest_authors[] = $ga;
+				}
 
-			if ( $linked_guest_author ) {
-				$linked_guest_authors[] = $linked_guest_author;
+				$guest_authors = $unlinked_guest_authors;
 			}
-		}
 
-		$users = [];
+			$guest_author_total = count( $guest_authors );
+		}
 
-		// If passed an author ID.
+		// If we are searching for a specific ID we just want to return the specific user.
 		if ( $author_id ) {
+			// Unless we've already identified a guest author.
 			if ( 0 === $guest_author_total ) {
 				$user = get_user_by( 'id', $author_id ); // Get the WP user.
 
-				// We have a WP user, let's use it.
 				if ( $user ) {
-					// But wait, there's more! Let's see if this user is linked to a guest author.
-					$linked_guest_author = self::get_linked_guest_author( $user->user_login );
-
-					// If it is, let's use that instead.
-					if ( $linked_guest_author ) {
-						$guest_authors = [ $linked_guest_author ];
-					} else {
-						$users = [ $user ];
-					}
+					$users = [ $user ];
 				}
 			}
 		} else {
@@ -162,6 +163,23 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 			$user_total = $user_query->get_total();
 		}
 
+		if ( 0 < $user_total ) {
+			// But wait, there's more! Let's see if this user is linked to a guest author.
+			$unlinked_users = [];
+			foreach ( $users as $user ) {
+				$linked_guest_author = self::get_linked_guest_author( $user->user_login );
+
+				// If it is, let's use that instead.
+				if ( $linked_guest_author ) {
+					$guest_authors[] = $linked_guest_author;
+				} else {
+					$unlinked_users[] = $user;
+				}
+			}
+
+			$users = $unlinked_users;
+		}
+
 		// Format and combine results.
 		$combined_authors = array_merge(
 			array_reduce(
@@ -197,14 +215,8 @@ class WP_REST_Newspack_Authors_Controller extends WP_REST_Controller {
 			),
 			array_reduce(
 				$users,
-				function( $acc, $user ) use ( $fields, $avatar_hide_default, $linked_guest_authors ) {
+				function( $acc, $user ) use ( $fields, $avatar_hide_default ) {
 					if ( $user ) {
-
-						// This user is linked to a guest author already returned in the query, so skip it.
-						if ( in_array( $user->data->user_login, $linked_guest_authors, true ) ) {
-							return $acc;
-						}
-
 						$user_data = [
 							'id'         => intval( $user->data->ID ),
 							'registered' => $user->data->user_registered,

package/src/blocks/carousel/edit.js

@@ -252,8 +252,8 @@ class Edit extends Component {
 						<Fragment>
 							{ autoplay && (
 								<Fragment>
-									<button ref={ this.btnPauseRef } />
-									<button ref={ this.btnPlayRef } />
+									<button className="swiper-button swiper-button-pause" ref={ this.btnPauseRef } />
+									<button className="swiper-button swiper-button-play" ref={ this.btnPlayRef } />
 								</Fragment>
 							) }
 							<div className="swiper-wrapper">

package/src/blocks/homepage-articles/{edit.js → edit.tsx}

@@ -23,8 +23,6 @@ import classNames from 'classnames';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-// eslint-disable-next-line @wordpress/no-unsafe-wp-apis
-import { dateI18n, __experimentalGetSettings } from '@wordpress/date';
 import { Component, Fragment, RawHTML } from '@wordpress/element';
 import {
 	BlockControls,
@@ -63,7 +61,7 @@ import {
 	pullRight,
 } from '@wordpress/icons';
 
-let IS_SUBTITLE_SUPPORTED_IN_THEME;
+let IS_SUBTITLE_SUPPORTED_IN_THEME: boolean;
 if (
 	typeof window === 'object' &&
 	window.newspack_blocks_data &&
@@ -102,8 +100,8 @@ const squareIcon = (
 	</SVG>
 );
 
-class Edit extends Component {
-	renderPost = post => {
+class Edit extends Component< HomepageArticlesProps > {
+	renderPost = ( post: Post ) => {
 		const { attributes, isUIDisabled } = this.props;
 		const {
 			showImage,
@@ -125,15 +123,17 @@ class Edit extends Component {
 
 		const styles = {
 			minHeight:
-				mediaPosition === 'behind' &&
-				showImage &&
-				post.newspack_featured_image_src &&
-				minHeight + 'vh',
+				( mediaPosition === 'behind' &&
+					showImage &&
+					post.newspack_featured_image_src &&
+					minHeight + 'vh' ) ||
+				undefined,
 			paddingTop:
-				mediaPosition === 'behind' &&
-				showImage &&
-				post.newspack_featured_image_src &&
-				minHeight / 5 + 'vh',
+				( mediaPosition === 'behind' &&
+					showImage &&
+					post.newspack_featured_image_src &&
+					minHeight / 5 + 'vh' ) ||
+				undefined,
 		};
 
 		const postClasses = classNames(
@@ -145,7 +145,6 @@ class Edit extends Component {
 		);
 
 		const postTitle = this.titleForPost( post );
-		const dateFormat = __experimentalGetSettings().formats.date;
 		return (
 			<article className={ postClasses } key={ post.id } style={ styles }>
 				{ getPostStatusLabel( post ) }
@@ -242,22 +241,20 @@ class Edit extends Component {
 
 						{ showDate && ! post.newspack_listings_hide_publish_date && (
 							<time className="entry-date published" key="pub-date">
-								{ dateI18n( dateFormat, post.date ) }
+								{ post.date_formatted }
 							</time>
 						) }
+						{ post.article_meta_footer ? <RawHTML>{ post.article_meta_footer }</RawHTML> : null }
 					</div>
 				</div>
 			</article>
 		);
 	};
 
-	titleForPost = post => {
+	titleForPost = ( post: Post ) => {
 		if ( ! post.title ) {
 			return '';
 		}
-		if ( typeof post.title === 'string' ) {
-			return decodeEntities( post.title.trim() );
-		}
 		if ( typeof post.title === 'object' && post.title.rendered ) {
 			return decodeEntities( post.title.rendered.trim() );
 		}
@@ -349,14 +346,16 @@ class Edit extends Component {
 			},
 		];
 
-		const handleAttributeChange = key => value => setAttributes( { [ key ]: value } );
+		const handleAttributeChange = ( key: HomepageArticlesAttributesKey ) => ( value: any ) =>
+			setAttributes( { [ key ]: value } );
 
 		return (
 			<Fragment>
 				<PanelBody title={ __( 'Display Settings', 'newspack-blocks' ) } initialOpen={ true }>
+					{ /* @ts-ignore */ }
 					<QueryControls
 						numberOfItems={ postsToShow }
-						onNumberOfItemsChange={ _postsToShow =>
+						onNumberOfItemsChange={ ( _postsToShow: number ) =>
 							setAttributes( { postsToShow: _postsToShow || 1 } )
 						}
 						specificMode={ specificMode }
@@ -450,7 +449,7 @@ class Edit extends Component {
 							'newspack-blocks'
 						) }
 						checked={ ! attributes.deduplicate }
-						onChange={ value => setAttributes( { deduplicate: ! value } ) }
+						onChange={ ( value: boolean ) => setAttributes( { deduplicate: ! value } ) }
 						className="newspack-blocks-deduplication-toggle"
 					/>
 				</PanelBody>
@@ -528,7 +527,7 @@ class Edit extends Component {
 								'newspack-blocks'
 							) }
 							value={ minHeight }
-							onChange={ _minHeight => setAttributes( { minHeight: _minHeight } ) }
+							onChange={ ( _minHeight: number ) => setAttributes( { minHeight: _minHeight } ) }
 							min={ 0 }
 							max={ 100 }
 							required
@@ -556,7 +555,7 @@ class Edit extends Component {
 						<RangeControl
 							label={ __( 'Max number of words in excerpt', 'newspack-blocks' ) }
 							value={ excerptLength }
-							onChange={ value => setAttributes( { excerptLength: value } ) }
+							onChange={ ( value: number ) => setAttributes( { excerptLength: value } ) }
 							min={ 10 }
 							max={ 100 }
 						/>
@@ -571,14 +570,14 @@ class Edit extends Component {
 							label={ __( '"Read More" link text', 'newspack-blocks' ) }
 							value={ readMoreLabel }
 							placeholder={ readMoreLabel }
-							onChange={ value => setAttributes( { readMoreLabel: value } ) }
+							onChange={ ( value: string ) => setAttributes( { readMoreLabel: value } ) }
 						/>
 					) }
 					<RangeControl
 						className="type-scale-slider"
 						label={ __( 'Type Scale', 'newspack-blocks' ) }
 						value={ typeScale }
-						onChange={ _typeScale => setAttributes( { typeScale: _typeScale } ) }
+						onChange={ ( _typeScale: number ) => setAttributes( { typeScale: _typeScale } ) }
 						min={ 1 }
 						max={ 10 }
 						required
@@ -636,7 +635,7 @@ class Edit extends Component {
 	componentDidMount() {
 		this.props.triggerReflow();
 	}
-	componentDidUpdate( props ) {
+	componentDidUpdate( props: HomepageArticlesProps ) {
 		if ( shouldReflow( props, this.props ) ) {
 			this.props.triggerReflow();
 		}
@@ -677,9 +676,9 @@ class Edit extends Component {
 			'show-image': showImage,
 			[ `columns-${ columns }` ]: postLayout === 'grid',
 			[ `colgap-${ colGap }` ]: postLayout === 'grid',
-			[ `ts-${ typeScale }` ]: typeScale !== '5',
+			[ `ts-${ typeScale }` ]: typeScale !== 5,
 			[ `image-align${ mediaPosition }` ]: showImage,
-			[ `is-${ imageScale }` ]: imageScale !== '1' && showImage,
+			[ `is-${ imageScale }` ]: imageScale !== 1 && showImage,
 			'mobile-stack': mobileStack,
 			[ `is-${ imageShape }` ]: showImage,
 			'has-text-color': textColor.color !== '',
@@ -769,7 +768,7 @@ class Edit extends Component {
 					<div>
 						{ latestPosts && ( ! RichText.isEmpty( sectionHeader ) || isSelected ) && (
 							<RichText
-								onChange={ value => setAttributes( { sectionHeader: value } ) }
+								onChange={ ( value: string ) => setAttributes( { sectionHeader: value } ) }
 								placeholder={ __( 'Write header…', 'newspack-blocks' ) }
 								value={ sectionHeader }
 								tagName="h2"
@@ -802,7 +801,7 @@ class Edit extends Component {
 							<RichText
 								placeholder={ __( 'Load more posts', 'newspack-blocks' ) }
 								value={ moreButtonText }
-								onChange={ value => setAttributes( { moreButtonText: value } ) }
+								onChange={ ( value: string ) => setAttributes( { moreButtonText: value } ) }
 								className="wp-block-button__link"
 								allowedFormats={ [] }
 							/>
@@ -814,7 +813,7 @@ class Edit extends Component {
 					<Toolbar>
 						<AlignmentControl
 							value={ textAlign }
-							onChange={ nextAlign => {
+							onChange={ ( nextAlign: string ) => {
 								setAttributes( { textAlign: nextAlign } );
 							} }
 						/>
@@ -831,6 +830,8 @@ class Edit extends Component {
 
 export default compose( [
 	withColors( { textColor: 'color' } ),
+	// @ts-ignore
 	withSelect( postsBlockSelector ),
+	// @ts-ignore
 	withDispatch( postsBlockDispatch ),
-] )( Edit );
+] as any )( Edit );

package/src/blocks/homepage-articles/templates/article.php

@@ -235,12 +235,13 @@ call_user_func(
 									),
 								)
 							),
-							esc_attr( get_the_date( DATE_W3C ) ),
-							esc_html( get_the_date() ),
+							esc_attr( Newspack_Blocks::get_displayed_post_date() ),
+							esc_html( Newspack_Blocks::get_formatted_displayed_post_date() ),
 							esc_attr( get_the_modified_date( DATE_W3C ) ),
 							esc_html( get_the_modified_date() )
 						);
 					endif;
+					echo Newspack_Blocks::get_article_meta_footer();  // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 					?>
 				</div><!-- .entry-meta -->
 			<?php endif; ?>