Release 4.5.0

[MAILPOET-4918]

.circleci/config.yml

@@ -71,13 +71,6 @@ anchors:
           - trunk
           - release
 
-  only_trunk_and_cot: &only_trunk_and_cot
-    filters:
-      branches:
-        only:
-          - trunk
-          - /^cot-.*/
-
   multisite_acceptance_config: &multisite_acceptance_config
     multisite: 1
     requires:
@@ -186,10 +179,10 @@ jobs:
       - run:
           name: Download additional WP Plugins for tests
           command: |
-            ./do download:woo-commerce-zip 6.8.2
+            ./do download:woo-commerce-zip 7.1.0
-            ./do download:woo-commerce-subscriptions-zip 4.5.1
+            ./do download:woo-commerce-subscriptions-zip 4.6.0
-            ./do download:woo-commerce-memberships-zip 1.23.0
+            ./do download:woo-commerce-memberships-zip 1.23.1
-            ./do download:woo-commerce-blocks-zip 8.4.0
+            ./do download:woo-commerce-blocks-zip 8.8.2
       - run:
           name: Dump tests ENV variables for acceptance tests
           command: |
@@ -318,7 +311,8 @@ jobs:
     parallelism: 20
     working_directory: /home/circleci/mailpoet/mailpoet
     machine:
-      image: ubuntu-2204:2022.07.1
+      image: ubuntu-2204:2022.10.2
+      docker_layer_caching: false
     parameters:
       multisite:
         type: integer
@@ -329,7 +323,7 @@ jobs:
       mysql_command:
         type: string
         default: ''
-      mysql_image_version:
+      mysql_image:
         type: string
         default: ''
       codeception_image_version:
@@ -356,12 +350,9 @@ jobs:
       enable_cot_sync:
         type: integer
         default: 0
-      allow_fail:
-        type: integer
-        default: 0
     environment:
       MYSQL_COMMAND: << parameters.mysql_command >>
-      MYSQL_IMAGE_VERSION: << parameters.mysql_image_version >>
+      MYSQL_IMAGE: << parameters.mysql_image >>
       CODECEPTION_IMAGE_VERSION: << parameters.codeception_image_version >>
       WORDPRESS_IMAGE_VERSION: << parameters.wordpress_image_version >>
     steps:
@@ -421,6 +412,12 @@ jobs:
               circleci tests glob "tests/acceptance/**/*Cest.php" | circleci tests split --split-by=timings > tests/acceptance/_groups/circleci_split_group
             fi
             cat tests/acceptance/_groups/circleci_split_group
+      - run:
+          name: Create docker containers for test
+          # We experienced some failures when creating containers so we do it explicitly with one retry
+          command: |
+            cd tests/docker
+            docker-compose create || docker-compose create
       - run:
           name: Run acceptance tests
           command: |
@@ -434,9 +431,6 @@ jobs:
               --xml
               -g circleci_split_group
             )
-            if [[ << parameters.allow_fail >> == 1 ]]; then
-              args+=(--no-exit)
-            fi
             docker-compose run -e SKIP_DEPS=1 \
             -e CIRCLE_BRANCH=${CIRCLE_BRANCH} \
             -e CIRCLE_JOB=${CIRCLE_JOB} \
@@ -444,18 +438,13 @@ jobs:
             -e ENABLE_COT=<< parameters.enable_cot >> \
             -e ENABLE_COT_SYNC=<< parameters.enable_cot_sync >> \
             codeception_acceptance "${args[@]}"
-      - when:
+      - run:
-          condition:
+          name: Check exceptions
-            not:
+          command: |
-              equal: [1, << parameters.allow_fail >>]
+            if [ "$(ls tests/_output/exceptions/*.html)" ]; then
-          steps:
+              echo "There were some exceptions during the tests run"
-            - run:
+              exit 1
-                name: Check exceptions
+            fi
-                command: |
-                  if [ "$(ls tests/_output/exceptions/*.html)" ]; then
-                    echo "There were some exceptions during the tests run"
-                    exit 1
-                  fi
       - store_artifacts:
           path: tests/_output
       - store_test_results:
@@ -494,9 +483,12 @@ jobs:
   integration_tests:
     working_directory: /home/circleci/mailpoet/mailpoet
     machine:
-      image: ubuntu-2204:2022.07.1
+      image: ubuntu-2204:2022.10.2
+      docker_layer_caching: false
     environment:
       CODECEPTION_IMAGE_VERSION: << parameters.codeception_image_version >>
+      MYSQL_COMMAND: << parameters.mysql_command >>
+      MYSQL_IMAGE: << parameters.mysql_image >>
     parameters:
       codeception_image_version:
         type: string
@@ -519,12 +511,12 @@ jobs:
       multisite:
         type: integer
         default: 0
-      woo_core_version:
+      mysql_command:
+        type: string
+        default: ''
+      mysql_image:
         type: string
         default: ''
-      allow_fail:
-        type: integer
-        default: 0
     steps:
       - attach_workspace:
           at: /home/circleci
@@ -532,14 +524,6 @@ jobs:
           name: 'Pull test docker images'
           # Pull docker images with 3 retries
           command: i='0';while ! docker-compose -f tests/docker/docker-compose.yml pull && ((i < 3)); do sleep 3 && i=$[$i+1]; done
-      - when:
-          condition: << parameters.woo_core_version >>
-          steps:
-            - run:
-                name: Download WooCommerce Core
-                command: |
-                  cd tests/docker
-                  docker-compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip << parameters.woo_core_version >>" --no-deps codeception_integration
       - run:
           name: 'PHP Integration tests'
           command: |
@@ -558,9 +542,6 @@ jobs:
             if [[ -n '<< parameters.skip_group >>' ]]; then
               args+=(--skip-group << parameters.skip_group >>)
             fi
-            if [[ << parameters.allow_fail >> == 1 ]]; then
-              args+=(--no-exit)
-            fi
             docker-compose run -e SKIP_DEPS=1 \
               -e CIRCLE_BRANCH=${CIRCLE_BRANCH} \
               -e CIRCLE_JOB=${CIRCLE_JOB} \
@@ -653,7 +634,7 @@ workflows:
             - build
       - acceptance_tests:
           <<: *slack-fail-post-step
-          name: acceptance_tests
+          name: acceptance_tests_base_and_woo_cot_off
           requires:
             - unit_tests
             - static_analysis_php8
@@ -661,13 +642,10 @@ workflows:
             - qa_php
       - acceptance_tests:
           <<: *slack-fail-post-step
-          <<: *only_trunk_and_cot
           name: acceptance_tests_woo_cot_sync
           group: woo
           enable_cot: 1
           enable_cot_sync: 1
-          allow_fail: 1
-          woo_core_version: woo-cot-beta # Temporarily force COT beta version
           requires:
             - unit_tests
             - static_analysis_php8
@@ -675,24 +653,10 @@ workflows:
             - qa_php
       - acceptance_tests:
           <<: *slack-fail-post-step
-          <<: *only_trunk_and_cot
           name: acceptance_tests_woo_cot_no_sync
           group: woo
           enable_cot: 1
           enable_cot_sync: 0
-          allow_fail: 1
-          woo_core_version: woo-cot-beta # Temporarily force COT beta version
-          requires:
-            - unit_tests
-            - static_analysis_php8
-            - qa_js
-            - qa_php
-      - acceptance_tests:
-          <<: *slack-fail-post-step
-          <<: *only_trunk_and_cot
-          name: acceptance_tests_woo_cot_off
-          group: woo
-          woo_core_version: woo-cot-beta # Temporarily force COT beta version
           requires:
             - unit_tests
             - static_analysis_php8
@@ -705,20 +669,8 @@ workflows:
       - integration_tests:
           <<: *slack-fail-post-step
           group: woo
-          name: integration_test_woocommerce
-          requires:
-            - unit_tests
-            - static_analysis_php8
-            - qa_js
-            - qa_php
-      - integration_tests:
-          <<: *slack-fail-post-step
-          <<: *only_trunk_and_cot
-          group: woo
           enable_cot: 1
           enable_cot_sync: 1
-          allow_fail: 1
-          woo_core_version: woo-cot-beta # Temporarily force COT beta version
           name: integration_test_woo_cot_sync
           requires:
             - unit_tests
@@ -727,12 +679,9 @@ workflows:
             - qa_php
       - integration_tests:
           <<: *slack-fail-post-step
-          <<: *only_trunk_and_cot
           group: woo
           enable_cot: 1
           enable_cot_sync: 0
-          allow_fail: 1
-          woo_core_version: woo-cot-beta # Temporarily force COT beta version
           name: integration_test_woo_cot_no_sync
           requires:
             - unit_tests
@@ -741,9 +690,7 @@ workflows:
             - qa_php
       - integration_tests:
           <<: *slack-fail-post-step
-          <<: *only_trunk_and_cot
           group: woo
-          woo_core_version: woo-cot-beta # Temporarily force COT beta version
           name: integration_test_woo_cot_off
           requires:
             - unit_tests
@@ -779,10 +726,14 @@ workflows:
           <<: *slack-fail-post-step
           requires:
             - build
-            - acceptance_tests
+            - acceptance_tests_base_and_woo_cot_off
             - js_tests
-            - integration_test_woocommerce
             - integration_test_base
+            - integration_test_woo_cot_no_sync
+            - integration_test_woo_cot_off
+            - integration_test_woo_cot_sync
+            - acceptance_tests_woo_cot_sync
+            - acceptance_tests_woo_cot_no_sync
 
   nightly:
     triggers:
@@ -807,14 +758,14 @@ workflows:
       - acceptance_tests:
           <<: *slack-fail-post-step
           name: acceptance_oldest
-          woo_core_version: 6.2.2
+          woo_core_version: 6.8.0
           woo_subscriptions_version: 4.3.0
           woo_memberships_version: 1.21.0
-          woo_blocks_version: 5.3.2
+          woo_blocks_version: 6.8.0
-          mysql_command: --max_allowed_packet=100M
+          mysql_command: --max_allowed_packet=100M --default-storage-engine=MYISAM
-          mysql_image_version: 5.7.36
+          mysql_image: mysql:5.5
-          codeception_image_version: 7.4-cli_20210126.1
+          codeception_image_version: 7.4-cli_20220605.0
-          wordpress_image_version: wp-5.6_php7.2_20220406.1
+          wordpress_image_version: wp-5.8_php7.3_20221104.1
           requires:
             - build
       - unit_tests:
@@ -837,6 +788,8 @@ workflows:
           <<: *slack-fail-post-step
           name: integration_oldest
           codeception_image_version: 7.2-cli_20220605.0
+          mysql_command: --max_allowed_packet=100M --default-storage-engine=MYISAM
+          mysql_image: mysql:5.5
           requires:
             - build
       - build_premium:

README.md

@@ -126,23 +126,24 @@ You can access this help in your command line running `./do` without parameters.
 
 [Read the article.](https://mailpoet.atlassian.net/wiki/spaces/MAILPOET/pages/629374977/Adding+new+templates+to+the+plugin)
 
-## 🚥 Testing with PHP 7.4 or PHP 8.0
+## 🚥 Testing with different PHP versions
 
-To switch the environment to PHP 7.4/8.0:
+To switch the environment to a different PHP version:
 
-1. Configure the `wordpress` service in `docker-compose.override.yml` to build from the php74 Dockerfile:
+1. Check https://github.com/mailpoet/mailpoet/tree/trunk/dev for a list of available PHP versions. Each directory starting with `php` corresponds to a available version.
+2. Configure the `wordpress` service in `docker-compose.override.yml` to build from the desired PHP version Dockerfile (replace {PHP_VERSION} with the name of the directory that corresponds to the version that you want to use):
 
    ```yaml
    wordpress:
      build:
        context: .
-       dockerfile: dev/php74/Dockerfile # OR dev/php80/Dockerfile
+       dockerfile: dev/{PHP_VERSION}/Dockerfile
    ```
 
-2. Run `docker-compose build wordpress`.
+3. Run `docker-compose build wordpress`.
-3. Start the stack with `./do start`.
+4. Start the stack with `./do start`.
 
-To switch back to PHP 8.1 remove what was added in 1) and, run `docker-compose build wordpress` for application container and `docker-compose build test_wordpress` for tests container,
+To switch back to the default PHP version remove what was added in 2) and, run `docker-compose build wordpress` for application container and `docker-compose build test_wordpress` for tests container,
 and start the stack using `./do start`.
 
 ## ✅ TODO

