Release 4.14.0

If subscriber is empty we want to return the same token as if it is null.

[MAILPOET-5248]

.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:
@@ -85,6 +78,11 @@ anchors:
       - static_analysis_php8
     <<: *only_trunk_and_release
 
+  command_add_github_key: &command_add_github_key
+    command: |
+      # Add GitHub to known_hosts (for jobs without a checkout step that need to clone repos)
+      echo "github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=" >> ~/.ssh/known_hosts
+
 executors:
   wpcli_php_oldest:
     <<: *default_job_config
@@ -99,7 +97,7 @@ executors:
   wpcli_php_latest:
     <<: *default_job_config
     docker:
-      - image: mailpoet/wordpress:8.1_20220718.1
+      - image: mailpoet/wordpress:8.1_20230307.1
 
   wpcli_php_mysql_oldest:
     <<: *default_job_config
@@ -110,7 +108,7 @@ executors:
   wpcli_php_mysql_latest:
     <<: *default_job_config
     docker:
-      - image: mailpoet/wordpress:8.1_20220718.1
+      - image: mailpoet/wordpress:8.1_20230307.1
       - image: cimg/mysql:8.0
         command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_520_ci
 
@@ -186,10 +184,11 @@ jobs:
       - run:
           name: Download additional WP Plugins for tests
           command: |
-            ./do download:woo-commerce-zip 6.8.2
-            ./do download:woo-commerce-subscriptions-zip 4.5.1
-            ./do download:woo-commerce-memberships-zip 1.23.0
-            ./do download:woo-commerce-blocks-zip 8.4.0
+            ./do download:woo-commerce-zip latest
+            ./do download:woo-commerce-subscriptions-zip 4.9.1
+            ./do download:woo-commerce-memberships-zip 1.24.0
+            ./do download:woo-commerce-blocks-zip 9.6.2
+            ./do download:automate-woo-zip 5.6.8
       - run:
           name: Dump tests ENV variables for acceptance tests
           command: |
@@ -207,11 +206,12 @@ jobs:
       - attach_workspace:
           at: /home/circleci
       - add_ssh_keys
+      - run:
+          name: 'Add GitHub to known_hosts'
+          <<: *command_add_github_key
       - run:
           name: 'Install Premium plugin'
           command: |
-            # Add GitHub to known_hosts because there is no checkout step in this job
-            echo "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts
             git clone ${MAILPOET_PREMIUM_REPO_URL} mailpoet-premium
       - restore_cache:
           key: premium-tools-{{ checksum "mailpoet-premium/tools/install.php" }}
@@ -256,6 +256,26 @@ jobs:
       - run:
           name: 'Static analysis'
           command: ./do qa:phpstan --php-version=<< parameters.php_version >>
+  security_analysis:
+    working_directory: /home/circleci/mailpoet/mailpoet
+    machine:
+      image: ubuntu-2204:2022.10.2
+      docker_layer_caching: false
+    steps:
+      - attach_workspace:
+          at: /home/circleci
+      - add_ssh_keys
+      - run:
+          name: 'Add GitHub to known_hosts'
+          <<: *command_add_github_key
+      - run:
+          name: 'Set up PHP'
+          command: |
+            sudo apt update
+            sudo apt install -y php8.1-cli
+      - run:
+          name: 'QA Security'
+          command: ./do qa:semgrep
   qa_js:
     executor: wpcli_php_latest
     working_directory: /home/circleci/mailpoet/mailpoet
@@ -318,7 +338,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 +350,7 @@ jobs:
       mysql_command:
         type: string
         default: ''
-      mysql_image_version:
+      mysql_image:
         type: string
         default: ''
       codeception_image_version:
@@ -350,18 +371,18 @@ jobs:
       woo_blocks_version:
         type: string
         default: ''
+      automate_woo_version:
+        type: string
+        default: ''
       enable_cot:
         type: integer
         default: 0
       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:
@@ -406,11 +427,21 @@ jobs:
                 command: |
                   cd tests/docker
                   docker-compose run --rm -w /project --entrypoint "./do download:woo-commerce-blocks-zip << parameters.woo_blocks_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
+      - when:
+          condition: << parameters.automate_woo_version >>
+          steps:
+            - run:
+                name: Download AutomateWoo
+                command: |
+                  cd tests/docker
+                  docker-compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
       - run:
           name: Group acceptance tests
           command: |
             # Convert test result filename values to be relative paths because the circleci CLI's split command requires exact matches
-            sed -i.bak 's#/wp-core/wp-content/plugins/mailpoet/##g' $CIRCLE_INTERNAL_TASK_DATA/circle-test-results/results.json
+            if [ -e $CIRCLE_INTERNAL_TASK_DATA/circle-test-results/results.json ]; then
+              sed -i.bak 's#/wp-core/wp-content/plugins/mailpoet/##g' $CIRCLE_INTERNAL_TASK_DATA/circle-test-results/results.json
+            fi
             # `circleci tests split` returns different values based on the container it's run on
             # in case group is defined find only tests containing the group
             if [[ -n '<< parameters.group >>' ]]; then
@@ -419,6 +450,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: |
@@ -432,9 +469,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} \
@@ -442,22 +476,78 @@ jobs:
             -e ENABLE_COT=<< parameters.enable_cot >> \
             -e ENABLE_COT_SYNC=<< parameters.enable_cot_sync >> \
             codeception_acceptance "${args[@]}"
-      - when:
-          condition:
-            not:
-              equal: [1, << parameters.allow_fail >>]
-          steps:
-            - run:
-                name: Check exceptions
-                command: |
-                  if [ "$(ls tests/_output/exceptions/*.html)" ]; then
-                    echo "There were some exceptions during the tests run"
-                    exit 1
-                  fi
+      - run:
+          name: Check exceptions
+          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:
           path: tests/_output
+  performance_tests:
+    working_directory: /home/circleci/mailpoet/mailpoet
+    machine:
+      image: ubuntu-2204:2022.10.2
+      docker_layer_caching: false
+    parameters:
+      mysql_command:
+        type: string
+        default: ''
+      mysql_image:
+        type: string
+        default: ''
+      wordpress_image_version:
+        type: string
+        default: ''
+      url:
+        type: string
+        default: 'http://localhost:9500'
+      pw:
+        type: string
+        default: 'password'
+      scenario:
+        type: string
+        default: 'pullrequests'
+    steps:
+      - attach_workspace:
+          at: /home/circleci
+      - run:
+          name: 'Set up PHP'
+          command: |
+            sudo apt update
+            sudo apt install -y php8.1-cli
+      - run:
+          name: 'Pull test docker images'
+          # Pull docker images with 3 retries
+          command: i='0';while ! docker-compose -f tests/performance/docker-compose.yml pull && ((i < 3)); do sleep 3 && i=$[$i+1]; done
+      - 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/performance
+            docker-compose create || docker-compose create
+      - run:
+          name: Run performance tests
+          command: |
+            mkdir -p tests/performance/_output
+            mkdir -p tests/performance/_screenshots
+            ./do test:performance --url=<< parameters.url >> --pw=<< parameters.pw >> --scenario=<< parameters.scenario >>
+      - run:
+          name: Check exceptions
+          command: |
+            if [ "$(ls tests/performance/_output/exceptions/*.html)" ]; then
+              echo "There were some exceptions during the tests run"
+              exit 1
+            fi
+      - store_artifacts:
+          path: tests/performance/_output
+      - store_artifacts:
+          path: tests/performance/_screenshots
+      - store_test_results:
+          path: tests/performance/_output
   unit_tests:
     working_directory: /home/circleci/mailpoet/mailpoet
     parameters:
@@ -492,9 +582,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
@@ -517,12 +610,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
@@ -530,14 +623,12 @@ 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: 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: 'PHP Integration tests'
           command: |
@@ -556,9 +647,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} \
@@ -633,6 +721,10 @@ workflows:
           php_version: 80000
           requires:
             - build
