@automattic/newspack-blocks 1.57.0 → 1.58.0

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.blog/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         1.57.0
+ * Version:         1.58.0
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 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', '1.57.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '1.58.0' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "1.57.0",
+	"version": "1.58.0",
 	"author": "Automattic",
 	"devDependencies": {
-		"@rushstack/eslint-patch": "^1.1.4",
-		"@testing-library/dom": "^8.17.1",
+		"@rushstack/eslint-patch": "^1.2.0",
+		"@testing-library/dom": "^8.18.1",
 		"@testing-library/user-event": "^14.4.3",
 		"eslint": "^7.32.0",
 		"fetch-mock-jest": "^1.5.1",
@@ -12,21 +12,21 @@
 		"identity-obj-proxy": "^3.0.0",
 		"lint-staged": "^13.0.3",
 		"newspack-scripts": "^4.3.0",
-		"postcss-scss": "^4.0.4",
+		"postcss-scss": "^4.0.5",
 		"prettier": "npm:wp-prettier@^2.6.2-beta-1",
 		"stylelint": "^14.9.1"
 	},
 	"description": "=== Newspack Blocks === Contributors: (this should be a list of wordpress.org userid's) Donate link: https://example.com/ Tags: comments, spam Requires at least: 4.5 Tested up to: 5.1.1 Stable tag: 0.1.0 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html",
 	"dependencies": {
-		"@stripe/stripe-js": "^1.35.0",
-		"classnames": "^2.3.1",
+		"@stripe/stripe-js": "^1.36.0",
+		"classnames": "^2.3.2",
 		"lodash": "^4.17.21",
 		"newspack-components": "^2.1.0",
 		"react": "^17.0.2",
 		"redux": "^4.2.0",
 		"redux-saga": "^1.2.1",
 		"regenerator-runtime": "^0.13.9",
-		"swiper": "8.3.2"
+		"swiper": "8.4.2"
 	},
 	"scripts": {
 		"cm": "newspack-scripts commit",

package/src/blocks/donate/class-wp-rest-newspack-donate-controller.php

@@ -130,6 +130,13 @@ class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 
 		$user_id = self::$current_user_id;
 
+		$client_metadata = [
+			'clientId'         => $request->get_param( 'clientId' ),
+			'newsletterOptIn'  => $request->get_param( 'newsletter_opt_in' ),
+			'current_page_url' => \wp_get_referer(),
+			'origin'           => $origin,
+		];
+
 		if ( 0 === $user_id ) {
 			$email_address = $request->get_param( 'email' );
 
@@ -138,7 +145,8 @@ class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 				$user_id = \Newspack\WooCommerce_Connection::set_up_membership(
 					$email_address,
 					$full_name,
-					$frequency
+					$frequency,
+					$client_metadata
 				);
 				if ( \is_wp_error( $user_id ) ) {
 					return [ 'error' => \esc_html( $user_id->get_error_message() ) ];
@@ -148,6 +156,8 @@ class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 			$email_address = \get_userdata( $user_id )->user_email;
 		}
 
+		$client_metadata['userId'] = $user_id;
+
 		$response = \Newspack\Stripe_Connection::handle_donation(
 			[
 				'frequency'         => $frequency,
@@ -155,13 +165,7 @@ class WP_REST_Newspack_Donate_Controller extends WP_REST_Controller {
 				'email_address'     => $email_address,
 				'full_name'         => $full_name,
 				'amount'            => $request->get_param( 'amount' ),
-				'client_metadata'   => [
-					'clientId'         => $request->get_param( 'clientId' ),
-					'newsletterOptIn'  => $request->get_param( 'newsletter_opt_in' ),
-					'userId'           => $user_id,
-					'current_page_url' => \wp_get_referer(),
-					'origin'           => $origin,
-				],
+				'client_metadata'   => $client_metadata,
 				'payment_metadata'  => $payment_metadata,
 				'payment_method_id' => $request->get_param( 'payment_method_id' ),
 			]

package/src/blocks/donate/streamlined/index.ts

@@ -281,6 +281,14 @@ export const processStreamlinedElements = ( parentElement = document ) =>
 			if ( feesAmountEl ) {
 				const formValues = Object.fromEntries( new FormData( formElement ) );
 				const feeAmount = utils.getFeeAmount( formElement );
+				if ( feeAmount === 0 ) {
+					const feesAmountContainerEl: HTMLElement | null = el.querySelector(
+						'#stripe-fees-amount-container'
+					);
+					if ( feesAmountContainerEl ) {
+						feesAmountContainerEl.style.display = 'none';
+					}
+				}
 				if ( typeof formValues.donation_frequency === 'string' ) {
 					feesAmountEl.innerHTML = `(${ settings.currencySymbol }${ feeAmount.toFixed(
 						2

package/src/blocks/donate/streamlined/utils.ts

@@ -175,7 +175,12 @@ export const computeFeeAmount = ( amount: number, feeMultiplier: number, feeStat
  */
 export const getFeeAmount = ( formElement: HTMLFormElement ) => {
 	const { feeMultiplier, feeStatic } = getSettings( formElement );
-	if ( ! feeMultiplier || ! feeStatic ) {
+	if (
+		undefined === feeMultiplier ||
+		undefined === feeStatic ||
+		isNaN( feeMultiplier ) ||
+		isNaN( feeStatic )
+	) {
 		return 0;
 	}
 	const { amount } = getDonationFormValues( formElement );

package/src/blocks/donate/view.php

@@ -112,7 +112,7 @@ function newspack_blocks_render_block_donate_footer( $attributes ) {
 					</div>
 				</div>
 				<?php if ( $is_rendering_fee_checkbox ) : ?>
-					<div class="stripe-payment__row stripe-payment__row--small">
+					<div class="stripe-payment__row stripe-payment__row--small" id="stripe-fees-amount-container">
 						<label class="stripe-payment__checkbox">
 							<input type="checkbox" name="agree_to_pay_fees" checked value="true"><?php echo esc_html__( 'Agree to pay fees?', 'newspack-blocks' ); ?>
 							<span id="stripe-fees-amount">($0)</span>

package/vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitdafc7b562537ced688bb573bc3588de3::getLoader();
+return ComposerAutoloaderInited31aaab4ad399c15f9f84cc5fecbd40::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitdafc7b562537ced688bb573bc3588de3
+class ComposerAutoloaderInited31aaab4ad399c15f9f84cc5fecbd40
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ class ComposerAutoloaderInitdafc7b562537ced688bb573bc3588de3
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitdafc7b562537ced688bb573bc3588de3', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInited31aaab4ad399c15f9f84cc5fecbd40', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInitdafc7b562537ced688bb573bc3588de3', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInited31aaab4ad399c15f9f84cc5fecbd40', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitdafc7b562537ced688bb573bc3588de3::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInited31aaab4ad399c15f9f84cc5fecbd40::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitdafc7b562537ced688bb573bc3588de3
+class ComposerStaticInited31aaab4ad399c15f9f84cc5fecbd40
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInitdafc7b562537ced688bb573bc3588de3
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitdafc7b562537ced688bb573bc3588de3::$classMap;
+            $loader->classMap = ComposerStaticInited31aaab4ad399c15f9f84cc5fecbd40::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -5,7 +5,7 @@
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'be057d5165dd9e7ef8292cfc027112678b253706',
+        'reference' => 'b661cbcc08369bcaf96e7b0073487070973bf76b',
         'name' => 'automattic/newspack-blocks',
         'dev' => false,
     ),
@@ -16,7 +16,7 @@
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'be057d5165dd9e7ef8292cfc027112678b253706',
+            'reference' => 'b661cbcc08369bcaf96e7b0073487070973bf76b',
             'dev_requirement' => false,
         ),
     ),