dev/php82/Dockerfile

@@ -0,0 +1,46 @@
+FROM php:8.2.0RC6-apache
+
+ARG UID=1000
+ARG GID=1000
+
+# additinal extensions
+RUN apt-get update \
+	&& apt-get install -y git zlib1g-dev libzip-dev zip wget gnupg msmtp libpng-dev gettext subversion \
+	&& \
+    # Install NodeJS, enable Corepack
+    curl -sL https://deb.nodesource.com/setup_17.x | bash - && \
+    apt-get install -y nodejs build-essential && \
+    corepack enable && \
+	\
+	# Install WP-CLI
+	curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
+	chmod +x /usr/local/bin/wp && \
+	\
+  # Clean up
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY dev/php.ini /usr/local/etc/php/conf.d/php_user.ini
+
+# msmtp config
+RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
+
+# xdebug build an config
+ENV XDEBUGINI_PATH=/usr/local/etc/php/conf.d/xdebug.ini
+RUN git clone -b "3.2.0RC2" --depth 1 https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug \
+    && docker-php-ext-configure xdebug --enable-xdebug-dev \
+    && docker-php-ext-install xdebug \
+    && mkdir /tmp/debug
+COPY dev/xdebug.ini /tmp/xdebug.ini
+RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
+
+# php extensions
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install mysqli
+
+# allow .htaccess files (between <Directory /var/www/> and </Directory>, which is WordPress installation)
+RUN sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
+
+# ensure existing content in /var/www/html respects UID and GID, give Node permissions for Corepack
+RUN chown -R ${UID}:${GID} /var/www/html && \
+  mkdir -p /.node && chown -R ${UID}:${GID} /.node

doc/Readme.md

@@ -28,6 +28,7 @@ Class `\MailPoet\API\API` becomes available once MailPoet plugin is loaded by Wo
 - [Add List (addList)](api_methods/AddList.md)
 - [Add Subscriber (addSubscriber)](api_methods/AddSubscriber.md)
 - [Add Subscriber Field (addSubscriberField)](api_methods/AddSubscriberField.md)
+- [Delete List (deleteList)](api_methods/DeleteList.md)
 - [Get Lists (getLists)](api_methods/GetLists.md)
 - [Get Subscriber (getSubscriber)](api_methods/GetSubscriber.md)
 - [Get Subscribers (getSubscribers)](api_methods/GetSubscribers.md)
@@ -38,6 +39,7 @@ Class `\MailPoet\API\API` becomes available once MailPoet plugin is loaded by Wo
 - [Subscribe to Lists (subscribeToLists)](api_methods/SubscribeToLists.md)
 - [Unsubscribe from List (unsubscribeFromList)](api_methods/UnsubscribeFromList.md)
 - [Unsubscribe from Lists (unsubscribeFromLists)](api_methods/UnsubscribeFromLists.md)
+- [Update List (updateList)](api_methods/UpdateList.md)
 
 ### Usage examples
 

doc/api_methods/DeleteList.md

@@ -0,0 +1,27 @@
+[back to list](../Readme.md)
+
+# Delete List
+
+## `bool deleteList(string $list_id)`
+
+This method provides functionality for deleting a list that is of the type 'default'.
+
+It returns a boolean value.
+
+## Error handling
+
+All expected errors from the API are exceptions of class `\MailPoet\API\MP\v1\APIException`.
+Code of the exception is populated to distinguish between different errors.
+
+An exception of base class `\Exception` can be thrown when something unexpected happens.
+
+Codes description:
+
+| Code | Description                                                     |
+| ---- | --------------------------------------------------------------- |
+| 5    | List does not exist                                             |
+| 18   | List id is empty                                                |
+| 20   | List cannot be deleted because it’s used for an automatic email |
+| 21   | List cannot be deleted because it’s used for a form             |
+| 22   | The list couldn’t be deleted from the database                  |
+| 23   | Only lists of the type 'default' can be deleted                 |

doc/api_methods/GetSubscribers.md

@@ -18,8 +18,8 @@ This method returns a list of subscribers. To see the subscriber data structure,
 
 Filter argument supports following array keys.
 
-| Key            | Type         | Description                                                                                                       |
+| Key          | Type         | Description                                                                                                       |
-| -------------- | ------------ | ----------------------------------------------------------------------------------------------------------------- |
+| ------------ | ------------ | ----------------------------------------------------------------------------------------------------------------- |
-| status         | string       | Specific status of subscribers. One of values: `unconfirmed`, `subscribed`, `unsubscribed`, `bounced`, `inactive` |
+| status       | string       | Specific status of subscribers. One of values: `unconfirmed`, `subscribed`, `unsubscribed`, `bounced`, `inactive` |
-| list_id        | int          | List id or dynamic segment id                                                                                     |
+| listId       | int          | List id or dynamic segment id                                                                                     |
-| min_updated_at | DateTime\int | DateTime object or timestamp of the minimal last update of subscribers                                            |
+| minUpdatedAt | DateTime\int | DateTime object or timestamp of the minimal last update of subscribers                                            |

doc/api_methods/UpdateList.md

@@ -0,0 +1,39 @@
+[back to list](../Readme.md)
+
+# Add Subscriber
+
+## `array updateList(array $list)`
+
+This method provides functionality for updating a list name or description. Only lists of type 'default' are supported.
+
+It returns the updated list. See [Get Lists](GetLists.md) for a list data structure description.
+
+## Arguments
+
+### `$list` (required)
+
+An associative array which contains list data.
+
+| Property               | Type         | Limits    | Description                |
+| ---------------------- | ------------ | --------- | -------------------------- |
+| id (required)          | string       | 11 chars  | A id of the list.          |
+| name (required)        | string       | 90 chars  | A name of the list.        |
+| description (optional) | string\|null | 250 chars | A description of the list. |
+
+## Error handling
+
+All expected errors from the API are exceptions of class `\MailPoet\API\MP\v1\APIException`.
+Code of the exception is populated to distinguish between different errors.
+
+An exception of base class `\Exception` can be thrown when something unexpected happens.
+
+Codes description:
+
+| Code | Description                                     |
+| ---- | ----------------------------------------------- |
+| 5    | The list was not found by id                    |
+| 14   | Missing list name                               |
+| 15   | Trying to use a list name that is already used  |
+| 18   | Missing list id                                 |
+| 19   | The list couldn’t be updated in the database    |
+| 23   | Only lists of the type 'default' can be updated |

docker-compose.yml

@@ -15,6 +15,7 @@ services:
     volumes:
       - my-datavolume:/var/lib/mysql
       - ./dev/database/create_test_db.sh:/docker-entrypoint-initdb.d/10-create_test_db.sh
+    command: --sql_mode=STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,ANSI,ONLY_FULL_GROUP_BY
     environment:
       MYSQL_ROOT_PASSWORD: somewordpress
       MYSQL_DATABASE: wordpress

mailpoet/.babelrc

