chore(modal-checkout): fix rebase artifacts

Automattic · Feb 1, 2024 · ec8c6a5 · ec8c6a5
1 parent 9f7ad1c
commit ec8c6a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/includes/class-modal-checkout.php b/includes/class-modal-checkout.php
@@ -55,8 +55,6 @@ public static function init() {
 		add_filter( 'woocommerce_enable_order_notes_field', [ __CLASS__, 'enable_order_notes_field' ] );
 		add_action( 'woocommerce_checkout_process', [ __CLASS__, 'wcsg_apply_gift_subscription' ] );
 		add_filter( 'woocommerce_order_received_verify_known_shoppers', '__return_false' );
-		// TODO: Remove once we apply auth flow to checkout modal.
-		add_filter( 'newspack_reader_activation_should_render_auth', '__return_false' );
 		add_filter( 'woocommerce_order_button_html', [ __CLASS__, 'order_button_html' ], 10, 1 );
 		// TODO: Remove once we apply auth flow to checkout modal.
 		add_filter( 'newspack_reader_activation_should_render_auth', '__return_false' );

diff --git a/src/modal-checkout/modal.js b/src/modal-checkout/modal.js
@@ -1,5 +1,10 @@
 /* globals newspackBlocksModal */
 
+/**
+ * Style dependencies
+ */
+import './modal.scss';
+
 /**
  * Specify a function to execute when the DOM is fully loaded.
  *

diff --git a/src/modal-checkout/templates/thankyou.php b/src/modal-checkout/templates/thankyou.php
@@ -53,7 +53,7 @@ function newspack_blocks_replace_login_with_order_summary() {
 	<?php if ( $is_success ) : ?>
 		<div class="newspack-ui__box newspack-ui__box--success newspack-ui__box--text-center">
 			<span class="newspack-ui__icon newspack-ui__icon--success">
-				<?php // TODO: How should we handle sharing icons across plugins? ?>
+				<?php // TODO: Replace with newspack-ui icons when available. ?>
 				<svg aria-hidden="true" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 					<path d="M16.7 7.1l-6.3 8.5-3.3-2.5-.9 1.2 4.5 3.4L17.9 8z"></path>
 				</svg>