diff --git a/modules/ppcp-settings/resources/js/data/payment/resolvers.js b/modules/ppcp-settings/resources/js/data/payment/resolvers.js
index 321ddfee8..ebc6832bb 100644
--- a/modules/ppcp-settings/resources/js/data/payment/resolvers.js
+++ b/modules/ppcp-settings/resources/js/data/payment/resolvers.js
@@ -26,7 +26,6 @@ export const resolvers = {
 			yield dispatch( STORE_NAME ).setIsReady( true );
 		} catch ( e ) {
 			yield dispatch( 'core/notices' ).createErrorNotice(
-				// TODO: Add the module name to the error message.
 				__(
 					'Error retrieving payment details.',
 					'woocommerce-paypal-payments'
diff --git a/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php b/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
index 2786c6510..d985f07c1 100644
--- a/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
+++ b/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
@@ -9,6 +9,17 @@ declare( strict_types = 1 );
 
 namespace WooCommerce\PayPalCommerce\Settings\Endpoint;
 
+use WooCommerce\PayPalCommerce\Googlepay\GooglePayGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\BancontactGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\BlikGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\IDealGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\MultibancoGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\MyBankGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\P24Gateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\TrustlyGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\CardButtonGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
 use WP_REST_Server;
 use WP_REST_Response;
 use WP_REST_Request;
@@ -35,11 +46,21 @@ class PaymentRestEndpoint extends RestEndpoint {
 	 * @var array
 	 */
 	private array $gateway_ids = array(
-		'ppcp-gateway',
-		'ppcp-credit-card-gateway',
+		PayPalGateway::ID,
+		CardButtonGateway::ID,
+
+		CreditCardGateway::ID,
 		ApplePayGateway::ID,
+		GooglePayGateway::ID,
+
+		BancontactGateway::ID,
+		BlikGateway::ID,
 		EPSGateway::ID,
-		// Todo: Add all payment methods. Maybe via a filter instead of hard-coding it?
+		IDealGateway::ID,
+		MyBankGateway::ID,
+		P24Gateway::ID,
+		TrustlyGateway::ID,
+		MultibancoGateway::ID,
 	);
 
 	/**