@@ -5,7 +5,6 @@
     "@babel/preset-env"
   ],
   "plugins": [
-    "babel-plugin-typescript-to-proptypes",
     [
       "@babel/plugin-transform-runtime",
       {

mailpoet/RoboFile.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 // phpcs:disable PSR1.Classes.ClassDeclaration
 // phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
@@ -117,11 +117,45 @@ class RoboFile extends \Robo\Tasks {
   }
 
   public function translationsBuild() {
+    $exclude = implode(',', [
+      '.mp_svn',
+      'assets/css',
+      'assets/img',
+      'assets/js',
+      'generated',
+      'lang',
+      'lib-3rd-party',
+      'mailpoet-premium',
+      'node_modules',
+      'plugin_repository',
+      'prefixer',
+      'tasks',
+      'temp',
+      'tests',
+      'tools',
+      'vendor',
+      'vendor-prefixed',
+    ]);
+
+    $headers = escapeshellarg(
+      json_encode([
+        'Report-Msgid-Bugs-To' => 'http://support.mailpoet.com/',
+        'Last-Translator' => 'MailPoet i18n (https://www.transifex.com/organization/wysija)',
+        'Language-Team' => 'MailPoet i18n <https://www.transifex.com/organization/wysija>',
+        'Plural-Forms' => 'nplurals=2; plural=(n != 1);',
+      ])
+    );
+
     $this->collectionBuilder()
       ->taskExec('mkdir -p ' . __DIR__ . '/lang')
-      ->taskExec(
+
-        'php -d memory_limit=-1 tasks/makepot/grunt-makepot.php wp-plugin . lang/mailpoet.pot mailpoet .mp_svn,assets,lang,node_modules,plugin_repository,tasks,tests,vendor'
+      // HTML, HBS
-      )->run();
+      ->taskExec("php -d memory_limit=-1 tasks/makepot/makepot-views.php . > lang/mailpoet.pot")
+
+      // PHP, JS/TS
+      ->taskExec("vendor/bin/wp i18n make-pot --merge --slug=mailpoet --domain=mailpoet --exclude=$exclude --headers=$headers . lang/mailpoet.pot")
+
+      ->run();
   }
 
   public function translationsGetPotFileFromBuild() {
@@ -351,6 +385,25 @@ class RoboFile extends \Robo\Tasks {
     $this->say("Validator metadata generated to: $validatorMetadataDir");
   }
 
+  public function migrationsNew() {
+    $generator = new \MailPoet\Migrator\Repository();
+    $result = $generator->create();
+    $path = realpath($result['path']);
+    $this->output->writeln('MAILPOET DATABASE MIGRATIONS');
+    $this->output->writeln("============================\n");
+    $this->output->writeln("New migration created ✔\n");
+    $this->output->writeln("  Name:  {$result['name']}");
+    $this->output->writeln("  Path:  $path");
+  }
+
+  public function migrationsStatus() {
+    return $this->taskExec('vendor/bin/wp mailpoet:migrations:status');
+  }
+
+  public function migrationsRun() {
+    return $this->taskExec('vendor/bin/wp mailpoet:migrations:run');
+  }
+
   public function qa() {
     $collection = $this->collectionBuilder();
     $collection->addCode([$this, 'qaPhp']);
@@ -372,6 +425,9 @@ class RoboFile extends \Robo\Tasks {
     $collection->addCode(function() {
       return $this->qaCodeSniffer([]);
     });
+    $collection->addCode(function() {
+      return $this->qaMinimalPluginStandard([]);
+    });
     return $collection->run();
   }
 
@@ -448,7 +504,56 @@ class RoboFile extends \Robo\Tasks {
       './tasks/code_sniffer/vendor/bin/phpcs',
       '--extensions=php',
       $severityFlag,
-      '--standard=tasks/code_sniffer/MailPoet',
+      '--standard=tasks/code_sniffer/MailPoet/free-ruleset.xml',
+      '-s',
+    ]);
+
+    $ignorePaths = [
+      '.mp_svn',
+      'assets',
+      'doc',
+      'generated',
+      'lib/Config/PopulatorData/Templates',
+      'lib-3rd-party',
+      'node_modules',
+      'plugin_repository',
+      'prefixer/build',
+      'prefixer/vendor',
+      'tasks/code_sniffer/vendor',
+      'tasks/phpstan/vendor',
+      'tasks/makepot',
+      'tools/vendor',
+      'temp',
+      'tests/_data',
+      'tests/_output',
+      'tests/_support/_generated',
+      'vendor',
+      'vendor-prefixed',
+      'views',
+    ];
+
+    // the "--ignore" arg takes a list of regexes, we need to anchor and escape them
+    $ignorePatterns = array_map(function (string $path): string {
+      return '^' . preg_quote(__DIR__ . DIRECTORY_SEPARATOR . $path);
+    }, $ignorePaths);
+
+    $stringFilesToCheck = !empty($filesToCheck) ? implode(' ', $filesToCheck) : '.';
+
+    return $this->taskExec($task)
+      ->arg('--ignore=' . implode(',', $ignorePatterns))
+      ->rawArg($stringFilesToCheck)
+      ->run();
+  }
+
+  public function qaMinimalPluginStandard(array $filesToCheck, $opts = ['severity' => 'all']) {
+    $severityFlag = $opts['severity'] === 'all' ? '-w' : '-n';
+
+    $task = implode(' ', [
+      'php -d memory_limit=-1',
+      './tasks/code_sniffer/vendor/bin/phpcs',
+      '--extensions=php',
+      $severityFlag,
+      '--standard=tasks/code_sniffer/vendor/wporg/plugin-directory/MinimalPluginStandard',
       '-s',
     ]);
 
@@ -746,6 +851,9 @@ class RoboFile extends \Robo\Tasks {
       ->addCode(function () use ($version) {
         $this->releaseCreatePullRequest($version);
       })
+      ->addCode(function () use ($version) {
+        $this->releaseRerunCircleWorkflow(\MailPoetTasks\Release\CircleCiController::PROJECT_PREMIUM);
+      })
       ->addCode(function () use ($version) {
         $this->translationsPrepareLanguagePacks($version);
       })
@@ -1063,6 +1171,18 @@ class RoboFile extends \Robo\Tasks {
     $this->say("Release '$version[name]' info was published on Slack.");
   }
 
+  public function releaseRerunCircleWorkflow(string $project = null) {
+    $circleciController = $this->createCircleCiController();
+    $result = $circleciController->rerunLatestWorkflow($project);
+    // Sometimes can be useful to know which Circle project workflow was restarted
+    $project = $project ? " for the project '{$project}'" : '';
+    if (!$result) {
+      $this->yell("Circle Workflow{$project} was not restarted", 40, 'red');
+    } else {
+      $this->say("Circle Workflow{$project} was started from the beginning");
+    }
+  }
+
   public function downloadWooCommerceBlocksZip($tag = null) {
     $this->createWpOrgDownloader('woo-gutenberg-products-block')
       ->downloadPluginZip('woo-gutenberg-products-block.zip', __DIR__ . '/tests/plugins/', $tag);
@@ -1087,20 +1207,10 @@ class RoboFile extends \Robo\Tasks {
   }
 
   public function downloadWooCommerceZip($tag = null) {
-    if ($tag === 'woo-cot-beta') {
-      $this->downloadWooCommerceCotZip();
-      return;
-    }
     $this->createWpOrgDownloader('woocommerce')
     ->downloadPluginZip('woocommerce.zip', __DIR__ . '/tests/plugins/', $tag);
   }
 
-  public function downloadWooCommerceCotZip() {
-    $cotBuildUrl = 'https://github.com/woocommerce/woocommerce/files/9706609/woocommerce.zip';
-    file_put_contents(__DIR__ . '/tests/plugins/woocommerce.zip', file_get_contents($cotBuildUrl));
-    file_put_contents(__DIR__ . '/tests/plugins/woocommerce.zip-info', $cotBuildUrl);
-  }
-
   public function generateData($generatorName = null, $threads = 1) {
     require_once __DIR__ . '/tests/DataGenerator/_bootstrap.php';
     $generator = new \MailPoet\Test\DataGenerator\DataGenerator(new \Codeception\Lib\Console\Output([]));

mailpoet/assets/css/src/components-automation-editor/_add-trigger.scss

@@ -1,4 +1,4 @@
-.mailpoet-automation-workflow-add-trigger {
+.mailpoet-automation-add-trigger {
   align-items: center;
   border: 1px dashed #c3c4c7;
   border-radius: 4px;

mailpoet/assets/css/src/components-automation-editor/_automation.scss

@@ -1,14 +1,14 @@
-.mailpoet-automation-editor-workflow {
+.mailpoet-automation-editor-automation {
   background: #fbfbfb;
   flex-grow: 1;
 }
 
-.mailpoet-automation-editor-workflow-wrapper {
+.mailpoet-automation-editor-automation-wrapper {
   display: grid;
   padding: 50px 20px;
 }
 
-.mailpoet-automation-editor-workflow-end {
+.mailpoet-automation-editor-automation-end {
   background: #8c8f94;
   border-radius: 999999px;
   fill: white;

mailpoet/assets/css/src/components-automation-editor/_empty-automation.scss

@@ -1,4 +1,4 @@
-.mailpoet-automation-editor-empty-workflow {
+.mailpoet-automation-editor-empty-automation {
   align-items: center;
   display: grid;
   height: 100%;

mailpoet/assets/css/src/components-automation-editor/_errors.scss

@@ -30,3 +30,32 @@
     outline: none;
   }
 }
+
+.mailpoet-automation-field__error {
+  position: relative;
+
+  input,
+  select,
+  textarea,
+  input[type='text'].components-form-token-field__input {
+    background: right top/26px no-repeat url('../../img/icons/alert.svg');
+    padding-right: 26px;
+  }
+
+  select,
+  input[type=number] {
+    background-position-x: calc(100% - 26px);
+    padding-right: 8px !important;
+  }
+
+  .components-base-control__help,
+  .mailpoet-automation-field-message {
+    color: #d63638;
+  }
+
+  .components-button.mailpoet-automation-button-sidebar-primary,
+  .components-button.mailpoet-automation-button-sidebar-primary.has-text,
+  .components-button.mailpoet-automation-button-sidebar-primary.has-icon {
+    background: #d63638;
+  }
+}

mailpoet/assets/css/src/components-automation-listing/_listing.scss

@@ -6,6 +6,12 @@
   }
 }
 
+.mailpoet-automation-is-onboarding {
+  .notice {
+    display: none;
+  }
+}
+
 .mailpoet-automation-listing-heading {
   margin-bottom: 16px;
 }
@@ -15,6 +21,21 @@
   margin-bottom: 0;
 }
 
+.mailpoet-automation-listing-cell-name {
+  position: relative;
+  width: 100%;
+
+  > a:only-child {
+    bottom: 2px;
+    display: flex;
+    left: 0;
+    padding: 16px 24px;
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+}
+
 .mailpoet-filter-tab-panel {
   background-color: #fff;
   border: 1px solid #dcdcde;

mailpoet/assets/css/src/components-automation-listing/_sections.scss

@@ -0,0 +1,201 @@
+@mixin full-width {
+  margin-left: -20px;
+  padding-left: 104px;
+  padding-right: 104px;
+  width: calc(100% + 60px);
+
+  @media screen and (max-width: 782px) {
+    margin-left: -10px;
+    width: calc(100% + 34px);
+  }
+}
+
+.mailpoet-automation-section {
+  @include full-width;
+}
+
+.mailpoet-automation-white-background {
+  background: #fff;
+}
+
+.mailpoet-automation-section-content {
+  display: block;
+  margin: auto;
+  max-width: 1072px;
+  padding: 65px 0;
+
+  h2 {
+    font-size: 23px;
+    font-weight: 400;
+    line-height: 32px;
+    margin: 0;
+    padding: 0 0 8px;
+  }
+
+  p {
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 22px;
+    margin: 0;
+    padding: 0 0 40px;
+  }
+}
+
+.mailpoet-automation-section-hero {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  margin-top: -20px;
+
+  h1 {
+    font-size: 32px;
+    font-weight: 400;
+    line-height: 40px;
+  }
+
+  p {
+    font-size: 14px;
+    line-height: 22px;
+    margin-bottom: 32px;
+  }
+
+  > div {
+    width: 400px;
+  }
+
+  img {
+    margin-top: 16px;
+    max-width: 100%;
+    width: 532px;
+
+    @media screen and (min-width: 1305px) {
+      height: 100%;
+      margin-top: 0;
+      max-height: 294px;
+      width: auto;
+    }
+  }
+}
+
+.mailpoet-automation-preheading {
+  display: block;
+  font-size: 11px;
+  letter-spacing: .2px;
+  line-height: 16px;
+  margin-bottom: 32px;
+  text-transform: uppercase;
+}
+
+.mailpoet-section-templates {
+  padding: 48px 0;
+
+  .components-button {
+    display: block;
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 25px;
+    text-align: center;
+    text-underline-offset: 5px;
+  }
+}
+
+.mailpoet-section-template-list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  margin-bottom: 40px;
+
+  > li {
+    flex-grow: 1;
+    margin-right: 8px;
+    max-width: 336px;
+
+    &:last-child {
+      margin-right: 0;
+    }
+
+    button {
+      background: #fff;
+      border: 1px solid #dcdcde;
+      border-radius: 0;
+      color: #1d2327;
+      cursor: pointer;
+      padding: 24px;
+      text-align: left;
+
+      h3 {
+        font-size: 16px;
+        font-weight: 600;
+        line-height: 24px;
+      }
+    }
+  }
+}
+
+.mailpoet-section-build-list-button {
+  background: transparent;
+  border: 0;
+  color: #000;
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 400;
+  line-height: 24px;
+  padding: 0;
+  text-align: left;
+  width: 100%;
+}
+
+.mailpoet-section-build-your-own {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  ol {
+    list-style: decimal-leading-zero inside;
+    margin: 0;
+    max-width: 373px;
+    padding: 0;
+
+    > li {
+      border-bottom: 1px solid #dcdcde;
+      display: grid;
+      grid-gap: 16px;
+      grid-template-columns: 16px auto;
+      margin-bottom: 16px;
+      padding-bottom: 16px;
+
+      &.open {
+        p {
+          display: block;
+        }
+
+        .mailpoet-section-build-list-button {
+          font-weight: 600;
+        }
+      }
+
+      &:last-of-type {
+        border: 0;
+      }
+    }
+
+    .marker {
+      color: #ff5301;
+      display: inline-block;
+      font-size: 16px;
+      font-weight: 600;
+      line-height: 24px;
+    }
+
+    p {
+      display: none;
+      padding: 0;
+    }
+  }
+
+  img {
+    height: auto;
+    max-width: 400px;
+    width: 100%;
+  }
+}

mailpoet/assets/css/src/components-automation/_option-button.scss

@@ -0,0 +1,33 @@
+.mailpoet-option-button {
+  display: flex;
+  margin-top: 8px;
+  position: relative;
+}
+
+.mailpoet-option-button-main {
+  border-radius: 2px 0 0 2px;
+  margin-right: 1px;
+}
+
+.mailpoet-option-button-opener {
+  background: var(--wp-admin-theme-color);
+  border-radius: 0 2px 2px 0;
+  color: white;
+}
+
+.mailpoet-option-button-opener svg {
+  fill: white;
+}
+
+.mailpoet-option-button-opener .is-opened svg {
+  transform: scale(-1, -1);
+  transform-origin: center 12.5px;
+}
+
+.mailpoet-option-button-opener.is-busy {
+  animation: components-button__busy-animation 2500ms infinite linear;
+  background-color: var(--wp-admin-theme-color);
+  background-image: linear-gradient(-45deg, var(--wp-admin-theme-color) 33%, var(--wp-admin-theme-color-darker-20) 33%, var(--wp-admin-theme-color-darker-20) 70%, var(--wp-admin-theme-color) 70%);
+  background-size: 100px 100%;
+  border-color: var(--wp-admin-theme-color);
+}

mailpoet/assets/css/src/components-editor/components/_forms.scss

@@ -51,4 +51,8 @@
   .mailpoet_form_field_block {
     display: block;
   }
+
+  .mailpoet_form_field_input_nowrap {
+    white-space: nowrap;
+  }
 }

mailpoet/assets/css/src/components-homepage/_layout.scss

@@ -0,0 +1,5 @@
+.mailpoet-homepage__container {
+  margin: 0 auto;
+  margin-top: $grid-gap-xl;
+  max-width: 680px;
+}

mailpoet/assets/css/src/components-homepage/_task-list.scss

@@ -0,0 +1,126 @@
+$task-icon-size: 32px;
+
+.mailpoet-task-list__task {
+  background-color: $color-white;
+  border-bottom: 1px solid $color-homepage-borders;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: grid;
+  font-weight: 600;
+  grid-template-columns: $grid-gap-xl auto $grid-gap-xl;
+  margin: 0;
+  padding: $grid-gap $grid-gap-medium;
+  position: relative;
+  width: 100%;
+
+  &:hover {
+    background-color: $color-grey-0;
+  }
+}
+
+.mailpoet-task-list__task-content {
+  align-content: center;
+  color: var(--wp-admin-theme-color);
+  display: flex;
+  flex-direction: column;
+  font-size: 14px;
+  justify-content: center;
+  line-height: 20px;
+
+  p {
+    color: $color-text-light;
+    font-weight: normal;
+    margin: 3px 0 0;
+  }
+
+  a {
+    color: var(--wp-admin-theme-color);
+
+    &:hover {
+      color: var(--wp-admin-theme-color-darker-20);
+    }
+  }
+}
+
+.mailpoet-task-list__task-before {
+  color: var(--wp-admin-theme-color);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.mailpoet-task-list__task-icon {
+  border: 1px solid var(--wp-admin-theme-color);
+  border-radius: 50%;
+  box-sizing: border-box;
+  height: $task-icon-size;
+  line-height: $task-icon-size;
+  text-align: center;
+  width: $task-icon-size;
+
+  svg {
+    fill: var(--wp-admin-theme-color);
+    margin: 3px;
+  }
+}
+
+.mailpoet-task-list__task--completed {
+  cursor: inherit;
+
+  &:hover {
+    background-color: $color-white;
+  }
+
+  .mailpoet-task-list__task-icon {
+    background-color: var(--wp-admin-theme-color);
+
+    svg {
+      fill: $color-white;
+    }
+  }
+}
+
+.mailpoet-task-list__task--active {
+  box-shadow: inset 5px 0 0 0 var(--wp-admin-theme-color);
+
+  &:after {
+    background-color: var(--wp-admin-theme-color);
+    content: '';
+    height: 100%;
+    left: 0;
+    opacity: .1;
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+    width: 100%;
+  }
+}
+
+.mailpoet-task-list__heading p,
+.mailpoet-task-list__all-set {
+  color: $color-text-light;
+  font-size: $heading-font-size-h4;
+  line-height: 1.5;
+  margin-top: $grid-gap-large;
+  text-align: center;
+}
+
+.mailpoet-task-list__heading {
+  margin-bottom: $grid-gap-large;
+  position: relative;
+
+  h1 {
+    margin: 0;
+  }
+
+  p {
+    margin-top: $grid-gap-half;
+    text-align: left;
+  }
+
+  .components-dropdown {
+    position: absolute;
+    right: 0;
+    top: 6px;
+  }
+}

mailpoet/assets/css/src/components-plugin/_common.scss

@@ -122,3 +122,21 @@ body .components-modal__screen-overlay {
   justify-content: flex-end;
   margin-top: $grid-gap-half;
 }
+
+.mailpoet-locked-badge {
+  align-items: center;
+  background: #fcf9e8;
+  border: .5px solid #f5e6ab;
+  border-radius: 4px;
+  color: #bd8600;
+  display: flex;
+  font-size: 11px;
+  font-weight: 500;
+  gap: 4px;
+  height: 20px;
+  letter-spacing: .2px;
+  line-height: 16px;
+  padding: 2px 8px 2px 4px;
+  text-transform: uppercase;
+  width: 82px;
+}

mailpoet/assets/css/src/components-plugin/_landingpage.scss

@@ -0,0 +1,91 @@
+#mailpoet_landingpage_container {
+  $content-padding: 32px 65px;
+
+  .mailpoet-content-center {
+    text-align: center;
+  }
+
+  .mailpoet-content-padding {
+    padding: $content-padding;
+  }
+
+  .landing-header {
+    padding: $content-padding;
+  }
+
+  .landing-footer {
+    background-color: $color-landingpage-background-light;
+    padding: $content-padding;
+
+    .landing-footer-content {
+      box-shadow: 0 -1px 0 0 $color-tertiary-light;
+      padding: 25px 0;
+    }
+  }
+
+  .landing-faq {
+    background-color: $color-landingpage-background-light;
+    padding: $content-padding;
+
+    .mailpoet-faq-accordion {
+      margin: 25px 0;
+    }
+  }
+}
+
+.mailpoet-faq-accordion {
+  details {
+    overflow: hidden;
+
+    &:not(:first-child) {
+      border-top: 1px solid $color-editor-border-structure;
+    }
+
+    summary {
+      cursor: pointer;
+      padding: 20px 5px;
+      position: relative;
+
+      &::-webkit-details-marker {   // remove default marker
+        content: '';
+        display: none;
+      }
+
+      &::marker {                   // remove default marker
+        content: '';
+        display: none;
+      }
+
+      &:after {
+        content: '›';
+        font-size: 30px;
+        position: absolute;
+        right: 20px;
+        top: 0;
+        transform: rotate(90deg);
+        transform-origin: center;
+        transition: .2s transform ease;
+      }
+    }
+
+    .content {
+      max-height: 0;
+      overflow: hidden;
+      padding: 10px 5px;
+      transition: max-height .3s ease;
+    }
+
+    // when accordion is opened
+    &[open] {
+      summary:after {
+        transform: rotate(-90deg);
+        transition: .5s transform ease;
+      }
+
+      .content {
+        max-height: 400px;
+        transition: max-height .5s ease-in;
+      }
+    }
+  }
+}

mailpoet/assets/css/src/components-plugin/_stats.scss

@@ -119,6 +119,10 @@
   color: $color-stats-average;
 }
 
+.mailpoet-statistics-value-number-critical {
+  color: $color-stats-critical;
+}
+
 .mailpoet-statistics-value-number-excellent {
   color: $color-stats-excellent;
 }

mailpoet/assets/css/src/components-plugin/_welcome-wizard.scss

@@ -22,6 +22,12 @@
   }
 }
 
+#mailpoet-wizard-container {
+  .mailpoet-top-bar {
+    left: 0;
+  }
+}
+
 .mailpoet-wizard-logo {
   margin-bottom: 100px;
   text-align: center;
@@ -35,6 +41,7 @@
   align-items: center;
   display: flex;
   justify-content: center;
+  margin-top: 8px;
 
   @include respond-to(medium-screen) {
     flex-direction: column;
@@ -42,7 +49,7 @@
 }
 
 .mailpoet-wizard-step-illustration {
-  margin-right: $grid-gap;
+  margin-right: $grid-gap-xl;
   max-width: $grid-column;
   text-align: center;
   width: 100%;
@@ -63,12 +70,16 @@
 }
 
 .mailpoet-wizard-step-content {
-  max-width: $grid-column-small + $grid-gap + $grid-column;
+  max-width: 480px;
   width: 100%;
 
   @include respond-to(medium-screen) {
     max-width: $grid-column;
   }
+
+  .mailpoet-button {
+    height: 36px;
+  }
 }
 
 .mailpoet-wizard-label {
@@ -111,12 +122,16 @@
 
 .mailpoet-wizard-woocommerce-option {
   align-items: center;
-  box-shadow: 0 -1px 0 0 $color-tertiary-light;
+  box-shadow: 0 1px 0 0 $color-tertiary-light;
   display: flex;
   flex-direction: row-reverse;
   justify-content: space-between;
   padding-bottom: 25px;
   padding-top: 1px;
+
+  &:last-child {
+    box-shadow: 0 0;
+  }
 }
 
 .mailpoet-wizard-note {

mailpoet/assets/css/src/components-public/_public.scss

@@ -63,6 +63,11 @@ $form-line-height: 1.4;
   .mailpoet-has-font-size {
     line-height: $form-line-height;
   }
+
+  .mailpoet_submit {
+    white-space: normal;
+    word-wrap: break-word;
+  }
 }
 
 /* Reset fieldset styles in form for backward compatibility. */

mailpoet/assets/css/src/components-public/captcha.scss

@@ -0,0 +1,12 @@
+.mailpoet_captcha_form {
+  .mailpoet_icon_button {
+    background: transparent;
+    border: 0;
+    cursor: pointer;
+
+    img {
+      height: 20px;
+      width: 20px;
+    }
+  }
+}

mailpoet/assets/css/src/components/_modal.scss

@@ -112,3 +112,11 @@
   max-width: 100%;
   width: 100%;
 }
+
+.authorize-sender-email-and-domain-modal {
+  z-index: 30; // overlay other modals
+}
+
+.authorize-sender-email-and-domain-modal-overlay {
+  z-index: $modal-screen-overlay-z-index + 4; // overlay other modals
+}

mailpoet/assets/css/src/components/_tags.scss

@@ -41,6 +41,15 @@
   }
 }
 
+.mailpoet-tag-critical {
+  border-color: $color-stats-critical;
+  color: $color-stats-critical;
+
+  &.mailpoet-tag-inverted {
+    background: $color-stats-critical;
+  }
+}
+
 .mailpoet-tag-good {
   border-color: $color-stats-good;
   color: $color-stats-good;

mailpoet/assets/css/src/components/_top_bar.scss

@@ -29,7 +29,6 @@ $beamer-dot-size: 8px;
   }
 
   .mailpoet-top-bar-logo {
-    cursor: pointer;
     position: relative;
     top: 2px;
     z-index: 1;
@@ -39,6 +38,10 @@ $beamer-dot-size: 8px;
       max-width: 100%;
     }
   }
+
+  a.mailpoet-top-bar-logo {
+    cursor: pointer;
+  }
 }
 
 .mailpoet-top-bar-logo-desktop {

mailpoet/assets/css/src/mailpoet-automation-editor.scss

@@ -11,17 +11,17 @@
 
 @import './components-automation-editor/add-step-button';
 @import './components-automation-editor/add-trigger';
+@import './components-automation-editor/automation';
 @import './components-automation-editor/block-icon';
 @import './components-automation-editor/chip';
 @import './components-automation-editor/dropdown';
-@import './components-automation-editor/empty-workflow';
+@import './components-automation-editor/empty-automation';
 @import './components-automation-editor/errors';
 @import './components-automation-editor/panel';
 @import './components-automation-editor/separator';
 @import './components-automation-editor/status';
 @import './components-automation-editor/step';
 @import './components-automation-editor/step-card';
-@import './components-automation-editor/workflow';
 @import './components-automation-editor/notices';
 @import './components-automation-editor/deactivate-modal';
 

mailpoet/assets/css/src/mailpoet-automation-templates.scss

@@ -13,18 +13,34 @@ ul.mailpoet-automation-templates {
   margin: auto;
   max-width: 982px;
   padding: 48px 0;
+}
 
+.mailpoet-automation-template-list-item {
   button.components-button {
+    align-content: baseline;
+    align-items: flex-start;
     background: #fff;
     border: 1px solid #dcdcde;
     border-radius: 4px;
     cursor: pointer;
-    display: block;
+    display: grid;
+    grid-template-rows: 40px auto auto;
     height: 100%;
     padding: 24px 24px 26px;
     text-align: left;
     width: 100%;
 
+    &:disabled,
+    &[aria-disabled='true'] {
+      color: #787c82;
+      cursor: not-allowed;
+      opacity: 1;
+
+      h2 {
+        color: #787c82;
+      }
+    }
+
     &:hover {
       background: #fff;
       border: 1px solid #dcdcde;
@@ -37,12 +53,15 @@ ul.mailpoet-automation-templates {
       box-shadow: 0 3px 6px rgba(0, 0, 0, .15);
       color: inherit;
     }
+
+    >* {
+      width: 100%
+    }
   }
 
   h2 {
     background: transparent;
     border: none;
-    color: #2271b1;
     font-size: 14px;
     font-weight: 600;
     line-height: 21px;
@@ -54,7 +73,7 @@ ul.mailpoet-automation-templates {
     margin: 8px 0 0;
   }
 
-  .mailpoet-automation-from-scratch {
+  &.mailpoet-automation-from-scratch {
     button {
       align-content: center;
       border: 2px dashed #dcdcde;
@@ -71,4 +90,27 @@ ul.mailpoet-automation-templates {
       fill: #dcdcde;
     }
   }
+
+  .badge {
+    text-align: right;
+    transform: translateX(24px);
+
+    span {
+      padding: 3px 8px;
+    }
+  }
+}
+
+.mailpoet-automation-template-list-item-coming-soon {
+  .badge span {
+    background: #ffe9cc;
+    color: #1d2327;
+  }
+}
+
+.mailpoet-automation-template-list-item-premium {
+  .badge span {
+    background: #ff5301;
+    color: #fff;
+  }
 }

mailpoet/assets/css/src/mailpoet-automation.scss

@@ -4,11 +4,14 @@
 // automation components
 
 @import './components-automation/statistics';
+@import './components-automation/option-button';
 
 // automation listing
 
+@import './components-automation-listing/sections';
 @import './components-automation-listing/listing';
 @import './components-automation-listing/header';
 @import './components-automation-listing/search';
 @import './components-automation-listing/cells/actions';
 @import './components-automation-listing/cells/status';
+@import './mailpoet-automation-templates';

mailpoet/assets/css/src/mailpoet-homepage.scss

@@ -0,0 +1,16 @@
+
+@import '../../../node_modules/@woocommerce/components/build-style/style'; // Needed to load WP admin themes color variables
+
+// Settings
+// Global variables, config switches. Not producing any CSS.
+
+@import 'settings/breakpoints';
+@import 'settings/colors';
+@import 'settings/grid';
+@import 'settings/typography';
+
+// Components
+// Actual UI components.
+
+@import 'components-homepage/_layout';
+@import 'components-homepage/_task-list';

mailpoet/assets/css/src/mailpoet-plugin.scss

@@ -85,3 +85,4 @@
 @import 'components-plugin/set-from-address-modal';
 @import 'components-plugin/stats';
 @import 'components-plugin/import-export';
+@import 'components-plugin/landingpage';

mailpoet/assets/css/src/mailpoet-public.scss

@@ -19,3 +19,4 @@
 @import 'components-public/public';
 @import 'components-public/animation';
 @import 'components-public/form_colors';
+@import 'components-public/captcha';

mailpoet/assets/css/src/settings/_colors.scss

@@ -69,6 +69,7 @@ $color-badge-video-guide: #46b450;
 $color-stats-average: #f559c3;
 $color-stats-good: #ff9f00;
 $color-stats-excellent: #7ed321;
+$color-stats-critical: #f00;
 $color-stats-unknown: $color-primary-inactive;
 
 // Automation editor
@@ -78,3 +79,9 @@ $color-chip-success-bg: #b8e6bf;
 $color-chip-success-text: #005c12;
 $color-chip-danger-bg: #facfd2;
 $color-chip-danger-text: #8a2424;
+
+// Landing page
+$color-landingpage-background-light: #fbfbfb;
+
+// Homepage
+$color-homepage-borders: #f5f5f5;

mailpoet/assets/img/icons/alert.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 4.75C7.99594 4.75 4.75 7.99594 4.75 12C4.75 16.0041 7.99594 19.25 12 19.25C16.0041 19.25 19.25 16.0041 19.25 12C19.25 7.99594 16.0041 4.75 12 4.75ZM3.25 12C3.25 7.16751 7.16751 3.25 12 3.25C16.8325 3.25 20.75 7.16751 20.75 12C20.75 16.8325 16.8325 20.75 12 20.75C7.16751 20.75 3.25 16.8325 3.25 12Z" fill="#d63638"/>
+<path d="M13 7H11V13H13V7Z" fill="#d63638"/>
+<path d="M13 15H11V17H13V15Z" fill="#d63638"/>
+</svg>

mailpoet/assets/img/icons/controls-volumeon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><rect x="0" fill="none" width="20" height="20"/><g><path d="M2 7h4l5-4v14l-5-4H2V7zm12.69-2.46C14.82 4.59 18 5.92 18 10s-3.18 5.41-3.31 5.46c-.06.03-.13.04-.19.04-.2 0-.39-.12-.46-.31-.11-.26.02-.55.27-.65.11-.05 2.69-1.15 2.69-4.54 0-3.41-2.66-4.53-2.69-4.54-.25-.1-.38-.39-.27-.65.1-.25.39-.38.65-.27zM16 10c0 2.57-2.23 3.43-2.32 3.47-.06.02-.12.03-.18.03-.2 0-.39-.12-.47-.32-.1-.26.04-.55.29-.65.07-.02 1.68-.67 1.68-2.53s-1.61-2.51-1.68-2.53c-.25-.1-.38-.39-.29-.65.1-.25.39-.39.65-.29.09.04 2.32.9 2.32 3.47z"/></g></svg>

mailpoet/assets/img/icons/image-rotate.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><rect x="0" fill="none" width="20" height="20"/><g><path d="M10.25 1.02c5.1 0 8.75 4.04 8.75 9s-3.65 9-8.75 9c-3.2 0-6.02-1.59-7.68-3.99l2.59-1.52c1.1 1.5 2.86 2.51 4.84 2.51 3.3 0 6-2.79 6-6s-2.7-6-6-6c-1.97 0-3.72 1-4.82 2.49L7 8.02l-6 2v-7L2.89 4.6c1.69-2.17 4.36-3.58 7.36-3.58z"/></g></svg>

mailpoet/assets/js/src/automation/api/hooks.ts

@@ -1,81 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { api } from '../config';
-
-const API_URL = `${api.root}/mailpoet/v1/automation`;
-
-export const request = (
-  path: string,
-  init?: RequestInit,
-): ReturnType<typeof fetch> => fetch(`${API_URL}/${path}`, init);
-
-type Error<T> = {
-  response?: Response;
-  data?: T;
-};
-
-type State<T> = {
-  data?: T;
-  loading: boolean;
-  error?: Error<T>;
-};
-
-type Result<T> = [(init?: RequestInit) => Promise<void>, State<T>];
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type Data = Record<string, any>;
-
-export const useMutation = <T extends Data>(
-  path: string,
-  config?: RequestInit,
-): Result<T> => {
-  const [state, setState] = useState<State<T>>({
-    data: undefined,
-    loading: false,
-    error: undefined,
-  });
-
-  const mutation = useCallback(
-    async (init?: RequestInit) => {
-      setState((prevState) => ({ ...prevState, loading: true }));
-      const response = await request(path, {
-        ...config,
-        ...init,
-        headers: {
-          'content-type': 'application/json',
-          ...(init?.headers ?? {}),
-          'x-wp-nonce': api.nonce,
-        },
-      });
-
-      try {
-        const data = await response.json();
-        const error = response.ok ? null : { ...response, data };
-        setState((prevState) => ({ ...prevState, data, error }));
-      } catch (_) {
-        const error = { response };
-        setState((prevState) => ({ ...prevState, error }));
-      } finally {
-        setState((prevState) => ({ ...prevState, loading: false }));
-      }
-    },
-    [config, path],
-  );
-
-  return [mutation, state];
-};
-
-export const useQuery = <T extends Data>(
-  path: string,
-  init?: RequestInit,
-): State<T> => {
-  const [mutation, result] = useMutation<T>(path, init);
-
-  useEffect(
-    () => {
-      void mutation();
-    },
-    [] /* eslint-disable-line react-hooks/exhaustive-deps -- request only on initial load */,
-  );
-
-  return result;
-};

mailpoet/assets/js/src/automation/api/index.ts

@@ -1,9 +1,7 @@
 import apiFetch from '@wordpress/api-fetch';
 import { api } from '../config';
 
-export * from './hooks';
+const apiUrl = `${api.root}/mailpoet/v1/`;
-
-const apiUrl = `${api.root}/mailpoet/v1/automation/`;
 
 export type ApiError = {
   code?: string;

mailpoet/assets/js/src/automation/automation.tsx

@@ -1,94 +1,70 @@
+import { useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
 import { TopBarWithBeamer } from 'common/top_bar/top_bar';
-import { plusIcon } from 'common/button/icon/plus';
+import { Popover, SlotFillProvider } from '@wordpress/components';
-import { Button, Flex, Popover, SlotFillProvider } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
-import { initializeApi, useMutation } from './api';
+import { initializeApi } from './api';
+import { registerTranslations } from './i18n';
 import { createStore, storeName } from './listing/store';
-import { AutomationListing } from './listing';
+import { AutomationListing, AutomationListingHeader } from './listing';
 import { registerApiErrorHandler } from './listing/api-error-handler';
 import { Notices } from './listing/components/notices';
-import { WorkflowListingNotices } from './listing/workflow-listing-notices';
+import { BuildYourOwnSection, HeroSection, TemplatesSection } from './sections';
-import { Onboarding } from './onboarding';
-import {
-  CreateEmptyWorkflowButton,
-  CreateWorkflowFromTemplateButton,
-} from './testing';
 import { MailPoet } from '../mailpoet';
 
-function Content(): JSX.Element {
+const trackOpenEvent = () => {
-  const count = useSelect((select) => select(storeName).getWorkflowCount());
+  MailPoet.trackEvent('Automations > Listing viewed');
-  return count > 0 ? <AutomationListing /> : <Onboarding />;
+};
-}
 
-function Workflows(): JSX.Element {
+function Content(): JSX.Element {
+  const [isBooting, setIsBooting] = useState(true);
+  const count = useSelect((select) => select(storeName).getAutomationCount());
+
+  useEffect(() => {
+    if (!isBooting || count === 0) {
+      return;
+    }
+    trackOpenEvent();
+    setIsBooting(false);
+  }, [isBooting, count]);
+  const content =
+    count > 0 ? (
+      <>
+        <AutomationListingHeader />
+        <AutomationListing />
+      </>
+    ) : (
+      <HeroSection />
+    );
+
+  // Hide notices on onboarding screen
+  useEffect(() => {
+    const onboardingClass = 'mailpoet-automation-is-onboarding';
+    const element = document.querySelector('body');
+    if (count === 0 && !element.classList.contains(onboardingClass)) {
+      element.classList.add(onboardingClass);
+    }
+    if (count > 0 && element.classList.contains(onboardingClass)) {
+      element.classList.remove(onboardingClass);
+    }
+  }, [count]);
   return (
     <>
-      <TopBarWithBeamer />
+      {content}
-      <Flex className="mailpoet-automation-listing-heading">
+      <TemplatesSection />
-        <h1 className="wp-heading-inline">Automations</h1>
+      <BuildYourOwnSection />
-        <Button
-          href={MailPoet.urls.automationTemplates}
-          icon={plusIcon}
-          variant="primary"
-          className="mailpoet-add-new-button"
-        >
-          New automation
-        </Button>
-      </Flex>
-      <Notices />
-      <Content />
     </>
   );
 }
 
-function RecreateSchemaButton(): JSX.Element {
+function Automations(): JSX.Element {
-  const [createSchema, { loading, error }] = useMutation('system/database', {
-    method: 'POST',
-  });
-
   return (
-    <div>
+    <>
-      <WorkflowListingNotices />
+      <TopBarWithBeamer />
-      <button
+      <Notices />
-        className="button button-link-delete"
+      <Content />
-        type="button"
+    </>
-        onClick={() => createSchema()}
-        disabled={loading}
-      >
-        Recreate DB schema (data will be lost)
-      </button>
-      {error && (
-        <div>{error?.data?.message ?? 'An unknown error occurred'}</div>
-      )}
-    </div>
-  );
-}
-
-function DeleteSchemaButton(): JSX.Element {
-  const [deleteSchema, { loading, error }] = useMutation('system/database', {
-    method: 'DELETE',
-  });
-
-  return (
-    <div>
-      <button
-        className="button button-link-delete"
-        type="button"
-        onClick={async () => {
-          await deleteSchema();
-          window.location.href =
-            '/wp-admin/admin.php?page=mailpoet-experimental';
-        }}
-        disabled={loading}
-      >
-        Delete DB schema & deactivate feature
-      </button>
-      {error && (
-        <div>{error?.data?.message ?? 'An unknown error occurred'}</div>
-      )}
-    </div>
   );
 }
 
@@ -96,26 +72,8 @@ function App(): JSX.Element {
   return (
     <SlotFillProvider>
       <BrowserRouter>
-        <div>
+        <Automations />
-          <Workflows />
+        <Popover.Slot />
-          <div style={{ marginTop: 30, display: 'grid', gridGap: 8 }}>
-            <CreateEmptyWorkflowButton />
-            <CreateWorkflowFromTemplateButton slug="simple-welcome-email">
-              Create testing workflow from template (welcome email)
-            </CreateWorkflowFromTemplateButton>
-            <CreateWorkflowFromTemplateButton slug="welcome-email-sequence">
-              Create testing workflow from template (welcome sequence, only
-              premium)
-            </CreateWorkflowFromTemplateButton>
-            <CreateWorkflowFromTemplateButton slug="advanced-welcome-email-sequence">
-              Create testing workflow from template (advanced welcome sequence,
-              only premium)
-            </CreateWorkflowFromTemplateButton>
-            <RecreateSchemaButton />
-            <DeleteSchemaButton />
-          </div>
-          <Popover.Slot />
-        </div>
       </BrowserRouter>
     </SlotFillProvider>
   );
@@ -126,6 +84,7 @@ window.addEventListener('DOMContentLoaded', () => {
 
   const root = document.getElementById('mailpoet_automation');
   if (root) {
+    registerTranslations();
     registerApiErrorHandler();
     initializeApi();
     ReactDOM.render(<App />, root);

mailpoet/assets/js/src/automation/components/option-button/index.tsx

@@ -0,0 +1,64 @@
+import { Dispatch, SetStateAction, useState } from 'react';
+import { Button, DropdownMenu } from '@wordpress/components';
+import { chevronDown } from '@wordpress/icons';
+import { __ } from '@wordpress/i18n';
+import { Fragment } from '@wordpress/element';
+import { StepMoreControlsType } from '../../types/filters';
+
+type OptionButtonPropType = {
+  variant: Button.ButtonVariant;
+  controls: StepMoreControlsType;
+  title: string;
+  onClick: (setIsBusy: Dispatch<SetStateAction<boolean>>) => void;
+};
+export function OptionButton({
+  controls,
+  title,
+  onClick,
+  variant,
+}: OptionButtonPropType): JSX.Element {
+  const [isBusy, setIsBusy] = useState(false);
+  const slots = Object.values(controls).filter((item) => item.slot);
+  const dropDownMenuClassNames = isBusy
+    ? `mailpoet-option-button-opener is-busy`
+    : `mailpoet-option-button-opener`;
+  return (
+    <div className="mailpoet-option-button">
+      <Button
+        isBusy={isBusy}
+        disabled={isBusy}
+        variant={variant}
+        className="mailpoet-option-button-main"
+        onClick={() => {
+          setIsBusy(true);
+          onClick(setIsBusy);
+        }}
+      >
+        {title}
+      </Button>
+      {slots.length > 0 &&
+        slots.map(({ key, slot }) => (
+          <Fragment key={`slot-${key}`}>{slot}</Fragment>
+        ))}
+      {Object.values(controls).length > 0 && (
+        <DropdownMenu
+          className={dropDownMenuClassNames}
+          label={__('More', 'mailpoet')}
+          icon={chevronDown}
+          controls={Object.values(controls).map((item) => {
+            const control = {
+              ...item.control,
+              onClick: () => {
+                setIsBusy(true);
+                item.control.onClick(setIsBusy);
+              },
+            };
+
+            return control;
+          })}
+          popoverProps={{ position: 'bottom left' }}
+        />
+      )}
+    </div>
+  );
+}

mailpoet/assets/js/src/automation/config.ts

@@ -4,9 +4,9 @@ declare global {
       root: string;
       nonce: string;
     };
-    mailpoet_workflow_count: number;
+    mailpoet_automation_count: number;
   }
 }
 
 export const api = window.mailpoet_automation_api;
-export const workflowCount = window.mailpoet_workflow_count;
+export const automationCount = window.mailpoet_automation_count;

mailpoet/assets/js/src/automation/editor/api-error-handler.tsx

@@ -19,7 +19,7 @@ export const registerApiErrorHandler = (): void =>
         const status = errorObject.data?.status;
         const code = errorObject.code;
 
-        if (code === 'mailpoet_automation_workflow_not_valid') {
+        if (code === 'mailpoet_automation_not_valid') {
           dispatch(storeName).setErrors({ steps: errorObject.data.errors });
           return undefined;
         }
@@ -30,6 +30,7 @@ export const registerApiErrorHandler = (): void =>
             message ?? __('An unknown error occurred.', 'mailpoet'),
             { explicitDismiss: true },
           );
+          dispatch(storeName).setErrors({ steps: [] });
           return undefined;
         }
 

mailpoet/assets/js/src/automation/editor/components/actions/trash-button.tsx

@@ -4,13 +4,14 @@ import {
   Button,
 } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
+import { __, sprintf } from '@wordpress/i18n';
 import { storeName } from '../../store';
 
 export function TrashButton(): JSX.Element {
   const [showConfirmDialog, setShowConfirmDialog] = useState(false);
-  const { workflow } = useSelect(
+  const { automation } = useSelect(
     (select) => ({
-      workflow: select(storeName).getWorkflowData(),
+      automation: select(storeName).getAutomationData(),
     }),
     [],
   );
@@ -20,8 +21,8 @@ export function TrashButton(): JSX.Element {
     <>
       <ConfirmDialog
         isOpen={showConfirmDialog}
-        title="Delete workflow"
+        title={__('Delete automation', 'mailpoet')}
-        confirmButtonText="Yes, delete"
+        confirmButtonText={__('Yes, delete', 'mailpoet')}
         onConfirm={async () => {
           trash(() => {
             setShowConfirmDialog(false);
@@ -30,7 +31,12 @@ export function TrashButton(): JSX.Element {
         onCancel={() => setShowConfirmDialog(false)}
         __experimentalHideHeader={false}
       >
-        You are about to delete the “{workflow.name}” workflow.
+        {sprintf(
+          __('You are about to delete the automation "%s".', 'mailpoet'),
+          automation.name,
+        )}
+        <br />
+        {__(' This will stop it for all subscribers immediately.', 'mailpoet')}
       </ConfirmDialog>
 
       <Button
@@ -38,7 +44,7 @@ export function TrashButton(): JSX.Element {
         isDestructive
         onClick={() => setShowConfirmDialog(true)}
       >
-        Move to Trash
+        {__('Move to Trash', 'mailpoet')}
       </Button>
     </>
   );

mailpoet/assets/js/src/automation/editor/components/automation/add-step-button.tsx

@@ -1,7 +1,7 @@
 import { useContext } from 'react';
 import { __unstableCompositeItem as CompositeItem } from '@wordpress/components';
 import { Icon, plus } from '@wordpress/icons';
-import { WorkflowCompositeContext } from './context';
+import { AutomationCompositeContext } from './context';
 
 type Props = {
   onClick?: (element: HTMLButtonElement) => void;
@@ -9,7 +9,7 @@ type Props = {
 };
 
 export function AddStepButton({ onClick, previousStepId }: Props): JSX.Element {
-  const compositeState = useContext(WorkflowCompositeContext);
+  const compositeState = useContext(AutomationCompositeContext);
   return (
     <CompositeItem
       state={compositeState}

mailpoet/assets/js/src/automation/editor/components/automation/add-trigger.tsx

@@ -3,7 +3,7 @@ import { __unstableCompositeItem as CompositeItem } from '@wordpress/components'
 import { Icon, plus } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 import { useDispatch } from '@wordpress/data';
-import { WorkflowCompositeContext } from './context';
+import { AutomationCompositeContext } from './context';
 import { Step } from './types';
 import { storeName } from '../../store';
 
@@ -12,14 +12,14 @@ type Props = {
 };
 
 export function AddTrigger({ step }: Props): JSX.Element {
-  const compositeState = useContext(WorkflowCompositeContext);
+  const compositeState = useContext(AutomationCompositeContext);
   const { setInserterPopover } = useDispatch(storeName);
 
   return (
     <CompositeItem
       state={compositeState}
       role="treeitem"
-      className="mailpoet-automation-workflow-add-trigger"
+      className="mailpoet-automation-add-trigger"
       data-previous-step-id={step.id}
       focusable
       onClick={(event) => {

mailpoet/assets/js/src/automation/editor/components/automation/context.tsx

@@ -1,5 +1,5 @@
 import { __unstableUseCompositeState as useCompositeState } from '@wordpress/components';
 import { createContext } from '@wordpress/element';
 
-export const WorkflowCompositeContext =
+export const AutomationCompositeContext =
   createContext<ReturnType<typeof useCompositeState>>(undefined);

mailpoet/assets/js/src/automation/editor/components/automation/empty-automation.tsx

@@ -0,0 +1,9 @@
+import { __ } from '@wordpress/i18n';
+
+export function EmptyAutomation(): JSX.Element {
+  return (
+    <div className="mailpoet-automation-editor-empty-automation">
+      {__('No automation data.', 'mailpoet')}
+    </div>
+  );
+}

mailpoet/assets/js/src/automation/editor/components/automation/index.tsx

@@ -7,8 +7,8 @@ import { useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { Icon, check } from '@wordpress/icons';
 import { Hooks } from 'wp-js-hooks';
-import { WorkflowCompositeContext } from './context';
+import { AutomationCompositeContext } from './context';
-import { EmptyWorkflow } from './empty-workflow';
+import { EmptyAutomation } from './empty-automation';
 import { Separator } from './separator';
 import { Step } from './step';
 import { Step as StepData } from './types';
@@ -16,11 +16,15 @@ import { InserterPopover } from '../inserter-popover';
 import { storeName } from '../../store';
 import { AddTrigger } from './add-trigger';
 import { Statistics } from './statistics';
+import {
+  RenderStepSeparatorType,
+  RenderStepType,
+} from '../../../types/filters';
 
-export function Workflow(): JSX.Element {
+export function Automation(): JSX.Element {
-  const { workflowData, selectedStep } = useSelect(
+  const { automationData, selectedStep } = useSelect(
     (select) => ({
-      workflowData: select(storeName).getWorkflowData(),
+      automationData: select(storeName).getAutomationData(),
       selectedStep: select(storeName).getSelectedStep(),
     }),
     [],
@@ -32,9 +36,9 @@ export function Workflow(): JSX.Element {
     shift: true,
   });
 
-  const stepMap = workflowData?.steps ?? undefined;
+  const stepMap = automationData?.steps ?? undefined;
 
-  // serialize steps (for now, we support only one trigger and linear workflows)
+  // serialize steps (for now, we support only one trigger and linear automations)
   const steps = useMemo(() => {
     const stepArray = [stepMap.root];
 
@@ -50,9 +54,9 @@ export function Workflow(): JSX.Element {
   }, [stepMap]);
 
   const renderStep = useMemo(
-    () =>
+    (): RenderStepType =>
       Hooks.applyFilters(
-        'mailpoet.automation.workflow.render_step',
+        'mailpoet.automation.render_step',
         (stepData: StepData) =>
           stepData.type === 'root' ? (
             <AddTrigger step={stepData} />
@@ -67,9 +71,9 @@ export function Workflow(): JSX.Element {
   );
 
   const renderSeparator = useMemo(
-    () =>
+    (): RenderStepSeparatorType =>
       Hooks.applyFilters(
-        'mailpoet.automation.workflow.render_step_separator',
+        'mailpoet.automation.render_step_separator',
         (previousStepData: StepData) => (
           <Separator previousStepId={previousStepData.id} />
         ),
@@ -77,20 +81,20 @@ export function Workflow(): JSX.Element {
     [],
   );
 
-  if (!workflowData) {
+  if (!automationData) {
-    return <EmptyWorkflow />;
+    return <EmptyAutomation />;
   }
 
   return (
-    <WorkflowCompositeContext.Provider value={compositeState}>
+    <AutomationCompositeContext.Provider value={compositeState}>
       <Composite
         state={compositeState}
         role="tree"
-        aria-label={__('Workflow', 'mailpoet')}
+        aria-label={__('Automation', 'mailpoet')}
         aria-orientation="vertical"
-        className="mailpoet-automation-editor-workflow"
+        className="mailpoet-automation-editor-automation"
       >
-        <div className="mailpoet-automation-editor-workflow-wrapper">
+        <div className="mailpoet-automation-editor-automation-wrapper">
           <Statistics />
           {stepMap.root.next_steps.length === 0 ? (
             <>
@@ -115,13 +119,13 @@ export function Workflow(): JSX.Element {
             </Fragment>
           ))}
           <Icon
-            className="mailpoet-automation-editor-workflow-end"
+            className="mailpoet-automation-editor-automation-end"
             icon={check}
           />
           <div />
         </div>
         <InserterPopover />
       </Composite>
-    </WorkflowCompositeContext.Provider>
+    </AutomationCompositeContext.Provider>
   );
 }

mailpoet/assets/js/src/automation/editor/components/automation/statistics.tsx

@@ -0,0 +1,40 @@
+import { useSelect } from '@wordpress/data';
+import { _x } from '@wordpress/i18n';
+import { storeName } from '../../store';
+import { Statistics as BaseStatistics } from '../../../components/statistics';
+
+export function Statistics(): JSX.Element {
+  const { automation } = useSelect(
+    (select) => ({
+      automation: select(storeName).getAutomationData(),
+    }),
+    [],
+  );
+
+  return (
+    <div className="mailpoet-automation-editor-stats">
+      <BaseStatistics
+        items={[
+          {
+            key: 'entered',
+            // translators: Total number of subscribers who entered an automation
+            label: _x('Total Entered', 'automation stats', 'mailpoet'),
+            value: automation.stats.totals.entered,
+          },
+          {
+            key: 'processing',
+            // translators: Total number of subscribers who are being processed in an automation
+            label: _x('Total Processing', 'automation stats', 'mailpoet'),
+            value: automation.stats.totals.in_progress,
+          },
+          {
+            key: 'exited',
+            // translators: Total number of subscribers who exited an automation, no matter the result
+            label: _x('Total Exited', 'automation stats', 'mailpoet'),
+            value: automation.stats.totals.exited,
+          },
+        ]}
+      />
+    </div>
+  );
+}

mailpoet/assets/js/src/automation/editor/components/automation/step-more-menu.tsx

@@ -0,0 +1,68 @@
+import { useState, Fragment } from 'react';
+import { DropdownMenu } from '@wordpress/components';
+import { moreVertical, trash } from '@wordpress/icons';
+import { __ } from '@wordpress/i18n';
+import { Hooks } from 'wp-js-hooks';
+import { PremiumModal } from 'common/premium_modal';
+import { Step as StepData } from './types';
+import { StepMoreControlsType } from '../../../types/filters';
+
+type Props = {
+  step: StepData;
+};
+
+export function StepMoreMenu({ step }: Props): JSX.Element {
+  const [showModal, setShowModal] = useState(false);
+
+  const moreControls: StepMoreControlsType = Hooks.applyFilters(
+    'mailpoet.automation.step.more-controls',
+    {
+      delete: {
+        key: 'delete',
+        control: {
+          title: __('Delete step', 'mailpoet'),
+          icon: trash,
+          onClick: () => setShowModal(true),
+        },
+        slot: () => {
+          if (!showModal) {
+            return false;
+          }
+          return (
+            <PremiumModal
+              onRequestClose={() => {
+                setShowModal(false);
+              }}
+              tracking={{
+                utm_medium: 'upsell_modal',
+                utm_campaign: 'remove_automation_step',
+              }}
+            >
+              {__('You cannot remove a step from the automation.', 'mailpoet')}
+            </PremiumModal>
+          );
+        },
+      },
+    },
+    step,
+  );
+
+  const slots = Object.values(moreControls).filter(
+    (item) => item.slot !== undefined,
+  );
+  const controls = Object.values(moreControls).map((item) => item.control);
+  return (
+    <div className="mailpoet-automation-step-more-menu">
+      {slots.map(({ key, slot }) => (
+        <Fragment key={key}>{slot()}</Fragment>
+      ))}
+      <DropdownMenu
+        label={__('More', 'mailpoet')}
+        icon={moreVertical}
+        popoverProps={{ position: 'bottom right' }}
+        toggleProps={{ isSmall: true }}
+        controls={Object.values(controls)}
+      />
+    </div>
+  );
+}

mailpoet/assets/js/src/automation/editor/components/automation/step.tsx

@@ -3,8 +3,8 @@ import { useContext } from 'react';
 import { __unstableCompositeItem as CompositeItem } from '@wordpress/components';
 import { useDispatch, useRegistry, useSelect } from '@wordpress/data';
 import { blockMeta } from '@wordpress/icons';
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
-import { WorkflowCompositeContext } from './context';
+import { AutomationCompositeContext } from './context';
 import { StepMoreMenu } from './step-more-menu';
 import { Step as StepData } from './types';
 import { Chip } from '../chip';
@@ -48,7 +48,7 @@ export function Step({ step, isSelected }: Props): JSX.Element {
     [step],
   );
   const { openSidebar, selectStep } = useDispatch(storeName);
-  const compositeState = useContext(WorkflowCompositeContext);
+  const compositeState = useContext(AutomationCompositeContext);
   const { batch } = useRegistry();
 
   const compositeItemId = `step-${step.id}`;
@@ -90,7 +90,7 @@ export function Step({ step, isSelected }: Props): JSX.Element {
           >
             {step.type !== 'trigger'
               ? stepTypeData.title
-              : __('Trigger', 'mailpoet')}
+              : _x('Trigger', 'noun', 'mailpoet')}
           </label>
           <div className="mailpoet-automation-editor-step-subtitle">
             {step.type !== 'trigger'

mailpoet/assets/js/src/automation/editor/components/automation/types.ts

@@ -1,3 +1,5 @@
+import { AutomationStatus } from '../../../listing/automation';
+
 export type NextStep = {
   id: string;
 };
@@ -10,10 +12,10 @@ export type Step = {
   next_steps: NextStep[];
 };
 
-export type Workflow = {
+export type Automation = {
   id: number;
   name: string;
-  status: 'active' | 'inactive' | 'draft' | 'trash';
+  status: AutomationStatus;
   created_at: string;
   updated_at: string;
   activated_at: string;

mailpoet/assets/js/src/automation/editor/components/header/document_actions.tsx

@@ -1,16 +1,16 @@
 import { ComponentProps, ComponentType, Ref } from 'react';
 import {
-  Dropdown as WpDropdown,
-  Button,
-  VisuallyHidden,
   __experimentalText as Text,
+  Button,
+  Dropdown as WpDropdown,
+  VisuallyHidden,
 } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 import { useRef } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { chevronDown } from '@wordpress/icons';
 import { storeName } from '../../store';
-import { WorkflowStatus } from '../../../listing/workflow';
+import { AutomationStatus } from '../../../listing/automation';
 
 // See: https://github.com/WordPress/gutenberg/blob/eff0cab2b3181c004dbd15398e570ecec28a3726/packages/edit-site/src/components/header/document-actions/index.js
 
@@ -21,11 +21,11 @@ const Dropdown: ComponentType<
   }
 > = WpDropdown;
 
-export function DocumentActions({ children }): JSX.Element {
+function DocumentActions({ children }): JSX.Element {
-  const { workflowName, workflowStatus, showIconLabels } = useSelect(
+  const { automationName, automationStatus, showIconLabels } = useSelect(
     (select) => ({
-      workflowName: select(storeName).getWorkflowData().name,
+      automationName: select(storeName).getAutomationData().name,
-      workflowStatus: select(storeName).getWorkflowData().status,
+      automationStatus: select(storeName).getAutomationData().status,
       showIconLabels: select(storeName).isFeatureActive('showIconLabels'),
     }),
     [],
@@ -36,9 +36,9 @@ export function DocumentActions({ children }): JSX.Element {
   const titleRef = useRef();
 
   let chipClass = 'mailpoet-automation-editor-chip-gray';
-  if (workflowStatus === WorkflowStatus.ACTIVE) {
+  if (automationStatus === AutomationStatus.ACTIVE) {
     chipClass = 'mailpoet-automation-editor-chip-success';
-  } else if (workflowStatus === WorkflowStatus.INACTIVE) {
+  } else if (automationStatus === AutomationStatus.DEACTIVATING) {
     chipClass = 'mailpoet-automation-editor-chip-danger';
   }
 
@@ -64,19 +64,21 @@ export function DocumentActions({ children }): JSX.Element {
                     as="h1"
                   >
                     <VisuallyHidden as="span">
-                      {__('Editing workflow: ')}
+                      {__('Editing automation:', 'mailpoet')}
                     </VisuallyHidden>
-                    {workflowName}
+                    {automationName}
                   </Text>
 
                   <Text
                     size="body"
                     className={`edit-site-document-actions__secondary-item ${chipClass}`}
                   >
-                    {workflowStatus === WorkflowStatus.ACTIVE && __('Active')}
+                    {automationStatus === AutomationStatus.ACTIVE &&
-                    {workflowStatus === WorkflowStatus.INACTIVE &&
+                      __('Active', 'mailpoet')}
-                      __('Inactive')}
+                    {automationStatus === AutomationStatus.DEACTIVATING &&
-                    {workflowStatus === WorkflowStatus.DRAFT && __('Draft')}
+                      __('Deactivating', 'mailpoet')}
+                    {automationStatus === AutomationStatus.DRAFT &&
+                      __('Draft', 'mailpoet')}
                   </Text>
                 </a>
                 <Button
@@ -85,9 +87,9 @@ export function DocumentActions({ children }): JSX.Element {
                   aria-expanded={isOpen}
                   aria-haspopup="true"
                   onClick={onToggle}
-                  label={__('Change workflow name')}
+                  label={__('Change automation name', 'mailpoet')}
                 >
-                  {showIconLabels && __('Rename')}
+                  {showIconLabels && __('Rename', 'mailpoet')}
                 </Button>
               </>
             )}
@@ -99,3 +101,6 @@ export function DocumentActions({ children }): JSX.Element {
     </div>
   );
 }
+
+DocumentActions.displayName = 'DocumentActions';
+export { DocumentActions };

mailpoet/assets/js/src/automation/editor/components/header/errors.tsx

@@ -9,10 +9,11 @@ import {
 import { useDispatch, useSelect } from '@wordpress/data';
 import { createContext } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
+import { ErrorBoundary } from 'common';
 import { Chip } from '../chip';
 import { ColoredIcon } from '../icons';
 import {
-  StepError as StepErrorType,
+  StepErrors as StepErrorType,
   stepSidebarKey,
   storeName,
 } from '../../store';
@@ -35,17 +36,17 @@ type StepErrorProps = {
 function StepError({ stepId }: StepErrorProps): JSX.Element {
   const compositeState = useContext(ErrorsCompositeContext);
 
-  const { steps, workflowData } = useSelect(
+  const { steps, automationData } = useSelect(
     (select) => ({
       steps: select(storeName).getSteps(),
-      workflowData: select(storeName).getWorkflowData(),
+      automationData: select(storeName).getAutomationData(),
     }),
     [],
   );
 
   const { openSidebar, selectStep } = useDispatch(storeName);
 
-  const stepData = workflowData.steps[stepId];
+  const stepData = automationData.steps[stepId];
   const step = steps.find(({ key }) => key === stepData.key);
 
   return (
@@ -70,6 +71,8 @@ function StepError({ stepId }: StepErrorProps): JSX.Element {
   );
 }
 
+StepError.displayName = 'StepError';
+
 export function Errors(): JSX.Element | null {
   const [showPopover, setShowPopover] = useState(false);
 
@@ -78,10 +81,10 @@ export function Errors(): JSX.Element | null {
     shift: true,
   });
 
-  const { errors, workflowData } = useSelect(
+  const { errors, automationData } = useSelect(
     (select) => ({
       errors: select(storeName).getErrors(),
-      workflowData: select(storeName).getWorkflowData(),
+      automationData: select(storeName).getAutomationData(),
     }),
     [],
   );
@@ -93,18 +96,18 @@ export function Errors(): JSX.Element | null {
     }
 
     const visited = new Map<string, StepErrorType | undefined>();
-    const ids = workflowData.steps.root.next_steps.map(({ id }) => id);
+    const ids = automationData.steps.root.next_steps.map(({ id }) => id);
     while (ids.length > 0) {
       const id = ids.shift();
       if (!visited.has(id)) {
         visited.set(id, errors.steps[id]);
-        workflowData.steps[id]?.next_steps?.forEach((step) =>
+        automationData.steps[id]?.next_steps?.forEach((step) =>
           ids.push(step.id),
         );
       }
     }
     return [...visited.values()].filter((error) => !!error);
-  }, [errors, workflowData]);
+  }, [errors, automationData]);
 
   // automatically open the popover when errors appear
   const hasErrors = stepErrors.length > 0;
@@ -151,15 +154,20 @@ export function Errors(): JSX.Element | null {
             <Composite
               state={compositeState}
               role="list"
-              aria-label={__('Workflow errors', 'mailpoet')}
+              aria-label={__('Automation errors', 'mailpoet')}
               className="mailpoet-automation-errors"
             >
               <div className="mailpoet-automation-errors-header">
-                {__('The following steps are not fully set:', 'mailpoet')}
+                {
+                  // translators: Label for a list of automation steps that are incomplete or have errors
+                  __('The following steps are not fully set:', 'mailpoet')
+                }
               </div>
-              {stepErrors.map((error) => (
+              <ErrorBoundary>
-                <StepError key={error.step_id} stepId={error.step_id} />
+                {stepErrors.map((error) => (
-              ))}
+                  <StepError key={error.step_id} stepId={error.step_id} />
+                ))}
+              </ErrorBoundary>
             </Composite>
           </ErrorsCompositeContext.Provider>
         </Popover>

mailpoet/assets/js/src/automation/editor/components/header/index.tsx

@@ -1,51 +1,113 @@
 import { useState } from 'react';
-import { Button, NavigableMenu, TextControl } from '@wordpress/components';
+import {
+  Button,
+  NavigableMenu,
+  TextControl,
+  Tooltip,
+} from '@wordpress/components';
 import { dispatch, useDispatch, useSelect } from '@wordpress/data';
 import { PinnedItems } from '@wordpress/interface';
 import { __ } from '@wordpress/i18n';
+import { ErrorBoundary } from 'common';
 import { DocumentActions } from './document_actions';
 import { Errors } from './errors';
 import { InserterToggle } from './inserter_toggle';
 import { MoreMenu } from './more_menu';
 import { storeName } from '../../store';
-import { WorkflowStatus } from '../../../listing/workflow';
+import { AutomationStatus } from '../../../listing/automation';
-import { DeactivateModal } from '../modals/deactivate-modal';
+import {
+  DeactivateImmediatelyModal,
+  DeactivateModal,
+} from '../modals/deactivate-modal';
 
 // See:
 //   https://github.com/WordPress/gutenberg/blob/9601a33e30ba41bac98579c8d822af63dd961488/packages/edit-post/src/components/header/index.js
 //   https://github.com/WordPress/gutenberg/blob/0ee78b1bbe9c6f3e6df99f3b967132fa12bef77d/packages/edit-site/src/components/header/index.js
 
-function ActivateButton({ onClick }): JSX.Element {
+function ActivateButton({ label }): JSX.Element {
-  const { errors } = useSelect(
+  const { errors, isDeactivating } = useSelect(
     (select) => ({
       errors: select(storeName).getErrors(),
+      isDeactivating:
+        select(storeName).getAutomationData().status ===
+        AutomationStatus.DEACTIVATING,
     }),
     [],
   );
+  const { openActivationPanel } = useDispatch(storeName);
 
-  return (
+  const button = (
     <Button
       variant="primary"
       className="editor-post-publish-button"
-      onClick={onClick}
+      onClick={openActivationPanel}
-      disabled={!!errors}
+      disabled={isDeactivating || !!errors}
     >
-      {__('Activate', 'mailpoet')}
+      {label}
     </Button>
   );
+
+  if (isDeactivating) {
+    return (
+      <Tooltip
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        // The following error seems to be a mismatch. It claims the 'delay' prop does not exist, but it does.
+        delay={0}
+        text={__(
+          'Editing an active automation is temporarily unavailable. We are working on introducing this functionality.',
+          'mailpoet',
+        )}
+      >
+        {button}
+      </Tooltip>
+    );
+  }
+
+  return button;
 }
 
 function UpdateButton(): JSX.Element {
   const { save } = useDispatch(storeName);
 
+  const { automation } = useSelect(
+    (select) => ({
+      automation: select(storeName).getAutomationData(),
+    }),
+    [],
+  );
+
+  if (automation.stats.totals.in_progress === 0) {
+    return (
+      <Button
+        variant="primary"
+        className="editor-post-publish-button"
+        onClick={save}
+      >
+        {__('Update', 'mailpoet')}
+      </Button>
+    );
+  }
   return (
-    <Button
+    <Tooltip
-      variant="primary"
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      className="editor-post-publish-button"
+      // @ts-ignore
-      onClick={save}
+      // The following error seems to be a mismatch. It claims the 'delay' prop does not exist, but it does.
+      delay={0}
+      text={__(
+        'Editing an active automation is temporarily unavailable. We are working on introducing this functionality.',
+        'mailpoet',
+      )}
     >
-      {__('Update', 'mailpoet')}
+      <Button
-    </Button>
+        variant="primary"
+        className="editor-post-publish-button"
+        onClick={save}
+        disabled
+      >
+        {__('Update', 'mailpoet')}
+      </Button>
+    </Tooltip>
   );
 }
 
@@ -65,7 +127,7 @@ function DeactivateButton(): JSX.Element {
   const { hasUsersInProgress } = useSelect(
     (select) => ({
       hasUsersInProgress:
-        select(storeName).getWorkflowData().stats.totals.in_progress > 0,
+        select(storeName).getAutomationData().stats.totals.in_progress > 0,
     }),
     [],
   );
@@ -99,20 +161,56 @@ function DeactivateButton(): JSX.Element {
   );
 }
 
+function DeactivateNowButton(): JSX.Element {
+  const [showDeactivateModal, setShowDeactivateModal] = useState(false);
+  const [isBusy, setIsBusy] = useState(false);
+  const { hasUsersInProgress } = useSelect(
+    (select) => ({
+      hasUsersInProgress:
+        select(storeName).getAutomationData().stats.totals.in_progress > 0,
+    }),
+    [],
+  );
+
+  const deactivateOrShowModal = () => {
+    if (hasUsersInProgress) {
+      setShowDeactivateModal(true);
+      return;
+    }
+    setIsBusy(true);
+    void dispatch(storeName).deactivate();
+  };
+
+  return (
+    <>
+      {showDeactivateModal && (
+        <DeactivateImmediatelyModal
+          onClose={() => {
+            setShowDeactivateModal(false);
+          }}
+        />
+      )}
+      <Button
+        isBusy={isBusy}
+        variant="tertiary"
+        onClick={deactivateOrShowModal}
+      >
+        {__('Deactivate now', 'mailpoet')}
+      </Button>
+    </>
+  );
+}
+
 type Props = {
   showInserterToggle: boolean;
-  toggleActivatePanel: () => void;
 };
 
-export function Header({
+export function Header({ showInserterToggle }: Props): JSX.Element {
-  showInserterToggle,
+  const { setAutomationName } = useDispatch(storeName);
-  toggleActivatePanel,
+  const { automationName, automationStatus } = useSelect(
-}: Props): JSX.Element {
-  const { setWorkflowName } = useDispatch(storeName);
-  const { workflowName, workflowStatus } = useSelect(
     (select) => ({
-      workflowName: select(storeName).getWorkflowData().name,
+      automationName: select(storeName).getAutomationData().name,
-      workflowStatus: select(storeName).getWorkflowData().status,
+      automationStatus: select(storeName).getAutomationData().status,
     }),
     [],
   );
@@ -130,40 +228,50 @@ export function Header({
       </div>
 
       <div className="edit-site-header_center">
-        <DocumentActions>
+        <ErrorBoundary>
-          {() => (
+          <DocumentActions>
-            <div className="mailpoet-automation-editor-dropdown-name-edit">
+            {() => (
-              <div className="mailpoet-automation-editor-dropdown-name-edit-title">
+              <div className="mailpoet-automation-editor-dropdown-name-edit">
-                {__('Automation name', 'mailpoet')}
+                <div className="mailpoet-automation-editor-dropdown-name-edit-title">
+                  {__('Automation name', 'mailpoet')}
+                </div>
+                <TextControl
+                  value={automationName}
+                  onChange={(newName) => setAutomationName(newName)}
+                  help={__(
+                    `Give the automation a name that indicates its purpose. E.g. "Abandoned cart recovery"`,
+                    'mailpoet',
+                  )}
+                />
               </div>
-              <TextControl
+            )}
-                value={workflowName}
+          </DocumentActions>
-                onChange={(newName) => setWorkflowName(newName)}
+        </ErrorBoundary>
-                help={__(
-                  `Give the automation a name that indicates its purpose. E.g. "Abandoned cart recovery"`,
-                  'mailpoet',
-                )}
-              />
-            </div>
-          )}
-        </DocumentActions>
       </div>
 
       <div className="edit-site-header_end">
         <div className="edit-site-header__actions">
-          <Errors />
+          <ErrorBoundary>
-          {workflowStatus !== WorkflowStatus.ACTIVE && (
+            <Errors />
+          </ErrorBoundary>
+          {automationStatus === AutomationStatus.DRAFT && (
             <>
               <SaveDraftButton />
-              <ActivateButton onClick={toggleActivatePanel} />
+              <ActivateButton label={__('Activate', 'mailpoet')} />
             </>
           )}
-          {workflowStatus === WorkflowStatus.ACTIVE && (
+          {automationStatus === AutomationStatus.ACTIVE && (
             <>
               <DeactivateButton />
               <UpdateButton />
             </>
           )}
+          {automationStatus === AutomationStatus.DEACTIVATING && (
+            <>
+              <DeactivateNowButton />
+              <ActivateButton label={__('Update & Activate', 'mailpoet')} />
+            </>
+          )}
           <PinnedItems.Slot scope={storeName} />
           <MoreMenu />
         </div>

mailpoet/assets/js/src/automation/editor/components/header/inserter_toggle.tsx

@@ -1,6 +1,6 @@
 import { Button, ToolbarItem } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { __, _x } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { plus } from '@wordpress/icons';
 import { storeName } from '../../store';
 
@@ -28,13 +28,11 @@ export function InserterToggle(): JSX.Element {
       onMouseDown={(event) => event.preventDefault()}
       onClick={toggleInserterSidebar}
       icon={plus}
-      label={_x(
+      label={__('Toggle step inserter', 'mailpoet')}
-        'Toggle step inserter',
-        'Generic label for step inserter button',
-      )}
       showTooltip={!showIconLabels}
     >
-      {showIconLabels && (!isInserterOpened ? __('Add') : __('Close'))}
+      {showIconLabels &&
+        (!isInserterOpened ? __('Add', 'mailpoet') : __('Close', 'mailpoet'))}
     </ToolbarItem>
   );
 }

mailpoet/assets/js/src/automation/editor/components/header/more_menu.tsx

@@ -20,14 +20,14 @@ export function MoreMenu(): JSX.Element {
     >
       {() => (
         <>
-          <MenuGroup label={_x('View', 'noun')}>
+          <MenuGroup label={_x('View', 'noun', 'mailpoet')}>
             <PreferenceToggleMenuItem
               scope={storeName}
               name="fullscreenMode"
-              label={__('Fullscreen mode')}
+              label={__('Fullscreen mode', 'mailpoet')}
-              info={__('Work without distraction')}
+              info={__('Work without distraction', 'mailpoet')}
-              messageActivated={__('Fullscreen mode activated')}
+              messageActivated={__('Fullscreen mode activated', 'mailpoet')}
-              messageDeactivated={__('Fullscreen mode deactivated')}
+              messageDeactivated={__('Fullscreen mode deactivated', 'mailpoet')}
               shortcut={displayShortcut.secondary('f')}
             />
           </MenuGroup>

mailpoet/assets/js/src/automation/editor/components/index.ts

@@ -0,0 +1,2 @@
+export * from './panel';
+export * from './form-token-field';

mailpoet/assets/js/src/automation/editor/components/inserter-listbox/listbox_group.tsx

@@ -13,7 +13,10 @@ export const InserterListboxGroup = forwardRef<HTMLDivElement, Props>(
 
     useEffect(() => {
       if (shouldSpeak) {
-        speak(__('Use left and right arrow keys to move through blocks'));
+        speak(
+          // translators: Moving through automation step list using keyboard
+          __('Use left and right arrow keys to move through steps', 'mailpoet'),
+        );
       }
     }, [shouldSpeak]);