Merge branch 'epic/campaigns' into fix/campaign-cover-image-aspect-ra…

…tio-GIVE-2147

includes/gateways/stripe/includes/class-give-stripe-payment-intent.php

@@ -68,8 +68,11 @@ public function create( $args ) {
                 );
 
                 give_set_error('stripe_payment_intent_error',
-                    __('There was an issue with your donation transaction. Please check your payment method or contact your card issuer for assistance. If the issue persists, try a different payment method or contact the site administrators.',
-                        'give'));
+               	    sprintf( 
+                		__('There was an issue with your donation transaction: %s<br>Please check your payment method or contact your card issuer for assistance. If the issue persists, try a different payment method or contact the site administrators.', 'give'),
+                		$e->getMessage()
+                	)
+                );
 
                 return false;
             } // End try().

includes/payments/actions.php

@@ -135,6 +135,11 @@ function give_record_status_change( $payment_id, $new_status, $old_status ) {
 	$old_status = isset( $stati[ $old_status ] ) ? $stati[ $old_status ] : $old_status;
 	$new_status = isset( $stati[ $new_status ] ) ? $stati[ $new_status ] : $new_status;
 
+	// Skip recording payment status change if there is no update
+	if ( $old_status === $new_status ) {
+		return;
+	}
+
 	// translators: 1: old status 2: new status.
 	$status_change = sprintf( esc_html__( 'Status changed from %1$s to %2$s.', 'give' ), $old_status, $new_status );
 

package.json

@@ -69,7 +69,7 @@
         "@fortawesome/free-solid-svg-icons": "^5.15.1",
         "@fortawesome/react-fontawesome": "^0.1.12",
         "@givewp/design-system-foundation": "^1.2.0",
-        "@givewp/form-builder-library": "^1.7.0",
+        "@givewp/form-builder-library": "^1.7.1",
         "@hookform/error-message": "^2.0.1",
         "@hookform/resolvers": "^2.9.10",
         "@paypal/paypal-js": "^5.1.4",
@@ -91,7 +91,6 @@
         "@wordpress/interface": "^5.11.0",
         "@wordpress/server-side-render": "^4.2.0",
         "accounting": "^0.4.1",
-        "ajv": "^7.0.4",
         "axios": "^1.7.9",
         "chart.js": "^2.9.3",
         "chartjs-plugin-crosshair": "^1.1.4",
@@ -120,7 +119,6 @@
         "react-a11y-dialog": "^6.1.5",
         "react-acceptjs": "^0.3.0",
         "react-ace": "^10.1.0",
-        "react-apexcharts": "^1.4.1",
         "react-aria-components": "^1.0.0-alpha.6",
         "react-beautiful-dnd": "^13.1.1",
         "react-csv": "^2.0.1",