From 94e15c7f44b1d20174a2e509fc41ca349db383ee Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Thu, 24 Apr 2025 20:32:28 +0200
Subject: [PATCH] Improve currency code validation

---
 apps/api/src/validators/is-currency-code.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/api/src/validators/is-currency-code.ts b/apps/api/src/validators/is-currency-code.ts
index 34a82c481..841871146 100644
--- a/apps/api/src/validators/is-currency-code.ts
+++ b/apps/api/src/validators/is-currency-code.ts
@@ -25,19 +25,20 @@ export class IsExtendedCurrencyConstraint
   implements ValidatorConstraintInterface
 {
   public defaultMessage() {
-    return '$value must be a valid ISO4217 currency code';
+    return '$property must be a valid ISO4217 currency code';
   }
 
   public validate(currency: any) {
     // Return true if currency is a standard ISO 4217 code or a derived currency
     return (
-      isISO4217CurrencyCode(currency) ||
-      [
-        ...DERIVED_CURRENCIES.map((derivedCurrency) => {
-          return derivedCurrency.currency;
-        }),
-        'USX'
-      ].includes(currency)
+      /^[A-Z]+$/.test(currency) &&
+      (isISO4217CurrencyCode(currency) ||
+        [
+          ...DERIVED_CURRENCIES.map((derivedCurrency) => {
+            return derivedCurrency.currency;
+          }),
+          'USX'
+        ].includes(currency))
     );
   }
 }