fix: use USD X,XXX format instead of $X,XXX for all currency values

- format_money_figures() now outputs "USD 1,800" not "$1,800"
- Normalizes any existing $ or USD prefix before re-formatting
- emphasize_keywords() bolds "USD X,XXX" patterns in bold
- All monetary figures in paragraphs, tables, steps, bullets are bold + USD format
- All 89 tests pass

app/services/utils.py

@@ -48,47 +48,42 @@ def is_truthy(val) -> bool:
 
 
 def format_money_figures(text: str) -> str:
-    """Mirrors PHP formatMoneyFigures().
+    """Normalize all monetary figures to "USD X,XXX" format.
 
-    - Strips "USD " prefix
-    - Adds $ to large numbers
+    - Converts existing $X,XXX → USD X,XXX
+    - Normalizes bare large numbers → USD X,XXX
     - Formats with commas
+    - Currency type is always USD (no $ symbol)
     """
     if not text:
         return text
 
-    # Remove "USD " prefix
-    text = re.sub(r"\bUSD\s*", "", text, flags=re.IGNORECASE)
+    # Normalize "$X,XXX" → bare number (strip $ symbol)
+    text = re.sub(r'\$([\d,]+(?:\.\d+)?)', lambda m: m.group(1), text)
+
+    # Normalize "USD X,XXX" → bare number for uniform re-processing
+    text = re.sub(r'\bUSD\s+([\d,]+(?:\.\d+)?)', lambda m: m.group(1), text, flags=re.IGNORECASE)
 
     def _format_match(m: re.Match) -> str:
         num_str = m.group(1).replace(",", "")
         dec = m.group(2) if m.group(2) else ""
-        num = float(num_str)
+        try:
+            num = float(num_str)
+        except ValueError:
+            return m.group(0)
         if dec:
             formatted = f"{num:,.{len(dec)}f}"
         else:
             formatted = f"{num:,.0f}"
-        return "$" + formatted
+        return "USD " + formatted
 
-    # Add $ to large numbers (with optional decimals)
+    # Add "USD " to large numbers (4+ digits or already comma-formatted)
     text = re.sub(
-        r"(?<![$0-9])(?<!\$)((?:\d{1,3}(?:,\d{3})+)|(?:\d{4,}))(?:\.(\d+))?(?![%\d/])",
+        r"(?<!\d)((?:\d{1,3}(?:,\d{3})+)|(?:\d{4,}))(?:\.(\d+))?(?![%\d/])",
         _format_match,
         text,
     )
 
-    # Ensure remaining 4+ digit numbers are formatted with commas and $
-    def _format_remaining(m: re.Match) -> str:
-        num_str = m.group(1).replace(",", "")
-        formatted = f"{float(num_str):,.0f}"
-        return "$" + formatted
-
-    text = re.sub(
-        r"(?<!\$)\b(\d{1,3}(?:,\d{3})+|\d{4,})(?![%\d/])",
-        _format_remaining,
-        text,
-    )
-
     return text
 
 
@@ -161,11 +156,12 @@ def emphasize_keywords(text: str) -> str:
         flags=re.IGNORECASE,
     )
 
-    # Bold dollar amounts like $1,000 or $500
+    # Bold USD amounts like USD 1,000 or USD 500
     escaped = re.sub(
-        r'(\$[\d,]+(?:\.\d+)?)',
+        r'\b(USD\s+[\d,]+(?:\.\d+)?)',
         r'<strong>\1</strong>',
         escaped,
+        flags=re.IGNORECASE,
     )
 
     # Bold key qualification and geo terms.

app/templates/partials/blocks/table.html

@@ -26,7 +26,8 @@
             {% for c in block.data.all_columns %}
             {% set col_label = c.label | default('') %}
             {% set col_lc = col_label | lower %}
-            <th class="{% if col_lc == 'regular' %}is-regular-col{% elif col_lc == 'prime' %}is-prime-col{% endif %}">{{ c.label | e }}</th>
+            <th class="{% if col_lc == 'regular' %}is-regular-col{% elif col_lc == 'prime' %}is-prime-col{% endif %}">{{
+                c.label | e }}</th>
             {% endfor %}
         </tr>
         {% endif %}
@@ -37,7 +38,8 @@
             {% for c in block.data.all_columns %}
             {% set col_label = c.label | default('') %}
             {% set col_lc = col_label | lower %}
-            <td class="{% if col_lc == 'regular' %}is-regular-col{% elif col_lc == 'prime' %}is-prime-col{% endif %}">{{ row[c.key] | default('') | safe }}</td>
+            <td class="{% if col_lc == 'regular' %}is-regular-col{% elif col_lc == 'prime' %}is-prime-col{% endif %}">{{
+                row[c.key] | default('') | safe }}</td>
             {% endfor %}
         </tr>
         {% endfor %}
@@ -67,7 +69,8 @@
         <tr>
             {% for col in block.data.columns %}
             {% set col_lc = (col | lower) %}
-            <th class="{% if col_lc == 'regular' %}is-regular-col{% elif col_lc == 'prime' %}is-prime-col{% endif %}">{{ col | e }}</th>
+            <th class="{% if col_lc == 'regular' %}is-regular-col{% elif col_lc == 'prime' %}is-prime-col{% endif %}">{{
+                col | e }}</th>
             {% endfor %}
         </tr>
     </thead>
@@ -76,10 +79,11 @@
         {% for row in block.data.rows %}
         <tr>
             {% for cell in row %}
-            {% set col = block.data.columns[loop.index0] if block.data.columns and loop.index0 < (block.data.columns | length) else '' %}
-            {% set col_lc = (col | lower) %}
-            <td class="{% if col_lc == 'regular' %}is-regular-col{% elif col_lc == 'prime' %}is-prime-col{% endif %}">{{ cell | safe }}</td>
-            {% endfor %}
+            {% set col = block.data.columns[loop.index0] if block.data.columns and loop.index0 < (block.data.columns |
+                length) else '' %} {% set col_lc=(col | lower) %} <td
+                class="{% if col_lc == 'regular' %}is-regular-col{% elif col_lc == 'prime' %}is-prime-col{% endif %}">{{
+                cell | safe }}</td>
+                {% endfor %}
         </tr>
         {% endfor %}
     </tbody>

tests/test_renderers.py

@@ -70,15 +70,16 @@ def test_is_truthy_false_values():
 
 # ── format_money_figures() ──
 
-def test_format_money_removes_usd_prefix():
+def test_format_money_usd_prefix_normalised():
     result = format_money_figures("USD 5000")
-    assert "USD" not in result
-    assert "$" in result
+    assert "USD 5,000" in result
+    assert "$" not in result
 
 
-def test_format_money_adds_dollar_sign():
+def test_format_money_formats_as_usd():
     result = format_money_figures("The cost is 15000 per year")
-    assert "$15,000" in result
+    assert "USD 15,000" in result
+    assert "$" not in result
 
 
 def test_format_money_preserves_percentages():