+      - security_analysis:
+          <<: *slack-fail-post-step
+          requires:
+            - build
       - qa_js:
           <<: *slack-fail-post-step
           requires:
@@ -651,7 +743,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
@@ -659,13 +751,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
@@ -673,24 +762,18 @@ 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:
+      - performance_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
+          name: performance_tests
           requires:
             - unit_tests
             - static_analysis_php8
@@ -703,20 +786,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
@@ -725,12 +796,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
@@ -739,9 +807,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
@@ -777,10 +843,15 @@ 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
+            - performance_tests
 
   nightly:
     triggers:
@@ -800,19 +871,29 @@ workflows:
           woo_subscriptions_version: latest
           woo_memberships_version: latest
           woo_blocks_version: latest
+          automate_woo_version: latest
           requires:
             - build
       - acceptance_tests:
           <<: *slack-fail-post-step
           name: acceptance_oldest
-          woo_core_version: 6.2.2
+          woo_core_version: 7.3.0
           woo_subscriptions_version: 4.3.0
           woo_memberships_version: 1.21.0
-          woo_blocks_version: 5.3.2
-          mysql_command: --max_allowed_packet=100M
-          mysql_image_version: 5.7.36
-          codeception_image_version: 7.4-cli_20210126.1
-          wordpress_image_version: wp-5.6_php7.2_20220406.1
+          woo_blocks_version: 6.8.0
+          automate_woo_version: 5.1.1
+          mysql_command: --max_allowed_packet=100M --default-storage-engine=MYISAM
+          mysql_image: mysql:5.5
+          codeception_image_version: 7.4-cli_20220605.0
+          wordpress_image_version: wp-6.0_php7.4_20230425.1
+          requires:
+            - build
+      - performance_tests:
+          <<: *slack-fail-post-step
+          name: performance_latest
+          url: https://qawp.net
+          pw: $WP_TEST_PERFORMANCE_PW
+          scenario: nightlytests
           requires:
             - build
       - unit_tests:
@@ -835,6 +916,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:

.github/workflows/stats.yml

@@ -0,0 +1,16 @@
+name: Pull Request Stats
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  stats:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run pull request stats
+        uses: flowwer-dev/pull-request-stats@master
+        with:
+          period: 90
+          charts: true
+          sort-by: 'TIME'

.gitignore

@@ -7,4 +7,5 @@ docker-compose.override.yml
 node_modules
 npm-debug.log
 mailpoet-premium
+tsconfig.tsbuildinfo
 wordpress

.npmrc

@@ -1,2 +1,3 @@
 save-workspace-protocol=rolling
 strict-peer-dependencies=false
+resolve-peers-from-workspace-root=true

.nvmrc

@@ -1 +1 @@
-v17.9.1
+v19.7.0

.prettierignore

@@ -22,6 +22,7 @@ vendor-prefixed
 /mailpoet/temp
 /mailpoet/tests/javascript_newsletter_editor/testBundles
 /mailpoet/tests/plugins
+/mailpoet/tools/wpscan-semgrep-rules
 /mailpoet/views
 /mailpoet-premium
 /wordpress

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. Start the stack with `./do start`.
+3. Run `docker-compose build wordpress`.
+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

babel.config.js

@@ -0,0 +1,8 @@
+export default {
+  presets: [
+    ['@babel/preset-react', { runtime: 'automatic' }],
+    '@babel/preset-env',
+    '@babel/preset-typescript',
+  ],
+  plugins: [['@babel/plugin-transform-runtime']],
+};

dev/php74/Dockerfile

@@ -10,7 +10,7 @@ RUN apt-get update \
 	&& pecl install xdebug-2.9.8 && \
 	\
     # Install NodeJS, enable Corepack
-    curl -sL https://deb.nodesource.com/setup_17.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_19.x | bash - && \
     apt-get install -y nodejs build-essential && \
     corepack enable && \
 	\

dev/php80/Dockerfile

@@ -8,7 +8,7 @@ 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 - && \
+    curl -sL https://deb.nodesource.com/setup_19.x | bash - && \
     apt-get install -y nodejs build-essential && \
     corepack enable && \
 	\

dev/php81/Dockerfile

@@ -8,7 +8,7 @@ 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 - && \
+    curl -sL https://deb.nodesource.com/setup_19.x | bash - && \
     apt-get install -y nodejs build-essential && \
     corepack enable && \
 	\

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_19.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)
@@ -36,8 +37,10 @@ Class `\MailPoet\API\API` becomes available once MailPoet plugin is loaded by Wo
 - [Is Setup Complete (isSetupComplete)](api_methods/IsSetupComplete.md)
 - [Subscribe to List (subscribeToList)](api_methods/SubscribeToList.md)
 - [Subscribe to Lists (subscribeToLists)](api_methods/SubscribeToLists.md)
