From fa2baa5d1b96a45d39a2b10c605810b5abc9d9dd Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Wed, 11 May 2022 23:02:52 +0530
Subject: [PATCH 01/53] Fix: prevent WordPress database error notice on fresh
 install (#6403)

* fix: do not install table if already exist

* fix: install migration table on fresh install

* doc: add unreleased tag

* doc: add unreleased tag

* doc: add throws tag

* refaxtor: create database tavle only if not exist
---
 includes/install.php                          | 789 +++++++++---------
 .../Migrations/CreateMigrationsTable.php      |  10 +-
 2 files changed, 397 insertions(+), 402 deletions(-)

diff --git a/includes/install.php b/includes/install.php
index 7488047588..e1fdae9e6b 100644
--- a/includes/install.php
+++ b/includes/install.php
@@ -1,22 +1,24 @@
 <?php
 
 use Give\Form\Migrations\MoveOptionsToVisualAppearanceSection;
+use Give\Framework\Migrations\Exceptions\DatabaseMigrationException;
 use Give\Log\Migrations\MigrateExistingLogs;
+use Give\MigrationLog\Migrations\CreateMigrationsTable;
 use Give\Revenue\Migrations\AddPastDonationsToRevenueTable;
 
 /**
  * Install Function
  *
  * @package     Give
- * @subpackage  Functions/Install
+ * @since       1.0
  * @copyright   Copyright (c) 2016, GiveWP
  * @license     https://opensource.org/licenses/gpl-license GNU Public License
- * @since       1.0
+ * @subpackage  Functions/Install
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+if (!defined('ABSPATH')) {
+    exit;
 }
 
 /**
@@ -30,28 +32,22 @@
  *
  * @param bool $network_wide
  *
- * @global     $wpdb
  * @return void
+ * @global     $wpdb
  */
-function give_install( $network_wide = false ) {
-
-	global $wpdb;
-
-	if ( is_multisite() && $network_wide ) {
-
-		foreach ( $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs LIMIT 100" ) as $blog_id ) {
-
-			switch_to_blog( $blog_id );
-			give_run_install();
-			restore_current_blog();
-
-		}
-	} else {
-
-		give_run_install();
-
-	}
-
+function give_install($network_wide = false)
+{
+    global $wpdb;
+
+    if (is_multisite() && $network_wide) {
+        foreach ($wpdb->get_col("SELECT blog_id FROM $wpdb->blogs LIMIT 100") as $blog_id) {
+            switch_to_blog($blog_id);
+            give_run_install();
+            restore_current_blog();
+        }
+    } else {
+        give_run_install();
+    }
 }
 
 /**
@@ -60,128 +56,128 @@ function give_install( $network_wide = false ) {
  * @since  1.5
  * @return void
  */
-function give_run_install() {
-	$give_options = give_get_settings();
-
-	// Setup the Give Custom Post Types.
-	give_setup_post_types();
-
-	// Add Upgraded From Option.
-	$current_version = get_option( 'give_version' );
-	if ( $current_version ) {
-		update_option( 'give_version_upgraded_from', $current_version, false );
-	}
-
-	// Setup some default options.
-	$options = [];
-
-	// Fresh Install? Setup Test Mode, Base Country (US), Test Gateway, Currency.
-	if ( empty( $current_version ) ) {
-		$options = array_merge( $options, give_get_default_settings() );
-	} else {
-		// Otherwise, disable the Onboarding experience
-		$options = [
-			'setup_page_enabled' => 'disabled',
-		];
-	}
-
-	// Populate the default values.
-	update_option( 'give_settings', array_merge( $give_options, $options ), false );
-
-	// Create Give roles.
-	$roles = new Give_Roles();
-	$roles->add_roles();
-	$roles->add_caps();
-
-	// Set api version, end point and refresh permalink.
-	$api = new Give_API();
-	$api->add_endpoint();
-	update_option( 'give_default_api_version', 'v' . $api->get_version(), false );
-
-	// Create databases.
-	__give_register_tables();
-
-	// Add a temporary option to note that Give pages have been created.
-	Give_Cache::set( '_give_installed', $options, 30, true );
-
-	/**
-	 * Run plugin upgrades.
-	 *
-	 * @since 1.8
-	 */
-	do_action( 'give_upgrades' );
-
-	if ( GIVE_VERSION !== get_option( 'give_version' ) ) {
-		update_option( 'give_version', GIVE_VERSION, false );
-	}
-
-	if ( ! $current_version ) {
-
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/upgrade-functions.php';
-
-		// When new upgrade routines are added, mark them as complete on fresh install.
-		$upgrade_routines = [
-			'upgrade_give_user_caps_cleanup',
-			'upgrade_give_payment_customer_id',
-			'upgrade_give_offline_status',
-			'v18_upgrades_core_setting',
-			'v18_upgrades_form_metadata',
-			'v189_upgrades_levels_post_meta',
-			'v1812_update_amount_values',
-			'v1812_update_donor_purchase_values',
-			'v1813_update_user_roles',
-			'v1813_update_donor_user_roles',
-			'v1817_update_donation_iranian_currency_code',
-			'v1817_cleanup_user_roles',
-			'v1818_assign_custom_amount_set_donation',
-			'v1818_give_worker_role_cleanup',
-			'v20_upgrades_form_metadata',
-			'v20_logs_upgrades',
-			'v20_move_metadata_into_new_table',
-			'v20_rename_donor_tables',
-			'v20_upgrades_donor_name',
-			'v20_upgrades_user_address',
-			'v20_upgrades_payment_metadata',
-			'v201_upgrades_payment_metadata',
-			'v201_add_missing_donors',
-			'v201_move_metadata_into_new_table',
-			'v201_logs_upgrades',
-			'v210_verify_form_status_upgrades',
-			'v213_delete_donation_meta',
-			'v215_update_donor_user_roles',
-			'v220_rename_donation_meta_type',
-			'v224_update_donor_meta',
-			'v224_update_donor_meta_forms_id',
-			'v230_move_donor_note',
-			'v230_move_donation_note',
-			'v230_delete_donor_wall_related_donor_data',
-			'v230_delete_donor_wall_related_comment_data',
-			'v240_update_form_goal_progress',
-			'v241_remove_sale_logs',
-			'v270_store_stripe_account_for_donation',
-			AddPastDonationsToRevenueTable::id(),
-			MigrateExistingLogs::id()
-		];
-
-		foreach ( $upgrade_routines as $upgrade ) {
-			give_set_upgrade_complete( $upgrade );
-		}
-	}
-
-	// Bail if activating from network, or bulk.
-	if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-		return;
-	}
-
-	// Setup embed form route on fresh install or plugin activation.
-	Give()->routeForm->setBasePrefix();
-	Give()->routeForm->addRule();
-
-	// Flush rewrite rules.
-	flush_rewrite_rules();
-
-	// Add the transient to redirect.
-	Give_Cache::set( '_give_activation_redirect', true, 30, true );
+function give_run_install()
+{
+    $give_options = give_get_settings();
+
+    // Setup the Give Custom Post Types.
+    give_setup_post_types();
+
+    // Add Upgraded From Option.
+    $current_version = get_option('give_version');
+    if ($current_version) {
+        update_option('give_version_upgraded_from', $current_version, false);
+    }
+
+    // Setup some default options.
+    $options = [];
+
+    // Fresh Install? Setup Test Mode, Base Country (US), Test Gateway, Currency.
+    if (empty($current_version)) {
+        $options = array_merge($options, give_get_default_settings());
+    } else {
+        // Otherwise, disable the Onboarding experience
+        $options = [
+            'setup_page_enabled' => 'disabled',
+        ];
+    }
+
+    // Populate the default values.
+    update_option('give_settings', array_merge($give_options, $options), false);
+
+    // Create Give roles.
+    $roles = new Give_Roles();
+    $roles->add_roles();
+    $roles->add_caps();
+
+    // Set api version, end point and refresh permalink.
+    $api = new Give_API();
+    $api->add_endpoint();
+    update_option('give_default_api_version', 'v' . $api->get_version(), false);
+
+    // Create databases.
+    __give_register_tables();
+
+    // Add a temporary option to note that Give pages have been created.
+    Give_Cache::set('_give_installed', $options, 30, true);
+
+    /**
+     * Run plugin upgrades.
+     *
+     * @since 1.8
+     */
+    do_action('give_upgrades');
+
+    if (GIVE_VERSION !== get_option('give_version')) {
+        update_option('give_version', GIVE_VERSION, false);
+    }
+
+    if (!$current_version) {
+        require_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/upgrade-functions.php';
+
+        // When new upgrade routines are added, mark them as complete on fresh install.
+        $upgrade_routines = [
+            'upgrade_give_user_caps_cleanup',
+            'upgrade_give_payment_customer_id',
+            'upgrade_give_offline_status',
+            'v18_upgrades_core_setting',
+            'v18_upgrades_form_metadata',
+            'v189_upgrades_levels_post_meta',
+            'v1812_update_amount_values',
+            'v1812_update_donor_purchase_values',
+            'v1813_update_user_roles',
+            'v1813_update_donor_user_roles',
+            'v1817_update_donation_iranian_currency_code',
+            'v1817_cleanup_user_roles',
+            'v1818_assign_custom_amount_set_donation',
+            'v1818_give_worker_role_cleanup',
+            'v20_upgrades_form_metadata',
+            'v20_logs_upgrades',
+            'v20_move_metadata_into_new_table',
+            'v20_rename_donor_tables',
+            'v20_upgrades_donor_name',
+            'v20_upgrades_user_address',
+            'v20_upgrades_payment_metadata',
+            'v201_upgrades_payment_metadata',
+            'v201_add_missing_donors',
+            'v201_move_metadata_into_new_table',
+            'v201_logs_upgrades',
+            'v210_verify_form_status_upgrades',
+            'v213_delete_donation_meta',
+            'v215_update_donor_user_roles',
+            'v220_rename_donation_meta_type',
+            'v224_update_donor_meta',
+            'v224_update_donor_meta_forms_id',
+            'v230_move_donor_note',
+            'v230_move_donation_note',
+            'v230_delete_donor_wall_related_donor_data',
+            'v230_delete_donor_wall_related_comment_data',
+            'v240_update_form_goal_progress',
+            'v241_remove_sale_logs',
+            'v270_store_stripe_account_for_donation',
+            AddPastDonationsToRevenueTable::id(),
+            MigrateExistingLogs::id()
+        ];
+
+        foreach ($upgrade_routines as $upgrade) {
+            give_set_upgrade_complete($upgrade);
+        }
+    }
+
+    // Bail if activating from network, or bulk.
+    if (is_network_admin() || isset($_GET['activate-multi'])) {
+        return;
+    }
+
+    // Setup embed form route on fresh install or plugin activation.
+    Give()->routeForm->setBasePrefix();
+    Give()->routeForm->addRule();
+
+    // Flush rewrite rules.
+    flush_rewrite_rules();
+
+    // Add the transient to redirect.
+    Give_Cache::set('_give_activation_redirect', true, 30, true);
 }
 
 /**
@@ -192,26 +188,23 @@ function give_run_install() {
  *
  * @since      1.3.5
  *
- * @param  int    $blog_id The Blog ID created.
- * @param  int    $user_id The User ID set as the admin.
- * @param  string $domain  The URL.
- * @param  string $path    Site Path.
- * @param  int    $site_id The Site ID.
- * @param  array  $meta    Blog Meta.
+ * @param int $blog_id The Blog ID created.
+ * @param int $user_id The User ID set as the admin.
+ * @param string $domain The URL.
+ * @param string $path Site Path.
+ * @param int $site_id The Site ID.
+ * @param array $meta Blog Meta.
  */
-function give_on_create_blog( $blog_id, $user_id, $domain, $path, $site_id, $meta ) {
-
-	if ( is_plugin_active_for_network( GIVE_PLUGIN_BASENAME ) ) {
-
-		switch_to_blog( $blog_id );
-		give_install();
-		restore_current_blog();
-
-	}
-
+function give_on_create_blog($blog_id, $user_id, $domain, $path, $site_id, $meta)
+{
+    if (is_plugin_active_for_network(GIVE_PLUGIN_BASENAME)) {
+        switch_to_blog($blog_id);
+        give_install();
+        restore_current_blog();
+    }
 }
 
-add_action( 'wpmu_new_blog', 'give_on_create_blog', 10, 6 );
+add_action('wpmu_new_blog', 'give_on_create_blog', 10, 6);
 
 
 /**
@@ -219,30 +212,29 @@ function give_on_create_blog( $blog_id, $user_id, $domain, $path, $site_id, $met
  *
  * @since  1.4.3
  *
- * @param  array $tables  The tables to drop.
- * @param  int   $blog_id The Blog ID being deleted.
+ * @param array $tables The tables to drop.
+ * @param int $blog_id The Blog ID being deleted.
  *
  * @return array          The tables to drop.
  */
-function give_wpmu_drop_tables( $tables, $blog_id ) {
-
-	switch_to_blog( $blog_id );
-	$custom_tables = __give_get_tables();
-
-	/* @var Give_DB $table */
-	foreach ( $custom_tables as $table ) {
-		if ( $table->installed() ) {
-			$tables[] = $table->table_name;
-		}
-	}
+function give_wpmu_drop_tables($tables, $blog_id)
+{
+    switch_to_blog($blog_id);
+    $custom_tables = __give_get_tables();
 
-	restore_current_blog();
+    /* @var Give_DB $table */
+    foreach ($custom_tables as $table) {
+        if ($table->installed()) {
+            $tables[] = $table->table_name;
+        }
+    }
 
-	return $tables;
+    restore_current_blog();
 
+    return $tables;
 }
 
-add_filter( 'wpmu_drop_tables', 'give_wpmu_drop_tables', 10, 2 );
+add_filter('wpmu_drop_tables', 'give_wpmu_drop_tables', 10, 2);
 
 /**
  * Post-installation
@@ -252,51 +244,47 @@ function give_wpmu_drop_tables( $tables, $blog_id ) {
  * @since 1.0
  * @return void
  */
-function give_after_install() {
-
-	if ( ! is_admin() ) {
-		return;
-	}
-
-	$give_options     = Give_Cache::get( '_give_installed', true );
-	$give_table_check = get_option( '_give_table_check', false );
-
-	if ( false === $give_table_check || current_time( 'timestamp' ) > $give_table_check ) {
-
-		if ( ! @Give()->donor_meta->installed() ) {
-
-			// Create the donor meta database.
-			// (this ensures it creates it on multisite instances where it is network activated).
-			@Give()->donor_meta->create_table();
-
-		}
-
-		if ( ! @Give()->donors->installed() ) {
-			// Create the donor database.
-			// (this ensures it creates it on multisite instances where it is network activated).
-			@Give()->donors->create_table();
-		}
-
-		/**
-		 * Fires after plugin installation.
-		 *
-		 * @since 1.0
-		 *
-		 * @param array $give_options Give plugin options.
-		 */
-		do_action( 'give_after_install', $give_options );
-
-		update_option( '_give_table_check', ( current_time( 'timestamp' ) + WEEK_IN_SECONDS ), false );
-	}
-
-	// Delete the transient
-	if ( false !== $give_options ) {
-		Give_Cache::delete( Give_Cache::get_key( '_give_installed' ) );
-	}
-
+function give_after_install()
+{
+    if (!is_admin()) {
+        return;
+    }
+
+    $give_options = Give_Cache::get('_give_installed', true);
+    $give_table_check = get_option('_give_table_check', false);
+
+    if (false === $give_table_check || current_time('timestamp') > $give_table_check) {
+        if (!@Give()->donor_meta->installed()) {
+            // Create the donor meta database.
+            // (this ensures it creates it on multisite instances where it is network activated).
+            @Give()->donor_meta->create_table();
+        }
+
+        if (!@Give()->donors->installed()) {
+            // Create the donor database.
+            // (this ensures it creates it on multisite instances where it is network activated).
+            @Give()->donors->create_table();
+        }
+
+        /**
+         * Fires after plugin installation.
+         *
+         * @since 1.0
+         *
+         * @param array $give_options Give plugin options.
+         */
+        do_action('give_after_install', $give_options);
+
+        update_option('_give_table_check', (current_time('timestamp') + WEEK_IN_SECONDS), false);
+    }
+
+    // Delete the transient
+    if (false !== $give_options) {
+        Give_Cache::delete(Give_Cache::get_key('_give_installed'));
+    }
 }
 
-add_action( 'admin_init', 'give_after_install' );
+add_action('admin_init', 'give_after_install');
 
 
 /**
@@ -307,26 +295,23 @@ function give_after_install() {
  * @since 1.0
  * @return void
  */
-function give_install_roles_on_network() {
-
-	global $wp_roles;
-
-	if ( ! is_object( $wp_roles ) ) {
-		return;
-	}
-
-	if ( ! array_key_exists( 'give_manager', $wp_roles->roles ) ) {
-
-		// Create Give plugin roles
-		$roles = new Give_Roles();
-		$roles->add_roles();
-		$roles->add_caps();
-
-	}
-
+function give_install_roles_on_network()
+{
+    global $wp_roles;
+
+    if (!is_object($wp_roles)) {
+        return;
+    }
+
+    if (!array_key_exists('give_manager', $wp_roles->roles)) {
+        // Create Give plugin roles
+        $roles = new Give_Roles();
+        $roles->add_roles();
+        $roles->add_caps();
+    }
 }
 
-add_action( 'admin_init', 'give_install_roles_on_network' );
+add_action('admin_init', 'give_install_roles_on_network');
 
 /**
  * Default core setting values.
@@ -334,88 +319,88 @@ function give_install_roles_on_network() {
  * @since 1.8
  * @return array
  */
-function give_get_default_settings() {
-
-	$options = [
-		// General.
-		'base_country'                                => 'US',
-		'test_mode'                                   => 'enabled',
-		'currency'                                    => 'USD',
-		'currency_position'                           => 'before',
-		'session_lifetime'                            => '604800',
-		'email_access'                                => 'enabled',
-		'thousands_separator'                         => ',',
-		'decimal_separator'                           => '.',
-		'number_decimals'                             => 2,
-		'sequential-ordering_status'                  => 'enabled',
-
-		// Display options.
-		'css'                                         => 'enabled',
-		'floatlabels'                                 => 'disabled',
-		'company_field'                               => 'disabled',
-		'name_title_prefix'                           => 'disabled',
-		'forms_singular'                              => 'enabled',
-		'forms_archives'                              => 'enabled',
-		'forms_excerpt'                               => 'enabled',
-		'form_featured_img'                           => 'enabled',
-		'form_sidebar'                                => 'enabled',
-		'categories'                                  => 'disabled',
-		'tags'                                        => 'disabled',
-		'terms'                                       => 'disabled',
-		'admin_notices'                               => 'enabled',
-		'cache'                                       => 'enabled',
-		'uninstall_on_delete'                         => 'disabled',
-		'the_content_filter'                          => 'enabled',
-		'scripts_footer'                              => 'disabled',
-		'agree_to_terms_label'                        => __( 'Agree to Terms?', 'give' ),
-		'agreement_text'                              => give_get_default_agreement_text(),
-		'babel_polyfill_script'                       => 'enabled',
-
-		// Default is manual gateway.
-		'gateways'                                    => [
-			'manual'  => 1,
-			'offline' => 1,
-		],
-		'default_gateway'                             => 'manual',
-
-		// Offline gateway setup.
-		'global_offline_donation_content'             => give_get_default_offline_donation_content(),
-		'global_offline_donation_email'               => give_get_default_offline_donation_content(),
-
-		// Billing address.
-		'give_offline_donation_enable_billing_fields' => 'disabled',
-
-		// Default donation notification email.
-		'donation_notification'                       => give_get_default_donation_notification_email(),
-
-		// Default email receipt message.
-		'donation_receipt'                            => give_get_default_donation_receipt_email(),
-
-		'donor_default_user_role'                     => 'give_donor',
-		Give()->routeForm->getOptionName()            => 'give',
-
-		// Stripe accounts.
-		'_give_stripe_get_all_accounts'               => [],
-
-		// Onboarding
-		'setup_page_enabled'                          => 'enabled',
-
-		// Advanced settings
-		'usage_tracking'                              => 'disabled',
-	];
-
-	return $options;
+function give_get_default_settings()
+{
+    $options = [
+        // General.
+        'base_country' => 'US',
+        'test_mode' => 'enabled',
+        'currency' => 'USD',
+        'currency_position' => 'before',
+        'session_lifetime' => '604800',
+        'email_access' => 'enabled',
+        'thousands_separator' => ',',
+        'decimal_separator' => '.',
+        'number_decimals' => 2,
+        'sequential-ordering_status' => 'enabled',
+
+        // Display options.
+        'css' => 'enabled',
+        'floatlabels' => 'disabled',
+        'company_field' => 'disabled',
+        'name_title_prefix' => 'disabled',
+        'forms_singular' => 'enabled',
+        'forms_archives' => 'enabled',
+        'forms_excerpt' => 'enabled',
+        'form_featured_img' => 'enabled',
+        'form_sidebar' => 'enabled',
+        'categories' => 'disabled',
+        'tags' => 'disabled',
+        'terms' => 'disabled',
+        'admin_notices' => 'enabled',
+        'cache' => 'enabled',
+        'uninstall_on_delete' => 'disabled',
+        'the_content_filter' => 'enabled',
+        'scripts_footer' => 'disabled',
+        'agree_to_terms_label' => __('Agree to Terms?', 'give'),
+        'agreement_text' => give_get_default_agreement_text(),
+        'babel_polyfill_script' => 'enabled',
+
+        // Default is manual gateway.
+        'gateways' => [
+            'manual' => 1,
+            'offline' => 1,
+        ],
+        'default_gateway' => 'manual',
+
+        // Offline gateway setup.
+        'global_offline_donation_content' => give_get_default_offline_donation_content(),
+        'global_offline_donation_email' => give_get_default_offline_donation_content(),
+
+        // Billing address.
+        'give_offline_donation_enable_billing_fields' => 'disabled',
+
+        // Default donation notification email.
+        'donation_notification' => give_get_default_donation_notification_email(),
+
+        // Default email receipt message.
+        'donation_receipt' => give_get_default_donation_receipt_email(),
+
+        'donor_default_user_role' => 'give_donor',
+        Give()->routeForm->getOptionName() => 'give',
+
+        // Stripe accounts.
+        '_give_stripe_get_all_accounts' => [],
+
+        // Onboarding
+        'setup_page_enabled' => 'enabled',
+
+        // Advanced settings
+        'usage_tracking' => 'disabled',
+    ];
+
+    return $options;
 }
 
 /**
  * Default terms and conditions.
  */
-function give_get_default_agreement_text() {
+function give_get_default_agreement_text()
+{
+    $org_name = get_bloginfo('name');
 
-	$org_name = get_bloginfo( 'name' );
-
-	$agreement = sprintf(
-		'<p>Acceptance of any contribution, gift or grant is at the discretion of the %1$s. The  %1$s will not accept any gift unless it can be used or expended consistently with the purpose and mission of the  %1$s.</p>
+    $agreement = sprintf(
+        '<p>Acceptance of any contribution, gift or grant is at the discretion of the %1$s. The  %1$s will not accept any gift unless it can be used or expended consistently with the purpose and mission of the  %1$s.</p>
 				<p>No irrevocable gift, whether outright or life-income in character, will be accepted if under any reasonable set of circumstances the gift would jeopardize the donor’s financial security.</p>
 				<p>The %1$s will refrain from providing advice about the tax or other treatment of gifts and will encourage donors to seek guidance from their own professional advisers to assist them in the process of making their donation.</p>
 				<p>The %1$s will accept donations of cash or publicly traded securities. Gifts of in-kind services will be accepted at the discretion of the %1$s.</p>
@@ -423,10 +408,10 @@ function give_get_default_agreement_text() {
 				<p>The %1$s will provide acknowledgments to donors meeting tax requirements for property received by the charity as a gift. However, except for gifts of cash and publicly traded securities, no value shall be ascribed to any receipt or other form of substantiation of a gift received by %1$s.</p>
 				<p>The %1$s will respect the intent of the donor relating to gifts for restricted purposes and those relating to the desire to remain anonymous. With respect to anonymous gifts, the %1$s will restrict information about the donor to only those staff members with a need to know.</p>
 				<p>The %1$s will not compensate, whether through commissions, finders\' fees, or other means, any third party for directing a gift or a donor to the %1$s.</p>',
-		$org_name
-	);
+        $org_name
+    );
 
-	return apply_filters( 'give_get_default_agreement_text', $agreement, $org_name );
+    return apply_filters('give_get_default_agreement_text', $agreement, $org_name);
 }
 
 
@@ -437,62 +422,63 @@ function give_get_default_agreement_text() {
  *
  * @return void
  */
-function give_create_pages() {
-
-	// Bailout if pages already created.
-	if ( Give_Cache_Setting::get_option( 'give_install_pages_created' ) ) {
-		return;
-	}
-
-	$options = [];
-
-	// Checks if the Success Page option exists AND that the page exists.
-	if ( ! get_post( give_get_option( 'success_page' ) ) ) {
-
-		// Donation Confirmation (Success) Page
-		$success = wp_insert_post(
-			[
-				'post_title'     => esc_html__( 'Donation Confirmation', 'give' ),
-				'post_content'   => '[give_receipt]',
-				'post_status'    => 'publish',
-				'post_author'    => 1,
-				'post_type'      => 'page',
-				'comment_status' => 'closed',
-			]
-		);
-
-		// Store our page IDs
-		$options['success_page'] = $success;
-	}
-
-	// Checks if the Failure Page option exists AND that the page exists.
-	if ( ! get_post( give_get_option( 'failure_page' ) ) ) {
-
-		// Failed Donation Page
-		$failed = wp_insert_post(
-			[
-				'post_title'     => esc_html__( 'Donation Failed', 'give' ),
-				'post_content'   => esc_html__( 'We\'re sorry, your donation failed to process. Please try again or contact site support.', 'give' ),
-				'post_status'    => 'publish',
-				'post_author'    => 1,
-				'post_type'      => 'page',
-				'comment_status' => 'closed',
-			]
-		);
-
-		$options['failure_page'] = $failed;
-	}
-
-	if ( ! empty( $options ) ) {
-		update_option( 'give_settings', array_merge( give_get_settings(), $options ), false );
-	}
-
-	add_option( 'give_install_pages_created', 1, '', false );
+function give_create_pages()
+{
+    // Bailout if pages already created.
+    if (Give_Cache_Setting::get_option('give_install_pages_created')) {
+        return;
+    }
+
+    $options = [];
+
+    // Checks if the Success Page option exists AND that the page exists.
+    if (!get_post(give_get_option('success_page'))) {
+        // Donation Confirmation (Success) Page
+        $success = wp_insert_post(
+            [
+                'post_title' => esc_html__('Donation Confirmation', 'give'),
+                'post_content' => '[give_receipt]',
+                'post_status' => 'publish',
+                'post_author' => 1,
+                'post_type' => 'page',
+                'comment_status' => 'closed',
+            ]
+        );
+
+        // Store our page IDs
+        $options['success_page'] = $success;
+    }
+
+    // Checks if the Failure Page option exists AND that the page exists.
+    if (!get_post(give_get_option('failure_page'))) {
+        // Failed Donation Page
+        $failed = wp_insert_post(
+            [
+                'post_title' => esc_html__('Donation Failed', 'give'),
+                'post_content' => esc_html__(
+                    'We\'re sorry, your donation failed to process. Please try again or contact site support.',
+                    'give'
+                ),
+                'post_status' => 'publish',
+                'post_author' => 1,
+                'post_type' => 'page',
+                'comment_status' => 'closed',
+            ]
+        );
+
+        $options['failure_page'] = $failed;
+    }
+
+    if (!empty($options)) {
+        update_option('give_settings', array_merge(give_get_settings(), $options), false);
+    }
+
+    add_option('give_install_pages_created', 1, '', false);
 }
 
 // @TODO we can add this hook only when plugin activate instead of every admin page load.
 // @see known issue https://github.com/impress-org/give/issues/1848
-add_action( 'admin_init', 'give_create_pages', - 1 );
+add_action('admin_init', 'give_create_pages', -1);
 
 
 /**
@@ -503,12 +489,13 @@ function give_create_pages() {
  *
  * @param string $old_version
  */
-function give_install_tables_on_plugin_update( $old_version ) {
-	update_option( 'give_version_upgraded_from', $old_version, false );
-	__give_register_tables();
+function give_install_tables_on_plugin_update($old_version)
+{
+    update_option('give_version_upgraded_from', $old_version, false);
+    __give_register_tables();
 }
 
-add_action( 'update_option_give_version', 'give_install_tables_on_plugin_update', 0, 2 );
+add_action('update_option_give_version', 'give_install_tables_on_plugin_update', 0, 2);
 
 
 /**
@@ -518,34 +505,40 @@ function give_install_tables_on_plugin_update( $old_version ) {
  *
  * @sice 2.3.1
  */
-function __give_get_tables() {
-	$tables = [
-		'donors_db'       => new Give_DB_Donors(),
-		'donor_meta_db'   => new Give_DB_Donor_Meta(),
-		'comment_db'      => new Give_DB_Comments(),
-		'comment_db_meta' => new Give_DB_Comment_Meta(),
-		'give_session'    => new Give_DB_Sessions(),
-		'formmeta_db'     => new Give_DB_Form_Meta(),
-		'sequential_db'   => new Give_DB_Sequential_Ordering(),
-		'donation_meta'   => new Give_DB_Payment_Meta(),
-	];
-
-	return $tables;
+function __give_get_tables()
+{
+    $tables = [
+        'donors_db' => new Give_DB_Donors(),
+        'donor_meta_db' => new Give_DB_Donor_Meta(),
+        'comment_db' => new Give_DB_Comments(),
+        'comment_db_meta' => new Give_DB_Comment_Meta(),
+        'give_session' => new Give_DB_Sessions(),
+        'formmeta_db' => new Give_DB_Form_Meta(),
+        'sequential_db' => new Give_DB_Sequential_Ordering(),
+        'donation_meta' => new Give_DB_Payment_Meta(),
+    ];
+
+    return $tables;
 }
 
 /**
  * Register classes
  * Note: only for internal purpose use
  *
- * @sice 2.3.1
+ * @unreleased Install migration table on fresh install because this table is required to run migrations.
+ * @since 2.3.1
+ * @throws DatabaseMigrationException
  */
-function __give_register_tables() {
-	$tables = __give_get_tables();
-
-	/* @var Give_DB $table */
-	foreach ( $tables  as $table ) {
-		if ( ! $table->installed() ) {
-			$table->register_table();
-		}
-	}
+function __give_register_tables()
+{
+    $tables = __give_get_tables();
+
+    /* @var Give_DB $table */
+    foreach ($tables as $table) {
+        if (!$table->installed()) {
+            $table->register_table();
+        }
+    }
+
+    give(CreateMigrationsTable::class)->run();
 }
diff --git a/src/MigrationLog/Migrations/CreateMigrationsTable.php b/src/MigrationLog/Migrations/CreateMigrationsTable.php
index d88feb1c13..cf78a5b731 100644
--- a/src/MigrationLog/Migrations/CreateMigrationsTable.php
+++ b/src/MigrationLog/Migrations/CreateMigrationsTable.php
@@ -43,14 +43,16 @@ public static function timestamp()
         return strtotime('1970-01-01 00:00');
     }
 
+    /**
+     * @unreleased Add Check whether table installed before adding it to database.
+     * @throws DatabaseMigrationException
+     */
     public function run()
     {
-        global $wpdb;
-
-        $table = "{$wpdb->prefix}give_migrations";
+        $table = DB::prefix('give_migrations');
         $charset = DB::get_charset_collate();
 
-        $sql = "CREATE TABLE {$table} (
+        $sql = "CREATE TABLE IF NOT EXISTS {$table} (
 			id VARCHAR(180) NOT NULL,
 			status VARCHAR(16) NOT NULL,
 			error text NULL,

From 64b04c07ae2b183afa1ad8447faded3538fc9f1e Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@impress.org>
Date: Wed, 11 May 2022 16:05:07 -0700
Subject: [PATCH 02/53] chore: correct release date

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index b9b140ec24..8b8f1805d3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -250,7 +250,7 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 8. GiveWP has a dedicated support team to help answer any questions you may have and help you through stumbling blocks.
 
 == Changelog ==
-= 2.20.0: April 27th, 2022 =
+= 2.20.0: May 11th, 2022 =
 * New: Refreshed the donor and donation list screens in the admin
 * New: Significant improvements to the donor wall and form grid blocks
 * Enhancement: Optimized deleting a donation and all of its meta

From 6b97f434b47be473e8bb5ae1bb87254d329d59aa Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Thu, 12 May 2022 10:19:27 +0530
Subject: [PATCH 03/53] tests: make mock class function compatible with parent
 class

---
 .../Traits/HasRouteMethodTest.php                | 16 ++++++++--------
 .../PaymentGatewaysRegisterTest.php              | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/unit/tests/Framework/PaymentGateways/Traits/HasRouteMethodTest.php b/tests/unit/tests/Framework/PaymentGateways/Traits/HasRouteMethodTest.php
index 75a9e922ef..3b2b51b05c 100644
--- a/tests/unit/tests/Framework/PaymentGateways/Traits/HasRouteMethodTest.php
+++ b/tests/unit/tests/Framework/PaymentGateways/Traits/HasRouteMethodTest.php
@@ -72,32 +72,32 @@ class GatewayRouteTestGateway extends PaymentGateway
 {
     public $routeMethods = ['gatewaySimpleRouteMethod'];
 
-    protected function gatewaySimpleRouteMethod($queryParams)
+    protected function gatewaySimpleRouteMethod($queryParams): string
     {
         return __CLASS__ . __FUNCTION__;
     }
 
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup($formId, $args): string
     {
         return '';
     }
 
-    public static function id()
+    public static function id(): string
     {
         return 'GatewayRouteTestGateway';
     }
 
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
 
-    public function getName()
+    public function getName(): string
     {
         return self::id();
     }
 
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return self::id();
     }
@@ -128,12 +128,12 @@ public function createSubscription(
     ) {
     }
 
-    protected function handleSimpleRoute($queryParams)
+    protected function handleSimpleRoute($queryParams): string
     {
         return __CLASS__ . __FUNCTION__;
     }
 
-    protected function handleSecureRoute($queryParams)
+    protected function handleSecureRoute($queryParams): string
     {
         return __CLASS__ . __FUNCTION__;
     }
diff --git a/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php b/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
index d7b3c8d8f3..965fff7f5c 100644
--- a/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
+++ b/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
@@ -93,7 +93,7 @@ class MockStripe extends PaymentGateway
     /**
      * @return string
      */
-    public static function id()
+    public static function id(): string
     {
         return 'mock-stripe';
     }
@@ -101,7 +101,7 @@ public static function id()
     /**
      * @inheritDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -109,7 +109,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return 'Stripe Payment Method';
     }
@@ -117,7 +117,7 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return 'Credit Card';
     }
@@ -146,7 +146,7 @@ class MockPaypal extends PaymentGateway
     /**
      * @return string
      */
-    public static function id()
+    public static function id(): string
     {
         return 'mock-paypal';
     }
@@ -154,7 +154,7 @@ public static function id()
     /**
      * @inheritDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -162,7 +162,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return 'PayPal Payment Method';
     }
@@ -170,7 +170,7 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return 'PayPal';
     }

From 58b4bde978befb91a4c04585c0f857fb7bacb22c Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Thu, 12 May 2022 21:39:08 +0530
Subject: [PATCH 04/53] fix: show migration and log table in system info
 (#6412)

---
 .../tools/views/html-admin-page-system-info.php  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/includes/admin/tools/views/html-admin-page-system-info.php b/includes/admin/tools/views/html-admin-page-system-info.php
index 9c5590acff..42d40769e0 100644
--- a/includes/admin/tools/views/html-admin-page-system-info.php
+++ b/includes/admin/tools/views/html-admin-page-system-info.php
@@ -565,6 +565,22 @@ class="dashicons dashicons-external"></span></a>
 				Table::prefixTableName( 'give_revenue' )
 			);
 
+            $isMigrationTableExist = Table::tableExists(Table::prefixTableName('give_migrations'));
+            $db_table_list .= sprintf(
+                '<li><mark class="%1$s"><span class="dashicons dashicons-%2$s"></mark> %3$s</li>',
+                $isMigrationTableExist ? 'yes' : 'error',
+                $isMigrationTableExist ? 'yes' : 'no-alt',
+                Table::prefixTableName('give_migrations')
+            );
+
+            $isLogTableExist = Table::tableExists(Table::prefixTableName('give_log'));
+            $db_table_list .= sprintf(
+                '<li><mark class="%1$s"><span class="dashicons dashicons-%2$s"></mark> %3$s</li>',
+                $isLogTableExist ? 'yes' : 'error',
+                $isLogTableExist ? 'yes' : 'no-alt',
+                Table::prefixTableName('give_log')
+            );
+
 			echo "<ul>{$db_table_list}</ul>";
 			?>
 		</td>

From 307bc184a5a99885e7f2f109355c7b2981d1d83b Mon Sep 17 00:00:00 2001
From: Taylor Waldon <103544411+taylorfromteamgive@users.noreply.github.com>
Date: Thu, 12 May 2022 11:48:47 -0700
Subject: [PATCH 05/53] Chore: Add Venmo to Readme (#6414)

---
 readme.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 8b8f1805d3..18bc121d77 100644
--- a/readme.txt
+++ b/readme.txt
@@ -83,12 +83,13 @@ For new users, we suggest reviewing our [Getting Started Guide](https://go.givew
 
 If you are a GiveWP customer with an active license of any of our popular add-ons, we'd love to hear from you and support you via our [Priority Support channel](https://go.givewp.com/support).
 
-=== 💳 Accept Credit Card Donations ===
+=== 💳 Accept Credit Card Donations and More ===
 
 GiveWP comes with several payment gateway options:
 
 * **Stripe Donations** -- Our Stripe integration allows you to accept credit card donations on your website. There is a small 2% fee associated with these donations. Want no additional fees? Upgrade to our Stripe Premium add-on to start accepting [Stripe Donations]](https://go.givewp.com/addon-stripe).
 * **PayPal Donations** -- Allow worldwide donations with PayPal Donations. No additional fees applied.
+* **Venmo Donations** -- Give donors the option to pay through Venmo with their account balance or connected bank account. 
 * **Offline Donations** -- Enable your donors to send checks or physical donations with an offline gateway with instructions.
 * **Test Gateway** -- use the Test Gateway to see exactly how your donors will walk through the donation process.
 * **And many more Gateways** - View additional payment gateways on our website. These include Authorize.net, Bitpay, Square, Razorpay, Paytm, and more.

From b19fce14cd792f412075f7631838b78ee4dc68c4 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@givewp.com>
Date: Fri, 13 May 2022 09:06:45 -0700
Subject: [PATCH 06/53] Improvement: update DatabaseQueryException to log when
 uncaught (#6416)

---
 src/Framework/Database/DB.php                 |  2 +-
 .../Exceptions/DatabaseQueryException.php     | 50 +++++--------------
 .../Contracts/LoggableException.php           |  8 +--
 src/Framework/Exceptions/Traits/Loggable.php  |  8 +--
 src/Revenue/Repositories/Revenue.php          | 23 ++-------
 .../UncaughtExceptionLoggerTest.php           |  4 +-
 6 files changed, 25 insertions(+), 70 deletions(-)

diff --git a/src/Framework/Database/DB.php b/src/Framework/Database/DB.php
index 15ba26f919..d24c1da72e 100644
--- a/src/Framework/Database/DB.php
+++ b/src/Framework/Database/DB.php
@@ -239,7 +239,7 @@ private static function runQueryWithErrorChecking($queryCaller)
         $wpError = self::getQueryErrors($errorCount);
 
         if (!empty($wpError->errors)) {
-            throw DatabaseQueryException::create($wpError->get_error_messages());
+            throw new DatabaseQueryException('Query Exception', $wpError->errors);
         }
 
         return $output;
diff --git a/src/Framework/Database/Exceptions/DatabaseQueryException.php b/src/Framework/Database/Exceptions/DatabaseQueryException.php
index 633a1ac7df..be011c39af 100644
--- a/src/Framework/Database/Exceptions/DatabaseQueryException.php
+++ b/src/Framework/Database/Exceptions/DatabaseQueryException.php
@@ -2,7 +2,8 @@
 
 namespace Give\Framework\Database\Exceptions;
 
-use Exception;
+use Give\Framework\Exceptions\Primitives\Exception;
+use Throwable;
 
 /**
  * Class DatabaseQueryException
@@ -10,6 +11,7 @@
  * An exception for when errors occurred within the database while performing a query, which stores the SQL errors the
  * database returned
  *
+ * @unreleased Use the GiveWP exception class
  * @since 2.9.2
  */
 class DatabaseQueryException extends Exception
@@ -19,24 +21,11 @@ class DatabaseQueryException extends Exception
      */
     private $queryErrors;
 
-    /**
-     * Creates a new instance wih the query errors
-     *
-     * @since 2.9.2
-     *
-     * @param string|string[] $queryErrors
-     * @param string|null     $message
-     *
-     * @return DatabaseQueryException
-     */
-    public static function create($queryErrors, $message = null)
+    public function __construct(string $message, array $queryErrors, $code = 0, Throwable $previous = null)
     {
-        $error = new self();
+        $this->queryErrors = $queryErrors;
 
-        $error->message = $message ?: 'Query failed in database';
-        $error->queryErrors = (array)$queryErrors;
-
-        return $error;
+        parent::__construct($message, $code, $previous);
     }
 
     /**
@@ -46,32 +35,19 @@ public static function create($queryErrors, $message = null)
      *
      * @return string[]
      */
-    public function getQueryErrors()
+    public function getQueryErrors(): array
     {
         return $this->queryErrors;
     }
 
     /**
-     * Returns a human readable form of the exception for logging
-     *
-     * @since 2.9.2
-     *
-     * @return string
+     * @inheritDoc
      */
-    public function getLogOutput()
+    public function getLogContext(): array
     {
-        $queryErrors = array_map(
-            function ($error) {
-                return " - {$error}";
-            },
-            $this->queryErrors
-        );
-
-        return "
-			Code: {$this->getCode()}\n
-			Message: {$this->getMessage()}\n
-			DB Errors: \n
-			{$queryErrors}
-		";
+        return [
+            'category' => 'Uncaught database exception',
+            'Query Errors' => $this->queryErrors,
+        ];
     }
 }
diff --git a/src/Framework/Exceptions/Contracts/LoggableException.php b/src/Framework/Exceptions/Contracts/LoggableException.php
index 6a618138fe..ee25edf9ab 100644
--- a/src/Framework/Exceptions/Contracts/LoggableException.php
+++ b/src/Framework/Exceptions/Contracts/LoggableException.php
@@ -8,17 +8,13 @@ interface LoggableException
      * Returns the human-readable message for the log
      *
      * @since 2.11.1
-     *
-     * @return string
      */
-    public function getLogMessage();
+    public function getLogMessage(): string;
 
     /**
      * Returns an associated array with additional context for the log
      *
      * @since 2.11.1
-     *
-     * @return array
      */
-    public function getLogContext();
+    public function getLogContext(): array;
 }
diff --git a/src/Framework/Exceptions/Traits/Loggable.php b/src/Framework/Exceptions/Traits/Loggable.php
index 8f2b22de13..3f14882dfa 100644
--- a/src/Framework/Exceptions/Traits/Loggable.php
+++ b/src/Framework/Exceptions/Traits/Loggable.php
@@ -8,8 +8,6 @@ trait Loggable
      * Gets the Exception::getMessage() method
      *
      * @since 2.11.1
-     *
-     * @return string
      */
     abstract public function getMessage();
 
@@ -17,10 +15,8 @@ abstract public function getMessage();
      * Returns the human-readable log message
      *
      * @since 2.11.1
-     *
-     * @return string
      */
-    public function getLogMessage()
+    public function getLogMessage(): string
     {
         return $this->getMessage();
     }
@@ -32,7 +28,7 @@ public function getLogMessage()
      *
      * @return array
      */
-    public function getLogContext()
+    public function getLogContext(): array
     {
         return [
             'category' => 'Uncaught Exception',
diff --git a/src/Revenue/Repositories/Revenue.php b/src/Revenue/Repositories/Revenue.php
index 5d00b5bbed..c8f691d11b 100644
--- a/src/Revenue/Repositories/Revenue.php
+++ b/src/Revenue/Repositories/Revenue.php
@@ -3,7 +3,6 @@
 namespace Give\Revenue\Repositories;
 
 use Give\Framework\Database\DB;
-use Give\Framework\Database\Exceptions\DatabaseQueryException;
 use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
 
 /**
@@ -52,28 +51,16 @@ public function insert($revenueData)
      * @param $revenueId
      *
      * @return false|int
-     * @throws DatabaseQueryException
      */
     public function deleteByDonationId($revenueId)
     {
         global $wpdb;
 
-        try {
-            return DB::delete(
-                $wpdb->give_revenue,
-                ['donation_id' => $revenueId],
-                ['%d']
-            );
-        } catch (DatabaseQueryException $exception) {
-            give_record_log(
-                'Revenue delete by donation failed',
-                $exception->getLogOutput(),
-                0,
-                'database'
-            );
-
-            throw $exception;
-        }
+        return DB::delete(
+            $wpdb->give_revenue,
+            ['donation_id' => $revenueId],
+            ['%d']
+        );
     }
 
     /**
diff --git a/tests/unit/tests/Framework/Exceptions/UncaughtExceptionLoggerTest.php b/tests/unit/tests/Framework/Exceptions/UncaughtExceptionLoggerTest.php
index 7cc695eb06..bcc328c2da 100644
--- a/tests/unit/tests/Framework/Exceptions/UncaughtExceptionLoggerTest.php
+++ b/tests/unit/tests/Framework/Exceptions/UncaughtExceptionLoggerTest.php
@@ -27,11 +27,11 @@ public function testShouldLogException()
 }
 
 class ExceptionLogged extends Exception implements LoggableException {
-	public function getLogMessage() {
+	public function getLogMessage(): string {
 		return '';
 	}
 
-	public function getLogContext() {
+	public function getLogContext(): array {
 		return [];
 	}
 }

From ab405f99f57b8b7dee34e4f30b2bb4a891174bbc Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 13 May 2022 21:53:48 +0530
Subject: [PATCH 07/53] Log does not generate PHP warnings (#6411)

* fix: use array_diff_key to prevent php wanring

* doc: add unreleased tag
---
 src/Log/Log.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Log/Log.php b/src/Log/Log.php
index 60f209b1f6..aad9c9a9b9 100644
--- a/src/Log/Log.php
+++ b/src/Log/Log.php
@@ -11,6 +11,7 @@
  *
  * The static facade intended to be the primary way of logging within GiveWP to make life easier.
  *
+ * @unreleased Use array_diff_key to filter context data to prevent php wanring with multi-dimesion array
  * @since 2.20.0 add sensitive information redaction; store context as arrays for JSON serialization
  * @since 2.19.6 added debug
  * @since 2.10.0
@@ -82,7 +83,7 @@ function ($key) {
             );
 
             // Additional context
-            $data['context'] = array_diff(
+            $data['context'] = array_diff_key(
                 $context,
                 $data
             );

From 72ca6dbb19e085b076778ae477ed8d55a8793bfd Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jon@impress.org>
Date: Fri, 13 May 2022 14:34:52 -0400
Subject: [PATCH 08/53] Enhancement: Gateway api now uses models (#6306)

Co-authored-by: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
Co-authored-by: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
---
 includes/donors/actions.php                   |  11 +-
 includes/forms/functions.php                  |   2 +-
 .../DataTransferObjects/DonationQueryData.php |   2 +-
 .../Factories/DonationNoteFactory.php         |  21 ++
 src/Donations/Models/Donation.php             |  52 ++---
 src/Donations/Models/DonationNote.php         | 141 ++++++++++++
 .../Repositories/DonationNotesRepository.php  | 207 +++++++++++++++++
 .../Repositories/DonationRepository.php       |  60 +++--
 src/Donations/ServiceProvider.php             |   2 +
 src/Donors/Models/Donor.php                   |  40 ++--
 src/Donors/Repositories/DonorRepository.php   |   2 +-
 .../LegacyPaymentGatewayInterface.php         |   4 +-
 src/Framework/Models/Model.php                |   2 +-
 .../Actions/GenerateGatewayRouteUrl.php       |   2 +-
 .../PaymentAbandonedHandler.php               |   7 +-
 .../PaymentCompleteHandler.php                |   7 +-
 .../CommandHandlers/PaymentHandler.php        |  37 +--
 .../PaymentProcessingHandler.php              |   5 +-
 .../PaymentRefundedHandler.php                |   7 +-
 .../RedirectOffsiteHandler.php                |   5 +-
 .../RespondToBrowserHandler.php               |   5 +-
 .../SubscriptionCompleteHandler.php           |  64 ++----
 .../Commands/PaymentCommand.php               |  10 +-
 .../Commands/RedirectOffsite.php              |   4 +-
 .../Commands/RespondToBrowser.php             |   4 +-
 .../Commands/SubscriptionComplete.php         |   5 +-
 .../Contracts/PaymentGatewayInterface.php     |  21 +-
 .../Contracts/SubscriptionModuleInterface.php |  26 +--
 .../PaymentGateways/DonationSummary.php       |  55 ++---
 .../PaymentGateways/PaymentGateway.php        | 100 +++-----
 .../PaymentGateways/SubscriptionModule.php    |   6 +-
 .../Adapters/LegacyPaymentGatewayAdapter.php  | 164 +++++++++-----
 .../LegacyDonationData.php                    |  61 -----
 .../includes/give-recurring-cache.php         |   1 -
 .../includes/give-subscriptions-db.php        | 105 +++++----
 .../Actions/RegisterPaymentGateways.php       |   5 +-
 .../DataTransferObjects/FormData.php          |  80 ++-----
 .../GatewayPaymentData.php                    | 100 --------
 .../GatewaySubscriptionData.php               |  48 ----
 .../DataTransferObjects/SubscriptionData.php  |  18 +-
 .../CreatePayPalStandardPaymentURL.php        |  59 ++---
 .../PayPalStandard/PayPalStandard.php         |  46 ++--
 .../Views/PayPalStandardBillingFields.php     |   4 +-
 .../Stripe/Actions/CreateCheckoutSession.php  |  37 +--
 .../Stripe/Actions/CreatePaymentIntent.php    |  67 +++---
 .../Actions/GetOrCreateStripeCustomer.php     |  39 ++--
 .../Actions/GetPaymentMethodFromRequest.php   |  22 +-
 .../Stripe/Actions/SaveDonationSummary.php    |  13 +-
 .../Gateways/Stripe/BECSGateway.php           |  26 +--
 .../Gateways/Stripe/CheckoutGateway.php       |  50 ++--
 .../Gateways/Stripe/CreditCardGateway.php     |  26 +--
 .../Gateways/Stripe/SEPAGateway.php           |  53 +++--
 .../Traits/HandlePaymentIntentStatus.php      |  10 +-
 .../Stripe/Traits/SEPAMandateForm.php         |  53 +++--
 .../Gateways/TestGateway/TestGateway.php      |  18 +-
 .../TestGateway/TestGatewayOffsite.php        |  66 +++---
 .../PayPalCommerce/PayPalCommerce.php         |  22 +-
 src/Subscriptions/Models/Subscription.php     |  21 +-
 .../Repositories/SubscriptionRepository.php   |  10 +-
 .../tests/Donations/Models/TestDonation.php   |  65 ++++--
 .../Donations/Models/TestDonationNote.php     |  75 ++++++
 .../TestDonationNoteRepository.php            | 213 ++++++++++++++++++
 .../TestDonationRepository.php                |   2 +-
 .../PaymentGateways/DonationSummaryTest.php   |  74 +++---
 .../Traits/HasRouteMethodTest.php             |  13 +-
 .../Gateways/Stripe/CreditCardGatewayTest.php |  74 +++---
 .../PaymentGatewaysRegisterTest.php           |   8 +-
 67 files changed, 1527 insertions(+), 1137 deletions(-)
 create mode 100644 src/Donations/Factories/DonationNoteFactory.php
 create mode 100644 src/Donations/Models/DonationNote.php
 create mode 100644 src/Donations/Repositories/DonationNotesRepository.php
 delete mode 100644 src/LegacyPaymentGateways/DataTransferObjects/LegacyDonationData.php
 delete mode 100644 src/PaymentGateways/DataTransferObjects/GatewayPaymentData.php
 delete mode 100644 src/PaymentGateways/DataTransferObjects/GatewaySubscriptionData.php
 create mode 100644 tests/unit/tests/Donations/Models/TestDonationNote.php
 create mode 100644 tests/unit/tests/Donations/Repositories/TestDonationNoteRepository.php
 rename tests/unit/tests/Donations/{ => Repositories}/TestDonationRepository.php (99%)

diff --git a/includes/donors/actions.php b/includes/donors/actions.php
index f7ae70e672..336d78047c 100644
--- a/includes/donors/actions.php
+++ b/includes/donors/actions.php
@@ -2,16 +2,13 @@
 /**
  * Insert donor comment to donation.
  *
+ * @unreleased remove anonymous
  * @since 2.2.0
  *
- * @param int   $donation_id
- * @param array $donation_data
+ * @param  int  $donation_id
+ * @param  array  $donation_data
  */
 function __give_insert_donor_donation_comment( $donation_id, $donation_data ) {
-	$is_anonymous_donation = isset( $_POST['give_anonymous_donation'] )
-		? absint( $_POST['give_anonymous_donation'] )
-		: 0;
-
 	if ( ! empty( $_POST['give_comment'] ) ) {
 		$comment_meta = array( 'author_email' => $donation_data['user_info']['email'] );
 
@@ -27,8 +24,6 @@ function __give_insert_donor_donation_comment( $donation_id, $donation_data ) {
 			$comment_meta
 		);
 	}
-
-	give_update_meta( $donation_id, '_give_anonymous_donation', $is_anonymous_donation );
 }
 
 add_action( 'give_insert_payment', '__give_insert_donor_donation_comment', 10, 2 );
diff --git a/includes/forms/functions.php b/includes/forms/functions.php
index 8898691aaa..ad37186ba1 100644
--- a/includes/forms/functions.php
+++ b/includes/forms/functions.php
@@ -616,7 +616,7 @@ function give_get_price_option_name( $form_id = 0, $price_id = 0, $payment_id =
 	$prices     = give_get_variable_prices( $form_id );
 	$price_name = '';
 
-	if ( false === $prices ) {
+	if ( ! $prices ) {
 		return $price_name;
 	}
 
diff --git a/src/Donations/DataTransferObjects/DonationQueryData.php b/src/Donations/DataTransferObjects/DonationQueryData.php
index 3b38bdf76d..7498ee59fa 100644
--- a/src/Donations/DataTransferObjects/DonationQueryData.php
+++ b/src/Donations/DataTransferObjects/DonationQueryData.php
@@ -156,7 +156,7 @@ public static function fromObject($donationQueryObject)
         $self->purchaseKey = $donationQueryObject->{DonationMetaKeys::PURCHASE_KEY()->getKeyAsCamelCase()};
         $self->donorIp = $donationQueryObject->{DonationMetaKeys::DONOR_IP()->getKeyAsCamelCase()};
         $self->anonymous = (bool)$donationQueryObject->{DonationMetaKeys::ANONYMOUS()->getKeyAsCamelCase()};
-        $self->levelId = (int)$donationQueryObject->{DonationMetaKeys::LEVEL_ID()->getKeyAsCamelCase()};
+        $self->levelId = (string)$donationQueryObject->{DonationMetaKeys::LEVEL_ID()->getKeyAsCamelCase()};
         $self->gatewayTransactionId = $donationQueryObject->{DonationMetaKeys::GATEWAY_TRANSACTION_ID()
             ->getKeyAsCamelCase()};
 
diff --git a/src/Donations/Factories/DonationNoteFactory.php b/src/Donations/Factories/DonationNoteFactory.php
new file mode 100644
index 0000000000..3f8880d566
--- /dev/null
+++ b/src/Donations/Factories/DonationNoteFactory.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Give\Donations\Factories;
+
+use Give\Framework\Models\Factories\ModelFactory;
+
+class DonationNoteFactory extends ModelFactory
+{
+    /**
+     * @unreleased
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'donationId' => 1,
+            'content' => $this->faker->text
+        ];
+    }
+}
diff --git a/src/Donations/Models/Donation.php b/src/Donations/Models/Donation.php
index 247ecd88a5..0f698162c1 100644
--- a/src/Donations/Models/Donation.php
+++ b/src/Donations/Models/Donation.php
@@ -3,13 +3,13 @@
 namespace Give\Donations\Models;
 
 use DateTime;
-use Exception;
 use Give\Donations\DataTransferObjects\DonationQueryData;
 use Give\Donations\Factories\DonationFactory;
 use Give\Donations\Properties\BillingAddress;
 use Give\Donations\ValueObjects\DonationMode;
 use Give\Donations\ValueObjects\DonationStatus;
 use Give\Donors\Models\Donor;
+use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
 use Give\Framework\Models\Contracts\ModelCrud;
 use Give\Framework\Models\Contracts\ModelHasFactory;
@@ -47,10 +47,11 @@
  * @property string $purchaseKey
  * @property string $donorIp
  * @property bool $anonymous
- * @property int $levelId
+ * @property string $levelId
  * @property string $gatewayTransactionId
  * @property Donor $donor
  * @property Subscription $subscription
+ * @property DonationNote[] $notes
  */
 class Donation extends Model implements ModelCrud, ModelHasFactory
 {
@@ -79,7 +80,7 @@ class Donation extends Model implements ModelCrud, ModelHasFactory
         'subscriptionId' => ['int', 0],
         'billingAddress' => BillingAddress::class,
         'anonymous' => ['bool', false],
-        'levelId' => ['int', 0],
+        'levelId' => ['string', ''],
         'gatewayTransactionId' => 'string',
     ];
 
@@ -89,6 +90,7 @@ class Donation extends Model implements ModelCrud, ModelHasFactory
     protected $relationships = [
         'donor' => Relationship::BELONGS_TO,
         'subscription' => Relationship::BELONGS_TO,
+        'notes' => Relationship::HAS_MANY,
     ];
 
     /**
@@ -100,7 +102,7 @@ class Donation extends Model implements ModelCrud, ModelHasFactory
      *
      * @return Donation
      */
-    public static function find($id)
+    public static function find($id): Donation
     {
         return give()->donations->getById($id);
     }
@@ -109,13 +111,9 @@ public static function find($id)
      * @since 2.20.0 return mutated model instance
      * @since 2.19.6
      *
-     * @param array $attributes
-     *
-     * @return Donation
-     *
      * @throws Exception|InvalidArgumentException
      */
-    public static function create(array $attributes)
+    public static function create(array $attributes): Donation
     {
         $donation = new static($attributes);
 
@@ -144,11 +142,9 @@ public function save()
     /**
      * @since 2.19.6
      *
-     * @return bool
-     *
      * @throws Exception|InvalidArgumentException
      */
-    public function delete()
+    public function delete(): bool
     {
         return give()->donations->delete($this);
     }
@@ -158,7 +154,7 @@ public function delete()
      *
      * @return ModelQueryBuilder<Donor>
      */
-    public function donor()
+    public function donor(): ModelQueryBuilder
     {
         return give()->donors->queryById($this->donorId);
     }
@@ -168,7 +164,7 @@ public function donor()
      *
      * @return ModelQueryBuilder<Subscription>
      */
-    public function subscription()
+    public function subscription(): ModelQueryBuilder
     {
         if ($this->subscriptionId) {
             return give()->subscriptions->queryById($this->subscriptionId);
@@ -190,21 +186,19 @@ public function getSequentialId()
     /**
      * @since 2.19.6
      *
-     * @return object[]
+     * @return ModelQueryBuilder<DonationNote>
      */
-    public function getNotes()
+    public function notes(): ModelQueryBuilder
     {
-        return give()->donations->getNotesByDonationId($this->id);
+        return give()->donations->notes->queryByDonationId($this->id);
     }
 
     /**
      * Returns the amount charged in the currency the GiveWP site is set to
      *
      * @since 2.20.0
-     *
-     * @return Money
      */
-    public function amountInBaseCurrency()
+    public function amountInBaseCurrency(): Money
     {
         return $this->amount->inBaseCurrency($this->exchangeRate);
     }
@@ -214,10 +208,8 @@ public function amountInBaseCurrency()
      * donor paid $100, but the donation was charged $105 with a $5 fee, this method will return $100.
      *
      * @since 2.20.0
-     *
-     * @return Money
      */
-    public function intendedAmount()
+    public function intendedAmount(): Money
     {
         return $this->feeAmountRecovered === null
             ? $this->amount
@@ -228,10 +220,8 @@ public function intendedAmount()
      * Returns the amount intended in the currency the GiveWP site is set to
      *
      * @since 2.20.0
-     *
-     * @return Money
      */
-    public function intendedAmountInBaseCurrency()
+    public function intendedAmountInBaseCurrency(): Money
     {
         return $this->intendedAmount()->inBaseCurrency($this->exchangeRate);
     }
@@ -251,7 +241,7 @@ public function gateway(): PaymentGateway
      *
      * @inheritDoc
      */
-    protected function getPropertyDefaults()
+    protected function getPropertyDefaults(): array
     {
         return array_merge(parent::getPropertyDefaults(), [
             'mode' => give_is_test_mode() ? DonationMode::TEST() : DonationMode::LIVE(),
@@ -265,7 +255,7 @@ protected function getPropertyDefaults()
      *
      * @return ModelQueryBuilder<Donation>
      */
-    public static function query()
+    public static function query(): ModelQueryBuilder
     {
         return give()->donations->prepareQuery();
     }
@@ -274,10 +264,8 @@ public static function query()
      * @since 2.19.6
      *
      * @param object $object
-     *
-     * @return Donation
      */
-    public static function fromQueryBuilderObject($object)
+    public static function fromQueryBuilderObject($object): Donation
     {
         return DonationQueryData::fromObject($object)->toDonation();
     }
@@ -285,7 +273,7 @@ public static function fromQueryBuilderObject($object)
     /**
      * @return DonationFactory<Donation>
      */
-    public static function factory()
+    public static function factory(): DonationFactory
     {
         return new DonationFactory(static::class);
     }
diff --git a/src/Donations/Models/DonationNote.php b/src/Donations/Models/DonationNote.php
new file mode 100644
index 0000000000..68e2de5299
--- /dev/null
+++ b/src/Donations/Models/DonationNote.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Give\Donations\Models;
+
+use DateTime;
+use Give\Donations\Factories\DonationNoteFactory;
+use Give\Framework\Exceptions\Primitives\Exception;
+use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
+use Give\Framework\Models\Contracts\ModelCrud;
+use Give\Framework\Models\Contracts\ModelHasFactory;
+use Give\Framework\Models\Model;
+use Give\Framework\Models\ModelQueryBuilder;
+use Give\Framework\Models\ValueObjects\Relationship;
+use Give\Framework\Support\Facades\DateTime\Temporal;
+
+/**
+ * @unreleased
+ *
+ * @property int $id
+ * @property int $donationId
+ * @property string $content
+ * @property DateTime $createdAt
+ * @property Donation $donation
+ */
+class DonationNote extends Model implements ModelCrud, ModelHasFactory
+{
+    /**
+     * @inheritdoc
+     */
+    protected $properties = [
+        'id' => 'int',
+        'donationId' => 'int',
+        'content' => 'string',
+        'createdAt' => DateTime::class,
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    protected $relationships = [
+        'donation' => Relationship::BELONGS_TO,
+    ];
+
+    /**
+     * @unreleased
+     *
+     * @param  int  $id
+     *
+     * @return DonationNote
+     */
+    public static function find($id): DonationNote
+    {
+        return give()->donations->notes->getById($id);
+    }
+
+
+    /**
+     * @unreleased
+     *
+     * @param  array  $attributes
+     *
+     * @return $this
+     * @throws Exception|InvalidArgumentException
+     */
+    public static function create(array $attributes): DonationNote
+    {
+        $donationNote = new static($attributes);
+
+        give()->donations->notes->insert($donationNote);
+
+        return $donationNote;
+    }
+
+    /**
+     * @unreleased
+     *
+     * @throws Exception|InvalidArgumentException
+     */
+    public function save()
+    {
+        if (!$this->id) {
+            give()->donations->notes->insert($this);
+        } else{
+            give()->donations->notes->update($this);
+        }
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return bool
+     *
+     * @throws Exception|InvalidArgumentException
+     */
+    public function delete()
+    {
+        return give()->donations->notes->delete($this);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return ModelQueryBuilder
+     */
+    public static function query()
+    {
+        return give()->donations->notes->prepareQuery();
+    }
+
+    /**
+     * @return ModelQueryBuilder
+     */
+    public function donation()
+    {
+        return give()->donations->queryById($this->donationId);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @param  object  $object
+     * @return DonationNote
+     */
+    public static function fromQueryBuilderObject($object)
+    {
+        return new DonationNote([
+            'id' => (int)$object->id,
+            'donationId' => (int)$object->donationId,
+            'createdAt' => Temporal::toDateTime($object->createdAt),
+            'content' => (string)$object->content,
+        ]);
+    }
+
+    /**
+     * @return DonationNoteFactory
+     */
+    public static function factory()
+    {
+        return new DonationNoteFactory(static::class);
+    }
+}
diff --git a/src/Donations/Repositories/DonationNotesRepository.php b/src/Donations/Repositories/DonationNotesRepository.php
new file mode 100644
index 0000000000..875d923b90
--- /dev/null
+++ b/src/Donations/Repositories/DonationNotesRepository.php
@@ -0,0 +1,207 @@
+<?php
+
+namespace Give\Donations\Repositories;
+
+use Give\Donations\Models\DonationNote;
+use Give\Framework\Database\DB;
+use Give\Framework\Exceptions\Primitives\Exception;
+use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
+use Give\Framework\Models\ModelQueryBuilder;
+use Give\Framework\Support\Facades\DateTime\Temporal;
+use Give\Helpers\Hooks;
+use Give\Log\Log;
+
+/**
+ * @unreleased
+ */
+class DonationNotesRepository
+{
+
+    /**
+     * @unreleased
+     *
+     * @var string[]
+     */
+    private $requiredDonationProperties = [
+        'donationId',
+        'content',
+    ];
+
+    /**
+     * @unreleased
+     *
+     * @param int $noteId
+     *
+     * @return DonationNote|null
+     */
+    public function getById($noteId)
+    {
+        return $this->prepareQuery()
+            ->where('comment_ID', $noteId)
+            ->get();
+    }
+
+    /**
+     * @unreleased
+     *
+     * @param DonationNote $donationNote
+     *
+     * @throws Exception|InvalidArgumentException
+     */
+    public function insert(DonationNote $donationNote)
+    {
+        $this->validateDonationNote($donationNote);
+
+        Hooks::doAction('give_donation_note_creating', $donationNote);
+
+        $dateCreated = Temporal::withoutMicroseconds($donationNote->createdAt ?: Temporal::getCurrentDateTime());
+        $dateCreatedFormatted = Temporal::getFormattedDateTime($dateCreated);
+
+
+        DB::query('START TRANSACTION');
+
+        try {
+            DB::table('give_comments')
+                ->insert([
+                    'comment_content' => $donationNote->content,
+                    'comment_date' => $dateCreatedFormatted,
+                    'comment_date_gmt' => get_gmt_from_date($dateCreatedFormatted),
+                    'comment_parent' => $donationNote->donationId,
+                    'comment_type' => 'donation',
+                ]);
+        } catch (Exception $exception) {
+            DB::query('ROLLBACK');
+
+            Log::error('Failed creating a donation note', compact('donationNote'));
+
+            throw new $exception('Failed creating a donation note');
+        }
+
+        DB::query('COMMIT');
+
+        $donationNote->id = DB::last_insert_id();
+        $donationNote->createdAt = $dateCreated;
+
+        Hooks::doAction('give_donation_note_created', $donationNote);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @param DonationNote $donationNote
+     *
+     * @throws Exception|InvalidArgumentException
+     */
+    public function update(DonationNote $donationNote)
+    {
+        $this->validateDonationNote($donationNote);
+
+        Hooks::doAction('give_donation_note_updating', $donationNote);
+
+        DB::query('START TRANSACTION');
+
+        try {
+            DB::table('give_comments')
+                ->where('comment_ID', $donationNote->id)
+                ->update([
+                    'comment_content' => $donationNote->content,
+                    'comment_parent' => $donationNote->donationId,
+                    'comment_type' => 'donation',
+                ]);
+        } catch (Exception $exception) {
+            DB::query('ROLLBACK');
+
+            Log::error('Failed updating a donation note', compact('donationNote'));
+
+            throw new $exception('Failed updating a donation note');
+        }
+
+        DB::query('COMMIT');
+
+        Hooks::doAction('give_donation_note_updated', $donationNote);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @param DonationNote $donationNote
+     *
+     * @return bool
+     * @throws Exception
+     */
+    public function delete(DonationNote $donationNote): bool
+    {
+        DB::query('START TRANSACTION');
+
+        Hooks::doAction('give_donation_note_deleting', $donationNote);
+
+        try {
+            DB::table('give_comments')
+                ->where('comment_ID', $donationNote->id)
+                ->delete();
+        } catch (Exception $exception) {
+            DB::query('ROLLBACK');
+
+            Log::error('Failed deleting a donation note', compact('donationNote'));
+
+            throw new $exception('Failed deleting a donation note');
+        }
+
+        DB::query('COMMIT');
+
+        Hooks::doAction('give_donation_note_deleted', $donationNote);
+
+        return true;
+    }
+
+    /**
+     * @unreleased
+     *
+     * @param  int  $donationId
+     *
+     * @return ModelQueryBuilder
+     */
+    public function queryByDonationId(int $donationId): ModelQueryBuilder
+    {
+        return $this->prepareQuery()
+            ->where('comment_parent', $donationId)
+            ->orderBy('comment_ID', 'DESC');
+    }
+
+    /**
+     * @unreleased
+     *
+     * @param DonationNote $donationNote
+     *
+     * @return void
+     */
+    private function validateDonationNote(DonationNote $donationNote)
+    {
+        foreach ($this->requiredDonationProperties as $key) {
+            if (!isset($donationNote->$key)) {
+                throw new InvalidArgumentException("'$key' is required.");
+            }
+        }
+
+        if (!$donationNote->donation) {
+            throw new InvalidArgumentException('Invalid donationId, Donation does not exist');
+        }
+    }
+
+    /**
+     * @return ModelQueryBuilder
+     */
+    public function prepareQuery(): ModelQueryBuilder
+    {
+        $builder = new ModelQueryBuilder(DonationNote::class);
+
+        return $builder->from('give_comments')
+            ->select(
+                ['comment_ID', 'id'],
+                ['comment_parent', 'donationId'],
+                ['comment_content', 'content'],
+                ['comment_date', 'createdAt']
+            )
+            ->where('comment_type', 'donation');
+    }
+}
diff --git a/src/Donations/Repositories/DonationRepository.php b/src/Donations/Repositories/DonationRepository.php
index b653b61fb9..a8349ff74d 100644
--- a/src/Donations/Repositories/DonationRepository.php
+++ b/src/Donations/Repositories/DonationRepository.php
@@ -2,12 +2,12 @@
 
 namespace Give\Donations\Repositories;
 
-use Exception;
 use Give\Donations\Actions\GeneratePurchaseKey;
 use Give\Donations\Models\Donation;
 use Give\Donations\ValueObjects\DonationMetaKeys;
 use Give\Donations\ValueObjects\DonationMode;
 use Give\Framework\Database\DB;
+use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
 use Give\Framework\Models\ModelQueryBuilder;
 use Give\Framework\QueryBuilder\QueryBuilder;
@@ -15,7 +15,6 @@
 use Give\Helpers\Call;
 use Give\Helpers\Hooks;
 use Give\Log\Log;
-use Give\ValueObjects\Money;
 use WP_REST_Request;
 
 /**
@@ -24,6 +23,18 @@
  */
 class DonationRepository
 {
+    /**
+     * @var DonationNotesRepository
+     */
+    public $notes;
+
+    /**
+     * @unreleased
+     */
+    public function __construct()
+    {
+        $this->notes = give(DonationNotesRepository::class);
+    }
 
     /**
      * @since 2.19.6
@@ -59,6 +70,19 @@ public function getById($donationId)
     /**
      * @since 2.19.6
      *
+     * @param $donationId
+     *
+     * @return ModelQueryBuilder
+     */
+    public function queryById($donationId)
+    {
+        return $this->prepareQuery()
+            ->where('ID', $donationId);
+    }
+
+    /**
+     * @unreleased
+     *
      * @param int $subscriptionId
      *
      * @return Donation[]|null
@@ -287,7 +311,10 @@ public function delete(Donation $donation)
     private function getCoreDonationMetaForDatabase(Donation $donation)
     {
         $meta = [
-            DonationMetaKeys::AMOUNT => $donation->amount->formatToDecimal(),
+            DonationMetaKeys::AMOUNT => give_sanitize_amount_for_db(
+                $donation->amount->formatToDecimal(),
+                ['currency' => $donation->amount->getCurrency()]
+            ),
             DonationMetaKeys::CURRENCY => $donation->amount->getCurrency()->getCode(),
             DonationMetaKeys::EXCHANGE_RATE => $donation->exchangeRate,
             DonationMetaKeys::GATEWAY => $donation->gatewayId,
@@ -296,19 +323,18 @@ private function getCoreDonationMetaForDatabase(Donation $donation)
             DonationMetaKeys::LAST_NAME => $donation->lastName,
             DonationMetaKeys::EMAIL => $donation->email,
             DonationMetaKeys::FORM_ID => $donation->formId,
-            DonationMetaKeys::FORM_TITLE => isset($donation->formTitle) ? $donation->formTitle : $this->getFormTitle(
-                $donation->formId
-            ),
-            DonationMetaKeys::MODE => isset($donation->mode) ? $donation->mode->getValue(
-            ) : $this->getDefaultDonationMode()->getValue(),
-            DonationMetaKeys::PURCHASE_KEY => isset($donation->purchaseKey)
-                ? $donation->purchaseKey
-                : Call::invoke(
+            DonationMetaKeys::FORM_TITLE => $donation->formTitle ?? $this->getFormTitle($donation->formId),
+            DonationMetaKeys::MODE => isset($donation->mode) ?
+                $donation->mode->getValue() :
+                $this->getDefaultDonationMode()->getValue(),
+            DonationMetaKeys::PURCHASE_KEY => $donation->purchaseKey ?? Call::invoke(
                     GeneratePurchaseKey::class,
                     $donation->email
                 ),
-            DonationMetaKeys::DONOR_IP => isset($donation->donorIp) ? $donation->donorIp : give_get_ip(),
-            DonationMetaKeys::GATEWAY_TRANSACTION_ID => $donation->gatewayTransactionId
+            DonationMetaKeys::DONOR_IP => $donation->donorIp ?? give_get_ip(),
+            DonationMetaKeys::GATEWAY_TRANSACTION_ID => $donation->gatewayTransactionId,
+            DonationMetaKeys::LEVEL_ID => $donation->levelId,
+            DonationMetaKeys::ANONYMOUS => (int)$donation->anonymous
         ];
 
         if ($donation->feeAmountRecovered !== null) {
@@ -328,14 +354,6 @@ private function getCoreDonationMetaForDatabase(Donation $donation)
             $meta[DonationMetaKeys::SUBSCRIPTION_ID] = $donation->subscriptionId;
         }
 
-        if (isset($donation->anonymous)) {
-            $meta[DonationMetaKeys::ANONYMOUS] = $donation->anonymous;
-        }
-
-        if (isset($donation->levelId)) {
-            $meta[DonationMetaKeys::LEVEL_ID] = $donation->levelId;
-        }
-
         return $meta;
     }
 
diff --git a/src/Donations/ServiceProvider.php b/src/Donations/ServiceProvider.php
index f575c1eaa9..712f154285 100644
--- a/src/Donations/ServiceProvider.php
+++ b/src/Donations/ServiceProvider.php
@@ -11,6 +11,7 @@
 use Give\Donations\LegacyListeners\UpdateDonorPaymentIds;
 use Give\Donations\LegacyListeners\UpdateSequentialId;
 use Give\Donations\Models\Donation;
+use Give\Donations\Repositories\DonationNotesRepository;
 use Give\Donations\Repositories\DonationRepository;
 use Give\Helpers\Call;
 use Give\Helpers\Hooks;
@@ -24,6 +25,7 @@ class ServiceProvider implements ServiceProviderInterface
     public function register()
     {
         give()->singleton('donations', DonationRepository::class);
+        give()->singleton('donationNotes', DonationNotesRepository::class);
     }
 
     /**
diff --git a/src/Donors/Models/Donor.php b/src/Donors/Models/Donor.php
index 2fab29ceeb..8835cea98e 100644
--- a/src/Donors/Models/Donor.php
+++ b/src/Donors/Models/Donor.php
@@ -66,7 +66,7 @@ class Donor extends Model implements ModelCrud, ModelHasFactory
      *
      * @return Donor
      */
-    public static function find($id)
+    public static function find($id): Donor
     {
         return give()->donors->getById($id);
     }
@@ -74,11 +74,9 @@ public static function find($id)
     /**
      * @since 2.19.6
      *
-     * @param string $email
-     *
-     * @return Donor
+     * @return Donor|null
      */
-    public static function whereEmail($email)
+    public static function whereEmail(string $email)
     {
         return give()->donors->getByEmail($email);
     }
@@ -86,11 +84,23 @@ public static function whereEmail($email)
     /**
      * @since 2.19.6
      *
-     * @param int $userId
+     * @param  string  $donorEmail
+     * @return bool
+     */
+    public function hasEmail(string $donorEmail): bool
+    {
+        $emails = array_merge($this->additionalEmails ?? [], [$this->email]);
+
+        return in_array($donorEmail, $emails, true);
+    }
+
+    /**
+     * @unreleased
      *
-     * @return Donor
+     * @param  int  $userId
+     * @return Donor|null
      */
-    public static function whereUserId($userId)
+    public static function whereUserId(int $userId)
     {
         return give()->donors->getByWpUserId($userId);
     }
@@ -105,7 +115,7 @@ public static function whereUserId($userId)
      *
      * @throws Exception|InvalidArgumentException
      */
-    public static function create(array $attributes)
+    public static function create(array $attributes): Donor
     {
         $donor = new static($attributes);
 
@@ -146,7 +156,7 @@ public function delete()
      *
      * @return ModelQueryBuilder<Donation>
      */
-    public function donations()
+    public function donations(): ModelQueryBuilder
     {
         return give()->donations->queryByDonorId($this->id);
     }
@@ -156,7 +166,7 @@ public function donations()
      *
      * @return ModelQueryBuilder<Subscription>
      */
-    public function subscriptions()
+    public function subscriptions(): ModelQueryBuilder
     {
         return give()->subscriptions->queryByDonorId($this->id);
     }
@@ -166,7 +176,7 @@ public function subscriptions()
      *
      * @return int
      */
-    public function totalDonations()
+    public function totalDonations(): int
     {
         return give()->donations->getTotalDonationCountByDonorId($this->id);
     }
@@ -176,7 +186,7 @@ public function totalDonations()
      *
      * @return int
      */
-    public function totalAmountDonated()
+    public function totalAmountDonated(): int
     {
         return array_sum(array_column($this->donations, DonationMetaKeys::AMOUNT()->getKeyAsCamelCase()));
     }
@@ -186,7 +196,7 @@ public function totalAmountDonated()
      *
      * @return ModelQueryBuilder<Donor>
      */
-    public static function query()
+    public static function query(): ModelQueryBuilder
     {
         return give()->donors->prepareQuery();
     }
@@ -198,7 +208,7 @@ public static function query()
      *
      * @return Donor
      */
-    public static function fromQueryBuilderObject($object)
+    public static function fromQueryBuilderObject($object): Donor
     {
         return DonorQueryData::fromObject($object)->toDonor();
     }
diff --git a/src/Donors/Repositories/DonorRepository.php b/src/Donors/Repositories/DonorRepository.php
index 90fc304c26..27cbb80138 100644
--- a/src/Donors/Repositories/DonorRepository.php
+++ b/src/Donors/Repositories/DonorRepository.php
@@ -66,7 +66,7 @@ public function getById($donorId)
      * @param int $userId
      * @return Donor|null
      */
-    public function getByWpUserId($userId)
+    public function getByWpUserId(int $userId)
     {
         // user_id can technically be 0 so make sure to return null
         if (!$userId) {
diff --git a/src/Framework/LegacyPaymentGateways/Contracts/LegacyPaymentGatewayInterface.php b/src/Framework/LegacyPaymentGateways/Contracts/LegacyPaymentGatewayInterface.php
index a8148ddc2c..09f8c6c659 100644
--- a/src/Framework/LegacyPaymentGateways/Contracts/LegacyPaymentGatewayInterface.php
+++ b/src/Framework/LegacyPaymentGateways/Contracts/LegacyPaymentGatewayInterface.php
@@ -10,8 +10,6 @@ interface LegacyPaymentGatewayInterface {
 	 * Returns form fields for donation form to render
 	 *
 	 * @since 2.18.0
-	 *
-	 * @return string|bool
 	 */
-	public function getLegacyFormFieldMarkup( $formId, $args );
+	public function getLegacyFormFieldMarkup( int $formId, array $args ): string;
 }
diff --git a/src/Framework/Models/Model.php b/src/Framework/Models/Model.php
index 5a2cb78c72..16426069a1 100644
--- a/src/Framework/Models/Model.php
+++ b/src/Framework/Models/Model.php
@@ -180,7 +180,7 @@ public function getAttribute($key)
             throw new InvalidArgumentException("$key is not a valid property.");
         }
 
-        return isset($this->attributes[$key]) ? $this->attributes[$key] : null;
+        return $this->attributes[$key] ?? null;
     }
 
     /**
diff --git a/src/Framework/PaymentGateways/Actions/GenerateGatewayRouteUrl.php b/src/Framework/PaymentGateways/Actions/GenerateGatewayRouteUrl.php
index c5e6fb2589..ca9d81034e 100644
--- a/src/Framework/PaymentGateways/Actions/GenerateGatewayRouteUrl.php
+++ b/src/Framework/PaymentGateways/Actions/GenerateGatewayRouteUrl.php
@@ -14,7 +14,7 @@ class GenerateGatewayRouteUrl
      * @since 2.19.0 remove $donationId param in favor of args
      *
      */
-    public function __invoke($gatewayId, $gatewayMethod, $args = null)
+    public function __invoke(string $gatewayId, string $gatewayMethod, array $args = []): string
     {
         $queryArgs = [
             'give-listener' => 'give-gateway',
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentAbandonedHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentAbandonedHandler.php
index 90734691ed..f6fec9a96f 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentAbandonedHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentAbandonedHandler.php
@@ -2,6 +2,7 @@
 
 namespace Give\Framework\PaymentGateways\CommandHandlers;
 
+use Give\Donations\ValueObjects\DonationStatus;
 use Give\Framework\PaymentGateways\Commands\PaymentAbandoned;
 
 class PaymentAbandonedHandler extends PaymentHandler
@@ -15,10 +16,10 @@ public function __construct(PaymentAbandoned $paymentCommand)
     }
 
     /**
-     * @return string
+     * @inheritDoc
      */
-    protected function getPaymentStatus()
+    protected function getPaymentStatus(): DonationStatus
     {
-        return 'abandoned';
+        return DonationStatus::ABANDONED();
     }
 }
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
index 9ee5fa82f4..558a934312 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
@@ -2,6 +2,7 @@
 
 namespace Give\Framework\PaymentGateways\CommandHandlers;
 
+use Give\Donations\ValueObjects\DonationStatus;
 use Give\Framework\PaymentGateways\Commands\PaymentComplete;
 
 class PaymentCompleteHandler extends PaymentHandler
@@ -15,10 +16,10 @@ public function __construct(PaymentComplete $paymentCommand)
     }
 
     /**
-     * @return string
+     * @unreleased
      */
-    protected function getPaymentStatus()
+    protected function getPaymentStatus(): DonationStatus
     {
-        return 'complete';
+        return DonationStatus::COMPLETE();
     }
 }
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
index a4ae32a665..91ad5fba53 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
@@ -2,6 +2,10 @@
 
 namespace Give\Framework\PaymentGateways\CommandHandlers;
 
+use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
+use Give\Donations\ValueObjects\DonationStatus;
+use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\PaymentGateways\Commands\PaymentCommand;
 
 abstract class PaymentHandler
@@ -12,10 +16,11 @@ abstract class PaymentHandler
     protected $paymentCommand;
 
     /**
+     * @unreleased change return type to DonationStatus
+     *
      * @since 2.18.0
-     * @return string
      */
-    abstract protected function getPaymentStatus();
+    abstract protected function getPaymentStatus(): DonationStatus;
 
     /**
      * @param PaymentCommand $paymentCommand
@@ -26,30 +31,30 @@ public function __construct(PaymentCommand $paymentCommand)
     }
 
     /**
-     * @param PaymentCommand $paymentCommand
-     * @return static
+     * @since 2.18.0
      */
-    public static function make(PaymentCommand $paymentCommand)
+    public static function make(PaymentCommand $paymentCommand): PaymentHandler
     {
         return new static($paymentCommand);
     }
 
     /**
+     * @unreleased replace $donationId with Donation model
      * @since 2.18.0
      *
-     * @param  int  $donationId
-     * @return void
+     * @throws Exception
      */
-    public function handle($donationId)
+    public function handle(Donation $donation)
     {
-        give_update_payment_status($donationId, $this->getPaymentStatus());
-
-        if( $this->paymentCommand->gatewayTransactionId ) {
-            give_set_payment_transaction_id($donationId, $this->paymentCommand->gatewayTransactionId);
-        }
-
-        foreach( $this->paymentCommand->paymentNotes as $paymentNote ) {
-            give_insert_payment_note( $donationId, $paymentNote );
+        $donation->status = $this->getPaymentStatus();
+        $donation->gatewayTransactionId = $this->paymentCommand->gatewayTransactionId;
+        $donation->save();
+
+        foreach ($this->paymentCommand->paymentNotes as $paymentNote) {
+            DonationNote::create([
+                'donationId' => $donation->id,
+                'content' => $paymentNote
+            ]);
         }
     }
 }
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentProcessingHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentProcessingHandler.php
index 6ef50c64b6..8cc60b3807 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentProcessingHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentProcessingHandler.php
@@ -2,6 +2,7 @@
 
 namespace Give\Framework\PaymentGateways\CommandHandlers;
 
+use Give\Donations\ValueObjects\DonationStatus;
 use Give\Framework\PaymentGateways\Commands\PaymentProcessing;
 
 class PaymentProcessingHandler extends PaymentHandler
@@ -15,10 +16,10 @@ public function __construct(PaymentProcessing $paymentCommand)
     }
 
     /**
-     * @return string
+     * @return DonationStatus
      */
     protected function getPaymentStatus()
     {
-        return 'processing';
+        return DonationStatus::PROCESSING();
     }
 }
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentRefundedHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentRefundedHandler.php
index 74294be377..636da88d0d 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentRefundedHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentRefundedHandler.php
@@ -2,6 +2,7 @@
 
 namespace Give\Framework\PaymentGateways\CommandHandlers;
 
+use Give\Donations\ValueObjects\DonationStatus;
 use Give\Framework\PaymentGateways\Commands\PaymentRefunded;
 
 class PaymentRefundedHandler extends PaymentHandler
@@ -15,10 +16,10 @@ public function __construct(PaymentRefunded $paymentCommand)
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
-    protected function getPaymentStatus()
+    protected function getPaymentStatus(): DonationStatus
     {
-        return 'refunded';
+        return DonationStatus::REFUNDED();
     }
 }
diff --git a/src/Framework/PaymentGateways/CommandHandlers/RedirectOffsiteHandler.php b/src/Framework/PaymentGateways/CommandHandlers/RedirectOffsiteHandler.php
index 1ce112fc97..f2c3e26e63 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/RedirectOffsiteHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/RedirectOffsiteHandler.php
@@ -10,11 +10,8 @@
 class RedirectOffsiteHandler  {
     /**
      * @since 2.18.0
-     *
-     * @param  RedirectOffsite  $command
-     * @return RedirectResponse
      */
-    public function __invoke(RedirectOffsite $command)
+    public function __invoke(RedirectOffsite $command): RedirectResponse
     {
         return response()->redirectTo($command->redirectUrl);
     }
diff --git a/src/Framework/PaymentGateways/CommandHandlers/RespondToBrowserHandler.php b/src/Framework/PaymentGateways/CommandHandlers/RespondToBrowserHandler.php
index 325c669c0f..9d93c6386a 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/RespondToBrowserHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/RespondToBrowserHandler.php
@@ -10,11 +10,8 @@
 class RespondToBrowserHandler  {
     /**
      * @since 2.18.0
-     *
-     * @param  RespondToBrowser $command
-     * @return JsonResponse
      */
-    public function __invoke(RespondToBrowser $command)
+    public function __invoke(RespondToBrowser $command): JsonResponse
     {
         return response()->json($command->data);
     }
diff --git a/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php b/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
index 65e7222ef5..4ec3db71e2 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
@@ -2,58 +2,30 @@
 
 namespace Give\Framework\PaymentGateways\CommandHandlers;
 
+use Exception;
+use Give\Donations\Models\Donation;
+use Give\Donations\ValueObjects\DonationStatus;
 use Give\Framework\PaymentGateways\Commands\SubscriptionComplete;
-use Give_Subscription;
-use Give_Subscriptions_DB;
+use Give\Subscriptions\Models\Subscription;
+use Give\Subscriptions\ValueObjects\SubscriptionStatus;
 
-class SubscriptionCompleteHandler  {
+class SubscriptionCompleteHandler
+{
     /**
+     * @unreleased replace logic with models
      * @since 2.18.0
      *
-     * @param  SubscriptionComplete  $subscriptionComplete
-     * @param  int  $subscriptionId
-     * @param  int  $donationId
-     * @return void
+     * @throws Exception
      */
-    public function __invoke(SubscriptionComplete $subscriptionComplete, $subscriptionId, $donationId)
+    public function __invoke(SubscriptionComplete $subscriptionComplete, Subscription $subscription, Donation $donation)
     {
-        give_update_payment_status($donationId);
-        give_set_payment_transaction_id($donationId, $subscriptionComplete->gatewayTransactionId);
-
-        if (function_exists('give_recurring_update_subscription_status') && class_exists('Give_Subscriptions_DB')) {
-            give_recurring_update_subscription_status($subscriptionId, 'active');
-
-            $subscription = $this->getSubscription($subscriptionId);
-
-            $subscription->update([
-                'profile_id' => $subscriptionComplete->gatewaySubscriptionId,
-                'transaction_id' => $subscriptionComplete->gatewayTransactionId
-            ]);
-        }
-    }
-
-     /**
-     * @since 2.18.0
-     *
-     * @return Give_Subscriptions_DB
-     */
-    private function subscriptions()
-    {
-        /**
-         * @var Give_Subscriptions_DB $subscriptions
-         */
-        return give(Give_Subscriptions_DB::class);
-    }
-
-    /**
-     * @since 2.18.0
-     *
-     * @param  int  $subscriptionId
-     *
-     * @return Give_Subscription
-     */
-    private function getSubscription($subscriptionId)
-    {
-        return current($this->subscriptions()->get_subscriptions(['id' => $subscriptionId]));
+        $donation->status = DonationStatus::COMPLETE();
+        $donation->gatewayTransactionId = $subscriptionComplete->gatewayTransactionId;
+        $donation->save();
+
+        $subscription->status = SubscriptionStatus::ACTIVE();
+        $subscription->gatewaySubscriptionId = $subscriptionComplete->gatewaySubscriptionId;
+        $subscription->transactionId = $subscriptionComplete->gatewayTransactionId;
+        $subscription->save();
     }
 }
diff --git a/src/Framework/PaymentGateways/Commands/PaymentCommand.php b/src/Framework/PaymentGateways/Commands/PaymentCommand.php
index 1b1ec63504..fa9791738f 100644
--- a/src/Framework/PaymentGateways/Commands/PaymentCommand.php
+++ b/src/Framework/PaymentGateways/Commands/PaymentCommand.php
@@ -25,7 +25,7 @@ abstract class PaymentCommand implements GatewayCommand
      * @param  string|null  $gatewayTransactionId
      * @return static
      */
-    public static function make($gatewayTransactionId = null)
+    public static function make(string $gatewayTransactionId = null): PaymentCommand
     {
         return new static($gatewayTransactionId);
     }
@@ -35,7 +35,7 @@ public static function make($gatewayTransactionId = null)
      *
      * @param  string|null  $gatewayTransactionId
      */
-    public function __construct($gatewayTransactionId = null)
+    public function __construct(string $gatewayTransactionId = null)
     {
         $this->gatewayTransactionId = $gatewayTransactionId;
     }
@@ -44,9 +44,10 @@ public function __construct($gatewayTransactionId = null)
      * @param  string|string[]  ...$paymentNotes
      * @return $this
      */
-    public function setPaymentNotes(...$paymentNotes)
+    public function setPaymentNotes(...$paymentNotes): PaymentCommand
     {
         $this->paymentNotes = $paymentNotes;
+
         return $this;
     }
 
@@ -54,9 +55,10 @@ public function setPaymentNotes(...$paymentNotes)
      * @param  string  $gatewayTransactionId
      * @return $this
      */
-    public function setTransactionId($gatewayTransactionId)
+    public function setTransactionId(string $gatewayTransactionId): PaymentCommand
     {
         $this->gatewayTransactionId = $gatewayTransactionId;
+        
         return $this;
     }
 }
diff --git a/src/Framework/PaymentGateways/Commands/RedirectOffsite.php b/src/Framework/PaymentGateways/Commands/RedirectOffsite.php
index 88f54e3587..ff705ff9ae 100644
--- a/src/Framework/PaymentGateways/Commands/RedirectOffsite.php
+++ b/src/Framework/PaymentGateways/Commands/RedirectOffsite.php
@@ -13,10 +13,8 @@ class RedirectOffsite implements GatewayCommand {
 
     /**
      * @since 2.18.0
-     *
-     * @param  string  $redirectUrl
      */
-    public function __construct($redirectUrl)
+    public function __construct(string $redirectUrl)
     {
         $this->redirectUrl = $redirectUrl;
     }
diff --git a/src/Framework/PaymentGateways/Commands/RespondToBrowser.php b/src/Framework/PaymentGateways/Commands/RespondToBrowser.php
index 10edac6d8a..b3a34123c9 100644
--- a/src/Framework/PaymentGateways/Commands/RespondToBrowser.php
+++ b/src/Framework/PaymentGateways/Commands/RespondToBrowser.php
@@ -14,10 +14,8 @@ class RespondToBrowser implements GatewayCommand {
 
     /**
      * @since 2.18.0
-     *
-     * @param  array  $data
      */
-    public function __construct($data)
+    public function __construct(array $data)
     {
         $this->data = $data;
     }
diff --git a/src/Framework/PaymentGateways/Commands/SubscriptionComplete.php b/src/Framework/PaymentGateways/Commands/SubscriptionComplete.php
index 1d869de30c..adf9924c53 100644
--- a/src/Framework/PaymentGateways/Commands/SubscriptionComplete.php
+++ b/src/Framework/PaymentGateways/Commands/SubscriptionComplete.php
@@ -19,11 +19,8 @@ class SubscriptionComplete implements GatewayCommand {
 
     /**
      * @since 2.18.0
-     *
-     * @param  string  $gatewayTransactionId
-     * @param  string  $gatewaySubscriptionId
      */
-    public function __construct($gatewayTransactionId, $gatewaySubscriptionId)
+    public function __construct(string $gatewayTransactionId, string $gatewaySubscriptionId)
     {
         $this->gatewayTransactionId = $gatewayTransactionId;
         $this->gatewaySubscriptionId = $gatewaySubscriptionId;
diff --git a/src/Framework/PaymentGateways/Contracts/PaymentGatewayInterface.php b/src/Framework/PaymentGateways/Contracts/PaymentGatewayInterface.php
index e0771774d8..9850c20ddd 100644
--- a/src/Framework/PaymentGateways/Contracts/PaymentGatewayInterface.php
+++ b/src/Framework/PaymentGateways/Contracts/PaymentGatewayInterface.php
@@ -5,8 +5,8 @@
 use Give\Donations\Models\Donation;
 use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\PaymentGateways\Commands\GatewayCommand;
+use Give\Framework\PaymentGateways\Commands\RedirectOffsite;
 use Give\Framework\PaymentGateways\Exceptions\PaymentGatewayException;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 
 /**
  * @since 2.18.0
@@ -20,7 +20,7 @@ interface PaymentGatewayInterface extends SubscriptionModuleInterface
      *
      * @return string
      */
-    public static function id();
+    public static function id(): string;
 
     /**
      * Return a unique identifier for the gateway
@@ -29,7 +29,7 @@ public static function id();
      *
      * @return string
      */
-    public function getId();
+    public function getId(): string;
 
     /**
      * Returns a human-readable name for the gateway
@@ -38,7 +38,7 @@ public function getId();
      *
      * @return string - Translated text
      */
-    public function getName();
+    public function getName(): string;
 
     /**
      * Returns a human-readable label for use when a donor selects a payment method to use
@@ -47,7 +47,7 @@ public function getName();
      *
      * @return string - Translated text
      */
-    public function getPaymentMethodLabel();
+    public function getPaymentMethodLabel(): string;
 
     /**
      * Determines if subscriptions are supported
@@ -56,20 +56,19 @@ public function getPaymentMethodLabel();
      *
      * @return bool
      */
-    public function supportsSubscriptions();
+    public function supportsSubscriptions(): bool;
 
     /**
      * Create a payment with gateway
      *
      * @since 2.18.0
      *
-     * @param GatewayPaymentData $paymentData
-     *
-     * @return GatewayCommand
-     * @throws PaymentGatewayException|Exception
+     * @return GatewayCommand|RedirectOffsite|void
      *
+     * @throws PaymentGatewayException
+     * @throws Exception
      */
-    public function createPayment(GatewayPaymentData $paymentData);
+    public function createPayment(Donation $donation);
 
     /**
      * @since 2.20.0
diff --git a/src/Framework/PaymentGateways/Contracts/SubscriptionModuleInterface.php b/src/Framework/PaymentGateways/Contracts/SubscriptionModuleInterface.php
index f03249b332..917b8efaef 100644
--- a/src/Framework/PaymentGateways/Contracts/SubscriptionModuleInterface.php
+++ b/src/Framework/PaymentGateways/Contracts/SubscriptionModuleInterface.php
@@ -4,8 +4,7 @@
 
 use Give\Donations\Models\Donation;
 use Give\Framework\PaymentGateways\Commands\GatewayCommand;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
-use Give\PaymentGateways\DataTransferObjects\GatewaySubscriptionData;
+use Give\Framework\PaymentGateways\Commands\RedirectOffsite;
 use Give\Subscriptions\Models\Subscription;
 
 interface SubscriptionModuleInterface
@@ -15,21 +14,14 @@ interface SubscriptionModuleInterface
      *
      * @since 2.18.0
      *
-     * @param GatewayPaymentData $paymentData
-     * @param GatewaySubscriptionData $subscriptionData
-     *
-     * @return GatewayCommand
+     * @return GatewayCommand|RedirectOffsite
      */
-    public function createSubscription(GatewayPaymentData $paymentData, GatewaySubscriptionData $subscriptionData);
+    public function createSubscription(Donation $donation, Subscription $subscription);
 
     /**
      * Cancel subscription.
      *
      * @since 2.20.0
-     *
-     * @param Subscription $subscription
-     *
-     * @return void
      */
     public function cancelSubscription(Subscription $subscription);
 
@@ -37,26 +29,20 @@ public function cancelSubscription(Subscription $subscription);
      * Returns whether the gateway supports syncing subscriptions.
      *
      * @since 2.20.0
-     *
-     * @return bool
      */
-    public function canSyncSubscriptionWithPaymentGateway();
+    public function canSyncSubscriptionWithPaymentGateway(): bool;
 
     /**
      * Whether the gateway supports updating subscription amount.
      *
      * @since 2.20.0
-     *
-     * @return bool
      */
-    public function canUpdateSubscriptionAmount();
+    public function canUpdateSubscriptionAmount(): bool;
 
     /**
      * Whether the gateway supports updating subscription method.
      *
      * @since 2.20.0
-     *
-     * @return bool
      */
-    public function canUpdateSubscriptionPaymentMethod();
+    public function canUpdateSubscriptionPaymentMethod(): bool;
 }
diff --git a/src/Framework/PaymentGateways/DonationSummary.php b/src/Framework/PaymentGateways/DonationSummary.php
index 9d0a3a1450..8e2bf5b0e4 100644
--- a/src/Framework/PaymentGateways/DonationSummary.php
+++ b/src/Framework/PaymentGateways/DonationSummary.php
@@ -2,7 +2,7 @@
 
 namespace Give\Framework\PaymentGateways;
 
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
+use Give\Donations\Models\Donation;
 
 /**
  * @since 2.19.0
@@ -12,17 +12,15 @@ class DonationSummary
     /** @var int */
     protected $length = 255;
 
-    /** @var GatewayPaymentData */
-    protected $paymentData;
+    /** @var Donation */
+    protected $donation;
 
     /**
      * @since 2.19.0
-     *
-     * @param GatewayPaymentData $paymentData
      */
-    public function __construct(GatewayPaymentData $paymentData)
+    public function __construct(Donation $donation)
     {
-        $this->paymentData = $paymentData;
+        $this->donation = $donation;
     }
 
     /**
@@ -30,7 +28,7 @@ public function __construct(GatewayPaymentData $paymentData)
      *
      * @param int $length
      */
-    public function setLength($length)
+    public function setLength(int $length)
     {
         $this->length = $length;
     }
@@ -40,7 +38,7 @@ public function setLength($length)
      *
      * @return string
      */
-    public function getSummaryWithDonor()
+    public function getSummaryWithDonor(): string
     {
         return $this->trimAndFilter(
             implode(' - ', [
@@ -55,7 +53,7 @@ public function getSummaryWithDonor()
      *
      * @return string
      */
-    public function getSummary()
+    public function getSummary(): string
     {
         return $this->trimAndFilter(
             implode(
@@ -68,28 +66,14 @@ public function getSummary()
         );
     }
 
-    /**
-     * @since 2.19.0
-     *
-     * @param string $property
-     *
-     * @return mixed|void
-     */
-    protected function get($property)
-    {
-        if (property_exists($this->paymentData, $property)) {
-            return $this->paymentData->$property;
-        }
-    }
-
     /**
      * @since 2.19.0
      *
      * @return string
      */
-    protected function getLabel()
+    protected function getLabel(): string
     {
-        $formId = give_get_payment_form_id($this->get('donationId'));
+        $formId = give_get_payment_form_id($this->donation->id);
         $formTitle = get_the_title($formId);
         return $formTitle ?: sprintf(__('Donation Form ID: %d', 'give'), $formId);
     }
@@ -98,28 +82,25 @@ protected function getLabel()
      * @since 2.19.0
      * @return string
      */
-    protected function getPriceLabel()
+    protected function getPriceLabel(): string
     {
-        $formId = give_get_payment_form_id($this->get('donationId'));
-        $priceId = $this->get('priceId');
+        $priceId = $this->donation->levelId;
 
         return is_numeric($priceId)
-            ? give_get_price_option_name($formId, $this->get('priceId'))
+            ? give_get_price_option_name($this->donation->formId, $this->donation->levelId)
             : '';
     }
 
     /**
      * @since 2.19.0
-     *
-     * @return string
      */
-    protected function getDonorLabel()
+    protected function getDonorLabel(): string
     {
         return sprintf(
             '%s %s (%s)',
-            $this->get('donorInfo')->firstName,
-            $this->get('donorInfo')->lastName,
-            $this->get('donorInfo')->email
+            $this->donation->firstName,
+            $this->donation->lastName,
+            $this->donation->email
         );
     }
 
@@ -130,7 +111,7 @@ protected function getDonorLabel()
      *
      * @return string
      */
-    protected function trimAndFilter($text)
+    protected function trimAndFilter(string $text): string
     {
         /**
          * @since 1.8.12
diff --git a/src/Framework/PaymentGateways/PaymentGateway.php b/src/Framework/PaymentGateways/PaymentGateway.php
index 6e24cb2748..1cf25b7c83 100644
--- a/src/Framework/PaymentGateways/PaymentGateway.php
+++ b/src/Framework/PaymentGateways/PaymentGateway.php
@@ -2,6 +2,7 @@
 
 namespace Give\Framework\PaymentGateways;
 
+use Give\Donations\Models\Donation;
 use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\FieldsAPI\Exceptions\TypeNotSupported;
 use Give\Framework\LegacyPaymentGateways\Contracts\LegacyPaymentGatewayInterface;
@@ -24,11 +25,9 @@
 use Give\Framework\PaymentGateways\Exceptions\PaymentGatewayException;
 use Give\Framework\PaymentGateways\Log\PaymentGatewayLog;
 use Give\Framework\PaymentGateways\Routes\RouteSignature;
-use Give\Framework\PaymentGateways\Traits\HasRouteMethods;
 use Give\Framework\PaymentGateways\Traits\HandleHttpResponses;
+use Give\Framework\PaymentGateways\Traits\HasRouteMethods;
 use Give\Helpers\Call;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
-use Give\PaymentGateways\DataTransferObjects\GatewaySubscriptionData;
 use Give\Subscriptions\Models\Subscription;
 
 use function Give\Framework\Http\Response\response;
@@ -68,27 +67,25 @@ public function __construct(SubscriptionModule $subscriptionModule = null)
     /**
      * @inheritDoc
      */
-    public function supportsSubscriptions()
+    public function supportsSubscriptions(): bool
     {
         return isset($this->subscriptionModule);
     }
 
     /**
      * @since 2.19.0
-     *
-     * @inheritDoc
      */
-    public function handleCreatePayment(GatewayPaymentData $gatewayPaymentData)
+    public function handleCreatePayment(Donation $donation)
     {
         try {
-            $command = $this->createPayment($gatewayPaymentData);
-            $this->handleGatewayPaymentCommand($command, $gatewayPaymentData);
+            $command = $this->createPayment($donation);
+            $this->handleGatewayPaymentCommand($command, $donation);
         } catch (Exception $exception) {
             PaymentGatewayLog::error(
                 $exception->getMessage(),
                 [
                     'Payment Gateway' => $this->getId(),
-                    'Donation Data' => $gatewayPaymentData,
+                    'Donation' => $donation,
                 ]
             );
 
@@ -104,20 +101,19 @@ public function handleCreatePayment(GatewayPaymentData $gatewayPaymentData)
     /**
      * @since 2.19.0
      *
-     * @inheritDoc
      */
-    public function handleCreateSubscription(GatewayPaymentData $paymentData, GatewaySubscriptionData $subscriptionData)
+    public function handleCreateSubscription(Donation $donation, Subscription $subscription)
     {
         try {
-            $command = $this->createSubscription($paymentData, $subscriptionData);
-            $this->handleGatewaySubscriptionCommand($command, $paymentData, $subscriptionData);
+            $command = $this->createSubscription($donation, $subscription);
+            $this->handleGatewaySubscriptionCommand($command, $donation, $subscription);
         } catch (Exception $exception) {
             PaymentGatewayLog::error(
                 $exception->getMessage(),
                 [
                     'Payment Gateway' => $this->getId(),
-                    'Donation Data' => $paymentData,
-                    'Subscription Data' => $subscriptionData,
+                    'Donation' => $donation,
+                    'Subscription' => $subscription,
                 ]
             );
 
@@ -136,9 +132,9 @@ public function handleCreateSubscription(GatewayPaymentData $paymentData, Gatewa
      *
      * @inheritDoc
      */
-    public function createSubscription(GatewayPaymentData $paymentData, GatewaySubscriptionData $subscriptionData)
+    public function createSubscription(Donation $donation, Subscription $subscription): GatewayCommand
     {
-        return $this->subscriptionModule->createSubscription($paymentData, $subscriptionData);
+        return $this->subscriptionModule->createSubscription($donation, $subscription);
     }
 
     /**
@@ -152,7 +148,7 @@ public function cancelSubscription(Subscription $subscription)
     /**
      * @inheritDoc
      */
-    public function canSyncSubscriptionWithPaymentGateway()
+    public function canSyncSubscriptionWithPaymentGateway(): bool
     {
         return $this instanceof SubscriptionTransactionsSynchronizable
             || $this->subscriptionModule->canSyncSubscriptionWithPaymentGateway();
@@ -161,7 +157,7 @@ public function canSyncSubscriptionWithPaymentGateway()
     /**
      * @inheritDoc
      */
-    public function canUpdateSubscriptionAmount()
+    public function canUpdateSubscriptionAmount(): bool
     {
         return $this instanceof SubscriptionAmountEditable
             || $this->subscriptionModule->canUpdateSubscriptionAmount();
@@ -170,7 +166,7 @@ public function canUpdateSubscriptionAmount()
     /**
      * @inheritDoc
      */
-    public function canUpdateSubscriptionPaymentMethod()
+    public function canUpdateSubscriptionPaymentMethod(): bool
     {
         return $this instanceof SubscriptionPaymentMethodEditable
             || $this->subscriptionModule->canUpdateSubscriptionPaymentMethod();
@@ -181,19 +177,17 @@ public function canUpdateSubscriptionPaymentMethod()
      *
      * @since 2.18.0
      *
-     * @param GatewayCommand $command
-     * @param GatewayPaymentData $gatewayPaymentData
-     *
      * @throws TypeNotSupported
+     * @throws Exception
      */
-    public function handleGatewayPaymentCommand(GatewayCommand $command, GatewayPaymentData $gatewayPaymentData)
+    public function handleGatewayPaymentCommand(GatewayCommand $command, Donation $donation)
     {
         if ($command instanceof PaymentComplete) {
             $handler = new PaymentCompleteHandler($command);
 
-            $handler->handle($gatewayPaymentData->donationId);
+            $handler->handle($donation);
 
-            $response = response()->redirectTo($gatewayPaymentData->redirectUrl);
+            $response = response()->redirectTo(give_get_success_page_uri());
 
             $this->handleResponse($response);
         }
@@ -201,9 +195,9 @@ public function handleGatewayPaymentCommand(GatewayCommand $command, GatewayPaym
         if ($command instanceof PaymentProcessing) {
             $handler = new PaymentProcessingHandler($command);
 
-            $handler->handle($gatewayPaymentData->donationId);
+            $handler->handle($donation);
 
-            $response = response()->redirectTo($gatewayPaymentData->redirectUrl);
+            $response = response()->redirectTo(give_get_success_page_uri());
 
             $this->handleResponse($response);
         }
@@ -233,26 +227,22 @@ public function handleGatewayPaymentCommand(GatewayCommand $command, GatewayPaym
      *
      * @since 2.18.0
      *
-     * @param GatewayCommand $command
-     * @param GatewayPaymentData $gatewayPaymentData
-     * @param GatewaySubscriptionData $gatewaySubscriptionData
-     *
      * @throws TypeNotSupported
      */
     public function handleGatewaySubscriptionCommand(
         GatewayCommand $command,
-        GatewayPaymentData $gatewayPaymentData,
-        GatewaySubscriptionData $gatewaySubscriptionData
+        Donation $donation,
+        Subscription $subscription
     ) {
         if ($command instanceof SubscriptionComplete) {
             Call::invoke(
                 SubscriptionCompleteHandler::class,
                 $command,
-                $gatewaySubscriptionData->subscriptionId,
-                $gatewayPaymentData->donationId
+                $subscription,
+                $donation
             );
 
-            $response = response()->redirectTo($gatewayPaymentData->redirectUrl);
+            $response = response()->redirectTo(give_get_success_page_uri());
 
             $this->handleResponse($response);
         }
@@ -270,14 +260,8 @@ public function handleGatewaySubscriptionCommand(
      *
      * @since 2.18.0
      * @since 2.19.0 remove $donationId param in favor of args
-     *
-     * @param string $gatewayMethod
-     * @param array|null $args
-     *
-     * @return string
-     *
      */
-    public function generateGatewayRouteUrl($gatewayMethod, $args = null)
+    public function generateGatewayRouteUrl(string $gatewayMethod, array $args = []): string
     {
         return Call::invoke(GenerateGatewayRouteUrl::class, $this->getId(), $gatewayMethod, $args);
     }
@@ -288,15 +272,8 @@ public function generateGatewayRouteUrl($gatewayMethod, $args = null)
      * @since 2.19.5 replace nonce with hash and expiration
      * @since 2.19.4 replace RouteSignature args with unique donationId
      * @since 2.19.0
-     *
-     * @param string $gatewayMethod
-     * @param int $donationId
-     * @param array|null $args
-     *
-     * @return string
-     *
      */
-    public function generateSecureGatewayRouteUrl($gatewayMethod, $donationId, $args = null)
+    public function generateSecureGatewayRouteUrl(string $gatewayMethod, int $donationId, array $args = []): string
     {
         $signature = new RouteSignature($this->getId(), $gatewayMethod, $donationId);
 
@@ -318,13 +295,8 @@ public function generateSecureGatewayRouteUrl($gatewayMethod, $donationId, $args
      * 2. Return json response if processing payment on ajax.
      *
      * @since 2.19.0
-     *
-     * @param Exception|PaymentGatewayException $exception
-     * @param string $message
-     *
-     * @return void
      */
-    private function handleExceptionResponse($exception, $message)
+    private function handleExceptionResponse(Exception $exception, string $message)
     {
         if ($exception instanceof PaymentGatewayException) {
             $message = $exception->getMessage();
@@ -340,14 +312,10 @@ private function handleExceptionResponse($exception, $message)
 
     /**
      * @since 2.20.0
-     *
-     * @param string $method
-     *
-     * @return bool
      */
-    public function supportsMethodRoute($method)
+    public function supportsMethodRoute(string $method): bool
     {
-        if ( $this->subscriptionModule && $this->subscriptionModule->supportsMethodRoute($method) ) {
+        if ($this->subscriptionModule && $this->subscriptionModule->supportsMethodRoute($method)) {
             return true;
         }
 
@@ -363,7 +331,7 @@ public function supportsMethodRoute($method)
      */
     public function callRouteMethod($method, $queryParams)
     {
-        if ( $this->subscriptionModule && $this->subscriptionModule->supportsMethodRoute($method) ) {
+        if ($this->subscriptionModule && $this->subscriptionModule->supportsMethodRoute($method)) {
             return $this->subscriptionModule->callRouteMethod($method, $queryParams);
         }
 
diff --git a/src/Framework/PaymentGateways/SubscriptionModule.php b/src/Framework/PaymentGateways/SubscriptionModule.php
index c2d97caabe..2aa3b35974 100644
--- a/src/Framework/PaymentGateways/SubscriptionModule.php
+++ b/src/Framework/PaymentGateways/SubscriptionModule.php
@@ -33,7 +33,7 @@ public function setGateway(PaymentGateway $gateway)
     /**
      * @inheritDoc
      */
-    public function canSyncSubscriptionWithPaymentGateway()
+    public function canSyncSubscriptionWithPaymentGateway(): bool
     {
         return $this instanceof SubscriptionTransactionsSynchronizable;
     }
@@ -41,7 +41,7 @@ public function canSyncSubscriptionWithPaymentGateway()
     /**
      * @inheritDoc
      */
-    public function canUpdateSubscriptionAmount()
+    public function canUpdateSubscriptionAmount(): bool
     {
         return $this instanceof SubscriptionAmountEditable;
     }
@@ -49,7 +49,7 @@ public function canUpdateSubscriptionAmount()
     /**
      * @inheritDoc
      */
-    public function canUpdateSubscriptionPaymentMethod()
+    public function canUpdateSubscriptionPaymentMethod(): bool
     {
         return $this instanceof SubscriptionPaymentMethodEditable;
     }
diff --git a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
index 15563385c6..eeeaaa5091 100644
--- a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
+++ b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
@@ -2,12 +2,14 @@
 
 namespace Give\LegacyPaymentGateways\Adapters;
 
+use Exception;
+use Give\Donors\Models\Donor;
 use Give\Framework\PaymentGateways\Contracts\PaymentGatewayInterface;
-use Give\PaymentGateways\Actions\CreatePaymentAction;
-use Give\PaymentGateways\Actions\CreateSubscriptionAction;
 use Give\PaymentGateways\DataTransferObjects\FormData;
-use Give\PaymentGateways\DataTransferObjects\GiveInsertPaymentData;
 use Give\PaymentGateways\DataTransferObjects\SubscriptionData;
+use Give\Subscriptions\Models\Subscription;
+use Give\Subscriptions\ValueObjects\SubscriptionPeriod;
+use Give\Subscriptions\ValueObjects\SubscriptionStatus;
 
 /**
  * Class LegacyPaymentGatewayAdapter
@@ -21,105 +23,149 @@ class LegacyPaymentGatewayAdapter
      *
      * @since 2.18.0
      * @since 2.19.0 Added missing $args parameter for ID prefixing and general backwards compatibility.
-     *
-     * @param  int  $formId
-     * @param  array  $args
-     * @param  PaymentGatewayInterface  $registeredGateway
-     *
-     * @return string|bool
      */
-    public function getLegacyFormFieldMarkup($formId, $args, $registeredGateway)
-    {
+    public function getLegacyFormFieldMarkup(
+        int $formId,
+        array $args,
+        PaymentGatewayInterface $registeredGateway
+    ): string {
         return $registeredGateway->getLegacyFormFieldMarkup($formId, $args);
     }
 
     /**
      * First we create a payment, then move on to the gateway processing
      *
-     * @since 2.18.0
+     * @unreleased Replace give_insert_payment with donation model.
      * @since 2.19.0 Replace is_recurring with is_donation_recurring to detect recurring donations.
+     * @since 2.18.0
      *
-     * @param  array  $legacyDonationData  Legacy Donation Data
-     * @param  PaymentGatewayInterface  $registeredGateway
-     *
-     * @return void
+     * @throws Exception
      */
-    public function handleBeforeGateway($legacyDonationData, $registeredGateway)
+    public function handleBeforeGateway(array $legacyDonationData, PaymentGatewayInterface $registeredGateway)
     {
-        $formData = FormData::fromRequest($legacyDonationData);
+       $formData = FormData::fromRequest($legacyDonationData);
 
         $this->validateGatewayNonce($formData->gatewayNonce);
 
-        $donationId = $this->createPayment($formData->toGiveInsertPaymentData());
+        $donor = $this->getOrCreateDonor(
+            $formData->donorInfo->wpUserId,
+            $formData->donorInfo->email,
+            $formData->donorInfo->firstName,
+            $formData->donorInfo->lastName
+        );
+
+        $donation = $formData->toDonation($donor->id);
+        $donation->save();
 
-        $gatewayPaymentData = $formData->toGatewayPaymentData($donationId);
+        $this->setSession($donation->id);
 
-        if (give_recurring_is_donation_recurring($formData->legacyDonationData)) {
+        if (give_recurring_is_donation_recurring($legacyDonationData)) {
             $subscriptionData = SubscriptionData::fromRequest($legacyDonationData);
-            $subscriptionId = $this->createSubscription($donationId, $formData, $subscriptionData);
 
-            $gatewaySubscriptionData = $subscriptionData->toGatewaySubscriptionData($subscriptionId);
+            $subscription = Subscription::create([
+                'amount' => $donation->amount,
+                'period' => new SubscriptionPeriod($subscriptionData->period),
+                'frequency' => (int)$subscriptionData->frequency,
+                'donorId' => $donor->id,
+                'installments' => (int)$subscriptionData->times,
+                'status' => SubscriptionStatus::PENDING(),
+                'donationFormId' => $formData->formId
+            ]);
+
+            give()->subscriptions->updateLegacyColumns(
+                $subscription->id,
+                [
+                    'parent_payment_id' => $donation->id,
+                    'expiration' => $subscription->expiration()
+                ]
+            );
 
-            $registeredGateway->handleCreateSubscription($gatewayPaymentData, $gatewaySubscriptionData);
+            $registeredGateway->handleCreateSubscription($donation, $subscription);
         }
 
-        $registeredGateway->handleCreatePayment($gatewayPaymentData);
+        $registeredGateway->handleCreatePayment($donation);
     }
 
     /**
-     * Create the payment
+     * Validate Gateway Nonce
      *
      * @since 2.18.0
-     *
-     * @param  GiveInsertPaymentData  $giveInsertPaymentData
-     *
-     * @return int
      */
-    private function createPayment(GiveInsertPaymentData $giveInsertPaymentData)
+    private function validateGatewayNonce(string $gatewayNonce)
     {
-        /** @var CreatePaymentAction $createPaymentAction */
-        $createPaymentAction = give(CreatePaymentAction::class);
-
-        return $createPaymentAction($giveInsertPaymentData);
+        if (!wp_verify_nonce($gatewayNonce, 'give-gateway')) {
+            wp_die(
+                esc_html__(
+                    'We\'re unable to recognize your session. Please refresh the screen to try again; otherwise contact your website administrator for assistance.',
+                    'give'
+                ),
+                esc_html__('Error', 'give'),
+                ['response' => 403]
+            );
+        }
     }
 
     /**
-     * Create the payment
+     * Set donation id to purchase session for use in the donation receipt.
      *
-     * @since 2.18.0
+     * @unreleased
      *
-     * @param  int  $donationId
-     * @param  FormData  $formData
-     * @param  SubscriptionData  $subscriptionData
+     * @param $donationId
      *
-     * @return int
+     * @return void
      */
-    private function createSubscription($donationId, FormData $formData, SubscriptionData $subscriptionData)
+    private function setSession($donationId)
     {
-        /** @var CreateSubscriptionAction $createSubscriptionAction */
-        $createSubscriptionAction = give(CreateSubscriptionAction::class);
+        $purchaseSession = (array)give()->session->get('give_purchase');
 
-        return $createSubscriptionAction($donationId, $formData, $subscriptionData);
+        if ($purchaseSession && array_key_exists('purchase_key', $purchaseSession)) {
+            $purchaseSession['donation_id'] = $donationId;
+            give()->session->set('give_purchase', $purchaseSession);
+        }
     }
 
     /**
-     * Validate Gateway Nonce
+     * @unreleased
      *
-     * @since 2.18.0
+     * @param int|null $userId
+     * @param string $donorEmail
+     * @param string $firstName
+     * @param string $lastName
      *
-     * @param  string  $gatewayNonce
+     * @return Donor
+     * @throws Exception
      */
-    private function validateGatewayNonce($gatewayNonce)
-    {
-        if (!wp_verify_nonce($gatewayNonce, 'give-gateway')) {
-            wp_die(
-                esc_html__(
-                    'We\'re unable to recognize your session. Please refresh the screen to try again; otherwise contact your website administrator for assistance.',
-                    'give'
-                ),
-                esc_html__('Error', 'give'),
-                ['response' => 403]
-            );
+    private function getOrCreateDonor(
+        int $userId,
+        string $donorEmail,
+        string $firstName,
+        string $lastName
+    ): Donor {
+        // first check if donor exists as a user
+        $donor = Donor::whereUserId($userId);
+
+        // If they exist as a donor & user then make sure they don't already own this email before adding to their additional emails list..
+        if ($donor && !$donor->hasEmail($donorEmail)) {
+            $donor->additionalEmails = array_merge($donor->additionalEmails ?? [], [$donorEmail]);
+            $donor->save();
         }
+
+        // if donor is not a user than check for any donor matching this email
+        if (!$donor) {
+            $donor = Donor::whereEmail($donorEmail);
+        }
+
+        // if no donor exists then create a new one using their personal information from the form.
+        if (!$donor) {
+            $donor = Donor::create([
+                'name' => trim("$firstName $lastName"),
+                'firstName' => $firstName,
+                'lastName' => $lastName,
+                'email' => $donorEmail,
+                'userId' => $userId ?: null
+            ]);
+        }
+
+        return $donor;
     }
 }
diff --git a/src/LegacyPaymentGateways/DataTransferObjects/LegacyDonationData.php b/src/LegacyPaymentGateways/DataTransferObjects/LegacyDonationData.php
deleted file mode 100644
index e911d1ebfd..0000000000
--- a/src/LegacyPaymentGateways/DataTransferObjects/LegacyDonationData.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Give\LegacyPaymentGateways\DataTransferObjects;
-
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
-
-/**
- * @since 2.19.0
- */
-class LegacyDonationData
-{
-    /** @var GatewayPaymentData */
-    protected $paymentData;
-
-    /** @var string */
-    protected $paymentMethodId;
-
-    /**
-     * @since 2.19.0
-     * @param GatewayPaymentData $paymentData
-     * @param $paymentMethodId
-     */
-    public function __construct(GatewayPaymentData $paymentData, $paymentMethodId )
-    {
-        $this->paymentData = $paymentData;
-        $this->paymentMethodId = $paymentMethodId;
-    }
-
-    /**
-     * @since 2.19.0
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            'source_id' => $this->paymentMethodId,
-            'donation_id' => $this->paymentData->donationId,
-            'post_data' => [
-                'give-form-id' => give_get_payment_form_id( $this->paymentData->donationId ),
-                'give-price-id' => $this->paymentData->priceId,
-                'give-form-title' => give_get_donation_form_title( $this->paymentData->donationId ),
-            ],
-            'user_info' => [
-                'first_name' => $this->paymentData->donorInfo->firstName,
-                'last_name' => $this->paymentData->donorInfo->lastName,
-                'user_email' => $this->paymentData->donorInfo->email,
-            ],
-        ];
-    }
-
-    /**
-     * @since 2.19.0
-     * @return array
-     */
-    public function toArrayWithDescription()
-    {
-        return $this->toArray() + [
-            'description' => give_payment_gateway_donation_summary( $this->toArray(), false )
-        ];
-    }
-}
diff --git a/src/LegacySubscriptions/includes/give-recurring-cache.php b/src/LegacySubscriptions/includes/give-recurring-cache.php
index aabee25f80..98b9e45ac0 100644
--- a/src/LegacySubscriptions/includes/give-recurring-cache.php
+++ b/src/LegacySubscriptions/includes/give-recurring-cache.php
@@ -57,7 +57,6 @@ public function setup() {
 
 		add_action( 'give_subscription_inserted', array( $this, 'flush_on_subscription_insert' ) );
 		add_action( 'give_subscription_deleted', array( $this, 'flush_on_subscription_delete' ), 10, 2 );
-		add_action( 'give_subscription_updated', array( $this, 'flush_on_subscription_update' ), 10, 4 );
 		add_action( 'give_cache_filter_group_name', array( $this, 'filter_group_name' ), 999, 2 );
 		add_action( 'give_deleted_give-donations_cache', array( $this, 'flush_on_donation_edit' ), 10 );
 		add_action( 'before_delete_post', array( $this, 'flush_on_donation_delete' ), 10 );
diff --git a/src/LegacySubscriptions/includes/give-subscriptions-db.php b/src/LegacySubscriptions/includes/give-subscriptions-db.php
index 1fcc2f5a29..bc4df624be 100644
--- a/src/LegacySubscriptions/includes/give-subscriptions-db.php
+++ b/src/LegacySubscriptions/includes/give-subscriptions-db.php
@@ -3,9 +3,9 @@
  * Give Recurring Subscription DB
  *
  * @package     Give
- * @copyright   Copyright (c) 2016, GiveWP
- * @license     https://opensource.org/licenses/gpl-license GNU Public License
  * @since       1.0
+ * @license     https://opensource.org/licenses/gpl-license GNU Public License
+ * @copyright   Copyright (c) 2016, GiveWP
  */
 
 // Exit if accessed directly
@@ -48,7 +48,7 @@ public function __construct()
      */
     public function get_columns()
     {
-        return array(
+        return [
             'id' => '%d',
             'customer_id' => '%d',
             'period' => '%s',
@@ -65,7 +65,7 @@ public function get_columns()
             'status' => '%s',
             'notes' => '%s',
             'profile_id' => '%s',
-        );
+        ];
     }
 
 
@@ -77,7 +77,7 @@ public function get_columns()
      */
     public function get_column_defaults()
     {
-        return array(
+        return [
             'customer_id' => 0,
             'period' => '',
             'frequency' => 1,
@@ -93,22 +93,23 @@ public function get_column_defaults()
             'status' => '',
             'notes' => '',
             'profile_id' => '',
-        );
+        ];
     }
 
     /**
      * Get subscription by specific data
      *
-     * @param  int  $column
-     * @param  int  $row_id
-     *
-     * @return mixed|object
      * @since 1.6
      *
+     * @param int $row_id
+     *
+     * @param int $column
+     *
+     * @return mixed|object
      */
     public function get_by($column, $row_id)
     {
-        $cache_key = Give_Cache::get_key("{$column}_{$row_id}", array($column, $row_id), false);
+        $cache_key = Give_Cache::get_key("{$column}_{$row_id}", [$column, $row_id], false);
         $subscription = Give_Recurring_Cache::get_subscription($cache_key);
 
         if (is_null($subscription)) {
@@ -122,10 +123,11 @@ public function get_by($column, $row_id)
     /**
      * Get subscription
      *
-     * @param  int  $row_id
+     * @since 1.6
+     *
+     * @param int $row_id
      *
      * @return mixed|object
-     * @since 1.6
      */
     public function get($row_id)
     {
@@ -143,18 +145,21 @@ public function get($row_id)
     /**
      * Update subscription
      *
-     * @param  int  $row_id
-     * @param  array  $data
-     * @param  string  $where
-     *
-     * @return bool
      * @since 1.6
      *
+     * @param array $data
+     * @param string $where
+     *
+     * @param int $row_id
+     *
+     * @return bool
      */
-    public function update($row_id, $data = array(), $where = '')
+    public function update($row_id, $data = [], $where = '')
     {
         $status = parent::update($row_id, $data, $where);
 
+        (new Give_Recurring_Cache())->flush_on_subscription_update($status, $row_id, $data, $where);
+
         /**
          * Fire the action when subscriptions updated
          *
@@ -162,17 +167,18 @@ public function update($row_id, $data = array(), $where = '')
          */
         do_action('give_subscription_updated', $status, $row_id, $data, $where);
 
+
         return $status;
     }
 
     /**
      * Create subscription
      *
-     * @param  array  $data
-     *
-     * @return int|mixed
      * @since 1.6
      *
+     * @param array $data
+     *
+     * @return int|mixed
      */
     public function create($data)
     {
@@ -191,7 +197,7 @@ public function create($data)
     /**
      * Delete subscription
      *
-     * @param  int  $subscription_id
+     * @param int $subscription_id
      *
      * @return bool
      */
@@ -215,18 +221,18 @@ public function delete($subscription_id = 0)
     /**
      * Retrieve all subscriptions for a donor.
      *
-     * @param  array  $args
+     * @since   1.0
+     *
+     * @param array $args
      *
      * @access  public
      * @return Give_Subscription[]
-     * @since   1.0
-     *
      */
-    public function get_subscriptions($args = array())
+    public function get_subscriptions($args = [])
     {
         global $wpdb;
 
-        $defaults = array(
+        $defaults = [
             'number' => 20,
             'offset' => 0,
             'search' => '',
@@ -234,7 +240,7 @@ public function get_subscriptions($args = array())
             'customer_id' => 0,
             'orderby' => 'id',
             'order' => 'DESC',
-        );
+        ];
 
         $args = wp_parse_args($args, $defaults);
 
@@ -284,11 +290,11 @@ public function get_subscriptions($args = array())
     /**
      * Count the total number of subscriptions in the database.
      *
-     * @param  array  $args
+     * @param array $args
      *
      * @return int|array/null
      */
-    public function count($args = array())
+    public function count($args = [])
     {
         global $wpdb;
 
@@ -309,7 +315,7 @@ public function count($args = array())
 
             // Simplify result if query for groupBy.
             if ($group_by_args && $result) {
-                $temp = array();
+                $temp = [];
                 foreach ($result as $data) {
                     $temp[$data[$group_by_args]] = $data['COUNT(id)'];
                 }
@@ -369,7 +375,7 @@ public function create_table()
     /**
      * Get Renewing Subscriptions
      *
-     * @param  string  $period
+     * @param string $period
      *
      * @return array|bool|mixed|null|object
      */
@@ -377,17 +383,17 @@ public function get_renewing_subscriptions($period = '+1month')
     {
         global $wpdb;
 
-        $args = array(
+        $args = [
             'number' => 99999,
             'status' => 'active',
             'offset' => 0,
             'orderby' => 'id',
             'order' => 'DESC',
-            'expiration' => array(
+            'expiration' => [
                 'start' => date('Y-m-d H:i:s', strtotime($period . ' midnight')),
                 'end' => date('Y-m-d H:i:s', strtotime($period . ' midnight') + (DAY_IN_SECONDS - 1)),
-            ),
-        );
+            ],
+        ];
 
         $cache_key = Give_Cache::get_key('give_renewing_subscriptions', $args, false);
         $subscriptions = Give_Recurring_Cache::get_db_query($cache_key);
@@ -412,7 +418,7 @@ public function get_renewing_subscriptions($period = '+1month')
     /**
      * Get expiring subscriptions.
      *
-     * @param  string  $period
+     * @param string $period
      *
      * @return array|bool|mixed|null|object
      */
@@ -420,17 +426,17 @@ public function get_expiring_subscriptions($period = '+1month')
     {
         global $wpdb;
 
-        $args = array(
+        $args = [
             'number' => 99999,
             'status' => 'active',
             'offset' => 0,
             'orderby' => 'id',
             'order' => 'DESC',
-            'expiration' => array(
+            'expiration' => [
                 'start' => date('Y-m-d H:i:s', strtotime($period . ' midnight')),
                 'end' => date('Y-m-d H:i:s', strtotime($period . ' midnight') + (DAY_IN_SECONDS - 1)),
-            ),
-        );
+            ],
+        ];
 
         $cache_key = Give_Cache::get_key('give_expiring_subscriptions', $args, false);
         $subscriptions = Give_Recurring_Cache::get_db_query($cache_key);
@@ -455,12 +461,13 @@ public function get_expiring_subscriptions($period = '+1month')
     /**
      * Generate a cache key from args.
      *
-     * @param $prefix
+     * @deprecated 1.6
+     *
      * @param $args
      *
-     * @return string
-     * @deprecated 1.6
+     * @param $prefix
      *
+     * @return string
      */
     protected function generate_cache_key($prefix, $args)
     {
@@ -470,11 +477,11 @@ protected function generate_cache_key($prefix, $args)
     /**
      * Build the query args for subscriptions.
      *
-     * @param  array  $args
+     * @param array $args
      *
      * @return string The mysql "where" query part.
      */
-    public function generate_where_clause($args = array())
+    public function generate_where_clause($args = [])
     {
         $where = ' WHERE 1=1';
 
@@ -578,7 +585,7 @@ public function generate_where_clause($args = array())
     /**
      * Build the query args for subscriptions.
      *
-     * @param  string  $groupby
+     * @param string $groupby
      *
      * @return string The mysql "where" query part.
      */
@@ -638,7 +645,7 @@ private function mysql_where_args_search($args)
 				LIKE '%%%s%%'",
                     $args['search']
                 );
-                $subscription_donor_id = array();
+                $subscription_donor_id = [];
                 $donor_ids = $wpdb->get_results($query, ARRAY_A);
                 if (!empty($donor_ids) && count($donor_ids) > 0) {
                     foreach ($donor_ids as $key => $val) {
diff --git a/src/PaymentGateways/Actions/RegisterPaymentGateways.php b/src/PaymentGateways/Actions/RegisterPaymentGateways.php
index bcaa9a679d..03f346f6c8 100644
--- a/src/PaymentGateways/Actions/RegisterPaymentGateways.php
+++ b/src/PaymentGateways/Actions/RegisterPaymentGateways.php
@@ -10,6 +10,7 @@
 use Give\PaymentGateways\Gateways\Stripe\CheckoutGateway as StripeCheckoutGateway;
 use Give\PaymentGateways\Gateways\Stripe\CreditCardGateway as StripeCreditCardGateway;
 use Give\PaymentGateways\Gateways\Stripe\SEPAGateway as StripeSEPAGateway;
+use Give\PaymentGateways\Gateways\TestGateway\TestGateway;
 use Give\PaymentGateways\PayPalCommerce\PayPalCommerce;
 
 class RegisterPaymentGateways
@@ -21,7 +22,7 @@ class RegisterPaymentGateways
      */
     public $gateways = [
         // When complete, the Test Gateway will eventually replace The legacy Manual Gateway.
-        //TestGateway::class,
+        TestGateway::class,
         //TestGatewayOffsite::class,
         StripeBECSGateway::class,
         StripeCheckoutGateway::class,
@@ -43,7 +44,7 @@ class RegisterPaymentGateways
      * @throws InvalidArgumentException|Exception
      *
      */
-    public function __invoke(array $gateways)
+    public function __invoke(array $gateways): array
     {
         /** @var PaymentGatewayRegister $paymentGatewayRegister */
         $paymentGatewayRegister = give(PaymentGatewayRegister::class);
diff --git a/src/PaymentGateways/DataTransferObjects/FormData.php b/src/PaymentGateways/DataTransferObjects/FormData.php
index d5ff7e78a2..7429691104 100644
--- a/src/PaymentGateways/DataTransferObjects/FormData.php
+++ b/src/PaymentGateways/DataTransferObjects/FormData.php
@@ -6,6 +6,7 @@
 use Give\Donations\Models\Donation;
 use Give\Donations\Properties\BillingAddress;
 use Give\Donations\ValueObjects\DonationStatus;
+use Give\Framework\Support\ValueObjects\Money;
 use Give\ValueObjects\Address;
 use Give\ValueObjects\CardInfo;
 use Give\ValueObjects\DonorInfo;
@@ -100,27 +101,19 @@ class FormData
      * @var DonorInfo
      */
     public $donorInfo;
-    /**
-     * This property is only for internal use. It will be removed in the future.
-     * We will use this property to gracefully deprecate action and filter which exist in existing donation flow.
-     *
-     * @deprecated
-     * @var array
-     */
-    public $legacyDonationData;
+
+    /** @var bool */
+    public $anonymous;
 
     /**
      * Convert data from request into DTO
      *
      * @since 2.18.0
-     *
-     * @return self
      */
-    public static function fromRequest(array $request)
+    public static function fromRequest(array $request): FormData
     {
         $self = new static();
 
-        $self->legacyDonationData = $request;
         $self->price = $request['price'];
         $self->date = $request['date'];
         $self->purchaseKey = $request['purchase_key'];
@@ -129,7 +122,7 @@ public static function fromRequest(array $request)
         $self->postData = $request['post_data'];
         $self->formTitle = $request['post_data']['give-form-title'];
         $self->formId = (int)$request['post_data']['give-form-id'];
-        $self->priceId = isset($request['post_data']['give-price-id']) ? $request['post_data']['give-price-id'] : '';
+        $self->priceId = $request['post_data']['give-price-id'] ?? '';
         $self->formIdPrefix = $request['post_data']['give-form-id-prefix'];
         $self->currentUrl = $request['post_data']['give-current-url'];
         $self->formMinimum = $request['post_data']['give-form-minimum'];
@@ -143,7 +136,7 @@ public static function fromRequest(array $request)
             'firstName' => $request['user_info']['first_name'],
             'lastName' => $request['user_info']['last_name'],
             'email' => $request['user_info']['email'],
-            'honorific' => ! empty($request['user_info']['title']) ? $request['user_info']['title'] : '',
+            'honorific' => !empty($request['user_info']['title']) ? $request['user_info']['title'] : '',
             'address' => $request['user_info']['address']
         ]);
         $self->cardInfo = CardInfo::fromArray([
@@ -162,22 +155,23 @@ public static function fromRequest(array $request)
             'postalCode' => $request['card_info']['card_zip'],
         ]);
 
+        $self->anonymous = isset($request['post_data']['give_anonymous_donation']) && (bool)absint(
+                $request['post_data']['give_anonymous_donation']
+            );
+
         return $self;
     }
 
     /**
      * @since 2.19.6
-     *
-     * @return Donation
      * @throws Exception
      */
-    public function toDonation($donorId)
+    public function toDonation($donorId): Donation
     {
         return new Donation([
             'status' => DonationStatus::PENDING(),
-            'gateway' => $this->paymentGateway,
-            'amount' => (int)$this->price,
-            'currency' => $this->currency,
+            'gatewayId' => $this->paymentGateway,
+            'amount' => Money::fromDecimal($this->price, $this->currency),
             'donorId' => $donorId,
             'firstName' => $this->donorInfo->firstName,
             'lastName' => $this->donorInfo->lastName,
@@ -192,50 +186,8 @@ public function toDonation($donorId)
                 'address1' => $this->billingAddress->line1,
                 'address2' => $this->billingAddress->line2
             ]),
-            'levelId' => (int)$this->priceId
-        ]);
-    }
-
-    /**
-     *
-     * @return GiveInsertPaymentData
-     */
-    public function toGiveInsertPaymentData()
-    {
-        return GiveInsertPaymentData::fromArray([
-            'price' => $this->price,
-            'formTitle' => $this->formTitle,
-            'formId' => $this->formId,
-            'priceId' => $this->priceId,
-            'date' => $this->date,
-            'donorEmail' => $this->donorInfo->email,
-            'purchaseKey' => $this->purchaseKey,
-            'currency' => $this->currency,
-            'userInfo' => $this->userInfo,
-            'paymentGateway' => $this->paymentGateway
-        ]);
-    }
-
-    /**
-     * @param int $donationId
-     *
-     * @return GatewayPaymentData
-     */
-    public function toGatewayPaymentData($donationId)
-    {
-        return GatewayPaymentData::fromArray([
-            'legacyPaymentData' => $this->legacyDonationData,
-            'amount' => $this->amount,
-            'currency' => $this->currency,
-            'date' => $this->date,
-            'price' => $this->price,
-            'priceId' => $this->priceId,
-            'gatewayId' => $this->paymentGateway,
-            'donationId' => $donationId,
-            'purchaseKey' => $this->purchaseKey,
-            'donorInfo' => $this->donorInfo,
-            'cardInfo' => $this->cardInfo,
-            'billingAddress' => $this->billingAddress,
+            'levelId' => $this->priceId,
+            'anonymous' => $this->anonymous
         ]);
     }
 }
diff --git a/src/PaymentGateways/DataTransferObjects/GatewayPaymentData.php b/src/PaymentGateways/DataTransferObjects/GatewayPaymentData.php
deleted file mode 100644
index e2c11ce441..0000000000
--- a/src/PaymentGateways/DataTransferObjects/GatewayPaymentData.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace Give\PaymentGateways\DataTransferObjects;
-
-use Give\ValueObjects\Address;
-use Give\ValueObjects\CardInfo;
-use Give\ValueObjects\DonorInfo;
-
-/**
- * Class GatewayPaymentData
- * @since 2.18.0
- */
-class GatewayPaymentData
-{
-    /**
-     * @var string
-     */
-    public $gatewayId;
-    /**
-     * @var string
-     */
-    public $donationId;
-    /**
-     * @var float
-     */
-    public $price;
-    /**
-     * @var string
-     */
-    public $priceId;
-    /**
-     * @var string
-     */
-    public $date;
-    /**
-     * @var string
-     */
-    public $purchaseKey;
-    /**
-     * @var string
-     */
-    public $currency;
-    /**
-     * @var DonorInfo
-     */
-    public $donorInfo;
-    /**
-     * @var CardInfo|null
-     */
-    public $cardInfo;
-    /**
-     * @var string
-     */
-    public $amount;
-    /**
-     * @var Address|null
-     */
-    public $billingAddress;
-    /**
-     * @var string
-     */
-    public $redirectUrl;
-    /**
-     * We are using this property internally to gracefully deprecate filter and action hooks.
-     * We do not recommend using this property in logic. This will be removed in the future.
-     *
-     * @deprecated
-     *
-     * @var array
-     */
-    public $legacyPaymentData;
-
-    /**
-     * Convert data from array into DTO
-     *
-     * @since 2.18.0
-     *
-     * @return self
-     */
-    public static function fromArray(array $array)
-    {
-        $self = new static();
-
-        $self->legacyPaymentData = $array['legacyPaymentData'];
-        $self->price = $array['price'];
-        $self->priceId = $array['priceId'];
-        $self->currency = $array['currency'];
-        $self->amount = $array['amount'];
-        $self->date = $array['date'];
-        $self->gatewayId = $array['gatewayId'];
-        $self->donationId = $array['donationId'];
-        $self->purchaseKey = $array['purchaseKey'];
-        $self->donorInfo = $array['donorInfo'];
-        $self->cardInfo = $array['cardInfo'];
-        $self->billingAddress = $array['billingAddress'];
-        $self->redirectUrl = give_get_success_page_uri();
-
-        return $self;
-    }
-}
diff --git a/src/PaymentGateways/DataTransferObjects/GatewaySubscriptionData.php b/src/PaymentGateways/DataTransferObjects/GatewaySubscriptionData.php
deleted file mode 100644
index 0ba19113f7..0000000000
--- a/src/PaymentGateways/DataTransferObjects/GatewaySubscriptionData.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Give\PaymentGateways\DataTransferObjects;
-
-/**
- * Class GatewaySubscriptionData
- * @since 2.18.0
- */
-class GatewaySubscriptionData
-{
-    /**
-     * @var string
-     */
-    public $period;
-
-    /**
-     * @var string
-     */
-    public $times;
-
-    /**
-     * @var string
-     */
-    public $frequency;
-    /**
-     * @var int
-     */
-    public $subscriptionId;
-
-    /**
-     * Convert data from array into DTO
-     *
-     * @since 2.18.0
-     *
-     * @return self
-     */
-    public static function fromArray(array $array)
-    {
-        $self = new static();
-
-        $self->period = $array['period'];
-        $self->times = $array['times'];
-        $self->frequency = $array['frequency'];
-        $self->subscriptionId = $array['subscriptionId'];
-
-        return $self;
-    }
-}
diff --git a/src/PaymentGateways/DataTransferObjects/SubscriptionData.php b/src/PaymentGateways/DataTransferObjects/SubscriptionData.php
index d3003115cf..be6333b8b1 100644
--- a/src/PaymentGateways/DataTransferObjects/SubscriptionData.php
+++ b/src/PaymentGateways/DataTransferObjects/SubscriptionData.php
@@ -27,10 +27,8 @@ class SubscriptionData
      * Convert data from request into DTO
      *
      * @since 2.18.0
-     *
-     * @return self
      */
-    public static function fromRequest(array $request)
+    public static function fromRequest(array $request): SubscriptionData
     {
         $self = new static();
 
@@ -40,18 +38,4 @@ public static function fromRequest(array $request)
 
         return $self;
     }
-
-    /**
-     * @param  int  $subscriptionId
-     * @return GatewaySubscriptionData
-     */
-    public function toGatewaySubscriptionData($subscriptionId)
-    {
-        return GatewaySubscriptionData::fromArray([
-            'period' => $this->period,
-            'times' => $this->times,
-            'frequency' => $this->frequency,
-            'subscriptionId' => $subscriptionId,
-        ]);
-    }
 }
diff --git a/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php b/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
index e9e39f8eec..1d14e71c8f 100644
--- a/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
+++ b/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
@@ -2,7 +2,8 @@
 
 namespace Give\PaymentGateways\Gateways\PayPalStandard\Actions;
 
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
+use Give\Donations\Models\Donation;
+use Give\Framework\PaymentGateways\DonationSummary;
 
 /**
  * This class create PayPal Standard payment gateway one time payment url on basis of donor donation query.
@@ -12,37 +13,36 @@
 class CreatePayPalStandardPaymentURL
 {
     public function __invoke(
-        GatewayPaymentData $paymentData,
+        Donation $donation,
         $successRedirectUrl, // PayPal Standard will redirect donor to this url after successful payment.
         $failedRedirectUrl, // PayPal Standard will redirect donor to this url after failed payment.
         $payPalIpnListenerUrl // PayPal Standard will send ipn notification to this url on payment update.
     )
     {
         $paypalPaymentRedirectUrl = trailingslashit(give_get_paypal_redirect()) . '?';
-        $itemName = give_payment_gateway_item_title($paymentData->legacyPaymentData);
+        $itemName = (new DonationSummary($donation))->getSummary();
         $payPalPartnerCode = 'givewp_SP';
-
         // Setup PayPal API params.
         $paypalPaymentArguments = [
             // PayPal account information
             'business' => give_get_option('paypal_email', false),
 
             // Donor info
-            'first_name' => $paymentData->donorInfo->firstName,
-            'last_name' => $paymentData->donorInfo->lastName,
-            'email' => $paymentData->donorInfo->email,
-            'address1' => $paymentData->billingAddress->line1,
-            'address2' => $paymentData->billingAddress->line2,
-            'city' => $paymentData->billingAddress->city,
-            'state' => $paymentData->billingAddress->state,
-            'zip' => $paymentData->billingAddress->postalCode,
-            'country' => $paymentData->billingAddress->country,
+            'first_name' => $donation->firstName,
+            'last_name' => $donation->lastName,
+            'email' => $donation->email,
+            'address1' => $donation->billingAddress->address1,
+            'address2' => $donation->billingAddress->address2,
+            'city' => $donation->billingAddress->city,
+            'state' => $donation->billingAddress->state,
+            'zip' => $donation->billingAddress->zip,
+            'country' => $donation->billingAddress->country,
 
             // Donation information.
-            'invoice' => $paymentData->purchaseKey,
-            'amount' => $paymentData->price,
+            'invoice' => $donation->purchaseKey,
+            'amount' => $donation->amount->formatToDecimal(),
             'item_name' => stripslashes($itemName),
-            'currency_code' => give_get_currency($paymentData->donationId),
+            'currency_code' => give_get_currency($donation->id),
 
             // Urls
             'return' => $successRedirectUrl,
@@ -53,7 +53,7 @@ public function __invoke(
             'shipping' => '0',
             'no_note' => '1',
             'charset' => get_bloginfo('charset'),
-            'custom' => $paymentData->donationId,
+            'custom' => $donation->id,
             'rm' => '2',
             'page_style' => give_get_paypal_page_style(),
             'cbt' => get_bloginfo('name'),
@@ -63,7 +63,7 @@ public function __invoke(
         // Donations or regular transactions?
         $paypalPaymentArguments['cmd'] = give_get_paypal_button_type();
 
-        $paypalPaymentArguments = $this->supportLegacyFilter($paypalPaymentArguments, $paymentData);
+        $paypalPaymentArguments = $this->supportLegacyFilter($paypalPaymentArguments, $donation);
 
         /**
          * Filter the PayPal Standard redirect args.
@@ -71,12 +71,12 @@ public function __invoke(
          * @since 2.19.0
          *
          * @param array $paypalPaymentArguments PayPal Standard payment Data.
-         * @param GatewayPaymentData $paymentData Gateway payment data.
+         * @param Donation $paymentData Gateway payment data.
          */
         $paypalPaymentArguments = apply_filters(
             'give_gateway_paypal_redirect_args',
             $paypalPaymentArguments,
-            $paymentData
+            $donation
         );
 
         $paypalPaymentRedirectUrl .= http_build_query($paypalPaymentArguments);
@@ -87,25 +87,28 @@ public function __invoke(
 
     /**
      * @since 2.19.0
-     *
-     * @param array $paypalPaymentArguments
-     * @param GatewayPaymentData $paymentData
-     *
-     * @return array
      */
-    private function supportLegacyFilter($paypalPaymentArguments, GatewayPaymentData $paymentData)
+    private function supportLegacyFilter(array $paypalPaymentArguments, Donation $donation): array
     {
         /**
          * Filter the PayPal Standard redirect args.
          *
+         * @unreleased Create and pass legacy payment data to filter hook
          * @since 1.8
          */
         return apply_filters_deprecated(
             'give_paypal_redirect_args',
             [
                 $paypalPaymentArguments,
-                $paymentData->donationId,
-                $paymentData->legacyPaymentData
+                $paypalPaymentArguments['custom'],
+                [
+                    'price' => $donation->amount->formatToDecimal(),
+                    'purchase_key' => $donation->purchaseKey,
+                    'user_email' => $donation->email,
+                    'date' => $donation->createdAt->format('Y-m-d H:i:s'),
+                    'post_data' => give_clean($_POST),
+                    'gateway' => $donation->gatewayId,
+                ]
             ],
             '2.19.0'
         );
diff --git a/src/PaymentGateways/Gateways/PayPalStandard/PayPalStandard.php b/src/PaymentGateways/Gateways/PayPalStandard/PayPalStandard.php
index a4009d77cc..a9f217f3f5 100644
--- a/src/PaymentGateways/Gateways/PayPalStandard/PayPalStandard.php
+++ b/src/PaymentGateways/Gateways/PayPalStandard/PayPalStandard.php
@@ -8,7 +8,6 @@
 use Give\Framework\PaymentGateways\Commands\RedirectOffsite;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Helpers\Call;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Gateways\PayPalStandard\Actions\CreatePayPalStandardPaymentURL;
 use Give\PaymentGateways\Gateways\PayPalStandard\Actions\GenerateDonationFailedPageUrl;
 use Give\PaymentGateways\Gateways\PayPalStandard\Actions\GenerateDonationReceiptPageUrl;
@@ -16,6 +15,9 @@
 use Give\PaymentGateways\Gateways\PayPalStandard\Views\PayPalStandardBillingFields;
 use Give_Payment;
 
+/**
+ * @since 2.19.0
+ */
 class PayPalStandard extends PaymentGateway
 {
     public $routeMethods = [
@@ -30,7 +32,7 @@ class PayPalStandard extends PaymentGateway
     /**
      * @inheritDoc
      */
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         return Call::invoke(PayPalStandardBillingFields::class, $formId);
     }
@@ -38,7 +40,7 @@ public function getLegacyFormFieldMarkup($formId, $args)
     /**
      * @inheritDoc
      */
-    public static function id()
+    public static function id(): string
     {
         return 'paypal';
     }
@@ -46,7 +48,7 @@ public static function id()
     /**
      * @inerhitDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -54,7 +56,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return esc_html__('PayPal Standard', 'give');
     }
@@ -62,7 +64,7 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return esc_html__('PayPal', 'give');
     }
@@ -70,21 +72,21 @@ public function getPaymentMethodLabel()
     /**
      * @inheritDoc
      */
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation): RedirectOffsite
     {
         return new RedirectOffsite(
             Call::invoke(
                 CreatePayPalStandardPaymentURL::class,
-                $paymentData,
+                $donation,
                 $this->generateSecureGatewayRouteUrl(
                     'handleSuccessPaymentReturn',
-                    $paymentData->donationId,
-                    ['donation-id' => $paymentData->donationId]
+                    $donation->id,
+                    ['donation-id' => $donation->id]
                 ),
                 $this->generateSecureGatewayRouteUrl(
                     'handleFailedPaymentReturn',
-                    $paymentData->donationId,
-                    ['donation-id' => $paymentData->donationId]
+                    $donation->id,
+                    ['donation-id' => $donation->id]
                 ),
                 $this->generateGatewayRouteUrl(
                     'handleIpnNotification'
@@ -101,22 +103,22 @@ public function createPayment(GatewayPaymentData $paymentData)
      * @since 2.19.6 1. Do not set donation to "processing"
      *             2. Add "payment-confirmation" param to receipt page url
      *
-     * @param  array  $queryParams  Query params in gateway route. {
+     * @param array $queryParams Query params in gateway route. {
      *
      * @type string "donation-id" Donation id.
      *
      * }
-     *
-     * @return RedirectResponse
      */
-    protected function handleSuccessPaymentReturn($queryParams)
+    protected function handleSuccessPaymentReturn(array $queryParams): RedirectResponse
     {
         $donationId = (int)$queryParams['donation-id'];
 
-        return new RedirectResponse(add_query_arg(
-            [ 'payment-confirmation' => $this->getId() ],
-            Call::invoke(GenerateDonationReceiptPageUrl::class, $donationId)
-        ));
+        return new RedirectResponse(
+            add_query_arg(
+                ['payment-confirmation' => $this->getId()],
+                Call::invoke(GenerateDonationReceiptPageUrl::class, $donationId)
+            )
+        );
     }
 
     /**
@@ -129,10 +131,8 @@ protected function handleSuccessPaymentReturn($queryParams)
      * @type string "donation-id" Donation id.
      *
      * }
-     *
-     * @return RedirectResponse
      */
-    protected function handleFailedPaymentReturn($queryParams)
+    protected function handleFailedPaymentReturn(array $queryParams): RedirectResponse
     {
         $donationId = (int)$queryParams['donation-id'];
         $payment = new Give_Payment($donationId);
diff --git a/src/PaymentGateways/Gateways/PayPalStandard/Views/PayPalStandardBillingFields.php b/src/PaymentGateways/Gateways/PayPalStandard/Views/PayPalStandardBillingFields.php
index 6aea5860e6..4164b6c29d 100644
--- a/src/PaymentGateways/Gateways/PayPalStandard/Views/PayPalStandardBillingFields.php
+++ b/src/PaymentGateways/Gateways/PayPalStandard/Views/PayPalStandardBillingFields.php
@@ -18,7 +18,7 @@ class PayPalStandardBillingFields
      *
      * @return string
      */
-    public function __invoke($formId)
+    public function __invoke(int $formId): string
     {
         ob_start();
 
@@ -58,7 +58,7 @@ public function __invoke($formId)
      *
      * @return string
      */
-    private function getLogo()
+    private function getLogo(): string
     {
         return file_get_contents(
             GIVE_PLUGIN_DIR . 'src/PaymentGateways/Gateways/PayPalStandard/resources/templates/paypal-standard-logo.svg'
diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/CreateCheckoutSession.php b/src/PaymentGateways/Gateways/Stripe/Actions/CreateCheckoutSession.php
index 96ec8b7244..972faab2fd 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/CreateCheckoutSession.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/CreateCheckoutSession.php
@@ -3,11 +3,12 @@
 namespace Give\PaymentGateways\Gateways\Stripe\Actions;
 
 use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
+use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\PaymentGateways\DonationSummary;
 use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Exceptions\InvalidPropertyName;
 use Give\PaymentGateways\Gateways\Stripe\ValueObjects\CheckoutSession;
-use Give\ValueObjects\Money;
 use Give_Stripe_Customer;
 
 /**
@@ -19,21 +20,22 @@ class CreateCheckoutSession
      * @since 2.20.0 Update function to get input value to line_items[0][name]
      * @since 2.19.0
      *
-     * @param GatewayPaymentData $paymentData
-     * @param DonationSummary $donationSummary
-     * @param Give_Stripe_Customer $giveStripeCustomer
+     * @param  GatewayPaymentData  $paymentData
+     * @param  DonationSummary  $donationSummary
+     * @param  Give_Stripe_Customer  $giveStripeCustomer
      *
      * @return CheckoutSession
      * @throws InvalidPropertyName
+     * @throws Exception
      */
     public function __invoke(
-        GatewayPaymentData $paymentData,
+        Donation $donation,
         DonationSummary $donationSummary,
         Give_Stripe_Customer $giveStripeCustomer
     ) {
         $session_args = [
             'customer' => $giveStripeCustomer->get_id(),
-            'client_reference_id' => $paymentData->purchaseKey,
+            'client_reference_id' => $donation->purchaseKey,
             'payment_method_types' => ['card'],
             'billing_address_collection' => give_is_setting_enabled(
                 give_get_option('stripe_collect_billing')
@@ -41,17 +43,17 @@ public function __invoke(
             'mode' => 'payment',
             'line_items' => [
                 [
-                    'name' => Donation::find($paymentData->donationId)->formTitle,
+                    'name' => Donation::find($donation->id)->formTitle,
                     'description' => $donationSummary->getSummaryWithDonor(),
-                    'amount' => Money::of($paymentData->price, $paymentData->currency)->getMinorAmount(),
-                    'currency' => $paymentData->currency,
+                    'amount' => $donation->amount->formatToMinorAmount(),
+                    'currency' => $donation->amount->getCurrency(),
                     'quantity' => 1,
                 ],
             ],
             'payment_intent_data' => [
                 'capture_method' => 'automatic',
                 'description' => $donationSummary->getSummaryWithDonor(),
-                'metadata' => give_stripe_prepare_metadata($paymentData->donationId),
+                'metadata' => give_stripe_prepare_metadata($donation->id),
                 'statement_descriptor' => give_stripe_get_statement_descriptor(),
             ],
             'submit_type' => 'donate',
@@ -60,16 +62,19 @@ public function __invoke(
             'locale' => give_stripe_get_preferred_locale(),
         ];
 
-        // If featured image exists, then add it to checkout session.
-        $formId = give_get_payment_form_id($paymentData->donationId);
-        if (!empty(get_the_post_thumbnail($formId))) {
-            $session_args['line_items'][0]['images'] = [get_the_post_thumbnail_url($formId)];
+        if ($formThumbnail = get_the_post_thumbnail($donation->formId)) {
+            $session_args['line_items'][0]['images'] = [$formThumbnail];
         }
 
         $session = give(CheckoutSession::class)->create($session_args);
 
-        give_insert_payment_note($paymentData->donationId, 'Stripe Checkout Session ID: ' . $session->id());
-        give_set_payment_transaction_id($paymentData->donationId, $session->id());
+        DonationNote::create([
+            'donationId' => $donation->id,
+            'content' => 'Stripe Checkout Session ID: ' . $session->id()
+        ]);
+
+        $donation->gatewayTransactionId = $session->id();
+        $donation->save();
 
         return $session;
     }
diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/CreatePaymentIntent.php b/src/PaymentGateways/Gateways/Stripe/Actions/CreatePaymentIntent.php
index 88befee18d..145f8ffbe6 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/CreatePaymentIntent.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/CreatePaymentIntent.php
@@ -2,13 +2,13 @@
 
 namespace Give\PaymentGateways\Gateways\Stripe\Actions;
 
-use Give\LegacyPaymentGateways\DataTransferObjects\LegacyDonationData;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
+use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
+use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\PaymentGateways\DonationSummary;
 use Give\PaymentGateways\Exceptions\InvalidPropertyName;
 use Give\PaymentGateways\Gateways\Stripe\ValueObjects\PaymentIntent;
 use Give\PaymentGateways\Gateways\Stripe\ValueObjects\PaymentMethod;
-use Give\ValueObjects\Money;
 
 /**
  * @since 2.19.0
@@ -20,10 +20,8 @@ class CreatePaymentIntent
 
     /**
      * @since 2.19.0
-     *
-     * @param array $paymentIntentArgs
      */
-    public function __construct($paymentIntentArgs = [])
+    public function __construct(array $paymentIntentArgs = [])
     {
         $this->defaultIntentArgs = $paymentIntentArgs;
     }
@@ -31,20 +29,15 @@ public function __construct($paymentIntentArgs = [])
     /**
      * @since 2.19.0
      *
-     * @param GatewayPaymentData $paymentData
-     * @param DonationSummary $donationSummary
-     * @param \Give_Stripe_Customer $giveStripeCustomer
-     * @param PaymentMethod $paymentMethod
-     *
-     * @return PaymentIntent
      * @throws InvalidPropertyName
+     * @throws Exception
      */
     public function __invoke(
-        GatewayPaymentData $paymentData,
+        Donation $donation,
         DonationSummary $donationSummary,
         \Give_Stripe_Customer $giveStripeCustomer,
         PaymentMethod $paymentMethod
-    ) {
+    ): PaymentIntent {
         /**
          * This filter hook is used to update the payment intent arguments.
          *
@@ -53,50 +46,50 @@ public function __invoke(
         $intent_args = apply_filters(
             'give_stripe_create_intent_args',
             array_merge([
-                'amount' => Money::of($paymentData->price, $paymentData->currency)->getMinorAmount(),
-                'currency' => $paymentData->currency,
+                'amount' => $donation->amount->formatToMinorAmount(),
+                'currency' => $donation->amount->getCurrency(),
                 'payment_method_types' => ['card'],
                 'statement_descriptor' => give_stripe_get_statement_descriptor(),
                 'description' => $donationSummary->getSummaryWithDonor(),
-                'metadata' => give_stripe_prepare_metadata(
-                    $paymentData->donationId,
-                    new LegacyDonationData($paymentData, $paymentMethod->id())
-                ),
+                'metadata' => give_stripe_prepare_metadata($donation->id),
                 'customer' => $giveStripeCustomer->get_id(),
                 'payment_method' => $paymentMethod->id(),
                 'confirm' => true,
-                'return_url' => $paymentData->redirectUrl,
+                'return_url' => give_get_success_page_uri(),
             ], $this->defaultIntentArgs)
         );
 
         // Send Stripe Receipt emails when enabled.
         if (give_is_setting_enabled(give_get_option('stripe_receipt_emails'))) {
-            $intent_args['receipt_email'] = $paymentData->donorInfo->email;
+            $intent_args['receipt_email'] = $donation->email;
         }
 
         $intent = give(PaymentIntent::class)->create($intent_args);
 
-        give_insert_payment_note(
-            $paymentData->donationId,
-            sprintf(__('Stripe Charge/Payment Intent ID: %s', 'give'), $intent->id())
-        );
-        give_insert_payment_note(
-            $paymentData->donationId,
-            sprintf(__('Stripe Payment Intent Client Secret: %s', 'give'), $intent->clientSecret())
-        );
+        DonationNote::create([
+            'donationId' => $donation->id,
+            'content' => sprintf(__('Stripe Charge/Payment Intent ID: %s', 'give'), $intent->id())
+        ]);
+
+        DonationNote::create([
+            'donationId' => $donation->id,
+            'content' => sprintf(__('Stripe Payment Intent Client Secret: %s', 'give'), $intent->clientSecret())
+        ]);
+
         give_update_meta(
-            $paymentData->donationId,
+            $donation->id,
             '_give_stripe_payment_intent_client_secret',
             $intent->clientSecret()
         );
 
-        if ('requires_action' == $intent->status()) {
-            give_insert_payment_note(
-                $paymentData->donationId,
-                __('Stripe requires additional action to be fulfilled. Check your Stripe account.', 'give')
-            );
+        if ('requires_action' === $intent->status()) {
+            DonationNote::create([
+                'donationId' => $donation->id,
+                'content' => __('Stripe requires additional action to be fulfilled. Check your Stripe account.', 'give')
+            ]);
+
             give_update_meta(
-                $paymentData->donationId,
+                $donation->id,
                 '_give_stripe_payment_intent_require_action_url',
                 $intent->nextActionRedirectUrl()
             );
diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php b/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
index 5ba5255cef..4af351273c 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
@@ -2,7 +2,9 @@
 
 namespace Give\PaymentGateways\Gateways\Stripe\Actions;
 
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
+use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
+use Give\Framework\Exceptions\Primitives\Exception;
 use Give\PaymentGateways\Gateways\Stripe\Exceptions\StripeCustomerException;
 use Give_Stripe_Customer;
 
@@ -12,48 +14,39 @@ class GetOrCreateStripeCustomer
     /**
      * @since 2.20.0 add second param support to function.
      *             This param is optional because we use it only when donor subscribe for recurring donation.
+     * @unreleased Update function first argument type to Donation model
      * @since 2.19.0
      *
-     * @param GatewayPaymentData $stripePaymentMethodId
-     * @param string $stripePaymentMethopdId
-     *
      * @return Give_Stripe_Customer
      * @throws StripeCustomerException
      */
-    public function __invoke(GatewayPaymentData $paymentData, $stripePaymentMethodId = '')
+    public function __invoke(Donation $donation, string $stripePaymentMethodId = ''): Give_Stripe_Customer
     {
-        $giveStripeCustomer = new Give_Stripe_Customer($paymentData->donorInfo->email, $stripePaymentMethodId);
+        $giveStripeCustomer = new Give_Stripe_Customer($donation->email, $stripePaymentMethodId);
 
         if (!$giveStripeCustomer->get_id()) {
             throw new StripeCustomerException(__('Unable to find or create stripe customer object.', 'give'));
         }
 
-        $this->saveStripeCustomerId($paymentData->donationId, $giveStripeCustomer->get_id());
+        $this->saveStripeCustomerId($donation, $giveStripeCustomer->get_id());
 
         return $giveStripeCustomer;
     }
 
     /**
+     * @unreleased Update function first argument type to Donation model
      * @since 2.19.0
-     *
-     * @param int $donationId
-     * @param string $stripeCustomerId
-     *
-     * @return void
+     * @throws Exception
      */
-    protected function saveStripeCustomerId($donationId, $stripeCustomerId)
+    protected function saveStripeCustomerId(Donation $donation, string $stripeCustomerId)
     {
-        $donor = new \Give_Donor(
-            give_get_payment_donor_id($donationId)
-        );
-
-        $donor->update_meta(give_stripe_get_customer_key(), $stripeCustomerId);
+        give()->donor_meta->update_meta($donation->donorId, give_stripe_get_customer_key(), $stripeCustomerId);
 
-        give_insert_payment_note(
-            $donationId,
-            sprintf(__('Stripe Customer ID: %s', 'give'), $stripeCustomerId)
-        );
+        DonationNote::create([
+            'donationId' => $donation->id,
+            'content' => sprintf(__('Stripe Customer ID: %s', 'give'), $stripeCustomerId)
+        ]);
 
-        give_update_meta($donationId, give_stripe_get_customer_key(), $stripeCustomerId);
+        give_update_meta($donation->id, give_stripe_get_customer_key(), $stripeCustomerId);
     }
 }
diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/GetPaymentMethodFromRequest.php b/src/PaymentGateways/Gateways/Stripe/Actions/GetPaymentMethodFromRequest.php
index 517ff77889..e64f295d38 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/GetPaymentMethodFromRequest.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/GetPaymentMethodFromRequest.php
@@ -2,7 +2,9 @@
 
 namespace Give\PaymentGateways\Gateways\Stripe\Actions;
 
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
+use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
+use Give\Framework\Exceptions\Primitives\Exception;
 use Give\PaymentGateways\Gateways\Stripe\Exceptions\PaymentMethodException;
 use Give\PaymentGateways\Gateways\Stripe\ValueObjects\PaymentMethod;
 
@@ -10,22 +12,26 @@ class GetPaymentMethodFromRequest
 {
     /**
      * @since 2.19.0
-     * @param GatewayPaymentData $paymentData
+     *
      * @throws PaymentMethodException
-     * @return PaymentMethod $paymentMethod
+     * @throws Exception
      */
-    public function __invoke( GatewayPaymentData $paymentData )
+    public function __invoke(Donation $donation): PaymentMethod
     {
-        if( ! isset( $_POST['give_stripe_payment_method'] ) ) {
+        if (!isset($_POST['give_stripe_payment_method'])) {
             throw new PaymentMethodException('Payment Method Not Found');
         }
 
         $paymentMethod = new PaymentMethod(
-            give_clean( $_POST['give_stripe_payment_method'] )
+            give_clean($_POST['give_stripe_payment_method'])
         );
 
-        give_update_meta($paymentData->donationId, '_give_stripe_source_id', $paymentMethod->id());
-        give_insert_payment_note($paymentData->donationId, sprintf(__('Stripe Source/Payment Method ID: %s', 'give'), $paymentMethod->id()));
+        give_update_meta($donation->id, '_give_stripe_source_id', $paymentMethod->id());
+
+        DonationNote::create([
+            'donationId' => $donation->id,
+            'content' => sprintf(__('Stripe Source/Payment Method ID: %s', 'give'), $paymentMethod->id())
+        ]);
 
         return $paymentMethod;
     }
diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/SaveDonationSummary.php b/src/PaymentGateways/Gateways/Stripe/Actions/SaveDonationSummary.php
index 02dde40c60..5e2fd3cdc1 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/SaveDonationSummary.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/SaveDonationSummary.php
@@ -2,7 +2,7 @@
 
 namespace Give\PaymentGateways\Gateways\Stripe\Actions;
 
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
+use Give\Donations\Models\Donation;
 use Give\Framework\PaymentGateways\DonationSummary;
 
 /**
@@ -11,18 +11,17 @@
 class SaveDonationSummary
 {
     /**
-     * @param GatewayPaymentData $paymentData
-     *
-     * @return DonationSummary
+     * @since 2.19.0
      */
-    public function __invoke(GatewayPaymentData $paymentData)
+    public function __invoke(Donation $donation): DonationSummary
     {
-        $summary = new DonationSummary($paymentData);
+        $summary = new DonationSummary($donation);
         give_update_meta(
-            $paymentData->donationId,
+            $donation->id,
             '_give_stripe_donation_summary',
             $summary->getSummaryWithDonor()
         );
+
         return $summary;
     }
 }
diff --git a/src/PaymentGateways/Gateways/Stripe/BECSGateway.php b/src/PaymentGateways/Gateways/Stripe/BECSGateway.php
index 5107ca19c0..c123314a40 100644
--- a/src/PaymentGateways/Gateways/Stripe/BECSGateway.php
+++ b/src/PaymentGateways/Gateways/Stripe/BECSGateway.php
@@ -5,12 +5,10 @@
 use Give\Donations\Models\Donation;
 use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\PaymentGateways\Commands\GatewayCommand;
-use Give\Framework\PaymentGateways\Contracts\SubscriptionModuleInterface;
 use Give\Framework\PaymentGateways\Exceptions\PaymentGatewayException;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Framework\PaymentGateways\SubscriptionModule;
 use Give\Helpers\Call;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Gateways\Stripe\Traits\BECSMandateForm;
 use Give\PaymentGateways\Gateways\Stripe\Traits\HandlePaymentIntentStatus;
 
@@ -44,29 +42,29 @@ public function __construct(SubscriptionModule $subscriptionModule = null)
      * @return GatewayCommand
      * @throws PaymentGatewayException
      */
-    public function createPayment( GatewayPaymentData $paymentData )
+    public function createPayment( Donation $donation ): GatewayCommand
     {
-        $paymentMethod = Call::invoke( Actions\GetPaymentMethodFromRequest::class, $paymentData );
-        $donationSummary = Call::invoke( Actions\SaveDonationSummary::class, $paymentData );
-        $stripeCustomer = Call::invoke( Actions\GetOrCreateStripeCustomer::class, $paymentData );
+        $paymentMethod = Call::invoke( Actions\GetPaymentMethodFromRequest::class, $donation );
+        $donationSummary = Call::invoke( Actions\SaveDonationSummary::class, $donation );
+        $stripeCustomer = Call::invoke( Actions\GetOrCreateStripeCustomer::class, $donation );
 
         $createIntentAction = new Actions\CreatePaymentIntent( $this->getPaymentIntentArgs() );
 
         return $this->handlePaymentIntentStatus(
             $createIntentAction(
-                $paymentData,
+                $donation,
                 $donationSummary,
                 $stripeCustomer,
                 $paymentMethod
             ),
-            $paymentData->donationId
+            $donation
         );
     }
 
     /**
      * @inheritDoc
      */
-    public static function id()
+    public static function id(): string
     {
         return 'stripe_becs';
     }
@@ -74,7 +72,7 @@ public static function id()
     /**
      * @inheritDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -82,7 +80,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return __('Stripe - BECS Direct Debit', 'give');
     }
@@ -90,7 +88,7 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return __('Stripe - BECS Direct Debit', 'give');
     }
@@ -98,7 +96,7 @@ public function getPaymentMethodLabel()
     /**
      * @inheritDoc
      */
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         return $this->getMandateFormHTML( $formId, $args );
     }
@@ -107,7 +105,7 @@ public function getLegacyFormFieldMarkup($formId, $args)
      * @since 2.19.0
      * @return array
      */
-    protected function getPaymentIntentArgs()
+    protected function getPaymentIntentArgs(): array
     {
         return [
             'payment_method_types' => [ 'au_becs_debit' ],
diff --git a/src/PaymentGateways/Gateways/Stripe/CheckoutGateway.php b/src/PaymentGateways/Gateways/Stripe/CheckoutGateway.php
index df07461187..f29e1137cd 100644
--- a/src/PaymentGateways/Gateways/Stripe/CheckoutGateway.php
+++ b/src/PaymentGateways/Gateways/Stripe/CheckoutGateway.php
@@ -11,7 +11,6 @@
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Helpers\Call;
 use Give\Helpers\Gateways\Stripe;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Exceptions\InvalidPropertyName;
 use Give\PaymentGateways\Gateways\Stripe\Exceptions\CheckoutException;
 
@@ -31,22 +30,22 @@ class CheckoutGateway extends PaymentGateway
      * @throws Exceptions\PaymentIntentException
      * @throws InvalidPropertyName
      */
-    protected function createPaymentModal( GatewayPaymentData $paymentData )
+    protected function createPaymentModal(Donation $donation)
     {
-        $paymentMethod = Call::invoke( Actions\GetPaymentMethodFromRequest::class, $paymentData );
-        $donationSummary = Call::invoke( Actions\SaveDonationSummary::class, $paymentData );
-        $stripeCustomer = Call::invoke( Actions\GetOrCreateStripeCustomer::class, $paymentData );
+        $paymentMethod = Call::invoke(Actions\GetPaymentMethodFromRequest::class, $donation);
+        $donationSummary = Call::invoke(Actions\SaveDonationSummary::class, $donation);
+        $stripeCustomer = Call::invoke(Actions\GetOrCreateStripeCustomer::class, $donation);
 
         $createIntentAction = new Actions\CreatePaymentIntent([]);
 
         return $this->handlePaymentIntentStatus(
             $createIntentAction(
-                $paymentData,
+                $donation,
                 $donationSummary,
                 $stripeCustomer,
                 $paymentMethod
             ),
-            $paymentData->donationId
+            $donation
         );
     }
 
@@ -55,16 +54,15 @@ protected function createPaymentModal( GatewayPaymentData $paymentData )
     /**
      * @inheritDoc
      * @since 2.19.0
-     * @return GatewayCommand
      * @throws PaymentGatewayException
      */
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation): GatewayCommand
     {
         switch (give_stripe_get_checkout_type()) {
             case 'modal':
-                return $this->createPaymentModal($paymentData);
+                return $this->createPaymentModal($donation);
             case 'redirect':
-                return $this->createPaymentRedirect($paymentData);
+                return $this->createPaymentRedirect($donation);
             default:
                 throw new CheckoutException('Invalid Checkout Error');
         }
@@ -73,24 +71,22 @@ public function createPayment(GatewayPaymentData $paymentData)
     /**
      * @since 2.19.7 fix argument order of CreateCheckoutSession
      * @since 2.19.0
-     *
-     * @return RedirectOffsite
      */
-    protected function createPaymentRedirect(GatewayPaymentData $paymentData)
+    protected function createPaymentRedirect(Donation $donation): RedirectOffsite
     {
-        $donationSummary = Call::invoke(Actions\SaveDonationSummary::class, $paymentData);
-        $stripeCustomer = Call::invoke(Actions\GetOrCreateStripeCustomer::class, $paymentData);
-        $session = Call::invoke(Actions\CreateCheckoutSession::class, $paymentData, $donationSummary, $stripeCustomer);
+        $donationSummary = Call::invoke(Actions\SaveDonationSummary::class, $donation);
+        $stripeCustomer = Call::invoke(Actions\GetOrCreateStripeCustomer::class, $donation);
+        $session = Call::invoke(Actions\CreateCheckoutSession::class, $donation, $donationSummary, $stripeCustomer);
 
         return new RedirectOffsite(
-            $this->getRedirectUrl( $session->id(), give_get_payment_form_id( $paymentData->donationId ) )
+            $this->getRedirectUrl($session->id(), give_get_payment_form_id($donation->id))
         );
     }
 
     /**
      * @inheritDoc
      */
-    public static function id()
+    public static function id(): string
     {
         return 'stripe_checkout';
     }
@@ -98,7 +94,7 @@ public static function id()
     /**
      * @inheritDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -106,7 +102,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return __('Stripe - Checkout', 'give');
     }
@@ -114,22 +110,24 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return __('Stripe - Checkout', 'give');
     }
 
     /**
      * @inheritDoc
+     *
+     * @return string|void
      */
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
-        Stripe::canShowBillingAddress( $formId, $args );
+        Stripe::canShowBillingAddress($formId, $args);
 
-        switch( give_stripe_get_checkout_type() ) {
+        switch (give_stripe_get_checkout_type()) {
             case 'modal':
                 return $this->getCheckoutInstructions()
-                     . $this->getCheckoutModalHTML( $formId, $args );
+                    . $this->getCheckoutModalHTML($formId, $args);
             case 'redirect':
                 return $this->getCheckoutInstructions();
         }
diff --git a/src/PaymentGateways/Gateways/Stripe/CreditCardGateway.php b/src/PaymentGateways/Gateways/Stripe/CreditCardGateway.php
index 74c6e4d33d..f9413b94c2 100644
--- a/src/PaymentGateways/Gateways/Stripe/CreditCardGateway.php
+++ b/src/PaymentGateways/Gateways/Stripe/CreditCardGateway.php
@@ -5,12 +5,10 @@
 use Give\Donations\Models\Donation;
 use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\PaymentGateways\Commands\GatewayCommand;
-use Give\Framework\PaymentGateways\Contracts\SubscriptionModuleInterface;
 use Give\Framework\PaymentGateways\Exceptions\PaymentGatewayException;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Framework\PaymentGateways\SubscriptionModule;
 use Give\Helpers\Call;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 
 /**
  * @since 2.19.0
@@ -45,32 +43,32 @@ public function __construct(SubscriptionModule $subscriptionModule = null)
      * @inheritDoc
      * @since 2.19.7 fix handlePaymentIntentStatus not receiving extra param
      * @since 2.19.0
-     * @return GatewayCommand
+     *
      * @throws PaymentGatewayException
      */
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation): GatewayCommand
     {
-        $paymentMethod = Call::invoke( Actions\GetPaymentMethodFromRequest::class, $paymentData );
-        $donationSummary = Call::invoke( Actions\SaveDonationSummary::class, $paymentData );
-        $stripeCustomer = Call::invoke( Actions\GetOrCreateStripeCustomer::class, $paymentData );
+        $paymentMethod = Call::invoke(Actions\GetPaymentMethodFromRequest::class, $donation);
+        $donationSummary = Call::invoke(Actions\SaveDonationSummary::class, $donation);
+        $stripeCustomer = Call::invoke(Actions\GetOrCreateStripeCustomer::class, $donation);
 
         $createIntentAction = new Actions\CreatePaymentIntent([]);
 
         return $this->handlePaymentIntentStatus(
             $createIntentAction(
-                $paymentData,
+                $donation,
                 $donationSummary,
                 $stripeCustomer,
                 $paymentMethod
             ),
-            $paymentData->donationId
+            $donation
         );
     }
 
     /**
      * @inheritDoc
      */
-    public static function id()
+    public static function id(): string
     {
         return 'stripe';
     }
@@ -78,7 +76,7 @@ public static function id()
     /**
      * @inheritDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -86,7 +84,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return __('Stripe - Credit Card', 'give');
     }
@@ -94,7 +92,7 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return __('Stripe - Credit Card', 'give');
     }
@@ -102,7 +100,7 @@ public function getPaymentMethodLabel()
     /**
      * @inheritDoc
      */
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         return $this->getCreditCardFormHTML($formId, $args);
     }
diff --git a/src/PaymentGateways/Gateways/Stripe/SEPAGateway.php b/src/PaymentGateways/Gateways/Stripe/SEPAGateway.php
index 318e3b4d73..4467ecbba8 100644
--- a/src/PaymentGateways/Gateways/Stripe/SEPAGateway.php
+++ b/src/PaymentGateways/Gateways/Stripe/SEPAGateway.php
@@ -5,12 +5,10 @@
 use Give\Donations\Models\Donation;
 use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\PaymentGateways\Commands\GatewayCommand;
-use Give\Framework\PaymentGateways\Contracts\SubscriptionModuleInterface;
 use Give\Framework\PaymentGateways\Exceptions\PaymentGatewayException;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Framework\PaymentGateways\SubscriptionModule;
 use Give\Helpers\Call;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Gateways\Stripe\Traits\HandlePaymentIntentStatus;
 use Give\PaymentGateways\Gateways\Stripe\Traits\SEPAMandateForm;
 
@@ -32,9 +30,18 @@ public function __construct(SubscriptionModule $subscriptionModule = null)
     {
         parent::__construct($subscriptionModule);
 
-        $this->errorMessages['accountConfiguredNoSsl']    = esc_html__( 'IBAN fields are disabled because your site is not running securely over HTTPS.', 'give' );
-        $this->errorMessages['accountNotConfiguredNoSsl'] = esc_html__( 'IBAN fields are disabled because Stripe is not connected and your site is not running securely over HTTPS.', 'give' );
-        $this->errorMessages['accountNotConfigured']      = esc_html__( 'IBAN fields are disabled. Please connect and configure your Stripe account to accept donations.', 'give' );
+        $this->errorMessages['accountConfiguredNoSsl'] = esc_html__(
+            'IBAN fields are disabled because your site is not running securely over HTTPS.',
+            'give'
+        );
+        $this->errorMessages['accountNotConfiguredNoSsl'] = esc_html__(
+            'IBAN fields are disabled because Stripe is not connected and your site is not running securely over HTTPS.',
+            'give'
+        );
+        $this->errorMessages['accountNotConfigured'] = esc_html__(
+            'IBAN fields are disabled. Please connect and configure your Stripe account to accept donations.',
+            'give'
+        );
     }
 
     /**
@@ -44,29 +51,29 @@ public function __construct(SubscriptionModule $subscriptionModule = null)
      * @return GatewayCommand
      * @throws PaymentGatewayException
      */
-    public function createPayment( GatewayPaymentData $paymentData )
+    public function createPayment(Donation $donation): GatewayCommand
     {
-        $paymentMethod = Call::invoke( Actions\GetPaymentMethodFromRequest::class, $paymentData );
-        $donationSummary = Call::invoke( Actions\SaveDonationSummary::class, $paymentData );
-        $stripeCustomer = Call::invoke( Actions\GetOrCreateStripeCustomer::class, $paymentData );
+        $paymentMethod = Call::invoke(Actions\GetPaymentMethodFromRequest::class, $donation);
+        $donationSummary = Call::invoke(Actions\SaveDonationSummary::class, $donation);
+        $stripeCustomer = Call::invoke(Actions\GetOrCreateStripeCustomer::class, $donation);
 
-        $createIntentAction = new Actions\CreatePaymentIntent( $this->getPaymentIntentArgs() );
+        $createIntentAction = new Actions\CreatePaymentIntent($this->getPaymentIntentArgs());
 
         return $this->handlePaymentIntentStatus(
             $createIntentAction(
-                $paymentData,
+                $donation,
                 $donationSummary,
                 $stripeCustomer,
                 $paymentMethod
             ),
-            $paymentData->donationId
+            $donation
         );
     }
 
     /**
      * @inheritDoc
      */
-    public static function id()
+    public static function id(): string
     {
         return 'stripe_sepa';
     }
@@ -74,7 +81,7 @@ public static function id()
     /**
      * @inheritDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -82,7 +89,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return __('Stripe - SEPA Direct Debit', 'give');
     }
@@ -90,7 +97,7 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return __('Stripe - SEPA Direct Debit', 'give');
     }
@@ -98,23 +105,23 @@ public function getPaymentMethodLabel()
     /**
      * @inheritDoc
      */
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
-        return $this->getMandateFormHTML( $formId, $args );
+        return $this->getMandateFormHTML($formId, $args);
     }
 
     /**
      * @since 2.19.0
      * @return array
      */
-    protected function getPaymentIntentArgs()
+    protected function getPaymentIntentArgs(): array
     {
         return [
-            'payment_method_types' => [ 'sepa_debit' ],
-            'setup_future_usage'   => 'on_session',
-            'mandate_data'         => [
+            'payment_method_types' => ['sepa_debit'],
+            'setup_future_usage' => 'on_session',
+            'mandate_data' => [
                 'customer_acceptance' => [
-                    'type'   => 'online',
+                    'type' => 'online',
                     'online' => [
                         'ip_address' => give_stripe_get_ip_address(),
                         'user_agent' => give_get_user_agent(),
diff --git a/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php b/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
index 11c3842679..7f651650ad 100644
--- a/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
+++ b/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
@@ -2,6 +2,7 @@
 
 namespace Give\PaymentGateways\Gateways\Stripe\Traits;
 
+use Give\Donations\Models\Donation;
 use Give\Framework\PaymentGateways\Commands\PaymentCommand;
 use Give\Framework\PaymentGateways\Commands\PaymentComplete;
 use Give\Framework\PaymentGateways\Commands\PaymentProcessing;
@@ -12,19 +13,18 @@
 trait HandlePaymentIntentStatus
 {
     /**
+     * @unreleased Update second argument type to Donation model
      * @since 2.19.7 fix param order and only pass donationId
      *
-     * @param PaymentIntent $paymentIntent
-     * @param string $donationId
-     *
      * @return PaymentCommand|RedirectOffsite
      * @throws PaymentIntentException
      */
-    public function handlePaymentIntentStatus(PaymentIntent $paymentIntent, $donationId)
+    public function handlePaymentIntentStatus(PaymentIntent $paymentIntent, Donation $donation)
     {
         switch ($paymentIntent->status()) {
             case 'requires_action':
-                give_set_payment_transaction_id($donationId, $paymentIntent->id());
+                $donation->gatewayTransactionId = $paymentIntent->id();
+                $donation->save();
                 return new RedirectOffsite($paymentIntent->nextActionRedirectUrl());
             case 'succeeded':
                 return new PaymentComplete($paymentIntent->id());
diff --git a/src/PaymentGateways/Gateways/Stripe/Traits/SEPAMandateForm.php b/src/PaymentGateways/Gateways/Stripe/Traits/SEPAMandateForm.php
index 89794a56d4..ac687ecbc9 100644
--- a/src/PaymentGateways/Gateways/Stripe/Traits/SEPAMandateForm.php
+++ b/src/PaymentGateways/Gateways/Stripe/Traits/SEPAMandateForm.php
@@ -6,48 +6,51 @@ trait SEPAMandateForm
 {
     use FormFieldMarkup;
 
-    public function getMandateFormHTML( $form_id, $args )
+    public function getMandateFormHTML(int $form_id, array $args): string
     {
         ob_start();
 
-        $id_prefix = ! empty( $args['id_prefix'] ) ? $args['id_prefix'] : '';
+        $id_prefix = !empty($args['id_prefix']) ? $args['id_prefix'] : '';
 
-        do_action( 'give_before_cc_fields', $form_id ); ?>
+        do_action('give_before_cc_fields', $form_id); ?>
 
         <fieldset id="give_cc_fields" class="give-do-validate">
             <legend>
-                <?php esc_attr_e( 'IBAN Info', 'give' ); ?>
+                <?php esc_attr_e('IBAN Info', 'give'); ?>
             </legend>
 
             <?php
-            if ( is_ssl() ) {
+            if (is_ssl()) {
                 ?>
                 <div id="give_secure_site_wrapper">
                     <span class="give-icon padlock"></span>
-                    <span><?php esc_attr_e( 'This is a secure SSL encrypted payment.', 'give' ); ?></span>
+                    <span><?php esc_attr_e('This is a secure SSL encrypted payment.', 'give'); ?></span>
                 </div>
                 <?php
             }
 
-            if ( $this->canShowFields() ) {
+            if ($this->canShowFields()) {
                 ?>
                 <div id="give-iban-number-wrap" class="form-row form-row-responsive give-stripe-cc-field-wrap">
                     <label for="give-iban-number-field-<?php echo $id_prefix; ?>" class="give-label">
-                        <?php echo __( 'IBAN', 'give' ); ?>
+                        <?php echo __('IBAN', 'give'); ?>
                         <span class="give-required-indicator">*</span>
-                        <span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php esc_attr_e( 'The (typically) 16 digits on the front of your credit card.', 'give' ); ?>"></span>
+                        <span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php esc_attr_e(
+                            'The (typically) 16 digits on the front of your credit card.',
+                            'give'
+                        ); ?>"></span>
                     </label>
                     <div
                         id="give-stripe-sepa-fields-<?php echo $id_prefix; ?>"
                         class="give-stripe-sepa-iban-field give-stripe-cc-field"
-                        data-hide_icon="<?php echo give_stripe_hide_iban_icon( $form_id ); ?>"
-                        data-icon_style="<?php echo give_stripe_get_iban_icon_style( $form_id ); ?>"
+                        data-hide_icon="<?php echo give_stripe_hide_iban_icon($form_id); ?>"
+                        data-icon_style="<?php echo give_stripe_get_iban_icon_style($form_id); ?>"
                         data-placeholder_country="<?php echo give_stripe_get_iban_placeholder_country(); ?>"
                     ></div>
                 </div>
                 <div class="form-row form-row-responsive give-stripe-sepa-mandate-acceptance-text">
                     <?php
-                    if ( give_is_setting_enabled( give_get_option( 'stripe_mandate_acceptance_option', 'enabled' ) ) ) {
+                    if (give_is_setting_enabled(give_get_option('stripe_mandate_acceptance_option', 'enabled'))) {
                         echo give_stripe_get_mandate_acceptance_text();
                     }
                     ?>
@@ -58,33 +61,35 @@ class="give-stripe-sepa-iban-field give-stripe-cc-field"
                  *
                  * Note: Kept this hook as it is.
                  *
-                 * @param int   $form_id Donation Form ID.
-                 * @param array $args    List of additional arguments.
-                 *
                  * @since 2.5.0
+                 *
+                 * @param array $args List of additional arguments.
+                 *
+                 * @param int $form_id Donation Form ID.
                  */
-                do_action( 'give_after_cc_expiration', $form_id, $args );
+                do_action('give_after_cc_expiration', $form_id, $args);
 
                 /**
                  * This action hook is used to display content after the Credit Card expiration field.
                  *
-                 * @param int   $form_id Donation Form ID.
-                 * @param array $args    List of additional arguments.
-                 *
                  * @since 2.5.0
+                 *
+                 * @param array $args List of additional arguments.
+                 *
+                 * @param int $form_id Donation Form ID.
                  */
-                do_action( 'give_stripe_after_cc_expiration', $form_id, $args );
+                do_action('give_stripe_after_cc_expiration', $form_id, $args);
             }
             ?>
         </fieldset>
         <?php
         // Remove Address Fields if user has option enabled.
-        $billing_fields_enabled = give_get_option( 'stripe_collect_billing' );
-        if ( ! $billing_fields_enabled ) {
-            remove_action( 'give_after_cc_fields', 'give_default_cc_address_fields' );
+        $billing_fields_enabled = give_get_option('stripe_collect_billing');
+        if (!$billing_fields_enabled) {
+            remove_action('give_after_cc_fields', 'give_default_cc_address_fields');
         }
 
-        do_action( 'give_after_cc_fields', $form_id, $args );
+        do_action('give_after_cc_fields', $form_id, $args);
 
         return ob_get_clean();
     }
diff --git a/src/PaymentGateways/Gateways/TestGateway/TestGateway.php b/src/PaymentGateways/Gateways/TestGateway/TestGateway.php
index 8c70f1566b..d69c2d557d 100644
--- a/src/PaymentGateways/Gateways/TestGateway/TestGateway.php
+++ b/src/PaymentGateways/Gateways/TestGateway/TestGateway.php
@@ -4,10 +4,10 @@
 
 use Give\Donations\Models\Donation;
 use Give\Framework\Exceptions\Primitives\Exception;
+use Give\Framework\PaymentGateways\Commands\GatewayCommand;
 use Give\Framework\PaymentGateways\Commands\PaymentComplete;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Helpers\Form\Utils as FormUtils;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Gateways\TestGateway\Views\LegacyFormFieldMarkup;
 
 /**
@@ -19,7 +19,7 @@ class TestGateway extends PaymentGateway
     /**
      * @inheritDoc
      */
-    public static function id()
+    public static function id(): string
     {
         return 'test-gateway';
     }
@@ -27,7 +27,7 @@ public static function id()
     /**
      * @inheritDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -35,7 +35,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return __('Test Gateway', 'give');
     }
@@ -43,7 +43,7 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return __('Test Gateway', 'give');
     }
@@ -51,10 +51,10 @@ public function getPaymentMethodLabel()
     /**
      * @inheritDoc
      */
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         if (FormUtils::isLegacyForm($formId)) {
-            return false;
+            return '';
         }
 
         /** @var LegacyFormFieldMarkup $legacyFormFieldMarkup */
@@ -66,9 +66,9 @@ public function getLegacyFormFieldMarkup($formId, $args)
     /**
      * @inheritDoc
      */
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation): GatewayCommand
     {
-        $transactionId = "test-gateway-transaction-id-{$paymentData->donationId}";
+        $transactionId = "test-gateway-transaction-id-{$donation->id}";
 
         return new PaymentComplete($transactionId);
     }
diff --git a/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php b/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
index ad2cdea8b5..4ce1b76d69 100644
--- a/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
+++ b/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
@@ -3,12 +3,14 @@
 namespace Give\PaymentGateways\Gateways\TestGateway;
 
 use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
+use Give\Donations\ValueObjects\DonationStatus;
 use Give\Framework\Exceptions\Primitives\Exception;
+use Give\Framework\Http\Response\Types\RedirectResponse;
 use Give\Framework\PaymentGateways\Commands\RedirectOffsite;
 use Give\Framework\PaymentGateways\Exceptions\PaymentGatewayException;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Helpers\Form\Utils as FormUtils;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Gateways\TestGateway\Views\LegacyFormFieldMarkup;
 
 use function Give\Framework\Http\Response\response;
@@ -36,7 +38,7 @@ class TestGatewayOffsite extends PaymentGateway
     /**
      * @inheritDoc
      */
-    public static function id()
+    public static function id(): string
     {
         return 'test-gateway-offsite';
     }
@@ -44,7 +46,7 @@ public static function id()
     /**
      * @inheritDoc
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -52,7 +54,7 @@ public function getId()
     /**
      * @inheritDoc
      */
-    public function getName()
+    public function getName(): string
     {
         return __('Test Gateway Offsite', 'give');
     }
@@ -60,7 +62,7 @@ public function getName()
     /**
      * @inheritDoc
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return __('Test Gateway Offsite', 'give');
     }
@@ -68,7 +70,7 @@ public function getPaymentMethodLabel()
     /**
      * @inheritDoc
      */
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         if (FormUtils::isLegacyForm($formId)) {
             return false;
@@ -83,12 +85,12 @@ public function getLegacyFormFieldMarkup($formId, $args)
     /**
      * @inheritDoc
      */
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation)
     {
         $redirectUrl = $this->generateSecureGatewayRouteUrl(
             'securelyReturnFromOffsiteRedirect',
-            $paymentData->donationId,
-            ['give-donation-id' => $paymentData->donationId]
+            $donation->id,
+            ['give-donation-id' => $donation->id]
         );
 
         return new RedirectOffsite($redirectUrl);
@@ -97,20 +99,20 @@ public function createPayment(GatewayPaymentData $paymentData)
     /**
      * An example of using a routeMethod for extending the Gateway API to handle a redirect.
      *
+     * @unreleased update to use Donation model
      * @since 2.19.0
      *
      * @param  array  $queryParams
+     *
+     * @return RedirectResponse
+     * @throws Exception
      * @throws PaymentGatewayException
      */
-    protected function returnFromOffsiteRedirect($queryParams)
+    protected function returnFromOffsiteRedirect(array $queryParams): RedirectResponse
     {
-        $donationId = $queryParams['give-donation-id'];
+        $donation = Donation::find($queryParams['give-donation-id']);
 
-        if (!get_post($donationId)) {
-            throw new PaymentGatewayException('Donation does not exist');
-        }
-
-        $this->updateDonation($donationId);
+        $this->updateDonation($donation);
 
         return response()->redirectTo(give_get_success_page_uri());
     }
@@ -118,35 +120,39 @@ protected function returnFromOffsiteRedirect($queryParams)
     /**
      * An example of using a secureRouteMethod for extending the Gateway API to handle a redirect.
      *
+     * @unreleased update to use Donation model
      * @since 2.19.0
      *
      * @param  array  $queryParams
-     * @throws PaymentGatewayException
+     *
+     * @return RedirectResponse
+     * @throws Exception
      */
-    protected function securelyReturnFromOffsiteRedirect($queryParams)
+    protected function securelyReturnFromOffsiteRedirect(array $queryParams): RedirectResponse
     {
-        $donationId = $queryParams['give-donation-id'];
+        $donation = Donation::find($queryParams['give-donation-id']);
 
-        if (!get_post($donationId)) {
-            throw new PaymentGatewayException('Donation does not exist');
-        }
-
-        $this->updateDonation($donationId);
+        $this->updateDonation($donation);
 
         return response()->redirectTo(give_get_success_page_uri());
     }
 
     /**
-     * Helper for updating donation
+     * @param  Donation  $donation
      *
-     * @param $donationId
      * @return void
+     * @throws Exception
      */
-    private function updateDonation($donationId)
+    private function updateDonation(Donation $donation)
     {
-        give_insert_payment_note($donationId, 'NOTE GOES HERE');
-        give_update_payment_status($donationId);
-        give_set_payment_transaction_id($donationId, "test-gateway-transaction-id");
+        $donation->status = DonationStatus::COMPLETE();
+        $donation->gatewayTransactionId = "test-gateway-transaction-id";
+        $donation->save();
+
+        DonationNote::create([
+            'donationId' => $donation->id,
+            'content' => 'Donation Completed from Test Gateway Offsite.'
+        ]);
     }
 
     /**
diff --git a/src/PaymentGateways/PayPalCommerce/PayPalCommerce.php b/src/PaymentGateways/PayPalCommerce/PayPalCommerce.php
index 51e91f998c..edde73b5c7 100644
--- a/src/PaymentGateways/PayPalCommerce/PayPalCommerce.php
+++ b/src/PaymentGateways/PayPalCommerce/PayPalCommerce.php
@@ -32,13 +32,8 @@ class PayPalCommerce extends PaymentGateway
 
     /**
      * @since 2.19.0
-     *
-     * @param int $formId
-     * @param array $args
-     *
-     * @return string
      */
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         return give(AdvancedCardFields::class)->addCreditCardForm($formId);
     }
@@ -48,7 +43,7 @@ public function getLegacyFormFieldMarkup($formId, $args)
      *
      * @return string
      */
-    public static function id()
+    public static function id(): string
     {
         return 'paypal-commerce';
     }
@@ -58,7 +53,7 @@ public static function id()
      *
      * @return string
      */
-    public function getId()
+    public function getId(): string
     {
         return self::id();
     }
@@ -68,7 +63,7 @@ public function getId()
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return esc_html__('PayPal Donations', 'give');
     }
@@ -78,7 +73,7 @@ public function getName()
      *
      * @return string
      */
-    public function getPaymentMethodLabel()
+    public function getPaymentMethodLabel(): string
     {
         return esc_html__('Credit Card', 'give');
     }
@@ -86,12 +81,9 @@ public function getPaymentMethodLabel()
     /**
      * @since 2.19.0
      *
-     * @param GatewayPaymentData $paymentData
-     *
-     * @return GatewayCommand
      * @throws PaymentGatewayException
      */
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation): GatewayCommand
     {
         $paypalOrder = Call::invoke(GetPayPalOrderFromRequest::class);
         $command = PaymentComplete::make($paypalOrder->payment->id);
@@ -104,7 +96,7 @@ public function createPayment(GatewayPaymentData $paymentData)
         ];
 
         give('payment_meta')->update_meta(
-            $paymentData->donationId,
+            $donation->id,
             '_give_order_id',
             $paypalOrder->id
         );
diff --git a/src/Subscriptions/Models/Subscription.php b/src/Subscriptions/Models/Subscription.php
index 4be5668520..29f7ca0644 100644
--- a/src/Subscriptions/Models/Subscription.php
+++ b/src/Subscriptions/Models/Subscription.php
@@ -5,7 +5,6 @@
 use DateTime;
 use Exception;
 use Give\Donations\Models\Donation;
-use Give\Donations\ValueObjects\DonationStatus;
 use Give\Donors\Models\Donor;
 use Give\Framework\Models\Contracts\ModelCrud;
 use Give\Framework\Models\Contracts\ModelHasFactory;
@@ -88,7 +87,7 @@ public static function find($id)
      *
      * @return ModelQueryBuilder<Donor>
      */
-    public function donor()
+    public function donor(): ModelQueryBuilder
     {
         return give()->donors->queryById($this->donorId);
     }
@@ -98,7 +97,7 @@ public function donor()
      *
      * @return ModelQueryBuilder<Donation>
      */
-    public function donations()
+    public function donations(): ModelQueryBuilder
     {
         return give()->donations->queryBySubscriptionId($this->id);
     }
@@ -110,7 +109,7 @@ public function donations()
      *
      * @return object[]
      */
-    public function getNotes()
+    public function getNotes(): array
     {
         return give()->subscriptions->getNotesBySubscriptionId($this->id);
     }
@@ -165,7 +164,7 @@ public function save()
      * @return bool
      * @throws Exception
      */
-    public function delete()
+    public function delete(): bool
     {
         return give()->subscriptions->delete($this);
     }
@@ -177,7 +176,7 @@ public function delete()
      *
      * @throws Exception
      */
-    public function cancel($force = false)
+    public function cancel(bool $force = false)
     {
         if (!$force && $this->status->isCanceled()) {
             return;
@@ -191,7 +190,7 @@ public function cancel($force = false)
      *
      * @return ModelQueryBuilder<Subscription>
      */
-    public static function query()
+    public static function query(): ModelQueryBuilder
     {
         return give()->subscriptions->prepareQuery();
     }
@@ -203,7 +202,7 @@ public static function query()
      *
      * @return Subscription
      */
-    public static function fromQueryBuilderObject($object)
+    public static function fromQueryBuilderObject($object): Subscription
     {
         return SubscriptionQueryData::fromObject($object)->toSubscription();
     }
@@ -215,7 +214,7 @@ public static function fromQueryBuilderObject($object)
      *
      * @return string
      */
-    public function expiration()
+    public function expiration(): string
     {
         $frequency = $this->frequency;
         $period = $this->period;
@@ -232,7 +231,7 @@ public function expiration()
     /**
      * @return PaymentGateway
      */
-    public function gateway()
+    public function gateway(): PaymentGateway
     {
         return give()->gateways->getPaymentGateway($this->gatewayId);
     }
@@ -240,7 +239,7 @@ public function gateway()
     /**
      * @return SubscriptionFactory<Subscription>
      */
-    public static function factory()
+    public static function factory(): SubscriptionFactory
     {
         return new SubscriptionFactory(static::class);
     }
diff --git a/src/Subscriptions/Repositories/SubscriptionRepository.php b/src/Subscriptions/Repositories/SubscriptionRepository.php
index 195936974b..fa00f5d5d3 100644
--- a/src/Subscriptions/Repositories/SubscriptionRepository.php
+++ b/src/Subscriptions/Repositories/SubscriptionRepository.php
@@ -167,7 +167,7 @@ public function insert(Subscription $subscription)
      *
      * @param Subscription $subscription
      *
-     * @return void
+     * @return Subscription
      * @throws Exception
      */
     public function update(Subscription $subscription)
@@ -204,7 +204,13 @@ public function update(Subscription $subscription)
 
         DB::query('COMMIT');
 
-        Hooks::doAction('give_subscription_updating', $subscription);
+        $subscriptionId = DB::last_insert_id();
+
+        $subscription = $this->getById($subscriptionId);
+
+        Hooks::doAction('give_subscription_updated', $subscription);
+
+        return $subscription;
     }
 
     /**
diff --git a/tests/unit/tests/Donations/Models/TestDonation.php b/tests/unit/tests/Donations/Models/TestDonation.php
index 1661b043e1..2ae163489c 100644
--- a/tests/unit/tests/Donations/Models/TestDonation.php
+++ b/tests/unit/tests/Donations/Models/TestDonation.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
 use Give\Donations\ValueObjects\DonationStatus;
 use Give\Donors\Models\Donor;
 use Give\Framework\Database\DB;
@@ -39,6 +40,7 @@ public function tearDown()
         $donorMetaTable = DB::prefix('give_donormeta');
         $subscriptionsTable = DB::prefix('give_subscriptions');
         $sequentialOrderingTable = DB::prefix('give_sequential_ordering');
+        $notesTable = DB::prefix('give_comments');
 
         DB::query("TRUNCATE TABLE $donorTable");
         DB::query("TRUNCATE TABLE $donorMetaTable");
@@ -46,6 +48,7 @@ public function tearDown()
         DB::query("TRUNCATE TABLE $donationsTable");
         DB::query("TRUNCATE TABLE $subscriptionsTable");
         DB::query("TRUNCATE TABLE $sequentialOrderingTable");
+        DB::query("TRUNCATE TABLE $notesTable");
     }
 
     /**
@@ -68,6 +71,8 @@ public function testCreateShouldInsertDonation()
             'lastName' => 'Murray',
             'email' => 'billMurray@givewp.com',
             'formId' => 1,
+            'levelId' => 'custom',
+            'anonymous' => true
         ]);
 
         $donationFromDatabase = Donation::find($donation->id);
@@ -122,6 +127,48 @@ public function testDonationShouldGetSequentialId()
         $this->assertEquals(1, $donation->getSequentialId());
     }
 
+    /**
+     * @unreleased
+     *
+     * @throws Exception
+     */
+    public function testShouldGetNotes()
+    {
+        /** @var Donor $donor */
+        $donor = Donor::factory()->create();
+
+        /** @var Donation $donation */
+        $donation = Donation::factory()->create(['donorId' => $donor->id]);
+
+        $donationNote1 = DonationNote::factory()->create(['donationId' => $donation->id]);
+        $donationNote2 = DonationNote::factory()->create(['donationId' => $donation->id]);
+        $donationNote3 = DonationNote::factory()->create(['donationId' => $donation->id]);
+
+        $this->assertCount(3, $donation->notes);
+
+        $this->assertEquals($donationNote1->id, $donation->notes[2]->id);
+        $this->assertEquals($donationNote2->id, $donation->notes[1]->id);
+        $this->assertEquals($donationNote3->id, $donation->notes[0]->id);
+    }
+
+    /**
+     * @unreleased
+     */
+    public function testDonationShouldGetIntendedAmountInBaseCurrency()
+    {
+        // When a donation has a fee recovery amount
+        $donation = Donation::factory()->create([
+            'amount' => new Money(5000, 'USD'),
+            'feeAmountRecovered' => new Money(500, 'USD'),
+            'exchangeRate' => '0.9',
+        ]);
+
+        self::assertMoneyEquals(
+            $donation->intendedAmount()->inBaseCurrency($donation->exchangeRate),
+            $donation->intendedAmountInBaseCurrency()
+        );
+    }
+
     /**
      * @unreleased
      */
@@ -158,22 +205,4 @@ public function testDonationShouldGetIntendedAmount()
 
         self::assertMoneyEquals(new Money(5000, 'USD'), $donation->intendedAmount());
     }
-
-    /**
-     * @unreleased
-     */
-    public function testDonationShouldGetIntendedAmountInBaseCurrency()
-    {
-        // When a donation has a fee recovery amount
-        $donation = Donation::factory()->create([
-            'amount' => new Money(5000, 'USD'),
-            'feeAmountRecovered' => new Money(500, 'USD'),
-            'exchangeRate' => '0.9',
-        ]);
-
-        self::assertMoneyEquals(
-            $donation->intendedAmount()->inBaseCurrency($donation->exchangeRate),
-            $donation->intendedAmountInBaseCurrency()
-        );
-    }
 }
diff --git a/tests/unit/tests/Donations/Models/TestDonationNote.php b/tests/unit/tests/Donations/Models/TestDonationNote.php
new file mode 100644
index 0000000000..51731f4256
--- /dev/null
+++ b/tests/unit/tests/Donations/Models/TestDonationNote.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace unit\tests\Donations\Models;
+
+use Exception;
+use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
+use Give\Donors\Models\Donor;
+use Give\Framework\Database\DB;
+
+class TestDonationNote  extends \Give_Unit_Test_Case
+{
+    /**
+     * @unreleased
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+        $donationsTable = DB::prefix('posts');
+        $donationMetaTable = DB::prefix('give_donationmeta');
+        $donorTable = DB::prefix('give_donors');
+        $donorMetaTable = DB::prefix('give_donormeta');
+        $notesTable = DB::prefix('give_comments');
+
+        DB::query("TRUNCATE TABLE $donorTable");
+        DB::query("TRUNCATE TABLE $donorMetaTable");
+        DB::query("TRUNCATE TABLE $donationMetaTable");
+        DB::query("TRUNCATE TABLE $donationsTable");
+        DB::query("TRUNCATE TABLE $notesTable");
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function testCreateShouldInsertDonationNote()
+    {
+        $donor = Donor::factory()->create();
+        $donation = Donation::factory()->create(['donorId' => $donor->id]);
+
+        $donationNote = DonationNote::create([
+            'donationId' => $donation->id,
+            'content' => 'im a note'
+        ]);
+
+        $donationNoteFromDatabase = DonationNote::find($donationNote->id);
+
+        $this->assertEquals($donationNote->getAttributes(), $donationNoteFromDatabase->getAttributes());
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function testDonationNoteShouldGetDonation()
+    {
+        $donor = Donor::factory()->create();
+
+        /** @var Donation $donation */
+        $donation = Donation::factory()->create(['donorId' => $donor->id]);
+
+        /** @var DonationNote $donationNote */
+        $donationNote = DonationNote::factory()->create(['donationId' => $donation->id]);
+
+        $this->assertInstanceOf(Donation::class, $donationNote->donation);
+        $this->assertEquals($donation->id, $donationNote->donation->id);
+    }
+}
diff --git a/tests/unit/tests/Donations/Repositories/TestDonationNoteRepository.php b/tests/unit/tests/Donations/Repositories/TestDonationNoteRepository.php
new file mode 100644
index 0000000000..5d22f6a844
--- /dev/null
+++ b/tests/unit/tests/Donations/Repositories/TestDonationNoteRepository.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace unit\tests\Donations\Repositories;
+
+use Exception;
+use Give\Donations\Models\Donation;
+use Give\Donations\Models\DonationNote;
+use Give\Donations\Repositories\DonationNotesRepository;
+use Give\Donors\Models\Donor;
+use Give\Framework\Database\DB;
+use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
+
+/**
+ * @coversDefaultClass DonationNotesRepository
+ */
+final class TestDonationNoteRepository extends \Give_Unit_Test_Case
+{
+
+    /**
+     * @unreleased - truncate donationMetaTable to avoid duplicate records
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+        $donationMetaTable = DB::prefix('give_donationmeta');
+        $donationsTable = DB::prefix('posts');
+        $donorsTable = DB::prefix('give_donors');
+        $donorMetaTable = DB::prefix('give_donormeta');
+        $notesTable = DB::prefix('give_comments');
+
+        DB::query("TRUNCATE TABLE $donationMetaTable");
+        DB::query("TRUNCATE TABLE $donationsTable");
+        DB::query("TRUNCATE TABLE $donorsTable");
+        DB::query("TRUNCATE TABLE $donorMetaTable");
+        DB::query("TRUNCATE TABLE $notesTable");
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function testGetByIdShouldReturnDonationNote()
+    {
+        $donor = Donor::factory()->create();
+        $donation = Donation::factory()->create(['donorId' => $donor->id]);
+        $donationNote = DonationNote::factory()->create(['donationId' => $donation->id]);
+        $repository = new DonationNotesRepository();
+
+        $donationNoteFromDatabase = $repository->getById($donationNote->id);
+
+        $this->assertInstanceOf(DonationNote::class, $donationNoteFromDatabase);
+        $this->assertEquals($donationNote->id, $donationNoteFromDatabase->id);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function testInsertShouldAddDonationNoteToDatabase()
+    {
+        $donor = Donor::factory()->create();
+        $donation = Donation::factory()->create(['donorId' => $donor->id]);
+        $donationNote = new DonationNote(['donationId' => $donation->id, 'content' => 'im a note']);
+
+        $repository = new DonationNotesRepository();
+
+        $repository->insert($donationNote);
+
+        /** @var DonationNote $query */
+        $query = $repository->prepareQuery()
+            ->where('comment_ID', $donationNote->id)
+            ->get();
+
+
+        // simulate asserting database has values
+        $this->assertInstanceOf(DonationNote::class, $donationNote);
+        $this->assertEquals($query->id, $donationNote->id);
+        $this->assertEquals($query->donationId, $donationNote->donationId);
+        $this->assertEquals($query->content, $donationNote->content);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function testInsertShouldFailValidationWhenMissingKeyAndThrowException()
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        $donationNoteMissingDonationId = new DonationNote([
+            'content' => 'im a note',
+        ]);
+
+        $repository = new DonationNotesRepository();
+
+        $repository->insert($donationNoteMissingDonationId);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function testInsertShouldFailValidationWhenDonationDoesNotExistAndThrowException()
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        $donationNoteWithInvalidDonation = new DonationNote([
+            'donationId' => 10000,
+            'content' => 'im a note'
+        ]);
+
+        $repository = new DonationNotesRepository();
+
+        $repository->insert($donationNoteWithInvalidDonation);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function testUpdateShouldFailValidationAndThrowException()
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        $donationNoteMissingDonationId = new DonationNote([
+            'content' => 'im a note'
+        ]);
+
+        $repository = new DonationNotesRepository();
+
+        $repository->update($donationNoteMissingDonationId);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function testUpdateShouldUpdateDonationNoteValuesInTheDatabase()
+    {
+        /** @var Donor $donor */
+        $donor = Donor::factory()->create();
+
+        /** @var Donation $donation */
+        $donation = Donation::factory()->create(['donorId' => $donor->id]);
+
+        /** @var DonationNote $donationNote */
+        $donationNote = DonationNote::factory()->create(['donationId' => $donation->id]);
+
+        $repository = new DonationNotesRepository();
+
+        $donationNote->content = 'im an updated note';
+
+        // call update method
+        $repository->update($donationNote);
+
+        /** @var DonationNote $query */
+        $query = $repository->prepareQuery()
+            ->where('comment_ID', $donationNote->id)
+            ->get();
+
+        $this->assertEquals('im an updated note', $query->content);
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return void
+     *
+     * @throws Exception
+     */
+    public function testDeleteShouldRemoveDonationNoteFromTheDatabase()
+    {
+        /** @var Donor $donor */
+        $donor = Donor::factory()->create();
+
+        /** @var Donation $donation */
+        $donation = Donation::factory()->create(['donorId' => $donor->id]);
+
+        /** @var DonationNote $donationNote */
+        $donationNote = DonationNote::factory()->create(['donationId' => $donation->id]);
+
+        $repository = new DonationNotesRepository();
+
+        $repository->delete($donationNote);
+
+        /** @var DonationNote $query */
+        $query = $repository->prepareQuery()
+            ->where('comment_ID', $donation->id)
+            ->get();
+
+        $this->assertNull($query);
+    }
+}
diff --git a/tests/unit/tests/Donations/TestDonationRepository.php b/tests/unit/tests/Donations/Repositories/TestDonationRepository.php
similarity index 99%
rename from tests/unit/tests/Donations/TestDonationRepository.php
rename to tests/unit/tests/Donations/Repositories/TestDonationRepository.php
index 6dc9d199f7..5035a59a50 100644
--- a/tests/unit/tests/Donations/TestDonationRepository.php
+++ b/tests/unit/tests/Donations/Repositories/TestDonationRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace unit\tests\Donations;
+namespace unit\tests\Donations\Repositories;
 
 use Exception;
 use Give\Donations\Models\Donation;
diff --git a/tests/unit/tests/Framework/PaymentGateways/DonationSummaryTest.php b/tests/unit/tests/Framework/PaymentGateways/DonationSummaryTest.php
index 1d2887c47a..1388c71459 100644
--- a/tests/unit/tests/Framework/PaymentGateways/DonationSummaryTest.php
+++ b/tests/unit/tests/Framework/PaymentGateways/DonationSummaryTest.php
@@ -2,9 +2,8 @@
 
 namespace unit\tests\Framework\PaymentGateways;
 
+use Give\Donations\Models\Donation;
 use Give\Framework\PaymentGateways\DonationSummary;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
-use Give\ValueObjects\DonorInfo;
 use Give_Helper_Payment;
 use Give_Unit_Test_Case;
 
@@ -16,14 +15,13 @@ class DonationSummaryTest extends Give_Unit_Test_Case
     /** @test */
     public function it_summarizes_a_simple_donation()
     {
-        $paymentData = new GatewayPaymentData();
-        $paymentData->donorInfo = new DonorInfo();
-        $paymentData->donationId = Give_Helper_Payment::create_simple_payment();
+        $donationId = Give_Helper_Payment::create_simple_payment();
+        $donation = Donation::find($donationId);
 
-        $summary = new DonationSummary($paymentData);
+        $summary = new DonationSummary($donation);
 
         $this->assertEquals(
-            give_payment_gateway_donation_summary($this->get_legacy_donation_data($paymentData), false),
+            give_payment_gateway_donation_summary($this->get_legacy_donation_data($donation), false),
             $summary->getSummary()
         );
     }
@@ -31,15 +29,16 @@ public function it_summarizes_a_simple_donation()
     /** @test */
     public function it_summarizes_a_multilevel_donation()
     {
-        $paymentData = new GatewayPaymentData();
-        $paymentData->donorInfo = new DonorInfo();
-        $paymentData->donationId = Give_Helper_Payment::create_multilevel_payment(['result_type' => 'object']);
-        $paymentData->priceId = 2;
+        $donationId = Give_Helper_Payment::create_multilevel_payment(['result_type' => 'object']);
+        $donation = Donation::find($donationId);
+        $donation->levelId = '2';
 
-        $summary = new DonationSummary($paymentData);
+        $donation->save();
+
+        $summary = new DonationSummary($donation);
 
         $this->assertEquals(
-            give_payment_gateway_donation_summary($this->get_legacy_donation_data($paymentData), false),
+            give_payment_gateway_donation_summary($this->get_legacy_donation_data($donation), false),
             $summary->getSummary()
         );
     }
@@ -47,17 +46,18 @@ public function it_summarizes_a_multilevel_donation()
     /** @test */
     public function it_summarizes_a_donation_with_donor_name_and_email()
     {
-        $paymentData = new GatewayPaymentData();
-        $paymentData->donorInfo = new DonorInfo();
-        $paymentData->donorInfo->firstName = 'Tester';
-        $paymentData->donorInfo->lastName = 'Test';
-        $paymentData->donorInfo->email = 'tester@test.test';
-        $paymentData->donationId = Give_Helper_Payment::create_simple_payment();
+        $donationId = Give_Helper_Payment::create_simple_payment();
+        $donation = Donation::find($donationId);
+        $donation->firstName = 'Tester';
+        $donation->lastName = 'Test';
+        $donation->email = 'tester@test.test';
+
+        $donation->save();
 
-        $summary = new DonationSummary($paymentData);
+        $summary = new DonationSummary($donation);
 
         $this->assertEquals(
-            give_payment_gateway_donation_summary($this->get_legacy_donation_data($paymentData), true),
+            give_payment_gateway_donation_summary($this->get_legacy_donation_data($donation), true),
             $summary->getSummaryWithDonor()
         );
     }
@@ -65,18 +65,17 @@ public function it_summarizes_a_donation_with_donor_name_and_email()
     /** @test */
     public function it_summarizes_a_donation_with_filter()
     {
-        $paymentData = new GatewayPaymentData();
-        $paymentData->donorInfo = new DonorInfo();
-        $paymentData->donationId = Give_Helper_Payment::create_simple_payment();
+        $donationId = Give_Helper_Payment::create_simple_payment();
+        $donation = Donation::find($donationId);
 
         add_filter('give_payment_gateway_donation_summary', function ($summary) {
             return 'FILTERED SUMMARY';
         });
 
-        $summary = new DonationSummary($paymentData);
+        $summary = new DonationSummary($donation);
 
         $this->assertEquals(
-            give_payment_gateway_donation_summary($this->get_legacy_donation_data($paymentData), false),
+            give_payment_gateway_donation_summary($this->get_legacy_donation_data($donation), false),
             $summary->getSummary()
         );
     }
@@ -85,35 +84,34 @@ public function it_summarizes_a_donation_with_filter()
     public function it_summarizes_a_simple_donation_truncated()
     {
         $length = 10;
-        $paymentData = new GatewayPaymentData();
-        $paymentData->donorInfo = new DonorInfo();
-        $paymentData->donationId = Give_Helper_Payment::create_simple_payment();
+        $donationId = Give_Helper_Payment::create_simple_payment();
+        $donation = Donation::find($donationId);
 
-        $summary = new DonationSummary($paymentData);
+        $summary = new DonationSummary($donation);
         $summary->setLength($length);
 
         $this->assertEquals(
-            give_payment_gateway_donation_summary($this->get_legacy_donation_data($paymentData), false, $length),
+            give_payment_gateway_donation_summary($this->get_legacy_donation_data($donation), false, $length),
             $summary->getSummary()
         );
     }
 
-    public function get_legacy_donation_data(GatewayPaymentData $paymentData)
+    public function get_legacy_donation_data(Donation $donation)
     {
-        $formId = give_get_payment_form_id($paymentData->donationId);
+        $formId = give_get_payment_form_id($donation->id);
         return [
             'source_id' => 'pm_1234',
-            'donation_id' => $paymentData->donationId,
+            'donation_id' => $donation->id,
             'post_data' => [
                 'give-form-title' => get_the_title($formId),
                 'give-form-id' => $formId,
-                'give-price-id' => $paymentData->priceId,
+                'give-price-id' => $donation->levelId,
             ],
             'user_info' => [
-                'first_name' => $paymentData->donorInfo->firstName,
-                'last_name' => $paymentData->donorInfo->lastName,
+                'first_name' => $donation->firstName,
+                'last_name' => $donation->lastName,
             ],
-            'user_email' => $paymentData->donorInfo->email,
+            'user_email' => $donation->email,
         ];
     }
 }
diff --git a/tests/unit/tests/Framework/PaymentGateways/Traits/HasRouteMethodTest.php b/tests/unit/tests/Framework/PaymentGateways/Traits/HasRouteMethodTest.php
index 3b2b51b05c..80357f5139 100644
--- a/tests/unit/tests/Framework/PaymentGateways/Traits/HasRouteMethodTest.php
+++ b/tests/unit/tests/Framework/PaymentGateways/Traits/HasRouteMethodTest.php
@@ -1,10 +1,9 @@
 <?php
 
+use Give\Donations\Models\Donation;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Framework\PaymentGateways\PaymentGatewayRegister;
 use Give\Framework\PaymentGateways\SubscriptionModule;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
-use Give\PaymentGateways\DataTransferObjects\GatewaySubscriptionData;
 use Give\Subscriptions\Models\Subscription;
 
 /**
@@ -77,7 +76,7 @@ protected function gatewaySimpleRouteMethod($queryParams): string
         return __CLASS__ . __FUNCTION__;
     }
 
-    public function getLegacyFormFieldMarkup($formId, $args): string
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         return '';
     }
@@ -102,11 +101,11 @@ public function getPaymentMethodLabel(): string
         return self::id();
     }
 
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation)
     {
     }
 
-    public function refundDonation(\Give\Donations\Models\Donation $donation)
+    public function refundDonation(Donation $donation)
     {
         // TODO: Implement refundDonation() method.
     }
@@ -123,8 +122,8 @@ class GatewayRouteTestGatewaySubscriptionModule extends SubscriptionModule
     ];
 
     public function createSubscription(
-        GatewayPaymentData $paymentData,
-        GatewaySubscriptionData $subscriptionData
+        Donation $donation,
+        Subscription $subscription
     ) {
     }
 
diff --git a/tests/unit/tests/PaymentGateways/Gateways/Stripe/CreditCardGatewayTest.php b/tests/unit/tests/PaymentGateways/Gateways/Stripe/CreditCardGatewayTest.php
index 85b1e8b686..cdc5307386 100644
--- a/tests/unit/tests/PaymentGateways/Gateways/Stripe/CreditCardGatewayTest.php
+++ b/tests/unit/tests/PaymentGateways/Gateways/Stripe/CreditCardGatewayTest.php
@@ -3,9 +3,7 @@
 use Give\Framework\PaymentGateways\Commands\PaymentComplete;
 use Give\Framework\PaymentGateways\Commands\PaymentProcessing;
 use Give\Framework\PaymentGateways\Commands\RedirectOffsite;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Gateways\Stripe\CreditCardGateway;
-use Give\ValueObjects\DonorInfo;
 
 /**
  * @since 2.19.0
@@ -14,7 +12,8 @@ class CreditCardGatewayTest extends Give_Unit_Test_Case
 {
     public function setUp()
     {
-        parent::setUp();$this->setUpStripeAccounts();
+        parent::setUp();
+        $this->setUpStripeAccounts();
 
         $this->form = Give_Helper_Form::create_simple_form();
         $_POST['give-form-id'] = $this->form->get_ID();
@@ -26,11 +25,11 @@ public function it_creates_a_payment_that_is_complete()
         $_POST['give_stripe_payment_method'] = 'pm_1234';
         $gateway = new CreditCardGateway();
 
-        $this->mock(Give_Stripe_Payment_Intent::class, function() {
-           return new Give_Stripe_Payment_Intent( 'succeeded' );
+        $this->mock(Give_Stripe_Payment_Intent::class, function () {
+            return new Give_Stripe_Payment_Intent('succeeded');
         });
 
-        $this->assertInstanceOf( PaymentComplete::class, $gateway->createPayment( $this->getMockPaymentData() ) );
+        $this->assertInstanceOf(PaymentComplete::class, $gateway->createPayment($this->getDonationModel()));
     }
 
     /** @test */
@@ -39,11 +38,11 @@ public function it_creates_a_payment_that_is_processing()
         $_POST['give_stripe_payment_method'] = 'pm_1234';
         $gateway = new CreditCardGateway();
 
-        $this->mock(Give_Stripe_Payment_Intent::class, function() {
-            return new Give_Stripe_Payment_Intent( 'processing' );
+        $this->mock(Give_Stripe_Payment_Intent::class, function () {
+            return new Give_Stripe_Payment_Intent('processing');
         });
 
-        $this->assertInstanceOf( PaymentProcessing::class, $gateway->createPayment( $this->getMockPaymentData() ) );
+        $this->assertInstanceOf(PaymentProcessing::class, $gateway->createPayment($this->getDonationModel()));
     }
 
     /** @test */
@@ -52,22 +51,18 @@ public function it_creates_a_payment_that_requires_action()
         $_POST['give_stripe_payment_method'] = 'pm_1234';
         $gateway = new CreditCardGateway();
 
-        $this->mock(Give_Stripe_Payment_Intent::class, function() {
-           return new Give_Stripe_Payment_Intent( 'requires_action' );
+        $this->mock(Give_Stripe_Payment_Intent::class, function () {
+            return new Give_Stripe_Payment_Intent('requires_action');
         });
 
-        $this->assertInstanceOf( RedirectOffsite::class, $gateway->createPayment( $this->getMockPaymentData() ) );
+        $this->assertInstanceOf(RedirectOffsite::class, $gateway->createPayment($this->getDonationModel()));
     }
 
-    public function getMockPaymentData()
+    public function getDonationModel()
     {
-        $paymentData = new GatewayPaymentData;
-        $paymentData->donationId = 0;
-        $paymentData->price = '1.00';
-        $paymentData->currency = 'USD';
-        $paymentData->donorInfo = new DonorInfo();
-        $paymentData->donorInfo->email = 'tester@test.test';
-        return $paymentData;
+        $donationId = Give_Helper_Payment::create_simple_payment();
+
+        return \Give\Donations\Models\Donation::find($donationId);
     }
 
     private function setUpStripeAccounts()
@@ -105,31 +100,40 @@ private function setUpStripeAccounts()
         );
 
         // Set default account globally.
-        give_update_option( '_give_stripe_default_account', 'account_1' );
+        give_update_option('_give_stripe_default_account', 'account_1');
     }
 }
 
-class Give_Stripe_Customer {
-    public function get_id() {
+class Give_Stripe_Customer
+{
+    public function get_id()
+    {
         return 'cust_1234';
     }
 }
 
-class Give_Stripe_Payment_Intent {
+class Give_Stripe_Payment_Intent
+{
     protected $status;
-    public function __construct( $status ) {
+
+    public function __construct($status)
+    {
         $this->status = $status;
     }
-    public function create() {
-        return json_decode(json_encode([
-            'id' => 'pi_1234',
-            'status' => $this->status,
-            'client_secret' => 'pi_secret',
-            'next_action' => [
-                'redirect_to_url' => [
-                    'url' => '',
+
+    public function create()
+    {
+        return json_decode(
+            json_encode([
+                'id' => 'pi_1234',
+                'status' => $this->status,
+                'client_secret' => 'pi_secret',
+                'next_action' => [
+                    'redirect_to_url' => [
+                        'url' => '',
+                    ]
                 ]
-            ]
-        ]));
+            ])
+        );
     }
 }
diff --git a/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php b/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
index 965fff7f5c..343e31d686 100644
--- a/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
+++ b/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
@@ -122,12 +122,12 @@ public function getPaymentMethodLabel(): string
         return 'Credit Card';
     }
 
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         // TODO: Implement getLegacyFormFieldMarkup() method.
     }
 
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation)
     {
         // TODO: Implement createPayment() method.
     }
@@ -175,12 +175,12 @@ public function getPaymentMethodLabel(): string
         return 'PayPal';
     }
 
-    public function getLegacyFormFieldMarkup($formId, $args)
+    public function getLegacyFormFieldMarkup(int $formId, array $args): string
     {
         // TODO: Implement getLegacyFormFieldMarkup() method.
     }
 
-    public function createPayment(GatewayPaymentData $paymentData)
+    public function createPayment(Donation $donation)
     {
         // TODO: Implement createPayment() method.
     }

From 54cfc00b0eb7c90b4985fec7bba47229e9a9d065 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@impress.org>
Date: Mon, 16 May 2022 09:59:24 -0700
Subject: [PATCH 09/53] chore: bump platform PHP version to 7.0

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 454b8219d3..ea373ef873 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
     },
     "config": {
         "platform": {
-            "php": "5.6.40"
+            "php": ">=7.0"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,

From fa4e716dbf8206a6336c4535e7004163aa439432 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@impress.org>
Date: Mon, 16 May 2022 10:05:47 -0700
Subject: [PATCH 10/53] chore: lock platform php version to 7.0 to avoid
 installing packages on higher versions

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ea373ef873..30aca8bf06 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
     },
     "config": {
         "platform": {
-            "php": ">=7.0"
+            "php": "7.0"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,

From 54a43e9825606e36705229b5b2096f68ef05d8ce Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@impress.org>
Date: Mon, 16 May 2022 13:52:16 -0700
Subject: [PATCH 11/53] chore: remove Cypress and e2e tests in favor of Ghost
 Inspector

---
 .distignore                                   |    1 -
 .gitignore                                    |    5 -
 cypress.json                                  |   15 -
 package-lock.json                             | 2764 +----------------
 package.json                                  |    2 -
 tests/e2e/README.md                           |   18 -
 tests/e2e/fixtures/example.json               |    5 -
 tests/e2e/integration/logs/logs_page_spec.js  |   80 -
 .../onboarding/onboarding_wizard_spec.js      |  171 -
 .../integration/onboarding/setup_page_spec.js |   29 -
 tests/e2e/integration/sample_spec.js          |    8 -
 tests/e2e/plugins/index.js                    |   23 -
 tests/e2e/support/commands.js                 |   41 -
 tests/e2e/support/index.d.ts                  |   18 -
 tests/e2e/support/index.js                    |   20 -
 15 files changed, 71 insertions(+), 3129 deletions(-)
 delete mode 100644 cypress.json
 delete mode 100644 tests/e2e/README.md
 delete mode 100644 tests/e2e/fixtures/example.json
 delete mode 100644 tests/e2e/integration/logs/logs_page_spec.js
 delete mode 100644 tests/e2e/integration/onboarding/onboarding_wizard_spec.js
 delete mode 100644 tests/e2e/integration/onboarding/setup_page_spec.js
 delete mode 100644 tests/e2e/integration/sample_spec.js
 delete mode 100644 tests/e2e/plugins/index.js
 delete mode 100644 tests/e2e/support/commands.js
 delete mode 100644 tests/e2e/support/index.d.ts
 delete mode 100644 tests/e2e/support/index.js

diff --git a/.distignore b/.distignore
index 64695d3653..15edd1340b 100644
--- a/.distignore
+++ b/.distignore
@@ -32,7 +32,6 @@ jsconfig.json
 globals.d.ts
 tsconfig.json
 
-cypress.json
 sample-data/wordpress.sql
 sample-data/sample-data.numbers
 bower.json
diff --git a/.gitignore b/.gitignore
index e98ade911f..1b5241348c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,6 @@
 /tmp
 /tests/bin/tmp
 
-# Cypress
-/cypress
-/tests/e2e/videos
-/tests/e2e/screenshots
-
 # Numerous always-ignore extensions
 .diff
 .err
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index c285f70db7..0000000000
--- a/cypress.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "env": {
-        "wp_user": "admin",
-        "wp_pass": "password",
-        "site": {
-            "url": "http://localhost:8888"
-        }
-    },
-    "fixturesFolder": "tests/e2e/fixtues",
-    "integrationFolder": "tests/e2e/integration",
-    "pluginsFolder": "tests/e2e/plugins",
-    "screenshotsFolder": "tests/e2e/screenshots",
-    "videosFolder": "tests/e2e/videos",
-    "supportFile": "tests/e2e/support/index.js"
-}
diff --git a/package-lock.json b/package-lock.json
index d598ce76fa..82f0d25660 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
                 "@wordpress/hooks": "^3.3.1",
                 "@wordpress/i18n": "^3.19.0",
                 "@wordpress/server-side-render": "^3.1.3",
-                "accounting": "*",
+                "accounting": "latest",
                 "axios": "^0.21.2",
                 "chart.js": "^2.9.3",
                 "chartjs-plugin-crosshair": "^1.1.4",
@@ -36,10 +36,10 @@
                 "hint.css": "^2.5.1",
                 "iframe-resizer": "^4.2.10",
                 "jquery": "^3.6.0",
-                "jquery-chosen": "*",
-                "jquery.payment": "*",
+                "jquery-chosen": "latest",
+                "jquery.payment": "latest",
                 "lodash": "^4.17.21",
-                "magnific-popup": "*",
+                "magnific-popup": "latest",
                 "moment": "^2.24.0",
                 "prop-types": "^15.7.2",
                 "react": "^16.12.0",
@@ -58,7 +58,7 @@
                 "react-select": "^3.1.0",
                 "styled-components": "^5.2.1",
                 "swr": "^1.2.0",
-                "uiblocker": "*",
+                "uiblocker": "latest",
                 "vhtml": "^2.2.0"
             },
             "devDependencies": {
@@ -79,7 +79,6 @@
                 "axios-mock-adapter": "^1.18.2",
                 "babel-loader": "^8.2.2",
                 "babel-plugin-react-require": "^3.1.3",
-                "cypress": "^8.7.0",
                 "jest": "^24.9.0",
                 "jest-puppeteer": "^4.4.0",
                 "laravel-mix": "^6.0.34",
@@ -1804,73 +1803,6 @@
                 "node": ">=0.1.95"
             }
         },
-        "node_modules/@cypress/request": {
-            "version": "2.88.6",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.6.tgz",
-            "integrity": "sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ==",
-            "dev": true,
-            "dependencies": {
-                "aws-sign2": "~0.7.0",
-                "aws4": "^1.8.0",
-                "caseless": "~0.12.0",
-                "combined-stream": "~1.0.6",
-                "extend": "~3.0.2",
-                "forever-agent": "~0.6.1",
-                "form-data": "~2.3.2",
-                "har-validator": "~5.1.3",
-                "http-signature": "~1.2.0",
-                "is-typedarray": "~1.0.0",
-                "isstream": "~0.1.2",
-                "json-stringify-safe": "~5.0.1",
-                "mime-types": "~2.1.19",
-                "performance-now": "^2.1.0",
-                "qs": "~6.5.2",
-                "safe-buffer": "^5.1.2",
-                "tough-cookie": "~2.5.0",
-                "tunnel-agent": "^0.6.0",
-                "uuid": "^8.3.2"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/@cypress/request/node_modules/qs": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.6"
-            }
-        },
-        "node_modules/@cypress/request/node_modules/uuid": {
-            "version": "8.3.2",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-            "dev": true,
-            "bin": {
-                "uuid": "dist/bin/uuid"
-            }
-        },
-        "node_modules/@cypress/xvfb": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
-            "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^3.1.0",
-                "lodash.once": "^4.1.1"
-            }
-        },
-        "node_modules/@cypress/xvfb/node_modules/debug": {
-            "version": "3.2.7",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-            "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-            "dev": true,
-            "dependencies": {
-                "ms": "^2.1.1"
-            }
-        },
         "node_modules/@discoveryjs/json-ext": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
@@ -2869,27 +2801,6 @@
             "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
             "dev": true
         },
-        "node_modules/@mrmlnc/readdir-enhanced": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-            "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "call-me-maybe": "^1.0.1",
-                "glob-to-regexp": "^0.3.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@mrmlnc/readdir-enhanced/node_modules/glob-to-regexp": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-            "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-            "dev": true,
-            "peer": true
-        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3638,18 +3549,6 @@
                 "@types/node": "*"
             }
         },
-        "node_modules/@types/sinonjs__fake-timers": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz",
-            "integrity": "sha512-dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg==",
-            "dev": true
-        },
-        "node_modules/@types/sizzle": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-            "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-            "dev": true
-        },
         "node_modules/@types/sockjs": {
             "version": "0.3.33",
             "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
@@ -3659,101 +3558,12 @@
                 "@types/node": "*"
             }
         },
-        "node_modules/@types/source-list-map": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-            "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-            "dev": true,
-            "optional": true,
-            "peer": true
-        },
         "node_modules/@types/stack-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
             "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
             "dev": true
         },
-        "node_modules/@types/tapable": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz",
-            "integrity": "sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==",
-            "dev": true,
-            "optional": true,
-            "peer": true
-        },
-        "node_modules/@types/uglify-js": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",
-            "integrity": "sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "dependencies": {
-                "source-map": "^0.6.1"
-            }
-        },
-        "node_modules/@types/uglify-js/node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/@types/webpack": {
-            "version": "4.41.31",
-            "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
-            "integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "dependencies": {
-                "@types/node": "*",
-                "@types/tapable": "^1",
-                "@types/uglify-js": "*",
-                "@types/webpack-sources": "*",
-                "anymatch": "^3.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "node_modules/@types/webpack-sources": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
-            "integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "dependencies": {
-                "@types/node": "*",
-                "@types/source-list-map": "*",
-                "source-map": "^0.7.3"
-            }
-        },
-        "node_modules/@types/webpack-sources/node_modules/source-map": {
-            "version": "0.7.3",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-            "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@types/webpack/node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/@types/ws": {
             "version": "8.5.2",
             "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz",
@@ -3778,16 +3588,6 @@
             "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
             "dev": true
         },
-        "node_modules/@types/yauzl": {
-            "version": "2.9.2",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-            "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
         "node_modules/@use-gesture/core": {
             "version": "10.2.9",
             "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.9.tgz",
@@ -5783,12 +5583,12 @@
         "node_modules/accounting": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/accounting/-/accounting-0.4.1.tgz",
-            "integrity": "sha1-h91BA+/39EYPHhhvXGd+1s9WaIM="
+            "integrity": "sha512-RU6KY9Y5wllyaCNBo1W11ZOTnTHMMgOZkIwdOOs6W5ibMTp72i4xIbEA48djxVGqMNTUNbvrP/1nWg5Af5m2gQ=="
         },
         "node_modules/acorn": {
-            "version": "8.5.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
-            "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
+            "version": "8.7.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+            "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
             "dev": true,
             "bin": {
                 "acorn": "bin/acorn"
@@ -5995,15 +5795,6 @@
             "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
             "dev": true
         },
-        "node_modules/ansi-colors": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-            "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/ansi-escapes": {
             "version": "4.3.2",
             "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -6075,26 +5866,6 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/arch": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-            "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
         "node_modules/argparse": {
             "version": "1.0.10",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -6149,29 +5920,6 @@
             "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
             "dev": true
         },
-        "node_modules/array-union": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-            "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "array-uniq": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/array-uniq": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-            "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/array-unique": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -6210,16 +5958,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/arrify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-            "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/asn1": {
             "version": "0.2.4",
             "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -6299,12 +6037,6 @@
                 "node": ">=4"
             }
         },
-        "node_modules/async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-            "dev": true
-        },
         "node_modules/async-limiter": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
@@ -6317,15 +6049,6 @@
             "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
             "dev": true
         },
-        "node_modules/at-least-node": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4.0.0"
-            }
-        },
         "node_modules/atob": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -6818,18 +6541,6 @@
                 "file-uri-to-path": "1.0.0"
             }
         },
-        "node_modules/blob-util": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
-            "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
-            "dev": true
-        },
-        "node_modules/bluebird": {
-            "version": "3.7.2",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-            "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-            "dev": true
-        },
         "node_modules/blueimp-md5": {
             "version": "2.18.0",
             "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz",
@@ -7196,15 +6907,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/cachedir": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
-            "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/call-bind": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -7217,13 +6919,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/call-me-maybe": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-            "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-            "dev": true,
-            "peer": true
-        },
         "node_modules/caller-callsite": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -7382,15 +7077,6 @@
                 "chart.js": "^2.9.3"
             }
         },
-        "node_modules/check-more-types": {
-            "version": "2.24.0",
-            "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-            "integrity": "sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
         "node_modules/chokidar": {
             "version": "3.5.3",
             "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -7581,22 +7267,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/cli-truncate": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-            "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-            "dev": true,
-            "dependencies": {
-                "slice-ansi": "^3.0.0",
-                "string-width": "^4.2.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/cli-width": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
@@ -7854,15 +7524,6 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/common-tags": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
-            "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
         "node_modules/commondir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -8096,7 +7757,7 @@
             "version": "2.6.12",
             "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
             "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-            "deprecated": "core-js@<3.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
+            "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
             "dev": true,
             "hasInstallScript": true
         },
@@ -8755,264 +8416,6 @@
                 "node": ">=0.8"
             }
         },
-        "node_modules/cypress": {
-            "version": "8.7.0",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.7.0.tgz",
-            "integrity": "sha512-b1bMC3VQydC6sXzBMFnSqcvwc9dTZMgcaOzT0vpSD+Gq1yFc+72JDWi55sfUK5eIeNLAtWOGy1NNb6UlhMvB+Q==",
-            "dev": true,
-            "hasInstallScript": true,
-            "dependencies": {
-                "@cypress/request": "^2.88.6",
-                "@cypress/xvfb": "^1.2.4",
-                "@types/node": "^14.14.31",
-                "@types/sinonjs__fake-timers": "^6.0.2",
-                "@types/sizzle": "^2.3.2",
-                "arch": "^2.2.0",
-                "blob-util": "^2.0.2",
-                "bluebird": "^3.7.2",
-                "cachedir": "^2.3.0",
-                "chalk": "^4.1.0",
-                "check-more-types": "^2.24.0",
-                "cli-cursor": "^3.1.0",
-                "cli-table3": "~0.6.0",
-                "commander": "^5.1.0",
-                "common-tags": "^1.8.0",
-                "dayjs": "^1.10.4",
-                "debug": "^4.3.2",
-                "enquirer": "^2.3.6",
-                "eventemitter2": "^6.4.3",
-                "execa": "4.1.0",
-                "executable": "^4.1.1",
-                "extract-zip": "2.0.1",
-                "figures": "^3.2.0",
-                "fs-extra": "^9.1.0",
-                "getos": "^3.2.1",
-                "is-ci": "^3.0.0",
-                "is-installed-globally": "~0.4.0",
-                "lazy-ass": "^1.6.0",
-                "listr2": "^3.8.3",
-                "lodash": "^4.17.21",
-                "log-symbols": "^4.0.0",
-                "minimist": "^1.2.5",
-                "ospath": "^1.2.2",
-                "pretty-bytes": "^5.6.0",
-                "proxy-from-env": "1.0.0",
-                "ramda": "~0.27.1",
-                "request-progress": "^3.0.0",
-                "supports-color": "^8.1.1",
-                "tmp": "~0.2.1",
-                "untildify": "^4.0.0",
-                "url": "^0.11.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "cypress": "bin/cypress"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
-        "node_modules/cypress/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/cypress/node_modules/chalk": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-            "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/cypress/node_modules/chalk/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cypress/node_modules/ci-info": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-            "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-            "dev": true
-        },
-        "node_modules/cypress/node_modules/cli-table3": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz",
-            "integrity": "sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==",
-            "dev": true,
-            "dependencies": {
-                "object-assign": "^4.1.0",
-                "string-width": "^4.2.0"
-            },
-            "engines": {
-                "node": "10.* || >= 12.*"
-            },
-            "optionalDependencies": {
-                "colors": "^1.1.2"
-            }
-        },
-        "node_modules/cypress/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/cypress/node_modules/commander": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-            "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/cypress/node_modules/debug": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-            "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-            "dev": true,
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/cypress/node_modules/extract-zip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^4.1.1",
-                "get-stream": "^5.1.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "extract-zip": "cli.js"
-            },
-            "engines": {
-                "node": ">= 10.17.0"
-            },
-            "optionalDependencies": {
-                "@types/yauzl": "^2.9.1"
-            }
-        },
-        "node_modules/cypress/node_modules/fs-extra": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-            "dev": true,
-            "dependencies": {
-                "at-least-node": "^1.0.0",
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/cypress/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cypress/node_modules/is-ci": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-            "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-            "dev": true,
-            "dependencies": {
-                "ci-info": "^3.2.0"
-            },
-            "bin": {
-                "is-ci": "bin.js"
-            }
-        },
-        "node_modules/cypress/node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-            "dev": true,
-            "dependencies": {
-                "universalify": "^2.0.0"
-            },
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "node_modules/cypress/node_modules/proxy-from-env": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
-            "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
-            "dev": true
-        },
-        "node_modules/cypress/node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/cypress/node_modules/universalify": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-            "dev": true,
-            "engines": {
-                "node": ">= 10.0.0"
-            }
-        },
         "node_modules/dashdash": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -9047,16 +8450,10 @@
                 "webidl-conversions": "^4.0.2"
             }
         },
-        "node_modules/dayjs": {
-            "version": "1.10.5",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz",
-            "integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g==",
-            "dev": true
-        },
         "node_modules/debug": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
             "dependencies": {
                 "ms": "2.1.2"
             },
@@ -9464,43 +8861,6 @@
             "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
             "dev": true
         },
-        "node_modules/dir-glob": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-            "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "arrify": "^1.0.1",
-                "path-type": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/dir-glob/node_modules/path-type": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-            "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "pify": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/dir-glob/node_modules/pify": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-            "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/direction": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/direction/-/direction-1.0.4.tgz",
@@ -9837,18 +9197,6 @@
                 "node": ">=10.13.0"
             }
         },
-        "node_modules/enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-            "dev": true,
-            "dependencies": {
-                "ansi-colors": "^4.1.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
         "node_modules/entities": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
@@ -10166,12 +9514,6 @@
                 "node": ">= 0.6"
             }
         },
-        "node_modules/eventemitter2": {
-            "version": "6.4.4",
-            "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz",
-            "integrity": "sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw==",
-            "dev": true
-        },
         "node_modules/eventemitter3": {
             "version": "4.0.7",
             "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -10203,100 +9545,6 @@
             "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
             "dev": true
         },
-        "node_modules/execa": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-            "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
-            "dev": true,
-            "dependencies": {
-                "cross-spawn": "^7.0.0",
-                "get-stream": "^5.0.0",
-                "human-signals": "^1.1.1",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.0",
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2",
-                "strip-final-newline": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
-            }
-        },
-        "node_modules/execa/node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-            "dev": true,
-            "dependencies": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/execa/node_modules/path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/execa/node_modules/shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "dev": true,
-            "dependencies": {
-                "shebang-regex": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/execa/node_modules/shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/execa/node_modules/which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "node-which": "bin/node-which"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/executable": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-            "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
-            "dev": true,
-            "dependencies": {
-                "pify": "^2.2.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/exit": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -10794,16 +10042,6 @@
                 "node": ">= 10"
             }
         },
-        "node_modules/file-type": {
-            "version": "10.11.0",
-            "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
-            "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/file-uri-to-path": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -11370,15 +10608,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/getos": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
-            "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
-            "dev": true,
-            "dependencies": {
-                "async": "^3.2.0"
-            }
-        },
         "node_modules/getpass": {
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -11447,30 +10676,6 @@
                 "node": ">= 0.4"
             }
         },
-        "node_modules/global-dirs": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-            "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-            "dev": true,
-            "dependencies": {
-                "ini": "2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/global-dirs/node_modules/ini": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-            "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/globals": {
             "version": "11.12.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -11479,233 +10684,6 @@
                 "node": ">=4"
             }
         },
-        "node_modules/globby": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-            "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "array-union": "^1.0.1",
-                "dir-glob": "2.0.0",
-                "fast-glob": "^2.0.2",
-                "glob": "^7.1.2",
-                "ignore": "^3.3.5",
-                "pify": "^3.0.0",
-                "slash": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/globby/node_modules/@nodelib/fs.stat": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-            "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/globby/node_modules/braces": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-            "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "arr-flatten": "^1.1.0",
-                "array-unique": "^0.3.2",
-                "extend-shallow": "^2.0.1",
-                "fill-range": "^4.0.0",
-                "isobject": "^3.0.1",
-                "repeat-element": "^1.1.2",
-                "snapdragon": "^0.8.1",
-                "snapdragon-node": "^2.0.1",
-                "split-string": "^3.0.2",
-                "to-regex": "^3.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/braces/node_modules/extend-shallow": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "is-extendable": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/fast-glob": {
-            "version": "2.2.7",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-            "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "@mrmlnc/readdir-enhanced": "^2.2.1",
-                "@nodelib/fs.stat": "^1.1.2",
-                "glob-parent": "^3.1.0",
-                "is-glob": "^4.0.0",
-                "merge2": "^1.2.3",
-                "micromatch": "^3.1.10"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/globby/node_modules/fill-range": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-            "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "extend-shallow": "^2.0.1",
-                "is-number": "^3.0.0",
-                "repeat-string": "^1.6.1",
-                "to-regex-range": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/fill-range/node_modules/extend-shallow": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "is-extendable": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/glob-parent": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-            "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "is-glob": "^3.1.0",
-                "path-dirname": "^1.0.0"
-            }
-        },
-        "node_modules/globby/node_modules/glob-parent/node_modules/is-glob": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-            "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "is-extglob": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-            "dev": true,
-            "peer": true
-        },
-        "node_modules/globby/node_modules/is-number": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-            "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "kind-of": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/is-number/node_modules/kind-of": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "is-buffer": "^1.1.5"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/kind-of": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/micromatch": {
-            "version": "3.1.10",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-            "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "arr-diff": "^4.0.0",
-                "array-unique": "^0.3.2",
-                "braces": "^2.3.1",
-                "define-property": "^2.0.2",
-                "extend-shallow": "^3.0.2",
-                "extglob": "^2.0.4",
-                "fragment-cache": "^0.2.1",
-                "kind-of": "^6.0.2",
-                "nanomatch": "^1.2.9",
-                "object.pick": "^1.3.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/globby/node_modules/pify": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-            "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/globby/node_modules/to-regex-range": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-            "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "is-number": "^3.0.0",
-                "repeat-string": "^1.6.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/good-listener": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
@@ -12399,15 +11377,6 @@
                 "ms": "^2.1.1"
             }
         },
-        "node_modules/human-signals": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-            "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.12.0"
-            }
-        },
         "node_modules/iconv-lite": {
             "version": "0.4.24",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -12464,13 +11433,6 @@
                 "url": "https://github.com/davidjbradshaw/iframe-resizer/blob/master/FUNDING.md"
             }
         },
-        "node_modules/ignore": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-            "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-            "dev": true,
-            "peer": true
-        },
         "node_modules/image-size": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -12484,57 +11446,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/imagemin": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-6.1.0.tgz",
-            "integrity": "sha512-8ryJBL1CN5uSHpiBMX0rJw79C9F9aJqMnjGnrd/1CafegpNuA81RBAAru/jQQEOWlOJJlpRnlcVFF6wq+Ist0A==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "file-type": "^10.7.0",
-                "globby": "^8.0.1",
-                "make-dir": "^1.0.0",
-                "p-pipe": "^1.1.0",
-                "pify": "^4.0.1",
-                "replace-ext": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/imagemin/node_modules/make-dir": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-            "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-            "dev": true,
-            "peer": true,
-            "dependencies": {
-                "pify": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/imagemin/node_modules/make-dir/node_modules/pify": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-            "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/imagemin/node_modules/pify": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-            "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
         "node_modules/img-loader": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/img-loader/-/img-loader-4.0.0.tgz",
@@ -13112,9 +12023,9 @@
             }
         },
         "node_modules/is-glob": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
             "dev": true,
             "dependencies": {
                 "is-extglob": "^2.1.1"
@@ -13123,22 +12034,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/is-installed-globally": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-            "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-            "dev": true,
-            "dependencies": {
-                "global-dirs": "^3.0.0",
-                "is-path-inside": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/is-interactive": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -13300,18 +12195,6 @@
             "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
             "dev": true
         },
-        "node_modules/is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/is-weakref": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -16550,15 +15433,6 @@
                 "node": ">=10"
             }
         },
-        "node_modules/lazy-ass": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-            "integrity": "sha1-eZllXoZGwX8In90YfRUNMyTVRRM=",
-            "dev": true,
-            "engines": {
-                "node": "> 0.8"
-            }
-        },
         "node_modules/lazy-cache": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -16692,33 +15566,6 @@
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
             "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
         },
-        "node_modules/listr2": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.1.tgz",
-            "integrity": "sha512-pk4YBDA2cxtpM8iLHbz6oEsfZieJKHf6Pt19NlKaHZZVpqHyVs/Wqr7RfBBCeAFCJchGO7WQHVkUPZTvJMHk8w==",
-            "dev": true,
-            "dependencies": {
-                "cli-truncate": "^2.1.0",
-                "colorette": "^2.0.16",
-                "log-update": "^4.0.0",
-                "p-map": "^4.0.0",
-                "rxjs": "^6.6.7",
-                "through": "^2.3.8",
-                "wrap-ansi": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "enquirer": ">= 2.3.0 < 3"
-            }
-        },
-        "node_modules/listr2/node_modules/colorette": {
-            "version": "2.0.16",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-            "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-            "dev": true
-        },
         "node_modules/load-json-file": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -16831,12 +15678,6 @@
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
             "dev": true
         },
-        "node_modules/lodash.once": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-            "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
-            "dev": true
-        },
         "node_modules/lodash.sortby": {
             "version": "4.7.0",
             "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -16849,171 +15690,6 @@
             "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
             "dev": true
         },
-        "node_modules/log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/log-symbols/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/log-symbols/node_modules/chalk": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-            "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/log-symbols/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/log-symbols/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/log-symbols/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/log-update": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-            "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-            "dev": true,
-            "dependencies": {
-                "ansi-escapes": "^4.3.0",
-                "cli-cursor": "^3.1.0",
-                "slice-ansi": "^4.0.0",
-                "wrap-ansi": "^6.2.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/log-update/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/log-update/node_modules/astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/log-update/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/log-update/node_modules/slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-            }
-        },
-        "node_modules/log-update/node_modules/wrap-ansi": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/loose-envify": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -17327,9 +16003,9 @@
             "dev": true
         },
         "node_modules/minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
             "dev": true,
             "dependencies": {
                 "brace-expansion": "^1.1.7"
@@ -18263,12 +16939,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/ospath": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
-            "integrity": "sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=",
-            "dev": true
-        },
         "node_modules/p-cancelable": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -18377,16 +17047,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/p-pipe": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz",
-            "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/p-reduce": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
@@ -18545,13 +17205,6 @@
             "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
             "dev": true
         },
-        "node_modules/path-dirname": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-            "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-            "dev": true,
-            "peer": true
-        },
         "node_modules/path-exists": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -18630,12 +17283,6 @@
             "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
             "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
         },
-        "node_modules/php-parser": {
-            "version": "3.0.0-prerelease.9",
-            "resolved": "git+ssh://git@github.com/glayzzle/php-parser.git#3279b7ee9bd78b914b5b840edc749eee0fabbfd8",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
         "node_modules/picocolors": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -18652,15 +17299,6 @@
                 "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
-        "node_modules/pify": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-            "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/pirates": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
@@ -20323,18 +18961,6 @@
                 "node": ">=10.13.0"
             }
         },
-        "node_modules/pretty-bytes": {
-            "version": "5.6.0",
-            "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-            "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/pretty-format": {
             "version": "24.9.0",
             "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
@@ -20516,6 +19142,7 @@
             "version": "1.20.0",
             "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.20.0.tgz",
             "integrity": "sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==",
+            "deprecated": "Version no longer supported. Upgrade to @latest",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
@@ -20579,6 +19206,7 @@
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
             "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+            "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
             "engines": {
                 "node": ">=0.4.x"
             }
@@ -20620,12 +19248,6 @@
                 "performance-now": "^2.1.0"
             }
         },
-        "node_modules/ramda": {
-            "version": "0.27.1",
-            "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
-            "integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==",
-            "dev": true
-        },
         "node_modules/randombytes": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -21453,15 +20075,6 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/request-progress": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
-            "integrity": "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=",
-            "dev": true,
-            "dependencies": {
-                "throttleit": "^1.0.0"
-            }
-        },
         "node_modules/request-promise-core": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
@@ -21935,6 +20548,7 @@
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
             "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+            "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
             "dev": true,
             "dependencies": {
                 "@cnakazawa/watch": "^1.0.3",
@@ -22627,66 +21241,6 @@
             "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
             "dev": true
         },
-        "node_modules/slash": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-            "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-            "dev": true,
-            "peer": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/slice-ansi": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-            "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/slice-ansi/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
         "node_modules/snapdragon": {
             "version": "0.8.2",
             "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -22877,6 +21431,7 @@
             "version": "0.5.3",
             "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
             "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+            "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
             "dev": true,
             "dependencies": {
                 "atob": "^2.1.2",
@@ -22909,6 +21464,7 @@
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
             "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+            "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
             "dev": true
         },
         "node_modules/spawnd": {
@@ -23282,20 +21838,20 @@
             }
         },
         "node_modules/strip-ansi": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-            "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dependencies": {
-                "ansi-regex": "^5.0.0"
+                "ansi-regex": "^5.0.1"
             },
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/strip-ansi/node_modules/ansi-regex": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-            "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "engines": {
                 "node": ">=8"
             }
@@ -23950,12 +22506,6 @@
             "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
             "dev": true
         },
-        "node_modules/throttleit": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-            "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
-            "dev": true
-        },
         "node_modules/through": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -24001,18 +22551,6 @@
             "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
             "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
         },
-        "node_modules/tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dev": true,
-            "dependencies": {
-                "rimraf": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8.17.0"
-            }
-        },
         "node_modules/tmpl": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
@@ -24361,9 +22899,9 @@
             }
         },
         "node_modules/underscore": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-            "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+            "version": "1.13.3",
+            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.3.tgz",
+            "integrity": "sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA=="
         },
         "node_modules/unicode-canonical-property-names-ecmascript": {
             "version": "2.0.0",
@@ -24501,15 +23039,6 @@
             "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
             "dev": true
         },
-        "node_modules/untildify": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-            "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/uri-js": {
             "version": "4.4.1",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -25709,6 +24238,12 @@
                 "text-table": "^0.2.0"
             }
         },
+        "node_modules/wp-textdomain/node_modules/php-parser": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.0.3.tgz",
+            "integrity": "sha512-WjbrtYrwmLY9hpoKoq1+mVqJhT0dEVDZRWSpNIw2MpTw3VM/K4C6e0WR4KlU6G/XROkV7tpH4NesV2dDiPxqaw==",
+            "dev": true
+        },
         "node_modules/wrap-ansi": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -27138,68 +25673,6 @@
                 "minimist": "^1.2.0"
             }
         },
-        "@cypress/request": {
-            "version": "2.88.6",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.6.tgz",
-            "integrity": "sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ==",
-            "dev": true,
-            "requires": {
-                "aws-sign2": "~0.7.0",
-                "aws4": "^1.8.0",
-                "caseless": "~0.12.0",
-                "combined-stream": "~1.0.6",
-                "extend": "~3.0.2",
-                "forever-agent": "~0.6.1",
-                "form-data": "~2.3.2",
-                "har-validator": "~5.1.3",
-                "http-signature": "~1.2.0",
-                "is-typedarray": "~1.0.0",
-                "isstream": "~0.1.2",
-                "json-stringify-safe": "~5.0.1",
-                "mime-types": "~2.1.19",
-                "performance-now": "^2.1.0",
-                "qs": "~6.5.2",
-                "safe-buffer": "^5.1.2",
-                "tough-cookie": "~2.5.0",
-                "tunnel-agent": "^0.6.0",
-                "uuid": "^8.3.2"
-            },
-            "dependencies": {
-                "qs": {
-                    "version": "6.5.2",
-                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-                    "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-                    "dev": true
-                },
-                "uuid": {
-                    "version": "8.3.2",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-                    "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-                    "dev": true
-                }
-            }
-        },
-        "@cypress/xvfb": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
-            "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
-            "dev": true,
-            "requires": {
-                "debug": "^3.1.0",
-                "lodash.once": "^4.1.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.7",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-                    "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                }
-            }
-        },
         "@discoveryjs/json-ext": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
@@ -28040,26 +26513,6 @@
             "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
             "dev": true
         },
-        "@mrmlnc/readdir-enhanced": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-            "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-            "dev": true,
-            "peer": true,
-            "requires": {
-                "call-me-maybe": "^1.0.1",
-                "glob-to-regexp": "^0.3.0"
-            },
-            "dependencies": {
-                "glob-to-regexp": {
-                    "version": "0.3.0",
-                    "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-                    "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-                    "dev": true,
-                    "peer": true
-                }
-            }
-        },
         "@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -28726,18 +27179,6 @@
                 "@types/node": "*"
             }
         },
-        "@types/sinonjs__fake-timers": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz",
-            "integrity": "sha512-dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg==",
-            "dev": true
-        },
-        "@types/sizzle": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-            "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-            "dev": true
-        },
         "@types/sockjs": {
             "version": "0.3.33",
             "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
@@ -28747,98 +27188,12 @@
                 "@types/node": "*"
             }
         },
-        "@types/source-list-map": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-            "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-            "dev": true,
-            "optional": true,
-            "peer": true
-        },
         "@types/stack-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
             "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
             "dev": true
         },
-        "@types/tapable": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz",
-            "integrity": "sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==",
-            "dev": true,
-            "optional": true,
-            "peer": true
-        },
-        "@types/uglify-js": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",
-            "integrity": "sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "requires": {
-                "source-map": "^0.6.1"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true,
-                    "optional": true,
-                    "peer": true
-                }
-            }
-        },
-        "@types/webpack": {
-            "version": "4.41.31",
-            "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
-            "integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "requires": {
-                "@types/node": "*",
-                "@types/tapable": "^1",
-                "@types/uglify-js": "*",
-                "@types/webpack-sources": "*",
-                "anymatch": "^3.0.0",
-                "source-map": "^0.6.0"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true,
-                    "optional": true,
-                    "peer": true
-                }
-            }
-        },
-        "@types/webpack-sources": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
-            "integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
-            "dev": true,
-            "optional": true,
-            "peer": true,
-            "requires": {
-                "@types/node": "*",
-                "@types/source-list-map": "*",
-                "source-map": "^0.7.3"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.7.3",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                    "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-                    "dev": true,
-                    "optional": true,
-                    "peer": true
-                }
-            }
-        },
         "@types/ws": {
             "version": "8.5.2",
             "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz",
@@ -28863,16 +27218,6 @@
             "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
             "dev": true
         },
-        "@types/yauzl": {
-            "version": "2.9.2",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-            "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "@types/node": "*"
-            }
-        },
         "@use-gesture/core": {
             "version": "10.2.9",
             "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.9.tgz",
@@ -30502,12 +28847,12 @@
         "accounting": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/accounting/-/accounting-0.4.1.tgz",
-            "integrity": "sha1-h91BA+/39EYPHhhvXGd+1s9WaIM="
+            "integrity": "sha512-RU6KY9Y5wllyaCNBo1W11ZOTnTHMMgOZkIwdOOs6W5ibMTp72i4xIbEA48djxVGqMNTUNbvrP/1nWg5Af5m2gQ=="
         },
         "acorn": {
-            "version": "8.5.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
-            "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
+            "version": "8.7.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+            "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
             "dev": true
         },
         "acorn-globals": {
@@ -30668,12 +29013,6 @@
             "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
             "dev": true
         },
-        "ansi-colors": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-            "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-            "dev": true
-        },
         "ansi-escapes": {
             "version": "4.3.2",
             "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -30720,12 +29059,6 @@
                 "picomatch": "^2.0.4"
             }
         },
-        "arch": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-            "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
-            "dev": true
-        },
         "argparse": {
             "version": "1.0.10",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -30773,23 +29106,6 @@
             "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
             "dev": true
         },
-        "array-union": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-            "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-            "dev": true,
-            "peer": true,
-            "requires": {
-                "array-uniq": "^1.0.1"
-            }
-        },
-        "array-uniq": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-            "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-            "dev": true,
-            "peer": true
-        },
         "array-unique": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -30816,13 +29132,6 @@
                 "es-abstract": "^1.18.0-next.1"
             }
         },
-        "arrify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-            "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-            "dev": true,
-            "peer": true
-        },
         "asn1": {
             "version": "0.2.4",
             "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -30897,12 +29206,6 @@
             "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
             "dev": true
         },
-        "async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-            "dev": true
-        },
         "async-limiter": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
@@ -30915,12 +29218,6 @@
             "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
             "dev": true
         },
-        "at-least-node": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-            "dev": true
-        },
         "atob": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -31301,18 +29598,6 @@
                 "file-uri-to-path": "1.0.0"
             }
         },
-        "blob-util": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
-            "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
-            "dev": true
-        },
-        "bluebird": {
-            "version": "3.7.2",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-            "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-            "dev": true
-        },
         "blueimp-md5": {
             "version": "2.18.0",
             "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz",
@@ -31634,12 +29919,6 @@
                 "responselike": "^2.0.0"
             }
         },
-        "cachedir": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
-            "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
-            "dev": true
-        },
         "call-bind": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -31649,13 +29928,6 @@
                 "get-intrinsic": "^1.0.2"
             }
         },
-        "call-me-maybe": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-            "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-            "dev": true,
-            "peer": true
-        },
         "caller-callsite": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -31785,12 +30057,6 @@
                 "chart.js": "^2.9.3"
             }
         },
-        "check-more-types": {
-            "version": "2.24.0",
-            "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-            "integrity": "sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=",
-            "dev": true
-        },
         "chokidar": {
             "version": "3.5.3",
             "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -31937,16 +30203,6 @@
             "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
             "dev": true
         },
-        "cli-truncate": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-            "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-            "dev": true,
-            "requires": {
-                "slice-ansi": "^3.0.0",
-                "string-width": "^4.2.0"
-            }
-        },
         "cli-width": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
@@ -32166,12 +30422,6 @@
             "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
             "dev": true
         },
-        "common-tags": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
-            "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==",
-            "dev": true
-        },
         "commondir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -32902,199 +31152,6 @@
                 "fs-exists-sync": "^0.1.0"
             }
         },
-        "cypress": {
-            "version": "8.7.0",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.7.0.tgz",
-            "integrity": "sha512-b1bMC3VQydC6sXzBMFnSqcvwc9dTZMgcaOzT0vpSD+Gq1yFc+72JDWi55sfUK5eIeNLAtWOGy1NNb6UlhMvB+Q==",
-            "dev": true,
-            "requires": {
-                "@cypress/request": "^2.88.6",
-                "@cypress/xvfb": "^1.2.4",
-                "@types/node": "^14.14.31",
-                "@types/sinonjs__fake-timers": "^6.0.2",
-                "@types/sizzle": "^2.3.2",
-                "arch": "^2.2.0",
-                "blob-util": "^2.0.2",
-                "bluebird": "^3.7.2",
-                "cachedir": "^2.3.0",
-                "chalk": "^4.1.0",
-                "check-more-types": "^2.24.0",
-                "cli-cursor": "^3.1.0",
-                "cli-table3": "~0.6.0",
-                "commander": "^5.1.0",
-                "common-tags": "^1.8.0",
-                "dayjs": "^1.10.4",
-                "debug": "^4.3.2",
-                "enquirer": "^2.3.6",
-                "eventemitter2": "^6.4.3",
-                "execa": "4.1.0",
-                "executable": "^4.1.1",
-                "extract-zip": "2.0.1",
-                "figures": "^3.2.0",
-                "fs-extra": "^9.1.0",
-                "getos": "^3.2.1",
-                "is-ci": "^3.0.0",
-                "is-installed-globally": "~0.4.0",
-                "lazy-ass": "^1.6.0",
-                "listr2": "^3.8.3",
-                "lodash": "^4.17.21",
-                "log-symbols": "^4.0.0",
-                "minimist": "^1.2.5",
-                "ospath": "^1.2.2",
-                "pretty-bytes": "^5.6.0",
-                "proxy-from-env": "1.0.0",
-                "ramda": "~0.27.1",
-                "request-progress": "^3.0.0",
-                "supports-color": "^8.1.1",
-                "tmp": "~0.2.1",
-                "untildify": "^4.0.0",
-                "url": "^0.11.0",
-                "yauzl": "^2.10.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-                    "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    },
-                    "dependencies": {
-                        "supports-color": {
-                            "version": "7.2.0",
-                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                            "dev": true,
-                            "requires": {
-                                "has-flag": "^4.0.0"
-                            }
-                        }
-                    }
-                },
-                "ci-info": {
-                    "version": "3.2.0",
-                    "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-                    "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-                    "dev": true
-                },
-                "cli-table3": {
-                    "version": "0.6.0",
-                    "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz",
-                    "integrity": "sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==",
-                    "dev": true,
-                    "requires": {
-                        "colors": "^1.1.2",
-                        "object-assign": "^4.1.0",
-                        "string-width": "^4.2.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "commander": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-                    "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-                    "dev": true
-                },
-                "debug": {
-                    "version": "4.3.2",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-                    "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                },
-                "extract-zip": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-                    "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-                    "dev": true,
-                    "requires": {
-                        "@types/yauzl": "^2.9.1",
-                        "debug": "^4.1.1",
-                        "get-stream": "^5.1.0",
-                        "yauzl": "^2.10.0"
-                    }
-                },
-                "fs-extra": {
-                    "version": "9.1.0",
-                    "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-                    "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-                    "dev": true,
-                    "requires": {
-                        "at-least-node": "^1.0.0",
-                        "graceful-fs": "^4.2.0",
-                        "jsonfile": "^6.0.1",
-                        "universalify": "^2.0.0"
-                    }
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "is-ci": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-                    "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-                    "dev": true,
-                    "requires": {
-                        "ci-info": "^3.2.0"
-                    }
-                },
-                "jsonfile": {
-                    "version": "6.1.0",
-                    "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-                    "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.1.6",
-                        "universalify": "^2.0.0"
-                    }
-                },
-                "proxy-from-env": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
-                    "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "8.1.1",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-                    "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "universalify": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-                    "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-                    "dev": true
-                }
-            }
-        },
         "dashdash": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -33128,16 +31185,10 @@
                 }
             }
         },
-        "dayjs": {
-            "version": "1.10.5",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz",
-            "integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g==",
-            "dev": true
-        },
         "debug": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
             "requires": {
                 "ms": "2.1.2"
             }
@@ -33441,36 +31492,6 @@
                 }
             }
         },
-        "dir-glob": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-            "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-            "dev": true,
-            "peer": true,
-            "requires": {
-                "arrify": "^1.0.1",
-                "path-type": "^3.0.0"
-            },
-            "dependencies": {
-                "path-type": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-                    "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "pify": "^3.0.0"
-                    }
-                },
-                "pify": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-                    "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-                    "dev": true,
-                    "peer": true
-                }
-            }
-        },
         "direction": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/direction/-/direction-1.0.4.tgz",
@@ -33756,15 +31777,6 @@
                 "tapable": "^2.2.0"
             }
         },
-        "enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-            "dev": true,
-            "requires": {
-                "ansi-colors": "^4.1.1"
-            }
-        },
         "entities": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
@@ -34001,12 +32013,6 @@
             "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
             "dev": true
         },
-        "eventemitter2": {
-            "version": "6.4.4",
-            "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz",
-            "integrity": "sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw==",
-            "dev": true
-        },
         "eventemitter3": {
             "version": "4.0.7",
             "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -34035,75 +32041,6 @@
             "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
             "dev": true
         },
-        "execa": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-            "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
-            "dev": true,
-            "requires": {
-                "cross-spawn": "^7.0.0",
-                "get-stream": "^5.0.0",
-                "human-signals": "^1.1.1",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.0",
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2",
-                "strip-final-newline": "^2.0.0"
-            },
-            "dependencies": {
-                "cross-spawn": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-                    "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-                    "dev": true,
-                    "requires": {
-                        "path-key": "^3.1.0",
-                        "shebang-command": "^2.0.0",
-                        "which": "^2.0.1"
-                    }
-                },
-                "path-key": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-                    "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-                    "dev": true
-                },
-                "shebang-command": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-                    "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-                    "dev": true,
-                    "requires": {
-                        "shebang-regex": "^3.0.0"
-                    }
-                },
-                "shebang-regex": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-                    "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-                    "dev": true
-                },
-                "which": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-                    "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-                    "dev": true,
-                    "requires": {
-                        "isexe": "^2.0.0"
-                    }
-                }
-            }
-        },
-        "executable": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-            "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
-            "dev": true,
-            "requires": {
-                "pify": "^2.2.0"
-            }
-        },
         "exit": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -34523,13 +32460,6 @@
                 "tslib": "^2.0.3"
             }
         },
-        "file-type": {
-            "version": "10.11.0",
-            "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
-            "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
-            "dev": true,
-            "peer": true
-        },
         "file-uri-to-path": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -34944,15 +32874,6 @@
             "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
             "dev": true
         },
-        "getos": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
-            "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
-            "dev": true,
-            "requires": {
-                "async": "^3.2.0"
-            }
-        },
         "getpass": {
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -35009,223 +32930,11 @@
                 "is-symbol": "^1.0.1"
             }
         },
-        "global-dirs": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-            "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-            "dev": true,
-            "requires": {
-                "ini": "2.0.0"
-            },
-            "dependencies": {
-                "ini": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-                    "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-                    "dev": true
-                }
-            }
-        },
         "globals": {
             "version": "11.12.0",
             "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
             "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
         },
-        "globby": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-            "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-            "dev": true,
-            "peer": true,
-            "requires": {
-                "array-union": "^1.0.1",
-                "dir-glob": "2.0.0",
-                "fast-glob": "^2.0.2",
-                "glob": "^7.1.2",
-                "ignore": "^3.3.5",
-                "pify": "^3.0.0",
-                "slash": "^1.0.0"
-            },
-            "dependencies": {
-                "@nodelib/fs.stat": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-                    "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-                    "dev": true,
-                    "peer": true
-                },
-                "braces": {
-                    "version": "2.3.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-                    "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "arr-flatten": "^1.1.0",
-                        "array-unique": "^0.3.2",
-                        "extend-shallow": "^2.0.1",
-                        "fill-range": "^4.0.0",
-                        "isobject": "^3.0.1",
-                        "repeat-element": "^1.1.2",
-                        "snapdragon": "^0.8.1",
-                        "snapdragon-node": "^2.0.1",
-                        "split-string": "^3.0.2",
-                        "to-regex": "^3.0.1"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "peer": true,
-                            "requires": {
-                                "is-extendable": "^0.1.0"
-                            }
-                        }
-                    }
-                },
-                "fast-glob": {
-                    "version": "2.2.7",
-                    "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-                    "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "@mrmlnc/readdir-enhanced": "^2.2.1",
-                        "@nodelib/fs.stat": "^1.1.2",
-                        "glob-parent": "^3.1.0",
-                        "is-glob": "^4.0.0",
-                        "merge2": "^1.2.3",
-                        "micromatch": "^3.1.10"
-                    }
-                },
-                "fill-range": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-                    "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "extend-shallow": "^2.0.1",
-                        "is-number": "^3.0.0",
-                        "repeat-string": "^1.6.1",
-                        "to-regex-range": "^2.1.0"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "peer": true,
-                            "requires": {
-                                "is-extendable": "^0.1.0"
-                            }
-                        }
-                    }
-                },
-                "glob-parent": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-                    "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "is-glob": "^3.1.0",
-                        "path-dirname": "^1.0.0"
-                    },
-                    "dependencies": {
-                        "is-glob": {
-                            "version": "3.1.0",
-                            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-                            "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-                            "dev": true,
-                            "peer": true,
-                            "requires": {
-                                "is-extglob": "^2.1.0"
-                            }
-                        }
-                    }
-                },
-                "is-buffer": {
-                    "version": "1.1.6",
-                    "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-                    "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-                    "dev": true,
-                    "peer": true
-                },
-                "is-number": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                    "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "kind-of": "^3.0.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "peer": true,
-                            "requires": {
-                                "is-buffer": "^1.1.5"
-                            }
-                        }
-                    }
-                },
-                "kind-of": {
-                    "version": "6.0.3",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-                    "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-                    "dev": true,
-                    "peer": true
-                },
-                "micromatch": {
-                    "version": "3.1.10",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-                    "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "arr-diff": "^4.0.0",
-                        "array-unique": "^0.3.2",
-                        "braces": "^2.3.1",
-                        "define-property": "^2.0.2",
-                        "extend-shallow": "^3.0.2",
-                        "extglob": "^2.0.4",
-                        "fragment-cache": "^0.2.1",
-                        "kind-of": "^6.0.2",
-                        "nanomatch": "^1.2.9",
-                        "object.pick": "^1.3.0",
-                        "regex-not": "^1.0.0",
-                        "snapdragon": "^0.8.1",
-                        "to-regex": "^3.0.2"
-                    }
-                },
-                "pify": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-                    "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-                    "dev": true,
-                    "peer": true
-                },
-                "to-regex-range": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-                    "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "is-number": "^3.0.0",
-                        "repeat-string": "^1.6.1"
-                    }
-                }
-            }
-        },
         "good-listener": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
@@ -35793,12 +33502,6 @@
                 }
             }
         },
-        "human-signals": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-            "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-            "dev": true
-        },
         "iconv-lite": {
             "version": "0.4.24",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -35826,13 +33529,6 @@
             "resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-4.3.2.tgz",
             "integrity": "sha512-gOWo2hmdPjMQsQ+zTKbses08mDfDEMh4NneGQNP4qwePYujY1lguqP6gnbeJkf154gojWlBhIltlgnMfYjGHWA=="
         },
-        "ignore": {
-            "version": "3.3.10",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-            "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-            "dev": true,
-            "peer": true
-        },
         "image-size": {
             "version": "0.5.5",
             "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -35840,49 +33536,6 @@
             "dev": true,
             "optional": true
         },
-        "imagemin": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-6.1.0.tgz",
-            "integrity": "sha512-8ryJBL1CN5uSHpiBMX0rJw79C9F9aJqMnjGnrd/1CafegpNuA81RBAAru/jQQEOWlOJJlpRnlcVFF6wq+Ist0A==",
-            "dev": true,
-            "peer": true,
-            "requires": {
-                "file-type": "^10.7.0",
-                "globby": "^8.0.1",
-                "make-dir": "^1.0.0",
-                "p-pipe": "^1.1.0",
-                "pify": "^4.0.1",
-                "replace-ext": "^1.0.0"
-            },
-            "dependencies": {
-                "make-dir": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-                    "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-                    "dev": true,
-                    "peer": true,
-                    "requires": {
-                        "pify": "^3.0.0"
-                    },
-                    "dependencies": {
-                        "pify": {
-                            "version": "3.0.0",
-                            "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-                            "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-                            "dev": true,
-                            "peer": true
-                        }
-                    }
-                },
-                "pify": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-                    "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-                    "dev": true,
-                    "peer": true
-                }
-            }
-        },
         "img-loader": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/img-loader/-/img-loader-4.0.0.tgz",
@@ -36293,24 +33946,14 @@
             "dev": true
         },
         "is-glob": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
             "dev": true,
             "requires": {
                 "is-extglob": "^2.1.1"
             }
         },
-        "is-installed-globally": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-            "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-            "dev": true,
-            "requires": {
-                "global-dirs": "^3.0.0",
-                "is-path-inside": "^3.0.2"
-            }
-        },
         "is-interactive": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -36415,12 +34058,6 @@
             "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
             "dev": true
         },
-        "is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true
-        },
         "is-weakref": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -38877,12 +36514,6 @@
                 }
             }
         },
-        "lazy-ass": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-            "integrity": "sha1-eZllXoZGwX8In90YfRUNMyTVRRM=",
-            "dev": true
-        },
         "lazy-cache": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -38979,29 +36610,6 @@
             "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
             "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
         },
-        "listr2": {
-            "version": "3.13.1",
-            "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.1.tgz",
-            "integrity": "sha512-pk4YBDA2cxtpM8iLHbz6oEsfZieJKHf6Pt19NlKaHZZVpqHyVs/Wqr7RfBBCeAFCJchGO7WQHVkUPZTvJMHk8w==",
-            "dev": true,
-            "requires": {
-                "cli-truncate": "^2.1.0",
-                "colorette": "^2.0.16",
-                "log-update": "^4.0.0",
-                "p-map": "^4.0.0",
-                "rxjs": "^6.6.7",
-                "through": "^2.3.8",
-                "wrap-ansi": "^7.0.0"
-            },
-            "dependencies": {
-                "colorette": {
-                    "version": "2.0.16",
-                    "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-                    "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-                    "dev": true
-                }
-            }
-        },
         "load-json-file": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -39097,12 +36705,6 @@
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
             "dev": true
         },
-        "lodash.once": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-            "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
-            "dev": true
-        },
         "lodash.sortby": {
             "version": "4.7.0",
             "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -39115,121 +36717,6 @@
             "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
             "dev": true
         },
-        "log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-            "dev": true,
-            "requires": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-                    "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "log-update": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-            "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-            "dev": true,
-            "requires": {
-                "ansi-escapes": "^4.3.0",
-                "cli-cursor": "^3.1.0",
-                "slice-ansi": "^4.0.0",
-                "wrap-ansi": "^6.2.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "astral-regex": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-                    "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "slice-ansi": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-                    "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "astral-regex": "^2.0.0",
-                        "is-fullwidth-code-point": "^3.0.0"
-                    }
-                },
-                "wrap-ansi": {
-                    "version": "6.2.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "string-width": "^4.1.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                }
-            }
-        },
         "loose-envify": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -39474,9 +36961,9 @@
             "dev": true
         },
         "minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
             "dev": true,
             "requires": {
                 "brace-expansion": "^1.1.7"
@@ -40222,12 +37709,6 @@
             "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
             "dev": true
         },
-        "ospath": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
-            "integrity": "sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=",
-            "dev": true
-        },
         "p-cancelable": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -40299,13 +37780,6 @@
                 "aggregate-error": "^3.0.0"
             }
         },
-        "p-pipe": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz",
-            "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=",
-            "dev": true,
-            "peer": true
-        },
         "p-reduce": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
@@ -40436,13 +37910,6 @@
             "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
             "dev": true
         },
-        "path-dirname": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-            "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-            "dev": true,
-            "peer": true
-        },
         "path-exists": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -40506,11 +37973,6 @@
             "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
             "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
         },
-        "php-parser": {
-            "version": "git+ssh://git@github.com/glayzzle/php-parser.git#3279b7ee9bd78b914b5b840edc749eee0fabbfd8",
-            "dev": true,
-            "from": "php-parser@^3.0.0-prerelease.8"
-        },
         "picocolors": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -40521,12 +37983,6 @@
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
             "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
         },
-        "pify": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-            "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-            "dev": true
-        },
         "pirates": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
@@ -41833,12 +39289,6 @@
             "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==",
             "dev": true
         },
-        "pretty-bytes": {
-            "version": "5.6.0",
-            "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-            "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-            "dev": true
-        },
         "pretty-format": {
             "version": "24.9.0",
             "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
@@ -42073,12 +39523,6 @@
                 "performance-now": "^2.1.0"
             }
         },
-        "ramda": {
-            "version": "0.27.1",
-            "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
-            "integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==",
-            "dev": true
-        },
         "randombytes": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -42747,15 +40191,6 @@
                 }
             }
         },
-        "request-progress": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
-            "integrity": "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=",
-            "dev": true,
-            "requires": {
-                "throttleit": "^1.0.0"
-            }
-        },
         "request-promise-core": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
@@ -43677,50 +41112,6 @@
             "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
             "dev": true
         },
-        "slash": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-            "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-            "dev": true,
-            "peer": true
-        },
-        "slice-ansi": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-            "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "astral-regex": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-                    "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-                    "dev": true
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                }
-            }
-        },
         "snapdragon": {
             "version": "0.8.2",
             "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -44233,17 +41624,17 @@
             }
         },
         "strip-ansi": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-            "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "requires": {
-                "ansi-regex": "^5.0.0"
+                "ansi-regex": "^5.0.1"
             },
             "dependencies": {
                 "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+                    "version": "5.0.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
                 }
             }
         },
@@ -44736,12 +42127,6 @@
             "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
             "dev": true
         },
-        "throttleit": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-            "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
-            "dev": true
-        },
         "through": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -44784,15 +42169,6 @@
             "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
             "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
         },
-        "tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dev": true,
-            "requires": {
-                "rimraf": "^3.0.0"
-            }
-        },
         "tmpl": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
@@ -45065,9 +42441,9 @@
             }
         },
         "underscore": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-            "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+            "version": "1.13.3",
+            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.3.tgz",
+            "integrity": "sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA=="
         },
         "unicode-canonical-property-names-ecmascript": {
             "version": "2.0.0",
@@ -45179,12 +42555,6 @@
                 }
             }
         },
-        "untildify": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-            "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-            "dev": true
-        },
         "uri-js": {
             "version": "4.4.1",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -46104,6 +43474,14 @@
                 "moment": "^2.24.0",
                 "php-parser": "^3.0.0-prerelease.8",
                 "text-table": "^0.2.0"
+            },
+            "dependencies": {
+                "php-parser": {
+                    "version": "3.0.3",
+                    "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.0.3.tgz",
+                    "integrity": "sha512-WjbrtYrwmLY9hpoKoq1+mVqJhT0dEVDZRWSpNIw2MpTw3VM/K4C6e0WR4KlU6G/XROkV7tpH4NesV2dDiPxqaw==",
+                    "dev": true
+                }
             }
         },
         "wrap-ansi": {
diff --git a/package.json b/package.json
index 9589e033e9..654ab96e94 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
         "production": "mix --production",
         "build": "mix --production",
         "watch": "mix watch",
-        "test:e2e": "cypress open",
         "env": "wp-env"
     },
     "repository": {
@@ -38,7 +37,6 @@
         "axios-mock-adapter": "^1.18.2",
         "babel-loader": "^8.2.2",
         "babel-plugin-react-require": "^3.1.3",
-        "cypress": "^8.7.0",
         "jest": "^24.9.0",
         "jest-puppeteer": "^4.4.0",
         "laravel-mix": "^6.0.34",
diff --git a/tests/e2e/README.md b/tests/e2e/README.md
deleted file mode 100644
index f3f84bc50f..0000000000
--- a/tests/e2e/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# GiveWP e2e testing
-
-End-to-end testing (e2e) checks whether GiveWP's features display and function as intended. These tests focus on the output of the webpage and interactions with it.
-
-## How to run the tests?
-
-### Prerequisites
-These tests run inside a dockerized container, so it is necessary that you have the [Docker Engine](https://docs.docker.com/install/) and [docker-compose](https://docs.docker.com/compose/install/) installed on your system. For a quick installation from scratch, you can simply install the [Docker Desktop app](https://www.docker.com/products/docker-desktop).
-
-A sample `wordpress.sql` is provided within the `/sample-data/` folder that has a few sample forms, donations, and donors to test in various combinations.
-
-### Testing
-
-1. Start local development environment (with docker) by running `npm run env start`.
-1. Run `npm run test:e2e` to open the Cypress UI test runner in the browser.
-1. Stop the local development environment by running `npm run env stop`.
-### Learn More
-You can find more information about what e2e testing achieves, how e2e tests are implemented in GiveWP, and how to write your own tests via the [GiveWP dev manual](https://app.gitbook.com/@give/s/givewp/testing/types-of-tests/end-to-end-testing). Happy testing!
diff --git a/tests/e2e/fixtures/example.json b/tests/e2e/fixtures/example.json
deleted file mode 100644
index 519902d71a..0000000000
--- a/tests/e2e/fixtures/example.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "name": "Using fixtures to represent data",
-    "email": "hello@cypress.io",
-    "body": "Fixtures are a great way to mock data for responses to routes"
-}
diff --git a/tests/e2e/integration/logs/logs_page_spec.js b/tests/e2e/integration/logs/logs_page_spec.js
deleted file mode 100644
index eaf42bf679..0000000000
--- a/tests/e2e/integration/logs/logs_page_spec.js
+++ /dev/null
@@ -1,80 +0,0 @@
-const cy = window.cy;
-const baseURL = window.baseURL;
-
-describe( 'Test Logs page', function() {
-	it( 'can use logs table', function() {
-		// Flush logs
-		cy.exec( 'wp-env run cli wp give flush-logs' );
-
-		// Seed logs
-		cy.exec( 'wp-env run cli "wp give test-logs --type=notice --category=CypressCategory --count=5"' );
-		cy.exec( 'wp-env run cli "wp give test-logs --type=error --source=CypressSource"' );
-
-		cy.visit( baseURL + '/wp-admin/edit.php?post_type=give_forms&page=give-tools&tab=logs' );
-		// Logs table is visible
-		cy.getByTest( 'logs-table' ).should( 'exist' );
-
-		// Do we have logs displayed
-		cy.getByTest( 'logs-table' ).find( '.give-table-row' ).should( 'exist' );
-
-		// View log details
-		cy.getByTest( 'view-log' ).eq( 0 ).click();
-		cy.getByTest( 'log-modal' ).should( 'exist' );
-
-		// Close log details
-		cy.getByTest( 'log-modal-close' ).click();
-		cy.getByTest( 'log-modal' ).should( 'not.exist' );
-
-		// Check pagination
-		cy.get( '.tablenav-pages-navspan' ).last().click();
-		cy.getByTest( 'logs-table' ).find( '.give-table-row' ).should( 'exist' );
-
-		// Sort by status
-		cy.getByTest( 'logs-status-dropdown' ).select( 'notice' );
-		cy.getByTest( 'logs-status-dropdown' ).should( 'have.value', 'notice' );
-
-		// Wait for the react state to update the DOM
-		cy.wait( 100 );
-
-		// Check sorted
-		cy.getByTest( 'logs-table' ).find( '.give-table-row' ).each( ( row ) => {
-			cy.wrap( row.children().eq( 0 ) ).should( 'contain.text', 'Notice' );
-		} );
-
-		// Reset status sort
-		cy.getByTest( 'logs-status-dropdown' ).select( 'All statuses' );
-
-		// Sort by Category
-		cy.getByTest( 'logs-category-dropdown' ).select( 'CypressCategory' );
-		cy.getByTest( 'logs-category-dropdown' ).should( 'have.value', 'CypressCategory' );
-
-		// Wait for the react state to update the DOM
-		cy.wait( 100 );
-
-		// Check sorted
-		cy.getByTest( 'logs-table' ).find( '.give-table-row' ).each( ( row ) => {
-			cy.wrap( row.children().eq( 1 ) ).should( 'contain.text', 'CypressCategory' );
-		} );
-
-		// Reset category sort
-		cy.getByTest( 'logs-category-dropdown' ).select( 'All categories' );
-
-		// Sort by Source
-		cy.getByTest( 'logs-source-dropdown' ).select( 'CypressSource' );
-		cy.getByTest( 'logs-source-dropdown' ).should( 'have.value', 'CypressSource' );
-
-		// Wait for the react state to update the DOM
-		cy.wait( 100 );
-
-		// Check sorted
-		cy.getByTest( 'logs-table' ).find( '.give-table-row' ).each( ( row ) => {
-			cy.wrap( row.children().eq( 2 ) ).should( 'contain.text', 'CypressSource' );
-		} );
-
-		// Flush logs
-		cy.getByTest( 'flush-logs-btn' ).click();
-		cy.getByTest( 'flush-logs-confirm-btn' ).click();
-		cy.getByTest( 'logs-table' ).find( '.give-table-row' ).should( 'not.exist' );
-	} );
-} );
-
diff --git a/tests/e2e/integration/onboarding/onboarding_wizard_spec.js b/tests/e2e/integration/onboarding/onboarding_wizard_spec.js
deleted file mode 100644
index 88fce39f3c..0000000000
--- a/tests/e2e/integration/onboarding/onboarding_wizard_spec.js
+++ /dev/null
@@ -1,171 +0,0 @@
-const cy = window.cy;
-const baseURL = window.baseURL;
-
-/**
- * Test interactions and functionality required to utilize the Onboarding Wizard
- */
-
-// First, describe this spec, and what you are testing
-describe( 'Test onboarding wizard', function() {
-	// For reach test, describe what it aims to check
-	it( 'can enable setup page', function() {
-		cy.visit( baseURL + '/wp-admin/edit.php?post_type=give_forms&page=give-settings&tab=advanced' );
-
-		// Target inputs by their name attribute
-		cy.get( 'input[name="setup_page_enabled"][value="enabled"]' ).click();
-		cy.get( 'input[name="save"]' ).click();
-		cy.visit( baseURL + '/wp-admin' );
-
-		// Be sure to include some assertion (here, that a link to the Setup Page should now exist)
-		cy.get( 'a[href="edit.php?post_type=give_forms&page=give-setup"]' ).should( 'exist' );
-	} );
-
-	it( 'can open the onboarding wizard', function() {
-		cy.visit( baseURL + '/wp-admin/edit.php?post_type=give_forms&page=give-setup' );
-
-		// When not an input or anchor tag, use get by test to target elements by their data-givewp-test attribute
-		cy.getByTest( 'setup-configuration' ).click();
-		cy.getByTest( 'intro-continue-button' ).should( 'exist' );
-	} );
-
-	it( 'can dismess onboarding wizard', function() {
-		cy.visit( baseURL + '/wp-admin/?page=give-onboarding-wizard' );
-		cy.getByTest( 'dismiss-wizard-link' ).click();
-		cy.getByTest( 'setup-configuration' ).should( 'exist' );
-	} );
-
-	it( 'can navigate through the Onboarding Wizard', function() {
-		cy.visit( baseURL + '/wp-admin/?page=give-onboarding-wizard' );
-
-		// Intro continue button should lead to cause step
-		cy.getByTest( 'intro-continue-button' ).click();
-		cy.getByTest( 'cause-continue-button' ).should( 'exist' );
-
-		// Only one fundraising type card should be selected at a time
-		cy.get( 'label[for="organization"]' ).click();
-		cy.get( 'input[value="organization"]' ).should( 'have.attr', 'checked' );
-		cy.get( 'input[value="individual"]' ).should( 'not.have.attr', 'checked' );
-
-		// Cause types should be selectable
-		cy.getByTest( 'cause-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).click();
-			cy.get( '.givewp-select__menu-list > div' ).eq( 2 ).click();
-			cy.get( '.givewp-select__value-container' ).contains( 'Environmental' );
-		} );
-
-		// Cause continue button should lead to location step
-		cy.getByTest( 'cause-continue-button' ).click();
-		cy.getByTest( 'location-continue-button' ).should( 'exist' );
-
-		// Changes to country should update options in state/province and currency inputs
-
-		// Set country to Canada
-		cy.getByTest( 'country-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).click();
-			cy.get( '.givewp-select__menu-list > div' ).eq( 1 ).click();
-		} );
-
-		// Check Canadian provinces
-		cy.getByTest( 'state-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).click();
-			cy.get( '.givewp-select__menu-list > div' ).eq( 1 ).contains( 'Alberta' );
-			cy.get( '.givewp-select__menu-list > div' ).eq( 2 ).contains( 'British Columbia' );
-		} );
-
-		// Check Candaian currency
-		cy.getByTest( 'currency-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).contains( 'Canadian Dollars ($)' );
-		} );
-
-		// Set country to UK
-		cy.getByTest( 'country-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).click();
-			cy.get( '.givewp-select__menu-list > div' ).eq( 2 ).click();
-		} );
-
-		// Check that state select input does not exist
-		cy.getByTest( 'state-select' ).should( 'not.exist' );
-
-		// Check UK currency
-		cy.getByTest( 'currency-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).contains( 'Pounds Sterling (£)' );
-		} );
-
-		// Set country to US
-		cy.getByTest( 'country-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).click();
-			cy.get( '.givewp-select__menu-list > div' ).eq( 0 ).click();
-		} );
-
-		// Check US states
-		cy.getByTest( 'state-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).click();
-			cy.get( '.givewp-select__menu-list > div' ).eq( 1 ).contains( 'Alabama' );
-			cy.get( '.givewp-select__menu-list > div' ).eq( 2 ).contains( 'Alaska' );
-		} );
-
-		// Check US currency
-		cy.getByTest( 'currency-select' ).within( () => {
-			cy.get( '.givewp-select__value-container' ).contains( 'US Dollars ($)' );
-		} );
-
-		// Location continue button should lead to features step
-		cy.getByTest( 'location-continue-button' ).click();
-		cy.getByTest( 'features-continue-button' ).should( 'exist' );
-
-		// Multiple feature cards can be selected
-		cy.get( 'label[for="donation-comments"]' ).click();
-		cy.get( 'label[for="terms-conditions"]' ).click();
-		cy.get( 'input[value="donation-comments"]' ).should( 'have.attr', 'checked' );
-		cy.get( 'input[value="terms-conditions"]' ).should( 'have.attr', 'checked' );
-
-		// Feature cards can be unselected
-		cy.get( 'label[for="donation-comments"]' ).click();
-		cy.get( 'label[for="terms-conditions"]' ).click();
-		cy.get( 'input[value="donation-comments"]' ).should( 'not.have.attr', 'checked' );
-		cy.get( 'input[value="terms-conditions"]' ).should( 'not.have.attr', 'checked' );
-
-		// Features continue button should lead to preview step
-		cy.getByTest( 'features-continue-button' ).click();
-		cy.getByTest( 'preview-continue-button' ).should( 'exist' );
-
-		// Prevew form iframe should load
-		cy.getByTest( 'preview-form' ).within( () => {
-			cy.get( 'iframe' ).its( '0.contentDocument.body' ).should( 'be.visible' );
-		} );
-
-		// Preview continue button should lead to addons step
-		cy.getByTest( 'preview-continue-button' ).click();
-		cy.getByTest( 'addons-continue-button' ).should( 'exist' );
-
-		// Multiple addon cards can be selected
-		cy.get( 'label[for="recurring-donations"]' ).click();
-		cy.get( 'label[for="donors-cover-fees"]' ).click();
-		cy.get( 'input[value="recurring-donations"]' ).should( 'have.attr', 'checked' );
-		cy.get( 'input[value="donors-cover-fees"]' ).should( 'have.attr', 'checked' );
-
-		// Addon cards can be unselected
-		cy.get( 'label[for="recurring-donations"]' ).click();
-		cy.get( 'label[for="donors-cover-fees"]' ).click();
-		cy.get( 'input[value="recurring-donations"]' ).should( 'not.have.attr', 'checked' );
-		cy.get( 'input[value="donors-cover-fees"]' ).should( 'not.have.attr', 'checked' );
-
-		// Top navigation should work as expected
-
-		// Check that first step link works as expected
-		cy.getByTest( 'navigation-step' ).eq( 0 ).click();
-		cy.getByTest( 'cause-continue-button' ).should( 'exist' );
-
-		// Check that third step link works as expected
-		cy.getByTest( 'navigation-step' ).eq( 2 ).click();
-		cy.getByTest( 'features-continue-button' ).should( 'exist' );
-
-		// Check that last step link works as expected
-		cy.getByTest( 'navigation-step' ).eq( 4 ).click();
-		cy.getByTest( 'addons-continue-button' ).should( 'exist' );
-
-		// Addons continue button should lead to setup page
-		cy.getByTest( 'addons-continue-button' ).click();
-		cy.getByTest( 'setup-configuration' ).should( 'exist' );
-	} );
-} );
diff --git a/tests/e2e/integration/onboarding/setup_page_spec.js b/tests/e2e/integration/onboarding/setup_page_spec.js
deleted file mode 100644
index f014e0af19..0000000000
--- a/tests/e2e/integration/onboarding/setup_page_spec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const cy = window.cy;
-const baseURL = window.baseURL;
-
-describe( 'Test setup page', function() {
-	it( 'can enable setup page', function() {
-		cy.visit( baseURL + '/wp-admin/edit.php?post_type=give_forms&page=give-settings&tab=advanced' );
-		cy.get( 'input[name="setup_page_enabled"][value="enabled"]' ).click();
-		cy.get( 'input[name="save"]' ).click();
-		cy.visit( baseURL + '/wp-admin' );
-		cy.get( 'a[href="edit.php?post_type=give_forms&page=give-setup"]' ).should( 'exist' );
-	} );
-	it( 'can manually launch wizard', function() {
-		cy.visit( baseURL + '/wp-admin/edit.php?post_type=give_forms&page=give-setup' );
-		cy.getByTest( 'setup-configuration' ).click();
-		cy.getByTest( 'intro-continue-button' ).should( 'exist' );
-	} );
-	it( 'can dismiss setup page', function() {
-		cy.visit( baseURL + '/wp-admin/edit.php?post_type=give_forms&page=give-setup' );
-		cy.getByTest( 'setup-dismiss' ).click();
-		cy.get( 'a[href="edit.php?post_type=give_forms&page=give-setup"]' ).should( 'not.exist' );
-	} );
-	it( 'can disable setup page', function() {
-		cy.visit( baseURL + '/wp-admin/edit.php?post_type=give_forms&page=give-settings&tab=advanced' );
-		cy.get( 'input[name="setup_page_enabled"][value="disabled"]' ).click();
-		cy.get( 'input[name="save"]' ).click();
-		cy.visit( baseURL + '/wp-admin' );
-		cy.get( 'a[href="edit.php?post_type=give_forms&page=give-setup"]' ).should( 'not.exist' );
-	} );
-} );
diff --git a/tests/e2e/integration/sample_spec.js b/tests/e2e/integration/sample_spec.js
deleted file mode 100644
index fe0f548676..0000000000
--- a/tests/e2e/integration/sample_spec.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const cy = window.cy;
-const baseURL = window.baseURL;
-
-describe( 'View reports', function() {
-	it( 'can view reports', function() {
-		cy.visit( baseURL + '/wp-admin/edit.php?post_type=give_forms&page=give-reports#/' );
-	} );
-} );
diff --git a/tests/e2e/plugins/index.js b/tests/e2e/plugins/index.js
deleted file mode 100644
index a319ff6165..0000000000
--- a/tests/e2e/plugins/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable valid-jsdoc, no-unused-vars */
-
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-module.exports = ( on, config ) => {
-	// `on` is used to hook into various events Cypress emits
-	// `config` is the resolved Cypress config
-};
diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
deleted file mode 100644
index 9d8a42b501..0000000000
--- a/tests/e2e/support/commands.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
-
-const cy = window.cy;
-const Cypress = window.Cypress;
-
-window.baseURL = Cypress.env( 'site' ).url;
-const baseURL = window.baseURL;
-
-Cypress.Commands.add( 'getByTest', name => cy.get( `[data-givewp-test="${ name }"]` ) );
-
-beforeEach( function() {
-	cy.visit( baseURL + '/wp-login.php' );
-	cy.wait( 1000 );
-	cy.get( '#user_login' ).type( Cypress.env( 'wp_user' ) );
-	cy.get( '#user_pass' ).type( Cypress.env( 'wp_pass' ) );
-	cy.get( '#wp-submit' ).click();
-} );
diff --git a/tests/e2e/support/index.d.ts b/tests/e2e/support/index.d.ts
deleted file mode 100644
index ba0967f7dc..0000000000
--- a/tests/e2e/support/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/// <reference types="cypress" />
-
-/**
- * This extends the cy command so the IDE is aware of custom commands
- */
-declare namespace Cypress {
-    interface Chainable<Subject> {
-        /**
-         * Retrieves the element by the data-givewp-test attribute.
-         * Equivalent to cy.get('[data-givewp-test="name"]')
-         *
-         * @param name
-         *
-         * @example cy.getByTest('email')
-         */
-        getByTest(name: string): Chainable<any>;
-    }
-}
\ No newline at end of file
diff --git a/tests/e2e/support/index.js b/tests/e2e/support/index.js
deleted file mode 100644
index 37a498fb5b..0000000000
--- a/tests/e2e/support/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands';
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')

From 510824f4b441570a642b9b315a7d706530278bcc Mon Sep 17 00:00:00 2001
From: Ante Laca <ante.laca@gmail.com>
Date: Mon, 16 May 2022 23:28:05 +0200
Subject: [PATCH 12/53] Refactor: Move Admin UI repository code into
 Controllers (#6390)

Co-authored-by: Jason Adams <jason.adams@givewp.com>
---
 .../DonationFormsRequestController.php        | 112 +++++++++
 .../DonationFormsResponseData.php             | 167 +++++++++++++
 src/DonationForms/Endpoints/ListForms.php     | 135 +++--------
 .../Repositories/DonationFormsRepository.php  | 113 +--------
 .../ValueObjects/DonationFormMetaKeys.php     |  23 ++
 .../components/DonationFormsRowActions.tsx    |   2 +-
 .../DonationsRequestController.php            | 165 +++++++++++++
 src/Donations/Endpoints/ListDonations.php     |   8 +-
 .../Repositories/DonationRepository.php       | 227 +++---------------
 .../Controllers/DonorsRequestController.php   | 130 ++++++++++
 src/Donors/Endpoints/ListDonors.php           |   8 +-
 src/Donors/Repositories/DonorRepository.php   | 137 ++---------
 .../DonationFormsRepositoryTest.php           |  39 +--
 13 files changed, 721 insertions(+), 545 deletions(-)
 create mode 100644 src/DonationForms/Controllers/DonationFormsRequestController.php
 create mode 100644 src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
 create mode 100644 src/DonationForms/ValueObjects/DonationFormMetaKeys.php
 create mode 100644 src/Donations/Controllers/DonationsRequestController.php
 create mode 100644 src/Donors/Controllers/DonorsRequestController.php

diff --git a/src/DonationForms/Controllers/DonationFormsRequestController.php b/src/DonationForms/Controllers/DonationFormsRequestController.php
new file mode 100644
index 0000000000..c5d5d1fb89
--- /dev/null
+++ b/src/DonationForms/Controllers/DonationFormsRequestController.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Give\DonationForms\Controllers;
+
+use Give\DonationForms\ValueObjects\DonationFormMetaKeys;
+use Give\Framework\Database\DB;
+use WP_REST_Request;
+
+/**
+ * Donation Forms Request Controller class
+ *
+ * @unreleased
+ */
+class DonationFormsRequestController
+{
+    /**
+     * @var WP_REST_Request
+     */
+    private $request;
+
+    /**
+     * @param WP_REST_Request $request
+     */
+    public function __construct(WP_REST_Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * @return array
+     */
+    public function getForms(): array
+    {
+        $page = $this->request->get_param('page');
+        $perPage = $this->request->get_param('perPage');
+        $search = $this->request->get_param('search');
+        $status = $this->request->get_param('status');
+
+        $query = DB::table('posts')
+            ->select(
+                'id',
+                ['post_date', 'createdAt'],
+                ['post_date_gmt', 'createdAtGmt'],
+                ['post_status', 'status'],
+                ['post_title', 'title']
+            )
+            ->attachMeta('give_formmeta', 'id', 'form_id',
+                [DonationFormMetaKeys::FORM_EARNINGS, 'revenue'],
+                [DonationFormMetaKeys::DONATION_LEVELS, 'donationLevels'],
+                [DonationFormMetaKeys::SET_PRICE, 'setPrice'],
+                [DonationFormMetaKeys::GOAL_OPTION, 'goalEnabled']
+            )
+            ->where('post_type', 'give_forms')
+            ->limit($perPage)
+            ->orderBy('id', 'DESC')
+            ->offset(($page - 1) * $perPage);
+
+        // Status
+        if ($status === 'any') {
+            $query->whereIn('post_status', ['publish', 'draft', 'pending', 'private']);
+        } else {
+            $query->where('post_status', $status);
+        }
+
+        // Search
+        if ($search) {
+            if (ctype_digit($search)) {
+                $query->where('ID', $search);
+            } else {
+                $searchTerms = array_map('trim', explode(' ', $search));
+                foreach ($searchTerms as $term) {
+                    if ($term) {
+                        $query->whereLike('post_title', $term);
+                    }
+                }
+            }
+        }
+
+        return $query->getAll();
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalFormsCount(): int
+    {
+        $search = $this->request->get_param('search');
+        $status = $this->request->get_param('status');
+        $perPage = $this->request->get_param('perPage');
+
+        $query = DB::table('posts')
+            ->where('post_type', 'give_forms');
+
+        if ($status === 'any') {
+            $query->whereIn('post_status', ['publish', 'draft', 'pending']);
+        } else {
+            $query->where('post_status', $status);
+        }
+
+        if ($search) {
+            if (ctype_digit($search)) {
+                $query->where('ID', $search);
+            } else {
+                $query->whereLike('post_title', $search);
+            }
+        }
+
+        $query->limit($perPage);
+
+        return $query->count();
+    }
+}
diff --git a/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php b/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
new file mode 100644
index 0000000000..6e61f57d6d
--- /dev/null
+++ b/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace Give\DonationForms\DataTransferObjects;
+
+use Give\Framework\Support\Contracts\Arrayable;
+use Give\Helpers\Date;
+
+/**
+ * Class DonationFormsResponseData
+ *
+ * @unreleased
+ */
+class DonationFormsResponseData implements Arrayable
+{
+    /**
+     * @var int
+     */
+    public $id;
+    /**
+     * @var string
+     */
+    public $name;
+    /**
+     * @var string
+     */
+    public $status;
+    /**
+     * @var array|false
+     */
+    public $goal;
+    /**
+     * @var int
+     */
+    public $donations;
+    /**
+     * @var string
+     */
+    public $amount;
+    /**
+     * @var string
+     */
+    public $revenue;
+    /**
+     * @var string
+     */
+    public $datetime;
+    /**
+     * @var string
+     */
+    public $shortcode;
+    /**
+     * @var string
+     */
+    public $permalink;
+    /**
+     * @var string
+     */
+    public $edit;
+
+
+    /**
+     * Convert from object to DonationForm
+     *
+     * @param object $form
+     *
+     * @unreleased
+     */
+    public static function fromObject($form): self
+    {
+        $self = new static();
+
+        $self->id = $form->id;
+        $self->name = $form->title;
+        $self->status = $form->status;
+        $self->goal = $form->goalEnabled === 'enabled' ? $self->getGoal($form->id) : false;
+        $self->donations = give()->donationFormsRepository->getFormDonationsCount($form->id);
+        $self->amount = $self->getFormAmount($form);
+        $self->revenue = $self->formatAmount($form->revenue ?? '');
+        $self->datetime = Date::getDateTime($form->createdAt);
+        $self->shortcode = sprintf('[give_form id="%d"]', $form->id);
+        $self->permalink = html_entity_decode(get_permalink($form->id));
+        $self->edit = html_entity_decode(get_edit_post_link($form->id));
+
+        return $self;
+    }
+
+    /**
+     * Convert DTO to array
+     *
+     * @unreleased
+     */
+    public function toArray(): array
+    {
+        return get_object_vars($this);
+    }
+
+    /**
+     * @param int $formId
+     *
+     * @return array
+     *
+     * @unreleased
+     */
+    private function getGoal(int $formId): array
+    {
+        $goal = give_goal_progress_stats($formId);
+
+        $getFormatFromGoal = static function ($goal) {
+            switch ($goal['format']) {
+                case 'donation':
+                    return _n('donation', 'donations', $goal['raw_goal'], 'give');
+
+                case 'donors':
+                    return _n('donor', 'donors', $goal['raw_goal'], 'give');
+
+                case 'amount':
+                    return __('amount', 'give');
+
+                case 'percentage':
+                    return __('percentage', 'give');
+
+                default:
+                    return '';
+            }
+        };
+
+        return [
+            'actual' => html_entity_decode($goal['actual']),
+            'goal' => html_entity_decode($goal['goal']),
+            'progress' => html_entity_decode($goal['progress']),
+            'format' => $getFormatFromGoal($goal)
+        ];
+    }
+
+    /**
+     * @param object $form
+     *
+     * @return string
+     *
+     * @unreleased
+     */
+    private function getFormAmount($form): string
+    {
+        $donationLevels = unserialize($form->donationLevels, ['allowed_classes' => false]);
+
+        if (
+            is_array($donationLevels)
+            && $amount = array_column($donationLevels, '_give_amount')
+        ) {
+            return $this->formatAmount(min($amount)) . ' - ' . $this->formatAmount(max($amount));
+        }
+
+        return $this->formatAmount($form->setPrice ?? '');
+    }
+
+    /**
+     * @param string $amount
+     *
+     * @return string
+     *
+     * @unreleased
+     */
+    private function formatAmount(string $amount): string
+    {
+        return html_entity_decode(give_currency_filter(give_format_amount($amount)));
+    }
+}
diff --git a/src/DonationForms/Endpoints/ListForms.php b/src/DonationForms/Endpoints/ListForms.php
index 99b2e7c469..16bbd208f0 100644
--- a/src/DonationForms/Endpoints/ListForms.php
+++ b/src/DonationForms/Endpoints/ListForms.php
@@ -2,9 +2,10 @@
 
 namespace Give\DonationForms\Endpoints;
 
+use Give\DonationForms\Controllers\DonationFormsRequestController;
+use Give\DonationForms\DataTransferObjects\DonationFormsResponseData;
 use WP_REST_Request;
 use WP_REST_Response;
-use Give\Helpers\Date;
 
 /**
  * @since 2.19.0
@@ -26,28 +27,28 @@ public function registerRoute()
             $this->endpoint,
             [
                 [
-                    'methods'             => 'GET',
-                    'callback'            => [$this, 'handleRequest'],
+                    'methods' => 'GET',
+                    'callback' => [$this, 'handleRequest'],
                     'permission_callback' => [$this, 'permissionsCheck'],
                 ],
                 'args' => [
-                    'page'    => [
-                        'type'              => 'integer',
-                        'required'          => false,
-                        'default'           => 1,
-                        'minimum'           => 1
+                    'page' => [
+                        'type' => 'integer',
+                        'required' => false,
+                        'default' => 1,
+                        'minimum' => 1
                     ],
                     'perPage' => [
-                        'type'              => 'integer',
-                        'required'          => false,
-                        'default'           => 30,
-                        'minimum'           => 1
+                        'type' => 'integer',
+                        'required' => false,
+                        'default' => 30,
+                        'minimum' => 1
                     ],
-                    'status'  => [
-                        'type'              => 'string',
-                        'required'          => false,
-                        'default'           => 'any',
-                        'enum'              => [
+                    'status' => [
+                        'type' => 'string',
+                        'required' => false,
+                        'default' => 'any',
+                        'enum' => [
                             'publish',
                             'future',
                             'draft',
@@ -58,9 +59,9 @@ public function registerRoute()
                             'any'
                         ]
                     ],
-                    'search'  => [
-                        'type'              => 'string',
-                        'required'          => false
+                    'search' => [
+                        'type' => 'string',
+                        'required' => false
                     ]
                 ],
             ]
@@ -68,105 +69,29 @@ public function registerRoute()
     }
 
     /**
-     * @param  WP_REST_Request  $request
+     * @param WP_REST_Request $request
      *
      * @return WP_REST_Response
      */
-    public function handleRequest(WP_REST_Request $request)
+    public function handleRequest(WP_REST_Request $request): WP_REST_Response
     {
-        $data  = [];
-        $forms = give()->donationFormsRepository->getFormsForRequest($request);
-        $totalForms = give()->donationFormsRepository->getTotalFormsCountForRequest($request);
+        $data = [];
+        $controller = new DonationFormsRequestController($request);
+        $forms = $controller->getForms();
+        $totalForms = $controller->getTotalFormsCount();
         $totalPages = (int)ceil($totalForms / $request->get_param('perPage'));
 
         foreach ($forms as $form) {
-            $data[] = [
-                'id'        => $form->id,
-                'name'      => $form->title,
-                'status'    => $form->status,
-                'goal'      => $form->goalEnabled === 'enabled' ? $this->getGoal($form->id) : false,
-                'donations' => give()->donationFormsRepository->getFormDonationsCount($form->id),
-                'amount'    => $this->getFormAmount($form),
-                'revenue'   => $this->formatAmount($form->revenue),
-                'datetime'  => Date::getDateTime($form->createdAt),
-                'shortcode' => sprintf('[give_form id="%d"]', $form->id),
-                'permalink' => html_entity_decode(get_permalink($form->id)),
-                'edit'      => html_entity_decode(get_edit_post_link($form->id))
-            ];
+            $data[] = DonationFormsResponseData::fromObject($form)->toArray();
         }
 
         return new WP_REST_Response(
             [
-                'items'      => $data,
+                'items' => $data,
                 'totalItems' => $totalForms,
                 'totalPages' => $totalPages,
-                'trash'      => defined('EMPTY_TRASH_DAYS') && EMPTY_TRASH_DAYS > 0,
+                'trash' => defined('EMPTY_TRASH_DAYS') && EMPTY_TRASH_DAYS > 0,
             ]
         );
     }
-
-    /**
-     * @param  int  $formId
-     *
-     * @return array
-     */
-    private function getGoal($formId)
-    {
-        $goal = give_goal_progress_stats($formId);
-
-        $getFormatFromGoal = function ($goal) {
-            switch ($goal[ 'format' ]) {
-                case 'donation':
-                    return _n('donation', 'donations', $goal[ 'raw_goal' ], 'give');
-
-                case 'donors':
-                    return _n('donor', 'donors', $goal[ 'raw_goal' ], 'give');
-
-                case 'amount':
-                    return __('amount', 'give');
-
-                case 'percentage':
-                    return __('percentage', 'give');
-
-                default:
-                    return '';
-            }
-        };
-
-        return [
-            'actual'   => html_entity_decode($goal[ 'actual' ]),
-            'goal'     => html_entity_decode($goal[ 'goal' ]),
-            'progress' => html_entity_decode($goal[ 'progress' ]),
-            'format'   => $getFormatFromGoal($goal)
-        ];
-    }
-
-    /**
-     * @param  object  $form
-     *
-     *
-     * @return string
-     */
-    private function getFormAmount($form)
-    {
-        $donationLevels = unserialize($form->donationLevels);
-
-        if (is_array($donationLevels)) {
-            $amount = array_column($donationLevels, '_give_amount');
-
-            return $this->formatAmount(min($amount)) . ' - ' . $this->formatAmount(max($amount));
-        }
-
-        return $this->formatAmount($form->setPrice);
-    }
-
-    /**
-     * @param  string  $amount
-     *
-     * @return string
-     */
-    private function formatAmount($amount)
-    {
-        return html_entity_decode(give_currency_filter(give_format_amount($amount)));
-    }
 }
diff --git a/src/DonationForms/Repositories/DonationFormsRepository.php b/src/DonationForms/Repositories/DonationFormsRepository.php
index bf50c5f208..464af1f16e 100644
--- a/src/DonationForms/Repositories/DonationFormsRepository.php
+++ b/src/DonationForms/Repositories/DonationFormsRepository.php
@@ -2,8 +2,8 @@
 
 namespace Give\DonationForms\Repositories;
 
+use Give\Donations\ValueObjects\DonationMetaKeys;
 use Give\Framework\Database\DB;
-use WP_REST_Request;
 
 /**
  * @since 2.19.0
@@ -11,113 +11,16 @@
 class DonationFormsRepository
 {
     /**
-     * @param  WP_REST_Request  $request
-     *
-     * @return array
-     */
-    public function getFormsForRequest(WP_REST_Request $request)
-    {
-        $page    = $request->get_param('page');
-        $perPage = $request->get_param('perPage');
-        $search  = $request->get_param('search');
-        $status  = $request->get_param('status');
-
-        $query = DB::table('posts')
-                   ->select(
-                       ['ID', 'id'],
-                       ['post_date', 'createdAt'],
-                       ['post_date_gmt', 'createdAtGmt'],
-                       ['post_status', 'status'],
-                       ['post_title', 'title']
-                   )
-                   ->attachMeta('give_formmeta', 'id', 'form_id',
-                       ['_give_form_earnings', 'revenue'],
-                       ['_give_donation_levels', 'donationLevels'],
-                       ['_give_set_price', 'setPrice'],
-                       ['_give_goal_option', 'goalEnabled']
-                   )
-                   ->where('post_type', 'give_forms')
-                   ->limit($perPage)
-                   ->orderBy('id', 'DESC')
-                   ->offset(($page - 1) * $perPage);
-
-        // Status
-        if ($status === 'any') {
-            $query->whereIn('post_status', ['publish', 'draft', 'pending', 'private']);
-        } else {
-            $query->where('post_status', $status);
-        }
-
-        // Search
-        if ($search) {
-            if (ctype_digit($search)) {
-                $query->where('ID', $search);
-            } else {
-                $searchTerms = array_map('trim', explode(' ', $search));
-                foreach ($searchTerms as $term)
-                {
-                    if ($term)
-                    {
-                        $query->whereLike('post_title', $term);
-                    }
-                }
-            }
-        }
-
-        return $query->getAll();
-    }
-
-    /**
-     * @param  WP_REST_Request  $request
+     * @param int $formId
      *
      * @return int
      */
-    public function getTotalFormsCountForRequest(WP_REST_Request $request)
+    public function getFormDonationsCount(int $formId): int
     {
-        $search  = $request->get_param('search');
-        $status  = $request->get_param('status');
-        $perPage = $request->get_param('perPage');
-
-        $query = DB::table('posts')
-                   ->selectRaw('SELECT COUNT(ID) AS count')
-                   ->where('post_type', 'give_forms');
-
-        if ($status === 'any') {
-            $query->whereIn('post_status', ['publish', 'draft', 'pending']);
-        } else {
-            $query->where('post_status', $status);
-        }
-
-        if ($search) {
-            if (ctype_digit($search)) {
-                $query->where('ID', $search);
-            } else {
-                $query->whereLike('post_title', $search);
-            }
-        }
-
-        $query->limit($perPage);
-
-        $total = $query->get();
-
-        return $total->count;
-    }
-
-    /**
-     * @param  int  $formId
-     *
-     * @return int
-     */
-    public function getFormDonationsCount($formId)
-    {
-        $donations = DB::table('posts')
-                       ->selectRaw('SELECT COUNT(ID) as count')
-                       ->leftJoin('give_donationmeta', 'ID', 'donation_id')
-                       ->where('meta_key', '_give_payment_form_id')
-                       ->where('meta_value', $formId)
-                       ->get();
-
-
-        return $donations->count;
+        return DB::table('posts')
+            ->leftJoin('give_donationmeta', 'ID', 'donation_id')
+            ->where('meta_key', DonationMetaKeys::FORM_ID)
+            ->where('meta_value', $formId)
+            ->count();
     }
 }
diff --git a/src/DonationForms/ValueObjects/DonationFormMetaKeys.php b/src/DonationForms/ValueObjects/DonationFormMetaKeys.php
new file mode 100644
index 0000000000..43a1322f04
--- /dev/null
+++ b/src/DonationForms/ValueObjects/DonationFormMetaKeys.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Give\DonationForms\ValueObjects;
+
+use Give\Framework\Support\ValueObjects\Enum;
+
+/**
+ * Donation Form Meta keys
+ *
+ * @unreleased
+ *
+ * @method static DonationFormMetaKeys FORM_EARNINGS()
+ * @method static DonationFormMetaKeys DONATION_LEVELS()
+ * @method static DonationFormMetaKeys SET_PRICE()
+ * @method static DonationFormMetaKeys GOAL_OPTION()
+ */
+class DonationFormMetaKeys extends Enum
+{
+    const FORM_EARNINGS = '_give_form_earnings';
+    const DONATION_LEVELS = '_give_donation_levels';
+    const SET_PRICE = '_give_set_price';
+    const GOAL_OPTION = '_give_goal_option';
+}
diff --git a/src/DonationForms/resources/components/DonationFormsRowActions.tsx b/src/DonationForms/resources/components/DonationFormsRowActions.tsx
index 2bed14582a..ac30adc889 100644
--- a/src/DonationForms/resources/components/DonationFormsRowActions.tsx
+++ b/src/DonationForms/resources/components/DonationFormsRowActions.tsx
@@ -11,7 +11,7 @@ export function DonationFormsRowActions({data, item, removeRow, addRow, setUpdat
     const {mutate} = useSWRConfig();
     const showConfirmModal = useContext(ShowConfirmModalContext);
     const trashEnabled = Boolean(data?.trash);
-    const deleteEndpoint = trashEnabled ? '/trash' : '/delete';
+    const deleteEndpoint = trashEnabled && item.status !== 'trash' ? '/trash' : '/delete';
 
     const fetchAndUpdateErrors = async (parameters, endpoint, id, method) => {
         const response = await donationFormsApi.fetchWithArgs(endpoint, {ids: [id]}, method);
diff --git a/src/Donations/Controllers/DonationsRequestController.php b/src/Donations/Controllers/DonationsRequestController.php
new file mode 100644
index 0000000000..3cddeb6695
--- /dev/null
+++ b/src/Donations/Controllers/DonationsRequestController.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace Give\Donations\Controllers;
+
+use Give\Donations\ValueObjects\DonationMetaKeys;
+use Give\Framework\Database\DB;
+use Give\Framework\QueryBuilder\QueryBuilder;
+use WP_REST_Request;
+
+/**
+ * Donations Request Controller class
+ *
+ * @unreleased
+ */
+class DonationsRequestController
+{
+    /**
+     * @var WP_REST_Request
+     */
+    private $request;
+
+    /**
+     * @param WP_REST_Request $request
+     */
+    public function __construct(WP_REST_Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return array
+     */
+    public function getDonations(): array
+    {
+        $page = $this->request->get_param('page');
+        $perPage = $this->request->get_param('perPage');
+
+        $query = DB::table('posts')
+            ->distinct()
+            ->select(
+                'id',
+                ['post_date', 'createdAt'],
+                ['post_status', 'status']
+            )
+            ->attachMeta(
+                'give_donationmeta',
+                'id',
+                'donation_id',
+                DonationMetaKeys::FORM_ID,
+                DonationMetaKeys::FORM_TITLE,
+                DonationMetaKeys::AMOUNT,
+                DonationMetaKeys::DONOR_ID,
+                DonationMetaKeys::FIRST_NAME,
+                DonationMetaKeys::LAST_NAME,
+                DonationMetaKeys::EMAIL,
+                DonationMetaKeys::GATEWAY,
+                DonationMetaKeys::MODE,
+                DonationMetaKeys::ANONYMOUS,
+                DonationMetaKeys::SUBSCRIPTION_INITIAL_DONATION,
+                DonationMetaKeys::IS_RECURRING
+            )
+            ->where('post_type', 'give_payment');
+
+        $query = $this->getWhereConditions($query);
+
+        $query->limit($perPage)
+            ->orderBy('id', 'DESC')
+            ->offset(($page - 1) * $perPage);
+
+        $donations = $query->getAll();
+
+        if (!$donations) {
+            return [];
+        }
+
+        return $donations;
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return int
+     */
+    public function getTotalDonationsCount(): int
+    {
+        $query = DB::table('posts')
+            ->where('post_type', 'give_payment');
+
+        $query = $this->getWhereConditions($query);
+
+        return $query->count();
+    }
+
+    /**
+     * @param QueryBuilder $query
+     * @unreleased
+     *
+     * @return QueryBuilder
+     */
+    private function getWhereConditions(QueryBuilder $query): QueryBuilder
+    {
+        $search = $this->request->get_param('search');
+        $start = $this->request->get_param('start');
+        $end = $this->request->get_param('end');
+        $form = $this->request->get_param('form');
+        $donor = $this->request->get_param('donor');
+
+        if ($form || $donor || ($search && !ctype_digit($search))) {
+            $query->leftJoin(
+                'give_donationmeta',
+                'id',
+                'metaTable.donation_id',
+                'metaTable'
+            );
+        }
+
+        if ($search) {
+            if (ctype_digit($search)) {
+                $query->where('id', $search);
+            } else if (strpos($search, '@') !== false) {
+                $query
+                    ->where('metaTable.meta_key', DonationMetaKeys::EMAIL)
+                    ->whereLike('metaTable.meta_value', $search);
+            } else {
+                $query
+                    ->where('metaTable.meta_key', DonationMetaKeys::FIRST_NAME)
+                    ->whereLike('metaTable.meta_value', $search)
+                    ->orWhere('metaTable.meta_key', DonationMetaKeys::LAST_NAME)
+                    ->whereLike('metaTable.meta_value', $search);
+            }
+        }
+
+        if ($donor) {
+            if (ctype_digit($donor)) {
+                $query
+                    ->where('metaTable.meta_key', DonationMetaKeys::DONOR_ID)
+                    ->where('metaTable.meta_value', $donor);
+            } else {
+                $query
+                    ->where('metaTable.meta_key', DonationMetaKeys::FIRST_NAME)
+                    ->whereLike('metaTable.meta_value', $donor)
+                    ->orWhere('metaTable.meta_key', DonationMetaKeys::LAST_NAME)
+                    ->whereLike('metaTable.meta_value', $donor);
+            }
+        }
+
+        if ($form) {
+            $query
+                ->where('metaTable.meta_key', DonationMetaKeys::FORM_ID)
+                ->where('metaTable.meta_value', $form);
+        }
+
+        if ($start && $end) {
+            $query->whereBetween('post_date', $start, $end);
+        } else if ($start) {
+            $query->where('post_date', $start, '>=');
+        } else if ($end) {
+            $query->where('post_date', $end, '<=');
+        }
+
+        return $query;
+    }
+}
diff --git a/src/Donations/Endpoints/ListDonations.php b/src/Donations/Endpoints/ListDonations.php
index 86220812ad..76b533eedf 100644
--- a/src/Donations/Endpoints/ListDonations.php
+++ b/src/Donations/Endpoints/ListDonations.php
@@ -2,6 +2,7 @@
 
 namespace Give\Donations\Endpoints;
 
+use Give\Donations\Controllers\DonationsRequestController;
 use Give\Donations\DataTransferObjects\DonationResponseData;
 use WP_REST_Request;
 use WP_REST_Response;
@@ -76,11 +77,12 @@ public function registerRoute()
      *
      * @return WP_REST_Response
      */
-    public function handleRequest(WP_REST_Request $request)
+    public function handleRequest(WP_REST_Request $request): WP_REST_Response
     {
         $data = [];
-        $donations = give()->donations->getDonationsForRequest($request);
-        $donationsCount = give()->donations->getTotalDonationsCountForRequest($request);
+        $controller = new DonationsRequestController($request);
+        $donations = $controller->getDonations();
+        $donationsCount = $controller->getTotalDonationsCount();
         $totalPages = (int)ceil($donationsCount / $request->get_param('perPage'));
 
         foreach ($donations as $donation) {
diff --git a/src/Donations/Repositories/DonationRepository.php b/src/Donations/Repositories/DonationRepository.php
index a8349ff74d..287b25b9ed 100644
--- a/src/Donations/Repositories/DonationRepository.php
+++ b/src/Donations/Repositories/DonationRepository.php
@@ -54,13 +54,13 @@ public function __construct()
     /**
      * Get Donation By ID
      *
-     * @since 2.19.6
-     *
      * @param int $donationId
      *
      * @return Donation|null
+     * @since 2.19.6
+     *
      */
-    public function getById($donationId)
+    public function getById(int $donationId)
     {
         return $this->prepareQuery()
             ->where('ID', $donationId)
@@ -81,25 +81,27 @@ public function queryById($donationId)
     }
 
     /**
-     * @unreleased
+     * @since 2.19.6
      *
      * @param int $subscriptionId
      *
      * @return Donation[]|null
+     * 
+     *
      */
-    public function getBySubscriptionId($subscriptionId)
+    public function getBySubscriptionId(int $subscriptionId)
     {
         return $this->queryBySubscriptionId($subscriptionId)->getAll();
     }
 
     /**
-     * @since 2.19.6
-     *
      * @param int $subscriptionId
      *
      * @return ModelQueryBuilder
+     * @since 2.19.6
+     *
      */
-    public function queryBySubscriptionId($subscriptionId)
+    public function queryBySubscriptionId(int $subscriptionId): ModelQueryBuilder
     {
         $initialDonationId = give()->subscriptions->getInitialDonationId($subscriptionId);
 
@@ -118,13 +120,13 @@ public function queryBySubscriptionId($subscriptionId)
     }
 
     /**
-     * @since 2.19.6
-     *
      * @param int $donorId
      *
      * @return ModelQueryBuilder
+     * @since 2.19.6
+     *
      */
-    public function queryByDonorId($donorId)
+    public function queryByDonorId(int $donorId): ModelQueryBuilder
     {
         return $this->prepareQuery()
             ->where('post_type', 'give_payment')
@@ -141,11 +143,11 @@ public function queryByDonorId($donorId)
     /**
      * @since 2.20.0 mutate model and return void
      * @since 2.19.6
-     *
      * @param Donation $donation
      *
      * @return void
      * @throws Exception|InvalidArgumentException
+     *
      */
     public function insert(Donation $donation)
     {
@@ -167,7 +169,7 @@ public function insert(Donation $donation)
                     'post_modified_gmt' => get_gmt_from_date($dateCreatedFormatted),
                     'post_status' => $donation->status->getValue(),
                     'post_type' => 'give_payment',
-                    'post_parent' => isset($donation->parentId) ? $donation->parentId : 0,
+                    'post_parent' => $donation->parentId ?? 0
                 ]);
 
             $donationId = DB::last_insert_id();
@@ -219,6 +221,7 @@ public function insert(Donation $donation)
      *
      * @return void
      * @throws Exception|InvalidArgumentException
+     *
      */
     public function update(Donation $donation)
     {
@@ -238,7 +241,7 @@ public function update(Donation $donation)
                     'post_modified_gmt' => get_gmt_from_date($date),
                     'post_status' => $donation->status->getValue(),
                     'post_type' => 'give_payment',
-                    'post_parent' => isset($donation->parentId) ? $donation->parentId : 0,
+                    'post_parent' => $donation->parentId ?? 0
                 ]);
 
             foreach ($this->getCoreDonationMetaForDatabase($donation) as $metaKey => $metaValue) {
@@ -265,13 +268,13 @@ public function update(Donation $donation)
     /**
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
-     *
      * @param Donation $donation
      *
      * @return bool
      * @throws Exception
+     *
      */
-    public function delete(Donation $donation)
+    public function delete(Donation $donation): bool
     {
         DB::query('START TRANSACTION');
 
@@ -303,12 +306,8 @@ public function delete(Donation $donation)
     /**
      * @since 2.20.0 update amount to use new type, and add currency and exchange rate
      * @since 2.19.6
-     *
-     * @param Donation $donation
-     *
-     * @return array
      */
-    private function getCoreDonationMetaForDatabase(Donation $donation)
+    private function getCoreDonationMetaForDatabase(Donation $donation): array
     {
         $meta = [
             DonationMetaKeys::AMOUNT => give_sanitize_amount_for_db(
@@ -361,11 +360,11 @@ private function getCoreDonationMetaForDatabase(Donation $donation)
      * In Legacy terms, the Initial Donation acts as the parent ID for subscription renewals.
      * This function inserts those specific meta columns that accompany this concept.
      *
+     * @throws Exception
      * @since 2.19.6
      *
-     * @throws Exception
      */
-    public function updateLegacyDonationMetaAsInitialSubscriptionDonation($donationId)
+    public function updateLegacyDonationMetaAsInitialSubscriptionDonation($donationId): bool
     {
         DB::query('START TRANSACTION');
 
@@ -401,14 +400,14 @@ public function updateLegacyDonationMetaAsInitialSubscriptionDonation($donationI
     }
 
     /**
-     *
-     * @since 2.19.6
      *
      * @param int $donationId
      *
      * @return int|null
+     * @since 2.19.6
+     *
      */
-    public function getSequentialId($donationId)
+    public function getSequentialId(int $donationId)
     {
         $query = DB::table('give_sequential_ordering')->where('payment_id', $donationId)->get();
 
@@ -420,13 +419,13 @@ public function getSequentialId($donationId)
     }
 
     /**
-     * @since 2.19.6
-     *
      * @param int $id
      *
      * @return object[]
+     * @since 2.19.6
+     *
      */
-    public function getNotesByDonationId($id)
+    public function getNotesByDonationId(int $id): array
     {
         $notes = DB::table('give_comments')
             ->select(
@@ -446,11 +445,11 @@ public function getNotesByDonationId($id)
     }
 
     /**
-     * @since 2.19.6
-     *
      * @param Donation $donation
      *
      * @return void
+     * @since 2.19.6
+     *
      */
     private function validateDonation(Donation $donation)
     {
@@ -466,11 +465,11 @@ private function validateDonation(Donation $donation)
     }
 
     /**
+     * @return DonationMode
      * @since 2.19.6
      *
-     * @return DonationMode
      */
-    private function getDefaultDonationMode()
+    private function getDefaultDonationMode(): DonationMode
     {
         $mode = give_is_test_mode() ? 'test' : 'live';
 
@@ -478,13 +477,13 @@ private function getDefaultDonationMode()
     }
 
     /**
-     * @since 2.19.6
-     *
      * @param int $formId
      *
      * @return string
+     * @since 2.19.6
+     *
      */
-    public function getFormTitle($formId)
+    public function getFormTitle(int $formId): string
     {
         $form = DB::table('posts')
             ->where('id', $formId)
@@ -500,7 +499,7 @@ public function getFormTitle($formId)
     /**
      * @return ModelQueryBuilder<Donation>
      */
-    public function prepareQuery()
+    public function prepareQuery(): ModelQueryBuilder
     {
         $builder = new ModelQueryBuilder(Donation::class);
 
@@ -523,12 +522,8 @@ public function prepareQuery()
 
     /**
      * @since 2.19.6
-     *
-     * @param $donorId
-     *
-     * @return int
      */
-    public function getTotalDonationCountByDonorId($donorId)
+    public function getTotalDonationCountByDonorId(int $donorId): int
     {
         return (int)DB::table('posts')
             ->where('post_type', 'give_payment')
@@ -543,11 +538,11 @@ public function getTotalDonationCountByDonorId($donorId)
     }
 
     /**
-     * @since 2.19.6
-     *
      * @param $donorId
      *
      * @return array|bool|null
+     * @since 2.19.6
+     *
      */
     public function getAllDonationIdsByDonorId($donorId)
     {
@@ -560,148 +555,4 @@ public function getAllDonationIdsByDonorId($donorId)
             'donation_id'
         );
     }
-
-    /**
-     * @param WP_REST_Request $request
-     *
-     * @since 2.20.0
-     *
-     * @return array
-     */
-    public function getDonationsForRequest(WP_REST_Request $request)
-    {
-        $page = $request->get_param('page');
-        $perPage = $request->get_param('perPage');
-
-        $query = DB::table('posts')
-            ->distinct()
-            ->select(
-                'id',
-                ['post_date', 'createdAt'],
-                ['post_status', 'status']
-            )
-            ->attachMeta(
-                'give_donationmeta',
-                'id',
-                'donation_id',
-                DonationMetaKeys::FORM_ID,
-                DonationMetaKeys::FORM_TITLE,
-                DonationMetaKeys::AMOUNT,
-                DonationMetaKeys::DONOR_ID,
-                DonationMetaKeys::FIRST_NAME,
-                DonationMetaKeys::LAST_NAME,
-                DonationMetaKeys::EMAIL,
-                DonationMetaKeys::GATEWAY,
-                DonationMetaKeys::MODE,
-                DonationMetaKeys::ANONYMOUS,
-                DonationMetaKeys::SUBSCRIPTION_INITIAL_DONATION,
-                DonationMetaKeys::IS_RECURRING
-            )
-            ->where('post_type', 'give_payment');
-
-        $query = $this->getWhereConditionsForRequest($query, $request);
-
-        $query->limit($perPage)
-            ->orderBy('id', 'DESC')
-            ->offset(($page - 1) * $perPage);
-
-        $donations = $query->getAll();
-
-        if (!$donations) {
-            return [];
-        }
-
-        return $donations;
-    }
-
-    /**
-     * @param WP_REST_Request $request
-     *
-     * @since 2.20.0
-     *
-     * @return int
-     */
-    public function getTotalDonationsCountForRequest(WP_REST_Request $request)
-    {
-        $query = DB::table('posts')
-            ->where('post_type', 'give_payment');
-
-        $query = $this->getWhereConditionsForRequest($query, $request);
-
-        return $query->count();
-    }
-
-    /**
-     * @param QueryBuilder $query
-     * @param WP_REST_Request $request
-     *
-     * @return QueryBuilder
-     * @since 2.20.0
-     *
-     */
-    private function getWhereConditionsForRequest(QueryBuilder $query, WP_REST_Request $request)
-    {
-        $search = $request->get_param('search');
-        $start = $request->get_param('start');
-        $end = $request->get_param('end');
-        $form = $request->get_param('form');
-        $donor = $request->get_param('donor');
-
-        if ($form || $donor || ($search && !ctype_digit($search))) {
-            $query->leftJoin(
-                'give_donationmeta',
-                'id',
-                'metaTable.donation_id',
-                'metaTable'
-            );
-        }
-
-        if ($search) {
-            if (ctype_digit($search)) {
-                $query->where('id', $search);
-            } else {
-                if (strpos($search, '@') !== false) {
-                    $query
-                        ->where('metaTable.meta_key', DonationMetaKeys::EMAIL)
-                        ->whereLike('metaTable.meta_value', $search);
-                } else {
-                    $query
-                        ->where('metaTable.meta_key', DonationMetaKeys::FIRST_NAME)
-                        ->whereLike('metaTable.meta_value', $search)
-                        ->orWhere('metaTable.meta_key', DonationMetaKeys::LAST_NAME)
-                        ->whereLike('metaTable.meta_value', $search);
-                }
-            }
-        }
-
-        if ($donor) {
-            if (ctype_digit($donor)) {
-                $query
-                    ->where('metaTable.meta_key', DonationMetaKeys::DONOR_ID)
-                    ->where('metaTable.meta_value', $donor);
-            } else {
-                $query
-                    ->where('metaTable.meta_key', DonationMetaKeys::FIRST_NAME)
-                    ->whereLike('metaTable.meta_value', $donor)
-                    ->orWhere('metaTable.meta_key', DonationMetaKeys::LAST_NAME)
-                    ->whereLike('metaTable.meta_value', $donor);
-            }
-        }
-
-        if ($form) {
-            $query
-                ->where('metaTable.meta_key', DonationMetaKeys::FORM_ID)
-                ->where('metaTable.meta_value', $form);
-        }
-
-        if ($start && $end) {
-            $query->whereBetween('post_date', $start, $end);
-        } elseif ($start) {
-            $query->where('post_date', $start, '>=');
-        } elseif ($end) {
-            $query->where('post_date', $end, '<=');
-        }
-
-        return $query;
-    }
 }
diff --git a/src/Donors/Controllers/DonorsRequestController.php b/src/Donors/Controllers/DonorsRequestController.php
new file mode 100644
index 0000000000..b161bfc9f5
--- /dev/null
+++ b/src/Donors/Controllers/DonorsRequestController.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace Give\Donors\Controllers;
+
+use Give\Framework\Database\DB;
+use Give\Framework\QueryBuilder\QueryBuilder;
+use WP_REST_Request;
+
+/**
+ * Donors Request Controller class
+ *
+ * @unreleased
+ */
+class DonorsRequestController
+{
+    /**
+     * @var WP_REST_Request
+     */
+    private $request;
+
+    /**
+     * @param WP_REST_Request $request
+     */
+    public function __construct(WP_REST_Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return array
+     */
+    public function getDonors(): array
+    {
+        $page = $this->request->get_param('page');
+        $perPage = $this->request->get_param('perPage');
+
+        $query = DB::table('give_donors')
+            ->select(
+                'id',
+                ['user_id', 'userId'],
+                'email',
+                'name',
+                ['purchase_value', 'donationRevenue'],
+                ['purchase_count', 'donationCount'],
+                ['payment_ids', 'paymentIds'],
+                ['date_created', 'createdAt']
+            )
+            ->attachMeta(
+                'give_donormeta',
+                'id',
+                'donor_id',
+                ['_give_donor_title_prefix', 'titlePrefix']
+            )
+            ->limit($perPage)
+            ->orderBy('id', 'DESC')
+            ->offset(($page - 1) * $perPage);
+
+        $query = $this->getWhereConditions($query);
+
+        $query->limit($perPage);
+
+        return $query->getAll();
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return int
+     */
+    public function getTotalDonorsCount(): int
+    {
+        $query = DB::table('give_donors');
+        $query = $this->getWhereConditions($query);
+
+        return $query->count();
+    }
+
+    /**
+     * @param QueryBuilder $builder
+     * @unreleased
+     *
+     * @return QueryBuilder
+     */
+    private function getWhereConditions(QueryBuilder $builder): QueryBuilder
+    {
+        $search = $this->request->get_param('search');
+        $start = $this->request->get_param('start');
+        $end = $this->request->get_param('end');
+        $form = $this->request->get_param('form');
+
+        if ($search) {
+            if (ctype_digit($search)) {
+                $builder->where('id', $search);
+            } else {
+                $builder->whereLike('name', $search);
+                $builder->orWhereLike('email', $search);
+            }
+        }
+
+        if ($start && $end) {
+            $builder->whereBetween('date_created', $start, $end);
+        } else if ($start) {
+            $builder->where('date_created', $start, '>=');
+        } else if ($end) {
+            $builder->where('date_created', $end, '<=');
+        }
+
+        if ($form) {
+            $builder
+                ->whereIn('id', static function (QueryBuilder $builder) use ($form) {
+                    $builder
+                        ->from('give_donationmeta')
+                        ->distinct()
+                        ->select('meta_value')
+                        ->where('meta_key', '_give_payment_donor_id')
+                        ->whereIn('donation_id', static function (QueryBuilder $builder) use ($form) {
+                            $builder
+                                ->from('give_donationmeta')
+                                ->select('donation_id')
+                                ->where('meta_key', '_give_payment_form_id')
+                                ->where('meta_value', $form);
+                        });
+                });
+        }
+
+        return $builder;
+    }
+}
diff --git a/src/Donors/Endpoints/ListDonors.php b/src/Donors/Endpoints/ListDonors.php
index 868ce59986..ba5aef8065 100644
--- a/src/Donors/Endpoints/ListDonors.php
+++ b/src/Donors/Endpoints/ListDonors.php
@@ -2,6 +2,7 @@
 
 namespace Give\Donors\Endpoints;
 
+use Give\Donors\Controllers\DonorsRequestController;
 use Give\Donors\DataTransferObjects\DonorResponseData;
 use WP_REST_Request;
 use WP_REST_Response;
@@ -75,11 +76,12 @@ public function registerRoute()
      *
      * @return WP_REST_Response
      */
-    public function handleRequest(WP_REST_Request $request)
+    public function handleRequest(WP_REST_Request $request): WP_REST_Response
     {
         $data = [];
-        $donors = give()->donors->getDonorsForRequest($request);
-        $donorsCount = give()->donors->getTotalDonorsCountForRequest($request);
+        $controller = new DonorsRequestController($request);
+        $donors = $controller->getDonors();
+        $donorsCount = $controller->getTotalDonorsCount();
         $pageCount = (int)ceil($donorsCount / $request->get_param('perPage'));
 
         foreach ($donors as $donor) {
diff --git a/src/Donors/Repositories/DonorRepository.php b/src/Donors/Repositories/DonorRepository.php
index 27cbb80138..80f20401e7 100644
--- a/src/Donors/Repositories/DonorRepository.php
+++ b/src/Donors/Repositories/DonorRepository.php
@@ -10,10 +10,8 @@
 use Give\Framework\Database\DB;
 use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
 use Give\Framework\Models\ModelQueryBuilder;
-use Give\Framework\QueryBuilder\QueryBuilder;
 use Give\Framework\Support\Facades\DateTime\Temporal;
 use Give\Log\Log;
-use WP_REST_Request;
 
 /**
  * @since 2.19.6
@@ -53,7 +51,7 @@ public function queryById($donorId)
      * @param int $donorId
      * @return Donor|null
      */
-    public function getById($donorId)
+    public function getById(int $donorId)
     {
         return $this->queryById($donorId)->get();
     }
@@ -120,7 +118,7 @@ public function insert(Donor $donor)
             DB::table('give_donors')
                 ->insert([
                     'date_created' => Temporal::getFormattedDateTime($dateCreated),
-                    'user_id' => isset($donor->userId) ? $donor->userId : 0,
+                    'user_id' => $donor->userId ?? 0,
                     'email' => $donor->email,
                     'name' => $donor->name
                 ]);
@@ -165,7 +163,7 @@ public function insert(Donor $donor)
      * @since 2.19.6
      *
      * @param Donor $donor
-     * @return Donor
+     * @return void
      * @throws Exception
      */
     public function update(Donor $donor)
@@ -214,7 +212,7 @@ public function update(Donor $donor)
      * @return bool
      * @throws Exception
      */
-    public function updateLegacyColumns($donorId, $columns)
+    public function updateLegacyColumns(int $donorId, array $columns): bool
     {
         DB::query('START TRANSACTION');
 
@@ -247,7 +245,7 @@ public function updateLegacyColumns($donorId, $columns)
      *
      * @throws Exception
      */
-    public function delete(Donor $donor)
+    public function delete(Donor $donor): bool
     {
         DB::query('START TRANSACTION');
 
@@ -278,12 +276,12 @@ public function delete(Donor $donor)
      * @param Donor $donor
      * @return array
      */
-    private function getCoreDonorMeta(Donor $donor)
+    private function getCoreDonorMeta(Donor $donor): array
     {
         return [
             DonorMetaKeys::FIRST_NAME => $donor->firstName,
             DonorMetaKeys::LAST_NAME => $donor->lastName,
-            DonorMetaKeys::PREFIX => isset($donor->prefix) ? $donor->prefix : null,
+            DonorMetaKeys::PREFIX => $donor->prefix ?? null,
         ];
     }
 
@@ -306,7 +304,7 @@ private function validateDonor(Donor $donor)
      * @param string $email
      * @return Donor
      */
-    public function getByEmail($email)
+    public function getByEmail(string $email)
     {
         $donorObjectByPrimaryEmail = $this->prepareQuery()
             ->where('email', $email)
@@ -323,7 +321,7 @@ public function getByEmail($email)
      * @param string $email
      * @return Donor
      */
-    public function getByAdditionalEmail($email)
+    public function getByAdditionalEmail(string $email)
     {
         $donorMetaObject = DB::table('give_donormeta')
             ->select(['donor_id', 'id'])
@@ -341,7 +339,7 @@ public function getByAdditionalEmail($email)
     /**
      * @return ModelQueryBuilder<Donor>
      */
-    public function prepareQuery()
+    public function prepareQuery(): ModelQueryBuilder
     {
         $builder = new ModelQueryBuilder(Donor::class);
 
@@ -402,7 +400,7 @@ private function updateAdditionalEmails(Donor $donor)
      * @param int $donorId
      * @return string|null
      */
-    public function getDonorLatestDonationDate($donorId)
+    public function getDonorLatestDonationDate(int $donorId)
     {
         $donation = DB::table('posts')
             ->select('post_date')
@@ -426,7 +424,7 @@ public function getDonorLatestDonationDate($donorId)
      * @param int $donorId
      * @return string|null
      */
-    public function getDonorType($donorId)
+    public function getDonorType(int $donorId)
     {
         $donor = DB::table('give_donors')
             ->select(
@@ -454,74 +452,21 @@ public function getDonorType($donorId)
         $recurringDonations = DB::table('posts')
             ->leftJoin('give_donationmeta', 'id', 'donation_id')
             ->whereIn('donation_id', $ids)
-            ->where( 'meta_key', DonationMetaKeys::IS_RECURRING)
-            ->where( 'meta_value', '1')
+            ->where('meta_key', DonationMetaKeys::IS_RECURRING)
+            ->where('meta_value', '1')
             ->count();
 
         if ($recurringDonations) {
             return 'subscriber';
         }
 
-        if ((int)$donor->donationCount > 1 ) {
+        if ((int)$donor->donationCount > 1) {
             return 'repeat';
         }
 
         return 'single';
     }
 
-    /**
-     * @param WP_REST_Request $request
-     * @since 2.20.0
-     *
-     * @return array
-     */
-    public function getDonorsForRequest(WP_REST_Request $request)
-    {
-        $page = $request->get_param('page');
-        $perPage = $request->get_param('perPage');
-
-        $query = DB::table('give_donors')
-            ->select(
-                'id',
-                ['user_id', 'userId'],
-                'email',
-                'name',
-                ['purchase_value', 'donationRevenue'],
-                ['purchase_count', 'donationCount'],
-                ['payment_ids', 'paymentIds'],
-                ['date_created', 'createdAt']
-            )
-            ->attachMeta(
-                'give_donormeta',
-                'id',
-                'donor_id',
-                ['_give_donor_title_prefix', 'titlePrefix']
-            )
-            ->limit($perPage)
-            ->orderBy('id', 'DESC')
-            ->offset(($page - 1) * $perPage);
-
-        $query = $this->getWhereConditionsForRequest($query, $request);
-
-        $query->limit($perPage);
-
-        return $query->getAll();
-    }
-
-    /**
-     * @param WP_REST_Request $request
-     * @since 2.20.0
-     *
-     * @return int
-     */
-    public function getTotalDonorsCountForRequest(WP_REST_Request $request)
-    {
-        $query = DB::table('give_donors');
-        $query = $this->getWhereConditionsForRequest($query, $request);
-
-        return $query->count();
-    }
-
     /**
      * @since 2.20.0
      * @return int
@@ -530,56 +475,4 @@ public function getDonorsCount()
     {
         return DB::table('give_donors')->count();
     }
-
-    /**
-     * @param QueryBuilder $builder
-     * @param WP_REST_Request $request
-     * @since 2.20.0
-     *
-     * @return QueryBuilder
-     */
-    private function getWhereConditionsForRequest(QueryBuilder $builder, WP_REST_Request $request)
-    {
-        $search = $request->get_param('search');
-        $start = $request->get_param('start');
-        $end = $request->get_param('end');
-        $form = $request->get_param('form');
-
-        if ($search) {
-            if (ctype_digit($search)) {
-                $builder->where('id', $search);
-            } else {
-                $builder->whereLike('name', $search);
-                $builder->orWhereLike('email', $search);
-            }
-        }
-
-        if ($start && $end) {
-            $builder->whereBetween('date_created', $start, $end);
-        } else if ($start) {
-            $builder->where('date_created', $start, '>=');
-        } else if ($end) {
-            $builder->where('date_created', $end, '<=');
-        }
-
-        if ($form) {
-            $builder
-                ->whereIn('id', static function (QueryBuilder $builder) use ($form) {
-                    $builder
-                        ->from('give_donationmeta')
-                        ->distinct()
-                        ->select('meta_value')
-                        ->where('meta_key', '_give_payment_donor_id')
-                        ->whereIn('donation_id', static function (QueryBuilder $builder) use ($form) {
-                            $builder
-                                ->from('give_donationmeta')
-                                ->select('donation_id')
-                                ->where('meta_key', '_give_payment_form_id')
-                                ->where('meta_value', $form);
-                        });
-                });
-        }
-
-        return $builder;
-    }
 }
diff --git a/tests/unit/tests/DonationForms/Repositories/DonationFormsRepositoryTest.php b/tests/unit/tests/DonationForms/Repositories/DonationFormsRepositoryTest.php
index aa8a49fdb6..e73a60e180 100644
--- a/tests/unit/tests/DonationForms/Repositories/DonationFormsRepositoryTest.php
+++ b/tests/unit/tests/DonationForms/Repositories/DonationFormsRepositoryTest.php
@@ -1,6 +1,7 @@
 <?php
 
-use Give\DonationForms\Repositories\DonationFormsRepository as DonationFormsRepository;
+use Give\DonationForms\Controllers\DonationFormsRequestController;
+use Give\Framework\Database\DB;
 
 final class DonationFormsTest extends Give_Unit_Test_Case {
 
@@ -9,18 +10,21 @@ final class DonationFormsTest extends Give_Unit_Test_Case {
     public function setUp()
     {
         parent::setUp();
-        $this->testingForms[] = Give_Helper_Form::create_simple_form();
-        $this->testingForms[] = Give_Helper_Form::create_simple_form();
+
+        // Delete previous donation forms
+        $posts = DB::prefix('posts');
+        DB::query("TRUNCATE TABLE $posts");
+
+        Give_Helper_Form::create_simple_form();
+        Give_Helper_Form::create_simple_form();
     }
 
     public function tearDown()
     {
         parent::tearDown();
-        foreach ( $this->testingForms as $form )
-        {
-            Give_Helper_Form::delete_form( $form->id );
-        }
-        $this->testingForms = [];
+
+        $posts = DB::prefix('posts');
+        DB::query("TRUNCATE TABLE $posts");
     }
 
     public function testListDonationForms()
@@ -31,15 +35,15 @@ public function testListDonationForms()
         $request->set_param('perPage', 30);
         $request->set_param('status', 'any');
 
-        $class = new ReflectionClass(DonationFormsRepository::class);
-        $getFormsForRequest = $class->getMethod('getFormsForRequest');
-        $getFormsForRequest->setAccessible(true);
-        $forms = $getFormsForRequest->invokeArgs(new DonationFormsRepository, [$request]);
+        $controller = new DonationFormsRequestController($request);
+        $forms = $controller->getForms();
+
         $this->assertEquals(2, count($forms), 'Repository retrieves correct number of total forms');
     }
 
-    public function testSearchRetrievesCorrectDonationForm(){
-        $this->testingForms[] = Give_Helper_Form::create_simple_form(
+    public function testSearchRetrievesCorrectDonationForm()
+    {
+        Give_Helper_Form::create_simple_form(
             [
                 'form' =>
                     [
@@ -54,10 +58,9 @@ public function testSearchRetrievesCorrectDonationForm(){
         $request->set_param('perPage', 30);
         $request->set_param('status', 'any');
 
-        $class = new ReflectionClass(DonationFormsRepository::class);
-        $getFormsForRequest = $class->getMethod('getFormsForRequest');
-        $getFormsForRequest->setAccessible(true);
-        $forms = $getFormsForRequest->invokeArgs(new DonationFormsRepository, [$request]);
+        $controller = new DonationFormsRequestController($request);
+        $forms = $controller->getForms();
+
         $this->assertEquals(1, count($forms), 'Search retrieves a single form');
         $this->assertEquals('My Simple Form', $forms[0]->title, 'Search retrieves correct form');
     }

From 0fe74f105de6e073b53a4a10f11fb041d0b24413 Mon Sep 17 00:00:00 2001
From: Joshua Dinh <75056371+JoshuaHungDinh@users.noreply.github.com>
Date: Mon, 16 May 2022 23:14:57 -0700
Subject: [PATCH 13/53] Fix: text aligns properly on offline donations (#6417)

* fix: adjust text alignment

* fix: display numbered list

* fix: adjust margin between elements

Co-authored-by: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
---
 .../Templates/Classic/resources/css/_payment-details.scss     | 4 ++++
 src/Views/Form/Templates/Sequoia/assets/css/form.scss         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Views/Form/Templates/Classic/resources/css/_payment-details.scss b/src/Views/Form/Templates/Classic/resources/css/_payment-details.scss
index 5952a45248..f503807290 100644
--- a/src/Views/Form/Templates/Classic/resources/css/_payment-details.scss
+++ b/src/Views/Form/Templates/Classic/resources/css/_payment-details.scss
@@ -261,6 +261,10 @@ $gatewayFontSize: 1rem;
         color: var(--give-primary-color);
     }
 
+    > #give_offline_payment_info >  p {
+        margin: 0;
+    }
+
     > .no-fields {
         p {
             margin-inline: auto;
diff --git a/src/Views/Form/Templates/Sequoia/assets/css/form.scss b/src/Views/Form/Templates/Sequoia/assets/css/form.scss
index 3867ff2383..36a983ddc4 100644
--- a/src/Views/Form/Templates/Sequoia/assets/css/form.scss
+++ b/src/Views/Form/Templates/Sequoia/assets/css/form.scss
@@ -1021,8 +1021,8 @@ p {
 
     #give_offline_payment_info {
         > ol {
-            list-style: none;
             padding: 0;
+            margin: 0 40px;
 
             > li {
                 line-height: 1.4;

From 447e4e8ee1ab199940d911af892d9748f6582167 Mon Sep 17 00:00:00 2001
From: Joshua Dinh <75056371+JoshuaHungDinh@users.noreply.github.com>
Date: Wed, 18 May 2022 14:18:52 -0700
Subject: [PATCH 14/53] Fix: admin notice's correctly display beneath the
 header (#6421)

* doc: remove additional period

* feature: change admin notice position

* feature: change admin notice position

* fix: update element type

* doc: add tag description

* fix: add text as comment
---
 assets/src/js/admin/reports/app/index.js     |  3 ++-
 includes/admin/views/html-admin-settings.php | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/assets/src/js/admin/reports/app/index.js b/assets/src/js/admin/reports/app/index.js
index 50e7885e34..b3643eb347 100644
--- a/assets/src/js/admin/reports/app/index.js
+++ b/assets/src/js/admin/reports/app/index.js
@@ -45,7 +45,8 @@ const App = () => {
 						<SettingsToggle />
 					</div>
 				</div>
-				<Tabs />
+                <hr className="wp-header-end hidden"/>
+                <Tabs />
 				<Routes />
 			</div>
 		</StoreProvider>
diff --git a/includes/admin/views/html-admin-settings.php b/includes/admin/views/html-admin-settings.php
index 4620bedb30..facb4e4654 100644
--- a/includes/admin/views/html-admin-settings.php
+++ b/includes/admin/views/html-admin-settings.php
@@ -22,7 +22,7 @@
 	/**
 	 * Filter the main form tab.
 	 *
-	 * Note: You can stop print main form if you want to.filter dynamically fire on basis of setting page slug
+	 * Note: You can stop print main form if you want to filter dynamically fire on basis of setting page slug
 	 * For example: if you register a setting page with give-settings menu slug
 	 *              then filter will be give-settings_open_form, give-settings_close_form
 	 *              We are using this filter in includes/admin/tools/class-settings-data.php#L52
@@ -41,6 +41,7 @@
 		)
 	);
 	?>
+
 	<div class="wrap give-settings-page <?php echo esc_html( $wrapper_class ); ?>">
 
 		<?php echo $form_open_tag; ?>
@@ -69,7 +70,15 @@
 
 		</div>
 
-		<div class="nav-tab-wrapper give-nav-tab-wrapper">
+        <?php
+        /*
+            Default behavior of WordPress places admin notices directly after the first h-tag inside any element
+            with the class of wrap. The tag below will instruct WordPress to place these notices below the header.
+        */
+        ?>
+        <hr class="wp-header-end hidden">
+
+        <div class="nav-tab-wrapper give-nav-tab-wrapper">
 				<?php
 				foreach ( $tabs as $name => $label ) {
 					echo '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=' . self::$setting_filter_prefix . "&tab={$name}" ) . '" class="nav-tab ' . ( $current_tab === $name ? 'nav-tab-active' : 'give-mobile-hidden' ) . '">' . $label . '</a>';

From 1e63721ef91ffc86a74a74ee3b5c85cbcb0e4092 Mon Sep 17 00:00:00 2001
From: Joshua Dinh <75056371+JoshuaHungDinh@users.noreply.github.com>
Date: Wed, 18 May 2022 14:55:56 -0700
Subject: [PATCH 15/53] Fix/document spelling  (#6422)

* doc: update spelling

* doc: update spelling
---
 src/API/Endpoints/Reports/AverageDonation.php |  2 +-
 src/API/Endpoints/Reports/Income.php          |  2 +-
 src/API/Endpoints/Reports/TotalDonors.php     |  4 +-
 src/API/Endpoints/Reports/TotalIncome.php     |  4 +-
 src/API/Endpoints/Reports/TotalRefunds.php    |  4 +-
 src/DonorDashboards/Admin/Settings.php        |  6 +--
 src/DonorDashboards/Admin/UpgradeNotice.php   |  2 +-
 .../Helpers/SanitizeProfileData.php           |  2 +-
 src/DonorDashboards/Tabs/Contracts/Route.php  |  2 +-
 .../resources/js/admin/index.js               |  2 +-
 src/Form/LegacyConsumer/README.md             |  4 +-
 src/Form/LoadTemplate.php                     |  2 +-
 src/FormAPI/Form/Field.php                    |  2 +-
 .../FieldsAPI/FormFieldMediator/README.md     |  4 +-
 .../includes/give-recurring-helpers.php       |  2 +-
 .../includes/give-subscription.php            |  2 +-
 src/Log/Log.php                               |  2 +-
 src/Onboarding/Setup/Page.php                 |  2 +-
 .../RecurringDonationsTab.module.scss         |  2 +-
 .../InPluginUpsells/resources/js/utils.js     |  2 +-
 .../RecurringDonations/PageSeedCommand.php    |  4 +-
 src/TestData/Commands/DonationSeedCommand.php |  2 +-
 src/TestData/Commands/PageSeedCommand.php     |  2 +-
 src/TestData/Framework/Factory.php            |  2 +-
 src/TestData/README.md                        | 54 +++++++++----------
 src/Tracking/Repositories/TrackEvents.php     |  2 +-
 src/Views/Form/Templates/Classic/Classic.php  |  2 +-
 .../resources/css/_donation-amount.scss       |  2 +-
 .../resources/css/_donation-summary.scss      |  2 +-
 .../resources/css/_errors-notices.scss        |  2 +-
 .../resources/css/_payment-details.scss       |  2 +-
 .../Templates/Classic/resources/js/form.js    |  4 +-
 src/Views/Form/Templates/Sequoia/Actions.php  |  2 +-
 33 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/API/Endpoints/Reports/AverageDonation.php b/src/API/Endpoints/Reports/AverageDonation.php
index 18e515816a..db6911ff67 100644
--- a/src/API/Endpoints/Reports/AverageDonation.php
+++ b/src/API/Endpoints/Reports/AverageDonation.php
@@ -132,7 +132,7 @@ public function get_data($start, $end, $intervalStr)
             'give'
         );
 
-        // Create data objec to be returned, with 'highlights' object containing total and average figures to display
+        // Create data object to be returned, with 'highlights' object containing total and average figures to display
         $data = [
             'datasets' => [
                 [
diff --git a/src/API/Endpoints/Reports/Income.php b/src/API/Endpoints/Reports/Income.php
index eaa7700198..bf22364b84 100644
--- a/src/API/Endpoints/Reports/Income.php
+++ b/src/API/Endpoints/Reports/Income.php
@@ -109,7 +109,7 @@ public function get_data($start, $end, $intervalStr)
             $tooltips = array_slice($tooltips, 1);
         }
 
-        // Create data objec to be returned, with 'highlights' object containing total and average figures to display
+        // Create data object to be returned, with 'highlights' object containing total and average figures to display
         $data = [
             'datasets' => [
                 [
diff --git a/src/API/Endpoints/Reports/TotalDonors.php b/src/API/Endpoints/Reports/TotalDonors.php
index 3433d08401..cd0bf20735 100644
--- a/src/API/Endpoints/Reports/TotalDonors.php
+++ b/src/API/Endpoints/Reports/TotalDonors.php
@@ -112,7 +112,7 @@ public function get_data($start, $end, $intervalStr)
             'give'
         );
 
-        // Create data objec to be returned, with 'highlights' object containing total and average figures to display
+        // Create data object to be returned, with 'highlights' object containing total and average figures to display
         $data = [
             'datasets' => [
                 [
@@ -145,7 +145,7 @@ public function get_trend($start, $end, $income)
 
         // Check that prev value and current value are > 0 (can't divide by 0)
         if ($prevDonors > 0 && $currentDonors > 0) {
-            // Check if it is a percent decreate, or increase
+            // Check if it is a percent decrease, or increase
             if ($prevDonors > $currentDonors) {
                 // Calculate a percent decrease
                 $trend = ((($prevDonors - $currentDonors) / $prevDonors) * 100) * -1;
diff --git a/src/API/Endpoints/Reports/TotalIncome.php b/src/API/Endpoints/Reports/TotalIncome.php
index beb8db6636..0a7c6aae85 100644
--- a/src/API/Endpoints/Reports/TotalIncome.php
+++ b/src/API/Endpoints/Reports/TotalIncome.php
@@ -119,7 +119,7 @@ public function get_data($start, $end, $intervalStr)
             'give'
         );
 
-        // Create data objec to be returned, with 'highlights' object containing total and average figures to display
+        // Create data object to be returned, with 'highlights' object containing total and average figures to display
         $data = [
             'datasets' => [
                 [
@@ -159,7 +159,7 @@ public function get_trend($start, $end, $income)
 
         // Check that prev value and current value are > 0 (can't divide by 0)
         if ($prevIncome > 0 && $currentIncome > 0) {
-            // Check if it is a percent decreate, or increase
+            // Check if it is a percent decrease, or increase
             if ($prevIncome > $currentIncome) {
                 // Calculate a percent decrease
                 $trend = ((($prevIncome - $currentIncome) / $prevIncome) * 100) * -1;
diff --git a/src/API/Endpoints/Reports/TotalRefunds.php b/src/API/Endpoints/Reports/TotalRefunds.php
index 19451651dc..cf7a90c722 100644
--- a/src/API/Endpoints/Reports/TotalRefunds.php
+++ b/src/API/Endpoints/Reports/TotalRefunds.php
@@ -112,7 +112,7 @@ public function get_data($start, $end, $intervalStr)
             'give'
         );
 
-        // Create data objec to be returned, with 'highlights' object containing total and average figures to display
+        // Create data object to be returned, with 'highlights' object containing total and average figures to display
         $data = [
             'datasets' => [
                 [
@@ -145,7 +145,7 @@ public function get_trend($start, $end, $refunds)
 
         // Check that prev value and current value are > 0 (can't divide by 0)
         if ($prevRefunds > 0 && $currentRefunds > 0) {
-            // Check if it is a percent decreate, or increase
+            // Check if it is a percent decrease, or increase
             if ($prevRefunds > $currentRefunds) {
                 // Calculate a percent decrease
                 $trend = ((($prevRefunds - $currentRefunds) / $prevRefunds) * 100) * -1;
diff --git a/src/DonorDashboards/Admin/Settings.php b/src/DonorDashboards/Admin/Settings.php
index 77b1ae085d..ac7859247d 100644
--- a/src/DonorDashboards/Admin/Settings.php
+++ b/src/DonorDashboards/Admin/Settings.php
@@ -92,7 +92,7 @@ protected function getDonorDashboardPageSetting()
     }
 
     /**
-     * Return CMB2 compatible array used to render/control override legacy donation manamgent pages setting
+     * Return CMB2 compatible array used to render/control override legacy donation management pages setting
      *
      * @since 2.10.0
      * @return array
@@ -264,7 +264,7 @@ private function isClassicEditorActive()
     }
 
     /**
-     * Determine whether the Disable Gutenberg plugin is active
+     * Determine whether Disable Gutenberg plugin is active
      *
      * @since 2.10.0
      * @return bool
@@ -310,7 +310,7 @@ public function overrideLegacyDonationManagementPageSettings($settings)
                 }
             }
 
-            // Hide settings that are overriden by Donor Profile setting
+            // Hide settings that are overridden by Donor Profile setting
             $key = 0;
             foreach ($settings as $setting) {
                 if (in_array($setting['id'], $overrideSettingsMap)) {
diff --git a/src/DonorDashboards/Admin/UpgradeNotice.php b/src/DonorDashboards/Admin/UpgradeNotice.php
index 2eddb7d2d6..e0f4564142 100644
--- a/src/DonorDashboards/Admin/UpgradeNotice.php
+++ b/src/DonorDashboards/Admin/UpgradeNotice.php
@@ -6,7 +6,7 @@ class UpgradeNotice
 {
 
     /**
-     * Reigster upgrade notice
+     * Register upgrade notice
      *
      * @since 2.10.0
      * @return void
diff --git a/src/DonorDashboards/Helpers/SanitizeProfileData.php b/src/DonorDashboards/Helpers/SanitizeProfileData.php
index 6a65105dce..06a7faff4a 100644
--- a/src/DonorDashboards/Helpers/SanitizeProfileData.php
+++ b/src/DonorDashboards/Helpers/SanitizeProfileData.php
@@ -10,7 +10,7 @@ class SanitizeProfileData
 {
 
     /**
-     * Sanitize int passed, and return 0 if somehting other than an integer was passed
+     * Sanitize int passed, and return 0 if something other than an integer was passed
      *
      * @since 2.10.0
      *
diff --git a/src/DonorDashboards/Tabs/Contracts/Route.php b/src/DonorDashboards/Tabs/Contracts/Route.php
index 68f7df3595..cf2747a940 100644
--- a/src/DonorDashboards/Tabs/Contracts/Route.php
+++ b/src/DonorDashboards/Tabs/Contracts/Route.php
@@ -82,7 +82,7 @@ public function handleRequestWithDonorIdCheck(WP_REST_Request $request)
                     'Email Access Token' => give()->email_access->token_email,
                     'Session Email' => give()->session->get('give_email'),
                     'Session Expiration' => give()->session->get_session_expiration(),
-                    'Error' => __('Donor ID coud not be validated for request.', 'give'),
+                    'Error' => __('Donor ID could not be validated for request.', 'give'),
                 ]
             );
 
diff --git a/src/DonorDashboards/resources/js/admin/index.js b/src/DonorDashboards/resources/js/admin/index.js
index d484f3bae2..832aaebe6b 100644
--- a/src/DonorDashboards/resources/js/admin/index.js
+++ b/src/DonorDashboards/resources/js/admin/index.js
@@ -1,7 +1,7 @@
 // Code to handle showing/hiding admin notices (based on dismissed status in localStorage)
 
 document.addEventListener('DOMContentLoaded', () => {
-    // Select dismissable notices
+    // Select dismissible notices
     const notices = document.querySelectorAll('div[data-give-dismissible]');
 
     // Apply for every dismissible GiveWP notice
diff --git a/src/Form/LegacyConsumer/README.md b/src/Form/LegacyConsumer/README.md
index 8b389e0497..2959b3ad3e 100644
--- a/src/Form/LegacyConsumer/README.md
+++ b/src/Form/LegacyConsumer/README.md
@@ -78,7 +78,7 @@ add_action( 'give_fields_payment_mode_before_gateways', function( $collection )
 
 ## Integrating with the Form
 
-The new public Fields API promotes field registration above the form template. Instead of requiring different hooks to render, validate, and persist field data, a single hook unifies field registration that can then be used to render, validate, and persist field data programatically.
+The new public Fields API promotes field registration above the form template. Instead of requiring different hooks to render, validate, and persist field data, a single hook unifies field registration that can then be used to render, validate, and persist field data programmatically.
 
 ```php
 // Setup a field register with an empty field collection.
@@ -94,4 +94,4 @@ add_action( 'give_payment_mode_before_gateways', function( $formID ) use ( $fiel
         // Render field HTML...
     }
 });
-```
\ No newline at end of file
+```
diff --git a/src/Form/LoadTemplate.php b/src/Form/LoadTemplate.php
index 39bc90122e..9185a7c1c3 100644
--- a/src/Form/LoadTemplate.php
+++ b/src/Form/LoadTemplate.php
@@ -129,7 +129,7 @@ public function handleReceiptAjax()
             return;
         }
 
-        // Remove protocol before url comparision.
+        // Remove protocol before url comparison.
         $referer = preg_replace('/^https?:\/\//i', '', untrailingslashit(wp_get_referer()));
         $successPageUrl = preg_replace('/^https?:\/\//i', '', untrailingslashit(FormUtils::getSuccessPageURL()));
 
diff --git a/src/FormAPI/Form/Field.php b/src/FormAPI/Form/Field.php
index 2fe6f5897a..23366e4b9f 100644
--- a/src/FormAPI/Form/Field.php
+++ b/src/FormAPI/Form/Field.php
@@ -72,7 +72,7 @@ abstract class Field
     public $defaultValue = null;
 
     /**
-     * Field attribues.
+     * Field attributes.
      *
      * @since 2.7.0
      * @var string
diff --git a/src/Framework/FieldsAPI/FormFieldMediator/README.md b/src/Framework/FieldsAPI/FormFieldMediator/README.md
index 3f1bee93b2..3289eb12c9 100644
--- a/src/Framework/FieldsAPI/FormFieldMediator/README.md
+++ b/src/Framework/FieldsAPI/FormFieldMediator/README.md
@@ -1,7 +1,7 @@
 # Form Field Mediators
 
-Form Field Mediators are intentionally separate from the Form Field with which they interact. The intent is to create a boudary between the structure of field data and how it relates to GiveWP using the WordPress hook system.
+Form Field Mediators are intentionally separate from the Form Field with which they interact. The intent is to create a boundary between the structure of field data and how it relates to GiveWP using the WordPress hook system.
 
 ## Example
 
-As an example, the [Required Field Mediator](RequiredField.php) integrates a collection of fields with the `give_donation_form_required_fields` filter hook to register error messages for each required field. In this case, the error message is a feature of the Form Field, but how that information is used is managed by the mediator. This boundary fulfills a seperation of concerns by de-coupling the data from its use.
\ No newline at end of file
+As an example, the [Required Field Mediator](RequiredField.php) integrates a collection of fields with the `give_donation_form_required_fields` filter hook to register error messages for each required field. In this case, the error message is a feature of the Form Field, but how that information is used is managed by the mediator. This boundary fulfills a separation of concerns by de-coupling the data from its use.
diff --git a/src/LegacySubscriptions/includes/give-recurring-helpers.php b/src/LegacySubscriptions/includes/give-recurring-helpers.php
index 17c5aa0a73..44f0d48163 100644
--- a/src/LegacySubscriptions/includes/give-recurring-helpers.php
+++ b/src/LegacySubscriptions/includes/give-recurring-helpers.php
@@ -159,7 +159,7 @@ function give_recurring_get_period($form_id, $price_id = 0)
 {
     $recurring_option = give_get_meta($form_id, '_give_recurring', true);
 
-    // Is this a variable price form & admin's choice?
+    // Is this a variable price form & admins choice?
     if (give_has_variable_prices($form_id) && 'yes_admin' === $recurring_option) {
         if ('custom' === $price_id) {
             return give_get_meta($form_id, '_give_recurring_custom_amount_period', true, 'month');
diff --git a/src/LegacySubscriptions/includes/give-subscription.php b/src/LegacySubscriptions/includes/give-subscription.php
index 9df3d38c63..726bd0c998 100644
--- a/src/LegacySubscriptions/includes/give-subscription.php
+++ b/src/LegacySubscriptions/includes/give-subscription.php
@@ -1062,7 +1062,7 @@ public function payment_exists( $txn_id = '' ) {
 	 * @param  integer $length The number of notes to get
 	 * @param  integer $paged  What note to start at
 	 *
-	 * @return array           The notes requsted
+	 * @return array           The notes requested
 	 */
 	public function get_notes( $length = 20, $paged = 1 ) {
 
diff --git a/src/Log/Log.php b/src/Log/Log.php
index aad9c9a9b9..ae08480831 100644
--- a/src/Log/Log.php
+++ b/src/Log/Log.php
@@ -11,7 +11,7 @@
  *
  * The static facade intended to be the primary way of logging within GiveWP to make life easier.
  *
- * @unreleased Use array_diff_key to filter context data to prevent php wanring with multi-dimesion array
+ * @unreleased Use array_diff_key to filter context data to prevent php warning with multi-dimension array
  * @since 2.20.0 add sensitive information redaction; store context as arrays for JSON serialization
  * @since 2.19.6 added debug
  * @since 2.10.0
diff --git a/src/Onboarding/Setup/Page.php b/src/Onboarding/Setup/Page.php
index b472f52dc8..5e9331d433 100644
--- a/src/Onboarding/Setup/Page.php
+++ b/src/Onboarding/Setup/Page.php
@@ -24,7 +24,7 @@ class Page
     const DISABLED = 'disabled';
 
     /**
-     * Dissmiss the Setup Page.
+     * Dismiss the Setup Page.
      *
      * @since 2.8.0
      */
diff --git a/src/Promotions/InPluginUpsells/resources/js/components/RecurringDonationsTab.module.scss b/src/Promotions/InPluginUpsells/resources/js/components/RecurringDonationsTab.module.scss
index b5b39d14f1..36605aefcd 100644
--- a/src/Promotions/InPluginUpsells/resources/js/components/RecurringDonationsTab.module.scss
+++ b/src/Promotions/InPluginUpsells/resources/js/components/RecurringDonationsTab.module.scss
@@ -52,7 +52,7 @@
 .features {
     margin: 0;
     padding: 0;
-    /* Sass doesn’t like that max-content isn’t a number */
+    /* Sass does not like that max-content isn’t a number */
     width: string.unquote('max(max-content, 100%)');
     display: grid;
     row-gap: 0.5rem;
diff --git a/src/Promotions/InPluginUpsells/resources/js/utils.js b/src/Promotions/InPluginUpsells/resources/js/utils.js
index 1448d4595f..41c23a251c 100644
--- a/src/Promotions/InPluginUpsells/resources/js/utils.js
+++ b/src/Promotions/InPluginUpsells/resources/js/utils.js
@@ -38,6 +38,6 @@ export function transformEmphasis(text) {
  * Get an asset URL.
  *
  * @param {string} filename (without leading slash).
- * @returns {strign} asset URL
+ * @returns {string} asset URL
  */
 export const assetUrl = (filename) => `${window.GiveAddons.assetsUrl}${filename}`;
diff --git a/src/TestData/Addons/RecurringDonations/PageSeedCommand.php b/src/TestData/Addons/RecurringDonations/PageSeedCommand.php
index d110d56643..c279345871 100644
--- a/src/TestData/Addons/RecurringDonations/PageSeedCommand.php
+++ b/src/TestData/Addons/RecurringDonations/PageSeedCommand.php
@@ -8,7 +8,7 @@
  * Class PageSeedCommand
  * @package Give\TestData\RecurringDonations
  *
- * A WP-CLI command for seeding recuring donations demonstration page.
+ * A WP-CLI command for seeding recurring donation's demonstration page.
  */
 class PageSeedCommand
 {
@@ -24,7 +24,7 @@ public function __construct(PageFactory $pageFactory)
     }
 
     /**
-     * Generates Recurring Donations demonstartion page
+     * Generates Recurring Donation's demonstration page
      *
      * [--preview=<preview>]
      * : Preview generated data
diff --git a/src/TestData/Commands/DonationSeedCommand.php b/src/TestData/Commands/DonationSeedCommand.php
index 764264dc68..4d180f332e 100644
--- a/src/TestData/Commands/DonationSeedCommand.php
+++ b/src/TestData/Commands/DonationSeedCommand.php
@@ -67,7 +67,7 @@ public function __construct(
      * default: false
      *
      * [--params=<params>]
-     * : Additinal params
+     * : Additional params
      * default: ''
      *
      * [--consistent=<consistent>]
diff --git a/src/TestData/Commands/PageSeedCommand.php b/src/TestData/Commands/PageSeedCommand.php
index fd5d11810f..62de2c713b 100644
--- a/src/TestData/Commands/PageSeedCommand.php
+++ b/src/TestData/Commands/PageSeedCommand.php
@@ -25,7 +25,7 @@ public function __construct(PageFactory $pageFactory)
     }
 
     /**
-     * Generates GiveWP demonstartion page with all GiveWP shortcodes included
+     * Generates GiveWP demonstration page with all GiveWP shortcodes included
      *
      * [--preview=<preview>]
      * : Preview generated data
diff --git a/src/TestData/Framework/Factory.php b/src/TestData/Framework/Factory.php
index 3b0ad414f9..4a0fe27fdf 100644
--- a/src/TestData/Framework/Factory.php
+++ b/src/TestData/Framework/Factory.php
@@ -29,7 +29,7 @@ public function make($count)
     }
 
     /**
-     * Allways generate consistent data
+     * Always generate consistent data
      *
      * @param bool $consistent
      *
diff --git a/src/TestData/README.md b/src/TestData/README.md
index daacb16edf..6d4088586c 100644
--- a/src/TestData/README.md
+++ b/src/TestData/README.md
@@ -8,7 +8,7 @@ Generate test data using CLI
 
 There is a specific order which you have to follow when generating the test data
 
-1. Generate Donation Forms 
+1. Generate Donation Forms
     - *If there are no Donation Forms available on the site, it's important to generate them first*
 
 2. Generate Donors
@@ -26,25 +26,25 @@ There is a specific order which you have to follow when generating the test data
 `[--count=<count>]`
 
  Number of donations to generate
- 
+
  default: `10`
- 
- 
+
+
 `[--template=<template>]`
 
  Form template
 
  default: `random`
- 
- options: 
+
+ options:
  - `sequoia`
  - `legacy`
  - `random`
- 
+
  `[--set-goal=<bool>]`
- 
+
  Set donation form goal
- 
+
  default: `false`
 
 `[--set-terms=<bool>]`
@@ -68,20 +68,20 @@ default: `false`
 
 **Example usage**
 
- `wp give test-donation-form --count=10 --template=legacy --set-goal=true --set-terms=true --consistent=true`  
- 
- 
+ `wp give test-donation-form --count=10 --template=legacy --set-goal=true --set-terms=true --consistent=true`
+
+
  **Help**
- 
+
  `wp help give test-donation-form`
- 
- 
+
+
  ### Generate Donors
- 
+
  `wp give test-donors`
- 
+
  **Options**
- 
+
 `[--count=<count>]`
 
 Number of donors to generate
@@ -105,16 +105,16 @@ default: `false`
 `wp give test-donors --count=10 --preview=true --consistent=true`
 
  **Help**
- 
+
  `wp help give test-donors`
 
 
  ### Generate Donations
- 
+
  `wp give test-donations`
- 
+
  **Options**
- 
+
 `[--count=<count>]`
 
 Number of donations to generate
@@ -161,7 +161,7 @@ default: `false`
 
 Used for passing additional parameters
 
-Example usage: 
+Example usage:
 
 `--params=donation_currency=EUR\&donation_cover_fees=true`
 
@@ -173,14 +173,14 @@ Make generated data consistent
 
 default: `false`
 
-### Generate GiveWP demonstartion page
+### Generate GiveWP demonstration page
 
 `wp give test-demonstration-page`
 
-Generates GiveWP demonstartion page with all GiveWP shortcodes included
+Generates GiveWP demonstration page with all GiveWP shortcodes included
 
  **Options**
- 
+
 `[--preview=<preview>]`
 
 Preview generated data
@@ -192,5 +192,5 @@ default: `false`
 `wp give test-demonstration-page --count=10 --preview=true`
 
  **Help**
- 
+
  `wp help give test-demonstration-page`
diff --git a/src/Tracking/Repositories/TrackEvents.php b/src/Tracking/Repositories/TrackEvents.php
index 7ff0fdd020..f5a91e039a 100644
--- a/src/Tracking/Repositories/TrackEvents.php
+++ b/src/Tracking/Repositories/TrackEvents.php
@@ -28,7 +28,7 @@ public function removeTrackList()
     }
 
     /**
-     * Remove list of recently edited donaiton forms.
+     * Remove list of recently edited donation forms.
      *
      * @since 2.10.2
      */
diff --git a/src/Views/Form/Templates/Classic/Classic.php b/src/Views/Form/Templates/Classic/Classic.php
index fa7f6c5951..efd33021c2 100644
--- a/src/Views/Form/Templates/Classic/Classic.php
+++ b/src/Views/Form/Templates/Classic/Classic.php
@@ -119,7 +119,7 @@ public function loadHooks()
          */
         // Remove goal.
         remove_action('give_pre_form', 'give_show_goal_progress');
-        // Remove intermediate continue button which appear when display style set to other then onpage.
+        // Remove intermediate continue button which appears when display style set to  anything other than "onpage".
         remove_action('give_after_donation_levels', 'give_display_checkout_button');
         // Hide title.
         add_filter('give_form_title', '__return_empty_string');
diff --git a/src/Views/Form/Templates/Classic/resources/css/_donation-amount.scss b/src/Views/Form/Templates/Classic/resources/css/_donation-amount.scss
index 864f8aa1dd..ea0240338f 100644
--- a/src/Views/Form/Templates/Classic/resources/css/_donation-amount.scss
+++ b/src/Views/Form/Templates/Classic/resources/css/_donation-amount.scss
@@ -105,7 +105,7 @@
 
     & .give-formatted-currency {
         // This is already formatted for the currency and flexbox breaks it so
-        // we agressively set the direction.
+        // we aggressively set the direction.
         direction: ltr;
         display: flex;
         column-gap: 0.15rem;
diff --git a/src/Views/Form/Templates/Classic/resources/css/_donation-summary.scss b/src/Views/Form/Templates/Classic/resources/css/_donation-summary.scss
index 7e3f96f239..26cb0e30ca 100644
--- a/src/Views/Form/Templates/Classic/resources/css/_donation-summary.scss
+++ b/src/Views/Form/Templates/Classic/resources/css/_donation-summary.scss
@@ -46,7 +46,7 @@
         }
     }
 
-    // Colors (tobdy inherits)
+    // Colors (inherits)
     thead,
     tfoot {
         color: #333;
diff --git a/src/Views/Form/Templates/Classic/resources/css/_errors-notices.scss b/src/Views/Form/Templates/Classic/resources/css/_errors-notices.scss
index dd50a953f0..d9c521f26c 100644
--- a/src/Views/Form/Templates/Classic/resources/css/_errors-notices.scss
+++ b/src/Views/Form/Templates/Classic/resources/css/_errors-notices.scss
@@ -57,7 +57,7 @@
     position: absolute;
 }
 
-// Styes for error and notice types
+// Styles for error and notice types
 #give_error_test_mode {
     margin-bottom: 0.9rem;
 }
diff --git a/src/Views/Form/Templates/Classic/resources/css/_payment-details.scss b/src/Views/Form/Templates/Classic/resources/css/_payment-details.scss
index f503807290..dcdc282bca 100644
--- a/src/Views/Form/Templates/Classic/resources/css/_payment-details.scss
+++ b/src/Views/Form/Templates/Classic/resources/css/_payment-details.scss
@@ -30,7 +30,7 @@ $gatewayFontSize: 1rem;
 
 #give-gateway-radio-list > li {
     // Ideally, the input would be wrapped with the label, but even then we
-    // wouldn’t be able to add nice hover and focus styles for this. So, we are
+    // would not be able to add nice hover and focus styles for this. So, we are
     // using absolute positioning to increase the hit area of the checkbox and
     // then placing the pseudo-element checkbox styles, label, and gateway icon
     // manually. Below are a few variables for tweaking the layout.
diff --git a/src/Views/Form/Templates/Classic/resources/js/form.js b/src/Views/Form/Templates/Classic/resources/js/form.js
index f861ecfa19..2139e5cca7 100644
--- a/src/Views/Form/Templates/Classic/resources/js/form.js
+++ b/src/Views/Form/Templates/Classic/resources/js/form.js
@@ -18,7 +18,7 @@ import {
 } from './is-feature-active.js';
 
 // This must be called ASAP (since this is used when DOMContentLoaded happens)
-// It doesn’t use anything inside the body.
+// It does not use anything inside the body.
 IS_STRIPE_ACTIVE && setStripeElementStyles();
 
 // Transforms document for classic template
@@ -444,7 +444,7 @@ function setRecurringPeriodSelectWidth() {
         }
 
         // Update after the fonts load.
-        // Note: FontFaceSet’s loadingdone doesn’t seem to work in Safari.
+        // Note: FontFaceSet’s loadingdone does not seem to work in Safari.
         document.fonts.ready.then(updateWidth);
 
         // Update when the value changes.
diff --git a/src/Views/Form/Templates/Sequoia/Actions.php b/src/Views/Form/Templates/Sequoia/Actions.php
index 3a285a4fe8..01547b934b 100644
--- a/src/Views/Form/Templates/Sequoia/Actions.php
+++ b/src/Views/Form/Templates/Sequoia/Actions.php
@@ -172,7 +172,7 @@ public function loadHooks($formId, $args, $form)
         // Remove goal.
         remove_action('give_pre_form', 'give_show_goal_progress', 10);
 
-        // Remove intermediate continue button which appear when display style set to other then onpage.
+        // Remove intermediate continue button which appears when display style is set to anything other than "onpage".
         remove_action('give_after_donation_levels', 'give_display_checkout_button', 10);
 
         // Hide title.

From 97a1957160cd8f2a1019b911f24099be63d49f92 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@givewp.com>
Date: Thu, 19 May 2022 14:18:10 -0700
Subject: [PATCH 16/53] Fix: Prevent "switch view" buttons from showing up
 incorrectly (#6423)

---
 includes/admin/admin-actions.php             |  2 +-
 src/DonationForms/DonationFormsAdminPage.php | 16 +++++++++++++---
 src/DonationForms/ServiceProvider.php        |  2 +-
 src/Donors/DonorsAdminPage.php               |  2 +-
 src/Donors/ServiceProvider.php               |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/includes/admin/admin-actions.php b/includes/admin/admin-actions.php
index 8499e8bf7f..92fc36604c 100644
--- a/includes/admin/admin-actions.php
+++ b/includes/admin/admin-actions.php
@@ -652,7 +652,7 @@ function showReactTable () {
         }
     </script>
     <button onclick="showReactTable()" class="page-title-action">
-        <?php _e('Show Updated View', 'give') ?>
+        <?php _e('Switch to New View', 'give') ?>
     </button>
 
 	<?php
diff --git a/src/DonationForms/DonationFormsAdminPage.php b/src/DonationForms/DonationFormsAdminPage.php
index 3063d035ae..de3645ff18 100644
--- a/src/DonationForms/DonationFormsAdminPage.php
+++ b/src/DonationForms/DonationFormsAdminPage.php
@@ -153,7 +153,7 @@ function showReactTable () {
             }
             jQuery( function() {
                 jQuery(jQuery(".wrap .page-title-action")[0]).after(
-                    '<button class="page-title-action" onclick="showReactTable()">Switch to Updated View</button>'
+                    '<button class="page-title-action" onclick="showReactTable()">Switch to New View</button>'
                 );
             });
         </script>
@@ -163,13 +163,23 @@ function showReactTable () {
     /**
      * Helper function to determine if current page is Give Add-ons admin page
      *
-     * @return bool
+     * @since 2.20.0
      */
-    public static function isShowing()
+    public static function isShowing(): bool
     {
         return isset($_GET['page']) && $_GET['page'] === 'give-forms';
     }
 
+    /**
+     * Helper function to determine if the current page is the legacy donation forms list page
+     *
+     * @unreleased
+     */
+    public static function isShowingLegacyPage(): bool
+    {
+        return isset($_GET['post_type']) && $_GET['post_type'] === 'give_forms' && empty($_GET['page']);
+    }
+
     /**
      * @since 2.20.0
      * @return string
diff --git a/src/DonationForms/ServiceProvider.php b/src/DonationForms/ServiceProvider.php
index 6dcc4c0d83..e47804af01 100644
--- a/src/DonationForms/ServiceProvider.php
+++ b/src/DonationForms/ServiceProvider.php
@@ -36,7 +36,7 @@ public function boot()
                 Hooks::addAction('admin_enqueue_scripts', DonationFormsAdminPage::class, 'loadScripts');
             }
         }
-        else
+        elseif(DonationFormsAdminPage::isShowingLegacyPage())
         {
             Hooks::addAction( 'admin_head', DonationFormsAdminPage::class, 'renderReactSwitch');
         }
diff --git a/src/Donors/DonorsAdminPage.php b/src/Donors/DonorsAdminPage.php
index 2d83db0ae2..6ae846d9c6 100644
--- a/src/Donors/DonorsAdminPage.php
+++ b/src/Donors/DonorsAdminPage.php
@@ -164,7 +164,7 @@ function showReactTable () {
             }
             jQuery( function() {
                 jQuery(jQuery(".wrap .wp-header-end")).before(
-                    '<button class="page-title-action" onclick="showReactTable()">Switch to Updated View</button>'
+                    '<button class="page-title-action" onclick="showReactTable()">Switch to New View</button>'
                 );
             });
         </script>
diff --git a/src/Donors/ServiceProvider.php b/src/Donors/ServiceProvider.php
index 309b5d4dcb..ba86e44261 100644
--- a/src/Donors/ServiceProvider.php
+++ b/src/Donors/ServiceProvider.php
@@ -35,7 +35,7 @@ public function boot()
                 Hooks::addAction('admin_enqueue_scripts', DonorsAdminPage::class, 'loadScripts');
             }
         }
-        else
+        elseif(DonorsAdminPage::isShowing())
         {
             Hooks::addAction( 'admin_head', DonorsAdminPage::class, 'renderReactSwitch');
         }

From 143c526e508d208b2e322b5f086591871ed49a66 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@impress.org>
Date: Thu, 19 May 2022 15:33:03 -0700
Subject: [PATCH 17/53] chore: prepare for 2.20.1 release

---
 give.php                                     | 4 ++--
 readme.txt                                   | 6 +++++-
 src/DonationForms/DonationFormsAdminPage.php | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/give.php b/give.php
index eb745a448b..7834a1264e 100644
--- a/give.php
+++ b/give.php
@@ -6,7 +6,7 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 2.20.0
+ * Version: 2.20.1
  * Requires at least: 5.0
  * Requires PHP: 7.0
  * Text Domain: give
@@ -305,7 +305,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '2.20.0');
+            define('GIVE_VERSION', '2.20.1');
         }
 
         // Plugin Root File.
diff --git a/readme.txt b/readme.txt
index 18bc121d77..c2fe50551a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 5.0
 Tested up to: 5.9
 Requires PHP: 7.0
-Stable tag: 2.20.0
+Stable tag: 2.20.1
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -251,6 +251,10 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 8. GiveWP has a dedicated support team to help answer any questions you may have and help you through stumbling blocks.
 
 == Changelog ==
+= 2.20.1: May 19th, 2022 =
+* Fix: Corrected an issue where admin notices were displaying strangely
+* Fix: Removed the "Switch to New View" button that would show up in strange admin places when switched to the legacy donor or donation lists
+
 = 2.20.0: May 11th, 2022 =
 * New: Refreshed the donor and donation list screens in the admin
 * New: Significant improvements to the donor wall and form grid blocks
diff --git a/src/DonationForms/DonationFormsAdminPage.php b/src/DonationForms/DonationFormsAdminPage.php
index de3645ff18..5fd2e507c3 100644
--- a/src/DonationForms/DonationFormsAdminPage.php
+++ b/src/DonationForms/DonationFormsAdminPage.php
@@ -173,7 +173,7 @@ public static function isShowing(): bool
     /**
      * Helper function to determine if the current page is the legacy donation forms list page
      *
-     * @unreleased
+     * @since 2.20.1
      */
     public static function isShowingLegacyPage(): bool
     {

From f6da7c43158f25c7f644f363eca6c8e580e1e182 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 20 May 2022 20:46:01 +0530
Subject: [PATCH 18/53] Fix: php 8.1 compatibility issue (#6424)

---
 includes/forms/functions.php                        | 13 ++++++++-----
 .../CommandHandlers/PaymentProcessingHandler.php    |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/includes/forms/functions.php b/includes/forms/functions.php
index ad37186ba1..baa34fdf10 100644
--- a/includes/forms/functions.php
+++ b/includes/forms/functions.php
@@ -167,6 +167,7 @@ function give_send_to_success_page( $query_string = null ) {
  * @param array|string $args
  *
  * @access public
+ * @unreleased Auto set "payment-mode" in redirect url.
  * @since  1.0
  * @return Void
  */
@@ -174,22 +175,24 @@ function give_send_back_to_checkout( $args = [] ) {
 
 	$url     = isset( $_POST['give-current-url'] ) ? sanitize_text_field( $_POST['give-current-url'] ) : '';
 	$form_id = 0;
+    $defaults = [];
 
 	// Set the form_id.
 	if ( isset( $_POST['give-form-id'] ) ) {
-		$form_id = sanitize_text_field( $_POST['give-form-id'] );
+        $defaults['form-id'] = (int) sanitize_text_field( $_POST['give-form-id'] );
 	}
 
+    // Set the payment mode.
+    if ( isset( $_POST['payment-mode'] ) ) {
+        $defaults['payment-mode'] = sanitize_text_field( $_POST['payment-mode'] );
+    }
+
 	// Need a URL to continue. If none, redirect back to single form.
 	if ( empty( $url ) ) {
 		wp_safe_redirect( get_permalink( $form_id ) );
 		give_die();
 	}
 
-	$defaults = [
-		'form-id' => (int) $form_id,
-	];
-
 	// Set the $level_id.
 	if ( isset( $_POST['give-price-id'] ) ) {
 		$defaults['level-id'] = sanitize_text_field( $_POST['give-price-id'] );
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentProcessingHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentProcessingHandler.php
index 8cc60b3807..a1b7a637c9 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentProcessingHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentProcessingHandler.php
@@ -18,7 +18,7 @@ public function __construct(PaymentProcessing $paymentCommand)
     /**
      * @return DonationStatus
      */
-    protected function getPaymentStatus()
+    protected function getPaymentStatus(): DonationStatus
     {
         return DonationStatus::PROCESSING();
     }

From b459d729ecd7ea247e15a0c37abc2f00fbf31c69 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@givewp.com>
Date: Fri, 20 May 2022 09:47:05 -0700
Subject: [PATCH 19/53] feature: include the failed query in the
 DatabaseQueryException (#6425)

---
 src/Framework/Database/DB.php                 |  2 +-
 .../Exceptions/DatabaseQueryException.php     | 25 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Framework/Database/DB.php b/src/Framework/Database/DB.php
index d24c1da72e..b98847027d 100644
--- a/src/Framework/Database/DB.php
+++ b/src/Framework/Database/DB.php
@@ -239,7 +239,7 @@ private static function runQueryWithErrorChecking($queryCaller)
         $wpError = self::getQueryErrors($errorCount);
 
         if (!empty($wpError->errors)) {
-            throw new DatabaseQueryException('Query Exception', $wpError->errors);
+            throw new DatabaseQueryException($wpdb->last_query, $wpError->errors);
         }
 
         return $output;
diff --git a/src/Framework/Database/Exceptions/DatabaseQueryException.php b/src/Framework/Database/Exceptions/DatabaseQueryException.php
index be011c39af..4c644bb31e 100644
--- a/src/Framework/Database/Exceptions/DatabaseQueryException.php
+++ b/src/Framework/Database/Exceptions/DatabaseQueryException.php
@@ -21,8 +21,23 @@ class DatabaseQueryException extends Exception
      */
     private $queryErrors;
 
-    public function __construct(string $message, array $queryErrors, $code = 0, Throwable $previous = null)
-    {
+    /**
+     * @var string
+     */
+    private $query;
+
+    /**
+     * @unreleased include query and query errors, and make auto-logging compatible
+     * @since 2.9.2
+     */
+    public function __construct(
+        string $query,
+        array $queryErrors,
+        string $message = 'Database Query',
+        $code = 0,
+        Throwable $previous = null
+    ) {
+        $this->query = $query;
         $this->queryErrors = $queryErrors;
 
         parent::__construct($message, $code, $previous);
@@ -40,6 +55,11 @@ public function getQueryErrors(): array
         return $this->queryErrors;
     }
 
+    public function getQuery(): string
+    {
+        return $this->query;
+    }
+
     /**
      * @inheritDoc
      */
@@ -47,6 +67,7 @@ public function getLogContext(): array
     {
         return [
             'category' => 'Uncaught database exception',
+            'Query' => $this->query,
             'Query Errors' => $this->queryErrors,
         ];
     }

From fedce0a5410a92dbf89e075d22c675b3f3966064 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 20 May 2022 22:49:06 +0530
Subject: [PATCH 20/53] fix: create Give_Recurring_Cache class object with
 get_instance function

---
 src/LegacySubscriptions/includes/give-subscriptions-db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/LegacySubscriptions/includes/give-subscriptions-db.php b/src/LegacySubscriptions/includes/give-subscriptions-db.php
index bc4df624be..64381402ad 100644
--- a/src/LegacySubscriptions/includes/give-subscriptions-db.php
+++ b/src/LegacySubscriptions/includes/give-subscriptions-db.php
@@ -158,7 +158,7 @@ public function update($row_id, $data = [], $where = '')
     {
         $status = parent::update($row_id, $data, $where);
 
-        (new Give_Recurring_Cache())->flush_on_subscription_update($status, $row_id, $data, $where);
+        Give_Recurring_Cache::get_instance()->flush_on_subscription_update($status, $row_id, $data, $where);
 
         /**
          * Fire the action when subscriptions updated

From 1f8040f2d5a78ed781ed14dd0cbacf27d76372f1 Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
Date: Fri, 20 May 2022 14:46:01 -0400
Subject: [PATCH 21/53] refactor: replace new actions with givewp prefix and
 update docblocks with since tags and types

---
 .../Repositories/DonationNotesRepository.php  | 12 +--
 .../Repositories/DonationRepository.php       | 74 +++++--------------
 src/Donations/ServiceProvider.php             |  8 +-
 src/Donors/Repositories/DonorRepository.php   | 56 +++++++-------
 .../Repositories/SubscriptionRepository.php   | 64 ++++++----------
 src/Subscriptions/ServiceProvider.php         |  4 +-
 6 files changed, 81 insertions(+), 137 deletions(-)

diff --git a/src/Donations/Repositories/DonationNotesRepository.php b/src/Donations/Repositories/DonationNotesRepository.php
index 875d923b90..965e25877d 100644
--- a/src/Donations/Repositories/DonationNotesRepository.php
+++ b/src/Donations/Repositories/DonationNotesRepository.php
@@ -52,7 +52,7 @@ public function insert(DonationNote $donationNote)
     {
         $this->validateDonationNote($donationNote);
 
-        Hooks::doAction('give_donation_note_creating', $donationNote);
+        Hooks::doAction('givewp_donation_note_creating', $donationNote);
 
         $dateCreated = Temporal::withoutMicroseconds($donationNote->createdAt ?: Temporal::getCurrentDateTime());
         $dateCreatedFormatted = Temporal::getFormattedDateTime($dateCreated);
@@ -82,7 +82,7 @@ public function insert(DonationNote $donationNote)
         $donationNote->id = DB::last_insert_id();
         $donationNote->createdAt = $dateCreated;
 
-        Hooks::doAction('give_donation_note_created', $donationNote);
+        Hooks::doAction('givewp_donation_note_created', $donationNote);
     }
 
     /**
@@ -96,7 +96,7 @@ public function update(DonationNote $donationNote)
     {
         $this->validateDonationNote($donationNote);
 
-        Hooks::doAction('give_donation_note_updating', $donationNote);
+        Hooks::doAction('givewp_donation_note_updating', $donationNote);
 
         DB::query('START TRANSACTION');
 
@@ -118,7 +118,7 @@ public function update(DonationNote $donationNote)
 
         DB::query('COMMIT');
 
-        Hooks::doAction('give_donation_note_updated', $donationNote);
+        Hooks::doAction('givewp_donation_note_updated', $donationNote);
     }
 
     /**
@@ -133,7 +133,7 @@ public function delete(DonationNote $donationNote): bool
     {
         DB::query('START TRANSACTION');
 
-        Hooks::doAction('give_donation_note_deleting', $donationNote);
+        Hooks::doAction('givewp_donation_note_deleting', $donationNote);
 
         try {
             DB::table('give_comments')
@@ -149,7 +149,7 @@ public function delete(DonationNote $donationNote): bool
 
         DB::query('COMMIT');
 
-        Hooks::doAction('give_donation_note_deleted', $donationNote);
+        Hooks::doAction('givewp_donation_note_deleted', $donationNote);
 
         return true;
     }
diff --git a/src/Donations/Repositories/DonationRepository.php b/src/Donations/Repositories/DonationRepository.php
index 287b25b9ed..84d6c4844e 100644
--- a/src/Donations/Repositories/DonationRepository.php
+++ b/src/Donations/Repositories/DonationRepository.php
@@ -15,7 +15,6 @@
 use Give\Helpers\Call;
 use Give\Helpers\Hooks;
 use Give\Log\Log;
-use WP_REST_Request;
 
 /**
  * @since 2.20.0 update amount type, fee recovered, and exchange rate
@@ -54,11 +53,9 @@ public function __construct()
     /**
      * Get Donation By ID
      *
-     * @param int $donationId
-     *
-     * @return Donation|null
      * @since 2.19.6
      *
+     * @return Donation|null
      */
     public function getById(int $donationId)
     {
@@ -69,12 +66,8 @@ public function getById(int $donationId)
 
     /**
      * @since 2.19.6
-     *
-     * @param $donationId
-     *
-     * @return ModelQueryBuilder
      */
-    public function queryById($donationId)
+    public function queryById(int $donationId): ModelQueryBuilder
     {
         return $this->prepareQuery()
             ->where('ID', $donationId);
@@ -83,11 +76,7 @@ public function queryById($donationId)
     /**
      * @since 2.19.6
      *
-     * @param int $subscriptionId
-     *
      * @return Donation[]|null
-     * 
-     *
      */
     public function getBySubscriptionId(int $subscriptionId)
     {
@@ -95,11 +84,7 @@ public function getBySubscriptionId(int $subscriptionId)
     }
 
     /**
-     * @param int $subscriptionId
-     *
-     * @return ModelQueryBuilder
      * @since 2.19.6
-     *
      */
     public function queryBySubscriptionId(int $subscriptionId): ModelQueryBuilder
     {
@@ -120,11 +105,7 @@ public function queryBySubscriptionId(int $subscriptionId): ModelQueryBuilder
     }
 
     /**
-     * @param int $donorId
-     *
-     * @return ModelQueryBuilder
      * @since 2.19.6
-     *
      */
     public function queryByDonorId(int $donorId): ModelQueryBuilder
     {
@@ -141,19 +122,19 @@ public function queryByDonorId(int $donorId): ModelQueryBuilder
     }
 
     /**
+     *
+     * @unreleased replace actions with givewp_donation_creating and givewp_donation_created
      * @since 2.20.0 mutate model and return void
      * @since 2.19.6
-     * @param Donation $donation
      *
      * @return void
      * @throws Exception|InvalidArgumentException
-     *
      */
     public function insert(Donation $donation)
     {
         $this->validateDonation($donation);
 
-        Hooks::doAction('give_donation_creating', $donation);
+        Hooks::doAction('givewp_donation_creating', $donation);
 
         $dateCreated = Temporal::withoutMicroseconds($donation->createdAt ?: Temporal::getCurrentDateTime());
         $dateCreatedFormatted = Temporal::getFormattedDateTime($dateCreated);
@@ -210,24 +191,22 @@ public function insert(Donation $donation)
             $donation->purchaseKey = $donationMeta[DonationMetaKeys::PURCHASE_KEY];
         }
 
-        Hooks::doAction('give_donation_created', $donation);
+        Hooks::doAction('givewp_donation_created', $donation);
     }
 
     /**
+     * @unreleased replace actions with givewp_donation_updating and givewp_donation_updated
      * @since 2.20.0 return void
      * @since 2.19.6
      *
-     * @param Donation $donation
-     *
      * @return void
      * @throws Exception|InvalidArgumentException
-     *
      */
     public function update(Donation $donation)
     {
         $this->validateDonation($donation);
 
-        Hooks::doAction('give_donation_updating', $donation);
+        Hooks::doAction('givewp_donation_updating', $donation);
 
         $date = Temporal::getCurrentFormattedDateForDatabase();
 
@@ -262,23 +241,21 @@ public function update(Donation $donation)
 
         DB::query('COMMIT');
 
-        Hooks::doAction('give_donation_updated', $donation);
+        Hooks::doAction('givewp_donation_updated', $donation);
     }
 
     /**
+     * @unreleased replace actions with givewp_donation_deleting and givewp_donation_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
-     * @param Donation $donation
      *
-     * @return bool
      * @throws Exception
-     *
      */
     public function delete(Donation $donation): bool
     {
         DB::query('START TRANSACTION');
 
-        Hooks::doAction('give_donation_deleting', $donation);
+        Hooks::doAction('givewp_donation_deleting', $donation);
 
         try {
             DB::table('posts')
@@ -298,7 +275,7 @@ public function delete(Donation $donation): bool
 
         DB::query('COMMIT');
 
-        Hooks::doAction('give_donation_deleted', $donation);
+        Hooks::doAction('givewp_donation_deleted', $donation);
 
         return true;
     }
@@ -360,9 +337,9 @@ private function getCoreDonationMetaForDatabase(Donation $donation): array
      * In Legacy terms, the Initial Donation acts as the parent ID for subscription renewals.
      * This function inserts those specific meta columns that accompany this concept.
      *
-     * @throws Exception
      * @since 2.19.6
      *
+     * @throws Exception
      */
     public function updateLegacyDonationMetaAsInitialSubscriptionDonation($donationId): bool
     {
@@ -400,12 +377,9 @@ public function updateLegacyDonationMetaAsInitialSubscriptionDonation($donationI
     }
 
     /**
-     *
-     * @param int $donationId
-     *
-     * @return int|null
      * @since 2.19.6
      *
+     * @return int|null
      */
     public function getSequentialId(int $donationId)
     {
@@ -419,11 +393,9 @@ public function getSequentialId(int $donationId)
     }
 
     /**
-     * @param int $id
-     *
-     * @return object[]
      * @since 2.19.6
      *
+     * @return object[]
      */
     public function getNotesByDonationId(int $id): array
     {
@@ -445,11 +417,9 @@ public function getNotesByDonationId(int $id): array
     }
 
     /**
-     * @param Donation $donation
-     *
-     * @return void
      * @since 2.19.6
      *
+     * @return void
      */
     private function validateDonation(Donation $donation)
     {
@@ -465,9 +435,7 @@ private function validateDonation(Donation $donation)
     }
 
     /**
-     * @return DonationMode
      * @since 2.19.6
-     *
      */
     private function getDefaultDonationMode(): DonationMode
     {
@@ -477,11 +445,7 @@ private function getDefaultDonationMode(): DonationMode
     }
 
     /**
-     * @param int $formId
-     *
-     * @return string
      * @since 2.19.6
-     *
      */
     public function getFormTitle(int $formId): string
     {
@@ -538,13 +502,11 @@ public function getTotalDonationCountByDonorId(int $donorId): int
     }
 
     /**
-     * @param $donorId
-     *
-     * @return array|bool|null
      * @since 2.19.6
      *
+     * @return array|bool|null
      */
-    public function getAllDonationIdsByDonorId($donorId)
+    public function getAllDonationIdsByDonorId(int $donorId)
     {
         return array_column(
             DB::table('give_donationmeta')
diff --git a/src/Donations/ServiceProvider.php b/src/Donations/ServiceProvider.php
index 712f154285..dc385ee56e 100644
--- a/src/Donations/ServiceProvider.php
+++ b/src/Donations/ServiceProvider.php
@@ -44,9 +44,9 @@ public function boot()
      */
     private function bootLegacyListeners()
     {
-        Hooks::addAction('give_donation_creating', DispatchGivePreInsertPayment::class);
+        Hooks::addAction('givewp_donation_creating', DispatchGivePreInsertPayment::class);
 
-        add_action('give_donation_created', function (Donation $donation) {
+        add_action('givewp_donation_created', function (Donation $donation) {
             Call::invoke(InsertSequentialId::class, $donation);
             Call::invoke(DispatchGiveInsertPayment::class, $donation);
             Call::invoke(UpdateDonorPaymentIds::class, $donation);
@@ -65,12 +65,12 @@ private function bootLegacyListeners()
             //Call::invoke(UpdateDonorPurchaseValueAndCount::class, $donation);
         });
 
-        add_action('give_donation_updated', function (Donation $donation) {
+        add_action('givewp_donation_updated', function (Donation $donation) {
             Call::invoke(DispatchGiveUpdatePaymentStatus::class, $donation);
             Call::invoke(UpdateSequentialId::class, $donation);
         });
 
-        Hooks::addAction('give_donation_deleted', RemoveSequentialId::class);
+        Hooks::addAction('givewp_donation_deleted', RemoveSequentialId::class);
     }
 
     /**
diff --git a/src/Donors/Repositories/DonorRepository.php b/src/Donors/Repositories/DonorRepository.php
index 80f20401e7..0bca01d697 100644
--- a/src/Donors/Repositories/DonorRepository.php
+++ b/src/Donors/Repositories/DonorRepository.php
@@ -11,6 +11,7 @@
 use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
 use Give\Framework\Models\ModelQueryBuilder;
 use Give\Framework\Support\Facades\DateTime\Temporal;
+use Give\Helpers\Hooks;
 use Give\Log\Log;
 
 /**
@@ -33,11 +34,8 @@ class DonorRepository
      * Query Donor By ID
      *
      * @since 2.19.6
-     *
-     * @param int $donorId
-     * @return ModelQueryBuilder
      */
-    public function queryById($donorId)
+    public function queryById(int $donorId): ModelQueryBuilder
     {
         return $this->prepareQuery()
             ->where('id', $donorId);
@@ -48,7 +46,6 @@ public function queryById($donorId)
      *
      * @since 2.19.6
      *
-     * @param int $donorId
      * @return Donor|null
      */
     public function getById(int $donorId)
@@ -61,7 +58,6 @@ public function getById(int $donorId)
      *
      * @since 2.19.6
      *
-     * @param int $userId
      * @return Donor|null
      */
     public function getByWpUserId(int $userId)
@@ -79,10 +75,9 @@ public function getByWpUserId(int $userId)
     /**
      * @since 2.19.6
      *
-     * @param int $donorId
      * @return array|bool
      */
-    public function getAdditionalEmails($donorId)
+    public function getAdditionalEmails(int $donorId)
     {
         $additionalEmails = DB::table('give_donormeta')
             ->select(['meta_value', 'email'])
@@ -98,11 +93,10 @@ public function getAdditionalEmails($donorId)
     }
 
     /**
+     * @unreleased add actions givewp_donor_creating and givewp_donor_created
      * @since 2.20.0 mutate model and return void
      * @since 2.19.6
      *
-     * @param Donor $donor
-     *
      * @return void
      * @throws Exception
      */
@@ -110,6 +104,8 @@ public function insert(Donor $donor)
     {
         $this->validateDonor($donor);
 
+        Hooks::doAction('givewp_donor_creating', $donor);
+
         $dateCreated = Temporal::withoutMicroseconds($donor->createdAt ?: Temporal::getCurrentDateTime());
 
         DB::query('START TRANSACTION');
@@ -156,13 +152,16 @@ public function insert(Donor $donor)
 
         $donor->id = $donorId;
         $donor->createdAt = $dateCreated;
+
+        Hooks::doAction('givewp_donor_created', $donor);
     }
 
     /**
+     *
+     * @unreleased add actions givewp_donor_updating and givewp_donor_updated
      * @since 2.20.0 return void
      * @since 2.19.6
      *
-     * @param Donor $donor
      * @return void
      * @throws Exception
      */
@@ -170,6 +169,8 @@ public function update(Donor $donor)
     {
         $this->validateDonor($donor);
 
+        Hooks::doAction('givewp_donor_updating', $donor);
+
         DB::query('START TRANSACTION');
 
         try {
@@ -202,14 +203,13 @@ public function update(Donor $donor)
         }
 
         DB::query('COMMIT');
+
+        Hooks::doAction('givewp_donor_updated', $donor);
     }
 
     /**
      * @since 2.19.6
      *
-     * @param int $donorId
-     * @param array $columns
-     * @return bool
      * @throws Exception
      */
     public function updateLegacyColumns(int $donorId, array $columns): bool
@@ -240,6 +240,8 @@ public function updateLegacyColumns(int $donorId, array $columns): bool
     }
 
     /**
+     *
+     * @unreleased add actions givewp_donor_deleting and givewp_donor_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *
@@ -249,6 +251,8 @@ public function delete(Donor $donor): bool
     {
         DB::query('START TRANSACTION');
 
+        Hooks::doAction('givewp_donor_deleting', $donor);
+
         try {
             DB::table('give_donors')
                 ->where('id', $donor->id)
@@ -267,14 +271,13 @@ public function delete(Donor $donor): bool
 
         DB::query('COMMIT');
 
+        Hooks::doAction('givewp_donor_deleted', $donor);
+
         return true;
     }
 
     /**
      * @since 2.19.6
-     *
-     * @param Donor $donor
-     * @return array
      */
     private function getCoreDonorMeta(Donor $donor): array
     {
@@ -288,7 +291,6 @@ private function getCoreDonorMeta(Donor $donor): array
     /**
      * @since 2.19.6
      *
-     * @param Donor $donor
      * @return void
      */
     private function validateDonor(Donor $donor)
@@ -301,8 +303,9 @@ private function validateDonor(Donor $donor)
     }
 
     /**
-     * @param string $email
-     * @return Donor
+     * @since 2.19.6
+     *
+     * @return Donor|null
      */
     public function getByEmail(string $email)
     {
@@ -318,8 +321,9 @@ public function getByEmail(string $email)
     }
 
     /**
-     * @param string $email
-     * @return Donor
+     * @since 2.19.6
+     *
+     * @return Donor|null
      */
     public function getByAdditionalEmail(string $email)
     {
@@ -371,7 +375,6 @@ public function prepareQuery(): ModelQueryBuilder
      *
      * @since 2.19.6
      *
-     * @param Donor $donor
      * @return void
      */
     private function updateAdditionalEmails(Donor $donor)
@@ -397,7 +400,7 @@ private function updateAdditionalEmails(Donor $donor)
 
     /**
      * @since 2.20.0
-     * @param int $donorId
+     *
      * @return string|null
      */
     public function getDonorLatestDonationDate(int $donorId)
@@ -421,7 +424,7 @@ public function getDonorLatestDonationDate(int $donorId)
 
     /**
      * @since 2.20.0
-     * @param int $donorId
+     *
      * @return string|null
      */
     public function getDonorType(int $donorId)
@@ -469,9 +472,8 @@ public function getDonorType(int $donorId)
 
     /**
      * @since 2.20.0
-     * @return int
      */
-    public function getDonorsCount()
+    public function getDonorsCount(): int
     {
         return DB::table('give_donors')->count();
     }
diff --git a/src/Subscriptions/Repositories/SubscriptionRepository.php b/src/Subscriptions/Repositories/SubscriptionRepository.php
index fa00f5d5d3..fd5772a638 100644
--- a/src/Subscriptions/Repositories/SubscriptionRepository.php
+++ b/src/Subscriptions/Repositories/SubscriptionRepository.php
@@ -17,7 +17,6 @@
  */
 class SubscriptionRepository
 {
-
     /**
      * @var string[]
      */
@@ -32,24 +31,16 @@ class SubscriptionRepository
 
     /**
      * @since 2.19.6
-     *
-     * @param int $subscriptionId
-     *
-     * @return Subscription
      */
-    public function getById($subscriptionId)
+    public function getById(int $subscriptionId): Subscription
     {
         return $this->queryById($subscriptionId)->get();
     }
 
     /**
      * @since 2.19.6
-     *
-     * @param int $subscriptionId
-     *
-     * @return ModelQueryBuilder
      */
-    public function queryById($subscriptionId)
+    public function queryById(int $subscriptionId): ModelQueryBuilder
     {
         return $this->prepareQuery()
             ->where('id', $subscriptionId);
@@ -57,12 +48,8 @@ public function queryById($subscriptionId)
 
     /**
      * @since 2.19.6
-     *
-     * @param int $donationId
-     *
-     * @return ModelQueryBuilder
      */
-    public function queryByDonationId($donationId)
+    public function queryByDonationId(int $donationId): ModelQueryBuilder
     {
         return $this->prepareQuery()
             ->where('parent_payment_id', $donationId);
@@ -70,12 +57,8 @@ public function queryByDonationId($donationId)
 
     /**
      * @since 2.19.6
-     *
-     * @param int $donorId
-     *
-     * @return ModelQueryBuilder
      */
-    public function queryByDonorId($donorId)
+    public function queryByDonorId(int $donorId): ModelQueryBuilder
     {
         return $this->prepareQuery()
             ->where('customer_id', $donorId);
@@ -84,11 +67,9 @@ public function queryByDonorId($donorId)
     /**
      * @since 2.19.6
      *
-     * @param int $id
-     *
      * @return object[]
      */
-    public function getNotesBySubscriptionId($id)
+    public function getNotesBySubscriptionId(int $id): array
     {
         $notes = DB::table('comments')
             ->select(
@@ -108,9 +89,10 @@ public function getNotesBySubscriptionId($id)
     }
 
     /**
+     * @unreleased replace actions with givewp_subscription_creating and givewp_subscription_created
      * @since 2.19.6
      *
-     * @param Subscription $subscription
+     * @param  Subscription  $subscription
      *
      * @return void
      * @throws Exception
@@ -119,7 +101,7 @@ public function insert(Subscription $subscription)
     {
         $this->validateSubscription($subscription);
 
-        Hooks::doAction('give_subscription_creating', $subscription);
+        Hooks::doAction('givewp_subscription_creating', $subscription);
 
         $dateCreated = Temporal::withoutMicroseconds($subscription->createdAt ?: Temporal::getCurrentDateTime());
 
@@ -159,22 +141,23 @@ public function insert(Subscription $subscription)
             $subscription->expiresAt = null;
         }
 
-        Hooks::doAction('give_subscription_created', $subscription);
+        Hooks::doAction('givewp_subscription_created', $subscription);
     }
 
     /**
+     * @unreleased replace actions with givewp_subscription_updating and givewp_subscription_updated
      * @since 2.19.6
      *
-     * @param Subscription $subscription
+     * @param  Subscription  $subscription
      *
      * @return Subscription
      * @throws Exception
      */
-    public function update(Subscription $subscription)
+    public function update(Subscription $subscription): Subscription
     {
         $this->validateSubscription($subscription);
 
-        Hooks::doAction('give_subscription_updating', $subscription);
+        Hooks::doAction('givewp_subscription_updating', $subscription);
 
         DB::query('START TRANSACTION');
 
@@ -208,24 +191,25 @@ public function update(Subscription $subscription)
 
         $subscription = $this->getById($subscriptionId);
 
-        Hooks::doAction('give_subscription_updated', $subscription);
+        Hooks::doAction('givewp_subscription_updated', $subscription);
 
         return $subscription;
     }
 
     /**
+     * @unreleased replace actions with givewp_subscription_deleting and givewp_subscription_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *
-     * @param Subscription $subscription
+     * @param  Subscription  $subscription
      *
      * @return bool
      *
      * @throws Exception
      */
-    public function delete(Subscription $subscription)
+    public function delete(Subscription $subscription): bool
     {
-        Hooks::doAction('give_subscription_deleting', $subscription);
+        Hooks::doAction('givewp_subscription_deleting', $subscription);
 
         DB::query('START TRANSACTION');
 
@@ -247,7 +231,7 @@ public function delete(Subscription $subscription)
 
         DB::query('COMMIT');
 
-        Hooks::doAction('give_subscription_model_deleted', $subscription);
+        Hooks::doAction('givewp_subscription_deleted', $subscription);
 
         return true;
     }
@@ -255,13 +239,9 @@ public function delete(Subscription $subscription)
     /**
      * @since 2.19.6
      *
-     * @param int $subscriptionId
-     * @param array $columns
-     *
-     * @return bool
      * @throws Exception
      */
-    public function updateLegacyColumns($subscriptionId, $columns)
+    public function updateLegacyColumns(int $subscriptionId, array $columns): bool
     {
         foreach (Subscription::propertyKeys() as $key) {
             if (array_key_exists($key, $columns)) {
@@ -295,7 +275,7 @@ public function updateLegacyColumns($subscriptionId, $columns)
      *
      * @return int|null
      */
-    public function getInitialDonationId($subscriptionId)
+    public function getInitialDonationId(int $subscriptionId)
     {
         $query = DB::table('give_subscriptions')
             ->where('id', $subscriptionId)
@@ -332,7 +312,7 @@ private function validateSubscription(Subscription $subscription)
      *
      * @return ModelQueryBuilder<Subscription>
      */
-    public function prepareQuery()
+    public function prepareQuery(): ModelQueryBuilder
     {
         $builder = new ModelQueryBuilder(Subscription::class);
 
diff --git a/src/Subscriptions/ServiceProvider.php b/src/Subscriptions/ServiceProvider.php
index 2db34a9df2..64e83b5bd0 100644
--- a/src/Subscriptions/ServiceProvider.php
+++ b/src/Subscriptions/ServiceProvider.php
@@ -37,7 +37,7 @@ public function boot()
      */
     private function bootLegacyListeners()
     {
-        Hooks::addAction('give_subscription_creating', DispatchGiveSubscriptionPreCreate::class);
-        Hooks::addAction('give_subscription_created', DispatchGiveSubscriptionPostCreate::class);
+        Hooks::addAction('givewp_subscription_creating', DispatchGiveSubscriptionPreCreate::class);
+        Hooks::addAction('givewp_subscription_created', DispatchGiveSubscriptionPostCreate::class);
     }
 }

From 4e769fda983794c64297733125d126579f0ae628 Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
Date: Fri, 20 May 2022 15:04:54 -0400
Subject: [PATCH 22/53] fix: subscription update should return void

---
 .../Repositories/SubscriptionRepository.php        | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Subscriptions/Repositories/SubscriptionRepository.php b/src/Subscriptions/Repositories/SubscriptionRepository.php
index fd5772a638..11820c44f7 100644
--- a/src/Subscriptions/Repositories/SubscriptionRepository.php
+++ b/src/Subscriptions/Repositories/SubscriptionRepository.php
@@ -31,8 +31,10 @@ class SubscriptionRepository
 
     /**
      * @since 2.19.6
+     *
+     * @return Subscription|null
      */
-    public function getById(int $subscriptionId): Subscription
+    public function getById(int $subscriptionId)
     {
         return $this->queryById($subscriptionId)->get();
     }
@@ -150,10 +152,10 @@ public function insert(Subscription $subscription)
      *
      * @param  Subscription  $subscription
      *
-     * @return Subscription
+     * @return void
      * @throws Exception
      */
-    public function update(Subscription $subscription): Subscription
+    public function update(Subscription $subscription)
     {
         $this->validateSubscription($subscription);
 
@@ -187,13 +189,7 @@ public function update(Subscription $subscription): Subscription
 
         DB::query('COMMIT');
 
-        $subscriptionId = DB::last_insert_id();
-
-        $subscription = $this->getById($subscriptionId);
-
         Hooks::doAction('givewp_subscription_updated', $subscription);
-
-        return $subscription;
     }
 
     /**

From d5d8b6cf10c6b0b8dc638d7c76110e20717e47af Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@impress.org>
Date: Fri, 20 May 2022 12:50:46 -0700
Subject: [PATCH 23/53] =?UTF-8?q?chore:=20add=20jon=20and=20joshua=20as=20?=
 =?UTF-8?q?contributors=20=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index c2fe50551a..1a9af5fcef 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
 === GiveWP - Donation Plugin and Fundraising Platform ===
-Contributors: givewp, dlocc, webdevmattcrom, ravinderk, mehul0810, kevinwhoffman, jason_the_adams, henryholtgeerts, kbjohnson90, alaca, benmeredithgmailcom
+Contributors: givewp, dlocc, webdevmattcrom, ravinderk, mehul0810, kevinwhoffman, jason_the_adams, henryholtgeerts, kbjohnson90, alaca, benmeredithgmailcom, jonwaldstein, joshuadinh
 Donate link: https://go.givewp.com/home
 Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 5.0

From de6e58071c01bebe43c7f931dd6daeb6fcb40b8d Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
Date: Fri, 20 May 2022 15:51:46 -0400
Subject: [PATCH 24/53] docs: update all model docblocks with types and some
 generics

---
 src/Donations/Models/Donation.php             |  8 ++---
 src/Donations/Models/DonationNote.php         | 30 ++++++++-----------
 .../Repositories/DonationNotesRepository.php  |  4 +--
 .../Repositories/DonationRepository.php       |  9 ++++++
 src/Donors/Models/Donor.php                   | 13 ++++----
 src/Donors/Repositories/DonorRepository.php   |  4 +++
 src/Subscriptions/Models/Subscription.php     |  7 +----
 .../Repositories/SubscriptionRepository.php   | 21 +++++++------
 8 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/Donations/Models/Donation.php b/src/Donations/Models/Donation.php
index 0f698162c1..7a0adc256f 100644
--- a/src/Donations/Models/Donation.php
+++ b/src/Donations/Models/Donation.php
@@ -98,11 +98,11 @@ class Donation extends Model implements ModelCrud, ModelHasFactory
      *
      * @since 2.19.6
      *
-     * @param int $id
+     * @param  int  $id
      *
-     * @return Donation
+     * @return Donation|null
      */
-    public static function find($id): Donation
+    public static function find($id)
     {
         return give()->donations->getById($id);
     }
@@ -271,7 +271,7 @@ public static function fromQueryBuilderObject($object): Donation
     }
 
     /**
-     * @return DonationFactory<Donation>
+     * @since 2.19.6
      */
     public static function factory(): DonationFactory
     {
diff --git a/src/Donations/Models/DonationNote.php b/src/Donations/Models/DonationNote.php
index 68e2de5299..464977a194 100644
--- a/src/Donations/Models/DonationNote.php
+++ b/src/Donations/Models/DonationNote.php
@@ -44,11 +44,9 @@ class DonationNote extends Model implements ModelCrud, ModelHasFactory
     /**
      * @unreleased
      *
-     * @param  int  $id
-     *
-     * @return DonationNote
+     * @return DonationNote|null
      */
-    public static function find($id): DonationNote
+    public static function find($id)
     {
         return give()->donations->notes->getById($id);
     }
@@ -57,8 +55,6 @@ public static function find($id): DonationNote
     /**
      * @unreleased
      *
-     * @param  array  $attributes
-     *
      * @return $this
      * @throws Exception|InvalidArgumentException
      */
@@ -74,6 +70,7 @@ public static function create(array $attributes): DonationNote
     /**
      * @unreleased
      *
+     * @return void
      * @throws Exception|InvalidArgumentException
      */
     public function save()
@@ -88,11 +85,9 @@ public function save()
     /**
      * @unreleased
      *
-     * @return bool
-     *
      * @throws Exception|InvalidArgumentException
      */
-    public function delete()
+    public function delete(): bool
     {
         return give()->donations->notes->delete($this);
     }
@@ -100,17 +95,19 @@ public function delete()
     /**
      * @unreleased
      *
-     * @return ModelQueryBuilder
+     * @return ModelQueryBuilder<DonationNote>
      */
-    public static function query()
+    public static function query(): ModelQueryBuilder
     {
         return give()->donations->notes->prepareQuery();
     }
 
     /**
-     * @return ModelQueryBuilder
+     * @unreleased
+     *
+     * @return ModelQueryBuilder<Donation>
      */
-    public function donation()
+    public function donation(): ModelQueryBuilder
     {
         return give()->donations->queryById($this->donationId);
     }
@@ -119,9 +116,8 @@ public function donation()
      * @unreleased
      *
      * @param  object  $object
-     * @return DonationNote
      */
-    public static function fromQueryBuilderObject($object)
+    public static function fromQueryBuilderObject($object): DonationNote
     {
         return new DonationNote([
             'id' => (int)$object->id,
@@ -132,9 +128,9 @@ public static function fromQueryBuilderObject($object)
     }
 
     /**
-     * @return DonationNoteFactory
+     * @unreleased
      */
-    public static function factory()
+    public static function factory(): DonationNoteFactory
     {
         return new DonationNoteFactory(static::class);
     }
diff --git a/src/Donations/Repositories/DonationNotesRepository.php b/src/Donations/Repositories/DonationNotesRepository.php
index 965e25877d..6aa5fe27ed 100644
--- a/src/Donations/Repositories/DonationNotesRepository.php
+++ b/src/Donations/Repositories/DonationNotesRepository.php
@@ -34,7 +34,7 @@ class DonationNotesRepository
      *
      * @return DonationNote|null
      */
-    public function getById($noteId)
+    public function getById(int $noteId)
     {
         return $this->prepareQuery()
             ->where('comment_ID', $noteId)
@@ -189,7 +189,7 @@ private function validateDonationNote(DonationNote $donationNote)
     }
 
     /**
-     * @return ModelQueryBuilder
+     * @return ModelQueryBuilder<DonationNote>
      */
     public function prepareQuery(): ModelQueryBuilder
     {
diff --git a/src/Donations/Repositories/DonationRepository.php b/src/Donations/Repositories/DonationRepository.php
index 84d6c4844e..a9ba706911 100644
--- a/src/Donations/Repositories/DonationRepository.php
+++ b/src/Donations/Repositories/DonationRepository.php
@@ -66,6 +66,9 @@ public function getById(int $donationId)
 
     /**
      * @since 2.19.6
+     *
+     * @param  int  $donationId
+     * @return ModelQueryBuilder<Donation>
      */
     public function queryById(int $donationId): ModelQueryBuilder
     {
@@ -85,6 +88,9 @@ public function getBySubscriptionId(int $subscriptionId)
 
     /**
      * @since 2.19.6
+     *
+     * @param  int  $subscriptionId
+     * @return ModelQueryBuilder<Donation>
      */
     public function queryBySubscriptionId(int $subscriptionId): ModelQueryBuilder
     {
@@ -106,6 +112,9 @@ public function queryBySubscriptionId(int $subscriptionId): ModelQueryBuilder
 
     /**
      * @since 2.19.6
+     *
+     * @param  int  $donorId
+     * @return ModelQueryBuilder<Donation>
      */
     public function queryByDonorId(int $donorId): ModelQueryBuilder
     {
diff --git a/src/Donors/Models/Donor.php b/src/Donors/Models/Donor.php
index 8835cea98e..b3278b49ad 100644
--- a/src/Donors/Models/Donor.php
+++ b/src/Donors/Models/Donor.php
@@ -11,7 +11,6 @@
 use Give\Framework\Exceptions\Primitives\InvalidArgumentException;
 use Give\Framework\Models\Contracts\ModelCrud;
 use Give\Framework\Models\Contracts\ModelHasFactory;
-use Give\Framework\Models\Factories\ModelFactory;
 use Give\Framework\Models\Model;
 use Give\Framework\Models\ModelQueryBuilder;
 use Give\Framework\Models\ValueObjects\Relationship;
@@ -64,9 +63,9 @@ class Donor extends Model implements ModelCrud, ModelHasFactory
      *
      * @param $id
      *
-     * @return Donor
+     * @return Donor|null
      */
-    public static function find($id): Donor
+    public static function find($id)
     {
         return give()->donors->getById($id);
     }
@@ -196,7 +195,7 @@ public function totalAmountDonated(): int
      *
      * @return ModelQueryBuilder<Donor>
      */
-    public static function query(): ModelQueryBuilder
+    public static function query()
     {
         return give()->donors->prepareQuery();
     }
@@ -214,9 +213,11 @@ public static function fromQueryBuilderObject($object): Donor
     }
 
     /**
-     * @return ModelFactory<Donor>
+     * @since 2.19.6
+     *
+     * @return DonorFactory
      */
-    public static function factory()
+    public static function factory(): DonorFactory
     {
         return new DonorFactory(static::class);
     }
diff --git a/src/Donors/Repositories/DonorRepository.php b/src/Donors/Repositories/DonorRepository.php
index 0bca01d697..c008709a00 100644
--- a/src/Donors/Repositories/DonorRepository.php
+++ b/src/Donors/Repositories/DonorRepository.php
@@ -34,6 +34,8 @@ class DonorRepository
      * Query Donor By ID
      *
      * @since 2.19.6
+     *
+     * @return ModelQueryBuilder<Donor>
      */
     public function queryById(int $donorId): ModelQueryBuilder
     {
@@ -341,6 +343,8 @@ public function getByAdditionalEmail(string $email)
     }
 
     /**
+     * @since 2.19.6
+     *
      * @return ModelQueryBuilder<Donor>
      */
     public function prepareQuery(): ModelQueryBuilder
diff --git a/src/Subscriptions/Models/Subscription.php b/src/Subscriptions/Models/Subscription.php
index 29f7ca0644..c66176ca27 100644
--- a/src/Subscriptions/Models/Subscription.php
+++ b/src/Subscriptions/Models/Subscription.php
@@ -161,7 +161,6 @@ public function save()
     /**
      * @since 2.19.6
      *
-     * @return bool
      * @throws Exception
      */
     public function delete(): bool
@@ -199,8 +198,6 @@ public static function query(): ModelQueryBuilder
      * @since 2.19.6
      *
      * @param object $object
-     *
-     * @return Subscription
      */
     public static function fromQueryBuilderObject($object): Subscription
     {
@@ -211,8 +208,6 @@ public static function fromQueryBuilderObject($object): Subscription
      * Expiration / End Date / Renewal
      *
      * @since 2.19.6
-     *
-     * @return string
      */
     public function expiration(): string
     {
@@ -237,7 +232,7 @@ public function gateway(): PaymentGateway
     }
 
     /**
-     * @return SubscriptionFactory<Subscription>
+     * @since 2.19.6
      */
     public static function factory(): SubscriptionFactory
     {
diff --git a/src/Subscriptions/Repositories/SubscriptionRepository.php b/src/Subscriptions/Repositories/SubscriptionRepository.php
index 11820c44f7..5590330ca8 100644
--- a/src/Subscriptions/Repositories/SubscriptionRepository.php
+++ b/src/Subscriptions/Repositories/SubscriptionRepository.php
@@ -41,6 +41,9 @@ public function getById(int $subscriptionId)
 
     /**
      * @since 2.19.6
+     *
+     * @param  int  $subscriptionId
+     * @return ModelQueryBuilder<Subscription>
      */
     public function queryById(int $subscriptionId): ModelQueryBuilder
     {
@@ -50,6 +53,9 @@ public function queryById(int $subscriptionId): ModelQueryBuilder
 
     /**
      * @since 2.19.6
+     *
+     * @param  int  $donationId
+     * @return ModelQueryBuilder<Subscription>
      */
     public function queryByDonationId(int $donationId): ModelQueryBuilder
     {
@@ -59,6 +65,9 @@ public function queryByDonationId(int $donationId): ModelQueryBuilder
 
     /**
      * @since 2.19.6
+     *
+     * @param  int  $donorId
+     * @return ModelQueryBuilder<Subscription>
      */
     public function queryByDonorId(int $donorId): ModelQueryBuilder
     {
@@ -94,8 +103,6 @@ public function getNotesBySubscriptionId(int $id): array
      * @unreleased replace actions with givewp_subscription_creating and givewp_subscription_created
      * @since 2.19.6
      *
-     * @param  Subscription  $subscription
-     *
      * @return void
      * @throws Exception
      */
@@ -150,8 +157,6 @@ public function insert(Subscription $subscription)
      * @unreleased replace actions with givewp_subscription_updating and givewp_subscription_updated
      * @since 2.19.6
      *
-     * @param  Subscription  $subscription
-     *
      * @return void
      * @throws Exception
      */
@@ -197,10 +202,6 @@ public function update(Subscription $subscription)
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *
-     * @param  Subscription  $subscription
-     *
-     * @return bool
-     *
      * @throws Exception
      */
     public function delete(Subscription $subscription): bool
@@ -267,8 +268,6 @@ public function updateLegacyColumns(int $subscriptionId, array $columns): bool
     /**
      * @since 2.19.6
      *
-     * @param int $subscriptionId
-     *
      * @return int|null
      */
     public function getInitialDonationId(int $subscriptionId)
@@ -286,7 +285,7 @@ public function getInitialDonationId(int $subscriptionId)
     }
 
     /**
-     * @param Subscription $subscription
+     * @since 2.19.6
      *
      * @return void
      */

From ebd019b7cde4048172e859b08527075f02269f89 Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
Date: Fri, 20 May 2022 16:03:06 -0400
Subject: [PATCH 25/53] docs: update return type

---
 src/Donors/Models/Donor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Donors/Models/Donor.php b/src/Donors/Models/Donor.php
index b3278b49ad..f3e4b7432d 100644
--- a/src/Donors/Models/Donor.php
+++ b/src/Donors/Models/Donor.php
@@ -195,7 +195,7 @@ public function totalAmountDonated(): int
      *
      * @return ModelQueryBuilder<Donor>
      */
-    public static function query()
+    public static function query(): ModelQueryBuilder
     {
         return give()->donors->prepareQuery();
     }

From 452ad6fbffddedcfa399ba9f79512f286a4f0ba7 Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
Date: Tue, 24 May 2022 09:33:10 -0400
Subject: [PATCH 26/53] refactor: use givewp prefix for gateway registration

---
 src/PaymentGateways/Actions/RegisterPaymentGateways.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/PaymentGateways/Actions/RegisterPaymentGateways.php b/src/PaymentGateways/Actions/RegisterPaymentGateways.php
index 03f346f6c8..16e59146fe 100644
--- a/src/PaymentGateways/Actions/RegisterPaymentGateways.php
+++ b/src/PaymentGateways/Actions/RegisterPaymentGateways.php
@@ -62,24 +62,26 @@ public function __invoke(array $gateways): array
     /**
      * Register 3rd party payment gateways
      *
+     * @unreleased use givewp prefix for action
      * @since 2.18.0
      *
      * @param  PaymentGatewayRegister  $paymentGatewayRegister
      */
     private function register3rdPartyPaymentGateways(PaymentGatewayRegister $paymentGatewayRegister)
     {
-        do_action('give_register_payment_gateway', $paymentGatewayRegister);
+        do_action('givewp_register_payment_gateway', $paymentGatewayRegister);
     }
 
     /**
      * Unregister 3rd party payment gateways
      *
+     * @unreleased use givewp prefix for action
      * @since 2.18.0
      *
      * @param  PaymentGatewayRegister  $paymentGatewayRegister
      */
     private function unregister3rdPartyPaymentGateways(PaymentGatewayRegister $paymentGatewayRegister)
     {
-        do_action('give_unregister_payment_gateway', $paymentGatewayRegister);
+        do_action('givewp_unregister_payment_gateway', $paymentGatewayRegister);
     }
 }

From 6ec6ec7c25f141930f1ad41021c168209f2dfcc9 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Tue, 24 May 2022 19:34:30 +0530
Subject: [PATCH 27/53] Fix: remove php dependency validation logic (#6429)

* fix:remove php dependency validation logic

* doc: add unrelease change and define changes
---
 give.php | 62 +-------------------------------------------------------
 1 file changed, 1 insertion(+), 61 deletions(-)

diff --git a/give.php b/give.php
index 7834a1264e..2b1101a4d9 100644
--- a/give.php
+++ b/give.php
@@ -85,6 +85,7 @@
 /**
  * Main Give Class
  *
+ * @unreleased Remove php dependency validation logic and constant
  * @since 2.19.6 add $donations, $subscriptions, and replace $donors class with DonorRepositoryProxy
  * @since 2.8.0 build in a service container
  * @since 1.0
@@ -218,18 +219,6 @@ public function __construct()
      */
     public function boot()
     {
-        // PHP version
-        if (!defined('GIVE_REQUIRED_PHP_VERSION')) {
-            define('GIVE_REQUIRED_PHP_VERSION', '5.6.0');
-        }
-
-        // Bailout: Need minimum php version to load plugin.
-        if (function_exists('phpversion') && version_compare(GIVE_REQUIRED_PHP_VERSION, phpversion(), '>')) {
-            add_action('admin_notices', [$this, 'minimum_phpversion_notice']);
-
-            return;
-        }
-
         $this->setup_constants();
 
         // Add compatibility notice for recurring and stripe support with Give 2.5.0.
@@ -357,55 +346,6 @@ public function load_textdomain()
         load_plugin_textdomain('give', false, $give_lang_dir);
     }
 
-    /**
-     *  Show minimum PHP version notice.
-     *
-     * @since  1.8.12
-     * @access public
-     */
-    public function minimum_phpversion_notice()
-    {
-        // Bailout.
-        if (!is_admin()) {
-            return;
-        }
-
-        $notice_desc = '<p><strong>' . __(
-                'Your site could be faster and more secure with a newer PHP version.',
-                'give'
-            ) . '</strong></p>';
-        $notice_desc .= '<p>' . __(
-                'Hey, we\'ve noticed that you\'re running an outdated version of PHP. PHP is the programming language that WordPress and GiveWP are built on. The version that is currently used for your site is no longer supported. Newer versions of PHP are both faster and more secure. In fact, your version of PHP no longer receives security updates, which is why we\'re sending you this notice.',
-                'give'
-            ) . '</p>';
-        $notice_desc .= '<p>' . __(
-                'Hosts have the ability to update your PHP version, but sometimes they don\'t dare to do that because they\'re afraid they\'ll break your site.',
-                'give'
-            ) . '</p>';
-        $notice_desc .= '<p><strong>' . __('To which version should I update?', 'give') . '</strong></p>';
-        $notice_desc .= '<p>' . __(
-                'You should update your PHP version to either 5.6 or to 7.0 or 7.1. On a normal WordPress site, switching to PHP 5.6 should never cause issues. We would however actually recommend you switch to PHP7. There are some plugins that are not ready for PHP7 though, so do some testing first. PHP7 is much faster than PHP 5.6. It\'s also the only PHP version still in active development and therefore the better option for your site in the long run.',
-                'give'
-            ) . '</p>';
-        $notice_desc .= '<p><strong>' . __('Can\'t update? Ask your host!', 'give') . '</strong></p>';
-        $notice_desc .= '<p>' . sprintf(
-                __(
-                    'If you cannot upgrade your PHP version yourself, you can send an email to your host. If they don\'t want to upgrade your PHP version, we would suggest you switch hosts. Have a look at one of the recommended %1$sWordPress hosting partners%2$s.',
-                    'give'
-                ),
-                sprintf(
-                    '<a href="%1$s" target="_blank">',
-                    esc_url('https://wordpress.org/hosting/')
-                ),
-                '</a>'
-            ) . '</p>';
-
-        echo sprintf(
-            '<div class="notice notice-error">%1$s</div>',
-            wp_kses_post($notice_desc)
-        );
-    }
-
     /**
      * Display compatibility notice for Give 2.5.0 and Recurring 1.8.13 when Stripe premium is not active.
      *

From 0bb9fd34b0c46a8875018da6be84df318903449e Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Thu, 26 May 2022 22:04:39 +0530
Subject: [PATCH 28/53] Fix: handle the Stripe webhook correctly (#6385)

* feature: add contract for stripe event listener

* feature: add CheckoutSessionCompleted for stripe webhook event

* feature: update strive event contract

each event should have a way to return donation id.

* refactor: implment getdonation function

* feature: add contract for subscription

* feature: add function to get Donation by transaciton id

* refactor: implement findByGatewayTransactionId function

* refactor: move function to abstract class

* feature: setup gateway transaction id

* feature: add stripe event listener for payment_intent.succeeded

* feature: implement payment_intent.payment_failed stripe event listener

* feature: add stripe event listener for charge.refunded

* feature: add function to get subscription model by transaction id

* refactor: change function access type to protected

* refactor: give access og stripe event datat to functions

* refactor: update logic to handle stripe event

* refactor: refresh strive event before processing

* refactor: use correct exception

* doc: add correct return type of function

* refactor: call query builder to get Donation model

* refactor: use respository to get Donation model

* refactor: remove unused function from model

* fix: update donatio status only if not completed

* refactor: extend custom Enum class

* fix: log error on stripe event exception

* fix: do not change donation status if already failed

* fix: do not change donation status if already completed

* format: improve code formatting

* fix: do not change donation status if already refunded

* fix: save donation model gateway transaction id to donation meta

* refactor: remove legacy stripe event handler logic

* fix: update donation only if not completed

* refavtor: remove HasSubscription contract

* refactor: do not thor exception if donation not exist for stripe event

* fix: execute event if correct donation form for stripe event

* fix: check for donation before returning form id

* fix: use charge id to refund donation
---
 .../includes/class-give-stripe-webhooks.php   | 416 ++++++------------
 .../Repositories/DonationRepository.php       |  28 +-
 src/Donations/ValueObjects/DonationStatus.php |   2 +-
 .../Stripe/Traits/CanSetupStripeApp.php       |  21 +
 .../Webhooks/Contracts/EventListener.php      |  18 +
 .../Webhooks/Listeners/ChargeRefunded.php     |  63 +++
 .../Listeners/CheckoutSessionCompleted.php    |  56 +++
 .../Listeners/PaymentIntentPaymentFailed.php  |  43 ++
 .../Listeners/PaymentIntentSucceeded.php      |  51 +++
 .../Stripe/Webhooks/StripeEventListener.php   |  83 ++++
 .../Repositories/SubscriptionRepository.php   |  25 ++
 11 files changed, 516 insertions(+), 290 deletions(-)
 create mode 100644 src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
 create mode 100644 src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
 create mode 100644 src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
 create mode 100644 src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
 create mode 100644 src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
 create mode 100644 src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
 create mode 100644 src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php

diff --git a/includes/gateways/stripe/includes/class-give-stripe-webhooks.php b/includes/gateways/stripe/includes/class-give-stripe-webhooks.php
index 7bdc76d52f..c1bf1c3ac5 100644
--- a/includes/gateways/stripe/includes/class-give-stripe-webhooks.php
+++ b/includes/gateways/stripe/includes/class-give-stripe-webhooks.php
@@ -2,304 +2,144 @@
 /**
  * Give - Stripe Core | Process Webhooks
  *
+ * @package    Give
  * @since 2.5.0
  *
- * @package    Give
  * @subpackage Stripe Core
  * @copyright  Copyright (c) 2019, GiveWP
  * @license    https://opensource.org/licenses/gpl-license GNU Public License
  */
 
+use Give\Log\Log;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners\ChargeRefunded;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners\CheckoutSessionCompleted;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners\PaymentIntentPaymentFailed;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners\PaymentIntentSucceeded;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\StripeEventListener;
+use Stripe\Event;
+
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+if (!defined('ABSPATH')) {
+    exit;
 }
 
-if ( ! class_exists( 'Give_Stripe_Webhooks' ) ) {
-
-	/**
-	 * Class Give_Stripe_Webhooks
-	 *
-	 * @since 2.5.0
-	 */
-	class Give_Stripe_Webhooks {
-
-		/**
-		 * Stripe Gateway
-		 *
-		 * @since  2.5.0
-		 * @access public
-		 *
-		 * @var $stripe_gateway
-		 */
-		public $stripe_gateway;
-
-		/**
-		 * Give_Stripe_Webhooks constructor.
-		 *
-		 * @since 2.5.0
-		 */
-		public function __construct() {
-
-			$this->stripe_gateway = new Give_Stripe_Gateway();
-
-			add_action( 'init', [ $this, 'listen' ] );
-		}
-
-		/**
-		 * Listen for Stripe events.
-		 *
-		 * @access public
-		 * @since  2.5.0
-		 *
-		 * @return void
-		 */
-		public function listen() {
-
-			$give_listener = give_clean( filter_input( INPUT_GET, 'give-listener' ) );
-
-			// Must be a stripe listener to proceed.
-			if ( ! isset( $give_listener ) || 'stripe' !== $give_listener ) {
-				return;
-			}
-
-			// Retrieve the request's body and parse it as JSON.
-			$body  = @file_get_contents( 'php://input' );
-			$event = json_decode( $body );
-
-			/**
-			 * Never remove this as it ensure the check for which Stripe account to use.
-			 * @Todo Utilize idempotency key on every Stripe request for better stability.
-			 */
-			$metadata    = (array) $event->data->object->metadata;
-			$donation_id = ! empty( $metadata['Donation Post ID'] ) ? $metadata['Donation Post ID'] : 0;
-			$form_id     = give_get_payment_form_id( $donation_id );
-
-			// Set App Info, API Key, and API Version.
-			give_stripe_set_app_info( $form_id );
-
-			$processed_event = $this->process( $event );
-
-			if ( false === $processed_event ) {
-				$message = __( 'Something went wrong with processing the payment gateway event.', 'give' );
-			} else {
-				$message = sprintf(
-					/* translators: 1. Processing result. */
-					__( 'Processed event: %s', 'give' ),
-					$processed_event
-				);
-
-				give_stripe_record_log(
-					__( 'Stripe - Webhook Received', 'give' ),
-					sprintf(
-						/* translators: 1. Event ID 2. Event Type 3. Message */
-						__( 'Webhook received with ID %1$s and TYPE %2$s which processed and returned a message %3$s.', 'give' ),
-						$event->id,
-						$event->type,
-						$message
-					)
-				);
-			}
-
-			status_header( 200 );
-			exit( $message );
-		}
-
-		/**
-		 * Process Stripe Webhooks.
-		 *
-		 * @since  2.5.0
-		 * @access public
-		 *
-		 * @param \Stripe\Event $event_json Stripe Event.
-		 *
-		 * @return bool|string
-		 */
-		public function process( $event_json ) {
-
-			// Next, proceed with additional webhooks.
-			if ( isset( $event_json->id ) ) {
-
-				status_header( 200 );
-
-				try {
-
-					$event = \Stripe\Event::retrieve( $event_json->id );
-
-					// Update time of webhook received whenever the event is retrieved.
-					give_update_option( 'give_stripe_last_webhook_received_timestamp', time() );
-
-				} catch ( Exception $e ) {
-					die( 'Invalid event ID' );
-				}
-
-				// Bailout, if event type doesn't exists.
-				if ( empty( $event->type ) ) {
-					return false;
-				}
-
-				switch ( $event->type ) {
-
-					case 'checkout.session.completed':
-						$this->process_checkout_session_completed( $event );
-						break;
-
-					case 'payment_intent.succeeded':
-						$this->process_payment_intent_succeeded( $event );
-						break;
-
-					case 'payment_intent.payment_failed':
-						$this->process_payment_intent_failed( $event );
-						break;
-
-					case 'charge.refunded':
-						$this->process_charge_refunded( $event );
-						break;
-				}
-
-				do_action( 'give_stripe_event_' . $event->type, $event );
-
-				return $event->type;
-
-			} else {
-				status_header( 500 );
-				// Something went wrong outside of Stripe.
-				give_record_gateway_error( __( 'Stripe Error', 'give' ), sprintf( __( 'An error occurred while processing a webhook.', 'give' ) ) );
-				die( '-1' ); // Failed.
-			} // End if().
-		}
-
-		/**
-		 * This function will process `checkout.session.completed` webhook event.
-		 *
-		 * @param \Stripe\Event $event Stripe Event.
-		 *
-		 * @since  2.5.5
-		 * @access public
-		 *
-		 * @return void
-		 */
-		public function process_checkout_session_completed( $event ) {
-
-			// Get Payment Intent data from Event.
-			$checkout_session = $event->data->object;
-
-			// Process when Payment Intent status is succeeded.
-			$donation_id = give_get_purchase_id_by_transaction_id( $checkout_session->id );
-
-			// Update payment status to donation.
-			give_update_payment_status( $donation_id, 'publish' );
-
-			// Insert donation note to inform admin that charge succeeded.
-			give_insert_payment_note( $donation_id, __( 'Charge succeeded in Stripe.', 'give' ) );
-
-			/**
-			 * This action hook will be used to extend processing the payment intent succeeded event.
-			 *
-			 * @since 2.5.5
-			 */
-			do_action( 'give_stripe_process_checkout_session_completed', $donation_id, $event );
-		}
-
-		/**
-		 * This function will process `payment_intent.succeeded` webhook event.
-		 *
-		 * @param \Stripe\Event $event Stripe Event.
-		 *
-		 * @since  2.5.5
-		 * @access public
-		 *
-		 * @return void
-		 */
-		public function process_payment_intent_succeeded( $event ) {
-
-			// Get Payment Intent data from Event.
-			$intent = $event->data->object;
-
-			// Process when Payment Intent status is succeeded.
-			if ( 'succeeded' === $intent->status ) {
-				$donation_id = give_get_purchase_id_by_transaction_id( $intent->id );
-
-				// Update payment status to donation.
-				give_update_payment_status( $donation_id, 'publish' );
-
-				// Insert donation note to inform admin that charge succeeded.
-				give_insert_payment_note( $donation_id, __( 'Charge succeeded in Stripe.', 'give' ) );
-			}
-
-			/**
-			 * This action hook will be used to extend processing the payment intent succeeded event.
-			 *
-			 * @since 2.5.5
-			 */
-			do_action( 'give_stripe_process_payment_intent_succeeded', $event );
-		}
-
-		/**
-		 * This function will process `payment_intent.failed` webhook event.
-		 *
-		 * @param \Stripe\Event $event Stripe Event.
-		 *
-		 * @since  2.5.5
-		 * @access public
-		 *
-		 * @return void
-		 */
-		public function process_payment_intent_failed( $event ) {
-
-			// Get Payment Intent data from Event.
-			$intent      = $event->data->object;
-			$donation_id = give_get_purchase_id_by_transaction_id( $intent->id );
-
-			// Update payment status to donation.
-			give_update_payment_status( $donation_id, 'failed' );
-
-			// Insert donation note to inform admin that charge succeeded.
-			give_insert_payment_note( $donation_id, __( 'Charge failed in Stripe.', 'give' ) );
-
-			/**
-			 * This action hook will be used to extend processing the payment intent failed event.
-			 *
-			 * @since 2.5.5
-			 */
-			do_action( 'give_stripe_process_payment_intent_failed', $event );
-		}
-
-		/**
-		 * This function will process `charge.refunded` webhook event.
-		 *
-		 * @param \Stripe\Event $event Stripe Event.
-		 *
-		 * @since  2.5.5
-		 * @access public
-		 *
-		 * @return void
-		 */
-		public function process_charge_refunded( $event ) {
-			global $wpdb;
-
-			$charge = $event->data->object;
-
-			if ( $charge->refunded ) {
-
-				$payment_id = $wpdb->get_var( $wpdb->prepare( "SELECT donation_id FROM {$wpdb->donationmeta} WHERE meta_key = '_give_payment_transaction_id' AND meta_value = %s LIMIT 1", $charge->id ) );
-
-				if ( $payment_id ) {
-
-					give_update_payment_status( $payment_id, 'refunded' );
-					give_insert_payment_note( $payment_id, __( 'Charge refunded in Stripe.', 'give' ) );
-
-				}
-			}
-
-			/**
-			 * This action hook will be used to extend processing the charge refunded event.
-			 *
-			 * @since 2.5.5
-			 */
-			do_action( 'give_stripe_process_charge_refunded', $event );
-		}
-	}
+if (!class_exists('Give_Stripe_Webhooks')) {
+    /**
+     * Class Give_Stripe_Webhooks
+     *
+     * @since 2.5.0
+     */
+    class Give_Stripe_Webhooks
+    {
+
+        /**
+         * Stripe Gateway
+         *
+         * @since  2.5.0
+         * @access public
+         *
+         * @var $stripe_gateway
+         */
+        public $stripe_gateway;
+
+        /**
+         * Give_Stripe_Webhooks constructor.
+         *
+         * @since 2.5.0
+         */
+        public function __construct()
+        {
+            $this->stripe_gateway = new Give_Stripe_Gateway();
+
+            add_action('init', [$this, 'listen']);
+        }
+
+        /**
+         * Listen for Stripe events.
+         *
+         * @access public
+         * @since  2.5.0
+         *
+         * @return void
+         */
+        public function listen()
+        {
+            $give_listener = give_clean(filter_input(INPUT_GET, 'give-listener'));
+
+            // Must be a stripe listener to proceed.
+            if ('stripe' !== $give_listener) {
+                return;
+            }
+
+            // Retrieve the request's body and parse it as JSON.
+            $payload = @file_get_contents('php://input');
+
+            try {
+                $event = Event::constructFrom(
+                    json_decode($payload, true)
+                );
+            } catch (\UnexpectedValueException $e) {
+                Log::warning(
+                    'Stripe - Webhook Received',
+                    ['Payload' => $payload,]
+                );
+
+                status_header(400);
+                exit();
+            }
+
+            try {
+                $processed_event = $this->process($event);
+
+                $message = $processed_event ?
+                    sprintf(
+                    /* translators: 1. Processing result. */
+                        __('Processed event: %s', 'give'),
+                        $processed_event
+                    ) :
+                    __('Something went wrong with processing the payment gateway event.', 'give');
+            } catch (\Exception $e) {
+                $message = sprintf(
+                    'Unable to process %1$s event on %2$s. Error: %3$s',
+                    $event->type,
+                    home_url(),
+                    $e->getMessage()
+                );
+            }
+
+            status_header(200);
+            exit($message);
+        }
+
+        /**
+         * Process Stripe Webhooks.
+         *
+         * @since  2.5.0
+         * @access public
+         *
+         * @return string
+         * @throws \Give\Framework\Exceptions\Primitives\Exception
+         */
+        public function process(Event $event)
+        {
+            $eventListeners = [
+                'checkout.session.completed' => CheckoutSessionCompleted::class,
+                'payment_intent.succeeded' => PaymentIntentSucceeded::class,
+                'payment_intent.payment_failed' => PaymentIntentPaymentFailed::class,
+                'charge.refunded' => ChargeRefunded::class
+            ];
+
+            if (array_key_exists($event->type, $eventListeners)) {
+                /* @var StripeEventListener $stripeEvent */
+                $stripeEvent = give($eventListeners[$event->type]);
+                $stripeEvent($event);
+            }
+
+            do_action('give_stripe_event_' . $event->type, $event);
+
+            return $event->type;
+        }
+    }
 }
 
 new Give_Stripe_Webhooks();
diff --git a/src/Donations/Repositories/DonationRepository.php b/src/Donations/Repositories/DonationRepository.php
index a9ba706911..eaf7717f34 100644
--- a/src/Donations/Repositories/DonationRepository.php
+++ b/src/Donations/Repositories/DonationRepository.php
@@ -64,6 +64,32 @@ public function getById(int $donationId)
             ->get();
     }
 
+    /**
+     * @unreleased
+     * @return Donation|null
+     */
+    public function getByGatewayTransactionId($gatewayTransactionId)
+    {
+        return $this->queryByGatewayTransactionId($gatewayTransactionId)->get();
+    }
+
+    /**
+     * @unreleased
+     * @return ModelQueryBuilder
+     */
+    public function queryByGatewayTransactionId($gatewayTransactionId)
+    {
+        return $this->prepareQuery()
+            ->where('post_type', 'give_payment')
+            ->where('ID', function (QueryBuilder $builder) use ($gatewayTransactionId) {
+                $builder
+                    ->select('donation_id')
+                    ->from('give_donationmeta')
+                    ->where('meta_key', DonationMetaKeys::GATEWAY_TRANSACTION_ID()->getValue())
+                    ->where('meta_value', $gatewayTransactionId);
+            });
+    }
+
     /**
      * @since 2.19.6
      *
@@ -296,6 +322,7 @@ public function delete(Donation $donation): bool
     private function getCoreDonationMetaForDatabase(Donation $donation): array
     {
         $meta = [
+            DonationMetaKeys::GATEWAY_TRANSACTION_ID => $donation->gatewayTransactionId,
             DonationMetaKeys::AMOUNT => give_sanitize_amount_for_db(
                 $donation->amount->formatToDecimal(),
                 ['currency' => $donation->amount->getCurrency()]
@@ -317,7 +344,6 @@ private function getCoreDonationMetaForDatabase(Donation $donation): array
                     $donation->email
                 ),
             DonationMetaKeys::DONOR_IP => $donation->donorIp ?? give_get_ip(),
-            DonationMetaKeys::GATEWAY_TRANSACTION_ID => $donation->gatewayTransactionId,
             DonationMetaKeys::LEVEL_ID => $donation->levelId,
             DonationMetaKeys::ANONYMOUS => (int)$donation->anonymous
         ];
diff --git a/src/Donations/ValueObjects/DonationStatus.php b/src/Donations/ValueObjects/DonationStatus.php
index e47594a59d..3292cda260 100644
--- a/src/Donations/ValueObjects/DonationStatus.php
+++ b/src/Donations/ValueObjects/DonationStatus.php
@@ -2,7 +2,7 @@
 
 namespace Give\Donations\ValueObjects;
 
-use MyCLabs\Enum\Enum;
+use Give\Framework\Support\ValueObjects\Enum;
 
 /**
  * @since 2.19.6
diff --git a/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php b/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
new file mode 100644
index 0000000000..967e609917
--- /dev/null
+++ b/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Give\PaymentGateways\Gateways\Stripe\Traits;
+
+/**
+ * @unreleased
+ */
+trait CanSetupStripeApp
+{
+    /**
+     * @unreleased
+     *
+     * @param int $formId
+     *
+     * @return void
+     */
+    protected function setupStripeApp($formId)
+    {
+        give_stripe_set_app_info($formId);
+    }
+}
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
new file mode 100644
index 0000000000..8ca856a4cc
--- /dev/null
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Give\PaymentGateways\Gateways\Stripe\Webhooks\Contracts;
+
+use Stripe\Event;
+
+/**
+ * @unreleased
+ */
+interface EventListener
+{
+    /**
+     * @unreleased
+     *
+     * @return void
+     */
+    public function processEvent(Event $event);
+}
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
new file mode 100644
index 0000000000..6daee75dd4
--- /dev/null
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners;
+
+use Give\Donations\Repositories\DonationRepository;
+use Give\Donations\ValueObjects\DonationStatus;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\StripeEventListener;
+use Stripe\Charge;
+use Stripe\Event;
+
+/**
+ * @unreleased
+ */
+class ChargeRefunded extends StripeEventListener
+{
+    /**
+     * @unreleased
+     *
+     * @inerhitDoc
+     */
+    public function processEvent(Event $event)
+    {
+        /* @var Charge $stripeCharge */
+        $stripeCharge = $event->data->object;
+        $donation = $this->getDonation($event);
+
+        if ($stripeCharge->refunded && !$donation->status->isRefunded()) {
+            $donation->status = DonationStatus::REFUNDED();
+            $donation->save();
+
+            give_insert_payment_note($donation->id, __('Charge refunded in Stripe.', 'give'));
+        }
+
+        // TODO handle stripe partial refund.
+
+        $this->addSupportForLegacyActionHook($event);
+    }
+
+    /**
+     * @unreleased
+     */
+    private function addSupportForLegacyActionHook(Event $event)
+    {
+        /**
+         * This action hook will be used to extend processing the charge refunded event.
+         *
+         * @since 2.5.5
+         */
+        do_action('give_stripe_process_charge_refunded', $event);
+    }
+
+    /**
+     * @unreleased
+     * @inerhitDoc
+     */
+    protected function getDonation(Event $event)
+    {
+        /* @var Charge $stripeCharge */
+        $stripeCharge = $event->data->object;
+
+        return give(DonationRepository::class)->getByGatewayTransactionId($stripeCharge->id);
+    }
+}
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
new file mode 100644
index 0000000000..d215ab6a00
--- /dev/null
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners;
+
+use Give\Donations\ValueObjects\DonationStatus;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\StripeEventListener;
+use Stripe\Checkout\Session;
+use Stripe\Event;
+
+/**
+ * @unreleased
+ */
+class CheckoutSessionCompleted extends StripeEventListener
+{
+
+    /**
+     * @unreleased
+     *
+     * @inerhitDoc
+     */
+    public function processEvent(Event $event)
+    {
+        /* @var Session $checkoutSession */
+        $checkoutSession = $event->data->object;
+        $donation = $this->getDonation($event);
+
+        if (!$donation->status->isComplete()) {
+            $donation->status = DonationStatus::COMPLETE();
+            $donation->gatewayTransactionId = $checkoutSession->payment_intent;
+            $donation->save();
+
+            // Insert donation note to inform admin that charge succeeded.
+            give_insert_payment_note(
+                $donation->id,
+                esc_html__('Charge succeeded in Stripe.', 'give')
+            );
+        }
+
+        $this->addSupportForLegacyActionHook($donation->id, $event);
+    }
+
+    /**
+     * @unreleased
+     * @return void
+     */
+    private function addSupportForLegacyActionHook($donationId, $event)
+    {
+        /**
+         * This action hook will be used to extend processing the payment intent succeeded event.
+         *
+         * @since 2.5.5
+         */
+        do_action('give_stripe_process_checkout_session_completed', $donationId, $event);
+    }
+
+}
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
new file mode 100644
index 0000000000..0d97460b13
--- /dev/null
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners;
+
+use Give\Donations\ValueObjects\DonationStatus;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\StripeEventListener;
+use Stripe\Event;
+
+class PaymentIntentPaymentFailed extends StripeEventListener
+{
+
+    /**
+     * @unreleased
+     *
+     * @inerhitDoc
+     */
+    public function processEvent(Event $event)
+    {
+        $donation = $this->getDonation($event);
+
+        if (!$donation->status->isFailed()) {
+            $donation->status = DonationStatus::FAILED();
+            $donation->save();
+
+            give_insert_payment_note($donation->id, __('Charge failed in Stripe.', 'give'));
+        }
+
+        $this->addSupportForLegacyActionHook($event);
+    }
+
+    /**
+     * @unreleased
+     */
+    private function addSupportForLegacyActionHook(Event $event)
+    {
+        /**
+         * This action hook will be used to extend processing the payment intent failed event.
+         *
+         * @since 2.5.5
+         */
+        do_action('give_stripe_process_payment_intent_failed', $event);
+    }
+}
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
new file mode 100644
index 0000000000..43758e3b6e
--- /dev/null
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners;
+
+use Give\Donations\ValueObjects\DonationStatus;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\StripeEventListener;
+use Stripe\Event;
+use Stripe\PaymentIntent;
+
+/**
+ * @unreleased
+ */
+class PaymentIntentSucceeded extends StripeEventListener
+{
+
+    /**
+     * @unreleased
+     * @inerhitDoc
+     */
+    public function processEvent(Event $event)
+    {
+        /* @var PaymentIntent $paymentIntent */
+        $paymentIntent = $event->data->object;
+
+        if (PaymentIntent::STATUS_SUCCEEDED === $paymentIntent->status) {
+            $donation = $this->getDonation($event);
+
+            if (!$donation->status->isComplete()) {
+                $donation->status = DonationStatus::COMPLETE();
+                $donation->save();
+
+                give_insert_payment_note($donation->id, __('Charge succeeded in Stripe.', 'give'));
+            }
+        }
+
+        $this->addSupportForLegacyActionHook($event);
+    }
+
+    /**
+     * @unreleased
+     */
+    private function addSupportForLegacyActionHook(Event $event)
+    {
+        /**
+         * This action hook will be used to extend processing the payment intent succeeded event.
+         *
+         * @since 2.5.5
+         */
+        do_action('give_stripe_process_payment_intent_succeeded', $event);
+    }
+}
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php
new file mode 100644
index 0000000000..1d31cd1fda
--- /dev/null
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Give\PaymentGateways\Gateways\Stripe\Webhooks;
+
+use Give\Donations\Models\Donation;
+use Give\Donations\Repositories\DonationRepository;
+use Give\Framework\Exceptions\Primitives\Exception;
+use Give\PaymentGateways\Gateways\Stripe\Traits\CanSetupStripeApp;
+use Give\PaymentGateways\Gateways\Stripe\Webhooks\Contracts\EventListener;
+use Stripe\Event;
+
+/**
+ * @unreleased
+ */
+abstract class StripeEventListener implements EventListener
+{
+    use CanSetupStripeApp;
+
+    /**
+     * @unreleased
+     * @throws Exception
+     */
+    public function __invoke(Event $event)
+    {
+        if ($formId = $this->getFormId($event)) {
+            $this->setupStripeApp($formId);
+            $this->logEventReceiveTime();
+
+            $this->processEvent($this->getEventFromStripe($event->id));
+        }
+    }
+
+    /**
+     * @unreleased
+     *
+     * @param string $eventId
+     *
+     * @return Event
+     * @throws Exception
+     */
+    protected function getEventFromStripe($eventId)
+    {
+        try {
+            return Event::retrieve($eventId);
+        } catch (\Exception $e) {
+            throw new Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * @unreleased
+     * @return void
+     */
+    private function logEventReceiveTime()
+    {
+        // Update time of webhook received whenever the event is retrieved.
+        give_update_option('give_stripe_last_webhook_received_timestamp', time());
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return int|null
+     */
+    protected function getFormId(Event $event)
+    {
+        if ($donation = $this->getDonation($event)) {
+            return $donation->formId;
+        }
+
+        return null;
+    }
+
+    /**
+     * @unreleased
+     *
+     * @return Donation
+     */
+    protected function getDonation(Event $event)
+    {
+        return give(DonationRepository::class)->getByGatewayTransactionId($event->data->object->id);
+    }
+}
diff --git a/src/Subscriptions/Repositories/SubscriptionRepository.php b/src/Subscriptions/Repositories/SubscriptionRepository.php
index 5590330ca8..2bbec16bdb 100644
--- a/src/Subscriptions/Repositories/SubscriptionRepository.php
+++ b/src/Subscriptions/Repositories/SubscriptionRepository.php
@@ -39,6 +39,18 @@ public function getById(int $subscriptionId)
         return $this->queryById($subscriptionId)->get();
     }
 
+    /**
+     * @unreleased
+     *
+     * @param string $gatewayTransactionId
+     *
+     * @return Subscription
+     */
+    public function getByGatewayTransactionId($gatewayTransactionId)
+    {
+        return $this->queryByGatewayTransactionId($gatewayTransactionId)->get();
+    }
+
     /**
      * @since 2.19.6
      *
@@ -51,6 +63,19 @@ public function queryById(int $subscriptionId): ModelQueryBuilder
             ->where('id', $subscriptionId);
     }
 
+    /**
+     * @unreleased
+     *
+     * @param string $gatewayTransactionId
+     *
+     * @return ModelQueryBuilder
+     */
+    public function queryByGatewayTransactionId($gatewayTransactionId)
+    {
+        return $this->prepareQuery()
+            ->where('profile_id', $gatewayTransactionId);
+    }
+
     /**
      * @since 2.19.6
      *

From 1ed1ed29dd41ec180603661e0986c5aea9a6997d Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Thu, 26 May 2022 22:22:00 +0530
Subject: [PATCH 29/53] fix: do not need to set note

this note will be set in PaymentIntentSucceeded class
---
 .../Webhooks/Listeners/CheckoutSessionCompleted.php       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
index d215ab6a00..8b0dccad4d 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
@@ -2,6 +2,8 @@
 
 namespace Give\PaymentGateways\Gateways\Stripe\Webhooks\Listeners;
 
+use Give\Donations\Models\DonationNote;
+use Give\Donations\Repositories\DonationRepository;
 use Give\Donations\ValueObjects\DonationStatus;
 use Give\PaymentGateways\Gateways\Stripe\Webhooks\StripeEventListener;
 use Stripe\Checkout\Session;
@@ -28,12 +30,6 @@ public function processEvent(Event $event)
             $donation->status = DonationStatus::COMPLETE();
             $donation->gatewayTransactionId = $checkoutSession->payment_intent;
             $donation->save();
-
-            // Insert donation note to inform admin that charge succeeded.
-            give_insert_payment_note(
-                $donation->id,
-                esc_html__('Charge succeeded in Stripe.', 'give')
-            );
         }
 
         $this->addSupportForLegacyActionHook($donation->id, $event);

From e690ce60e8235724aa271bd5e67fb5740c7b7632 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 27 May 2022 00:10:05 +0530
Subject: [PATCH 30/53] Fix: add legacy subscription data to initial donation
 meta (#6435)

* fix: add legacy subscription data to donation meta

* doc: record changes

* fix: do not need to store subscription id in initial donation
---
 .../Adapters/LegacyPaymentGatewayAdapter.php                | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
index eeeaaa5091..21a25c798b 100644
--- a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
+++ b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
@@ -35,7 +35,8 @@ public function getLegacyFormFieldMarkup(
     /**
      * First we create a payment, then move on to the gateway processing
      *
-     * @unreleased Replace give_insert_payment with donation model.
+     * @unreleased Replace give_insert_payment with donation model. Store legacy subscription data in donation meta.
+     *             Attach subscription id to donation.
      * @since 2.19.0 Replace is_recurring with is_donation_recurring to detect recurring donations.
      * @since 2.18.0
      *
@@ -43,7 +44,7 @@ public function getLegacyFormFieldMarkup(
      */
     public function handleBeforeGateway(array $legacyDonationData, PaymentGatewayInterface $registeredGateway)
     {
-       $formData = FormData::fromRequest($legacyDonationData);
+        $formData = FormData::fromRequest($legacyDonationData);
 
         $this->validateGatewayNonce($formData->gatewayNonce);
 
@@ -72,6 +73,7 @@ public function handleBeforeGateway(array $legacyDonationData, PaymentGatewayInt
                 'donationFormId' => $formData->formId
             ]);
 
+            give()->donations->updateLegacyDonationMetaAsInitialSubscriptionDonation($donation->id);
             give()->subscriptions->updateLegacyColumns(
                 $subscription->id,
                 [

From 7318e0e38aac3c132624d6d35dc8d235786b6c1a Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 27 May 2022 00:23:04 +0530
Subject: [PATCH 31/53] Refactor: remove GatewayPaymentData class reference
 from code (#6432)

* refactor: GatewayPaymentData class has been removed, so remove unused code

* feature: change source to payment gateway name

* doc: recode changes

* chore: remove GatewayPaymentData from registry test

Co-authored-by: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
---
 .../PaymentGateways/Log/PaymentGatewayLog.php  | 18 +++++++-----------
 .../Stripe/Actions/CreateCheckoutSession.php   |  5 -----
 .../PayPalCommerce/PayPalCommerce.php          |  1 -
 .../PaymentGatewaysRegisterTest.php            |  1 -
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php b/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
index 3e5a8a8d45..ae77759d63 100644
--- a/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
+++ b/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
@@ -2,11 +2,11 @@
 
 namespace Give\Framework\PaymentGateways\Log;
 
+use Give\Donations\Models\Donation;
 use Give\Log\Log;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
-use Give\ValueObjects\CardInfo;
 
 /**
+ * @unreleased Remove GatewayPaymentData related code and Update 'source' to payment gateway name
  * @since 2.19.6 remove cardInfo from log
  * @since 2.18.0
  */
@@ -20,15 +20,11 @@ public static function __callStatic($name, $arguments)
         $arguments[1]['category'] = 'Payment Gateway';
         $arguments[1]['source'] = 'Payment Gateway';
 
-
-        foreach ($arguments[1] as $argument) {
-            if ($argument instanceof GatewayPaymentData) {
-                unset($argument->cardInfo, $argument->legacyPaymentData['card_info']);
-            }
-
-            if ($argument instanceof CardInfo) {
-                unset($argument);
-            }
+        if (
+            array_key_exists('Donation', $arguments[1]) &&
+            $arguments[1]['Donation'] instanceof Donation
+        ) {
+            $arguments[1]['source'] = $arguments[1]['Donation']->gateway()->getName();
         }
 
         parent::__callStatic($name, $arguments);
diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/CreateCheckoutSession.php b/src/PaymentGateways/Gateways/Stripe/Actions/CreateCheckoutSession.php
index 972faab2fd..3d6d74621a 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/CreateCheckoutSession.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/CreateCheckoutSession.php
@@ -6,7 +6,6 @@
 use Give\Donations\Models\DonationNote;
 use Give\Framework\Exceptions\Primitives\Exception;
 use Give\Framework\PaymentGateways\DonationSummary;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\Exceptions\InvalidPropertyName;
 use Give\PaymentGateways\Gateways\Stripe\ValueObjects\CheckoutSession;
 use Give_Stripe_Customer;
@@ -20,10 +19,6 @@ class CreateCheckoutSession
      * @since 2.20.0 Update function to get input value to line_items[0][name]
      * @since 2.19.0
      *
-     * @param  GatewayPaymentData  $paymentData
-     * @param  DonationSummary  $donationSummary
-     * @param  Give_Stripe_Customer  $giveStripeCustomer
-     *
      * @return CheckoutSession
      * @throws InvalidPropertyName
      * @throws Exception
diff --git a/src/PaymentGateways/PayPalCommerce/PayPalCommerce.php b/src/PaymentGateways/PayPalCommerce/PayPalCommerce.php
index edde73b5c7..dfb45c9ace 100644
--- a/src/PaymentGateways/PayPalCommerce/PayPalCommerce.php
+++ b/src/PaymentGateways/PayPalCommerce/PayPalCommerce.php
@@ -9,7 +9,6 @@
 use Give\Framework\PaymentGateways\Exceptions\PaymentGatewayException;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Helpers\Call;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use Give\PaymentGateways\PayPalCommerce\Actions\GetPayPalOrderFromRequest;
 use Give\PaymentGateways\PayPalCommerce\Models\MerchantDetail;
 
diff --git a/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php b/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
index 343e31d686..6deabe5acf 100644
--- a/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
+++ b/tests/unit/tests/PaymentGateways/PaymentGatewaysRegisterTest.php
@@ -6,7 +6,6 @@
 use Give\Framework\PaymentGateways\Exceptions\OverflowException;
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Framework\PaymentGateways\PaymentGatewayRegister;
-use Give\PaymentGateways\DataTransferObjects\GatewayPaymentData;
 use PHPUnit\Framework\TestCase;
 
 /**

From ce8841ac02ac88628d7658dfef7df9f944bbb505 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 27 May 2022 01:30:33 +0530
Subject: [PATCH 32/53] feature: verify stripe event

---
 .../stripe/includes/class-give-stripe-webhooks.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/includes/gateways/stripe/includes/class-give-stripe-webhooks.php b/includes/gateways/stripe/includes/class-give-stripe-webhooks.php
index c1bf1c3ac5..f36de4ef17 100644
--- a/includes/gateways/stripe/includes/class-give-stripe-webhooks.php
+++ b/includes/gateways/stripe/includes/class-give-stripe-webhooks.php
@@ -73,15 +73,21 @@ public function listen()
 
             // Retrieve the request's body and parse it as JSON.
             $payload = @file_get_contents('php://input');
+            $payload = json_decode($payload, true);
 
             try {
-                $event = Event::constructFrom(
-                    json_decode($payload, true)
+                $event = \Stripe\Event::retrieve(
+                    Event::constructFrom(
+                        $payload
+                    )->id
                 );
-            } catch (\UnexpectedValueException $e) {
+            } catch (\Exception $exception) {
                 Log::warning(
                     'Stripe - Webhook Received',
-                    ['Payload' => $payload,]
+                    [
+                        'Payload' => $payload,
+                        'Error' => $exception->getMessage()
+                    ]
                 );
 
                 status_header(400);

From 77a8c22e5292416d55230d037e59f442a06609bd Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 27 May 2022 18:50:19 +0530
Subject: [PATCH 33/53] doc: remove unnecessary tags

---
 .../Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php b/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
index 4af351273c..24056dd6f2 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
@@ -17,8 +17,7 @@ class GetOrCreateStripeCustomer
      * @unreleased Update function first argument type to Donation model
      * @since 2.19.0
      *
-     * @return Give_Stripe_Customer
-     * @throws StripeCustomerException
+     * @throws StripeCustomerException|Exception
      */
     public function __invoke(Donation $donation, string $stripePaymentMethodId = ''): Give_Stripe_Customer
     {

From f989cd89f0bed1fdb10d6c73dd505db448a90e21 Mon Sep 17 00:00:00 2001
From: Scott Kingsley Clark <scott@skc.dev>
Date: Tue, 31 May 2022 10:18:31 -0500
Subject: [PATCH 34/53] Fix/Changed: Bring back filter support for income goal
 stats (#6418)

* Bring back filter support for income goal stats

https://github.com/impress-org/givewp/commit/16e564b22272d326ddc12fccbaa162e49cdbe43b removed support for the filtered income value (`$goal_progress_stats['raw_actual']`) and this just makes that filterable again. It does this in a generalized way that lets anyone filter the income OR goal values in the context of this goal shortcode.

An added bonus here in this PR is that it passes the `$args` so that it can support even more complex queries for customization.

# Use-case

Customizing the current goal so that it's based on a date range. For instance, fundraising for specific versions of a free plugin so that once the fundraiser is over, the next version can have it's own separate income/goal without creating totally separate forms.

* No version set for the filter

* Update filter description
---
 templates/shortcode-goal.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/templates/shortcode-goal.php b/templates/shortcode-goal.php
index 7a23209017..c398827a69 100644
--- a/templates/shortcode-goal.php
+++ b/templates/shortcode-goal.php
@@ -20,8 +20,29 @@
 $show_text           = isset( $args['show_text'] ) ? filter_var( $args['show_text'], FILTER_VALIDATE_BOOLEAN ) : true;
 $show_bar            = isset( $args['show_bar'] ) ? filter_var( $args['show_bar'], FILTER_VALIDATE_BOOLEAN ) : true;
 
-$income = $form->get_earnings();
-$goal   = $goal_progress_stats['raw_goal'];
+/**
+ * Allow filtering the goal stats used for this shortcode context.
+ *
+ * @since TBD
+ *
+ * @param array $stats               The income and goal values for this form goal.
+ * @param int   $form_id             Donation Form ID.
+ * @param array $goal_progress_stats The full goal progress stats.
+ * @param array $args                The full list of shortcode arguments passed.
+ */
+$shortcode_stats = apply_filters(
+    'give_goal_shortcode_stats',
+    array(
+        'income' => $form->get_earnings(),
+        'goal'   => $goal_progress_stats['raw_goal'],
+    ),
+    $form_id,
+    $goal_progress_stats,
+    $args
+);
+
+$income = $shortcode_stats['income'];
+$goal   = $shortcode_stats['goal'];
 
 switch ( $goal_format ) {
 

From 3fb525cfc5799254603fc0050cc77c8ef305587e Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
Date: Tue, 31 May 2022 11:20:09 -0400
Subject: [PATCH 35/53] docs: update since tag with @unreleased

---
 templates/shortcode-goal.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/shortcode-goal.php b/templates/shortcode-goal.php
index c398827a69..8f1961b427 100644
--- a/templates/shortcode-goal.php
+++ b/templates/shortcode-goal.php
@@ -23,12 +23,12 @@
 /**
  * Allow filtering the goal stats used for this shortcode context.
  *
- * @since TBD
+ * @unreleased
  *
- * @param array $stats               The income and goal values for this form goal.
- * @param int   $form_id             Donation Form ID.
- * @param array $goal_progress_stats The full goal progress stats.
- * @param array $args                The full list of shortcode arguments passed.
+ * @param  array  $stats  The income and goal values for this form goal.
+ * @param  int  $form_id  Donation Form ID.
+ * @param  array  $goal_progress_stats  The full goal progress stats.
+ * @param  array  $args  The full list of shortcode arguments passed.
  */
 $shortcode_stats = apply_filters(
     'give_goal_shortcode_stats',

From b6bfdffe95c518792373f333eb92c319ea500df4 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Tue, 31 May 2022 20:51:02 +0530
Subject: [PATCH 36/53] New: allow add-on to use 'Requires GiveWP' to define
 dependency (#6428)

* feature: allow addon to use 'Requires GiveWP' to define dependency

* refactor: remove sude effect from class

add function (get_readme_file_content) to get readme.tx file content.

* tests: add test for Give_Readme_Parser class

* test: Mock_GiveWP_Readme_Parser content should be using Requires GiveWP

Co-authored-by: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
---
 includes/class-give-readme-parser.php         | 94 ++++++++++---------
 .../unit/legacy/test-addon-readme-parser.php  | 65 +++++++++++++
 2 files changed, 113 insertions(+), 46 deletions(-)
 create mode 100644 tests/unit/legacy/test-addon-readme-parser.php

diff --git a/includes/class-give-readme-parser.php b/includes/class-give-readme-parser.php
index 05333edce5..a3220d05b3 100644
--- a/includes/class-give-readme-parser.php
+++ b/includes/class-give-readme-parser.php
@@ -1,60 +1,62 @@
 <?php
+
 /**
  * Give Readme Parser
  *
  * @package     Give
- * @subpackage  Admin/Readme_Parser
+ * @since       2.1.4
  * @copyright   Copyright (c) 2018, GiveWP
  * @license     https://opensource.org/licenses/gpl-license GNU Public License
- * @since       2.1.4
+ * @subpackage  Admin/Readme_Parser
  */
-class Give_Readme_Parser {
-	/**
-	 * Readme file url
-	 *
-	 * @since  2.1.4
-	 * @access private
-	 * @var
-	 */
-	private $file_url;
+class Give_Readme_Parser
+{
+    /**
+     * Readme file url
+     *
+     * @since  2.1.4
+     * @access private
+     * @var
+     */
+    private $file_url;
 
-	/**
-	 * Readme file content
-	 *
-	 * @since  2.1.4
-	 * @access private
-	 * @var
-	 */
-	private $file_content;
+    /**
+     * Give_Readme_Parser constructor.
+     *
+     * @param string $file_url
+     */
+    public function __construct(string $file_url)
+    {
+        $this->file_url = $file_url;
+    }
 
-	/**
-	 * Give_Readme_Parser constructor.
-	 *
-	 * @param string $file_url
-	 */
-	function __construct( $file_url ) {
-		$this->file_url     = $file_url;
-		$this->file_content = wp_remote_retrieve_body( wp_remote_get( $this->file_url ) );
-	}
+    /**
+     * Get required Give core minimum version for addon
+     *
+     * @since 2.1.4
+     * @access public
+     *
+     * @return string
+     */
+    public function requires_at_least()
+    {
+        // Regex to extract Give core minimum version from the readme.txt file.
+        preg_match('/Requires (Give|GiveWP):(.*)/i', $this->get_readme_file_content(), $_requires_at_least);
 
-	/**
-	 * Get required Give core minimum version for addon
-	 *
-	 * @since 2.1.4
-	 * @access public
-	 *
-	 * @return string
-	 */
-	public function requires_at_least() {
-		// Regex to extract Give core minimum version from the readme.txt file.
-		preg_match( '|Requires Give:(.*)|i', $this->file_content, $_requires_at_least );
+        if (is_array($_requires_at_least) && 3 === count($_requires_at_least)) {
+            $_requires_at_least = trim($_requires_at_least[2]);
+        } else {
+            $_requires_at_least = null;
+        }
 
-		if ( is_array( $_requires_at_least ) && 1 < count( $_requires_at_least ) ) {
-			$_requires_at_least = trim( $_requires_at_least[1] );
-		} else {
-			$_requires_at_least = null;
-		}
+        return $_requires_at_least;
+    }
 
-		return $_requires_at_least;
-	}
+    /**
+     * @unreleased
+     */
+    protected function get_readme_file_content(): string
+    {
+        return wp_remote_retrieve_body(wp_remote_get($this->file_url));
+    }
 }
diff --git a/tests/unit/legacy/test-addon-readme-parser.php b/tests/unit/legacy/test-addon-readme-parser.php
new file mode 100644
index 0000000000..e40249b2e1
--- /dev/null
+++ b/tests/unit/legacy/test-addon-readme-parser.php
@@ -0,0 +1,65 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+require_once GIVE_PLUGIN_DIR . 'includes/class-give-readme-parser.php';
+
+/**
+ * @unreleased
+ */
+class Tests_Give_Readme_Parser extends TestCase
+{
+    /**
+     * @unreleased
+     */
+    public function test_should_return_requires_give()
+    {
+        $this->assertEquals('2.25.0', (new Mock_Give_Readme_Parser('fake_url_value'))->requires_at_least());
+    }
+
+    /**
+     * @unreleased
+     */
+    public function test_should_return_requires_givewp()
+    {
+        $this->assertEquals('2.26.0', (new Mock_GiveWP_Readme_Parser('fake_url_value'))->requires_at_least());
+    }
+}
+
+/**
+ * @unreleased
+ */
+class Mock_Give_Readme_Parser extends Give_Readme_Parser
+{
+    /**
+     * @unreleased
+     */
+    protected function get_readme_file_content(): string
+    {
+        return '=== Give - Addon ===
+Requires at least: 5.0
+Requires PHP: 7.0
+Requires Give: 2.25.0
+
+Add-on for Give.';
+    }
+}
+
+/**
+ * @unreleased
+ */
+class Mock_GiveWP_Readme_Parser extends Give_Readme_Parser
+{
+    /**
+     * @unreleased
+     */
+    protected function get_readme_file_content(): string
+    {
+        return '=== Give - Addon ===
+Requires at least: 5.0
+Requires PHP: 7.0
+Requires GiveWP: 2.26.0
+
+Add-on for GiveWP.';
+    }
+}

From c34bb707687624cf303bc63027b33cb1f474525d Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Tue, 7 Jun 2022 22:17:20 +0530
Subject: [PATCH 37/53] fix: catch all exceptions when process one time or
 recurring donation (#6442)

* fix: handle global Exception instead of own primitive

* doc: add unreleased tag
---
 src/Framework/PaymentGateways/PaymentGateway.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Framework/PaymentGateways/PaymentGateway.php b/src/Framework/PaymentGateways/PaymentGateway.php
index 1cf25b7c83..9ca3ed290a 100644
--- a/src/Framework/PaymentGateways/PaymentGateway.php
+++ b/src/Framework/PaymentGateways/PaymentGateway.php
@@ -73,6 +73,7 @@ public function supportsSubscriptions(): bool
     }
 
     /**
+     * @unreleased Handle PHP exception.
      * @since 2.19.0
      */
     public function handleCreatePayment(Donation $donation)
@@ -80,7 +81,7 @@ public function handleCreatePayment(Donation $donation)
         try {
             $command = $this->createPayment($donation);
             $this->handleGatewayPaymentCommand($command, $donation);
-        } catch (Exception $exception) {
+        } catch (\Exception $exception) {
             PaymentGatewayLog::error(
                 $exception->getMessage(),
                 [
@@ -99,6 +100,7 @@ public function handleCreatePayment(Donation $donation)
     }
 
     /**
+     * @unreleased Handle PHP exception.
      * @since 2.19.0
      *
      */
@@ -107,7 +109,7 @@ public function handleCreateSubscription(Donation $donation, Subscription $subsc
         try {
             $command = $this->createSubscription($donation, $subscription);
             $this->handleGatewaySubscriptionCommand($command, $donation, $subscription);
-        } catch (Exception $exception) {
+        } catch (\Exception $exception) {
             PaymentGatewayLog::error(
                 $exception->getMessage(),
                 [
@@ -294,9 +296,10 @@ public function generateSecureGatewayRouteUrl(string $gatewayMethod, int $donati
      * 1. Redirect to donation form if donation form submit.
      * 2. Return json response if processing payment on ajax.
      *
+     * @unreleased Handle PHP exception.
      * @since 2.19.0
      */
-    private function handleExceptionResponse(Exception $exception, string $message)
+    private function handleExceptionResponse(\Exception $exception, string $message)
     {
         if ($exception instanceof PaymentGatewayException) {
             $message = $exception->getMessage();

From 721bd49155fda24afb597cbd2bde2872e1c6a69d Mon Sep 17 00:00:00 2001
From: Joshua Dinh <75056371+JoshuaHungDinh@users.noreply.github.com>
Date: Wed, 8 Jun 2022 09:19:23 -0700
Subject: [PATCH 38/53] New: Brand new Donor Wall design (#6420)

Co-authored-by: Ben Meredith <ben.meredith@gmail.com>
---
 .../src/css/frontend/_components.donor.scss   | 304 +++++++++------
 assets/src/js/frontend/give-donor-wall.js     |   6 +-
 blocks/components/column-selector/index.js    |  93 ++---
 blocks/components/column-selector/style.scss  |  14 +-
 blocks/components/toggle/index.js             |  17 +
 blocks/components/toggle/style.scss           |  16 +
 blocks/donation-form-grid/data/options.js     |   9 +-
 blocks/donation-form-grid/edit/inspector.js   |   8 +-
 blocks/donor-wall/class-give-donor-wall.php   |  81 ++--
 blocks/donor-wall/data/attributes.js          |  42 ++-
 blocks/donor-wall/data/options.js             |  25 +-
 blocks/donor-wall/edit/inspector.js           | 350 ++++++++++++------
 blocks/donor-wall/edit/style.scss             |  44 +++
 blocks/donor-wall/index.js                    |   2 +-
 blocks/load.php                               |   1 +
 includes/donors/class-give-donor-wall.php     |  13 +-
 templates/shortcode-donor-wall.php            | 295 +++++++++------
 17 files changed, 843 insertions(+), 477 deletions(-)
 create mode 100644 blocks/components/toggle/index.js
 create mode 100644 blocks/components/toggle/style.scss
 create mode 100644 blocks/donor-wall/edit/style.scss

diff --git a/assets/src/css/frontend/_components.donor.scss b/assets/src/css/frontend/_components.donor.scss
index 1f26bc0828..b73690cdad 100644
--- a/assets/src/css/frontend/_components.donor.scss
+++ b/assets/src/css/frontend/_components.donor.scss
@@ -5,17 +5,34 @@
 /**
  * Single donor with user image, details, and review text.
  *
- * 1. Header wraps the user photo and details. It displays above review text.
- * 2. Image is the image of the donor.
- * 3. Details include the donor's name, amount given, and date of the donation.
+ * 1. Card Container wraps the Image, Name, Content & Details. It displays above the tribute message.
+ * 2. Content includes the donor comment
+ * 4. Details include the forms title & amount given.
  */
 
+@use "sass:string";
+
+$MIN_REM_SIZE: 16px;
+
+/**
+ * Safely use rem values in distributed code for unpredictable environments (e.g. for use inside a WordPress plugin).
+ *
+ * This does not support IE 11 and a few other outdated browser.
+ * A Sass mixin could be used to provide a fallback value for this.
+ *
+ * @param {Number} $value
+ * @return {String} e.g. for $value: 3 and $MIN_REM_SIZE: 16px => max(3rem, 48px)
+ */
+@function safe-rem($value) {
+    @return string.unquote("max(#{$value}rem, #{$value * $MIN_REM_SIZE})");
+}
+
 /*--------------------------------------------------------------
 # Spacing
 --------------------------------------------------------------*/
 
 $donor-space: 20px;
-$donor-color: #333;
+$donor-color: #00160A;
 $donor-space-eighth: $donor-space * 0.125;
 $donor-space-quarter: $donor-space * 0.25;
 $donor-space-fifth: $donor-space * 0.2;
@@ -27,117 +44,178 @@ $donor-space-and-three-quarters: $donor-space * 1.75;
 $donor-space-double: $donor-space * 2;
 $donor-space-triple: $donor-space * 3;
 
+
 .give-donor {
-	border: 1px solid $give-card-border;
-	background: #fff;
-	color: $donor-color;
-	font-size: 1em;
-	margin-bottom: $donor-space;
-	padding: $donor-space;
-	position: relative;
-	transition: all 0.2s ease-out;
-	width: 100%;
-
-	&__header {
-
-		/* [1] */
-		align-items: center;
-		display: flex;
-	}
-
-	&__image {
-
-		/* [2] */
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		background: #fff;
-		margin-right: $donor-space-half;
-		overflow: hidden;
-		border-radius: 50%;
-		flex-basis: 40%;
-
-		position: relative;
-
-		img {
-			object-fit: cover;
-			width: 100%;
-		}
-
-		.give-donor__name_initial {
-			position: absolute;
-		}
-
-		&[data-anonymous-donation='0'] img[src*='anonymous-user.svg'],
-		&[data-anonymous-donation='1'] .give-donor__name_initial {
-			visibility: hidden;
-		}
-
-		&[data-anonymous-donation='0'][data-has-valid-gravatar='0'] {
-			border: 1px solid $give-card-border;
-		}
-	}
-
-	&__details {
-
-		/* [3] */
-		flex-grow: 1;
-		overflow: hidden;
-		flex-basis: 60%;
-	}
-
-	&__name {
-		font-size: 1em !important;
-		font-weight: bold !important;
-		color: $donor-color !important;
-		line-height: 1.3 !important;
-		margin: 0 !important;
-		padding: 0 !important;
-	}
-
-	&__timestamp {
-		color: $donor-color !important;
-		display: block;
-		font-size: 75% !important;
-		line-height: 1.3 !important;
-	}
-
-	&__content {
-		margin-top: $donor-space-half;
-		width: 100%;
-
-		p {
-			color: $donor-color;
-			font-size: 1em !important;
-			font-size: 1em !important;
-			line-height: 1.5 !important;
-			margin: 0 0 $donor-space !important;
-			padding: 0 !important;
-			width: 100%;
-		}
-
-		&:first-child {
-			margin-top: 0 !important;
-		}
-
-		& :last-child {
-			margin-bottom: 0 !important;
-		}
-	}
-
-	&__read-more {
-		cursor: pointer;
-		white-space: nowrap;
-	}
-
-	&__excerpt + &__comment {
-		display: none;
-	}
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    width:100%;
+    max-height: 100%;
+    padding: 18px 0;
+    margin-bottom: $donor-space;
+    border: 1px solid $give-card-border;
+    background: #fff;
+    color: $donor-color;
+    transition: all 0.2s ease-out;
+
+    &-container {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding: 0 5%;
+
+        &__image {
+            align-self: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background: #fff;
+            overflow: hidden;
+            border-radius: 50%;
+            border: 1px solid $give-card-border;
+            margin-bottom: 12px;
+
+            img {
+                object-fit: cover;
+                object-position: center;
+                width: 100%;
+            }
+
+            &__name_initial {
+                position: absolute;
+            }
+
+            &[data-anonymous-donation='0'] img[src*='anonymous-user.svg'],
+            &[data-anonymous-donation='1'] .give-donor-header__name_initial {
+                visibility: hidden;
+            }
+
+            &[data-anonymous-donation='0'][data-has-valid-gravatar='0'] {
+                border: 1px solid $give-card-border;
+            }
+        }
+
+        &__name {
+            width: 100%;
+            margin: 0 0 10px 0 !important;
+            font-size: safe-rem(1.5);
+            font-weight: 600;
+            text-align: center;
+            line-height: 20px;
+        }
+    }
+
+    /* [1] */
+    &-wrapper {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    &-content {
+        flex: 1;
+        width: 100%;
+        margin-bottom: 20px;
+        line-height: 20px;
+        padding-left: 16px;
+        border-left: 2px solid #219653;
+        font-weight: 400;
+        letter-spacing: 0;
+
+        p {
+            width: 100%;
+            color: $donor-color;
+            font-size: safe-rem(.875);
+            font-style: italic;
+            line-height: 20px;
+            margin: 0 !important;
+        }
+
+        &__excerpt &__read-more {
+            cursor: pointer;
+            white-space: nowrap;
+        }
+
+        &__excerpt + &__comment {
+            display: none;
+        }
+    }
+
+
+    /* [2] */
+
+    &-details {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        &__wrapper {
+            display: flex;
+            flex-direction: column;
+            width: 100%;
+
+            span:first-child {
+                color: $donor-color;
+                font-size: safe-rem(1) !important;;
+                font-weight: 500 !important;;
+                letter-spacing: 0;
+            }
+
+            span:last-child {
+                color: $donor-color;
+                font-size: safe-rem(0.8);
+                font-weight: 400;
+                letter-spacing: 0;
+                text-align: left;
+            }
+        }
+
+        &__total {
+            color: #219653;
+            font-size: safe-rem(1.25);
+            font-weight: 700;
+            line-height: 24px;
+            letter-spacing: 0;
+            text-align: right;
+            overflow-wrap: normal;
+        }
+    }
+
+    /* [3] */
+
+    &-tribute{
+        display: flex;
+        align-items: center;
+        width: 100%;
+        min-height: 32px;
+        margin-top: 32px;
+
+        span {
+            svg {
+                display: block;
+                height: 22px;
+                width: 22px;
+                margin: 0 15px 0 32px;
+            }
+        }
+
+        &__message {
+            font-size: safe-rem(0.75);
+            color: $donor-color;
+            text-align: center;
+
+
+            span:last-child {
+                font-weight: 600;
+            }
+        }
+    }
 }
 
 .give-donor-wall-modal {
-	p:last-child {
-		margin-bottom: 0;
-	}
+    p:last-child {
+        margin-bottom: 0;
+    }
 }
diff --git a/assets/src/js/frontend/give-donor-wall.js b/assets/src/js/frontend/give-donor-wall.js
index 173829ae84..b2009f6eb7 100644
--- a/assets/src/js/frontend/give-donor-wall.js
+++ b/assets/src/js/frontend/give-donor-wall.js
@@ -14,7 +14,7 @@ class GiveDonorWall {
 				/**
 				 * Add events
 				 */
-				window.addDynamicEventListener( document, 'click', '.give-donor__read-more', GiveDonorWall.readMoreBtnEvent );
+				window.addDynamicEventListener( document, 'click', '.give-donor-content__read-more', GiveDonorWall.readMoreBtnEvent );
 				window.addDynamicEventListener( document, 'click', '.give-donor__load_more', GiveDonorWall.loadMoreBtnEvent );
 			}, false
 		);
@@ -38,7 +38,7 @@ class GiveDonorWall {
 		jQuery.magnificPopup.open(
 			{
 				items: {
-					src: evt.target.parentNode.parentNode.parentNode.getElementsByClassName( 'give-donor__comment' )[ 0 ],
+					src: evt.target.parentNode.parentNode.parentNode.getElementsByClassName( 'give-donor-content__comment' )[ 0 ],
 					type: 'inline',
 				},
 				mainClass: 'give-modal give-donor-wall-modal',
@@ -151,7 +151,7 @@ class GiveDonorWall {
 		gridWraps = Array.from( shortcodeAttrHiddenField.parentNode.querySelectorAll( '.give-grid__item' ) );
 
 		gridWraps.forEach( function( gridWrap, index ) {
-			gravatarContainer = gridWrap.querySelector( '.give-donor__image' );
+			gravatarContainer = gridWrap.querySelector( '.give-donor-container__image' );
 
 			// Bailout out if already tried to load gravatar.
 			if ( gravatarContainer.classList.contains( 'gravatar-loaded' ) ) {
diff --git a/blocks/components/column-selector/index.js b/blocks/components/column-selector/index.js
index 7bdb06832b..d1669e5525 100644
--- a/blocks/components/column-selector/index.js
+++ b/blocks/components/column-selector/index.js
@@ -1,46 +1,19 @@
-import {__} from '@wordpress/i18n';
 import cx from 'classnames';
 import './style.scss';
 
-export function Selector({display, selected, onClick}) {
+export function Selector({display, selected}) {
     const displayValue = String(display);
 
-    const handleOnClick = () => {
-        if (onClick instanceof Function) {
-            onClick(displayValue);
-        }
-    };
-
     return (
         <div
-            onClick={handleOnClick}
             className={cx(
                 'give_column_selector_container',
                 {'give_column_selector_selected': displayValue === selected}
             )}
         >
-            {display === 'best-fit' ? (
-                <div className="give_column_selector_icon_container">
-                    <div>
-                        {__('Best Fit (Responsive)', 'give')}
-                    </div>
-                    <div>
-                        <div className="give_best_fit_icon">
-                            <div className="give_best_fit_row">
-                                <div className="give_best_fit_icon_box"> </div>
-                                <div className="give_best_fit_icon_box"> </div>
-                            </div>
-                            <div className="give_best_fit_row">
-                                <div className="give_best_fit_icon_box"> </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            ) : (
                 <>
                     {Array(display).fill(null).map((val, i) => <div key={i} className="give_column_selector_box"> </div>)}
                 </>
-            )}
         </div>
     )
 }
@@ -53,7 +26,7 @@ export function Row({children}) {
     )
 }
 
-export default function ({label, onClick, selected, help}) {
+export default function ({label, selected, help}) {
     return (
         <div className="give_column_selector">
             {label && (
@@ -64,39 +37,35 @@ export default function ({label, onClick, selected, help}) {
                 <p className="give_column_selector_help_text">{help}</p>
             )}
 
-            <Row>
-                <Selector
-                    display="best-fit"
-                    onClick={onClick}
-                    selected={selected}
-                />
-            </Row>
-
-            <Row>
-                <Selector
-                    display={1}
-                    onClick={onClick}
-                    selected={selected}
-                />
-                <Selector
-                    display={2}
-                    onClick={onClick}
-                    selected={selected}
-                />
-            </Row>
-
-            <Row>
-                <Selector
-                    display={3}
-                    onClick={onClick}
-                    selected={selected}
-                />
-                <Selector
-                    display={4}
-                    onClick={onClick}
-                    selected={selected}
-                />
-            </Row>
+            {selected === '1' ? (
+                    <Row>
+                        <Selector
+                            display={1}
+                            selected={selected}
+                        />
+                    </Row>
+            ) : selected === '2' ? (
+                <Row>
+                    <Selector
+                        display={2}
+                        selected={selected}
+                    />
+                </Row>
+            ) : selected === '3' ? (
+                <Row>
+                    <Selector
+                        display={3}
+                        selected={selected}
+                     />
+                </Row>
+            ):
+                <Row>
+                    <Selector
+                        display={4}
+                        selected={selected}
+                    />
+                </Row>
+            }
         </div>
     )
 }
diff --git a/blocks/components/column-selector/style.scss b/blocks/components/column-selector/style.scss
index 71d6582684..92117a7a20 100644
--- a/blocks/components/column-selector/style.scss
+++ b/blocks/components/column-selector/style.scss
@@ -11,19 +11,19 @@
 }
 
 .give_column_selector {
-    padding-bottom: 20px;
+    padding-bottom: 10px;
 }
 
 .give_column_selector_container {
-    padding: 10px;
-    display: flex;
     flex: 1;
+    display: flex;
     flex-direction: row;
-    align-items: stretch;
-    background-color: #EEEEEE;
-    border-radius: 2px;
+    align-items: center;
+    min-height: 80px;
+    padding: 10px;
     gap: 10px;
-    cursor: pointer;
+    background-color: #D9D9D9;
+    border-radius: 2px;
 
     .give_column_selector_box {
         @include column_selector_box;
diff --git a/blocks/components/toggle/index.js b/blocks/components/toggle/index.js
new file mode 100644
index 0000000000..cc5a62b34f
--- /dev/null
+++ b/blocks/components/toggle/index.js
@@ -0,0 +1,17 @@
+import {__} from '@wordpress/i18n';
+import './style.scss';
+
+export default function ({options, onClick, selected}) {
+    return (
+        <div className="give-toggle">
+            {options.map((value, i) => {
+                return  (<div
+                            key={i}
+                            onClick={() => onClick(value)}
+                            className="give-toggle__option" style={ selected === value ? {background: '#007cba', color: 'white'} : {}}>
+                            {value}
+                        </div>)
+            })}
+        </div>
+    );
+}
diff --git a/blocks/components/toggle/style.scss b/blocks/components/toggle/style.scss
new file mode 100644
index 0000000000..e5cf56962b
--- /dev/null
+++ b/blocks/components/toggle/style.scss
@@ -0,0 +1,16 @@
+.give-toggle {
+    display: flex;
+    min-height: 42px;
+    margin-bottom: 20px;
+    border: 1px solid #757575;
+    border-radius: 2px;
+
+    &__option {
+        flex:1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 3px;
+        cursor: pointer;
+    }
+}
diff --git a/blocks/donation-form-grid/data/options.js b/blocks/donation-form-grid/data/options.js
index e386cd4780..2d89c28078 100644
--- a/blocks/donation-form-grid/data/options.js
+++ b/blocks/donation-form-grid/data/options.js
@@ -28,11 +28,10 @@ giveFormOptions.order = [
 
 // Form Display Styles
 giveFormOptions.columns = [
-	{ value: 'best-fit', label: __( 'Best Fit', 'give' ) },
-	{ value: '1', label: '1' },
-	{ value: '2', label: '2' },
-	{ value: '3', label: '3' },
-	{ value: '4', label: '4' },
+	{ value: '1', label: 'Full Width' },
+	{ value: '2', label: 'Double' },
+	{ value: '3', label: 'Triple' },
+    { value: '4', label: 'Max (4)' },
 ];
 
 // Form Display Styles
diff --git a/blocks/donation-form-grid/edit/inspector.js b/blocks/donation-form-grid/edit/inspector.js
index 9baec603b5..358ef700fb 100644
--- a/blocks/donation-form-grid/edit/inspector.js
+++ b/blocks/donation-form-grid/edit/inspector.js
@@ -19,6 +19,7 @@ import ColumnSelector from '../../components/column-selector';
  * Internal dependencies
  */
 import giveFormOptions from '../data/options';
+import giveDonorWallOptions from "../../donor-wall/data/options";
 
 /**
  * Render Inspector Controls
@@ -85,7 +86,12 @@ const Inspector = ({attributes, setAttributes}) => {
                     onClick={(value) => saveSetting('columns', value)}
                     help={__('Controls how many columns of the Form Grid appear. "Best Fit" will adjust responsively to the space available.', 'give')}
                 />
-
+                <SelectControl
+                    label={ __( 'Columns', 'give' ) }
+                    name="columns"
+                    value={ columns }
+                    options={ giveFormOptions.columns }
+                    onChange={ ( value ) => saveSetting( 'columns', value ) } />
                 <ToggleControl
                     name="showTitle"
                     label={__('Show Title', 'give')}
diff --git a/blocks/donor-wall/class-give-donor-wall.php b/blocks/donor-wall/class-give-donor-wall.php
index bdf2489732..cf4cb40563 100644
--- a/blocks/donor-wall/class-give-donor-wall.php
+++ b/blocks/donor-wall/class-give-donor-wall.php
@@ -92,20 +92,20 @@ public function register_block() {
 						'default' => '12',
 					],
 					'formID'          => [
-						'type'    => 'string',
-						'default' => '0',
+						'type'    => 'array',
+						'default' => [],
 					],
 					'ids'             => [
-						'type'    => 'string',
-						'default' => '',
+						'type'    => 'array',
+						'default' => [],
 					],
                     'categories'             => [
-                        'type'    => 'string',
-                        'default' => '',
+                        'type'    => 'array',
+                        'default' => [],
                     ],
                     'tags'             => [
-                        'type'    => 'string',
-                        'default' => '',
+                        'type'    => 'array',
+                        'default' => [],
                     ],
 					'orderBy'         => [
 						'type'    => 'string',
@@ -121,7 +121,7 @@ public function register_block() {
 					],
 					'columns'         => [
 						'type'    => 'string',
-						'default' => 'best-fit',
+						'default' => '3',
 					],
 					'showAvatar'      => [
 						'type'    => 'boolean',
@@ -136,14 +136,10 @@ public function register_block() {
 						'default' => false,
 					],
                     'showForm' => [
-						'type'    => 'boolean',
-						'default' => false,
-					],
-					'showTotal'       => [
 						'type'    => 'boolean',
 						'default' => true,
 					],
-					'showDate'        => [
+					'showTotal'       => [
 						'type'    => 'boolean',
 						'default' => true,
 					],
@@ -161,7 +157,7 @@ public function register_block() {
 					],
 					'commentLength'   => [
 						'type'    => 'string',
-						'default' => '140',
+						'default' => '80',
 					],
 					'readMoreText'    => [
 						'type'    => 'string',
@@ -173,8 +169,24 @@ public function register_block() {
 					],
 					'avatarSize'      => [
 						'type'    => 'string',
-						'default' => '60',
+						'default' => '75',
 					],
+                    'toggleOptions'      => [
+                        'type'    => 'string',
+                        'default' => 'Donor info',
+                    ],
+                    'filter'      => [
+                        'type'    => 'string',
+                        'default' => 'Donor ID',
+                    ],
+                    'color'      => [
+                        'type'    => 'string',
+                        'default' => '#219653',
+                    ],
+                    'showTributes'      => [
+                        'type'    => 'boolean',
+                        'default' => false,
+                    ],
 				],
 			]
 		);
@@ -193,10 +205,10 @@ public function render_block( $attributes ) {
 
 		$parameters = [
 			'donors_per_page'   => absint( $attributes['donorsPerPage'] ),
-			'form_id'           => $attributes['formID'],
-			'ids'               => $attributes['ids'],
-            'cats'                => $attributes['categories'],
-            'tags'                => $attributes['tags'],
+			'form_id'           => implode(',', $this->getAsArray($attributes['formID'] ) ),
+			'ids'               => implode(',', $this->getAsArray($attributes['ids'] ) ),
+            'cats'              => implode(',', $this->getAsArray($attributes['categories'] ) ),
+            'tags'              => implode(',', $this->getAsArray($attributes['tags'] ) ),
 			'orderby'           => $attributes['orderBy'],
 			'order'             => $attributes['order'],
 			'pages'             => absint( $attributes['paged'] ),
@@ -206,14 +218,17 @@ public function render_block( $attributes ) {
 			'show_company_name' => $attributes['showCompanyName'],
 			'show_form'         => $attributes['showForm'],
 			'show_total'        => $attributes['showTotal'],
-			'show_time'         => $attributes['showDate'],
 			'show_comments'     => $attributes['showComments'],
-			'anonymous'         => $attributes['showAnonymous'],
+            'show_tributes'     => $attributes['showTributes'],
+            'anonymous'         => $attributes['showAnonymous'],
 			'comment_length'    => absint( $attributes['commentLength'] ),
 			'only_comments'     => $attributes['onlyComments'],
 			'readmore_text'     => $attributes['readMoreText'],
 			'loadmore_text'     => $attributes['loadMoreText'],
-			'avatar_size'       => $avatarSize ?: 60,
+            'toggle_options'    => $attributes['toggleOptions'],
+            'filter'            => $attributes['filter'],
+			'avatar_size'       => $avatarSize ?: 75,
+            'color'             => $attributes['color']
 		];
 
 		$html = Give_Donor_Wall::get_instance()->render_shortcode( $parameters );
@@ -222,6 +237,26 @@ public function render_block( $attributes ) {
 		return $html;
 	}
 
+
+    /**
+     * @unreleased
+     *
+     * @param string|array $value
+     * @return array
+     */
+    private function getAsArray($value) {
+        if ( is_array($value) ) {
+            return $value;
+        }
+
+        // Backward compatibility
+        if (strpos($value, ',')) {
+            return explode(',', $value);
+        }
+
+        return [$value];
+    }
+
 	/**
 	 * Return formatted notice when shortcode returns an empty string
 	 *
diff --git a/blocks/donor-wall/data/attributes.js b/blocks/donor-wall/data/attributes.js
index c0c46ceab4..991477877d 100644
--- a/blocks/donor-wall/data/attributes.js
+++ b/blocks/donor-wall/data/attributes.js
@@ -13,20 +13,20 @@ const blockAttributes = {
 		default: '12',
 	},
 	formID: {
-		type: 'string',
-		default: '0',
+		type: 'array',
+		default: [],
 	},
 	ids: {
-		type: 'string',
-		default: '',
+		type: 'array',
+		default: [],
 	},
     categories: {
-        type: 'string',
-        default: '',
+        type: 'array',
+        default: [],
     },
     tags: {
         type: 'string',
-        default: '',
+        default: [],
     },
 	orderBy: {
 		type: 'string',
@@ -42,7 +42,7 @@ const blockAttributes = {
 	},
 	columns: {
 		type: 'string',
-		default: 'best-fit',
+		default: '3',
 	},
 	showAvatar: {
 		type: 'boolean',
@@ -57,14 +57,10 @@ const blockAttributes = {
 		default: false,
 	},
     showForm: {
-		type: 'boolean',
-		default: false,
-	},
-	showTotal: {
 		type: 'boolean',
 		default: true,
 	},
-	showDate: {
+	showTotal: {
 		type: 'boolean',
 		default: true,
 	},
@@ -82,7 +78,7 @@ const blockAttributes = {
 	},
 	commentLength: {
 		type: 'string',
-		default: '140',
+		default: '80',
 	},
 	readMoreText: {
 		type: 'string',
@@ -94,8 +90,24 @@ const blockAttributes = {
 	},
 	avatarSize: {
 		type: 'string',
-		default: '60',
+		default: '75',
 	},
+    toggleOptions: {
+        type: 'string',
+        default: 'Donor info',
+    },
+    filter: {
+        type: 'string',
+        default: 'formID',
+    },
+    color: {
+        type: 'string',
+        default: '#219653',
+    },
+    showTributes: {
+        type: 'boolean',
+        default: false,
+    }
 };
 
 export default blockAttributes;
diff --git a/blocks/donor-wall/data/options.js b/blocks/donor-wall/data/options.js
index afb2a43f4f..9407d6e89c 100644
--- a/blocks/donor-wall/data/options.js
+++ b/blocks/donor-wall/data/options.js
@@ -10,11 +10,10 @@ const giveDonorWallOptions = {};
 
 // Form Display Styles
 giveDonorWallOptions.columns = [
-	{ value: 'best-fit', label: __( 'Best Fit', 'give' ) },
-	{ value: '1', label: '1' },
-	{ value: '2', label: '2' },
-	{ value: '3', label: '3' },
-	{ value: '4', label: '4' },
+	{ value: '1', label: 'Full width' },
+	{ value: '2', label: 'Double' },
+	{ value: '3', label: 'Triple' },
+    { value: '4', label: 'Max (4)' },
 ];
 
 // Order
@@ -29,4 +28,20 @@ giveDonorWallOptions.orderBy = [
 	{ value: 'post_date', label: __( 'Date Created', 'give' ) },
 ];
 
+//Toggle Switch
+giveDonorWallOptions.toggleOptions = [
+    { value: 'Donor info', label: __( 'Donor Info', 'give' ) },
+    { value: 'Wall attributes', label: __( 'Wall Attributes', 'give' ) },
+];
+
+//Filter
+giveDonorWallOptions.filter = [
+    { value: 'ids', label: __( 'Donor ID', 'give' ) },
+    { value: 'formID', label: __( 'Form ID', 'give' ) },
+    { value: 'categories', label: __( 'Categories', 'give' ) },
+    { value: 'tags', label: __( 'Tags', 'give' ) },
+];
+
+
+
 export default giveDonorWallOptions;
diff --git a/blocks/donor-wall/edit/inspector.js b/blocks/donor-wall/edit/inspector.js
index 9fdfc546e0..9cb856eb52 100644
--- a/blocks/donor-wall/edit/inspector.js
+++ b/blocks/donor-wall/edit/inspector.js
@@ -2,145 +2,253 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n'
-import { InspectorControls } from '@wordpress/block-editor';
-import { PanelBody, SelectControl, ToggleControl, TextControl } from '@wordpress/components';
+import {InspectorControls, ColorPalette,} from '@wordpress/block-editor';
+import {PanelBody, Panel, SelectControl, ToggleControl, TextControl, FormTokenField } from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
 import giveDonorWallOptions from '../data/options';
 
+import ColumnSelector from '../../components/column-selector';
+import ToggleOptions from '../../components/toggle';
+
+
+import './style.scss'
+
 /**
  * Render Inspector Controls
 */
 
 const Inspector = ( { attributes, setAttributes } ) => {
-	const { donorsPerPage, ids, formID, categories, tags, orderBy, order, columns, avatarSize, showAvatar, showName, showCompanyName, showForm, showTotal, showDate, showComments, showAnonymous, onlyComments, commentLength, readMoreText, loadMoreText } = attributes;
+	const { donorsPerPage, ids, formID, categories, tags, orderBy, order, columns, avatarSize, showAvatar, showName, showCompanyName, onlyComments, showForm, showTotal, showComments, showAnonymous,  commentLength, readMoreText, loadMoreText, toggleOptions, filter, color, showTributes  } = attributes;
+
 	const saveSetting = ( name, value ) => {
 		setAttributes( {
 			[ name ]: value,
 		} );
 	};
 
-	return (
+    const getAsArray = value => {
+        if (Array.isArray(value)) {
+            return value;
+        }
+
+        // Backward compatibility
+        if (formIDs.indexOf(',')) {
+            return value.split(',');
+        }
+
+        return [value];
+    };
+
+    const filterValue = () => {
+        if(filter === 'categories'){
+            return <> <FormTokenField
+                className="give-donor-wall-inspector"
+                onChange ={(value) => saveSetting('categories', value)}
+                value={getAsArray(categories)}/>
+                <p className="components-form-token-field__help">
+                    {__('Type the name of your category to add it to the list. Only forms within the categories you choose will be displayed in this grid.', 'give')}
+                </p>
+            </>
+
+        } else if (filter === 'tags'){
+            return <> <FormTokenField
+                className="give-donor-wall-inspector"
+                name="tags"
+                value={getAsArray(tags)}
+                onChange ={(value) => saveSetting('tags', value)}/>
+                <p className="components-form-token-field__help">
+                    {__('Type the name of your tag to add it to the list. Only forms with these tags you choose will be displayed in this grid.', 'give')}
+                </p>
+            </>
+
+        } else if (filter === 'ids'){
+            return  <> <FormTokenField
+                className="give-donor-wall-inspector"
+                name="ids"
+                value={getAsArray(ids)}
+                onChange ={(value) => saveSetting('ids', value)}/>
+                <p className="components-form-token-field__help">
+                    {__('By default, all donors will display. Use this setting to restrict the donor wall to only display certain donors. Use a comma-separated list of donor IDs.', 'give')}
+                </p>
+            </>
+
+        } else if (filter === 'formID' ){
+            return <> <FormTokenField
+                className="give-donor-wall-inspector"
+                help={__('By Default, donations to all forms will display. Use this setting to restrict the donor to display only donations to certains forms. Use a comma-separated list of form IDs.', 'give')}
+                name="formID"
+                value={getAsArray(formID)}
+                onChange ={(value) => saveSetting('formID', value)}/>
+                <p className="components-form-token-field__help">
+                    {__('Type the ID of your form to add it to the list. Only forms with these IDs you choose will be displayed in this grid.', 'give')}
+                </p>
+            </>
+        }
+    };
+
+    return (
 		<InspectorControls key="inspector">
-			<PanelBody title={ __( 'Donor Wall Settings', 'give' ) }>
-				<TextControl
-					name="donorsPerPage"
-					label={ __( 'Donors Per Page', 'give' ) }
-					value={ donorsPerPage }
-					onChange={ ( value ) => saveSetting( 'donorsPerPage', value ) }
-                    help={ __('How many donors should show up on the initial page load?', 'give' ) }
-                />
-				<TextControl
-					name="ids"
-					label={ __( 'Donor IDs', 'give' ) }
-					value={ ids }
-					onChange={ ( value ) => saveSetting( 'ids', value ) }
-                    help={ __('By default, all donors will display. Use this setting to restrict the donor wall to only display certain donors. Use a comma-separated list of donor IDs.', 'give') }
-                />
-				<TextControl
-					name="formID"
-					label={ __( 'Form IDs', 'give' ) }
-					value={ formID }
-					onChange={ ( value ) => saveSetting( 'formID', value ) }
-                    help={ __('By Default, donations to all forms will display. Use this setting to restrict the donor to display only donations to certains forms. Use a comma-separated list of form IDs.', 'give') }
-                />
-                <TextControl
-                    name="categories"
-                    label={ __( 'Categories', 'give' ) }
-                    value={ categories }
-                    onChange={ ( value ) => saveSetting( 'categories', value ) }/>
-                <TextControl
-                    name="tags"
-                    label={ __( 'Tags', 'give' ) }
-                    value={ tags }
-                    onChange={ ( value ) => saveSetting( 'tags', value ) }/>
-				<SelectControl
-					label={ __( 'Order By', 'give' ) }
-					name="orderBy"
-					value={ orderBy }
-					options={ giveDonorWallOptions.orderBy }
-					onChange={ ( value ) => saveSetting( 'orderBy', value ) } />
-				<SelectControl
-					label={ __( 'Order', 'give' ) }
-					name="order"
-					value={ order }
-					options={ giveDonorWallOptions.order }
-					onChange={ ( value ) => saveSetting( 'order', value ) } />
-				<SelectControl
-					label={ __( 'Columns', 'give' ) }
-					name="columns"
-					value={ columns }
-					options={ giveDonorWallOptions.columns }
-					onChange={ ( value ) => saveSetting( 'columns', value ) } />
-				<TextControl
-					name="avatarSize"
-					label={ __( 'Avatar Size (px)', 'give' ) }
-					value={ avatarSize }
-					onChange={ ( value ) => saveSetting( 'avatarSize', value ) } />
-				<ToggleControl
-					name="showAvatar"
-					label={ __( 'Show Avatar', 'give' ) }
-					checked={ !! showAvatar }
-					onChange={ ( value ) => saveSetting( 'showAvatar', value ) } />
-				<ToggleControl
-					name="showName"
-					label={ __( 'Show Name', 'give' ) }
-					checked={ !! showName }
-					onChange={ ( value ) => saveSetting( 'showName', value ) } />
-				<ToggleControl
-					name="showName"
-					label={ __( 'Show Company Name', 'give' ) }
-					checked={ !! showCompanyName }
-					onChange={ ( value ) => saveSetting( 'showCompanyName', value ) } />
-                <ToggleControl
-					name="showForm"
-					label={ __( 'Show Donation Form', 'give' ) }
-					checked={ !! showForm }
-					onChange={ ( value ) => saveSetting( 'showForm', value ) } />
-				<ToggleControl
-					name="showTotal"
-					label={ __( 'Show Total', 'give' ) }
-					checked={ !! showTotal }
-					onChange={ ( value ) => saveSetting( 'showTotal', value ) } />
-				<ToggleControl
-					name="showDate"
-					label={ __( 'Show Time', 'give' ) }
-					checked={ !! showDate }
-					onChange={ ( value ) => saveSetting( 'showDate', value ) } />
-				<ToggleControl
-					name="showComments"
-					label={ __( 'Show Comments', 'give' ) }
-					checked={ !! showComments }
-					onChange={ ( value ) => saveSetting( 'showComments', value ) } />
-				<ToggleControl
-					name="showAnonymous"
-					label={ __( 'Show Anonymous', 'give' ) }
-					checked={ !! showAnonymous }
-					onChange={ ( value ) => saveSetting( 'showAnonymous', value ) } />
-				<ToggleControl
-					name="onlyComments"
-					label={ __( 'Only Donors with Comments', 'give' ) }
-					checked={ !! onlyComments }
-					onChange={ ( value ) => saveSetting( 'onlyComments', value ) } />
-				<TextControl
-					name="commentLength"
-					label={ __( 'Comment Length', 'give' ) }
-					value={ commentLength }
-					onChange={ ( value ) => saveSetting( 'commentLength', value ) } />
-				<TextControl
-					name="readMoreText"
-					label={ __( 'Read More Text', 'give' ) }
-					value={ readMoreText }
-					onChange={ ( value ) => saveSetting( 'readMoreText', value ) } />
-				<TextControl
-					name="loadMoreText"
-					label={ __( 'Load More Text', 'give' ) }
-					value={ loadMoreText }
-					onChange={ ( value ) => saveSetting( 'loadMoreText', value ) } />
-			</PanelBody>
-		</InspectorControls>
+                <Panel>
+                    <PanelBody title= {__('Layout', 'give')} initialOpen={ true }>
+                        <ColumnSelector
+                            selected={columns}
+                            onClick={(value) => saveSetting('columns', value)}
+                            help={__('Controls how many columns of the Form Grid appear. All sizes will adjust responsively to the space available. The maximum number allowed per row is 4', 'give')}
+                        />
+                        <SelectControl
+                            className="give-donor-wall-inspector"
+                            name="columns"
+                            label={ __( 'Columns', 'give' ) }
+                            value={ columns }
+                            options={ giveDonorWallOptions.columns }
+                            onChange={ ( value ) => saveSetting( 'columns', value ) } />
+                    </PanelBody>
+                </Panel>
+                <Panel>
+                    <PanelBody title= {__('Display Elements', 'give')} initialOpen={ false }>
+                        <ToggleOptions
+                            options={[__( 'Donor info', 'give' ), __( 'Wall attributes', 'give' ) ]}
+                            onClick={( value ) => saveSetting( 'toggleOptions', value ) }
+                            selected={toggleOptions}/>
+                                {toggleOptions === 'Donor info' ?
+                                    <>
+                                        <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="showName"
+                                            label={ __( 'Show Name', 'give' ) }
+                                            checked={ !! showName }
+                                            onChange={ ( value ) => saveSetting( 'showName', value ) } />
+                                        <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="showName"
+                                            label={ __( 'Show Company Name', 'give' ) }
+                                            checked={ !! showCompanyName }
+                                            onChange={ ( value ) => saveSetting( 'showCompanyName', value ) } />
+                                        <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="showAnonymous"
+                                            label={ __( 'Show Anonymous', 'give' ) }
+                                            checked={ !! showAnonymous }
+                                            onChange={ ( value ) => saveSetting( 'showAnonymous', value ) } />
+                                        <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="showAvatar"
+                                            label={ __( 'Show Avatar', 'give' ) }
+                                            checked={ !! showAvatar }
+                                            onChange={ ( value ) => saveSetting( 'showAvatar', value ) } />
+                                        <TextControl
+                                            className="give-donor-wall-inspector"
+                                            name="avatarSize"
+                                            label={ __( 'Avatar Size', 'give' ) }
+                                            help={__('Avatar size. Default height is 75. Accepts valid heights in px.', 'give')}
+                                            value={ avatarSize }
+                                            onChange={ ( value ) => saveSetting( 'avatarSize', value ) } />
+                                    </> :
+                                    <>
+                                        <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="showForm"
+                                            label={ __( 'Show Donation Form', 'give' ) }
+                                            checked={ !! showForm }
+                                            onChange={ ( value ) => saveSetting( 'showForm', value ) } />
+                                        <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="showTotal"
+                                            label={ __( 'Show Total', 'give' ) }
+                                            checked={ !! showTotal }
+                                            onChange={ ( value ) => saveSetting( 'showTotal', value ) } />
+                                        { !!window.Give_Tribute && <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="showTributes"
+                                            label={ __( 'Show Tributes', 'give' ) }
+                                            checked={ !! showTributes }
+                                            onChange={ ( value ) => saveSetting( 'showTributes', value ) } />}
+
+                                        <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="showComments"
+                                            label={ __( 'Show Comments', 'give' ) }
+                                            checked={ !! showComments }
+                                            onChange={ ( value ) => saveSetting( 'showComments', value ) } />
+                                        <ToggleControl
+                                            className="give-donor-wall-inspector"
+                                            name="onlyComments"
+                                            label={ __( 'Only Comments', 'give' ) }
+                                            checked={ !! onlyComments }
+                                            onChange={ ( value ) => saveSetting( 'onlyComments', value ) } />
+                                        <TextControl
+                                            className="give-donor-wall-inspector"
+                                            name="commentLength"
+                                            label={ __( 'Comment Length', 'give' ) }
+                                            help={__('Limits the amount of characters to be displayed on donations with comments.', 'give')}
+                                            value={ commentLength }
+                                            onChange={ ( value ) => saveSetting( 'commentLength', value ) } />
+                                        <TextControl
+                                            className="give-donor-wall-inspector"
+                                            name="readMoreText"
+                                            label={ __( 'Read More Text', 'give' ) }
+                                            value={ readMoreText }
+                                            onChange={ ( value ) => saveSetting( 'readMoreText', value ) } />
+                                    </>
+                                }
+                    </PanelBody>
+                </Panel>
+                <Panel>
+                    <PanelBody title= {__('Wall Settings', 'give')} initialOpen={ false }>
+                        <SelectControl
+                            className="give-donor-wall-inspector"
+                            label={ __( 'Sort By', 'give' ) }
+                            name="orderBy"
+                            value={ orderBy }
+                            options={ giveDonorWallOptions.orderBy }
+                            onChange={ ( value ) => saveSetting( 'orderBy', value ) } />
+                        <SelectControl
+                            className="give-donor-wall-inspector"
+                            label={ __( 'Order', 'give' ) }
+                            name="order"
+                            value={ order }
+                            options={ giveDonorWallOptions.order }
+                            onChange={ ( value ) => saveSetting( 'order', value ) } />
+                        <SelectControl
+                            className="give-donor-wall-inspector"
+                            label={ __( 'Filter', 'give' ) }
+                            name="filter" value={ filter }
+                            options={ giveDonorWallOptions.filter }
+                            onChange={ ( value ) => saveSetting( 'filter', value ) } />
+
+                        {filterValue(filter)}
+                    </PanelBody>
+                </Panel>
+                <Panel>
+                    <PanelBody title= {__('Wall Interaction', 'give')} initialOpen={ false }>
+                        <TextControl
+                            className="give-donor-wall-inspector"
+                            name="donorsPerPage"
+                            label={ __( 'Donors Per Page', 'give' ) }
+                            value={ donorsPerPage }
+                            onChange={ ( value ) => saveSetting( 'donorsPerPage', value ) }
+                            help={ __('How many donors should show up on the initial page load?', 'give' ) }
+                        />
+                        <TextControl
+                            className="give-donor-wall-inspector"
+                            name="loadMoreText"
+                            label={ __( 'Load More Text', 'give' ) }
+                            value={ loadMoreText }
+                            onChange={ ( value ) => saveSetting( 'loadMoreText', value ) } />
+                    </PanelBody>
+                </Panel>
+                <Panel>
+                    <PanelBody title= {__('Color', 'give')} initialOpen={ false }>
+                        <ColorPalette
+                            value={color}
+                            onChange={( value ) => setAttributes( { color: value } )}
+                        />
+                    </PanelBody>
+                </Panel>
+	</InspectorControls>
 	);
 };
 
diff --git a/blocks/donor-wall/edit/style.scss b/blocks/donor-wall/edit/style.scss
new file mode 100644
index 0000000000..304e89463e
--- /dev/null
+++ b/blocks/donor-wall/edit/style.scss
@@ -0,0 +1,44 @@
+.give-donor-wall-inspector{
+    flex-direction: row !important;
+    align-items: center !important;
+    justify-content: space-between !important;
+
+    .components-base-control__label {
+        margin: 0 !important;
+    }
+
+    .components-base-control__field {
+        display: flex !important;
+        flex-direction: row!important;
+        align-items: center !important;
+        justify-content: space-between !important;
+
+        .components-text-control__input {
+            flex: .7 !important;
+        }
+    }
+
+    .components-flex-item {
+        display: flex !important;
+        align-items: center !important;
+        justify-content: center !important;
+
+        .components-input-control__label{
+            flex: 1 !important;
+            margin: 0 !important;
+        }
+    }
+
+    .components-input-control__container {
+        max-width: 165px !important;
+
+            > select {
+                line-height: 1.2 !important;
+            }
+        }
+    }
+
+.components-form-token-field {
+    margin-top: -18px !important;
+    label { display: none !important;}
+}
diff --git a/blocks/donor-wall/index.js b/blocks/donor-wall/index.js
index 1571317f8a..4560a1ae4c 100644
--- a/blocks/donor-wall/index.js
+++ b/blocks/donor-wall/index.js
@@ -17,7 +17,7 @@ import GiveDonorWallGrid from './edit/block';
 
 export default registerBlockType( 'give/donor-wall', {
 	title: __( 'Donor Wall', 'give' ),
-	description: __( 'The GiveWP Donor Wall block inserts an existing donation form into the page. Each form\'s presentation can be customized below.', 'give' ),
+	description: __( 'The GiveWP Donor Wall block displays donations on the front end of the site. The settings below allow you to customize the information displayed', 'give' ),
 	category: 'give',
 	icon: <GiveIcon color="grey" />,
 	keywords: [
diff --git a/blocks/load.php b/blocks/load.php
index d37b343523..45d7329a28 100644
--- a/blocks/load.php
+++ b/blocks/load.php
@@ -34,3 +34,4 @@ function give_blocks_category( $categories, $post ) {
 require_once GIVE_PLUGIN_DIR . 'blocks/donation-form/class-give-donation-form-block.php';
 require_once GIVE_PLUGIN_DIR . 'blocks/donation-form-grid/class-give-donation-form-grid-block.php';
 require_once GIVE_PLUGIN_DIR . 'blocks/donor-wall/class-give-donor-wall.php';
+
diff --git a/includes/donors/class-give-donor-wall.php b/includes/donors/class-give-donor-wall.php
index b41fda066f..d1a5f2eea1 100644
--- a/includes/donors/class-give-donor-wall.php
+++ b/includes/donors/class-give-donor-wall.php
@@ -95,14 +95,13 @@ public function setup_actions() {
 	 * @type bool   $show_name           Whether to display the donor's full name, first and last. Default 'true'.
 	 * @type bool   $show_company_name   Whether to display the donor's company name. Default 'false'.
 	 * @type bool   $show_total          Whether to display the donor's donation amount. Default 'true'.
-	 * @type bool   $show_time           Whether to display date of the last donation. Default 'true'.
 	 * @type bool   $show_comments       Whether to display the donor's comment if they left one. Default 'true'.
 	 * @type int    $comment_length      The number of words to display for the comments before a "Read more" field
 	 * @type int    $only_comments       Whether to display the donors only with comment. Default 'false'.
 	 *
 	 * @type string $readmore_text       Link label for modal in which donor can read full comment.
 	 * @type string $loadmore_text       Button label which will load more donor comments.
-	 * @type int    $avatar_size         Avatar image size in pixels without the "px". Default "60"
+	 * @type int    $avatar_size         Avatar image size in pixels without the "px". Default "75"
 	 * @type string $orderby             The order in which you want the donations to appear.
 	 *                                   Currently we are using this attribute internally and it will sort donations by created date.
 	 * @type string $order               The order in which you want the donors to appear. Accepts "ASC". "DESC".
@@ -201,13 +200,14 @@ public function parse_atts( $atts ) {
 				'show_company_name' => false,
 				'show_form'         => false,
 				'show_total'        => true,
-				'show_time'         => true,
 				'show_comments'     => true,
-				'comment_length'    => 140,
+                'show_tributes'     => true,
+                'comment_length'    => 140,
 				'only_comments'     => false,
 				'readmore_text'     => esc_html__( 'Read more', 'give' ),
 				'loadmore_text'     => esc_html__( 'Load more', 'give' ),
-				'avatar_size'       => 60,
+				'avatar_size'       => 75,
+                'color'             => "#219653",
 				'orderby'           => 'post_date',
 				'order'             => 'DESC',
 				'hide_empty'        => true,  // Deprecated in 2.3.0
@@ -223,9 +223,8 @@ public function parse_atts( $atts ) {
 			'show_name',
 			'show_company_name',
 			'show_total',
-			'show_time',
-			'show_comments',
 			'show_comments',
+			'show_tributes',
 			'hide_empty',
 			'only_comments',
 			'only_donor_html',
diff --git a/templates/shortcode-donor-wall.php b/templates/shortcode-donor-wall.php
index a306aa8ce3..fe4cd53d03 100644
--- a/templates/shortcode-donor-wall.php
+++ b/templates/shortcode-donor-wall.php
@@ -13,124 +13,191 @@
 
 $give_settings = $args[1]; // Give settings.
 $atts          = $args[2]; // Shortcode attributes.
+
+$primary_color = $atts['color'];
+$avatarSize = (int) $atts['avatar_size'] ;
+$tribute_background_color =  ! empty( $atts['color']) ? $atts['color'] . '20' :'#219653';
+
 ?>
 
+
 <div class="give-grid__item">
-	<div class="give-donor give-card">
-		<div class="give-donor__header">
-			<?php
-			if ( true === $atts['show_avatar'] ) {
-
-				// Get anonymous donor image.
-				$anonymous_donor_img = sprintf(
-					'<img src="%1$s" alt="%2$s">',
-					esc_url( GIVE_PLUGIN_URL . 'assets/dist/images/anonymous-user.svg' ),
-					esc_attr__( 'Anonymous User', 'give' )
-				);
-
-				$donor_avatar = sprintf(
-					'%2$s<div class="give-donor__name_initial">%1$s</div>',
-					$donation['name_initial'],
-					$anonymous_donor_img
-				);
-
-				// Validate donor gravatar.
-				$validate_gravatar = ! empty( $donation['_give_anonymous_donation'] ) ? 0 : give_validate_gravatar( $donation['_give_payment_donor_email'] );
-
-				// Maybe display the Avatar.
-				echo sprintf(
-					'<div class="give-donor__image" data-donor_email="%1$s" data-has-valid-gravatar="%2$s" data-avatar-size="%3$s" data-anonymous-donation="%5$s" style="max-width:%3$spx;">%4$s</div>',
-					md5( strtolower( trim( $donation['_give_payment_donor_email'] ) ) ),
-					absint( $validate_gravatar ),
-					$atts['avatar_size'],
-					$donor_avatar,
-					(int) ! empty( $donation['_give_anonymous_donation'] )
-				);
-			}
-			?>
-
-			<div class="give-donor__details">
-				<?php if ( true === $atts['show_name'] ) : ?>
-					<h3 class="give-donor__name">
-						<?php
-						// Get donor name based on donation parameter.
-						$donor_name = ! empty( $donation['_give_anonymous_donation'] )
-							? esc_html__( 'Anonymous', 'give' )
-							: trim( $donation['_give_donor_billing_first_name'] . ' ' . $donation['_give_donor_billing_last_name'] );
-						?>
-						<?php echo esc_html( $donor_name ); ?>
-					</h3>
-				<?php endif; ?>
-
-				<?php if ( true === $atts['show_company_name'] && isset( $donation['_give_donation_company'] ) ) : ?>
-					<h3 class="give-donor__name">
-						<?php echo esc_html( $donation['_give_donation_company'] ); ?>
-					</h3>
-				<?php endif; ?>
-
-                <?php if ( true === $atts['show_form'] && isset( $donation['_give_payment_form_title'] ) ) : ?>
-                    <div>
-                        <?php echo esc_html( $donation['_give_payment_form_title'] ); ?>
+    <div class="give-donor give-card">
+        <div class="give-donor-container">
+                <?php
+                if ( $atts['show_avatar'] ) {
+
+                    if ( !empty($donation['_give_anonymous_donation'])) {
+                        // Donor gave anonymously
+                        $imageUrl = GIVE_PLUGIN_URL . 'assets/dist/images/anonymous-user.svg';
+                        $alt = __('Anonymous User', 'give');
+
+                        echo "
+                            <div class='give-donor-container__image' >
+                                <img class='give-donor-container__image__anonymous' src='$imageUrl' alt='$alt' style='height: {$avatarSize}px;'/>
+                            </div>
+                        ";
+
+                    } elseif( $donation['_give_payment_donor_email'] && give_validate_gravatar($donation['_give_payment_donor_email'])) {
+                        // Donor has a valid Gravatar
+                        $hash = md5( strtolower( trim( $donation['_give_payment_donor_email'] ) ) );
+
+
+                        echo "
+                            <div class='give-donor-container__image' >
+                                <img src='https://gravatar.com/avatar/$hash' alt='$donor->name' style='height: $avatarSize px;'/>
+                            </div>
+                        ";
+
+                    } else {
+                        // Everyone else
+
+                        $initial = esc_html($donation['name_initial']);
+                        echo "
+                           <div class='give-donor-container__image' style='height: {$avatarSize}px; width: {$avatarSize}px;'>
+                             <span class='give-donor-container__image__name_initial'>$initial</span>
+                           </div>
+                        ";
+                    }
+                }
+                ?>
+
+                <?php if ( $atts['show_name'] ) : ?>
+                    <h3 class="give-donor-container__name" style='<?php echo ($atts['show_avatar']) ? "text-align: center" : "text-align: left"?>'>
+                        <?php
+                        // Get donor name based on donation parameter.
+                        $donor_name = ! empty( $donation['_give_anonymous_donation'] )
+                            ? esc_html__( 'Anonymous', 'give' )
+                            : trim( $donation['_give_donor_billing_first_name'] . ' ' . $donation['_give_donor_billing_last_name'] );
+                        ?>
+                        <?php echo esc_html( $donor_name ); ?>
+                    </h3>
+                <?php endif; ?>
+
+                <?php if ( $atts['show_company_name'] && isset( $donation['_give_donation_company'] ) ) : ?>
+                    <h3 class="give-donor-container__name">
+                        <?php echo esc_html( $donation['_give_donation_company'] ); ?>
+                    </h3>
+                <?php endif; ?>
+
+                <?php
+                if (
+                    $atts['show_comments']
+                    && absint( $atts['comment_length'] )
+                    && ! empty( $donation['donor_comment'] )
+                    && ! $donation['_give_anonymous_donation']
+                ) :
+                    ?>
+                <div class="give-donor-wrapper">
+                    <div class="give-donor-content" style="border-color: <?php echo ! empty( $atts['color']) ? $atts['color'] :'#219653' ?>">
+                        <?php
+                        $comment     = trim( $donation['donor_comment'] );
+                        $total_chars = strlen( $comment );
+                        $max_chars   = $atts['comment_length'];
+                        $read_more_text = $atts['readmore_text'];
+
+
+                        // A truncated excerpt is displayed if the comment is too long.
+                        if ( $max_chars < $total_chars ) {
+                            $excerpt    = '';
+                            $offset     = -( $total_chars - $max_chars );
+                            $last_space = strrpos( $comment, ' ', $offset );
+
+                            if ( $last_space ) {
+                                // Truncate excerpt at last space before limit.
+                                $excerpt = substr( $comment, 0, $last_space );
+                            } else {
+                                // There are no spaces, so truncate excerpt at limit.
+                                $excerpt = substr( $comment, 0, $max_chars );
+                            }
+
+                            $excerpt = trim( $excerpt, '.!,:;' );
+
+                            echo "<p class='give-donor-content__excerpt'>$excerpt &hellip;
+                                    <span> <a class='give-donor-content__read-more' style='color: {$primary_color}'> $read_more_text </a></span>
+                                   </p>";
+
+                            echo "<p class='give-donor-content__comment'> $comment </p>";
+
+                        }
+                        ?>
                     </div>
+                </div>
                 <?php endif; ?>
+                <div class="give-donor-details">
+                    <div class="give-donor-details__wrapper">
+                        <?php
+                            $full_form_name = esc_html($donation['_give_payment_form_title']);
+                            $word_count = 3;
+                            preg_match("/(\S+\s*){0,$word_count}/", esc_html($donation['_give_payment_form_title']), $regs);
+                            $truncated_form_name = trim($regs[0] . "...");
+
+                            // Determine whether to truncate form name based on amount of words
+                            if ( $atts['show_form'] &&  $atts['show_total'] && isset( $donation['_give_payment_form_title'] ) ) {
+                                if (str_word_count($donation['_give_payment_form_title'], 0) <= $word_count) {
+                                    echo "<span class='give-donor-details__form_title'> $full_form_name </span>";
+                                }
+                                else {
+                                    echo  "<span class='give-donor-details__form_title'> $truncated_form_name </span>";
+                                }
+                            }
+
+                            // Display full form name if ['show_total'] is false
+                            else if ($atts['show_form'] && ! $atts['show_total'] && isset( $donation['_give_payment_form_title'] ) ) {
+                                echo  "<span class='give-donor-details__form_title' style='text-align: center'> $full_form_name </span>";
+                            }
+
+                            if ($atts['show_total'] ) {
+                                echo "<span class='give-donor-details__amount_donated'>Amount Donated</span>";
+                            }
+                      ?>
+                    </div>
 
-				<?php if ( true === $atts['show_total'] ) : ?>
-					<span class="give-donor__total">
-						<?php echo esc_html( give_donation_amount( $donation['donation_id'], true ) ); ?>
-					</span>
-				<?php endif; ?>
-
-				<?php if ( true === $atts['show_time'] ) : ?>
-					<span class="give-donor__timestamp">
-						<?php echo esc_html( give_get_formatted_date( $donation['donation_date'], give_date_format(), 'Y-m-d H:i:s', true ) ); ?>
-					</span>
-				<?php endif; ?>
-			</div>
-		</div>
-
-		<?php
-		if (
-			true === $atts['show_comments']
-			&& absint( $atts['comment_length'] )
-			&& ! empty( $donation['donor_comment'] )
-			&& ! $donation['_give_anonymous_donation']
-		) :
-			?>
-			<div class="give-donor__content">
-				<?php
-				$comment     = trim( $donation['donor_comment'] );
-				$total_chars = strlen( $comment );
-				$max_chars   = $atts['comment_length'];
-
-				// A truncated excerpt is displayed if the comment is too long.
-				if ( $max_chars < $total_chars ) {
-					$excerpt    = '';
-					$offset     = -( $total_chars - $max_chars );
-					$last_space = strrpos( $comment, ' ', $offset );
-
-					if ( $last_space ) {
-						// Truncate excerpt at last space before limit.
-						$excerpt = substr( $comment, 0, $last_space );
-					} else {
-						// There are no spaces, so truncate excerpt at limit.
-						$excerpt = substr( $comment, 0, $max_chars );
-					}
-
-					$excerpt = trim( $excerpt, '.!,:;' );
-
-					echo sprintf(
-						'<p class="give-donor__excerpt">%s&hellip;<span> <a class="give-donor__read-more">%s</a></span></p>',
-						nl2br( esc_html( $excerpt ) ),
-						esc_html( $atts['readmore_text'] )
-					);
-				}
-
-				echo sprintf(
-					'<p class="give-donor__comment">%s</p>',
-					nl2br( esc_html( $comment ) )
-				);
-				?>
-			</div>
-		<?php endif; ?>
-	</div>
+                <?php
+                    $donation_total =  give_donation_amount( $donation['donation_id'], true );
+                    $donation_amount = esc_html(substr($donation_total, 0, strpos($donation_total, ".")));
+
+                    if ($atts['show_total'] ){
+                        echo "
+                             <span class= 'give-donor-details__total' style='color: {$primary_color}'> $donation_amount </span>
+                        ";
+                    }
+               ?>
+                </div>
+            </div>
+        <?php
+        if ($atts['show_tributes'] && (isset( $donation['_give_tributes_first_name'] ) || isset( $donation['_give_tributes_Last_name']))) {
+
+            $tribute_message = esc_html($donation['_give_tributes_type']);
+            $honoree_first_name = esc_html($donation['_give_tributes_first_name']);
+            $honoree_last_name = esc_html($donation['_give_tributes_last_name']);
+
+            $honoree_full_name =
+                //Determine if a last name is available
+                $donation['_give_tributes_last_name'] ?
+                    //Remove full last name, and add as an initial.
+                    trim($honoree_first_name  . " " . strtoupper($honoree_last_name [0]) . "." ) :
+                    // Else add period at the end of first name
+                    trim($honoree_first_name) . ".";
+
+            echo
+                "<div class='give-donor-tribute' style='background-color: {$tribute_background_color} '>
+                    <span>
+                        <svg width='16' height='16' viewBox='0 0 16 16'  xmlns='http://www.w3.org/2000/svg' class='give-donor-tribute__svg'>
+                             <path fill='$primary_color' opacity='0.4' d='M11.9667 5.13998L11.8734 5.08665L10.9467 4.55332L9.0334 3.44665C8.44673 3.10665 7.5534 3.10665 6.96673 3.44665L5.0534 4.55332L4.12673 5.09332L4.00673 5.15998C2.8134 5.95998 2.7334 6.10665 2.7334 7.39332V10.4667C2.7334 11.7533 2.8134 11.9 4.0334 12.72L6.96673 14.4133C7.26007 14.5867 7.62673 14.6667 8.00007 14.6667C8.36673 14.6667 8.74007 14.5867 9.0334 14.4133L11.9934 12.7C13.1867 11.9 13.2667 11.7533 13.2667 10.4667V7.39332C13.2667 6.10665 13.1867 5.95998 11.9667 5.13998Z' fill='#15AE56'/>
+                             <path fill='$primary_color' d='M4.12671 5.09337L5.05338 4.55337L6.88004 3.50004L6.96671 3.44671C7.55337 3.10671 8.44671 3.10671 9.03338 3.44671L9.12004 3.50004L10.9467 4.55337L11.8734 5.08671V3.66004C11.8734 2.16004 11.0467 1.33337 9.54671 1.33337H6.44671C4.94671 1.33337 4.12671 2.16004 4.12671 3.66004V5.09337Z' fill='#15AE56'/>
+                             <path fill='$primary_color' d='M9.89333 8.89327L9.47999 9.39994C9.41333 9.47327 9.36666 9.61994 9.37333 9.71994L9.41333 10.3733C9.43999 10.7733 9.15333 10.9799 8.77999 10.8333L8.17333 10.5933C8.07999 10.5599 7.91999 10.5599 7.82666 10.5933L7.21999 10.8333C6.84666 10.9799 6.55999 10.7733 6.58666 10.3733L6.62666 9.71994C6.63333 9.61994 6.58666 9.47327 6.51999 9.39994L6.10666 8.89327C5.84666 8.5866 5.95999 8.2466 6.34666 8.1466L6.97999 7.9866C7.07999 7.95994 7.19999 7.8666 7.25333 7.77994L7.60666 7.23327C7.82666 6.89327 8.17333 6.89327 8.39333 7.23327L8.74666 7.77994C8.79999 7.8666 8.91999 7.95994 9.01999 7.9866L9.65333 8.1466C10.04 8.2466 10.1533 8.5866 9.89333 8.89327Z' fill='#15AE56'/>
+                        </svg>
+                    </span>
+
+                    <span class='give-donor-tribute__message'>
+                        <span> $tribute_message </span>
+                        <span> $honoree_full_name </span>
+                    </span>
+                </div>";
+            }
+        ?>
+    </div>
 </div>
+
+

From 5d1befae278f518fd953d50e6069154de3ff6804 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Wed, 8 Jun 2022 23:21:47 +0530
Subject: [PATCH 39/53] Fix: validate donor before login to donor dashboard
 (#6441)

* format: fix typo

* fix: return donor id only if loggedin as wp user or email access

* format: improve code formatting

* fix: return donor loggedin status on basis of WP user or donor emaill access

* clarify wording

Make the wording highlight that this is a privacy feature.

Co-authored-by: Ben Meredith <ben.meredith@gmail.com>
---
 src/DonorDashboards/Helpers.php               | 24 ++++----
 .../Routes/Captcha/ProtectedRoute.php         | 25 ++++-----
 src/DonorDashboards/Routes/LogoutRoute.php    | 12 ++--
 .../Routes/VerifyEmailRoute.php               | 55 +++++++++----------
 src/DonorDashboards/Tabs/Contracts/Route.php  |  6 +-
 .../js/app/components/auth-modal/index.js     |  4 +-
 6 files changed, 60 insertions(+), 66 deletions(-)

diff --git a/src/DonorDashboards/Helpers.php b/src/DonorDashboards/Helpers.php
index 04afe98318..1f776729c5 100644
--- a/src/DonorDashboards/Helpers.php
+++ b/src/DonorDashboards/Helpers.php
@@ -32,17 +32,19 @@ public static function getCurrentDonorId()
             }
         }
 
-        if (
-            false !== give()->session->get_session_expiration() ||
-            true === give_get_history_session()
-        ) {
-            $email = give()->session->get('give_email');
-            $donor = give()->donors->get_donor_by('email', $email);
-            if ($donor) {
-                return $donor->id;
-            }
-        }
-
         return null;
     }
+
+    /**
+     * Retrieve donor logged in status
+     *
+     * @unreleased
+     */
+    public static function isDonorLoggedIn(): bool
+    {
+        return is_user_logged_in() || (
+                give_is_setting_enabled( give_get_option( 'email_access' ) ) &&
+                Give()->email_access->is_valid_token(Give()->email_access->get_token())
+        );
+    }
 }
diff --git a/src/DonorDashboards/Routes/Captcha/ProtectedRoute.php b/src/DonorDashboards/Routes/Captcha/ProtectedRoute.php
index 5c98b3afb4..1617a1f7d0 100644
--- a/src/DonorDashboards/Routes/Captcha/ProtectedRoute.php
+++ b/src/DonorDashboards/Routes/Captcha/ProtectedRoute.php
@@ -2,6 +2,8 @@
 
 namespace Give\DonorDashboards\Routes\Captcha;
 
+use WP_REST_Request;
+
 /**
  * Note: Functionality forked from `give_email_access_login()`.
  *
@@ -15,33 +17,26 @@ trait ProtectedRoute
      *
      * @return bool
      */
-    public function isCaptchaEnabled()
+    public function isCaptchaEnabled(): bool
     {
         $recaptcha_key = give_get_option('recaptcha_key');
         $recaptcha_secret = give_get_option('recaptcha_secret');
-        $recaptcha_enabled = (give_is_setting_enabled(
-            give_get_option('enable_recaptcha')
-        )) && ! empty($recaptcha_key) && ! empty($recaptcha_secret) ? true : false;
 
-        return $recaptcha_enabled;
+        return (give_is_setting_enabled(give_get_option('enable_recaptcha'))) &&
+            !empty($recaptcha_key) &&
+            !empty($recaptcha_secret);
     }
 
     /**
      * @since 2.10.2
-     *
-     * @param string $value
-     * @param WP_REST_Request $request
-     * @param string $param The name of the parameter.
-     *
-     * @return bool
      */
-    public function validateRecaptcha($value, $request, $param)
+    public function validateRecaptcha(string $value, WP_REST_Request $request, string $param): bool
     {
-        if ( ! $this->isCaptchaEnabled()) {
+        if (!$this->isCaptchaEnabled()) {
             return true;
         }
 
-        if ( ! $value) {
+        if (!$value) {
             return false;
         }
 
@@ -66,6 +61,6 @@ public function validateRecaptcha($value, $request, $param)
 
         $response = json_decode($request['body'], true);
 
-        return ! ! $response['success'];
+        return (bool)$response['success'];
     }
 }
diff --git a/src/DonorDashboards/Routes/LogoutRoute.php b/src/DonorDashboards/Routes/LogoutRoute.php
index 6ef37436c6..7044ba01c7 100644
--- a/src/DonorDashboards/Routes/LogoutRoute.php
+++ b/src/DonorDashboards/Routes/LogoutRoute.php
@@ -3,9 +3,11 @@
 namespace Give\DonorDashboards\Routes;
 
 use Give\API\RestRoute;
+use Give\DonorDashboards\Helpers as DonorDashboardHelpers;
 use WP_REST_Request;
 use WP_REST_Response;
 
+
 /**
  * @since 2.10.0
  */
@@ -40,10 +42,10 @@ public function registerRoute()
      *
      * @param WP_REST_Request $request
      *
-     * @return WP_REST_Request
+     * @return WP_REST_Response
      *
      */
-    public function handleRequest(WP_REST_Request $request)
+    public function handleRequest(WP_REST_Request $request): WP_REST_Response
     {
         // Check if WP user is logged in
         if (get_current_user_id() !== 0) {
@@ -83,11 +85,9 @@ public function handleRequest(WP_REST_Request $request)
 
     /**
      * Check permissions
-     *
-     * @return bool
      */
-    public function permissionsCheck()
+    public function permissionsCheck(): bool
     {
-        return Give()->session->get_session_expiration() !== false || is_user_logged_in();
+        return DonorDashboardHelpers::isDonorLoggedIn();
     }
 }
diff --git a/src/DonorDashboards/Routes/VerifyEmailRoute.php b/src/DonorDashboards/Routes/VerifyEmailRoute.php
index 8dcc8446b3..9fed6873c2 100644
--- a/src/DonorDashboards/Routes/VerifyEmailRoute.php
+++ b/src/DonorDashboards/Routes/VerifyEmailRoute.php
@@ -35,7 +35,6 @@ public function registerRoute()
                     'email' => [
                         'type' => 'string',
                         'required' => true,
-                        'sanitize_callback' => 'sanitize_text_field',
                     ],
                     'g-recaptcha-response' => [
                         'type' => 'string',
@@ -51,14 +50,12 @@ public function registerRoute()
      *
      * @since 2.10.0
      *
-     * @param WP_REST_Request $request
-     *
-     * @return array
+     * @return WP_REST_Response
      *
      */
     public function handleRequest(WP_REST_Request $request)
     {
-        if ( ! $this->validateRecaptcha(
+        if (!$this->validateRecaptcha(
             $request->get_param('g-recaptcha-response'),
             $request,
             'g-recaptcha-response'
@@ -102,40 +99,40 @@ public function handleRequest(WP_REST_Request $request)
                         ],
                     ]
                 );
-            } else {
-                $failedMessage = esc_html__('Unable to send email. Please try again.', 'give');
-
-                return new WP_REST_Response(
-                    [
-                        'status' => 400,
-                        'response' => 'error',
-                        'body_response' => [
-                            'error' => 'email_failed',
-                            'message' => $failedMessage,
-                        ],
-                    ]
-                );
             }
-        } else {
-            $value = Give()->email_access->verify_throttle / 60;
-            $spamMessage = (string)apply_filters(
-                'give_email_access_requests_exceed_notice',
-                sprintf(
-                    esc_html__('Email sent. If not received, make sure it is a valid donor email.', 'give'),
-                    sprintf(_n('%s minute', '%s minutes', $value, 'give'), $value)
-                ),
-                $value
-            );
+
+            $failedMessage = esc_html__('Unable to send email. Please try again.', 'give');
 
             return new WP_REST_Response(
                 [
                     'status' => 400,
                     'response' => 'error',
                     'body_response' => [
-                        'message' => $spamMessage,
+                        'error' => 'email_failed',
+                        'message' => $failedMessage,
                     ],
                 ]
             );
         }
+
+        $value = Give()->email_access->verify_throttle / 60;
+        $spamMessage = (string)apply_filters(
+            'give_email_access_requests_exceed_notice',
+            sprintf(
+                esc_html__('Email sent. If not received, make sure it is a valid donor email.', 'give'),
+                sprintf(_n('%s minute', '%s minutes', $value, 'give'), $value)
+            ),
+            $value
+        );
+
+        return new WP_REST_Response(
+            [
+                'status' => 400,
+                'response' => 'error',
+                'body_response' => [
+                    'message' => $spamMessage,
+                ],
+            ]
+        );
     }
 }
diff --git a/src/DonorDashboards/Tabs/Contracts/Route.php b/src/DonorDashboards/Tabs/Contracts/Route.php
index cf2747a940..14a23c3214 100644
--- a/src/DonorDashboards/Tabs/Contracts/Route.php
+++ b/src/DonorDashboards/Tabs/Contracts/Route.php
@@ -3,6 +3,7 @@
 namespace Give\DonorDashboards\Tabs\Contracts;
 
 use Give\API\RestRoute;
+use Give\DonorDashboards\Helpers as DonorDashboardHelpers;
 use Give\Log\Log;
 use WP_REST_Request;
 use WP_REST_Response;
@@ -12,7 +13,6 @@
  */
 abstract class Route implements RestRoute
 {
-
     /**
      * Returns string to complete Route endpoint
      * Full route will be donor-profile/{endpoint}
@@ -61,7 +61,7 @@ public function registerRoute()
                     'methods' => 'POST',
                     'callback' => [$this, 'handleRequestWithDonorIdCheck'],
                     'permission_callback' => function () {
-                        return is_user_logged_in() || Give()->session->get_session_expiration() !== false;
+                        return DonorDashboardHelpers::isDonorLoggedIn();
                     },
                 ],
                 'args' => $this->args(),
@@ -72,7 +72,7 @@ public function registerRoute()
     public function handleRequestWithDonorIdCheck(WP_REST_Request $request)
     {
         // Check that the provided donor ID is valid
-        if ( ! Give()->donors->get_donor_by('id', give()->donorDashboard->getId())) {
+        if (!Give()->donors->get_donor_by('id', give()->donorDashboard->getId())) {
             Log::error(
                 esc_html__('An error occurred while validating donor ID on request.', 'give'),
                 [
diff --git a/src/DonorDashboards/resources/js/app/components/auth-modal/index.js b/src/DonorDashboards/resources/js/app/components/auth-modal/index.js
index 89056acde0..7f54960989 100644
--- a/src/DonorDashboards/resources/js/app/components/auth-modal/index.js
+++ b/src/DonorDashboards/resources/js/app/components/auth-modal/index.js
@@ -81,7 +81,7 @@ const AuthModal = () => {
                     {loggedInWithoutDonor && (
                         <div className="give-donor-dashboard__auth-modal-notice">
                             {__(
-                                'The account you are currently logged into the site with does not have an associated donor dashboard. Donate now or contact the site administrator to associate this WordPress user with a donor dashboard.',
+                                'The account you are currently logged into the site with does not have any donations associated with it. Donate now or contact the site administrator to associate this WordPress user with an existing donor.',
                                 'give'
                             )}
                         </div>
@@ -90,7 +90,7 @@ const AuthModal = () => {
                         <Fragment>
                             <div className="give-donor-dashboard__auth-modal-instruction">
                                 {__(
-                                    "Enter your email below and we'll send you a link to access your donor dashboard",
+                                    "For privacy, enter the email address used to make a donation below and we'll send you a link to access your donor dashboard.",
                                     'give'
                                 )}
                             </div>

From 1c666368276588a44a31ab0c3694187adf0584dd Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Thu, 9 Jun 2022 09:31:07 +0530
Subject: [PATCH 40/53] feature: allow offsite redirect for recurring donations
 (#6446)

* feature: allow offsite redirect for recurring donations

* doc: add unrelesed tag
---
 src/Framework/PaymentGateways/PaymentGateway.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Framework/PaymentGateways/PaymentGateway.php b/src/Framework/PaymentGateways/PaymentGateway.php
index 9ca3ed290a..53c314d4cb 100644
--- a/src/Framework/PaymentGateways/PaymentGateway.php
+++ b/src/Framework/PaymentGateways/PaymentGateway.php
@@ -227,6 +227,7 @@ public function handleGatewayPaymentCommand(GatewayCommand $command, Donation $d
     /**
      * Handle gateway subscription command
      *
+     * @unreleased Handle RedirectOffsite response.
      * @since 2.18.0
      *
      * @throws TypeNotSupported
@@ -249,6 +250,12 @@ public function handleGatewaySubscriptionCommand(
             $this->handleResponse($response);
         }
 
+        if ($command instanceof RedirectOffsite) {
+            $response = Call::invoke(RedirectOffsiteHandler::class, $command);
+
+            $this->handleResponse($response);
+        }
+
         throw new TypeNotSupported(
             sprintf(
                 "Return type must be an instance of %s",

From ad830b1a146999c7be34d25ca4695f804d5ba0e6 Mon Sep 17 00:00:00 2001
From: Joshua Dinh <75056371+JoshuaHungDinh@users.noreply.github.com>
Date: Wed, 8 Jun 2022 21:30:56 -0700
Subject: [PATCH 41/53] Fix: Tool tabs display correctly (#6430)

* fix: add spacing to elements with conflicting styles

* fix: replace margin with padding

* style: remove specific padding on tabs

* style: reintroduce padding to component
---
 assets/src/css/admin/settings.scss                       | 1 +
 src/Views/Components/ListTable/ListTablePage.module.scss | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/src/css/admin/settings.scss b/assets/src/css/admin/settings.scss
index 2a80d11d64..324c8493ea 100644
--- a/assets/src/css/admin/settings.scss
+++ b/assets/src/css/admin/settings.scss
@@ -281,6 +281,7 @@ div.give-field-description {
 	font-size: 14px;
 }
 
+
 //--------------------------------------------------------------
 // Payment Gateways
 //--------------------------------------------------------------
diff --git a/src/Views/Components/ListTable/ListTablePage.module.scss b/src/Views/Components/ListTable/ListTablePage.module.scss
index 942f27b840..06bd7093fa 100644
--- a/src/Views/Components/ListTable/ListTablePage.module.scss
+++ b/src/Views/Components/ListTable/ListTablePage.module.scss
@@ -5,7 +5,6 @@
 
     .post-type-give_forms #wpbody {
         box-sizing: border-box;
-        padding-left: 0;
 
         & > a {
             text-decoration: underline
@@ -53,6 +52,7 @@
     background-color: #fff;
     padding-block: 1em;
     padding-inline: 1.5em;
+    margin-left: -20px;
     border-bottom: 0.0625rem solid #dbdbdb;
 
     & > * {
@@ -72,6 +72,7 @@
     margin: 0;
     font-size: 1.5rem;
     font-weight: 600;
+
 }
 
 .pageContent {
@@ -149,6 +150,7 @@
     background-color: rgba(248, 248, 248);
     padding-inline: 1.5em;
     padding-block: 1em;
+    margin: 0 -20px 0 -22px;
     border-bottom: 0.0625rem solid #dbdbdb;
 }
 

From d54be4c35c8e3342cc6d928697b6868419aa259c Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 10 Jun 2022 00:00:36 +0530
Subject: [PATCH 42/53] fix: use on_session enum for onetime stripe payment

---
 src/PaymentGateways/Gateways/Stripe/BECSGateway.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PaymentGateways/Gateways/Stripe/BECSGateway.php b/src/PaymentGateways/Gateways/Stripe/BECSGateway.php
index c123314a40..85ef617231 100644
--- a/src/PaymentGateways/Gateways/Stripe/BECSGateway.php
+++ b/src/PaymentGateways/Gateways/Stripe/BECSGateway.php
@@ -109,7 +109,7 @@ protected function getPaymentIntentArgs(): array
     {
         return [
             'payment_method_types' => [ 'au_becs_debit' ],
-            'setup_future_usage'   => 'off_session', // @TODO Is this correct? Maybe should be `on_session` - need to confirm.
+            'setup_future_usage'   => 'on_session',
             'mandate_data'         => [
                 'customer_acceptance' => [
                     'type'   => 'online',

From b7fbbcc3c83053cf08d8a694eb6e1ece9be3c37c Mon Sep 17 00:00:00 2001
From: "Kyle B. Johnson" <kjohnson@users.noreply.github.com>
Date: Tue, 14 Jun 2022 13:26:25 -0400
Subject: [PATCH 43/53] refactor: Remove Donor Wall REST API endpoint (#6451)

---
 includes/api/class-give-api-v2.php | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/includes/api/class-give-api-v2.php b/includes/api/class-give-api-v2.php
index fd51bf0122..d6970e201e 100644
--- a/includes/api/class-give-api-v2.php
+++ b/includes/api/class-give-api-v2.php
@@ -114,16 +114,6 @@ public function register_routes() {
 				'permission_callback' => '__return_true',
 			]
 		);
-
-		register_rest_route(
-			$this->rest_base,
-			'/donor-wall',
-			[
-				'methods'             => 'GET',
-				'callback'            => [ $this, 'get_donor_wall' ],
-				'permission_callback' => '__return_true',
-			]
-		);
 	}
 
 	/**
@@ -178,20 +168,6 @@ public function get_donation_grid( $request ) {
 		return give_form_grid_shortcode( $parameters );
 	}
 
-	/**
-	 * Rest fetch form data callback
-	 *
-	 * @param WP_REST_Request $request
-	 *
-	 * @access public
-	 * @return array|mixed|object
-	 */
-	public function get_donor_wall( $request ) {
-		$parameters = $request->get_params();
-
-		return Give_Donor_Wall::get_instance()->render_shortcode( $parameters );
-	}
-
 	/**
 	 * Get api reset url
 	 *

From 32feac585f5f42f8d78d9b2faf56d7f7188cc106 Mon Sep 17 00:00:00 2001
From: "Kyle B. Johnson" <kjohnson@users.noreply.github.com>
Date: Tue, 14 Jun 2022 13:27:13 -0400
Subject: [PATCH 44/53] feature: Check visibility before validating required.
 (#6268)

* feature: Check visibility before validating required.

* chore: Update tests.

* refactor: return false by default

* chore: add docblocks

* chore: format

* refactor: merge str_replace calls

* refactor: currency settings variable initialization

Co-authored-by: alaca <ante.laca@gmail.com>
---
 .../Actions/DetermineVisibilityForRequest.php | 140 ++++++++++++++++++
 .../Commands/SetupFieldValidation.php         |  27 +++-
 .../DetermineVisibilityForRequestTest.php     |  77 ++++++++++
 3 files changed, 239 insertions(+), 5 deletions(-)
 create mode 100644 src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
 create mode 100644 tests/unit/tests/Form/LegacyConsumer/Actions/DetermineVisibilityForRequestTest.php

diff --git a/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php b/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
new file mode 100644
index 0000000000..7f24dc6155
--- /dev/null
+++ b/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Give\Form\LegacyConsumer\Actions;
+
+use ArrayObject;
+use Give\Framework\FieldsAPI\Conditions\BasicCondition;
+use Give\Framework\FieldsAPI\Conditions\Condition;
+use Give\Framework\FieldsAPI\Field;
+use Give\ValueObjects\Money;
+
+/**
+ * @unreleased
+ */
+class DetermineVisibilityForRequest
+{
+    /** @var bool */
+    const IS_VISIBLE = true;
+
+    /** @var Field */
+    private $field;
+
+    /** @var ArrayObject */
+    protected $postData;
+
+    /**
+     * @unreleased
+     * @param Field $field
+     * @param array $postData
+     */
+    public function __construct(Field $field, array $postData)
+    {
+        $this->field = $field;
+        $this->postData = new ArrayObject($postData);
+    }
+
+    /**
+     * @unreleased
+     */
+    public function __invoke()
+    {
+        if (!$this->fieldHasVisibilityConditions()) {
+            return self::IS_VISIBLE;
+        }
+
+        $conditions = $this->field->getVisibilityConditions();
+        return array_reduce($conditions, [$this, 'reduceVisibility'], self::IS_VISIBLE);
+    }
+
+    /**
+     * @unreleased
+     * @return bool
+     */
+    protected function fieldHasVisibilityConditions()
+    {
+        return method_exists($this->field, 'hasVisibilityConditions')
+            && $this->field->hasVisibilityConditions();
+    }
+
+    /**
+     * @unreleased
+     * @param bool $visibility
+     * @param Condition $condition
+     * @return bool
+     */
+    protected function reduceVisibility($visibility, Condition $condition)
+    {
+        $result = $this->compareConditionWithOperator($condition);
+
+        return 'and' === $condition->boolean
+            ? $visibility && $result
+            : $visibility || $result;
+    }
+
+    /**
+     * @unreleased
+     * @param Condition $condition
+     * @return bool
+     */
+    protected function compareConditionWithOperator(Condition $condition)
+    {
+        if (is_a($condition, BasicCondition::class)) {
+            return $this->compareBasicConditionWithOperator($condition);
+        }
+
+        // @TODO Implement nested conditions.
+        return self::IS_VISIBLE;
+    }
+
+    /**
+     * @unreleased
+     * @param BasicCondition $condition
+     * @return bool
+     */
+    protected function compareBasicConditionWithOperator(BasicCondition $condition)
+    {
+        $conditionValue = $condition->value;
+        $comparisonValue = $this->postData[$condition->field];
+
+        if ('give-amount' === $condition->field) {
+            $conditionValue = $this->normalizeMinorAmount($conditionValue);
+            $comparisonValue = $this->normalizeMinorAmount($comparisonValue);
+        }
+
+        switch ($condition->operator) {
+            case '=':
+                return $comparisonValue === $conditionValue;
+            case '!=':
+                return $comparisonValue !== $conditionValue;
+            case '>':
+                return $comparisonValue > $conditionValue;
+            case '>=':
+                return $comparisonValue >= $conditionValue;
+            case '<':
+                return $comparisonValue < $conditionValue;
+            case '<=':
+                return $comparisonValue <= $conditionValue;
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * @unreleased
+     * @param $amount
+     * @return int
+     */
+    protected function normalizeMinorAmount($amount)
+    {
+        $currency = give_get_currency($this->postData['give-form-id']);
+        $settings = give_get_currencies('all')[$currency]['setting'];
+
+        $amount = str_replace(
+            [$settings['thousands_separator'], $settings['decimal_separator']],
+            ['', '.'],
+            $amount
+        );
+
+        return Money::of($amount, $currency)->getMinorAmount();
+    }
+}
diff --git a/src/Form/LegacyConsumer/Commands/SetupFieldValidation.php b/src/Form/LegacyConsumer/Commands/SetupFieldValidation.php
index b344d8ff30..7470026047 100644
--- a/src/Form/LegacyConsumer/Commands/SetupFieldValidation.php
+++ b/src/Form/LegacyConsumer/Commands/SetupFieldValidation.php
@@ -2,6 +2,7 @@
 
 namespace Give\Form\LegacyConsumer\Commands;
 
+use Give\Form\LegacyConsumer\Actions\DetermineVisibilityForRequest;
 use Give\Form\LegacyConsumer\Validators\FileUploadValidator;
 use Give\Framework\FieldsAPI\Field;
 use Give\Framework\FieldsAPI\File;
@@ -60,6 +61,10 @@ public function __invoke($hook)
      */
     public function validate(Field $field)
     {
+        if( ! $this->isFieldVisible( $field ) ) {
+            return;
+        }
+
         if ($field->getType() === Types::FILE) {
             // Are we processing donation form validation on ajax?
             if (isset($_POST['give_ajax'])) {
@@ -69,11 +74,13 @@ public function validate(Field $field)
             $validator = new FileUploadValidator($field);
             $validator();
         } elseif (in_array($field->getType(), Types::all(), true)) {
-            if ($field->isRequired() && ! isset($_POST[$field->getName()])) {
-                give_set_error(
-                    "give-{$field->getName()}-required-field-missing",
-                    $field->getRequiredError()['error_message']
-                );
+            if ( $field->isRequired() ) {
+                if( ! isset($_POST[$field->getName()]) || empty($_POST[$field->getName()]) ) {
+                    give_set_error(
+                        "give-{$field->getName()}-required-field-missing",
+                        $field->getRequiredError()['error_message']
+                    );
+                }
             }
 
             if (
@@ -102,4 +109,14 @@ public function validate(Field $field)
             do_action('give_fields_legacy_consumer_validate_field', $field, $this->formId);
         }
     }
+
+    /**
+     * @param Field $field
+     * @return bool
+     */
+    protected function isFieldVisible(Field $field)
+    {
+        $determineVisibilityAction = new DetermineVisibilityForRequest( $field, $_POST );
+        return $determineVisibilityAction->__invoke();
+    }
 }
diff --git a/tests/unit/tests/Form/LegacyConsumer/Actions/DetermineVisibilityForRequestTest.php b/tests/unit/tests/Form/LegacyConsumer/Actions/DetermineVisibilityForRequestTest.php
new file mode 100644
index 0000000000..47713fe062
--- /dev/null
+++ b/tests/unit/tests/Form/LegacyConsumer/Actions/DetermineVisibilityForRequestTest.php
@@ -0,0 +1,77 @@
+<?php
+
+use Give\Form\LegacyConsumer\Actions\DetermineVisibilityForRequest;
+use Give\Framework\FieldsAPI\Text;
+
+final class DetermineVisibilityForRequestTest extends Give_Unit_Test_Case
+{
+    public function testItDeterminesAFieldIsVisibleComparedToString()
+    {
+        $form = Give_Helper_Form::create_simple_form();
+        $requestData = [
+            'give-form-id' => $form->ID,
+            'give-amount' => '10.00',
+            'my_field' => 'test',
+            'my_other_field' => 'test'
+        ];
+
+        $field = new Text( 'my_field' );
+        $field->showIf('my_other_field', '=', 'test');
+
+        $action = new DetermineVisibilityForRequest( $field, $requestData );
+
+        $this->assertTrue( $action->__invoke() );
+    }
+
+    public function testItDeterminesAFieldIsNotVisibleComparedToString()
+    {
+        $form = Give_Helper_Form::create_simple_form();
+        $requestData = [
+            'give-form-id' => $form->ID,
+            'give-amount' => '10.00',
+            'my_field' => 'test',
+            'my_other_field' => 'nottest'
+        ];
+
+        $field = new Text( 'my_field' );
+        $field->showIf('my_other_field', '=', 'test');
+
+        $action = new DetermineVisibilityForRequest( $field, $requestData );
+
+        $this->assertFalse( $action->__invoke() );
+    }
+
+    public function testItDeterminesAFieldIsVisibleComparedToGiveAmount()
+    {
+        $form = Give_Helper_Form::create_simple_form();
+        $requestData = [
+            'give-form-id' => $form->ID,
+            'give-amount' => '10.00',
+            'my_field' => 'test',
+        ];
+
+        $field = new Text( 'my_field' );
+        $field->showIf('give-amount', '<', '100');
+
+        $action = new DetermineVisibilityForRequest( $field, $requestData );
+
+        $this->assertTrue( $action->__invoke() );
+    }
+
+    public function testItDeterminesAFieldIsNotVisibleComparedToGiveAmount()
+    {
+        $form = Give_Helper_Form::create_simple_form();
+        $requestData = [
+            'give-form-id' => $form->ID,
+            'give-amount' => '10.00',
+            'my_field' => 'test',
+        ];
+
+        $field = new Text( 'my_field' );
+        $field->showIf('give-amount', '>=', '100');
+
+        $action = new DetermineVisibilityForRequest( $field, $requestData );
+
+        $this->assertFalse( $action->__invoke() );
+    }
+}

From 27c25e977f5eb0c62f91c1b4d99d2dd0295c0655 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@impress.org>
Date: Wed, 15 Jun 2022 08:47:24 -0700
Subject: [PATCH 45/53] chore: do not include .map files in builds

---
 .distignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.distignore b/.distignore
index 15edd1340b..93e4a2634a 100644
--- a/.distignore
+++ b/.distignore
@@ -9,6 +9,7 @@
 /tests
 /node_modules
 /assets/src
+/assets/dist/**/*.map
 /vendor/bin
 /vendor/composer/installers
 /vendor/**/*.phar

From 3f8e73b586fde96a0b92ffdb8d570a77cd699e81 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Wed, 15 Jun 2022 21:32:53 +0530
Subject: [PATCH 46/53] feature: update default context for loggable exception
 (#6454)

* feature: update default context for loggable exception

Logging \Exception class object causes fatal error because backtrace data cause of infinite loop

* doc: add unreleased tag

* chore: Add unit test for Loggable Trait

* format: fix typo

* tests: use custom Exception class

* tests: check if Line array key exist in log context

Co-authored-by: Kyle B. Johnson <kyle.johnson@impress.org>
---
 src/Framework/Exceptions/Traits/Loggable.php  |  8 ++++-
 .../Exceptions/Traits/LoggableTest.php        | 30 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/tests/Framework/Exceptions/Traits/LoggableTest.php

diff --git a/src/Framework/Exceptions/Traits/Loggable.php b/src/Framework/Exceptions/Traits/Loggable.php
index 3f14882dfa..fa4109e54c 100644
--- a/src/Framework/Exceptions/Traits/Loggable.php
+++ b/src/Framework/Exceptions/Traits/Loggable.php
@@ -24,6 +24,7 @@ public function getLogMessage(): string
     /**
      * Returns an array with the basic context details
      *
+     * @unreleased Log meaningful data instead of entire exception object.
      * @since 2.11.1
      *
      * @return array
@@ -32,7 +33,12 @@ public function getLogContext(): array
     {
         return [
             'category' => 'Uncaught Exception',
-            'exception' => $this,
+            'exception' => [
+                'File' => basename($this->getFile()),
+                'Line' => $this->getLine(),
+                'Message' => $this->getMessage(),
+                'Code' => $this->getCode()
+            ]
         ];
     }
 }
diff --git a/tests/unit/tests/Framework/Exceptions/Traits/LoggableTest.php b/tests/unit/tests/Framework/Exceptions/Traits/LoggableTest.php
new file mode 100644
index 0000000000..7ef2b6e9a4
--- /dev/null
+++ b/tests/unit/tests/Framework/Exceptions/Traits/LoggableTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @unreleased
+ */
+class LoggableTest extends Give_Unit_Test_Case
+{
+    /**
+     * @unreleased
+     */
+    public function testExceptionHasContext()
+    {
+        $e = new MockLoggableException('This is a loggable exception.', 42);
+
+        $logContext = $e->getLogContext();
+
+        // @NOTE: Not asserting the logged exception "Line" because the value is coupled to the test code itself.
+        $this->assertEquals('LoggableTest.php', $logContext['exception']['File']);
+        $this->assertEquals('This is a loggable exception.', $logContext['exception']['Message']);
+        $this->assertEquals(42, $logContext['exception']['Code']);
+        $this->arrayHasKey('Line')->evaluate($logContext['exception']);
+    }
+}
+
+/**
+ * @unreleased
+ */
+class MockLoggableException extends \Give\Framework\Exceptions\Primitives\Exception
+{
+}

From d30963fe226d4f960319c77cda4a4e3ecc20fe87 Mon Sep 17 00:00:00 2001
From: Ante Laca <ante.laca@gmail.com>
Date: Wed, 15 Jun 2022 19:31:44 +0200
Subject: [PATCH 47/53] Changed: Form Grid block styles (#6397)

* fix: update sizing

* fix: adjust styles

* fix: remove element

* fix: update font size

* fix: update styles

* fix: update title size

* fix: update font

* refactor: update format

* fix: add backup font & remove width

* fix: update font to rem units

* fix: update font styles

* feature: add conditional styling

* refactor: fix style names

* fix: update styles

* fix: update various styles

* fix: add element

* fix: remove static form name

* refactor: clean up stylesheet

* fix: update styles

* fix: update size & spacing

* fix: update margin

* feature: add dynamic tribute names

* fix: conditionally render tribute infomation

* fix: update honoree tribute data

* feature: capitalize last name of honoree

* refactor: update class names

* fix: change minimum height

* fix: update specificity

* feature: add font color

* fix: semantically correct element

* fix: update margin

* fix: update margin

* feature: add conditional rendering for tribute messages

* feature: add tribute attribute defaults

* feature add toggle control for tribute messages

* feature: add tribute attribute to block registry and block parameters

* feature: include tribute attribute to be parsed and validated

* fix: update spacing between elements

* format: format style spacing

* fix: increase specificity to margin

* fix: remove style comment

* fix: update selector to load image

* fix: restructure elements

* fix: adjust styles to reflect new html structure

* fix: element structure

* fix: add various style changes

* fix: update html

* feature: add wrapper element

* feature: style wrapper element

* fix: change default comment length value

* fix: remove unnecessary styles

* fix: update element structure to reflect new designs

* fix: update styling to reflect full-width design

* feature: add classes to elements

* update font and progress bar size

* fix: adjust line-heights

* fix: update font-sizes

* fix: remove svg element

* feature: add and update fontsize according to typography calculations

* fix: update image size defaults

* fix: update default value to display forms

* fix: update default value for image sizes

* refactor: remove unnecessary elements

* fix: update font sizes and element spacing

* refactor: update class selector

* refactor: update default values

* fix: update class names

* refactor: update various styles

* fix: add margin to tributes

* fix: remove max width

* fix: update font styles & button background

* fix: add full height to images

* fix: update html

* feature: add color attribute

* feature: add Color Picker controls

* feature: register block color defaults

* feature: parse color attribute

* feature: style elements with color picker values

* feature: truncate form titles according to word count

* fix: display amount donated while show form is toggled off

* fix: remove color styles

* feature: conditionally display full form title

* feature: conditionally display amount donated

* feature: align form title

* fix: update styles

* fix: update column options

* fix: update column labels

* feature: add ColumnSelector

* feature: conditionally render column layouts

* fix: remove click handler on layout option

* fix: update layout styles to reflect design

* feature: add custom toggle options

* feature: add toggle option attributes

* feature: register and render block options with toggle options

* feature: update with toggle options

* feature: add toggle option component

* fix: remove background styling

* fix: rearrange panel options

* fix: correct attribute type

* feature: add conditional styling upon selection

* fix: update default toggle option

* fix: update toggle option values

* fix: update with new toggle option default values

* fix: correct option title name

* fix: use conditional styling based on values

* feature: add conditional toggles based on toggleOptions

* fix: remove unused controls

* fix: update with filter dropdown

* feature: add filter options

* feature: add filter attribute

* feature: add filter attribute to block

* feature: add custom filter component

* fix: update borders to match wp styles

* feature: update with Filter component

* fix: include hashtag for formID defaults

* feature: update component with selected option values

* fix: update with new styles

* fix: remove spaces

* fix: update formID defaults with hashtag

* fix: remove 4th column option

* feature: add select control for column options

* fix: tint tribute color

* feature: update svg color with color picker

* fix: remove time attribute

* fix: update the way gravitars are displayed

* chore: update true statements

* fix: update avatar size default value

* fix: adjust avatar size according to attribute value

* fix: update default avatar size

* fix: update comment excerpt with color attribute

* fix: remove best-fit column

* fix: update column attribute default

* fix: update column attribute default

* fix: reintroduce 4th column option

* fix: edit help text to reflect new grid

* fix: update formgrid column options

* fix: remove click events

* fix: remove commments

* fix: seperate select control from filter

* fix: remove styles

* fix: remove select control component & refactor props

* fix: update text controls with help text

* fix: update filter props

* fix: correct borders for non-gravatar users

* fix: replace Color Picker with Color Palette

* feature: add custom classnames for styling

* feature: add styles for labels

* fix: adjust spacing

* fix: clean up

* fix: allow users to read full comments

* fix: remove margin on some labels

* fix: remove trailing period space if honoree does not have a last name

* fix: update column help message

* fix: adjust line-height on select control components

* fix: remove trailing .00 from totals

* refactor: update form titles

* fix: update variables

* fix: change min-width of totals

* feature: add placeholder for number of donations

* fix: update styles for number of donations

* refactor: reduce complexity of tribute message

* fix: remove background color

* refactor: clean up spacing

* feature: update inspector controls

* feature: add filter options

* fix: update inspector controls

* fix: update with filter

* fix: update name values

* feature: add inspector control styles

* fix: update with FormTokenField

* fix: update filter

* fix: update filter function

* fix: update filter attribute

* fix: update filter

* fix: swap filter component for function

* fix: remove import

* fix: remove import and labels

* feature: update styles

* feature: add safe rem for font sizes

* feature: add change flex direction based on layout

* fix: update columns attribute default

* fix: update column attibute defaults

* fix: update fonts and element spacing

* fix: remove panel

* feature: add static tags with color

* fix: update styles

* fix: remove button background color

* feature: add tag background color attribute

* refactor: change button attributes to tags

* fix: change color palette settings

* fix: update with tags

* fix: change default fallback colors

* fix: update styles

* feature: add tag text color

* fix: update to use tag text color

* fix: update font styles

* feature: add dynamic tags

* feature: add number of donations

* fix: move show donate to display elements

* style: update tag styles with no image

* fix: remove console log

* feature: render seperate tags if no images are available

* fix: update form token field spacing

* style: update margin

* style: update styles

* fix: update toggle controls for progress bars

* fix: rearrange color palatte options

* fix: move tag elements into grid content

* fix: update header tag alignment for non tag donation forms

* style: update tag styles

* fix: remove element from percentage goal

* fix: add goal amount text

* fix: reintroduce imageSize & height controls

* fix: reintroduce show_pagination

* fix: add number of donations to goals

* fix: fix progress bar value outputs & displayed values

* chore: clean up spacing

* style: update header styles

* fix: remove image size help text

* feature: add conditional help messages for select controls

* fix: add styles for custom help messages

* fix: change pagination toggle placement

* feature: conditional image overlay based on tags

* style: update styles

* fix: image size attributes to adjust size

* fix: remove image styling

* style: update various styling

* fix: update pagination toggle control

* feature: add image height options

* fix: add classname to exclude forms

* feature: remove auto height images for full width columns

* feature: add styling for full width images

* fix: update styles for excluded forms

* fix: update defaults

* fix: update justify content

* fix: update images and tags

* fix: update filter

* fix: update where the progress bar color is coming from

* feature: pass progress bar color to function as arg

* feature: include progress bar color

* style: update

* fix: add progress bar color to shortcode attributes

* fix: check for if give tags are enabled and clean up

* fix: add gap between tags and derive container height from tags

* fix: update function with access to tag attribute colors

Co-authored-by: Joshua Dinh <josh@joshuadinh.tech>
Co-authored-by: Jason Adams <jason.adams@impress.org>
---
 assets/src/css/frontend/_card.scss            |   6 +-
 .../src/css/frontend/_components.donor.scss   |   1 -
 assets/src/css/frontend/form-grid.scss        | 124 ++++-
 assets/src/css/frontend/progress-bar.scss     |  80 ++--
 .../class-give-donation-form-grid-block.php   |  38 +-
 blocks/donation-form-grid/data/attributes.js  |  28 +-
 blocks/donation-form-grid/data/options.js     |  14 +
 blocks/donation-form-grid/edit/inspector.js   | 445 ++++++++++--------
 blocks/donation-form-grid/edit/style.scss     |  62 +++
 blocks/donor-wall/data/attributes.js          |  10 +-
 blocks/donor-wall/edit/inspector.js           |   7 +-
 includes/shortcodes.php                       |  10 +-
 src/Views/Admin/Form/FormGrid-Settings.php    |   2 +
 templates/shortcode-form-grid.php             | 272 +++++++----
 templates/shortcode-goal.php                  | 103 ++--
 15 files changed, 798 insertions(+), 404 deletions(-)
 create mode 100644 blocks/donation-form-grid/edit/style.scss

diff --git a/assets/src/css/frontend/_card.scss b/assets/src/css/frontend/_card.scss
index e4cab92984..8d715e33c9 100644
--- a/assets/src/css/frontend/_card.scss
+++ b/assets/src/css/frontend/_card.scss
@@ -9,9 +9,9 @@
 
 .give-card {
 	background-color: white;
-	border:  1px solid $give-card-border;
-	box-shadow: 0 1px 1px rgba( 0, 0, 0, 0.04 );
-	color: inherit;
+	border-radius: 8px;
+    box-shadow: 0px 0px 8px rgba(112, 111, 111, 0.25);
+    color: inherit;
 	display: flex;
 	flex-direction: column;
 	width: 100%;
diff --git a/assets/src/css/frontend/_components.donor.scss b/assets/src/css/frontend/_components.donor.scss
index b73690cdad..2da3a309fd 100644
--- a/assets/src/css/frontend/_components.donor.scss
+++ b/assets/src/css/frontend/_components.donor.scss
@@ -206,7 +206,6 @@ $donor-space-triple: $donor-space * 3;
             color: $donor-color;
             text-align: center;
 
-
             span:last-child {
                 font-weight: 600;
             }
diff --git a/assets/src/css/frontend/form-grid.scss b/assets/src/css/frontend/form-grid.scss
index 53cf3c8b91..0d615ba603 100644
--- a/assets/src/css/frontend/form-grid.scss
+++ b/assets/src/css/frontend/form-grid.scss
@@ -1,3 +1,125 @@
+@use "sass:string";
+
+$MIN_REM_SIZE: 16px;
+
+/**
+ * Safely use rem values in distributed code for unpredictable environments (e.g. for use inside a WordPress plugin).
+ *
+ * This does not support IE 11 and a few other outdated browser.
+ * A Sass mixin could be used to provide a fallback value for this.
+ *
+ * @param {Number} $value
+ * @return {String} e.g. for $value: 3 and $MIN_REM_SIZE: 16px => max(3rem, 48px)
+ */
+@function safe-rem($value) {
+    @return string.unquote("max(#{$value}rem, #{$value * $MIN_REM_SIZE})");
+}
+
+
+.give-form-grid {
+    display: flex;
+    height: 100%;
+
+    &-media {
+        position: relative;
+        min-width: 40%;
+        border-radius: 2px;
+
+        img {
+            min-width: 100%;
+            border-radius: 2px;
+            object-fit: cover;
+        }
+
+        &__tags {
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            display: flex;
+            align-items: center;
+            padding: 10px 16px;
+            border-radius: 2px;
+            gap: 10px;
+
+            > span {
+                padding: 4px 10px;
+                border-radius: 5px;
+                font-size: safe-rem(.975);
+                font-weight: 600;
+            }
+        }
+    }
+
+    &-container {
+        flex-grow: 1;
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+
+    }
+}
+
+#row-media {
+    max-width: 40%;
+    min-width: 40%;
+
+    img{
+        width: 100%;
+        min-height:100%;
+        border-radius: 2px;
+        object-fit: cover;
+    }
+}
+
+.give-form-grid-content {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: flex-start;
+    padding:  18px;
+
+    .give-form-grid-media__tags_no_image {
+        display: flex;
+        background: none;
+        margin-bottom: 12px;
+        border-radius: 2px;
+        gap: 10px;
+
+        > span {
+            padding: 4px 10px;
+            border-radius: 5px;
+            font-size: safe-rem(.975);
+            font-weight: 600;
+        }
+
+    }
+
+    & > h3 {
+        font-size: safe-rem(1.375) !important;
+        font-weight: 700 !important;
+        margin: 0 !important;
+    }
+
+    & > p {
+        font-size: 1rem;
+        font-weight: 400;
+    }
+
+    & > button {
+        background-color: transparent!important;
+        padding: 0;
+        border: none;
+        font-size: safe-rem(1);
+        font-weight: 400;
+        text-decoration: underline;
+        text-underline-offset: 5px;
+        cursor: pointer;
+
+    }
+}
+
 .give-form-grid-btn {
     justify-content: center;
     align-items: center;
@@ -8,7 +130,7 @@
     color: #fff;
     text-align: center;
     font-family: inherit;
-    font-size: 1.375rem;
+    font-size: safe-rem(1);
     font-weight: 600;
     line-height: 1.2;
 
diff --git a/assets/src/css/frontend/progress-bar.scss b/assets/src/css/frontend/progress-bar.scss
index fd42bfcdaf..0d6bc7cea9 100644
--- a/assets/src/css/frontend/progress-bar.scss
+++ b/assets/src/css/frontend/progress-bar.scss
@@ -7,38 +7,58 @@
  * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
 */
 
+
+
 .give-goal-progress {
-  margin-bottom: 20px;
-  clear:both;
-
-  .income {
-	font-size: 46px;
-	line-height: 48px;
-	letter-spacing: -1px;
-	color: #333;
-  }
-
-  .raised {
-	margin-bottom: 15px;
-  }
+    background: #F6F6F6;
+    padding: 16px 20px;
+}
+
+.raised {
+    display: flex;
+    justify-content: space-between;
+
+    &__details {
+        display: flex;
+        flex-direction: column;
+        font-size: 1rem;
+
+        & > span:first-child {
+            font-weight: 700 !important;
+            font-size: 1rem;
+        }
+
+        &  > span:last-child {
+            font-size: 14px;
+            font-weight: 400;
+
+        }
+
+        &_donations{
+            text-align: right;
+        }
+    }
+
 }
 
 .give-progress-bar {
-  height: 20px;
-  position: relative;
-  background: #EEE;
-  border-radius: 25px;
-  overflow: hidden;
-
-  > span {
-	display: block;
-	height: 100%;
-	border-top-right-radius: 8px;
-	border-bottom-right-radius: 8px;
-	border-top-left-radius: 20px;
-	border-bottom-left-radius: 20px;
-	background-color: rgb(43, 194, 83);
-	position: relative;
-	overflow: hidden;
-  }
+    position: relative;
+    height: 12px;
+    //background: #F1F1F1;
+    margin-bottom: 10px;
+    border-radius: 25px;
+
+    > span {
+        display: block;
+        height: 100%;
+        border-top-right-radius: 8px;
+        border-bottom-right-radius: 8px;
+        border-top-left-radius: 20px;
+        border-bottom-left-radius: 20px;
+        //background-color: rgb(43, 194, 83);
+        position: relative;
+        overflow: hidden;
+    }
 }
+
+
diff --git a/blocks/donation-form-grid/class-give-donation-form-grid-block.php b/blocks/donation-form-grid/class-give-donation-form-grid-block.php
index b698366c0a..84f66d038e 100644
--- a/blocks/donation-form-grid/class-give-donation-form-grid-block.php
+++ b/blocks/donation-form-grid/class-give-donation-form-grid-block.php
@@ -121,7 +121,7 @@ public function register_block() {
 					),
 					'columns'           => array(
 						'type'    => 'string',
-						'default' => 'best-fit',
+						'default' => '1',
 					),
                     'imageSize'           => array(
 						'type'    => 'string',
@@ -149,7 +149,7 @@ public function register_block() {
 					),
                     'showProgressBar'          => array(
                         'type'    => 'boolean',
-                        'default' => false,
+                        'default' => true,
                     ),
 					'showFeaturedImage' => array(
 						'type'    => 'boolean',
@@ -157,15 +157,19 @@ public function register_block() {
 					),
                     'showDonateButton' => array(
 						'type'    => 'boolean',
-						'default' => false,
+						'default' => true,
 					),
-                    'donateButtonBackgroundColor' => array(
+                    'tagBackgroundColor' => array(
 						'type'    => 'string',
-						'default' => '#66bb6a',
+						'default' => '#69b86b',
 					),
+                    'tagTextColor' => array(
+                        'type'    => 'string',
+                        'default' => '#ffffff',
+                    ),
                     'donateButtonTextColor' => array(
                         'type'    => 'string',
-                        'default' => '#fff',
+                        'default' => '#69b86b',
                     ),
 					'displayType'       => array(
 						'type'    => 'string',
@@ -175,6 +179,18 @@ public function register_block() {
                         'type'    => 'boolean',
                         'default' => true,
                     ),
+                    'filter'       => array(
+                        'type'    => 'string',
+                        'default' => 'tags',
+                    ),
+                    'imageHeightOptions'       => array(
+                        'type'    => 'string',
+                        'default' => 'auto',
+                    ),
+                    'progressBarColor'  => array(
+                        'type' => 'string',
+                        'default' => '#69b86b'
+                    )
 				),
 			)
 		);
@@ -205,13 +221,17 @@ public function render_block( $attributes ) {
             'excerpt_length'      => $attributes['excerptLength'],
 			'show_featured_image' => $attributes['showFeaturedImage'],
 			'show_donate_button'  => $attributes['showDonateButton'],
-			'donate_button_background_color' => $attributes['donateButtonBackgroundColor'],
-			'donate_button_text_color' => $attributes['donateButtonTextColor'],
+			'tag_background_color' => $attributes['tagBackgroundColor'],
+            'tag_text_color' => $attributes['tagTextColor'],
+            'donate_button_text_color' => $attributes['donateButtonTextColor'],
 			'display_style'       => $attributes['displayType'],
             'paged'               => $attributes['paged'],
             'image_size'          => $attributes['imageSize'],
             'image_height'        => $attributes['imageHeight'],
-		);
+            'filter'              => $attributes['filter'],
+            'image_height_options' => $attributes['imageHeightOptions'],
+            'progress_bar_color'  => $attributes['progressBarColor']
+        );
 
 		$html = give_form_grid_shortcode( $parameters );
 		$html = ! empty( $html ) ? $html : $this->blank_slate();
diff --git a/blocks/donation-form-grid/data/attributes.js b/blocks/donation-form-grid/data/attributes.js
index 2bdd1dc463..8afda399cb 100644
--- a/blocks/donation-form-grid/data/attributes.js
+++ b/blocks/donation-form-grid/data/attributes.js
@@ -41,7 +41,7 @@ const blockAttributes = {
 	},
 	columns: {
 		type: 'string',
-		default: 'best-fit',
+		default: '1',
 	},
     imageSize: {
         type: 'string',
@@ -50,6 +50,10 @@ const blockAttributes = {
     imageHeight: {
         type: 'string',
         default: 'auto',
+    },
+    imageHeightOptions: {
+        type: 'string',
+        default: 'auto',
     },
 	showTitle: {
 		type: 'boolean',
@@ -65,7 +69,7 @@ const blockAttributes = {
 	},
     showProgressBar: {
         type: 'boolean',
-        default: false,
+        default: true,
     },
 	showFeaturedImage: {
 		type: 'boolean',
@@ -73,15 +77,19 @@ const blockAttributes = {
 	},
     showDonateButton: {
 		type: 'boolean',
-		default: false,
+		default: true,
 	},
-    donateButtonBackgroundColor: {
+    tagBackgroundColor: {
 		type: 'string',
-		default: '#66bb6a',
+		default: '#69b86b',
 	},
+    tagTextColor: {
+        type: 'string',
+        default: '#ffffff',
+    },
     donateButtonTextColor: {
 		type: 'string',
-		default: '#fff',
+		default: '#69b86b',
 	},
 	displayType: {
 		type: 'string',
@@ -91,6 +99,14 @@ const blockAttributes = {
         type: 'integer',
         default: 16
     },
+    filter: {
+        type: 'string',
+        default: 'tags',
+    },
+    progressBarColor: {
+        type: 'string',
+        default: '#69b86b'
+    }
 };
 
 export default blockAttributes;
diff --git a/blocks/donation-form-grid/data/options.js b/blocks/donation-form-grid/data/options.js
index 2d89c28078..7b920d3493 100644
--- a/blocks/donation-form-grid/data/options.js
+++ b/blocks/donation-form-grid/data/options.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n'
+import giveDonorWallOptions from "../../donor-wall/data/options";
 
 /**
  * Options data for various form selects
@@ -40,4 +41,17 @@ giveFormOptions.displayType = [
 	{ value: 'modal_reveal', label: __( 'Modal', 'give' ) },
 ];
 
+//Filter
+giveFormOptions.filter = [
+    { value: 'formIDs', label: __( 'Form ID', 'give' ) },
+    { value: 'categories', label: __( 'Categories', 'give' ) },
+    { value: 'tags', label: __( 'Tags', 'give' ) },
+];
+
+//Image Height
+giveFormOptions.imageHeight = [
+    { value: 'auto', label: __( 'Auto', 'give' ) },
+    { value: 'custom', label: __( 'Custom', 'give' ) },
+]
+
 export default giveFormOptions;
diff --git a/blocks/donation-form-grid/edit/inspector.js b/blocks/donation-form-grid/edit/inspector.js
index 358ef700fb..012e177c5a 100644
--- a/blocks/donation-form-grid/edit/inspector.js
+++ b/blocks/donation-form-grid/edit/inspector.js
@@ -3,23 +3,25 @@
  */
 import {__} from '@wordpress/i18n'
 import { select } from '@wordpress/data';
-import {InspectorControls, store } from '@wordpress/block-editor';
+import {InspectorControls, PanelColorSettings, store } from '@wordpress/block-editor';
 import {
     ColorPalette,
-    FormTokenField,
+    FormTokenField, Panel,
     PanelBody,
     SelectControl,
     TextControl,
-    ToggleControl
+    ToggleControl,
 } from '@wordpress/components';
 
-import ColumnSelector from '../../components/column-selector';
 
 /**
  * Internal dependencies
  */
 import giveFormOptions from '../data/options';
-import giveDonorWallOptions from "../../donor-wall/data/options";
+
+import ColumnSelector from '../../components/column-selector';
+
+import './style.scss'
 
 /**
  * Render Inspector Controls
@@ -46,9 +48,13 @@ const Inspector = ({attributes, setAttributes}) => {
         showProgressBar,
         showFeaturedImage,
         showDonateButton,
-        donateButtonBackgroundColor,
+        tagBackgroundColor,
         donateButtonTextColor,
-        displayType
+        displayType,
+        filter,
+        tagTextColor,
+        imageHeightOptions,
+        progressBarColor
     } = attributes;
 
     const saveSetting = (name, value) => {
@@ -77,213 +83,260 @@ const Inspector = ({attributes, setAttributes}) => {
         };
     });
 
-    return (
-        <InspectorControls key="inspector">
-            <PanelBody title={__('Display Appearance', 'give')}>
-                <ColumnSelector
-                    label={__('Columns', 'give')}
-                    selected={columns}
-                    onClick={(value) => saveSetting('columns', value)}
-                    help={__('Controls how many columns of the Form Grid appear. "Best Fit" will adjust responsively to the space available.', 'give')}
-                />
-                <SelectControl
-                    label={ __( 'Columns', 'give' ) }
-                    name="columns"
-                    value={ columns }
-                    options={ giveFormOptions.columns }
-                    onChange={ ( value ) => saveSetting( 'columns', value ) } />
-                <ToggleControl
-                    name="showTitle"
-                    label={__('Show Title', 'give')}
-                    checked={!!showTitle}
-                    onChange={(value) => saveSetting('showTitle', value)}/>
+    const handleImageOptions = (value) => {
+        saveSetting('imageHeightOptions', value)
+        saveSetting('imageHeight', value)
+    }
+
+  const filterValue = () => {
+      if (filter === 'categories') {
+        return  <>
+            <FormTokenField
+                className="give-form-grid-inspector__filter"
+                name="categories"
+                value={getAsArray(categories)}
+                onChange={(value) => saveSetting('categories', value)}
+            />
 
-                <ToggleControl
-                    name="showExcerpt"
-                    label={__('Show Excerpt', 'give')}
-                    checked={!!showExcerpt}
-                    onChange={(value) => saveSetting('showExcerpt', value)}
-                />
+            <p className="components-form-token-field__help">
+                {__('Type the name of your category to add it to the list. Only forms within the categories you choose will be displayed in this grid.', 'give')}
+            </p>
+        </>
+      } else if (filter === 'tags') {
+          return <>
+              <FormTokenField
+                  className="give-form-grid-inspector__filter"
+                  name="tags"
+                  value={getAsArray(tags)}
+                  onChange={(value) => saveSetting('tags', value)}
+              />
 
-                <TextControl
-                    name="excerptLength"
-                    label={__('Excerpt Length', 'give')}
-                    value={excerptLength || ''}
-                    className={!showExcerpt && 'hidden'}
-                    onChange={(value) => saveSetting('excerptLength', Number.parseInt(value) || 0)}
-                />
+              <p className="components-form-token-field__help">
+                  {__('Type the name of your tag to add it to the list. Only forms with these tags you choose will be displayed in this grid.', 'give')}
+              </p></>
+      } else if (filter === 'formIDs'){
+          return <>
+              <FormTokenField
+                  className="give-form-grid-inspector__filter"
+                  name="formIDs"
+                  value={getAsArray(formIDs)}
+                  onChange={(value) => saveSetting('formIDs', value)}
+              />
 
-                <ToggleControl
-                    name="showGoal"
-                    label={__('Show Goal', 'give')}
-                    checked={!!showGoal}
-                    onChange={(value) => saveSetting('showGoal', value)}
-                />
+              <p className="components-form-token-field__help">
+                  {__('Type the ID of your form to add it to the list. Only forms with these IDs you choose will be displayed in this grid.', 'give')}
+              </p></>
+      }
+  }
 
-                {showGoal && (
+    return (
+        <InspectorControls key="inspector">
+            <Panel>
+                <PanelBody title= {__('Layout', 'give')} initialOpen={ true }>
+                    <ColumnSelector
+                        label={__('Columns', 'give')}
+                        selected={columns}
+                        onClick={(value) => saveSetting('columns', value)}
+                        help={__('Controls how many columns of the Form Grid appear. "Best Fit" will adjust responsively to the space available.', 'give')}
+                    />
+                    <SelectControl
+                        label={ __( 'Columns', 'give' ) }
+                        name="columns"
+                        value={ columns }
+                        options={ giveFormOptions.columns }
+                        onChange={ ( value ) => saveSetting( 'columns', value ) } />
+                </PanelBody>
+            </Panel>
+            <Panel>
+                <PanelBody title= {__('Display Elements', 'give')} initialOpen={ true }>
                     <ToggleControl
+                        className="give-form-grid-inspector"
+                        name="showTitle"
+                        label={__('Show Title', 'give')}
+                        checked={!!showTitle}
+                        onChange={(value) => saveSetting('showTitle', value)}/>
+                    <ToggleControl
+                        className="give-form-grid-inspector"
+                        name="showGoal"
+                        label={__('Show Goal', 'give')}
+                        checked={!!showGoal}
+                        onChange={(value) => saveSetting('showGoal', value)}
+                    />
+                    <ToggleControl
+                        className="give-form-grid-inspector"
+                        name="showExcerpt"
+                        label={__('Show Excerpt', 'give')}
+                        checked={!!showExcerpt}
+                        onChange={(value) => saveSetting('showExcerpt', value)}
+                    />
+                    <ToggleControl
+                        className="give-form-grid-inspector"
                         name="showProgressBar"
                         label={__('Show Progress Bar', 'give')}
                         checked={!!showProgressBar}
                         onChange={(value) => saveSetting('showProgressBar', value)}
                     />
-                )}
-
-                <ToggleControl
-                    align="right"
-                    name="showFeaturedImage"
-                    label={__('Show Featured Image', 'give')}
-                    checked={!!showFeaturedImage}
-                    onChange={(value) => saveSetting('showFeaturedImage', value)}
-                />
-
-                {showFeaturedImage && (
-                    <>
-                        <SelectControl
-                            name="imageSize"
-                            label={__('Image Size', 'give')}
-                            value={imageSize}
-                            options={getImageSizes()}
-                            onChange={(value) => saveSetting('imageSize', value)}
-                            help={__('Featured image size. Default "medium." Accepts WordPress image sizes, which by default are "thumbnail," "medium," "large," or "full." ', 'give')}
-                        />
-
-                        <TextControl
-                            name="imageHeight"
-                            label={__('Image Height', 'give')}
-                            value={imageHeight}
-                            onChange={(value) => saveSetting('imageHeight', value)}
-                            help={__('Featured image height. Default "auto". Accepts valid heights in px, em, or rem.', 'give')}
-                        />
-                    </>
-                )}
-
-                <ToggleControl
-                    name="showDonateButton"
-                    label={__('Show Donate Button', 'give')}
-                    checked={!!showDonateButton}
-                    onChange={(value) => saveSetting('showDonateButton', value)}
-                />
-                {showDonateButton && (
-                    <>
-                        <p>
-                            {__('Donate Button Background Color', 'give')}
-                        </p>
-                        <ColorPalette
-                            clearable={false}
-                            onChange={(value) => saveSetting('donateButtonBackgroundColor', value)}
-                            value={donateButtonBackgroundColor}
-                        />
-                        <p>
-                            {__('Donate Button Text Color', 'give')}
-                        </p>
-                        <ColorPalette
-                            clearable={false}
-                            onChange={(value) => saveSetting('donateButtonTextColor', value)}
-                            value={donateButtonTextColor}
-                        />
-                    </>
-                )}
-            </PanelBody>
-
-            <PanelBody title={__('Filters and Categories', 'give')}>
-
-                <SelectControl
-                    label={__('Order By', 'give')}
-                    name="orderBy"
-                    value={orderBy}
-                    options={giveFormOptions.orderBy}
-                    onChange={(value) => saveSetting('orderBy', value)}
-                    help={__('The order forms are displayed in.', 'give')}
-                />
-
-                <SelectControl
-                    label={__('Order', 'give')}
-                    name="order"
-                    value={order}
-                    options={giveFormOptions.order}
-                    onChange={(value) => saveSetting('order', value)}
-                    help={__('Whether the order ascends or descends.', 'give')}
-                />
-
-                <FormTokenField
-                    name="categories"
-                    label={__('Categories', 'give')}
-                    value={getAsArray(categories)}
-                    onChange={(value) => saveSetting('categories', value)}
-                />
+                    <ToggleControl
+                        className="give-form-grid-inspector"
+                        name="showDonateButton"
+                        label={__('Show Donate Button', 'give')}
+                        checked={!!showDonateButton}
+                        onChange={(value) => saveSetting('showDonateButton', value)}
+                    />
+                    <ToggleControl
+                        className="give-form-grid-inspector"
+                        align="right"
+                        name="showFeaturedImage"
+                        label={__('Show Featured Image', 'give')}
+                        checked={!!showFeaturedImage}
+                        onChange={(value) => saveSetting('showFeaturedImage', value)}
+                    />
+                    {showFeaturedImage && (
+                        <>
+                            <SelectControl
+                                className="give-form-grid-inspector"
+                                name="imageSize"
+                                label={__('Image Size', 'give')}
+                                value={imageSize}
+                                options={getImageSizes()}
+                                onChange={(value) => saveSetting('imageSize', value)}
+                            />
+                            <SelectControl
+                                className="give-form-grid-inspector"
+                                name="imageHeightOptions"
+                                label={__('Image Height', 'give')}
+                                value={imageHeightOptions}
+                                options={giveFormOptions.imageHeight}
+                                onChange={(value) => handleImageOptions(value)}
+                            />
 
-                <p className="components-form-token-field__help">
-                    {__('Type the name of your category to add it to the list. Only forms within the categories you choose will be displayed in this grid.', 'give')}
-                </p>
+                            {imageHeightOptions === 'custom' && <TextControl
+                                className="give-form-grid-inspector__filter"                                    name="imageHeight"
+                                    value={imageHeight}
+                                    onChange={(value) => saveSetting('imageHeight', value)}
+                                    help={__('Featured image height. Default "auto". Accepts valid heights in px, em, or rem.', 'give')}/>
+                            }
+                        </>
+                    )}
+                </PanelBody>
+            </Panel>
+            <Panel>
+                <PanelBody title= {__('Grid Settings', 'give')} initialOpen={ true }>
+                    <SelectControl
+                        className="give-form-grid-inspector"
+                        label={__('Order By', 'give')}
+                        name="orderBy"
+                        value={orderBy}
+                        options={giveFormOptions.orderBy}
+                        onChange={(value) => saveSetting('orderBy', value)}
+                        help={__('The order forms are displayed in.', 'give')}
+                    />
 
-                <FormTokenField
-                    name="tags"
-                    label={__('Tags', 'give')}
-                    value={getAsArray(tags)}
-                    onChange={(value) => saveSetting('tags', value)}
-                />
+                    <SelectControl
+                        className="give-form-grid-inspector"
+                        label={__('Order', 'give')}
+                        name="order"
+                        value={order}
+                        options={giveFormOptions.order}
+                        onChange={(value) => saveSetting('order', value)}
+                        help={__('Whether the order ascends or descends.', 'give')}
+                    />
+                    <SelectControl
+                        className="give-form-grid-inspector"
+                        label={ __( 'Filter', 'give' ) }
+                        name="filter" value={filter}
+                        options={ giveFormOptions.filter }
+                        onChange={ ( value ) => saveSetting( 'filter', value ) } />
 
-                <p className="components-form-token-field__help">
-                    {__('Type the name of your tag to add it to the list. Only forms with these tags you choose will be displayed in this grid.', 'give')}
-                </p>
+                    {filterValue(filter)}
 
-                <FormTokenField
-                    name="formIDs"
-                    label={__('Form IDs', 'give')}
-                    value={getAsArray(formIDs)}
-                    onChange={(value) => saveSetting('formIDs', value)}
-                />
+                    <ToggleControl
+                        className="give-form-grid-inspector  exclude__form"
+                        name="excludeForms"
+                        label={__('Exclude specific forms?', 'give')}
+                        checked={!!excludeForms}
+                        onChange={(value) => saveSetting('excludeForms', value)}
+                    />
 
-                <p className="components-form-token-field__help">
-                    {__('Type the ID of your form to add it to the list. Only forms with these IDs you choose will be displayed in this grid.', 'give')}
-                </p>
+                    {excludeForms && (
+                        <>
+                            <FormTokenField
+                                name="excludedFormIDs"
+                                label={__('Excluded Form IDs', 'give')}
+                                value={getAsArray(excludedFormIDs)}
+                                onChange={(value) => saveSetting('excludedFormIDs', value)}
+                            />
+                            <p className="components-form-token-field__help">
+                                {__('Type the ID of your form to exclude it from the list. Forms with these IDs you choose will not be displayed in this grid.', 'give')}
+                            </p>
+                        </>
+                    )}
+                </PanelBody>
+            </Panel>
+            <Panel>
+                <PanelBody title= {__('Grid Interaction', 'give')} initialOpen={ true }>
+                    <SelectControl
+                        className="give-form-grid-inspector"
+                        label={__('Display Type', 'give')}
+                        name="displayType"
+                        value={displayType}
+                        options={giveFormOptions.displayType}
+                        onChange={(value) => saveSetting('displayType', value)}
+                    />
+                    {displayType === 'redirect' ?
+                        <p className="give-form-grid-inspector__help">
+                            {__('Users will be redirected to the donation form page.', 'give')}
+                        </p> :
+                        <p className="give-form-grid-inspector__help">
+                            {__('Modal with the donation form will be displayed on the same page.', 'give')}
+                        </p>
+                    }
+                    <TextControl
+                        className="give-form-grid-inspector"
+                        name="formsPerPage"
+                        label={__('Forms Per Page', 'give')}
+                        value={formsPerPage}
+                        onChange={(value) => saveSetting('formsPerPage', value)}
+                        help={__('Sets the number of forms to be displayed on the first page load.', 'give')}
+                    />
+                    <ToggleControl
+                        className="give-form-grid-inspector"
+                        name="paged"
+                        label={__('Show Pagination', 'give')}
+                        checked={!!paged}
+                        onChange={(value) => saveSetting('paged', value)}
+                        help={__('Enable form display to multiple pages.', 'give')}
+                    />
+                </PanelBody>
+            </Panel>
+            <PanelColorSettings
+                title={ __( 'Color Settings' ) }
+                colorSettings={ [
+                    {
+                        value: tagBackgroundColor
+,                       onChange: (value) => saveSetting('tagBackgroundColor', value),
+                        label: __('Tag Background Color', 'give')
 
-                <ToggleControl
-                    name="excludeForms"
-                    label={__('Exclude specific forms?', 'give')}
-                    checked={!!excludeForms}
-                    onChange={(value) => saveSetting('excludeForms', value)}
-                />
+                    },
+                    {
+                        value: tagTextColor,
+                        onChange: (value) => saveSetting('tagTextColor', value),
+                        label: __('Tag Text Color', 'give')
+                    },
+                    {
+                        value: donateButtonTextColor,
+                        onChange: (value) => saveSetting('donateButtonTextColor', value),
+                        label: __('Donate Button Text Color', 'give')
+                    },
+                    {
+                        value: progressBarColor,
+                        onChange: (value) => saveSetting('progressBarColor', value),
+                        label: __('Progress Bar Color', 'give')
+                    },
 
-                {excludeForms && (
-                    <>
-                        <FormTokenField
-                            name="excludedFormIDs"
-                            label={__('Excluded Form IDs', 'give')}
-                            value={getAsArray(excludedFormIDs)}
-                            onChange={(value) => saveSetting('excludedFormIDs', value)}
-                        />
-                        <p className="components-form-token-field__help">
-                            {__('Type the ID of your form to exclude it from the list. Forms with these IDs you choose will not be displayed in this grid.', 'give')}
-                        </p>
-                    </>
-                )}
-            </PanelBody>
+                ] }
+            />
 
-            <PanelBody title={__('Grid Behavior', 'give')}>
-                <SelectControl
-                    label={__('Display Type', 'give')}
-                    name="displayType"
-                    value={displayType}
-                    options={giveFormOptions.displayType}
-                    onChange={(value) => saveSetting('displayType', value)}
-                    help={__('What should happen when a visitor clicks on a form within the grid? "Redirect" sends them to the individual form. "Modal" opens the form in a lightbox/popup on the same page.', 'give')}
-                />
-                <TextControl
-                    name="formsPerPage"
-                    label={__('Forms Per Page', 'give')}
-                    value={formsPerPage}
-                    onChange={(value) => saveSetting('formsPerPage', value)}
-                    help={__('How many forms should display on the first page load? To restrict display to only one page, disable pagination below.', 'give')}
-                />
-                <ToggleControl
-                    name="paged"
-                    label={__('Show Pagination', 'give')}
-                    checked={!!paged}
-                    onChange={(value) => saveSetting('paged', value)}
-                />
-            </PanelBody>
         </InspectorControls>
     );
 };
diff --git a/blocks/donation-form-grid/edit/style.scss b/blocks/donation-form-grid/edit/style.scss
new file mode 100644
index 0000000000..f95f3439a3
--- /dev/null
+++ b/blocks/donation-form-grid/edit/style.scss
@@ -0,0 +1,62 @@
+.give-form-grid-inspector{
+    flex-direction: row !important;
+    align-items: center !important;
+    justify-content: space-between !important;
+
+    &__filter {
+        margin-top: -18px !important;
+    }
+
+    &__help {
+        font-size: 0.75rem;
+        color: rgb(117, 117, 117);
+        font-style: normal;
+        margin: -15px  0 15px 0 !important;
+    }
+
+
+
+    .components-base-control__label {
+        margin: 0 !important;
+    }
+
+    .components-base-control__field {
+        display: flex !important;
+        flex-direction: row!important;
+        align-items: center !important;
+        justify-content: space-between !important;
+
+        .components-text-control__input {
+            flex: .7 !important;
+        }
+    }
+
+    .components-flex-item {
+        display: flex !important;
+        align-items: center !important;
+        justify-content: center !important;
+
+        .components-input-control__label{
+            flex: 1 !important;
+            margin: 0 !important;
+        }
+    }
+
+    .components-input-control__container {
+        max-width: 135px !important;
+
+            > select {
+                line-height: 1.2 !important;
+            }
+        }
+    }
+
+    .components-form-token-field{
+        label { display: none !important;}
+    }
+
+    .exclude__form {
+        margin-top: 20px !important;
+        border: 1px solid transparent;
+    }
+
diff --git a/blocks/donor-wall/data/attributes.js b/blocks/donor-wall/data/attributes.js
index 991477877d..ef7af361ce 100644
--- a/blocks/donor-wall/data/attributes.js
+++ b/blocks/donor-wall/data/attributes.js
@@ -68,6 +68,10 @@ const blockAttributes = {
 		type: 'boolean',
 		default: true,
 	},
+    showTributes: {
+        type: 'boolean',
+        default: true,
+    },
 	showAnonymous: {
 		type: 'boolean',
 		default: true,
@@ -98,16 +102,12 @@ const blockAttributes = {
     },
     filter: {
         type: 'string',
-        default: 'formID',
+        default: 'Donor ID',
     },
     color: {
         type: 'string',
         default: '#219653',
     },
-    showTributes: {
-        type: 'boolean',
-        default: false,
-    }
 };
 
 export default blockAttributes;
diff --git a/blocks/donor-wall/edit/inspector.js b/blocks/donor-wall/edit/inspector.js
index 9cb856eb52..afdebb7fdd 100644
--- a/blocks/donor-wall/edit/inspector.js
+++ b/blocks/donor-wall/edit/inspector.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n'
+
 import {InspectorControls, ColorPalette,} from '@wordpress/block-editor';
 import {PanelBody, Panel, SelectControl, ToggleControl, TextControl, FormTokenField } from '@wordpress/components';
 
@@ -13,8 +14,8 @@ import giveDonorWallOptions from '../data/options';
 import ColumnSelector from '../../components/column-selector';
 import ToggleOptions from '../../components/toggle';
 
-
 import './style.scss'
+import Toggle from "../../components/toggle";
 
 /**
  * Render Inspector Controls
@@ -88,7 +89,6 @@ const Inspector = ( { attributes, setAttributes } ) => {
             </>
         }
     };
-
     return (
 		<InspectorControls key="inspector">
                 <Panel>
@@ -166,7 +166,6 @@ const Inspector = ( { attributes, setAttributes } ) => {
                                             label={ __( 'Show Tributes', 'give' ) }
                                             checked={ !! showTributes }
                                             onChange={ ( value ) => saveSetting( 'showTributes', value ) } />}
-
                                         <ToggleControl
                                             className="give-donor-wall-inspector"
                                             name="showComments"
@@ -223,7 +222,7 @@ const Inspector = ( { attributes, setAttributes } ) => {
                     </PanelBody>
                 </Panel>
                 <Panel>
-                    <PanelBody title= {__('Wall Interaction', 'give')} initialOpen={ false }>
+                    <PanelBody title= {__('Wall Interaction', 'give')} initialOpen={ true }>
                         <TextControl
                             className="give-donor-wall-inspector"
                             name="donorsPerPage"
diff --git a/includes/shortcodes.php b/includes/shortcodes.php
index 3712225afb..34ddbab014 100644
--- a/includes/shortcodes.php
+++ b/includes/shortcodes.php
@@ -814,20 +814,22 @@ function give_form_grid_shortcode( $atts ) {
 			'order'               => 'DESC',
 			'cats'                => '',
 			'tags'                => '',
-			'columns'             => 'best-fit',
+			'columns'             => '1',
 			'show_title'          => true,
 			'show_goal'           => true,
 			'show_bar'            => false,
 			'show_excerpt'        => true,
 			'show_featured_image' => true,
 			'show_donate_button'  => false,
-            'donate_button_text'  => '',
-			'donate_button_background_color' => '#66bb6a',
-			'donate_button_text_color' => '#fff',
+			'donate_button_text'  => '',
+			'tag_background_color' => '#66bb6a',
+            'tag_text_color'      => '#000000',
+            'donate_button_text_color' => '#fff',
 			'image_size'          => 'medium',
 			'image_height'        => 'auto',
 			'excerpt_length'      => 16,
 			'display_style'       => 'modal_reveal',
+            'progress_bar_color' => '#66bb6a',
 			'status'              => '', // open or closed.
 		],
 		$atts
diff --git a/src/Views/Admin/Form/FormGrid-Settings.php b/src/Views/Admin/Form/FormGrid-Settings.php
index aa88c43f37..9943dcc8e3 100644
--- a/src/Views/Admin/Form/FormGrid-Settings.php
+++ b/src/Views/Admin/Form/FormGrid-Settings.php
@@ -1,11 +1,13 @@
 <div class="form_grid_options_wrap inner-panel">
     <div class="form-template-introduction">
+
         <div class="form-template-notice">
             <img src="<?= esc_url(GIVE_PLUGIN_URL . 'assets/dist/images/admin/cap-books.svg'); ?>" alt=""/>
             <p>
                 <?php _e('What is the Form Grid?', 'give'); ?><br />
                 <?php _e('The GiveWP Form Grid provides a way to add a grid layout of multiple forms into posts and pages using either a block or shortcode.', 'give'); ?>
             </p>
+
             <a href="https://givewp.com/documentation/core/blocks/form-grid-block/" target="_blank">
                 <?= __('Learn More', 'give'); ?>
                 <svg viewbox="0 0 21 21" xmlns="http://www.w3.org/2000/svg">
diff --git a/templates/shortcode-form-grid.php b/templates/shortcode-form-grid.php
index a0162b756a..e80f33e05c 100644
--- a/templates/shortcode-form-grid.php
+++ b/templates/shortcode-form-grid.php
@@ -18,17 +18,54 @@
 $stripped_content = ''; // Form content stripped of HTML tags and shortcodes.
 $excerpt          = ''; // Trimmed form excerpt ready for display.
 
+$flex_direction = $atts['columns'] === '1' ? "row" : "column";
 
 $activeTemplate = FormUtils::isLegacyForm( $form_id ) ? 'legacy' : Template::getActiveID( $form_id );
 
 /* @var \Give\Form\Template $formTemplate */
 $formTemplate = Give()->templates->getTemplate( $activeTemplate );
+
+$renderTags = static function($wrapper_class, $apply_styles = true) use($form_id , $atts ) {
+    if( !taxonomy_exists( 'give_forms_tag' ) ) {
+        return '';
+    }
+
+    $tags = wp_get_post_terms($form_id,'give_forms_tag');
+
+    $tag_bg_color = ! empty( $atts['tag_background_color'] )
+        ? $atts['tag_background_color']
+        : '#69b86b';
+
+    $tag_text_color = ! empty( $atts['tag_text_color'] )
+        ? $atts['tag_text_color']
+        : '#ffffff';
+
+    $tag_container_color = count($tags) >= 1
+        ? 'rgba(0, 0, 0, 0.35)'
+        : 'none';
+
+    $tag_elements = array_map(
+        static function($term)use($tag_text_color,$tag_bg_color){
+            return "<span style='color: $tag_text_color; background-color: $tag_bg_color;'>$term->name</span>";
+        }, $tags
+    );
+
+    $tag_elements = implode('', $tag_elements);
+    $styles = $apply_styles ? "style='background-color: $tag_container_color;'" : '';
+
+    return "
+         <div class='$wrapper_class' $styles >
+            $tag_elements
+         </div>
+    ";
+};
+
 ?>
 
 <div class="give-grid__item">
-	<?php
-	// Print the opening anchor tag based on display style.
-	if ( 'redirect' === $atts['display_style'] ) {
+    <?php
+    // Print the opening anchor tag based on display style.
+    if ( 'redirect' === $atts['display_style'] ) {
 
         $form_grid_option = give_get_meta( $form_id, '_give_form_grid_option', true );
         $form_grid_redirect_url = esc_url(give_get_meta( $form_id, '_give_form_grid_redirect_url', true ));
@@ -49,109 +86,138 @@
 		);
 	}
 	?>
-
-		<div class="give-card__body">
-			<?php
-			// Maybe display the form title.
-			if ( true === $atts['show_title'] ) {
-				printf(
-					'<h3 class="give-card__title">%1$s</h3>',
-					$formTemplate->getFormHeading( $form_id )
-				);
-			}
-
-			// Maybe display the form excerpt.
-			if ( true === $atts['show_excerpt'] ) {
-				if ( $raw_content = $formTemplate->getFormExcerpt( $form_id ) ) {
-					$stripped_content = wp_strip_all_tags(
-						strip_shortcodes( $raw_content )
-					);
-				} else {
-					// Get content from the form post's content field.
-					$raw_content = give_get_meta( $form_id, '_give_form_content', true );
-
-					if ( ! empty( $raw_content ) ) {
-						$stripped_content = wp_strip_all_tags(
-							strip_shortcodes( $raw_content )
-						);
-					}
-				}
-
-				// Maybe truncate excerpt.
-				if ( 0 < $atts['excerpt_length'] ) {
-					$excerpt = wp_trim_words( $stripped_content, $atts['excerpt_length'] );
-				} else {
-					$excerpt = $stripped_content;
-				}
-
-				printf( '<p class="give-card__text">%s</p>', $excerpt );
-			}
-
-			// Maybe display the goal progess bar.
-			if (
-				give_is_setting_enabled( get_post_meta( $form_id, '_give_goal_option', true ) )
-				&& true === $atts['show_goal']
-			) {
-				echo '<div class="give-card__progress">';
-					give_show_goal_progress( $form_id, [
-                        'show_bar' => $atts['show_bar']
-                    ] );
-				echo '</div>';
-			}
-			?>
-
-            <?php if ($atts['show_donate_button']):
-                $button_text = ! empty( $atts['donate_button_text'] )
-                    ? $atts['donate_button_text']
-                    : give_get_meta( $form_id, '_give_form_grid_donate_button_text', true );
-
-                $button_bg_color = ! empty( $atts['donate_button_background_color'] )
-                    ? $atts['donate_button_background_color']
-                    : '#66bb6a';
-
-                $button_text_color = ! empty( $atts['donate_button_text_color'] )
-                    ? $atts['donate_button_text_color']
-                    : '#fff';
+		<div class="give-form-grid" style="flex-direction:<?php echo $flex_direction ?>">
+                <?php
+                // Maybe display the featured image.
+                if (
+                    give_is_setting_enabled($give_settings['form_featured_img'])
+                    && ($imageSrc = $formTemplate->getFormFeaturedImage($form_id))
+                    && $atts['show_featured_image']
+                    && $atts['columns'] !== '1'
+                ) {
+                    /*
+                     * Filters the image size used in card layouts.
+                     *
+                     * @param string The image size.
+                     * @param array  Form grid attributes.
+                     */
+                    $image_size = apply_filters('give_form_grid_image_size', $atts['image_size'], $atts);
+                    $image_attr = '';
+
+                    if ('auto' !== $atts['image_height']) {
+                        $image_attr = [
+                            'style' => 'height: ' . $atts['image_height'],
+                        ];
+                    }
+
+                    $image = wp_get_attachment_image( attachment_url_to_postid( $imageSrc ), $image_size, false, $image_attr );
+
+
+                    echo "
+                        <div class='give-form-grid-media'>
+                            <div class='give-card__media'> $image </div>
+
+                            {$renderTags('give-form-grid-media__tags')}
+                        </div>
+                    ";
+                } elseif(
+                    give_is_setting_enabled($give_settings['form_featured_img'])
+                    && ($imageSrc = $formTemplate->getFormFeaturedImage($form_id))
+                    && $atts['show_featured_image']
+                    && $atts['columns'] === '1')
+                    {
+                        echo "
+                            <div id='row-media' class='give-form-grid-media'>
+                                <img class='give-form-grid-media' src='$imageSrc' alt='' />
+
+                                {$renderTags('give-form-grid-media__tags')}
+                            </div>
+                        ";
+                    }
                 ?>
-                <div>
-                    <br />
-                    <button class="give-form-grid-btn" style="background-color: <?php echo $button_bg_color; ?>;">
-                        <span style="color: <?php echo $button_text_color; ?>">
-                            <?php echo $button_text ?: __( 'Donate', 'give' ); ?>
-                        </span>
-                    </button>
-                </div>
-            <?php endif; ?>
-		</div>
 
-		<?php
-		// Maybe display the featured image.
-		if (
-			give_is_setting_enabled( $give_settings['form_featured_img'] )
-			&& ( $imageSrc = $formTemplate->getFormFeaturedImage( $form_id ) )
-			&& true === $atts['show_featured_image']
-		) {
-			/*
-			 * Filters the image size used in card layouts.
-			 *
-			 * @param string The image size.
-			 * @param array  Form grid attributes.
-			 */
-			$image_size = apply_filters( 'give_form_grid_image_size', $atts['image_size'], $atts );
-			$image_attr = '';
-
-			if ( 'auto' !== $atts['image_height'] ) {
-				$image_attr = [
-					'style' => 'height: ' . $atts['image_height'],
-				];
-			}
+            <div class="give-form-grid-container">
+                <div class="give-form-grid-content">
+                    <?php
+                    if( !$atts['show_featured_image']){
+                            echo "
+                                 <div class='give-form-grid-media' >
+                                        {$renderTags('give-form-grid-media__tags_no_image', false)}
+                                   </div>
+                            ";
+                        }
+                    ?>
+
+                    <?php
+
+                    // Maybe display the form title.
+                    if ( true === $atts['show_title'] ) {
+                        printf(
+                            '<h3 class="give-form-grid-content__title">%1$s</h3>',
+                            $formTemplate->getFormHeading( $form_id )
+                        );
+                    }
+
+                    // Maybe display the form excerpt.
+                    if ( true === $atts['show_excerpt'] ) {
+                        if ( $raw_content = $formTemplate->getFormExcerpt( $form_id ) ) {
+                            $stripped_content = wp_strip_all_tags(
+                                strip_shortcodes( $raw_content )
+                            );
+                        } else {
+                            // Get content from the form post's content field.
+                            $raw_content = give_get_meta( $form_id, '_give_form_content', true );
+
+                            if ( ! empty( $raw_content ) ) {
+                                $stripped_content = wp_strip_all_tags(
+                                    strip_shortcodes( $raw_content )
+                                );
+                            }
+                        }
+
+                        // Maybe truncate excerpt.
+                        if ( 0 < $atts['excerpt_length'] ) {
+                            $excerpt = wp_trim_words( $stripped_content, $atts['excerpt_length'] );
+                        } else {
+                            $excerpt = $stripped_content;
+                        }
+
+                        printf( '<p class="give-form-grid-content__text">%s</p>', $excerpt );
+                    }
+
+                     if ($atts['show_donate_button']):
+                        $button_text = ! empty( $atts['donate_button_text'] )
+                            ? $atts['donate_button_text']
+                            : give_get_meta( $form_id, '_give_form_grid_donate_button_text', true );
+
+                        $button_text_color = ! empty( $atts['donate_button_text_color'] )
+                            ? $atts['donate_button_text_color']
+                            : '#fff';
+                        ?>
+                        <button style="text-decoration-color: <?php echo $button_text_color; ?>">
+                                    <span style="color: <?php echo $button_text_color; ?>">
+                                        <?php echo $button_text ?: __( 'Donate', 'give' ); ?>
+                                    </span>
+                        </button>
+                    <?php endif; ?>
 
-			printf(
-				'<div class="give-card__media">%1$s</div>',
-				wp_get_attachment_image( attachment_url_to_postid( $imageSrc ), $image_size, false, $image_attr )
-			);
-		}
-		?>
+                </div>
+                <?php
+                    // Maybe display the goal progress bar.
+                    if (
+                        give_is_setting_enabled( get_post_meta( $form_id, '_give_goal_option', true ) )
+                        && true === $atts['show_goal']
+                    ) {
+                        echo '<div class="give-form-grid-content__progress">';
+                        give_show_goal_progress( $form_id, [
+                            'show_bar' => $atts['show_bar'],
+                            'progress_bar_color' => $atts['progress_bar_color'],
+                        ] );
+                        echo '</div>';
+                    }
+                ?>
+            </div>
+		</div>
 	</a>
 	<?php
 	// If modal, print form in hidden container until it is time to be revealed.
diff --git a/templates/shortcode-goal.php b/templates/shortcode-goal.php
index 8f1961b427..b15ef9f908 100644
--- a/templates/shortcode-goal.php
+++ b/templates/shortcode-goal.php
@@ -16,7 +16,7 @@
 
 $goal_progress_stats = give_goal_progress_stats( $form );
 $goal_format         = $goal_progress_stats['format'];
-$color               = give_get_meta( $form_id, '_give_goal_color', true );
+$color               = $args['progress_bar_color'];
 $show_text           = isset( $args['show_text'] ) ? filter_var( $args['show_text'], FILTER_VALIDATE_BOOLEAN ) : true;
 $show_bar            = isset( $args['show_bar'] ) ? filter_var( $args['show_bar'], FILTER_VALIDATE_BOOLEAN ) : true;
 
@@ -44,27 +44,28 @@
 $income = $shortcode_stats['income'];
 $goal   = $shortcode_stats['goal'];
 
+
 switch ( $goal_format ) {
 
-	case 'donation':
-		$progress           = $goal ? round( ( $income / $goal ) * 100, 2 ) : 0;
-		$progress_bar_value = $income >= $goal ? 100 : $progress;
-		break;
+    case 'donation':
+        $progress           = $goal ? round( ( $form->get_sales() / $goal ) * 100, 2 ) : 0;
+        $progress_bar_value = $form->get_sales() >= $goal ? 100 : $progress;
+        break;
 
-	case 'donors':
-		$progress_bar_value = $goal ? round( ( $income / $goal ) * 100, 2 ) : 0;
-		$progress           = $progress_bar_value;
-		break;
+    case 'donors':
+        $progress           = $goal ? round( ( give_get_form_donor_count( $form->ID ) / $goal ) * 100, 2 ) : 0;
+        $progress_bar_value = give_get_form_donor_count( $form->ID ) >= $goal ? 100 : $progress;
+        break;
 
-	case 'percentage':
-		$progress           = $goal ? round( ( $income / $goal ) * 100, 2 ) : 0;
-		$progress_bar_value = $income >= $goal ? 100 : $progress;
-		break;
+    case 'percentage':
+        $progress           = $goal ? round( ( $income / $goal ) * 100, 2 ) : 0;
+        $progress_bar_value = $income >= $goal ? 100 : $progress;
+        break;
 
-	default:
-		$progress           = $goal ? round( ( $income / $goal ) * 100, 2 ) : 0;
-		$progress_bar_value = $income >= $goal ? 100 : $progress;
-		break;
+    default:
+        $progress           = $goal ? round( ( $income / $goal ) * 100, 2 ) : 0;
+        $progress_bar_value = $income >= $goal ? 100 : $progress;
+        break;
 
 }
 
@@ -74,8 +75,21 @@
  * @since 1.8.8
  */
 $progress = apply_filters( 'give_goal_amount_funded_percentage_output', $progress, $form_id, $form );
+
+
+
 ?>
 <div class="give-goal-progress">
+    <?php if ( ! empty( $show_bar ) ) :
+        $style = "width:$progress_bar_value%;";
+        $style .= "background: linear-gradient(180deg, {$color} 0%, {$color} 100%); background-blend-mode: multiply;";
+        ?>
+        <div class="progress-bar">
+            <div class="give-progress-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="<?php echo esc_attr( $progress_bar_value ); ?>">
+                <span style="<?php echo $style; ?>"></span>
+            </div>
+        </div>
+    <?php endif; ?>
 	<?php if ( ! empty( $show_text ) ) : ?>
 		<div class="raised">
 			<?php
@@ -168,10 +182,12 @@
 						'form_id' => $form_id,
 					)
 				);
-
 				echo sprintf(
 					/* translators: 1: amount of income raised 2: goal target amount. */
-					__( '<span class="income" data-amounts="%1$s">%2$s</span> of <span class="goal-text" data-amounts="%3$s">%4$s</span> raised', 'give' ),
+					__( '<div class="raised__details">
+                                   <span class="amount"  data-amounts="%1$s">%2$s</span>
+                                   <span class="goal" data-amounts="%3$s"><span>of </span>%4$s</span>
+                         </div>', 'give' ),
 					esc_attr( wp_json_encode( $income_amounts, JSON_PRETTY_PRINT ) ),
 					esc_attr( $formatted_income ),
 					esc_attr( wp_json_encode( $goal_amounts, JSON_PRETTY_PRINT ) ),
@@ -181,7 +197,10 @@
 			elseif ( 'percentage' === $goal_format ) :
 
 				echo sprintf( /* translators: %s: percentage of the amount raised compared to the goal target */
-					__( '<span class="give-percentage">%s%%</span> funded', 'give' ),
+					__( '<div class="raised__details">
+                                   <span class="amount">%s%%</span>
+                                   <span class="goal"><span>of </span><span>100&#37;</span>
+                         </div>', 'give' ),
 					round( $progress )
 				);
 
@@ -189,46 +208,46 @@
 
 				echo sprintf( /* translators: 1: total number of donations completed 2: total number of donations set as goal */
 					_n(
-						'<span class="income">%1$s</span> of <span class="goal-text">%2$s</span> donation',
-						'<span class="income">%1$s</span> of <span class="goal-text">%2$s</span> donations',
+						'<div class="raised__details">
+                                           <span class="amount">%s%%</span>
+                                           <span class="goal">%2$s</span>
+                                </div>',
+						'<div class="raised__details">
+                                           <span class="amount">%1$s</span>
+                                           <span class="goal"><span>of</span> %2$s <span>Donations</span></span>
+                                </div>',
 						$goal,
 						'give'
 					),
-					give_format_amount( $income, array( 'decimal' => false ) ),
-					give_format_amount( $goal, array( 'decimal' => false ) )
+                    $form->get_sales(),
+                    give_format_amount( $goal, array( 'decimal' => false ) )
 				);
 
 			elseif ( 'donors' === $goal_format ) :
 
 				echo sprintf( /* translators: 1: total number of donors completed 2: total number of donors set as goal */
 					_n(
-						'<span class="income">%1$s</span> of <span class="goal-text">%2$s</span> donor',
-						'<span class="income">%1$s</span> of <span class="goal-text">%2$s</span> donors',
+						'<div class="raised__details">
+                                           <span class="amount">%1$s</spanclass>
+                                           <span class="goal"><span>of</span> %2$s <span>Donors</span> </span>
+                                </div>',
+						'<div class="raised__details">
+                                           <span class="amount">%1$s</span>
+                                           <span class="goal"><span>of</span> %2$s <span>Donors</span></span>
+                                </div>',
 						$goal,
 						'give'
 					),
-					give_format_amount( $income, array( 'decimal' => false ) ),
+                    give_get_form_donor_count( $form->ID ),
 					give_format_amount( $goal, array( 'decimal' => false ) )
 				);
-
 			endif;
 			?>
-		</div>
-	<?php endif; ?>
-
-
-	<?php if ( ! empty( $show_bar ) ) :
-        $style = "width:{$progress_bar_value}%;";
 
-        if ( ! empty($color)) {
-            $style .= ";background: linear-gradient(180deg, {$color} 0%, {$color} 100%), linear-gradient(180deg, #fff 0%, #ccc 100%); background-blend-mode: multiply;";
-        }
-        ?>
-        <div class="progress-bar">
-            <div class="give-progress-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="<?php echo esc_attr( $progress_bar_value ); ?>">
-                <span style="<?php echo $style; ?>"></span>
+            <div class="raised__details">
+                <span class="amount raised__details_donations"> <?php echo $form->get_sales(); ?></span>
+                <span class="goal">Donations</span>
             </div>
 		</div>
 	<?php endif; ?>
-
 </div><!-- /.goal-progress -->

From 8f2cddafc5a58d624a9ba4c9c3c92aca3b2db7a1 Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jon@givewp.com>
Date: Wed, 15 Jun 2022 13:42:00 -0400
Subject: [PATCH 48/53] fix: remove hardcoded test and manual gateway labels
 (#6456)

Co-authored-by: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
---
 includes/gateways/functions.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/includes/gateways/functions.php b/includes/gateways/functions.php
index 090afaa35a..be3218ca95 100644
--- a/includes/gateways/functions.php
+++ b/includes/gateways/functions.php
@@ -119,21 +119,19 @@ function give_get_default_gateway( $form_id ) {
 /**
  * Returns the admin label for the specified gateway
  *
+ * @unreleased remove hard coded admin_labels
  * @since 1.0
  *
- * @param string $gateway Name of the gateway to retrieve a label for
+ * @param  string  $gateway  Name of the gateway to retrieve a label for
  *
  * @return string Gateway admin label
  */
-function give_get_gateway_admin_label( $gateway ) {
-	$gateways = give_get_payment_gateways();
-	$label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['admin_label'] : $gateway;
-
-	if ( $gateway == 'manual' || $gateway == 'manual_donation' ) {
-		$label = __( 'Test Donation', 'give' );
-	}
+function give_get_gateway_admin_label($gateway)
+{
+    $gateways = give_get_payment_gateways();
+    $label = isset($gateways[$gateway]) ? $gateways[$gateway]['admin_label'] : $gateway;
 
-	return apply_filters( 'give_gateway_admin_label', $label, $gateway );
+    return apply_filters('give_gateway_admin_label', $label, $gateway);
 }
 
 /**

From 8072aba1bdc9932c6818f06bb205ec56564c2deb Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@givewp.com>
Date: Wed, 15 Jun 2022 14:48:31 -0700
Subject: [PATCH 49/53] Fix: Apply more escaping to prevent XSS vulnerabilities
 (#6447)

Co-authored-by: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
---
 includes/admin/admin-actions.php              | 10 +++---
 includes/admin/class-api-keys-table.php       |  2 +-
 includes/admin/donors/donor-actions.php       | 10 +++---
 includes/admin/donors/donors.php              |  4 +--
 .../emails/abstract-email-notification.php    |  8 ++---
 .../emails/class-donation-receipt-email.php   | 16 ++++++----
 .../emails/class-donor-register-email.php     |  2 +-
 .../emails/class-email-notifications.php      |  2 +-
 .../emails/class-new-donor-register-email.php |  2 +-
 .../admin/forms/class-metabox-form-data.php   |  3 +-
 includes/admin/reports/graphing.php           |  4 +--
 .../class-give-import-core-settings.php       |  4 +--
 .../import/class-give-import-donations.php    |  2 +-
 .../tools/views/html-admin-page-exports.php   |  4 +--
 .../tools/views/html-admin-page-imports.php   |  4 +--
 includes/admin/upgrades/views/upgrades.php    |  4 +--
 includes/ajax-functions.php                   |  2 +-
 includes/api/class-give-api.php               |  8 ++---
 includes/emails/template.php                  |  2 +-
 includes/forms/template.php                   |  4 +--
 includes/gateways/actions.php                 |  2 +-
 .../includes/class-give-stripe-gateway.php    |  4 +--
 includes/login-register.php                   |  4 +--
 src/Controller/Form.php                       |  2 +-
 src/Donations/DonationsAdminPage.php          |  6 ++--
 src/Helpers/Utils.php                         |  2 +-
 .../includes/give-subscription.php            |  2 +-
 src/Onboarding/Setup/templates/index.html.php | 12 +++----
 .../NewStripeAccountOnBoardingController.php  | 32 ++++++++++---------
 src/Tracking/AdminActionHandler.php           |  4 +--
 src/Tracking/UsageTrackingOnBoarding.php      |  6 ++--
 src/Views/IframeView.php                      | 22 +++++++------
 32 files changed, 102 insertions(+), 93 deletions(-)

diff --git a/includes/admin/admin-actions.php b/includes/admin/admin-actions.php
index 92fc36604c..bed2404881 100644
--- a/includes/admin/admin-actions.php
+++ b/includes/admin/admin-actions.php
@@ -76,10 +76,12 @@ function give_redirect_to_clean_url_admin_pages() {
 	if ( $redirect ) {
 		// Redirect.
 		wp_redirect(
-			remove_query_arg(
-				[ '_wp_http_referer', '_wpnonce' ],
-				wp_unslash( $_SERVER['REQUEST_URI'] )
-			)
+            esc_url_raw(
+                remove_query_arg(
+                    [ '_wp_http_referer', '_wpnonce' ],
+                    wp_unslash( $_SERVER['REQUEST_URI'] )
+                )
+            )
 		);
 		exit;
 	}
diff --git a/includes/admin/class-api-keys-table.php b/includes/admin/class-api-keys-table.php
index f02900e2c1..7cd6579157 100644
--- a/includes/admin/class-api-keys-table.php
+++ b/includes/admin/class-api-keys-table.php
@@ -316,7 +316,7 @@ public function query() {
 		foreach ( $users as $user ) {
 			$keys[ $user->ID ]['id']    = $user->ID;
 			$keys[ $user->ID ]['email'] = $user->user_email;
-			$keys[ $user->ID ]['user']  = '<a href="' . add_query_arg( 'user_id', $user->ID, 'user-edit.php' ) . '"><strong>' . $user->user_login . '</strong></a>';
+			$keys[ $user->ID ]['user']  = '<a href="' . esc_url( add_query_arg( 'user_id', $user->ID, 'user-edit.php' ) ) . '"><strong>' . $user->user_login . '</strong></a>';
 
 			$keys[ $user->ID ]['key']    = Give()->api->get_user_public_key( $user->ID );
 			$keys[ $user->ID ]['secret'] = Give()->api->get_user_secret_key( $user->ID );
diff --git a/includes/admin/donors/donor-actions.php b/includes/admin/donors/donor-actions.php
index 61d41b115b..b8538e36f4 100644
--- a/includes/admin/donors/donor-actions.php
+++ b/includes/admin/donors/donor-actions.php
@@ -161,7 +161,7 @@ function give_edit_donor( $args ) {
 
 	if ( $output['success'] ) {
 		wp_safe_redirect(
-            esc_url(
+            esc_url_raw(
                  add_query_arg(
                      array(
                          'post_type'       => 'give_forms',
@@ -358,7 +358,7 @@ function give_disconnect_donor_user_id( $args ) {
 		give_set_error( 'give-disconnect-user-fail', __( 'Failed to disconnect user from donor.', 'give' ) );
 	}
 
-	$output['redirect'] = $redirect_url;
+	$output['redirect'] = esc_url_raw( $redirect_url );
 
 	/**
 	 * Fires after disconnecting user ID from a donor.
@@ -516,7 +516,7 @@ function give_remove_donor_email() {
 		$url = add_query_arg( 'give-messages[]', 'email-remove-failed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
 	}
 
-	wp_safe_redirect( $url );
+	wp_safe_redirect( esc_url_raw( $url ) );
 	exit;
 }
 
@@ -569,7 +569,7 @@ function give_set_donor_primary_email() {
 		$url = add_query_arg( 'give-messages[]', 'primary-email-failed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
 	}
 
-	wp_safe_redirect( $url );
+	wp_safe_redirect( esc_url_raw( $url ) );
 	exit;
 }
 
@@ -673,7 +673,7 @@ function give_process_donor_deletion( $args ) {
 		admin_url( 'edit.php?post_type=give_forms&page=give-donors' )
 	);
 
-	wp_safe_redirect( $redirect_url );
+	wp_safe_redirect( esc_url_raw( $redirect_url ) );
 	give_die();
 
 }
diff --git a/includes/admin/donors/donors.php b/includes/admin/donors/donors.php
index f16622a1ff..55f67ffcdd 100644
--- a/includes/admin/donors/donors.php
+++ b/includes/admin/donors/donors.php
@@ -827,9 +827,9 @@ class="button js-cancel"><?php _e( 'Cancel', 'give' ); ?></button>
 									'give-remove-donor-email'
 								);
 								?>
-								<a href="<?php echo $promote_url; ?>"><?php _e( 'Make Primary', 'give' ); ?></a>
+								<a href="<?php echo esc_url( $promote_url ); ?>"><?php _e( 'Make Primary', 'give' ); ?></a>
 								&nbsp;|&nbsp;
-								<a href="<?php echo $remove_url; ?>" class="delete"><?php _e( 'Remove', 'give' ); ?></a>
+								<a href="<?php echo esc_url( $remove_url ); ?>" class="delete"><?php _e( 'Remove', 'give' ); ?></a>
 							<?php endif; ?>
 						</td>
 					</tr>
diff --git a/includes/admin/emails/abstract-email-notification.php b/includes/admin/emails/abstract-email-notification.php
index e2a89f2fd0..d2c1f505a5 100755
--- a/includes/admin/emails/abstract-email-notification.php
+++ b/includes/admin/emails/abstract-email-notification.php
@@ -909,22 +909,22 @@ public function preview_email_template_tags( $message ) {
 					'billing_address'         => $payment_id ? give_email_tag_billing_address( array( 'payment_id' => $payment_id ) ) : '',
 					'email_access_link'       => sprintf(
 						'<a href="%1$s">%2$s</a>',
-						add_query_arg(
+						esc_url( add_query_arg(
 							array(
 								'give_nl' => uniqid(),
 							),
 							give_get_history_page_uri()
-						),
+						) ),
 						__( 'View your donation history &raquo;', 'give' )
 					),
 					'donation_history_link'   => sprintf(
 						'<a href="%1$s">%2$s</a>',
-						add_query_arg(
+						esc_url( add_query_arg(
 							array(
 								'give_nl' => uniqid(),
 							),
 							give_get_history_page_uri()
-						),
+						) ),
 						__( 'View your donation history &raquo;', 'give' )
 					),
 					'reset_password_link'     => $user_id ? give_email_tag_reset_password_link( array( 'user_id' => $user_id ), $payment_id ) : '',
diff --git a/includes/admin/emails/class-donation-receipt-email.php b/includes/admin/emails/class-donation-receipt-email.php
index dbb20630a0..0e78cfe3f7 100755
--- a/includes/admin/emails/class-donation-receipt-email.php
+++ b/includes/admin/emails/class-donation-receipt-email.php
@@ -329,13 +329,15 @@ public function resend_donation_receipt( $data ) {
 			);
 
 			wp_redirect(
-				add_query_arg(
-					array(
-						'give-messages[]' => 'email-sent',
-						'give-action'     => false,
-						'purchase_id'     => false,
-					)
-				)
+                esc_url_raw(
+                    add_query_arg(
+                        array(
+                            'give-messages[]' => 'email-sent',
+                            'give-action'     => false,
+                            'purchase_id'     => false,
+                        )
+                    )
+                )
 			);
 			exit;
 		}
diff --git a/includes/admin/emails/class-donor-register-email.php b/includes/admin/emails/class-donor-register-email.php
index 8fd3e19d93..f5b1bf19da 100755
--- a/includes/admin/emails/class-donor-register-email.php
+++ b/includes/admin/emails/class-donor-register-email.php
@@ -174,7 +174,7 @@ public function email_preview_header( $email_preview_header, $email ) {
 			// Remove user id query param if set from request url.
 			$query = remove_query_arg( array( 'user_id' ), $query );
 
-			$request_url = home_url( '/?' . str_replace( '', '', $query ) );
+			$request_url = esc_url( home_url( '/?' . str_replace( '', '', $query ) ) );
 			?>
 
 			<!-- Start constructing HTML output.-->
diff --git a/includes/admin/emails/class-email-notifications.php b/includes/admin/emails/class-email-notifications.php
index 4f48f96f77..8a7f1546aa 100755
--- a/includes/admin/emails/class-email-notifications.php
+++ b/includes/admin/emails/class-email-notifications.php
@@ -396,7 +396,7 @@ public function send_preview_email() {
 		}
 
 		// Remove the test email query arg.
-		wp_redirect( remove_query_arg( 'give_action' ) );
+		wp_redirect( esc_url_raw( remove_query_arg( 'give_action' ) ) );
 		exit;
 	}
 
diff --git a/includes/admin/emails/class-new-donor-register-email.php b/includes/admin/emails/class-new-donor-register-email.php
index 4242464ccd..e85ec5eaaa 100755
--- a/includes/admin/emails/class-new-donor-register-email.php
+++ b/includes/admin/emails/class-new-donor-register-email.php
@@ -169,7 +169,7 @@ public function email_preview_header( $email_preview_header, $email ) {
 			// Remove user id query param if set from request url.
 			$query = remove_query_arg( array( 'user_id' ), $query );
 
-			$request_url = home_url( '/?' . str_replace( '', '', $query ) );
+			$request_url = esc_url( home_url( '/?' . str_replace( '', '', $query ) ) );
 			?>
 			<script type="text/javascript">
 				function change_preview() {
diff --git a/includes/admin/forms/class-metabox-form-data.php b/includes/admin/forms/class-metabox-form-data.php
index 57ff3ea4c0..92e388a9e2 100644
--- a/includes/admin/forms/class-metabox-form-data.php
+++ b/includes/admin/forms/class-metabox-form-data.php
@@ -1483,8 +1483,7 @@ public function maintain_active_tab( $location, $post_id ) {
 			'give_forms' === get_post_type( $post_id ) &&
 			! empty( $_POST['give_form_active_tab'] )
 		) {
-			$location = add_query_arg( 'give_tab', give_clean( $_POST['give_form_active_tab'] ), $location );
-		}
+			$location = esc_url_raw( add_query_arg( 'give_tab', give_clean( $_POST['give_form_active_tab'] ), $location ) ); }
 
 		return $location;
 	}
diff --git a/includes/admin/reports/graphing.php b/includes/admin/reports/graphing.php
index c669f44114..d71338f2b9 100644
--- a/includes/admin/reports/graphing.php
+++ b/includes/admin/reports/graphing.php
@@ -809,7 +809,7 @@ function give_parse_report_dates( $data ) {
 	$tab  = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'earnings';
 	$id   = isset( $_GET['form-id'] ) ? $_GET['form-id'] : null;
 
-	wp_redirect( esc_url(add_query_arg( $dates, admin_url( 'edit.php?post_type=give_forms&page=give-reports&legacy=true&tab=' . esc_attr( $tab ) . '&view=' . esc_attr( $view ) . '&form-id=' . absint( $id ) ) ) ) );
+	wp_redirect( esc_url_raw(add_query_arg( $dates, admin_url( 'edit.php?post_type=give_forms&page=give-reports&legacy=true&tab=' . esc_attr( $tab ) . '&view=' . esc_attr( $view ) . '&form-id=' . absint( $id ) ) ) ) );
 	give_die();
 }
 
@@ -839,7 +839,7 @@ function give_reports_refresh_button() {
 		[
 			'label'       => esc_attr__( 'Clicking this will clear the reports cache.', 'give' ),
 			'tag_content' => '<span class="give-admin-button-icon give-admin-button-icon-update"></span>' . esc_html__( 'Refresh Report Data', 'give' ),
-			'link'        => $url,
+			'link'        => esc_url( $url ),
 			'position'    => 'left',
 			'attributes'  => [
 				'class' => 'button alignright give-admin-button',
diff --git a/includes/admin/tools/import/class-give-import-core-settings.php b/includes/admin/tools/import/class-give-import-core-settings.php
index 4d6381a274..21202441f2 100644
--- a/includes/admin/tools/import/class-give-import-core-settings.php
+++ b/includes/admin/tools/import/class-give-import-core-settings.php
@@ -242,8 +242,8 @@ public function import_success() {
 				<th colspan="2">
 					<h2><?php echo $title; ?></h2>
 					<p>
-						<a class="button button-large button-secondary" href="<?php echo add_query_arg( $query_arg_success, admin_url( 'edit.php' ) ); ?>"><?php echo $text; ?></a>
-						<a class="button button-large button-secondary" href="<?php echo add_query_arg( $query_arg_setting, admin_url( 'edit.php' ) ); ?>"><?php echo __( 'View Settings', 'give' ); ?></a>
+						<a class="button button-large button-secondary" href="<?php echo esc_url( add_query_arg( $query_arg_success, admin_url( 'edit.php' ) ) ); ?>"><?php echo $text; ?></a>
+						<a class="button button-large button-secondary" href="<?php echo esc_url( add_query_arg( $query_arg_setting, admin_url( 'edit.php' ) ) ); ?>"><?php echo __( 'View Settings', 'give' ); ?></a>
 					</p>
 				</th>
 			</tr>
diff --git a/includes/admin/tools/import/class-give-import-donations.php b/includes/admin/tools/import/class-give-import-donations.php
index b9e1a04090..fd498b8722 100644
--- a/includes/admin/tools/import/class-give-import-donations.php
+++ b/includes/admin/tools/import/class-give-import-donations.php
@@ -350,7 +350,7 @@ public function import_success() {
 
 					<p>
 						<a class="button button-large button-secondary"
-						   href="<?php echo add_query_arg( $query_arg, admin_url( 'edit.php' ) ); ?>"><?php echo $text; ?></a>
+						   href="<?php echo esc_url( add_query_arg( $query_arg, admin_url( 'edit.php' ) ) ); ?>"><?php echo $text; ?></a>
 					</p>
 				</th>
 			</tr>
diff --git a/includes/admin/tools/views/html-admin-page-exports.php b/includes/admin/tools/views/html-admin-page-exports.php
index 5475071e66..f5f71b0fad 100644
--- a/includes/admin/tools/views/html-admin-page-exports.php
+++ b/includes/admin/tools/views/html-admin-page-exports.php
@@ -49,7 +49,7 @@
 							<p><?php esc_html_e( 'Download a CSV of all donations recorded.', 'give' ); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo add_query_arg( [ 'type' => 'export_donations' ] ); ?>">
+							<a class="button" href="<?php echo esc_url( add_query_arg( [ 'type' => 'export_donations' ] ) ); ?>">
 								<?php esc_html_e( 'Generate CSV', 'give' ); ?>
 							</a>
 						</td>
@@ -63,7 +63,7 @@
 							<p><?php esc_html_e( 'Download a PDF of Donations and Revenue reports for all forms for the current year.', 'give' ); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo wp_nonce_url( add_query_arg( [ 'give-action' => 'generate_pdf' ] ), 'give_generate_pdf' ); ?>">
+							<a class="button" href="<?php echo esc_url( wp_nonce_url( add_query_arg( [ 'give-action' => 'generate_pdf' ] ), 'give_generate_pdf' ) ); ?>">
 								<?php esc_html_e( 'Generate PDF', 'give' ); ?>
 							</a>
 						</td>
diff --git a/includes/admin/tools/views/html-admin-page-imports.php b/includes/admin/tools/views/html-admin-page-imports.php
index d58a271d64..e3f5799e6b 100644
--- a/includes/admin/tools/views/html-admin-page-imports.php
+++ b/includes/admin/tools/views/html-admin-page-imports.php
@@ -49,7 +49,7 @@
 							<p><?php esc_html_e( 'Import a CSV of Donations.', 'give' ); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo add_query_arg( array( 'importer-type' => 'import_donations' ) ); ?>">
+							<a class="button" href="<?php echo esc_url( add_query_arg( array( 'importer-type' => 'import_donations' ) ) ); ?>">
 								<?php esc_html_e( 'Import CSV', 'give' ); ?>
 							</a>
 						</td>
@@ -63,7 +63,7 @@
 							<p><?php esc_html_e( 'Import Give\'s settings in JSON format.', 'give' ); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo add_query_arg( array( 'importer-type' => 'import_core_setting' ) ); ?>">
+							<a class="button" href="<?php echo esc_url( add_query_arg( array( 'importer-type' => 'import_core_setting' ) ) ); ?>">
 								<?php esc_html_e( 'Import JSON', 'give' ); ?>
 							</a>
 						</td>
diff --git a/includes/admin/upgrades/views/upgrades.php b/includes/admin/upgrades/views/upgrades.php
index acd67764ab..7ff337c424 100644
--- a/includes/admin/upgrades/views/upgrades.php
+++ b/includes/admin/upgrades/views/upgrades.php
@@ -74,7 +74,7 @@ class="give-doing-update-text-p" <?php echo Give_Updates::$background_updater->i
 													give_test_ajax_works() ? ' ' . __( 'in the background.', 'give' ) : '.'
 												)
 												: __( 'GiveWP needs to update the database.', 'give' ),
-											$db_update_url,
+											esc_url( $db_update_url ),
 											( $is_doing_updates ? 'give-hidden' : '' ),
 											__( 'Update now', 'give' )
 										);
@@ -173,7 +173,7 @@ class="give-update-paused-text-p" <?php echo ! Give_Updates::$background_updater
 											'give'
 										),
 										$plugin_updates,
-										$plugin_update_url
+										esc_url( $plugin_update_url )
 									);
 									?>
 								</p>
diff --git a/includes/ajax-functions.php b/includes/ajax-functions.php
index 71f600081f..14e67697bb 100644
--- a/includes/ajax-functions.php
+++ b/includes/ajax-functions.php
@@ -792,7 +792,7 @@ function give_modal_ajax_url( $args = [] ) {
 		]
 	);
 
-	return add_query_arg( $args, admin_url( '/admin-ajax.php' ) );
+	return esc_url_raw( add_query_arg( $args, admin_url( '/admin-ajax.php' ) ) );
 }
 
 
diff --git a/includes/api/class-give-api.php b/includes/api/class-give-api.php
index fd2241718c..52085c037a 100644
--- a/includes/api/class-give-api.php
+++ b/includes/api/class-give-api.php
@@ -2012,23 +2012,23 @@ public function process_api_key( $args ) {
 			case 'generate':
 				if ( $this->generate_api_key( $user_id ) ) {
 					Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-					wp_redirect( add_query_arg( 'give-messages[]', 'api-key-generated', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+					wp_redirect( esc_url_raw( add_query_arg( 'give-messages[]', 'api-key-generated', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) ) );
 					exit();
 				} else {
-					wp_redirect( add_query_arg( 'give-messages[]', 'api-key-failed', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+					wp_redirect( esc_url_raw( add_query_arg( 'give-messages[]', 'api-key-failed', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) ) );
 					exit();
 				}
 				break;
 			case 'regenerate':
 				$this->generate_api_key( $user_id, true );
 				Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-				wp_redirect( add_query_arg( 'give-messages[]', 'api-key-regenerated', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+				wp_redirect( esc_url_raw( add_query_arg( 'give-messages[]', 'api-key-regenerated', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) ) );
 				exit();
 				break;
 			case 'revoke':
 				$this->revoke_api_key( $user_id );
 				Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-				wp_redirect( add_query_arg( 'give-messages[]', 'api-key-revoked', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+				wp_redirect( esc_url_raw( add_query_arg( 'give-messages[]', 'api-key-revoked', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) ) );
 				exit();
 				break;
 			default;
diff --git a/includes/emails/template.php b/includes/emails/template.php
index bfa118c4cf..26481378f6 100644
--- a/includes/emails/template.php
+++ b/includes/emails/template.php
@@ -204,7 +204,7 @@ function give_get_preview_email_header() {
 	$query            = $request_url_data['query'];
 	$query            = remove_query_arg( array( 'preview_id' ), $query );
 
-	$request_url = home_url( '/?' . str_replace( '', '', $query ) );
+	$request_url = esc_url( home_url( '/?' . str_replace( '', '', $query ) ) );
 
 	$transaction_header .= '<script>
 				 function change_preview(){
diff --git a/includes/forms/template.php b/includes/forms/template.php
index 6212fec7d4..4e95873172 100644
--- a/includes/forms/template.php
+++ b/includes/forms/template.php
@@ -1493,7 +1493,7 @@ function give_get_login_fields( $form_id ) {
 		<?php if ( $show_register_form == 'both' ) { ?>
 			<p class="give-new-account-link">
 				<?php _e( 'Don\'t have an account?', 'give' ); ?>&nbsp;
-				<a href="<?php echo remove_query_arg( 'login' ); ?>" class="give-checkout-register-cancel"
+				<a href="<?php echo esc_url( remove_query_arg( 'login' ) ); ?>" class="give-checkout-register-cancel"
 				   data-action="give_checkout_register">
 					<?php
 					if ( give_logged_in_only( $form_id ) ) {
@@ -2421,7 +2421,7 @@ function give_redirect_and_popup_form( $redirect, $args ) {
 	}
 
 	// Return the modified URL.
-	return $redirect;
+	return esc_url( $redirect );
 }
 
 add_filter( 'give_send_back_to_checkout', 'give_redirect_and_popup_form', 10, 2 );
diff --git a/includes/gateways/actions.php b/includes/gateways/actions.php
index aa10f8c9c6..eae5eba51e 100644
--- a/includes/gateways/actions.php
+++ b/includes/gateways/actions.php
@@ -23,7 +23,7 @@
  */
 function give_process_gateway_select( $data ) {
 	if ( isset( $_POST['gateway_submit'] ) ) {
-		wp_redirect( esc_url( add_query_arg( 'payment-mode', $_POST['payment-mode'] ) ) );
+		wp_redirect( esc_url_raw( add_query_arg( 'payment-mode', $_POST['payment-mode'] ) ) );
 		exit;
 	}
 }
diff --git a/includes/gateways/stripe/includes/class-give-stripe-gateway.php b/includes/gateways/stripe/includes/class-give-stripe-gateway.php
index dce41b65a0..6bc4085384 100644
--- a/includes/gateways/stripe/includes/class-give-stripe-gateway.php
+++ b/includes/gateways/stripe/includes/class-give-stripe-gateway.php
@@ -628,13 +628,13 @@ public function create_3d_secure_source( $donation_id, $source_id ) {
 				],
 				'statement_descriptor' => give_stripe_get_statement_descriptor(),
 				'redirect'             => [
-					'return_url' => add_query_arg(
+					'return_url' => esc_url_raw( add_query_arg(
 						[
 							'give-listener' => 'stripe_three_d_secure',
 							'donation_id'   => $donation_id,
 						],
 						give_get_success_page_uri()
-					),
+					) ),
 				],
 			];
 
diff --git a/includes/login-register.php b/includes/login-register.php
index 624870bfb1..1b59fe274b 100644
--- a/includes/login-register.php
+++ b/includes/login-register.php
@@ -51,8 +51,8 @@ function give_login_form( $login_redirect = '', $logout_redirect = '' ) {
 	give_get_template(
 		'shortcode-login',
 		array(
-			'give_login_redirect'  => $login_redirect,
-			'give_logout_redirect' => $logout_redirect,
+			'give_login_redirect'  => esc_url($login_redirect),
+			'give_logout_redirect' => esc_url($logout_redirect),
 		)
 	);
 
diff --git a/src/Controller/Form.php b/src/Controller/Form.php
index 3cfcb29ba8..3a14c9b566 100644
--- a/src/Controller/Form.php
+++ b/src/Controller/Form.php
@@ -283,7 +283,7 @@ public function handlePrePaymentProcessingErrorRedirect($redirect)
             $redirect
         );
 
-        $url = explode('?', $redirect, 2);
+        $url = explode('?', esc_url_raw($redirect), 2);
         $url[0] = Give()->routeForm->getURL(get_post_field('post_name', absint($_REQUEST['give-form-id'])));
 
         return implode('?', $url);
diff --git a/src/Donations/DonationsAdminPage.php b/src/Donations/DonationsAdminPage.php
index c323d5e75f..0792abefec 100644
--- a/src/Donations/DonationsAdminPage.php
+++ b/src/Donations/DonationsAdminPage.php
@@ -139,10 +139,10 @@ private function getForms()
             'status' => 'any'
         ];
 
-        $request = WP_REST_Request::from_url(add_query_arg(
+        $request = WP_REST_Request::from_url(esc_url_raw(add_query_arg(
             $queryParameters,
-            esc_url_raw(rest_url('give-api/v2/admin/forms'))
-        ));
+            rest_url('give-api/v2/admin/forms')
+        )));
 
         $data = rest_do_request($request)->get_data();
 
diff --git a/src/Helpers/Utils.php b/src/Helpers/Utils.php
index 5e7f7d4cce..9470ab5389 100644
--- a/src/Helpers/Utils.php
+++ b/src/Helpers/Utils.php
@@ -82,7 +82,7 @@ public static function switchRequestedURL($location, $url, $addArgs = [], $remov
      */
     public static function removeDonationAction($url)
     {
-        return add_query_arg(['giveDonationAction' => false], $url);
+        return esc_url_raw( add_query_arg(['giveDonationAction' => false], $url) );
     }
 
     /**
diff --git a/src/LegacySubscriptions/includes/give-subscription.php b/src/LegacySubscriptions/includes/give-subscription.php
index 29da5e4e7c..3746288ae6 100644
--- a/src/LegacySubscriptions/includes/give-subscription.php
+++ b/src/LegacySubscriptions/includes/give-subscription.php
@@ -801,7 +801,7 @@ public function get_cancel_url() {
 			'sub_id'      => $this->id,
 		) ), "give-recurring-cancel-{$this->id}" );
 
-		return apply_filters( 'give_subscription_cancel_url', $url, $this );
+		return apply_filters( 'give_subscription_cancel_url', esc_url($url), $this );
 	}
 
 
diff --git a/src/Onboarding/Setup/templates/index.html.php b/src/Onboarding/Setup/templates/index.html.php
index ae4b69c853..bb1c61bb8f 100644
--- a/src/Onboarding/Setup/templates/index.html.php
+++ b/src/Onboarding/Setup/templates/index.html.php
@@ -83,7 +83,7 @@
                         ),
                         'action' => sprintf(
                             '<a href="%1$s"><i class="fab fa-paypal"></i>&nbsp;&nbsp;%2$s</a>',
-                            add_query_arg(
+                            esc_url(add_query_arg(
                                 [
                                     'post_type' => 'give_forms',
                                     'page' => 'give-settings',
@@ -91,8 +91,8 @@
                                     'section' => 'paypal',
                                     'group' => 'paypal-commerce',
                                 ],
-                                esc_url_raw(admin_url('edit.php'))
-                            ),
+                                admin_url('edit.php')
+                            )),
                             ! $this->isPayPalSetup() ? esc_html__('Connect to PayPal', 'give') : esc_html__(
                                 'PayPal Settings',
                                 'give'
@@ -116,15 +116,15 @@
                         ),
                         'action' => ($this->isStripeSetup()) ? sprintf(
                             '<a href="%s"><i class="fab fa-stripe-s"></i>&nbsp;&nbsp;Stripe Settings</a>',
-                            add_query_arg(
+                            esc_url(add_query_arg(
                                 [
                                     'post_type' => 'give_forms',
                                     'page' => 'give-settings',
                                     'tab' => 'gateways',
                                     'section' => 'stripe-settings',
                                 ],
-                                esc_url_raw(admin_url('edit.php'))
-                            )
+                                admin_url('edit.php')
+                            ))
                         )
                             : sprintf(
                                 '<a href="%s"><i class="fab fa-stripe-s"></i>&nbsp;&nbsp;Connect to Stripe</a>',
diff --git a/src/PaymentGateways/Stripe/Controllers/NewStripeAccountOnBoardingController.php b/src/PaymentGateways/Stripe/Controllers/NewStripeAccountOnBoardingController.php
index c0d272a8ae..60d7dd779b 100644
--- a/src/PaymentGateways/Stripe/Controllers/NewStripeAccountOnBoardingController.php
+++ b/src/PaymentGateways/Stripe/Controllers/NewStripeAccountOnBoardingController.php
@@ -34,18 +34,18 @@ public function __construct(Settings $settings)
      */
     public function __invoke()
     {
-        if ( ! current_user_can('manage_give_settings')) {
+        if (!current_user_can('manage_give_settings')) {
             return;
         }
 
         $requestedData = NewStripeAccountOnBoardingDto::fromArray(give_clean($_GET));
 
-        if ( ! $requestedData->hasValidateData()) {
+        if (!$requestedData->hasValidateData()) {
             return;
         }
 
         $stripe_accounts = give_stripe_get_all_accounts();
-        $secret_key = ! give_is_test_mode() ? $requestedData->stripeAccessToken : $requestedData->stripeAccessTokenTest;
+        $secret_key = !give_is_test_mode() ? $requestedData->stripeAccessToken : $requestedData->stripeAccessTokenTest;
 
         Stripe::setApiKey($secret_key);
 
@@ -69,7 +69,7 @@ public function __invoke()
             return;
         }
 
-        $account_name = ! empty($account_details->business_profile->name) ?
+        $account_name = !empty($account_details->business_profile->name) ?
             $account_details->business_profile->name :
             $account_details->settings->dashboard->display_name;
         $account_slug = $account_details->id;
@@ -77,7 +77,7 @@ public function __invoke()
         $account_country = $account_details->country;
 
         // Set first Stripe account as default.
-        if ( ! $stripe_accounts) {
+        if (!$stripe_accounts) {
             give_update_option('_give_stripe_default_account', $account_slug);
         }
 
@@ -101,7 +101,7 @@ public function __invoke()
             $this->settings->addNewStripeAccount($accountDetailModel);
 
             if ($requestedData->formId) {
-                if ( ! Settings::getDefaultStripeAccountSlugForDonationForm($requestedData->formId)) {
+                if (!Settings::getDefaultStripeAccountSlugForDonationForm($requestedData->formId)) {
                     Settings::setDefaultStripeAccountSlugForDonationForm(
                         $requestedData->formId,
                         $accountDetailModel->accountSlug
@@ -116,15 +116,17 @@ public function __invoke()
             }
 
             wp_redirect(
-                add_query_arg(
-                    ['stripe_account' => 'connected'],
-                    $requestedData->formId ?
-                        admin_url(
-                            "post.php?post=$requestedData->formId&action=edit&give_tab=stripe_form_account_options"
-                        ) :
-                        admin_url(
-                            'edit.php?post_type=give_forms&page=give-settings&tab=gateways&section=stripe-settings'
-                        )
+                esc_url_raw(
+                    add_query_arg(
+                        ['stripe_account' => 'connected'],
+                        $requestedData->formId ?
+                            admin_url(
+                                "post.php?post=$requestedData->formId&action=edit&give_tab=stripe_form_account_options"
+                            ) :
+                            admin_url(
+                                'edit.php?post_type=give_forms&page=give-settings&tab=gateways&section=stripe-settings'
+                            )
+                    )
                 )
             );
             exit();
diff --git a/src/Tracking/AdminActionHandler.php b/src/Tracking/AdminActionHandler.php
index f92a5c89f0..33c3ecb41f 100644
--- a/src/Tracking/AdminActionHandler.php
+++ b/src/Tracking/AdminActionHandler.php
@@ -77,7 +77,7 @@ public function optOutFromUsageTracking()
 
         $this->usageTrackingOnBoarding->disableNotice($timestamp);
 
-        wp_safe_redirect(remove_query_arg('give_action'));
+        wp_safe_redirect(esc_url_raw(remove_query_arg('give_action')));
         exit();
     }
 
@@ -101,7 +101,7 @@ public function optInToUsageTracking()
             $this->settings->saveUsageTrackingOptionValue('disabled');
         }
 
-        wp_safe_redirect(remove_query_arg('give_action'));
+        wp_safe_redirect(esc_url_raw(remove_query_arg('give_action')));
         exit();
     }
 
diff --git a/src/Tracking/UsageTrackingOnBoarding.php b/src/Tracking/UsageTrackingOnBoarding.php
index 94f3d33143..142246890e 100644
--- a/src/Tracking/UsageTrackingOnBoarding.php
+++ b/src/Tracking/UsageTrackingOnBoarding.php
@@ -92,11 +92,11 @@ public function getNotice($wrapper = false)
                 ),
                 'action' => sprintf(
                     '<a class="button" href="%1$s">%2$s</a><div class="sub-links"><a href="%3$s" title="%7$s">%4$s</a><a href="%5$s">%6$s</a></div>',
-                    add_query_arg(['give_action' => 'opt_in_into_tracking']),
+                    esc_url(add_query_arg(['give_action' => 'opt_in_into_tracking'])),
                     esc_html__('Glad to Help', 'give'),
-                    add_query_arg(['give_action' => 'hide_opt_in_notice_shortly']),
+                    esc_url(add_query_arg(['give_action' => 'hide_opt_in_notice_shortly'])),
                     esc_html__('Not Right Now', 'give'),
-                    add_query_arg(['give_action' => 'hide_opt_in_notice_permanently']),
+                    esc_url(add_query_arg(['give_action' => 'hide_opt_in_notice_permanently'])),
                     esc_html__('Dismiss Forever', 'give'),
                     esc_html__('Disable notice for 48 hours', 'give')
                 ),
diff --git a/src/Views/IframeView.php b/src/Views/IframeView.php
index 1c04314329..1c4d530df9 100644
--- a/src/Views/IframeView.php
+++ b/src/Views/IframeView.php
@@ -111,9 +111,11 @@ public function __construct($template = null)
      */
     public function setURL($url = null)
     {
-        $this->url = add_query_arg(
-            ['giveDonationFormInIframe' => 1],
-            $url
+        $this->url = esc_url(
+            add_query_arg(
+                ['giveDonationFormInIframe' => 1],
+                $url
+            )
         );
 
         return $this;
@@ -199,9 +201,11 @@ private function addExtraQueryParams()
         // We can prevent live donation on in appropriate situation like: previewing donation form (with draft status)
         if (FormTemplateUtils\Utils\Frontend::getPreviewDonationFormId(
             ) || $this->isDonationFormBlockRendererApiRequest()) {
-            $this->url = add_query_arg(
-                ['giveDisableDonateNowButton' => 1],
-                $this->url
+            $this->url = esc_url(
+                add_query_arg(
+                    ['giveDisableDonateNowButton' => 1],
+                    $this->url
+                )
             );
         }
     }
@@ -283,7 +287,7 @@ private function getIframeURL()
     {
         $query_string = array_map('give_clean', wp_parse_args($_SERVER['QUERY_STRING']));
         $donationHistory = give_get_purchase_session();
-        $hasAction = ! empty($query_string['giveDonationAction']);
+        $hasAction = !empty($query_string['giveDonationAction']);
         $this->autoScroll = absint($hasAction);
         $donationFormHasSession = null;
 
@@ -294,8 +298,8 @@ private function getIframeURL()
         // Do not pass donation acton by query param if does not belong to current form.
         if (
             $hasAction &&
-            ! empty($donationHistory) &&
-            ! $donationFormHasSession
+            !empty($donationHistory) &&
+            !$donationFormHasSession
         ) {
             unset($query_string['giveDonationAction']);
             $hasAction = false;

From f704d8ee499711a6e7e6c0a796b265c069ae8018 Mon Sep 17 00:00:00 2001
From: Jon Waldstein <jon@givewp.com>
Date: Thu, 16 Jun 2022 09:43:28 -0400
Subject: [PATCH 50/53] refactor: replace redundent meta keys with dynamic
 method, update DTO to get keys as constant, and improve conditional for
 payment types (#6460)

Co-authored-by: Jon Waldstein <jonwaldstein@jons-air.mynetworksettings.com>
---
 .../DonationsRequestController.php            | 13 +---
 .../DonationResponseData.php                  | 61 ++++++++++++-------
 2 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/Donations/Controllers/DonationsRequestController.php b/src/Donations/Controllers/DonationsRequestController.php
index 3cddeb6695..3a7849f97c 100644
--- a/src/Donations/Controllers/DonationsRequestController.php
+++ b/src/Donations/Controllers/DonationsRequestController.php
@@ -48,18 +48,7 @@ public function getDonations(): array
                 'give_donationmeta',
                 'id',
                 'donation_id',
-                DonationMetaKeys::FORM_ID,
-                DonationMetaKeys::FORM_TITLE,
-                DonationMetaKeys::AMOUNT,
-                DonationMetaKeys::DONOR_ID,
-                DonationMetaKeys::FIRST_NAME,
-                DonationMetaKeys::LAST_NAME,
-                DonationMetaKeys::EMAIL,
-                DonationMetaKeys::GATEWAY,
-                DonationMetaKeys::MODE,
-                DonationMetaKeys::ANONYMOUS,
-                DonationMetaKeys::SUBSCRIPTION_INITIAL_DONATION,
-                DonationMetaKeys::IS_RECURRING
+                ...DonationMetaKeys::getColumnsForAttachMetaQuery()
             )
             ->where('post_type', 'give_payment');
 
diff --git a/src/Donations/DataTransferObjects/DonationResponseData.php b/src/Donations/DataTransferObjects/DonationResponseData.php
index 9ea5749672..bd485fbfb7 100644
--- a/src/Donations/DataTransferObjects/DonationResponseData.php
+++ b/src/Donations/DataTransferObjects/DonationResponseData.php
@@ -68,32 +68,38 @@ class DonationResponseData implements Arrayable
      * @var string
      */
     public $donationType;
+    /**
+     * @var string
+     */
+    public $name;
 
     /**
      * Convert data from object to Donation
      *
-     * @param object $donation
+     * @param  object  $donation
      *
+     * @unreleased use meta keys as camelcase
      * @since 2.20.0
-     *
-     * @return self
      */
-    public static function fromObject($donation)
+    public static function fromObject($donation): DonationResponseData
     {
         $self = new static();
 
         $self->id = (int)$donation->id;
-        $self->formId = (int)$donation->{DonationMetaKeys::FORM_ID()};
-        $self->formTitle = $donation->{DonationMetaKeys::FORM_TITLE()};
-        $self->amount = html_entity_decode(give_currency_filter(give_format_amount($donation->{DonationMetaKeys::AMOUNT()})));
-        $self->donorId = (int)$donation->{DonationMetaKeys::DONOR_ID()};
-        $self->name = $donation->{DonationMetaKeys::FIRST_NAME()} . ' ' . $donation->{DonationMetaKeys::LAST_NAME()};
-        $self->email = $donation->{DonationMetaKeys::EMAIL()};
-        $self->gateway = give_get_gateway_admin_label($donation->{DonationMetaKeys::GATEWAY()});
+        $self->formId = (int)$donation->{DonationMetaKeys::FORM_ID()->getKeyAsCamelCase()};
+        $self->formTitle = $donation->{DonationMetaKeys::FORM_TITLE()->getKeyAsCamelCase()};
+        $self->amount = html_entity_decode(
+            give_currency_filter(give_format_amount($donation->{DonationMetaKeys::AMOUNT()->getKeyAsCamelCase()}))
+        );
+        $self->donorId = (int)$donation->{DonationMetaKeys::DONOR_ID()->getKeyAsCamelCase()};
+        $self->name = $donation->{DonationMetaKeys::FIRST_NAME()->getKeyAsCamelCase(
+            )} . ' ' . $donation->{DonationMetaKeys::LAST_NAME()->getKeyAsCamelCase()};
+        $self->email = $donation->{DonationMetaKeys::EMAIL()->getKeyAsCamelCase()};
+        $self->gateway = give_get_gateway_admin_label($donation->{DonationMetaKeys::GATEWAY()->getKeyAsCamelCase()});
         $self->createdAt = Date::getDateTime($donation->createdAt);
         $self->status = new DonationStatus($donation->status);
-        $self->paymentMode = $donation->{DonationMetaKeys::MODE()};
-        $self->anonymous = (bool)$donation->{DonationMetaKeys::ANONYMOUS()};
+        $self->paymentMode = $donation->{DonationMetaKeys::MODE()->getKeyAsCamelCase()};
+        $self->anonymous = (bool)$donation->{DonationMetaKeys::ANONYMOUS()->getKeyAsCamelCase()};
         $self->donationType = self::getDonationType($donation);
 
         return $self;
@@ -103,9 +109,8 @@ public static function fromObject($donation)
      * Convert DTO to array
      *
      * @since 2.20.0
-     * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         return get_object_vars($this);
     }
@@ -113,18 +118,30 @@ public function toArray()
     /**
      * Get donation type to display on front-end
      *
+     * @unreleased refactor conditional for subscription renewals
      * @since 2.20.0
-     * @param object $donation
-     * @return string
+     * @param  object  $donation
      */
-    private static function getDonationType($donation)
+    private static function getDonationType($donation): string
     {
-        if ($donation->{DonationMetaKeys::IS_RECURRING()}) {
-            if ($donation->{DonationMetaKeys::SUBSCRIPTION_INITIAL_DONATION()}) {
-                return 'subscription';
-            }
+        /**
+         * Initial donations will have a special meta key
+         */
+        if ($donation->{DonationMetaKeys::SUBSCRIPTION_INITIAL_DONATION()->getKeyAsCamelCase()}) {
+            return 'subscription';
+        }
+
+        $hasRenewalStatus = $donation->status === DonationStatus::RENEWAL;
+        $hasSubscriptionId = !empty($donation->{DonationMetaKeys::SUBSCRIPTION_ID()->getKeyAsCamelCase()});
+        $hasRenewalMetaKey = !empty($donation->{DonationMetaKeys::IS_RECURRING()->getKeyAsCamelCase()});
+
+        /**
+         * Renewals are determined by a few different ways through GiveWP versions
+         */
+        if ($hasRenewalStatus || $hasSubscriptionId || $hasRenewalMetaKey) {
             return 'renewal';
         }
+
         return 'single';
     }
 }

From a96046d9a9490da05444233db1ca97c9c30654b8 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Thu, 16 Jun 2022 23:57:02 +0530
Subject: [PATCH 51/53] Fix: LoggedIn donor can perform authorized actions in
 donor dashboard (#6450)

---
 .../components/subscription-cancel-modal/utils/index.js    | 7 +++----
 .../js/app/components/subscription-manager/index.js        | 6 ++++--
 .../js/app/components/subscription-manager/utils/index.js  | 7 +++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/DonorDashboards/resources/js/app/components/subscription-cancel-modal/utils/index.js b/src/DonorDashboards/resources/js/app/components/subscription-cancel-modal/utils/index.js
index 33c95989c5..00b7428d60 100644
--- a/src/DonorDashboards/resources/js/app/components/subscription-cancel-modal/utils/index.js
+++ b/src/DonorDashboards/resources/js/app/components/subscription-cancel-modal/utils/index.js
@@ -1,11 +1,10 @@
-import axios from 'axios';
-import {getAPIRoot} from '../../../utils';
+import {donorDashboardApi} from '../../../utils';
 import {fetchSubscriptionsDataFromAPI} from '../../../tabs/recurring-donations/utils';
 
 export const cancelSubscriptionWithAPI = (id) => {
-    return axios
+    return donorDashboardApi
         .post(
-            getAPIRoot() + 'give-api/v2/donor-dashboard/recurring-donations/subscription/cancel',
+            'recurring-donations/subscription/cancel',
             {
                 id: id,
             },
diff --git a/src/DonorDashboards/resources/js/app/components/subscription-manager/index.js b/src/DonorDashboards/resources/js/app/components/subscription-manager/index.js
index 61f3adb938..6456d98a96 100644
--- a/src/DonorDashboards/resources/js/app/components/subscription-manager/index.js
+++ b/src/DonorDashboards/resources/js/app/components/subscription-manager/index.js
@@ -62,7 +62,9 @@ const SubscriptionManager = ({id, subscription}) => {
 
         setIsUpdating(true);
 
-        const paymentMethod = await gatewayRef.current.getPaymentMethod();
+        const paymentMethod = gatewayRef.current ?
+            await gatewayRef.current.getPaymentMethod() :
+            {};
 
         if ('error' in paymentMethod) {
             setIsUpdating(false);
@@ -99,7 +101,7 @@ const SubscriptionManager = ({id, subscription}) => {
                     <Button onClick={handleUpdate}>
                         {updated ? (
                             <Fragment>
-                                {__('Updated', 'give')} <FontAwesomeIcon icon="check" fixedWidth />
+                                {__('Updated', 'give')} <FontAwesomeIcon icon="check" fixedWidth/>
                             </Fragment>
                         ) : (
                             <Fragment>
diff --git a/src/DonorDashboards/resources/js/app/components/subscription-manager/utils/index.js b/src/DonorDashboards/resources/js/app/components/subscription-manager/utils/index.js
index 2ddbace5d0..9c30e2ef9f 100644
--- a/src/DonorDashboards/resources/js/app/components/subscription-manager/utils/index.js
+++ b/src/DonorDashboards/resources/js/app/components/subscription-manager/utils/index.js
@@ -1,11 +1,10 @@
-import axios from 'axios';
-import {getAPIRoot} from '../../../utils';
+import {donorDashboardApi} from '../../../utils';
 import {fetchSubscriptionsDataFromAPI} from '../../../tabs/recurring-donations/utils';
 
 export const updateSubscriptionWithAPI = ({id, amount, paymentMethod}) => {
-    return axios
+    return donorDashboardApi
         .post(
-            getAPIRoot() + 'give-api/v2/donor-dashboard/recurring-donations/subscription/update',
+            'recurring-donations/subscription/update',
             {
                 id: id,
                 amount: amount,

From 5a08268af016c092a8987bc9bbf9971597c97e52 Mon Sep 17 00:00:00 2001
From: Ravinder Kumar <ravinder.kumar.apj@gmail.com>
Date: Fri, 17 Jun 2022 01:39:20 +0530
Subject: [PATCH 52/53] Fix: disable server side custom file name in export
 feature (#6458)

---
 .../admin/tools/export/class-batch-export.php  | 18 +++++++++---------
 includes/admin/tools/export/export-actions.php |  6 +++---
 .../admin/tools/export/export-functions.php    |  5 ++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/includes/admin/tools/export/class-batch-export.php b/includes/admin/tools/export/class-batch-export.php
index 1d912eefde..f8fd1e1616 100644
--- a/includes/admin/tools/export/class-batch-export.php
+++ b/includes/admin/tools/export/class-batch-export.php
@@ -116,6 +116,7 @@ class Give_Batch_Export extends Give_Export {
 	/**
 	 * Give_Batch_Export constructor.
 	 *
+     * @unreleased Create only csv file.
 	 * @since 2.9.0 add hash to filename to avoid collisions
 	 * @since 1.5
 	 *
@@ -123,18 +124,17 @@ class Give_Batch_Export extends Give_Export {
 	 * @param string|null $filename
 	 */
 	public function __construct( $_step = 1, $filename = null ) {
-
-		$upload_dir     = wp_upload_dir();
+        $upload_dir     = wp_upload_dir();
 		$this->filetype = '.csv';
 
-		if ( null === $filename ) {
-			$hash           = uniqid();
-			$this->filename = "give-{$hash}-{$this->export_type}{$this->filetype}";
-		} else {
-			$this->filename = $filename;
-		}
+        if ( null === $filename ) {
+            $hash           = uniqid();
+            $this->filename = "give-{$hash}-{$this->export_type}{$this->filetype}";
+        } else {
+            $this->filename = "{$filename}{$this->filetype}";
+        }
 
-		$this->file = trailingslashit( $upload_dir['basedir'] ) . $this->filename;
+        $this->file = trailingslashit( $upload_dir['basedir'] ) . $this->filename;
 
 		if ( ! is_writable( $upload_dir['basedir'] ) ) {
 			$this->is_writable = false;
diff --git a/includes/admin/tools/export/export-actions.php b/includes/admin/tools/export/export-actions.php
index d87e300287..bb76fab690 100644
--- a/includes/admin/tools/export/export-actions.php
+++ b/includes/admin/tools/export/export-actions.php
@@ -17,6 +17,7 @@
 /**
  * Process the download file generated by a batch export.
  *
+ * @unreleased Sanitize file name. Allow plain file name only.
  * @since 2.9.0 pass the filename received to the exporter
  * @since 1.5
  *
@@ -45,11 +46,10 @@ function give_process_batch_export_form() {
 	 */
 	do_action( 'give_batch_export_class_include', $_REQUEST['class'] );
 
-	$filename = $_REQUEST['file_name'];
+    $filename = basename(sanitize_file_name($_REQUEST['file_name']), '.csv');
 
-	$export = new $_REQUEST['class']( 1, $filename );
+    $export = new $_REQUEST['class']( 1, $filename );
 	$export->export();
-
 }
 
 add_action( 'give_form_batch_export', 'give_process_batch_export_form' );
diff --git a/includes/admin/tools/export/export-functions.php b/includes/admin/tools/export/export-functions.php
index 043af5b2d4..a01ecf8229 100755
--- a/includes/admin/tools/export/export-functions.php
+++ b/includes/admin/tools/export/export-functions.php
@@ -19,6 +19,7 @@
 /**
  * Process batch exports via ajax
  *
+ * @unreleased Sanitize file name. Allow plain file name only.
  * @since 1.5
  * @return void
  */
@@ -48,7 +49,9 @@ function give_do_ajax_export() {
 
 	$step     = absint( $_POST['step'] );
 	$class    = sanitize_text_field( $form['give-export-class'] );
-	$filename = isset( $_POST['file_name'] ) ? sanitize_text_field( $_POST['file_name'] ) : null;
+	$filename = isset( $_POST['file_name'] ) ?
+        basename(sanitize_file_name( $_POST['file_name'] ), '.csv') :
+        null;
 
 	/* @var Give_Batch_Export $export */
 	$export = new $class( $step, $filename );

From b68aab707f5c42e339a8d8327b2b6bf2ba72ba17 Mon Sep 17 00:00:00 2001
From: Jason Adams <jason.adams@impress.org>
Date: Thu, 16 Jun 2022 13:40:32 -0700
Subject: [PATCH 53/53] chore: prepare for 2.21.0 release

---
 give.php                                      |  6 ++---
 .../admin/tools/export/class-batch-export.php |  2 +-
 .../admin/tools/export/export-actions.php     |  2 +-
 .../admin/tools/export/export-functions.php   |  2 +-
 includes/class-give-readme-parser.php         |  2 +-
 includes/donors/actions.php                   |  2 +-
 includes/forms/functions.php                  |  2 +-
 includes/gateways/functions.php               |  2 +-
 .../class-give-stripe-card.php                |  4 ++--
 includes/install.php                          |  2 +-
 readme.txt                                    | 23 ++++++++++++++++++-
 .../DonationFormsRequestController.php        |  2 +-
 .../DonationFormsResponseData.php             | 12 +++++-----
 .../ValueObjects/DonationFormMetaKeys.php     |  2 +-
 .../DonationsRequestController.php            |  8 +++----
 .../DonationResponseData.php                  |  4 ++--
 .../Factories/DonationNoteFactory.php         |  2 +-
 src/Donations/Models/DonationNote.php         | 18 +++++++--------
 .../Repositories/DonationNotesRepository.php  | 16 ++++++-------
 .../Repositories/DonationRepository.php       | 12 +++++-----
 .../Controllers/DonorsRequestController.php   |  8 +++----
 src/Donors/Models/Donor.php                   |  2 +-
 src/Donors/Repositories/DonorRepository.php   |  6 ++---
 .../Actions/DetermineVisibilityForRequest.php | 16 ++++++-------
 .../Exceptions/DatabaseQueryException.php     |  4 ++--
 src/Framework/Exceptions/Traits/Loggable.php  |  2 +-
 .../PaymentCompleteHandler.php                |  2 +-
 .../CommandHandlers/PaymentHandler.php        |  4 ++--
 .../SubscriptionCompleteHandler.php           |  2 +-
 .../PaymentGateways/Log/PaymentGatewayLog.php |  2 +-
 .../PaymentGateways/PaymentGateway.php        |  8 +++----
 .../Adapters/LegacyPaymentGatewayAdapter.php  |  6 ++---
 src/Log/Log.php                               |  2 +-
 .../Migrations/CreateMigrationsTable.php      |  2 +-
 .../Actions/RegisterPaymentGateways.php       |  4 ++--
 .../CreatePayPalStandardPaymentURL.php        |  2 +-
 .../Actions/GetOrCreateStripeCustomer.php     |  4 ++--
 .../Stripe/Traits/CanSetupStripeApp.php       |  4 ++--
 .../Traits/HandlePaymentIntentStatus.php      |  2 +-
 .../Webhooks/Contracts/EventListener.php      |  4 ++--
 .../Webhooks/Listeners/ChargeRefunded.php     |  8 +++----
 .../Listeners/CheckoutSessionCompleted.php    |  6 ++---
 .../Listeners/PaymentIntentPaymentFailed.php  |  4 ++--
 .../Listeners/PaymentIntentSucceeded.php      |  6 ++---
 .../Stripe/Webhooks/StripeEventListener.php   | 12 +++++-----
 .../TestGateway/TestGatewayOffsite.php        |  4 ++--
 .../Repositories/SubscriptionRepository.php   | 10 ++++----
 47 files changed, 141 insertions(+), 120 deletions(-)

diff --git a/give.php b/give.php
index a6b22200a9..941ac3021b 100644
--- a/give.php
+++ b/give.php
@@ -6,7 +6,7 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 2.20.2
+ * Version: 2.21.0
  * Requires at least: 5.0
  * Requires PHP: 7.0
  * Text Domain: give
@@ -85,7 +85,7 @@
 /**
  * Main Give Class
  *
- * @unreleased Remove php dependency validation logic and constant
+ * @since 2.21.0 Remove php dependency validation logic and constant
  * @since 2.19.6 add $donations, $subscriptions, and replace $donors class with DonorRepositoryProxy
  * @since 2.8.0 build in a service container
  * @since 1.0
@@ -294,7 +294,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '2.20.2');
+            define('GIVE_VERSION', '2.21.0');
         }
 
         // Plugin Root File.
diff --git a/includes/admin/tools/export/class-batch-export.php b/includes/admin/tools/export/class-batch-export.php
index f8fd1e1616..1a497f36a1 100644
--- a/includes/admin/tools/export/class-batch-export.php
+++ b/includes/admin/tools/export/class-batch-export.php
@@ -116,7 +116,7 @@ class Give_Batch_Export extends Give_Export {
 	/**
 	 * Give_Batch_Export constructor.
 	 *
-     * @unreleased Create only csv file.
+     * @since 2.21.0 Create only csv file.
 	 * @since 2.9.0 add hash to filename to avoid collisions
 	 * @since 1.5
 	 *
diff --git a/includes/admin/tools/export/export-actions.php b/includes/admin/tools/export/export-actions.php
index bb76fab690..c25fd054f6 100644
--- a/includes/admin/tools/export/export-actions.php
+++ b/includes/admin/tools/export/export-actions.php
@@ -17,7 +17,7 @@
 /**
  * Process the download file generated by a batch export.
  *
- * @unreleased Sanitize file name. Allow plain file name only.
+ * @since 2.21.0 Sanitize file name. Allow plain file name only.
  * @since 2.9.0 pass the filename received to the exporter
  * @since 1.5
  *
diff --git a/includes/admin/tools/export/export-functions.php b/includes/admin/tools/export/export-functions.php
index a01ecf8229..2ded5206a0 100755
--- a/includes/admin/tools/export/export-functions.php
+++ b/includes/admin/tools/export/export-functions.php
@@ -19,7 +19,7 @@
 /**
  * Process batch exports via ajax
  *
- * @unreleased Sanitize file name. Allow plain file name only.
+ * @since 2.21.0 Sanitize file name. Allow plain file name only.
  * @since 1.5
  * @return void
  */
diff --git a/includes/class-give-readme-parser.php b/includes/class-give-readme-parser.php
index a3220d05b3..b8b9115c67 100644
--- a/includes/class-give-readme-parser.php
+++ b/includes/class-give-readme-parser.php
@@ -53,7 +53,7 @@ public function requires_at_least()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     protected function get_readme_file_content(): string
     {
diff --git a/includes/donors/actions.php b/includes/donors/actions.php
index 336d78047c..4750b20332 100644
--- a/includes/donors/actions.php
+++ b/includes/donors/actions.php
@@ -2,7 +2,7 @@
 /**
  * Insert donor comment to donation.
  *
- * @unreleased remove anonymous
+ * @since 2.21.0 remove anonymous
  * @since 2.2.0
  *
  * @param  int  $donation_id
diff --git a/includes/forms/functions.php b/includes/forms/functions.php
index 2100c33e46..4380ea3b6b 100644
--- a/includes/forms/functions.php
+++ b/includes/forms/functions.php
@@ -167,7 +167,7 @@ function give_send_to_success_page( $query_string = null ) {
  * @param array|string $args
  *
  * @access public
- * @unreleased Auto set "payment-mode" in redirect url.
+ * @since 2.21.0 Auto set "payment-mode" in redirect url.
  * @since  1.0
  * @return Void
  */
diff --git a/includes/gateways/functions.php b/includes/gateways/functions.php
index be3218ca95..ca25ae78d2 100644
--- a/includes/gateways/functions.php
+++ b/includes/gateways/functions.php
@@ -119,7 +119,7 @@ function give_get_default_gateway( $form_id ) {
 /**
  * Returns the admin label for the specified gateway
  *
- * @unreleased remove hard coded admin_labels
+ * @since 2.21.0 remove hard coded admin_labels
  * @since 1.0
  *
  * @param  string  $gateway  Name of the gateway to retrieve a label for
diff --git a/includes/gateways/stripe/includes/payment-methods/class-give-stripe-card.php b/includes/gateways/stripe/includes/payment-methods/class-give-stripe-card.php
index 40abb71265..8dc8c06327 100644
--- a/includes/gateways/stripe/includes/payment-methods/class-give-stripe-card.php
+++ b/includes/gateways/stripe/includes/payment-methods/class-give-stripe-card.php
@@ -32,7 +32,7 @@ class Give_Stripe_Card {
 
 
 		/**
-         * @unreleased recover method for legacy give-recurring usage.
+         * @since 2.21.0 recover method for legacy give-recurring usage.
          * @since  1.0
          *
 		 * Stripe uses it's own credit card form because the card details are tokenized.
@@ -49,7 +49,7 @@ class Give_Stripe_Card {
 		 */
 		public function addCreditCardForm( $form_id, $args, $echo = true ) {
             $form = $this->getCreditCardFormHTML($form_id, $args);
-            
+
             if ( false !== $echo ) {
 				echo $form;
 			}
diff --git a/includes/install.php b/includes/install.php
index e1fdae9e6b..d65c3c183f 100644
--- a/includes/install.php
+++ b/includes/install.php
@@ -525,7 +525,7 @@ function __give_get_tables()
  * Register classes
  * Note: only for internal purpose use
  *
- * @unreleased Install migration table on fresh install because this table is required to run migrations.
+ * @since 2.21.0 Install migration table on fresh install because this table is required to run migrations.
  * @since 2.3.1
  * @throws DatabaseMigrationException
  */
diff --git a/readme.txt b/readme.txt
index c828ae2ebb..1c0e8d4c93 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 5.0
 Tested up to: 6.0
 Requires PHP: 7.0
-Stable tag: 2.20.2
+Stable tag: 2.21.0
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -251,6 +251,27 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 8. GiveWP has a dedicated support team to help answer any questions you may have and help you through stumbling blocks.
 
 == Changelog ==
+= 2.21.0: June 16th, 2022 =
+* New: Fresh new look for the Donor Wall block and shortcode!
+* New: Form Grid looks has a great new look and more visual options!
+* Enhancement: The new Gateway API now uses he new Models
+* Enhancement: All failed queries are now logged with extra data to troubleshoot
+* Enhancement: Some minor visual improvements on the Logs admin page
+* Security: Remove an unused donor wall endpoint that made donor wall data too easy to access
+* Security: Donors can no longer immediately access the Donor Dashboard without authentication
+* Security: Further tightening of XSS protection per WordPress security guidelines
+* Security: Tighten up file exposure to GiveWP Managers in the Exporter
+* Fix: Prevent a notice and database error on fresh installs
+* Fix: Cleared up some notices that logging was causing
+* Fix: Admin notices no longer scrunch all weird-like up at the top of the page
+* Fix: Further compatibility fixes for PHP 8.1
+* Fix: Text aligns better for offline donations in the form
+* Fix: Stripe gracefully ignores events that come in from another platform
+* Fix: Brought back accidentally removed income goal stat filters. Thanks sc0ttkclark!
+* Fix: Make sure that all donation errors are caught and gracefully handled to inform the donor
+* Fix: Renewals now display the correct payment type in the admin donations list
+* Fix: Checkboxes (also created via Form Field Manager) no longer require being checked when conditionally hidden
+
 = 2.20.2: June 8th, 2022 =
 * Security: Donors are no longer able to view the Donor Dashboard for the email they donated in without logging in
 * Security: Added additional URL escaping around the codebase to protect against XSS attacks
diff --git a/src/DonationForms/Controllers/DonationFormsRequestController.php b/src/DonationForms/Controllers/DonationFormsRequestController.php
index c5d5d1fb89..463e70d1d4 100644
--- a/src/DonationForms/Controllers/DonationFormsRequestController.php
+++ b/src/DonationForms/Controllers/DonationFormsRequestController.php
@@ -9,7 +9,7 @@
 /**
  * Donation Forms Request Controller class
  *
- * @unreleased
+ * @since 2.21.0
  */
 class DonationFormsRequestController
 {
diff --git a/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php b/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
index 6e61f57d6d..55d392eb88 100644
--- a/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
+++ b/src/DonationForms/DataTransferObjects/DonationFormsResponseData.php
@@ -8,7 +8,7 @@
 /**
  * Class DonationFormsResponseData
  *
- * @unreleased
+ * @since 2.21.0
  */
 class DonationFormsResponseData implements Arrayable
 {
@@ -63,7 +63,7 @@ class DonationFormsResponseData implements Arrayable
      *
      * @param object $form
      *
-     * @unreleased
+     * @since 2.21.0
      */
     public static function fromObject($form): self
     {
@@ -87,7 +87,7 @@ public static function fromObject($form): self
     /**
      * Convert DTO to array
      *
-     * @unreleased
+     * @since 2.21.0
      */
     public function toArray(): array
     {
@@ -99,7 +99,7 @@ public function toArray(): array
      *
      * @return array
      *
-     * @unreleased
+     * @since 2.21.0
      */
     private function getGoal(int $formId): array
     {
@@ -137,7 +137,7 @@ private function getGoal(int $formId): array
      *
      * @return string
      *
-     * @unreleased
+     * @since 2.21.0
      */
     private function getFormAmount($form): string
     {
@@ -158,7 +158,7 @@ private function getFormAmount($form): string
      *
      * @return string
      *
-     * @unreleased
+     * @since 2.21.0
      */
     private function formatAmount(string $amount): string
     {
diff --git a/src/DonationForms/ValueObjects/DonationFormMetaKeys.php b/src/DonationForms/ValueObjects/DonationFormMetaKeys.php
index 43a1322f04..bad0fcd5bb 100644
--- a/src/DonationForms/ValueObjects/DonationFormMetaKeys.php
+++ b/src/DonationForms/ValueObjects/DonationFormMetaKeys.php
@@ -7,7 +7,7 @@
 /**
  * Donation Form Meta keys
  *
- * @unreleased
+ * @since 2.21.0
  *
  * @method static DonationFormMetaKeys FORM_EARNINGS()
  * @method static DonationFormMetaKeys DONATION_LEVELS()
diff --git a/src/Donations/Controllers/DonationsRequestController.php b/src/Donations/Controllers/DonationsRequestController.php
index 3a7849f97c..e4ad0cdc84 100644
--- a/src/Donations/Controllers/DonationsRequestController.php
+++ b/src/Donations/Controllers/DonationsRequestController.php
@@ -10,7 +10,7 @@
 /**
  * Donations Request Controller class
  *
- * @unreleased
+ * @since 2.21.0
  */
 class DonationsRequestController
 {
@@ -28,7 +28,7 @@ public function __construct(WP_REST_Request $request)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return array
      */
@@ -68,7 +68,7 @@ public function getDonations(): array
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return int
      */
@@ -84,7 +84,7 @@ public function getTotalDonationsCount(): int
 
     /**
      * @param QueryBuilder $query
-     * @unreleased
+     * @since 2.21.0
      *
      * @return QueryBuilder
      */
diff --git a/src/Donations/DataTransferObjects/DonationResponseData.php b/src/Donations/DataTransferObjects/DonationResponseData.php
index bd485fbfb7..8a798a3bce 100644
--- a/src/Donations/DataTransferObjects/DonationResponseData.php
+++ b/src/Donations/DataTransferObjects/DonationResponseData.php
@@ -78,7 +78,7 @@ class DonationResponseData implements Arrayable
      *
      * @param  object  $donation
      *
-     * @unreleased use meta keys as camelcase
+     * @since 2.21.0 use meta keys as camelcase
      * @since 2.20.0
      */
     public static function fromObject($donation): DonationResponseData
@@ -118,7 +118,7 @@ public function toArray(): array
     /**
      * Get donation type to display on front-end
      *
-     * @unreleased refactor conditional for subscription renewals
+     * @since 2.21.0 refactor conditional for subscription renewals
      * @since 2.20.0
      * @param  object  $donation
      */
diff --git a/src/Donations/Factories/DonationNoteFactory.php b/src/Donations/Factories/DonationNoteFactory.php
index 3f8880d566..af46c0ba91 100644
--- a/src/Donations/Factories/DonationNoteFactory.php
+++ b/src/Donations/Factories/DonationNoteFactory.php
@@ -7,7 +7,7 @@
 class DonationNoteFactory extends ModelFactory
 {
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return array
      */
diff --git a/src/Donations/Models/DonationNote.php b/src/Donations/Models/DonationNote.php
index 464977a194..09c4807e79 100644
--- a/src/Donations/Models/DonationNote.php
+++ b/src/Donations/Models/DonationNote.php
@@ -14,7 +14,7 @@
 use Give\Framework\Support\Facades\DateTime\Temporal;
 
 /**
- * @unreleased
+ * @since 2.21.0
  *
  * @property int $id
  * @property int $donationId
@@ -42,7 +42,7 @@ class DonationNote extends Model implements ModelCrud, ModelHasFactory
     ];
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return DonationNote|null
      */
@@ -53,7 +53,7 @@ public static function find($id)
 
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return $this
      * @throws Exception|InvalidArgumentException
@@ -68,7 +68,7 @@ public static function create(array $attributes): DonationNote
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return void
      * @throws Exception|InvalidArgumentException
@@ -83,7 +83,7 @@ public function save()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @throws Exception|InvalidArgumentException
      */
@@ -93,7 +93,7 @@ public function delete(): bool
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return ModelQueryBuilder<DonationNote>
      */
@@ -103,7 +103,7 @@ public static function query(): ModelQueryBuilder
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return ModelQueryBuilder<Donation>
      */
@@ -113,7 +113,7 @@ public function donation(): ModelQueryBuilder
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param  object  $object
      */
@@ -128,7 +128,7 @@ public static function fromQueryBuilderObject($object): DonationNote
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     public static function factory(): DonationNoteFactory
     {
diff --git a/src/Donations/Repositories/DonationNotesRepository.php b/src/Donations/Repositories/DonationNotesRepository.php
index 6aa5fe27ed..9ef368b43d 100644
--- a/src/Donations/Repositories/DonationNotesRepository.php
+++ b/src/Donations/Repositories/DonationNotesRepository.php
@@ -12,13 +12,13 @@
 use Give\Log\Log;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class DonationNotesRepository
 {
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @var string[]
      */
@@ -28,7 +28,7 @@ class DonationNotesRepository
     ];
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param int $noteId
      *
@@ -42,7 +42,7 @@ public function getById(int $noteId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param DonationNote $donationNote
      *
@@ -86,7 +86,7 @@ public function insert(DonationNote $donationNote)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param DonationNote $donationNote
      *
@@ -122,7 +122,7 @@ public function update(DonationNote $donationNote)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param DonationNote $donationNote
      *
@@ -155,7 +155,7 @@ public function delete(DonationNote $donationNote): bool
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param  int  $donationId
      *
@@ -169,7 +169,7 @@ public function queryByDonationId(int $donationId): ModelQueryBuilder
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param DonationNote $donationNote
      *
diff --git a/src/Donations/Repositories/DonationRepository.php b/src/Donations/Repositories/DonationRepository.php
index eaf7717f34..2b9177aaaa 100644
--- a/src/Donations/Repositories/DonationRepository.php
+++ b/src/Donations/Repositories/DonationRepository.php
@@ -28,7 +28,7 @@ class DonationRepository
     public $notes;
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     public function __construct()
     {
@@ -65,7 +65,7 @@ public function getById(int $donationId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return Donation|null
      */
     public function getByGatewayTransactionId($gatewayTransactionId)
@@ -74,7 +74,7 @@ public function getByGatewayTransactionId($gatewayTransactionId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return ModelQueryBuilder
      */
     public function queryByGatewayTransactionId($gatewayTransactionId)
@@ -158,7 +158,7 @@ public function queryByDonorId(int $donorId): ModelQueryBuilder
 
     /**
      *
-     * @unreleased replace actions with givewp_donation_creating and givewp_donation_created
+     * @since 2.21.0 replace actions with givewp_donation_creating and givewp_donation_created
      * @since 2.20.0 mutate model and return void
      * @since 2.19.6
      *
@@ -230,7 +230,7 @@ public function insert(Donation $donation)
     }
 
     /**
-     * @unreleased replace actions with givewp_donation_updating and givewp_donation_updated
+     * @since 2.21.0 replace actions with givewp_donation_updating and givewp_donation_updated
      * @since 2.20.0 return void
      * @since 2.19.6
      *
@@ -280,7 +280,7 @@ public function update(Donation $donation)
     }
 
     /**
-     * @unreleased replace actions with givewp_donation_deleting and givewp_donation_deleted
+     * @since 2.21.0 replace actions with givewp_donation_deleting and givewp_donation_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *
diff --git a/src/Donors/Controllers/DonorsRequestController.php b/src/Donors/Controllers/DonorsRequestController.php
index b161bfc9f5..7608778010 100644
--- a/src/Donors/Controllers/DonorsRequestController.php
+++ b/src/Donors/Controllers/DonorsRequestController.php
@@ -9,7 +9,7 @@
 /**
  * Donors Request Controller class
  *
- * @unreleased
+ * @since 2.21.0
  */
 class DonorsRequestController
 {
@@ -27,7 +27,7 @@ public function __construct(WP_REST_Request $request)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return array
      */
@@ -65,7 +65,7 @@ public function getDonors(): array
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return int
      */
@@ -79,7 +79,7 @@ public function getTotalDonorsCount(): int
 
     /**
      * @param QueryBuilder $builder
-     * @unreleased
+     * @since 2.21.0
      *
      * @return QueryBuilder
      */
diff --git a/src/Donors/Models/Donor.php b/src/Donors/Models/Donor.php
index f3e4b7432d..4abf9c85d0 100644
--- a/src/Donors/Models/Donor.php
+++ b/src/Donors/Models/Donor.php
@@ -94,7 +94,7 @@ public function hasEmail(string $donorEmail): bool
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param  int  $userId
      * @return Donor|null
diff --git a/src/Donors/Repositories/DonorRepository.php b/src/Donors/Repositories/DonorRepository.php
index c008709a00..6015281457 100644
--- a/src/Donors/Repositories/DonorRepository.php
+++ b/src/Donors/Repositories/DonorRepository.php
@@ -95,7 +95,7 @@ public function getAdditionalEmails(int $donorId)
     }
 
     /**
-     * @unreleased add actions givewp_donor_creating and givewp_donor_created
+     * @since 2.21.0 add actions givewp_donor_creating and givewp_donor_created
      * @since 2.20.0 mutate model and return void
      * @since 2.19.6
      *
@@ -160,7 +160,7 @@ public function insert(Donor $donor)
 
     /**
      *
-     * @unreleased add actions givewp_donor_updating and givewp_donor_updated
+     * @since 2.21.0 add actions givewp_donor_updating and givewp_donor_updated
      * @since 2.20.0 return void
      * @since 2.19.6
      *
@@ -243,7 +243,7 @@ public function updateLegacyColumns(int $donorId, array $columns): bool
 
     /**
      *
-     * @unreleased add actions givewp_donor_deleting and givewp_donor_deleted
+     * @since 2.21.0 add actions givewp_donor_deleting and givewp_donor_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *
diff --git a/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php b/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
index 7f24dc6155..ab473780e1 100644
--- a/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
+++ b/src/Form/LegacyConsumer/Actions/DetermineVisibilityForRequest.php
@@ -9,7 +9,7 @@
 use Give\ValueObjects\Money;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class DetermineVisibilityForRequest
 {
@@ -23,7 +23,7 @@ class DetermineVisibilityForRequest
     protected $postData;
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param Field $field
      * @param array $postData
      */
@@ -34,7 +34,7 @@ public function __construct(Field $field, array $postData)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     public function __invoke()
     {
@@ -47,7 +47,7 @@ public function __invoke()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return bool
      */
     protected function fieldHasVisibilityConditions()
@@ -57,7 +57,7 @@ protected function fieldHasVisibilityConditions()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param bool $visibility
      * @param Condition $condition
      * @return bool
@@ -72,7 +72,7 @@ protected function reduceVisibility($visibility, Condition $condition)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param Condition $condition
      * @return bool
      */
@@ -87,7 +87,7 @@ protected function compareConditionWithOperator(Condition $condition)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param BasicCondition $condition
      * @return bool
      */
@@ -120,7 +120,7 @@ protected function compareBasicConditionWithOperator(BasicCondition $condition)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @param $amount
      * @return int
      */
diff --git a/src/Framework/Database/Exceptions/DatabaseQueryException.php b/src/Framework/Database/Exceptions/DatabaseQueryException.php
index 4c644bb31e..46870be20e 100644
--- a/src/Framework/Database/Exceptions/DatabaseQueryException.php
+++ b/src/Framework/Database/Exceptions/DatabaseQueryException.php
@@ -11,7 +11,7 @@
  * An exception for when errors occurred within the database while performing a query, which stores the SQL errors the
  * database returned
  *
- * @unreleased Use the GiveWP exception class
+ * @since 2.21.0 Use the GiveWP exception class
  * @since 2.9.2
  */
 class DatabaseQueryException extends Exception
@@ -27,7 +27,7 @@ class DatabaseQueryException extends Exception
     private $query;
 
     /**
-     * @unreleased include query and query errors, and make auto-logging compatible
+     * @since 2.21.0 include query and query errors, and make auto-logging compatible
      * @since 2.9.2
      */
     public function __construct(
diff --git a/src/Framework/Exceptions/Traits/Loggable.php b/src/Framework/Exceptions/Traits/Loggable.php
index fa4109e54c..3711dbb24d 100644
--- a/src/Framework/Exceptions/Traits/Loggable.php
+++ b/src/Framework/Exceptions/Traits/Loggable.php
@@ -24,7 +24,7 @@ public function getLogMessage(): string
     /**
      * Returns an array with the basic context details
      *
-     * @unreleased Log meaningful data instead of entire exception object.
+     * @since 2.21.0 Log meaningful data instead of entire exception object.
      * @since 2.11.1
      *
      * @return array
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
index 558a934312..7737817853 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentCompleteHandler.php
@@ -16,7 +16,7 @@ public function __construct(PaymentComplete $paymentCommand)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     protected function getPaymentStatus(): DonationStatus
     {
diff --git a/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php b/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
index 91ad5fba53..3c77aa782c 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/PaymentHandler.php
@@ -16,7 +16,7 @@ abstract class PaymentHandler
     protected $paymentCommand;
 
     /**
-     * @unreleased change return type to DonationStatus
+     * @since 2.21.0 change return type to DonationStatus
      *
      * @since 2.18.0
      */
@@ -39,7 +39,7 @@ public static function make(PaymentCommand $paymentCommand): PaymentHandler
     }
 
     /**
-     * @unreleased replace $donationId with Donation model
+     * @since 2.21.0 replace $donationId with Donation model
      * @since 2.18.0
      *
      * @throws Exception
diff --git a/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php b/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
index 4ec3db71e2..95ae08c12f 100644
--- a/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
+++ b/src/Framework/PaymentGateways/CommandHandlers/SubscriptionCompleteHandler.php
@@ -12,7 +12,7 @@
 class SubscriptionCompleteHandler
 {
     /**
-     * @unreleased replace logic with models
+     * @since 2.21.0 replace logic with models
      * @since 2.18.0
      *
      * @throws Exception
diff --git a/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php b/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
index ae77759d63..7817c0be10 100644
--- a/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
+++ b/src/Framework/PaymentGateways/Log/PaymentGatewayLog.php
@@ -6,7 +6,7 @@
 use Give\Log\Log;
 
 /**
- * @unreleased Remove GatewayPaymentData related code and Update 'source' to payment gateway name
+ * @since 2.21.0 Remove GatewayPaymentData related code and Update 'source' to payment gateway name
  * @since 2.19.6 remove cardInfo from log
  * @since 2.18.0
  */
diff --git a/src/Framework/PaymentGateways/PaymentGateway.php b/src/Framework/PaymentGateways/PaymentGateway.php
index 53c314d4cb..c729a0ab1c 100644
--- a/src/Framework/PaymentGateways/PaymentGateway.php
+++ b/src/Framework/PaymentGateways/PaymentGateway.php
@@ -73,7 +73,7 @@ public function supportsSubscriptions(): bool
     }
 
     /**
-     * @unreleased Handle PHP exception.
+     * @since 2.21.0 Handle PHP exception.
      * @since 2.19.0
      */
     public function handleCreatePayment(Donation $donation)
@@ -100,7 +100,7 @@ public function handleCreatePayment(Donation $donation)
     }
 
     /**
-     * @unreleased Handle PHP exception.
+     * @since 2.21.0 Handle PHP exception.
      * @since 2.19.0
      *
      */
@@ -227,7 +227,7 @@ public function handleGatewayPaymentCommand(GatewayCommand $command, Donation $d
     /**
      * Handle gateway subscription command
      *
-     * @unreleased Handle RedirectOffsite response.
+     * @since 2.21.0 Handle RedirectOffsite response.
      * @since 2.18.0
      *
      * @throws TypeNotSupported
@@ -303,7 +303,7 @@ public function generateSecureGatewayRouteUrl(string $gatewayMethod, int $donati
      * 1. Redirect to donation form if donation form submit.
      * 2. Return json response if processing payment on ajax.
      *
-     * @unreleased Handle PHP exception.
+     * @since 2.21.0 Handle PHP exception.
      * @since 2.19.0
      */
     private function handleExceptionResponse(\Exception $exception, string $message)
diff --git a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
index 21a25c798b..50da32bfc9 100644
--- a/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
+++ b/src/LegacyPaymentGateways/Adapters/LegacyPaymentGatewayAdapter.php
@@ -35,7 +35,7 @@ public function getLegacyFormFieldMarkup(
     /**
      * First we create a payment, then move on to the gateway processing
      *
-     * @unreleased Replace give_insert_payment with donation model. Store legacy subscription data in donation meta.
+     * @since 2.21.0 Replace give_insert_payment with donation model. Store legacy subscription data in donation meta.
      *             Attach subscription id to donation.
      * @since 2.19.0 Replace is_recurring with is_donation_recurring to detect recurring donations.
      * @since 2.18.0
@@ -110,7 +110,7 @@ private function validateGatewayNonce(string $gatewayNonce)
     /**
      * Set donation id to purchase session for use in the donation receipt.
      *
-     * @unreleased
+     * @since 2.21.0
      *
      * @param $donationId
      *
@@ -127,7 +127,7 @@ private function setSession($donationId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param int|null $userId
      * @param string $donorEmail
diff --git a/src/Log/Log.php b/src/Log/Log.php
index ae08480831..faf9a7aa85 100644
--- a/src/Log/Log.php
+++ b/src/Log/Log.php
@@ -11,7 +11,7 @@
  *
  * The static facade intended to be the primary way of logging within GiveWP to make life easier.
  *
- * @unreleased Use array_diff_key to filter context data to prevent php warning with multi-dimension array
+ * @since 2.21.0 Use array_diff_key to filter context data to prevent php warning with multi-dimension array
  * @since 2.20.0 add sensitive information redaction; store context as arrays for JSON serialization
  * @since 2.19.6 added debug
  * @since 2.10.0
diff --git a/src/MigrationLog/Migrations/CreateMigrationsTable.php b/src/MigrationLog/Migrations/CreateMigrationsTable.php
index cf78a5b731..9bd6c2996e 100644
--- a/src/MigrationLog/Migrations/CreateMigrationsTable.php
+++ b/src/MigrationLog/Migrations/CreateMigrationsTable.php
@@ -44,7 +44,7 @@ public static function timestamp()
     }
 
     /**
-     * @unreleased Add Check whether table installed before adding it to database.
+     * @since 2.21.0 Add Check whether table installed before adding it to database.
      * @throws DatabaseMigrationException
      */
     public function run()
diff --git a/src/PaymentGateways/Actions/RegisterPaymentGateways.php b/src/PaymentGateways/Actions/RegisterPaymentGateways.php
index 16e59146fe..ad89870ede 100644
--- a/src/PaymentGateways/Actions/RegisterPaymentGateways.php
+++ b/src/PaymentGateways/Actions/RegisterPaymentGateways.php
@@ -62,7 +62,7 @@ public function __invoke(array $gateways): array
     /**
      * Register 3rd party payment gateways
      *
-     * @unreleased use givewp prefix for action
+     * @since 2.21.0 use givewp prefix for action
      * @since 2.18.0
      *
      * @param  PaymentGatewayRegister  $paymentGatewayRegister
@@ -75,7 +75,7 @@ private function register3rdPartyPaymentGateways(PaymentGatewayRegister $payment
     /**
      * Unregister 3rd party payment gateways
      *
-     * @unreleased use givewp prefix for action
+     * @since 2.21.0 use givewp prefix for action
      * @since 2.18.0
      *
      * @param  PaymentGatewayRegister  $paymentGatewayRegister
diff --git a/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php b/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
index 1d14e71c8f..c9bbfaabeb 100644
--- a/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
+++ b/src/PaymentGateways/Gateways/PayPalStandard/Actions/CreatePayPalStandardPaymentURL.php
@@ -93,7 +93,7 @@ private function supportLegacyFilter(array $paypalPaymentArguments, Donation $do
         /**
          * Filter the PayPal Standard redirect args.
          *
-         * @unreleased Create and pass legacy payment data to filter hook
+         * @since 2.21.0 Create and pass legacy payment data to filter hook
          * @since 1.8
          */
         return apply_filters_deprecated(
diff --git a/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php b/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
index 24056dd6f2..0b819b114b 100644
--- a/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
+++ b/src/PaymentGateways/Gateways/Stripe/Actions/GetOrCreateStripeCustomer.php
@@ -14,7 +14,7 @@ class GetOrCreateStripeCustomer
     /**
      * @since 2.20.0 add second param support to function.
      *             This param is optional because we use it only when donor subscribe for recurring donation.
-     * @unreleased Update function first argument type to Donation model
+     * @since 2.21.0 Update function first argument type to Donation model
      * @since 2.19.0
      *
      * @throws StripeCustomerException|Exception
@@ -33,7 +33,7 @@ public function __invoke(Donation $donation, string $stripePaymentMethodId = '')
     }
 
     /**
-     * @unreleased Update function first argument type to Donation model
+     * @since 2.21.0 Update function first argument type to Donation model
      * @since 2.19.0
      * @throws Exception
      */
diff --git a/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php b/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
index 967e609917..f92354513c 100644
--- a/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
+++ b/src/PaymentGateways/Gateways/Stripe/Traits/CanSetupStripeApp.php
@@ -3,12 +3,12 @@
 namespace Give\PaymentGateways\Gateways\Stripe\Traits;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 trait CanSetupStripeApp
 {
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param int $formId
      *
diff --git a/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php b/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
index 7f651650ad..60c76484c5 100644
--- a/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
+++ b/src/PaymentGateways/Gateways/Stripe/Traits/HandlePaymentIntentStatus.php
@@ -13,7 +13,7 @@
 trait HandlePaymentIntentStatus
 {
     /**
-     * @unreleased Update second argument type to Donation model
+     * @since 2.21.0 Update second argument type to Donation model
      * @since 2.19.7 fix param order and only pass donationId
      *
      * @return PaymentCommand|RedirectOffsite
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
index 8ca856a4cc..d7bc146f39 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Contracts/EventListener.php
@@ -5,12 +5,12 @@
 use Stripe\Event;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 interface EventListener
 {
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return void
      */
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
index 6daee75dd4..fd9f3936f6 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/ChargeRefunded.php
@@ -9,12 +9,12 @@
 use Stripe\Event;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class ChargeRefunded extends StripeEventListener
 {
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @inerhitDoc
      */
@@ -37,7 +37,7 @@ public function processEvent(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     private function addSupportForLegacyActionHook(Event $event)
     {
@@ -50,7 +50,7 @@ private function addSupportForLegacyActionHook(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @inerhitDoc
      */
     protected function getDonation(Event $event)
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
index 8b0dccad4d..42555fd86c 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/CheckoutSessionCompleted.php
@@ -10,13 +10,13 @@
 use Stripe\Event;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class CheckoutSessionCompleted extends StripeEventListener
 {
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @inerhitDoc
      */
@@ -36,7 +36,7 @@ public function processEvent(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return void
      */
     private function addSupportForLegacyActionHook($donationId, $event)
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
index 0d97460b13..6788386319 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentPaymentFailed.php
@@ -10,7 +10,7 @@ class PaymentIntentPaymentFailed extends StripeEventListener
 {
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @inerhitDoc
      */
@@ -29,7 +29,7 @@ public function processEvent(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     private function addSupportForLegacyActionHook(Event $event)
     {
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
index 43758e3b6e..3efc333261 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/Listeners/PaymentIntentSucceeded.php
@@ -8,13 +8,13 @@
 use Stripe\PaymentIntent;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 class PaymentIntentSucceeded extends StripeEventListener
 {
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @inerhitDoc
      */
     public function processEvent(Event $event)
@@ -37,7 +37,7 @@ public function processEvent(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      */
     private function addSupportForLegacyActionHook(Event $event)
     {
diff --git a/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php b/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php
index 1d31cd1fda..dc19083dc7 100644
--- a/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php
+++ b/src/PaymentGateways/Gateways/Stripe/Webhooks/StripeEventListener.php
@@ -10,14 +10,14 @@
 use Stripe\Event;
 
 /**
- * @unreleased
+ * @since 2.21.0
  */
 abstract class StripeEventListener implements EventListener
 {
     use CanSetupStripeApp;
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @throws Exception
      */
     public function __invoke(Event $event)
@@ -31,7 +31,7 @@ public function __invoke(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param string $eventId
      *
@@ -48,7 +48,7 @@ protected function getEventFromStripe($eventId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      * @return void
      */
     private function logEventReceiveTime()
@@ -58,7 +58,7 @@ private function logEventReceiveTime()
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return int|null
      */
@@ -72,7 +72,7 @@ protected function getFormId(Event $event)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @return Donation
      */
diff --git a/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php b/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
index 4ce1b76d69..574655c85e 100644
--- a/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
+++ b/src/PaymentGateways/Gateways/TestGateway/TestGatewayOffsite.php
@@ -99,7 +99,7 @@ public function createPayment(Donation $donation)
     /**
      * An example of using a routeMethod for extending the Gateway API to handle a redirect.
      *
-     * @unreleased update to use Donation model
+     * @since 2.21.0 update to use Donation model
      * @since 2.19.0
      *
      * @param  array  $queryParams
@@ -120,7 +120,7 @@ protected function returnFromOffsiteRedirect(array $queryParams): RedirectRespon
     /**
      * An example of using a secureRouteMethod for extending the Gateway API to handle a redirect.
      *
-     * @unreleased update to use Donation model
+     * @since 2.21.0 update to use Donation model
      * @since 2.19.0
      *
      * @param  array  $queryParams
diff --git a/src/Subscriptions/Repositories/SubscriptionRepository.php b/src/Subscriptions/Repositories/SubscriptionRepository.php
index 2bbec16bdb..9da3c21a0a 100644
--- a/src/Subscriptions/Repositories/SubscriptionRepository.php
+++ b/src/Subscriptions/Repositories/SubscriptionRepository.php
@@ -40,7 +40,7 @@ public function getById(int $subscriptionId)
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param string $gatewayTransactionId
      *
@@ -64,7 +64,7 @@ public function queryById(int $subscriptionId): ModelQueryBuilder
     }
 
     /**
-     * @unreleased
+     * @since 2.21.0
      *
      * @param string $gatewayTransactionId
      *
@@ -125,7 +125,7 @@ public function getNotesBySubscriptionId(int $id): array
     }
 
     /**
-     * @unreleased replace actions with givewp_subscription_creating and givewp_subscription_created
+     * @since 2.21.0 replace actions with givewp_subscription_creating and givewp_subscription_created
      * @since 2.19.6
      *
      * @return void
@@ -179,7 +179,7 @@ public function insert(Subscription $subscription)
     }
 
     /**
-     * @unreleased replace actions with givewp_subscription_updating and givewp_subscription_updated
+     * @since 2.21.0 replace actions with givewp_subscription_updating and givewp_subscription_updated
      * @since 2.19.6
      *
      * @return void
@@ -223,7 +223,7 @@ public function update(Subscription $subscription)
     }
 
     /**
-     * @unreleased replace actions with givewp_subscription_deleting and givewp_subscription_deleted
+     * @since 2.21.0 replace actions with givewp_subscription_deleting and givewp_subscription_deleted
      * @since 2.20.0 consolidate meta deletion into a single query
      * @since 2.19.6
      *