Merge remote-tracking branch 'origin/issue-1048' into issue-1048

Author: attackant

admin/class-admin-apple-themes.php

@@ -163,7 +163,7 @@ public static function render_field( $theme, $option_name ) {
 	 * Return a Theme object loaded with db values based on the theme name string.
 	 *
 	 * @param string $theme_str The name of theme.
-	 * 
+	 *
 	 * @return \Apple_Exporter\Theme $theme_object A Theme object loaded with db config.
 	 */
 	public static function get_theme_by_name( $theme_str ) {
@@ -574,7 +574,9 @@ public function theme_nag() {
 				__( 'It looks like you are using the default theme. You can choose a new theme or customize your theme on the %1$sthemes page%2$s.', 'apple-news' ),
 				'<a href="' . esc_url( admin_url( 'admin.php?page=apple-news-themes' ) ) . '">',
 				'</a>'
-			)
+			),
+			get_current_user_id(),
+			true
 		);
 	}
 

assets/js/pluginsidebar/sidebar.jsx

@@ -201,7 +201,14 @@ function Sidebar() {
 
   // Display notices whenever they change.
   useEffect(() => {
-    notices.forEach((notice) => displayNotification(notice.message, notice.type));
+    /* Adding a conditional here to prevent a sporadic error.
+    Leaving a console log in place in case we need to debug this further.
+    See: https://github.com/alleyinteractive/apple-news/issues/1030 */
+    if (Array.isArray(notices) && notices.length) {
+      notices.forEach((notice) => displayNotification(notice.message, notice.type));
+    } else {
+      console.log('Notices dispatched, but none to display.'); // eslint-disable-line no-console
+    }
   }, [displayNotification, notices]);
 
   return (