+- [Unsubscribe globally](api_methods/UnsubscribeGlobally.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                                                                                                       |
-| -------------- | ------------ | ----------------------------------------------------------------------------------------------------------------- |
-| status         | string       | Specific status of subscribers. One of values: `unconfirmed`, `subscribed`, `unsubscribed`, `bounced`, `inactive` |
-| list_id        | int          | List id or dynamic segment id                                                                                     |
-| min_updated_at | DateTime\int | DateTime object or timestamp of the minimal last update of subscribers                                            |
+| Key          | Type         | Description                                                                                                       |
+| ------------ | ------------ | ----------------------------------------------------------------------------------------------------------------- |
+| status       | string       | Specific status of subscribers. One of values: `unconfirmed`, `subscribed`, `unsubscribed`, `bounced`, `inactive` |
+| listId       | int          | List id or dynamic segment id                                                                                     |
+| minUpdatedAt | DateTime\int | DateTime object or timestamp of the minimal last update of subscribers                                            |

doc/api_methods/UnsubscribeGlobally.md

@@ -0,0 +1,29 @@
+[back to list](../Readme.md)
+
+# Unsubscribe from all lists and change subscriber status
+
+## `array unsubscribe(string $subscriber_id)`
+
+This method removes a subscriber from all lists and updates its status to 'unsubscribed'.
+
+It returns a subscriber. See [Get Subscriber](GetSubscriber.md) for returned data structure.
+
+## Arguments
+
+### string `$subscriber_id` (required)
+
+An id or email of an existing subscriber. An `\Exception` is thrown when an id or email doesn't match any subscriber.
+
+## 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                                  |
+| ---- | -------------------------------------------- |
+| 4    | Invalid subscriber that does not exist       |
+| 24   | Subscriber already has 'unsubscribed' status |

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
@@ -46,6 +47,7 @@ services:
       PHP_IDE_CONFIG: 'serverName=Mailpoet'
       COMPOSER_HOME: '/tmp/.composer'
       NPM_CONFIG_CACHE: '/tmp/.npm'
+      XDG_CACHE_HOME: '/tmp/.cache'
       MAILPOET_DEV_SITE: 1
     volumes:
       - './wordpress:/var/www/html'

mailpoet/.babelrc

@@ -1,11 +1,10 @@
 {
   "presets": [
-    "@babel/preset-typescript",
     ["@babel/preset-react", { "runtime": "automatic" }],
-    "@babel/preset-env"
+    "@babel/preset-env",
+    ["@babel/preset-typescript", { "allowDeclareFields": true }]
   ],
   "plugins": [
-    "babel-plugin-typescript-to-proptypes",
     [
       "@babel/plugin-transform-runtime",
       {

mailpoet/.env.sample

@@ -37,3 +37,10 @@ WP_GITHUB_TOKEN=
 # Jira username/email and a token from https://id.atlassian.com/manage/api-tokens:
 WP_JIRA_USER=
 WP_JIRA_TOKEN=
+
+# k6 performance test suite
+# Get following secrets from the Secret Store, look for "MailPoet: plugin .env":
+WP_TEST_PERFORMANCE_DATA_URL=
+WP_TEST_PERFORMANCE_PW=
+K6_CLOUD_TOKEN=
+K6_CLOUD_ID=

mailpoet/.eslintignore

@@ -1,3 +0,0 @@
-**/vendor/**
-**/vendor-prefixed/**
-**/testBundles/**

mailpoet/.nvmrc

@@ -1 +0,0 @@
-v17.9.1

mailpoet/README.md

@@ -90,7 +90,6 @@ $ ./do test:debug-unit            # alias for ./do test:unit --debug
 $ ./do test:debug-integration     # alias for ./do test:integration --debug
 $ ./do test:failed-unit           # run the last failing unit test.
 $ ./do test:failed-integration    # run the last failing integration test.
-$ ./do test:coverage              # run tests and output coverage information.
 $ ./do test:javascript            # run the JS tests.
 $ ./do test:acceptance [--file=...] [--skip-deps]
   # run acceptances tests into a docker environment.

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,48 @@ 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',
+      'RoboFile.php',
+      '.storybook',
+      'storybook-static',
+    ]);
+
+    $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'
-      )->run();
+
+      // HTML, HBS
+      ->taskExec("php -d memory_limit=-1 tasks/makepot/makepot-views.php . > lang/mailpoet.pot")
+
+      // PHP, JS/TS
+      ->taskExec("php -d memory_limit=-1 vendor/wp-cli/wp-cli/php/boot-fs.php i18n make-pot --merge --slug=mailpoet --domain=mailpoet --exclude=$exclude --headers=$headers . lang/mailpoet.pot")
+
+      ->run();
   }
 
   public function translationsGetPotFileFromBuild() {
@@ -184,7 +221,7 @@ class RoboFile extends \Robo\Tasks {
     return $this->_exec($command);
   }
 
-  public function testIntegration(array $opts = ['file' => null, 'group' => null, 'skip-group' => null, 'xml' => false, 'multisite' => false, 'debug' => false, 'skip-deps' => false, 'skip-plugins' => false, 'enable-cot' => false, 'enable-cot-sync' => false]) {
+  public function testIntegration(array $opts = ['file' => null, 'group' => null, 'skip-group' => null, 'xml' => false, 'multisite' => false, 'debug' => false, 'skip-deps' => false, 'skip-plugins' => false, 'enable-cot' => false, 'enable-cot-sync' => false, 'stop-on-fail' => false]) {
     return $this->runTestsInContainer(array_merge($opts, ['test_type' => 'integration']));
   }
 
@@ -200,21 +237,6 @@ class RoboFile extends \Robo\Tasks {
     return $this->runTestsInContainer(array_merge($opts, ['test_type' => 'integration', 'skip-group' => 'woo', 'skip-deps' => true, 'skip-plugins' => true]));
   }
 
-  public function testCoverage($opts = ['file' => null, 'xml' => false]) {
-    $command = join(' ', [
-      'vendor/bin/codecept run -s acceptance',
-      (($opts['file']) ? $opts['file'] : ''),
-      '--coverage',
-      ($opts['xml']) ? '--coverage-xml' : '--coverage-html',
-    ]);
-
-    if ($opts['xml']) {
-      $command .= ' --xml';
-    }
-
-    return $this->execWithXDebug($command);
-  }
-
   public function testNewsletterEditor($xmlOutputFile = null) {
     $command = join(' ', [
       './node_modules/.bin/mocha',
@@ -263,6 +285,80 @@ class RoboFile extends \Robo\Tasks {
     return $this->runTestsInContainer($opts);
   }
 
+  public function testPerformance($path = null, $opts = ['url' => null, 'pw' => null, 'head' => false, 'scenario' => null]) {
+    $dir = __DIR__;
+    if ((getenv('K6_CLOUD_TOKEN')) === false) {
+      return $this->collectionBuilder()
+      ->addCode([$this, 'testPerformanceSetup'])
+      ->taskExec("php $dir/tools/k6.php")
+      ->arg('run')
+      ->option('env', 'K6_BROWSER_ENABLED=1')
+      ->option('env', 'URL=' . $opts['url'])
+      ->option('env', 'PW=' . $opts['pw'])
+      ->option('env', 'HEADLESS=' . ($opts['head'] ? 'false' : 'true'))
+      ->option('env', 'SCENARIO=' . $opts['scenario'])
+      ->arg($path ?? "$dir/tests/performance/scenarios.js")
+      ->dir($dir)->run();
+    } else {
+      return $this->collectionBuilder()
+      ->addCode([$this, 'testPerformanceSetup'])
+      ->taskExec("php $dir/tools/k6.php")
+      ->arg('run')
+      ->option('env', 'K6_BROWSER_ENABLED=1')
+      ->option('env', 'URL=' . $opts['url'])
+      ->option('env', 'PW=' . $opts['pw'])
+      ->option('env', 'HEADLESS=' . ($opts['head'] ? 'false' : 'true'))
+      ->option('env', 'SCENARIO=' . $opts['scenario'])
+      ->option('env', 'K6_CLOUD_TOKEN=' . getenv('K6_CLOUD_TOKEN'))
+      ->option('env', 'K6_CLOUD_ID=' . getenv('K6_CLOUD_ID'))
+      ->option('env', 'K6_PROJECT_NAME=' . $opts['scenario'])
+      ->option('out', 'cloud')
+      ->arg($path ?? "$dir/tests/performance/scenarios.js")
+      ->dir($dir)->run();
+    }
+  }
+
+  public function testPerformanceSetup() {
+    // get data file URL
+    $url = getenv('WP_TEST_PERFORMANCE_DATA_URL');
+    if (!$url) {
+      $this->yell("Please set 'WP_TEST_PERFORMANCE_DATA_URL'. You'll find it in the secret store.", 40, 'red');
+      exit(1);
+    }
+
+    // download data
+    $dataFile = __DIR__ . '/tests/performance/_data/data.sql';
+    if (!file_exists($dataFile)) {
+      $this->say('Downloading data file...');
+      if (!is_dir(dirname($dataFile))) {
+        mkdir(dirname($dataFile), 0777, true);
+      }
+      $source = gzopen($url, 'rb');
+      $destination = fopen($dataFile, 'wb');
+      while (!gzeof($source)) {
+        fwrite($destination, gzread($source, 4096));
+      }
+      fclose($destination);
+      gzclose($source);
+      $this->say("Data file downloaded to: $dataFile");
+    } else {
+      $this->say("Data file already exists: $dataFile");
+    }
+
+    // import data & run WordPress setup
+    $this->say('Importing data and running a WordPress setup...');
+    $this->taskExec('COMPOSE_HTTP_TIMEOUT=200 docker-compose run --rm -it setup')
+      ->dir(__DIR__ . '/tests/performance')
+      ->run();
+    $this->say('Data imported, WordPress set up.');
+  }
+
+  public function testPerformanceClean() {
+    $this->taskExec('COMPOSE_HTTP_TIMEOUT=200 docker-compose down --remove-orphans -v')
+      ->dir(__DIR__ . '/tests/performance')
+      ->run();
+  }
+
   public function testAcceptanceMultisite($opts = ['file' => null, 'skip-deps' => false, 'group' => null, 'timeout' => null, 'enable-cot' => false, 'enable-cot-sync' => false]) {
     return $this->runTestsInContainer(array_merge($opts, ['multisite' => true]));
   }
@@ -351,6 +447,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 +487,9 @@ class RoboFile extends \Robo\Tasks {
     $collection->addCode(function() {
       return $this->qaCodeSniffer([]);
     });
+    $collection->addCode(function() {
+      return $this->qaMinimalPluginStandard([]);
+    });
     return $collection->run();
   }
 
@@ -399,8 +517,8 @@ class RoboFile extends \Robo\Tasks {
       'lib-3rd-party/',
       'vendor/composer',
       'vendor/mtdowling',
-      'vendor/soundasleep',
       'vendor-prefixed/',
+      'vendor-prefixed/soundasleep',
       'mailpoet.php',
     ]);
     // The list of files and folders to exclude is coming from build.sh
@@ -418,7 +536,7 @@ class RoboFile extends \Robo\Tasks {
       'vendor/phpmailer/phpmailer/test',
       'vendor-prefixed/psr/log/Psr/Log/Test',
       'vendor-prefixed/sabberworm/php-css-parser/tests',
-      'vendor/soundasleep/html2text/tests',
+      'vendor-prefixed/soundasleep/html2text/tests',
       'vendor-prefixed/swiftmailer/swiftmailer/tests',
       'vendor-prefixed/symfony/service-contracts/Tests',
       'vendor-prefixed/symfony/translation/Tests',
@@ -448,7 +566,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',
     ]);
 
@@ -491,7 +658,8 @@ class RoboFile extends \Robo\Tasks {
   }
 
   public function qaFixFile($filePath) {
-    if (substr($filePath, -4) === '.php') {
+    $extension = pathinfo($filePath, PATHINFO_EXTENSION);
+    if ($extension === 'php') {
       // fix PHPCS rules
       return $this->collectionBuilder()
         ->taskExec(
@@ -502,48 +670,10 @@ class RoboFile extends \Robo\Tasks {
         )
         ->run();
     }
-    if (substr($filePath, -4) === '.jsx') {
-      // fix ESLint using ES6 rules
+    if (in_array($extension, ['js', 'jsx', 'ts', 'tsx'], true)) {
+      // fix ESLint rules
       return $this->collectionBuilder()
-        ->taskExec(
-          'npx ../eslint-config/node_modules/.bin/eslint -c ../eslint-config/.eslintrc.es6.json ' .
-            '--max-warnings 0 ' .
-            '--fix ' .
-            $filePath
-        )
-        ->run();
-    }
-    if (substr($filePath, -4) === '.tsx' || substr($filePath, -3) === '.ts') {
-      // fix ESLint using TS rules
-      return $this->collectionBuilder()
-        ->taskExec(
-          'npx ../eslint-config/node_modules/.bin/eslint -c ../eslint-config/.eslintrc.ts.json ' .
-            '--max-warnings 0 ' .
-            '--fix ' .
-            $filePath
-        )
-        ->run();
-    }
-    if (substr($filePath, -8) === '.spec.js') {
-      // fix ESLint using tests rules
-      return $this->collectionBuilder()
-        ->taskExec(
-          'npx ../eslint-config/node_modules/.bin/eslint -c ../eslint-config/.eslintrc.tests_newsletter_editor.json ' .
-            '--max-warnings 0 ' .
-            '--fix ' .
-            $filePath
-        )
-        ->run();
-    }
-    if (substr($filePath, -3) === '.js') {
-      // fix ESLint using ES5 rules
-      return $this->collectionBuilder()
-        ->taskExec(
-          'npx ../eslint-config/node_modules/.bin/eslint -c ../eslint-config/.eslintrc.es5.json ' .
-            '--max-warnings 0 ' .
-            '--fix ' .
-            $filePath
-        )
+        ->taskExec("pnpm eslint --max-warnings 0 --fix $filePath")
         ->run();
     }
   }
@@ -580,6 +710,10 @@ class RoboFile extends \Robo\Tasks {
       ->run();
   }
 
+  public function qaSemgrep() {
+    return $this->_exec('./tools/semgrep.sh lib/ lib-3rd-party/');
+  }
+
   public function storybookBuild() {
     return $this->_exec('pnpm run build-storybook');
   }
@@ -746,6 +880,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);
       })
@@ -882,9 +1019,23 @@ class RoboFile extends \Robo\Tasks {
       ->addCode(function () use ($version) {
         return $this->releasePublishSlack($version);
       })
+      ->addCode(function () {
+        return $this->releaseMergePullRequest(\MailPoetTasks\Release\GitHubController::RELEASE_SOURCE_BRANCH);
+      })
       ->run();
   }
 
+  public function releaseMergePullRequest(string $branch) {
+    try {
+      $this->createGitHubController()
+        ->mergePullRequest(\MailPoetTasks\Release\CircleCiController::PROJECT_MAILPOET, $branch);
+    } catch (\Exception $e) {
+      $this->yell($e->getMessage(), 40, 'red');
+      exit(1);
+    }
+    $this->say("Pull request for branch: '{$branch}' was successfully merged");
+  }
+
   /**
    * This command displays how many pull request each person did recently
    */
@@ -1063,6 +1214,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);
@@ -1086,19 +1249,18 @@ class RoboFile extends \Robo\Tasks {
       ->downloadReleaseZip('woocommerce-subscriptions.zip', __DIR__ . '/tests/plugins/', $tag);
   }
 
-  public function downloadWooCommerceZip($tag = null) {
-    if ($tag === 'woo-cot-beta') {
-      $this->downloadWooCommerceCotZip();
-      return;
+  public function downloadAutomateWooZip($tag = null) {
+    if (!getenv('WP_GITHUB_USERNAME') && !getenv('WP_GITHUB_TOKEN')) {
+      $this->yell("Skipping download of Automate Woo", 40, 'red');
+      exit(0); // Exit with 0 since it is a valid state for some environments
     }
-    $this->createWpOrgDownloader('woocommerce')
-    ->downloadPluginZip('woocommerce.zip', __DIR__ . '/tests/plugins/', $tag);
+    $this->createGithubClient('woocommerce/automatewoo')
+      ->downloadReleaseZip('automatewoo.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 downloadWooCommerceZip($tag = null) {
+    $this->createWpOrgDownloader('woocommerce')
+    ->downloadPluginZip('woocommerce.zip', __DIR__ . '/tests/plugins/', $tag);
   }
 
   public function generateData($generatorName = null, $threads = 1) {
@@ -1290,7 +1452,8 @@ class RoboFile extends \Robo\Tasks {
       (isset($opts['xml']) && $opts['xml'] ? '--xml ' : '') .
       (isset($opts['group']) && $opts['group'] ? '--group ' . $opts['group'] . ' ' : '') .
       (isset($opts['skip-group']) && $opts['skip-group'] ? '--skip-group ' . $opts['skip-group'] . ' ' : '') .
-      '-f ' . (isset($opts['file']) && $opts['file'] ? $opts['file'] : '')
+      (isset($opts['stop-on-fail']) && $opts['stop-on-fail'] ? '-f ' : '') .
+      (isset($opts['file']) && $opts['file'] ? $opts['file'] : '')
     )->dir(__DIR__ . '/tests/docker')->run();
   }
 }

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

@@ -0,0 +1,37 @@
+.mailpoet-automation-editor-automation {
+  background: #fbfbfb;
+  flex-grow: 1;
+}
+
+.mailpoet-automation-editor-automation-wrapper {
+  display: grid;
+  padding: 50px 20px;
+}
+
+.mailpoet-automation-editor-automation-end {
+  background: #8c8f94;
+  border-radius: 999999px;
+  fill: white;
+  height: 18px;
+  margin: 4px auto;
+  padding: 3px;
+  width: 18px;
+}
+
+.mailpoet-automation-editor-stats {
+  margin: 0 auto 32px;
+  max-width: 480px;
+  width: 100%;
+
+  .mailpoet-automation-stats-item {
+    line-height: 22px;
+  }
+
+  .mailpoet-automation-stats-label {
+    color: #787c82;
+  }
+
+  .mailpoet-automation-stats-value {
+    font-size: 14px;
+  }
+}

mailpoet/assets/css/src/components-automation-editor/_deactivate-modal.scss

@@ -0,0 +1,44 @@
+.mailpoet-automatoin-deactivate-modal {
+  color: #1d2327;
+  font-size: 13px;
+  line-height: 21px;
+  max-width: 480px;
+
+  .mailpoet-automation-options {
+    li {
+      margin-bottom: 12px;
+    }
+  }
+
+  .mailpoet-automation-option {
+    border: 2px solid #dcdcde;
+    border-radius: 4px;
+    color: #646970;
+    display: grid;
+    font-size: 12px;
+    grid-gap: 8px;
+    grid-template-columns: 20px auto;
+    line-height: 16px;
+    padding: 8px;
+
+    &.active {
+      border-color: #2271b1;
+    }
+
+    strong {
+      color: #1d2327;
+      display: block;
+      font-size: 13px;
+      font-weight: normal;
+      line-height: 21px;
+    }
+  }
+
+  .components-button {
+    float: right;
+
+    &.is-tertiary {
+      margin-right: 12px;
+    }
+  }
+}

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:not([type='radio'])
+  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-editor/_filters.scss

@@ -0,0 +1,35 @@
+button.components-button.mailpoet-automation-filters-panel-add-filter {
+  padding-right: 12px;
+
+  &.has-icon > svg {
+    margin-right: 4px;
+  }
+}
+
+.mailpoet-automation-filters-list {
+  display: grid;
+  gap: 12px;
+  margin-bottom: 16px;
+}
+
+.mailpoet-automation-filters-list-item {
+  align-items: center;
+  background: #f0f0f0;
+  display: grid;
+  grid-template-columns: 1fr auto;
+
+  .mailpoet-automation-filters-list-item-content {
+    padding: 8px 12px;
+  }
+
+  .mailpoet-automation-filters-list-item-remove {
+    color: #757575;
+    margin: 4px;
+    padding: 0;
+  }
+}
+
+.mailpoet-automation-filters-list-item-field,
+.mailpoet-automation-filters-list-item-value {
+  font-weight: 600;
+}

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

@@ -2,9 +2,19 @@
   padding-bottom: 100px;
 }
 
+.mailpoet-automation-panel-description {
+  color: #646970;
+  font-size: 13px;
+  margin-bottom: 16px;
+}
+
 .components-panel__body-title.mailpoet-automation-panel-plain-body-title {
   display: grid;
   grid-template-columns: 1fr auto;
+
+  &:hover {
+    background: none;
+  }
 }
 
 .mailpoet-automation-panel-plain-body-title-text {
@@ -12,6 +22,10 @@
   font-weight: 500;
   line-height: normal;
   padding: 16px 48px 16px 16px;
+
+  label & {
+    padding: 0;
+  }
 }
 
 .mailpoet-automation-panel-plain-body-title-action {
@@ -57,3 +71,78 @@
   color: #757575;
   font-style: italic;
 }
+
+.mailpoet-automation-activate-panel {
+  animation: mailpoet-automation-activate-panel-animation .1s forwards;
+  background: #fff;
+  border-left: 1px solid #ddd;
+  bottom: 0;
+  height: 100%;
+  left: auto;
+  overflow: auto;
+  position: fixed;
+  right: 0;
+  top: 0;
+  transform: translateX(100%);
+  width: 281px;
+  z-index: 999999;
+
+  button {
+    justify-content: center;
+    width: 100%;
+  }
+}
+
+.mailpoet-automation-activate-panel__header {
+  align-content: space-between;
+  align-items: center;
+  display: flex;
+  height: 61px;
+
+  .has-icon {
+    margin-left: auto;
+    width: auto;
+  }
+}
+
+.mailpoet-automation-activate-panel__header,
+.mailpoet-automation-activate-panel__section {
+  border-bottom: 1px solid #ddd;
+}
+
+.mailpoet-automation-activate-panel__header,
+.mailpoet-automation-activate-panel__body {
+  padding-left: 16px;
+  padding-right: 16px;
+
+  .components-spinner {
+    display: block;
+    margin: 100px auto 0;
+  }
+}
+
+.mailpoet-automation-activate-panel__section {
+  margin-left: -16px;
+  margin-right: -16px;
+  padding: 16px;
+}
+
+.mailpoet-automation-activate-panel__header-activate-button,
+.mailpoet-automation-activate-panel__header-cancel-button {
+  flex-grow: 1;
+  max-width: 160px;
+}
+
+.mailpoet-automation-activate-panel__header-activate-button {
+  padding-right: 4px;
+}
+
+.mailpoet-automation-activate-panel__header-cancel-button {
+  padding-left: 4px;
+}
+
+@keyframes mailpoet-automation-activate-panel-animation {
+  100% {
+    transform: translateX(0);
+  }
+}

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

@@ -54,7 +54,10 @@
 }
 
 .mailpoet-automation-editor-step-title {
+  align-items: center;
   color: $color-wordpress-grey-dark;
+  display: flex;
+  gap: 8px;
 }
 
 .mailpoet-automation-editor-step-subtitle {

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

@@ -1,19 +0,0 @@
-.mailpoet-automation-editor-workflow {
-  background: #fbfbfb;
-  flex-grow: 1;
-}
-
-.mailpoet-automation-editor-workflow-wrapper {
-  display: grid;
-  padding: 50px 20px;
-}
-
-.mailpoet-automation-editor-workflow-end {
-  background: #8c8f94;
-  border-radius: 999999px;
-  fill: white;
-  height: 18px;
-  margin: 4px auto;
-  padding: 3px;
-  width: 18px;
-}

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

@@ -1,3 +1,4 @@
 @import './mailpoet/button';
 @import './mailpoet/edit';
 @import './mailpoet/thumbnail';
+@import './mailpoet/steps';

mailpoet/assets/css/src/components-automation-integrations/mailpoet/steps/index.scss

@@ -0,0 +1 @@
+@import './send-email';

mailpoet/assets/css/src/components-automation-integrations/mailpoet/steps/send-email/index.scss

@@ -0,0 +1,15 @@
+.mailpoet-sendmail-description {
+  display: grid;
+  grid-gap: 4px;
+  grid-template-columns: 14px auto;
+  grid-template-rows: auto auto;
+}
+
+.mailpoet-sendemail-description-main {
+  grid-column-end: -1;
+  grid-column-start: 1;
+}
+
+.mailpoet-sendmail-description-type {
+  color: #787c82;
+}

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

@@ -4,18 +4,64 @@
   .mailpoet-add-new-button {
     padding-right: 12px;
   }
+}
 
-  .mailpoet-automation-listing {
-    /* Prevent border radius beneath tabs */
-    border-radius: 0 0 1px 1px;
+.mailpoet-automation-is-onboarding {
+  .notice {
+    display: none;
+  }
+}
+
+.mailpoet-automation-listing-heading {
+  margin-bottom: 16px;
+}
+
+.mailpoet-automation-listing {
+  box-shadow: none;
+  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-radius: 1px;
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, .1);
-  outline: none;
+  border: 1px solid #dcdcde;
+  border-radius: 2px;
+
+  .components-tab-panel__tabs {
+    box-shadow: inset 0 -1px 0 0 #dcdcde;
+  }
+
+  .components-tab-panel__tabs-item:focus {
+    box-shadow: none;
+  }
+
+  .components-tab-panel__tabs-item.is-active {
+    box-shadow: inset 0 -4px 0 0 var(--wp-admin-theme-color);
+  }
+
+  .components-tab-panel__tabs-item:focus-visible {
+    box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+  }
+
+  .components-tab-panel__tabs-item.is-active:focus-visible {
+    box-shadow:
+      inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color),
+      inset 0 -4px 0 0 var(--wp-admin-theme-color);
+  }
 
   .count {
     background-color: #f0f0f1;
@@ -27,6 +73,13 @@
   }
 }
 
-.mailpoet-automation-listing-heading {
-  margin-bottom: 16px;
+.mailpoet-automation-listing-more-button button.components-button {
+  height: 36px;
+  padding: 0;
+  width: 36px;
+
+  svg {
+    height: 28px;
+    width: 28px;
+  }
 }

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-listing/cells/_actions.scss

@@ -0,0 +1,7 @@
+.mailpoet-automation-listing-cell-actions {
+  align-items: center;
+  display: grid;
+  gap: 8px;
+  grid-auto-flow: column;
+  white-space: nowrap;
+}

mailpoet/assets/css/src/components-automation-listing/cells/_status.scss

@@ -1,6 +1,8 @@
 .mailpoet-automation-listing-cell-status {
   align-items: center;
-  display: flex;
+  display: grid;
+  grid-auto-flow: column;
+  white-space: nowrap;
 
   > div.components-base-control > div.components-base-control__field {
     margin-bottom: 0;

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-automation/_statistics.scss

@@ -0,0 +1,32 @@
+.mailpoet-automation-stats {
+  display: grid;
+  grid-auto-flow: column;
+  justify-content: space-between;
+}
+
+.mailpoet-automation-stats-item {
+  color: $color-wordpress-heading;
+  display: grid;
+  font-size: 12px;
+  line-height: 16px;
+  text-align: center;
+}
+
+.mailpoet-automation-stats-label {
+  color: #646970;
+  display: block;
+
+  &.display-after {
+    order: 1;
+  }
+}
+
+.mailpoet-automation-stats-value {
+  font-weight: 600;
+}
+
+.mailpoet-automation-stats-item-separator {
+  color: #a7aaad;
+  font-size: 20px;
+  margin: 0 16px;
+}

mailpoet/assets/css/src/components-editor/3rd-party-overrides/_overrides.scss

@@ -145,11 +145,11 @@
 
   /* Sidepanel overrides */
   .mailpoet_panel_body {
-    margin: 19px;
+    margin: 0;
     padding: 0;
 
     .mailpoet_editor_settings h3 {
-      margin-top: 0;
+      margin: 19px;
     }
   }
 

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

@@ -1,7 +1,6 @@
 .admin_page_mailpoet-newsletter-editor {
   .mailpoet_form_field {
-    margin-bottom: 15px;
-    margin-top: 15px;
+    margin: 19px 15px;
   }
 
   .mailpoet_form_field_title {
@@ -51,4 +50,8 @@
   .mailpoet_form_field_block {
     display: block;
   }
+
+  .mailpoet_form_field_input_nowrap {
+    white-space: nowrap;
+  }
 }

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

@@ -12,6 +12,12 @@
     font-size: 1.4em;
     text-transform: uppercase;
   }
+
+  .components-panel__row {
+    align-items: flex-start;
+    flex-direction: column;
+    justify-content: flex-start;
+  }
 }
 
 .mailpoet_sidepanel_field {

mailpoet/assets/css/src/components-editor/content-blocks/_coupon.scss

@@ -0,0 +1,90 @@
+.mailpoet_coupon_block {
+  .mailpoet_editor_coupon {
+    text-align: center;
+  }
+
+  .mailpoet_editor_coupon_overlay {
+    background: rgba(255, 255, 255, .5);
+    color: #000;
+    cursor: pointer;
+    display: none;
+    font-size: 18px;
+    height: 100%;
+    position: absolute;
+    text-align: center;
+    top: 0;
+    width: 100%;
+  }
+
+  :hover {
+    .mailpoet_editor_coupon {
+      opacity: .5;
+    }
+
+    .mailpoet_editor_coupon_overlay {
+      display: block;
+    }
+  }
+}
+
+.coupon_amount_wrapper {
+  position: relative;
+}
+
+.amount_percentage_sign {
+  font-size: 18px;
+  font-weight: bold;
+  left: 150px; // .mailpoet_input_medium width
+  line-height: 30px;
+  margin-left: 10px;
+  position: absolute;
+}
+
+.mailpoet_coupon_block_coupon {
+  background: $color-white;
+  font-size: 13px;
+  height: auto;
+  line-height: 21px;
+  margin-bottom: 16px;
+  padding: 16px 0;
+  width: 100%;
+
+  input[type='radio'] {
+    margin-left: 16px;
+  }
+
+  div {
+    padding: 0 16px 0 40px;
+
+    &.discount_type {
+      font-style: italic;
+    }
+  }
+}
+
+.mailpoet_coupon_block_settings,
+.mailpoet_coupon_block_display_options {
+  @include animation-slide-open-downwards();
+  overflow-x: hidden;
+}
+
+.mailpoet_editor_settings {
+  .components-panel__header.edit-post-sidebar__panel-tabs {
+    background: $color-primary-background;
+    border-bottom: none;
+  }
+
+  .components-base-control {
+    width: 100%;
+  }
+
+  .components-panel {
+    background: $color-primary-background;
+    border-left: none;
+    border-right: none;
+  }
+
+  .components-search-control input[type=search].components-search-control__input {
+    background: $color-white;
+  }
+}

mailpoet/assets/css/src/components-editor/content-blocks/_posts.scss

@@ -24,6 +24,7 @@
 .mailpoet_settings_posts_selection {
   @include animation-slide-open-downwards();
   overflow-x: hidden;
+  padding: 0 19px;
 }
 
 .mailpoet_settings_posts_show_display_options,

mailpoet/assets/css/src/components-editor/content-blocks/_products.scss

@@ -24,6 +24,7 @@
 .mailpoet_settings_products_selection {
   @include animation-slide-open-downwards();
   overflow-x: hidden;
+  padding: 0 19px;
 }
 
 .mailpoet_settings_products_show_display_options,

mailpoet/assets/css/src/components-form-editor/_block-editor.scss

@@ -22,8 +22,23 @@
 // We don't use any default block (WP Post editor has paragraph)
 // and CSS distributed within packages is works only with the paragraph block
 // We want to display it in center
+.block-editor .block-editor-inserter {
+  width: 100%;
+}
+
 .block-editor .block-editor-inserter .block-editor-button-block-appender.block-list-appender__toggle {
+  align-items: center;
+  box-shadow: inset 0 0 0 1px #1e1e1e;
+  display: flex;
+  height: auto;
+  justify-content: center;
   margin: 0 auto;
+  padding: 12px;
+  width: 100%;
+
+  &:hover {
+    box-shadow: inset 0 0 0 1px var(--wp-admin-theme-color)
+  }
 }
 
 // Html blocks contains iframe which captures clicks and in some cases prevents selecting block.
@@ -86,16 +101,19 @@ h2 {
 // Adjustments for family-font-select in popover
 .mailpoet_toolbar_item {
   .mailpoet-font-family-select {
-    height: 48px;
-
     .components-input-control__container .components-custom-select-control__button {
+      height: 48px;
       width: 200px;
     }
-  }
 
-  // Force rendering of select arrow on the right
-  .components-custom-select-control__button svg {
-    margin-right: initial;
+    // Backdrop is displayed over the select button so we need to disable pointer events so that we can click the select
+    .components-input-control__backdrop {
+      pointer-events: none !important;
+    }
+
+    .components-input-control__suffix * {
+      pointer-events: none !important;
+    }
   }
 }
 
@@ -111,10 +129,29 @@ h2 {
 
 .edit-post-visual-editor {
   background-color: $color-white;
-  padding: 10px;
+  padding: 10px 10px 100px;
 }
 
 // Unify padding o wp-block-columns with background with front end rendering
 .wp-block-columns.has-background {
   padding: 10px;
 }
+
+// Close button animation
+.edit-post-header-toolbar.edit-post-header-toolbar__left > .edit-post-header-toolbar__inserter-toggle {
+  svg {
+    transition: transform cubic-bezier(.165, .84, .44, 1) .2s;
+  }
+
+  &.is-pressed svg {
+    transform: rotate(45deg);
+  }
+}
+
+// Hide block selector header with close button on desktops
+
+@include respond-to(not-small-screen) {
+  .edit-post-editor__inserter-panel-header {
+    display: none;
+  }
+}

mailpoet/assets/css/src/components-form-editor/_helpscout.scss

@@ -1,28 +0,0 @@
-// Override CSS for HelpScout beacon on form editor page
-.admin_page_mailpoet-form-editor {
-  .BeaconFabButtonFrame,
-  .BeaconContainer {
-    left: 175px;
-  }
-
-  &.folded {
-    .BeaconFabButtonFrame,
-    .BeaconContainer {
-      left: 50px;
-    }
-  }
-
-  @include respond-to(medium-screen) {
-    .BeaconFabButtonFrame,
-    .BeaconContainer {
-      left: 50px;
-    }
-  }
-
-  @include respond-to(small-screen) {
-    .BeaconFabButtonFrame,
-    .BeaconContainer {
-      left: 15px;
-    }
-  }
-}

mailpoet/assets/css/src/components-form-editor/_sidebar-style-settings.scss

@@ -3,19 +3,17 @@
   grid-auto-flow: row;
   grid-row-gap: 20px;
 
-  .components-base-control {
-    margin-bottom: 0;
-  }
+  .components-radio-control {
+    .components-flex {
+      flex-direction: row;
+      justify-content: flex-start;
+    }
 
-  .components-base-control__label {
-    display: block;
-    font-weight: bold;
-  }
-
-  .components-radio-control__option {
-    display: inline-block;
-    margin-right: 1em;
-    width: auto;
+    .components-radio-control__option {
+      display: inline-block;
+      margin-right: 1em;
+      width: auto;
+    }
   }
 
   .mailpoet-size-settings-control .components-range-control__number {
@@ -43,10 +41,6 @@
     .components-input-control__container {
       width: 100%;
     }
-
-    .components-custom-select-control__label {
-      font-weight: bold;
-    }
   }
 }
 
@@ -101,25 +95,6 @@
 }
 
 .mailpoet-color-gradient-picker {
-  .block-editor-color-gradient-control__color-indicator {
-    font-weight: bold;
-  }
-
-  .component-color-indicator {
-    vertical-align: text-bottom;
-  }
-}
-
-// Styles for labels and headings for style setting components
-// We override some styles from @wordpress/components to have unified labels appearance
-.mailpoet-styles-settings .components-base-control__label,
-.mailpoet-styles-settings .components-input-control__label,
-.mailpoet-styles-settings .components-custom-select-control__label,
-.mailpoet-styles-settings .components-font-size-picker label {
-  font-size: 13px;
-  font-weight: normal;
-  margin-bottom: .5em;
-
   .component-color-indicator {
     vertical-align: text-bottom;
   }

mailpoet/assets/css/src/components-form-editor/_sidebar.scss

@@ -30,8 +30,13 @@
   }
 }
 
-.components-base-control.mailpoet-form-success-types__control {
-  margin-bottom: 0;
+.components-base-control.mailpoet-form-inline-radios__control {
+  .components-flex {
+    flex-direction: row;
+    gap: $grid-gap-half;
+    justify-content: flex-start;
+    margin-bottom: $grid-gap-half;
+  }
 
   .components-base-control__label {
     display: block;
@@ -39,7 +44,6 @@
 
   .components-radio-control__option {
     display: inline-block;
-    margin-right: 1em;
 
     input {
       margin-right: 6px;
@@ -123,4 +127,5 @@
 // This style hides the horizontal scrollbar in Firefox browser
 .interface-interface-skeleton__sidebar {
   overflow-x: hidden;
+  padding-bottom: 100px;
 }

mailpoet/assets/css/src/components-homepage/_content-section.scss

@@ -0,0 +1,37 @@
+.mailpoet-homepage-section__container {
+  background-color: $color-white;
+  box-shadow: rgb(0 0 0 / 10%) 0 0 0 1px;
+  margin: $grid-gap-xl 0 $grid-gap-medium;
+}
+
+.mailpoet-homepage-section__heading {
+  align-items: center;
+  border-bottom: 1px solid $color-homepage-borders;
+  display: grid;
+  grid-template-columns: auto 100px;
+  padding: $grid-gap $grid-gap-medium;
+  position: relative;
+
+  h2 {
+    font-size: 20px;
+    font-weight: normal;
+    line-height: 28px;
+    margin: 0;
+
+    span {
+      color: $color-text-light;
+      display: block;
+      font-size: 14px;
+      line-height: 1.5;
+    }
+  }
+
+  .mailpoet-homepage-section__heading-after {
+    display: grid;
+    justify-items: end;
+  }
+
+  @include respond-to(small-screen) {
+    padding: $grid-gap-half $grid-gap-medium;
+  }
+}

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/_product-discovery.scss

@@ -0,0 +1,68 @@
+.mailpoet-homepage-product-discovery {
+  ul {
+    margin: 0;
+  }
+}
+
+.mailpoet-product-discovery__task {
+  align-items: center;
+  border-bottom: 1px solid $color-homepage-borders;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: grid;
+  font-weight: 600;
+  grid-template-columns: (124px + $grid-gap-medium) auto $grid-gap-xl;
+  margin: 0;
+  padding: $grid-gap-medium;
+  position: relative;
+  width: 100%;
+
+  @include respond-to(small-screen) {
+    grid-template-columns: auto $grid-gap-xl;
+
+    img {
+      display: none;
+    }
+  }
+
+  &:last-child {
+    border-bottom: none;
+  }
+
+  &:hover {
+    box-shadow: inset 5px 0 0 0 var(--wp-admin-theme-color);
+  }
+}
+
+.mailpoet-product-discovery__task--completed {
+  cursor: inherit;
+
+  &:hover {
+    box-shadow: none;
+  }
+}
+
+.mailpoet-product-discovery__task-content {
+  h3 {
+    color: var(--wp-admin-theme-color);
+    font-size: 14px;
+    line-height: 20px;
+    margin: 0;
+  }
+
+  p {
+    color: $color-text-light;
+    font-weight: normal;
+    margin: 3px 0 0;
+  }
+}
+
+.mailpoet-product-discovery__task-after {
+  .mailpoet-task-list__task-icon {
+    background-color: var(--wp-admin-theme-color);
+
+    svg {
+      fill: $color-white;
+    }
+  }
+}

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

@@ -0,0 +1,55 @@
+.mailpoet-homepage-resources__posts {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+
+  @include respond-to(small-screen) {
+    display: block;
+  }
+}
+
+.mailpoet-resource-post {
+  @include animation-fade-in();
+  display: block;
+  padding: $grid-gap-medium;
+  text-decoration: none;
+
+  h3 {
+    font-size: 14px;
+  }
+
+  p {
+    color: $color-text-light;
+    font-size: 13px;
+    margin-bottom: 0;
+  }
+
+  img {
+    border-radius: 4px;
+  }
+}
+
+.mailpoet-homepage-resources__pagination {
+  border-top: 1px solid $color-homepage-borders;
+  color: $color-text-light;
+  display: flex;
+  font-size: 13px;
+  padding: $grid-gap-medium;
+
+  a {
+    height: 20px;
+    margin-left: $grid-gap;
+
+    svg {
+      margin: 0;
+      opacity: 1;
+    }
+  }
+
+  svg {
+    fill: $color-text-light;
+    height: 20px;
+    margin-left: $grid-gap;
+    opacity: .4;
+    width: 20px;
+  }
+}

mailpoet/assets/css/src/components-homepage/_subscribers-stats.scss

@@ -0,0 +1,117 @@
+.mailpoet-subscribers-stats {
+  .mailpoet-homepage-section__heading-after span {
+    color: darken($color-stats-excellent, 10%);
+    display: grid;
+    font-size: 20px;
+    grid-template-columns: 1fr 1fr;
+    justify-items: end;
+    line-height: 28px;
+
+    svg {
+      fill: darken($color-stats-excellent, 10%);
+      height: 28px;
+      width: 28px;
+    }
+
+    &.mailpoet-decrease {
+      color: darken($color-stats-critical, 10%);
+
+      svg {
+        fill: darken($color-stats-critical, 10%);
+        transform: scale(1, -1);
+      }
+    }
+  }
+}
+
+.mailpoet-subscribers-stats-global-change {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  width: 100%;
+
+  div {
+    color: $color-text-light;
+    padding: $grid-gap-medium;
+    text-transform: uppercase;
+
+    &:first-child {
+      border-right: 1px solid $color-homepage-borders;
+    }
+
+    span {
+      color: $color-homepage-dark-grey;
+      font-size: 20px;
+      line-height: 1.4;
+    }
+  }
+}
+
+.mailpoet-subscribers-stats-list-change-table {
+  border-collapse: collapse;
+  width: 100%;
+
+  thead {
+    background: $color-homepage-light-grey;
+    text-transform: capitalize;
+  }
+
+  a {
+    font-weight: 600;
+    text-decoration: none;
+  }
+
+  td,
+  th {
+    border: none;
+    border-top: 1px solid $color-homepage-borders;
+    color: $color-homepage-dark-grey;
+    padding: $grid-gap $grid-gap-medium;
+    text-align: left;
+
+    @include respond-to(small-screen) {
+      padding: $grid-gap $grid-gap-half;
+
+      &:first-child {
+        padding-left: $grid-gap-medium;
+      }
+
+      &:last-child {
+        padding-right: $grid-gap-medium;
+      }
+    }
+  }
+
+  @include respond-to(small-screen) {
+    td:nth-child(2),
+    th:nth-child(2) {
+      display: none;
+    }
+  }
+}
+
+.mailpoet-subscribers-stats-empty {
+  align-items: center;
+  color: $color-text-light;
+  display: flex;
+  flex-direction: column;
+  font-size: 13px;
+  justify-content: center;
+  padding: $grid-gap-large;
+
+  svg {
+    background: $color-homepage-light-grey;
+    border-radius: 50%;
+    fill: $color-secondary;
+    height: 32px;
+    width: 32px;
+  }
+
+  a {
+    text-decoration: none;
+  }
+
+  p {
+    max-width: 340px;
+    text-align: center;
+  }
+}

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-homepage/_upsell.scss

@@ -0,0 +1,64 @@
+.mailpoet-homepage-upsell {
+  background: bottom right/290px no-repeat url('../../img/homepage/upsell-illustration.png') #fffaf2;
+  min-height: 288px;
+
+  .mailpoet-homepage-section__heading {
+    border: none;
+    height: auto;
+    padding: 0;
+
+    h2 {
+      background-color: $color-white;
+      max-width: 330px;
+      padding: 32px 20px 0 40px;
+    }
+  }
+
+  .mailpoet-homepage-section__heading-after {
+    bottom: 20px;
+    position: relative;
+    right: 20px;
+  }
+
+  .mailpoet-homepage-upsell__content {
+    background-color: $color-white;
+    max-width: 330px;
+    padding: 8px 20px 32px 40px;
+
+    ul {
+      margin: 0;
+      padding: 0 0 8px;
+
+      li {
+        line-height: 16px;
+        margin: 4px 0;
+
+        svg {
+          fill: $color-secondary-middle;
+          vertical-align: middle;
+        }
+
+        span {
+          line-height: 18px;
+          padding-left: 12px;
+        }
+      }
+    }
+  }
+}
+
+@include respond-to(small-screen) {
+  .mailpoet-homepage-upsell {
+    background: $color-white;
+
+    .mailpoet-homepage-section__heading {
+      h2 {
+        max-width: 270px;
+      }
+    }
+
+    .mailpoet-homepage-upsell__content {
+      max-width: 270px;
+    }
+  }
+}

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

@@ -56,6 +56,7 @@ p.sender_email_address_warning:first-child {
 // Fix for select 2 placeholder padding rendering issue in Chrome
 .select2-container .select2-search--inline,
 .select2-container .select2-search--inline .select2-search__field {
+  height: 22px;
   max-width: 100%;
 }
 
@@ -122,3 +123,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/_forms.scss

@@ -27,10 +27,6 @@ input.select2-search__field:-ms-input-placeholder {
   color: $color-placeholder-select2;
 }
 
-.select2-container--default.select2-container--focus .select2-selection--multiple {
-  border: 1px solid #aaa; /* default Select2 border for single dropdown */
-}
-
 textarea.regular-text {
   width: 25em !important;
 }
@@ -232,3 +228,7 @@ progress::-moz-progress-bar {
 .mailpoet-form-field-tags label.components-form-token-field__label {
   display: none;
 }
+
+.mailpoet-form-field-disabled {
+  cursor: not-allowed;
+}

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

@@ -0,0 +1,202 @@
+#mailpoet_landingpage_container {
+  $content-padding: 32px 65px;
+  $mobile-content-padding: 25px;
+  $landingpage-max-width: 1460px;
+
+  .mailpoet-content-center {
+    text-align: center;
+  }
+
+  .mailpoet-content-padding {
+    padding: $content-padding;
+
+    @include respond-to(small-screen) {
+      padding: $mobile-content-padding
+    }
+  }
+
+  .landing-header {
+    padding: $content-padding;
+
+    @include respond-to(small-screen) {
+      padding: $mobile-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;
+    }
+
+    .landing-faq-mobile {
+      display: none;
+    }
+
+    @include respond-to(small-screen) {
+      padding: $mobile-content-padding;
+
+      .landing-faq-header {
+        display: none;
+      }
+
+      .landing-faq-mobile {
+        display: block;
+      }
+    }
+  }
+
+  .landing-content {
+    .hero-section {
+      $hero-image-offset: 6rem;
+      background-color: $color-landingpage-background-light;
+      margin-top: $hero-image-offset;
+      padding: $content-padding;
+
+      .hero-image {
+        margin-top: -($hero-image-offset + 2rem);
+      }
+
+      @include respond-to(small-screen) {
+        padding: $mobile-content-padding
+      }
+    }
+
+    .landingpage-images {
+      @include respond-to(medium-screen) {
+        width: 100%;
+      }
+    }
+
+    .landingpage-general-features {
+      p:last-child {
+        margin: 10px auto;
+        width: 60%;
+      }
+
+      .landingpage-feature-icon {
+        display: block;
+        margin: 0 auto;
+        padding: 20px;
+        text-align: center;
+      }
+
+      @include respond-to(medium-screen) {
+        p:last-child {
+          width: 100%;
+        }
+      }
+    }
+
+    .landingpage-wooCommerce-features {
+      margin-top: 30px;
+      padding: 2rem 10rem;
+
+      .landingpage-wooCommerce-feature-item {
+        padding: 30px;
+
+        @media screen and (min-width: 960px) and (max-width: 1460px) {
+          .landingpage-images {
+            width: 100%;
+          }
+        }
+
+        div:last-child {
+          margin: auto;
+        }
+      }
+
+      @include respond-to(small-screen) {
+        padding: $mobile-content-padding;
+
+        .landingpage-wooCommerce-feature-item {
+          padding: 25px 0;
+
+          div:last-child {
+            text-align: center;
+          }
+        }
+      }
+    }
+  }
+
+  main {
+    margin: 0 auto;
+    max-width: $landingpage-max-width;
+  }
+}
+
+.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;
+      }
+
+      @include respond-to(small-screen) {
+        &:after {
+          right: -1px;
+        }
+      }
+    }
+
+    .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/_listing-newsletters.scss

@@ -202,6 +202,19 @@ h1.title.mailpoet-newsletter-listing-heading {
   }
 }
 
+.mailpoet-listing-status-corrupt {
+  flex-direction: column;
+  padding-left: 0;
+
+  .mailpoet-listing-status-label {
+    padding-left: 0;
+  }
+
+  .mailpoet-listing-status-message {
+    color: $color-destructive;
+  }
+}
+
 .mailpoet-listing-status-percentage {
   stroke-width: 2px;
 }

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

@@ -4,6 +4,6 @@
 }
 
 // Fix for 3rd party plugins icons in menu that might display broken because we block loading 3rd party CSS on mailepoet pages
-#adminmenu .wp-menu-image img {
+#adminmenu :not(.toplevel_page_site-card) .wp-menu-image img {
   max-width: 20px;
 }