{{!-- Your original code with ONLY namespace/key fixes --}}

{{ assign "manual_id" block.settings.manual_measurement_id }}

{{!-- FIX: Changed namespace from magic_google_analytics_4 to magicgoogleanalytics4 --}}
{{!-- FIX: Changed keys from measurement_id to measurementid (no underscore) --}}
{{ assign "meta_id" shop.metafields.magicgoogleanalytics4.measurementid.value }}
{{ assign "meta_enabled" shop.metafields.magicgoogleanalytics4.appenabled.value }}
{{ assign "meta_events" shop.metafields.magicgoogleanalytics4.enabledevents.value }}

{{#unless meta_id}}
  {{ assign "meta_id" shop.metafields.magicgoogleanalytics4.measurementid }}
{{/unless}}
{{#unless meta_events}}
  {{ assign "meta_events" shop.metafields.magicgoogleanalytics4.enabledevents }}
{{/unless}}

{{#if manual_id}}
  {{ assign "final_id" manual_id }}
  {{ assign "final_enabled" "true" }}
{{else}}
  {{ assign "final_id" meta_id }}
  {{ assign "final_enabled" meta_enabled }}
{{/if}}

{{ assign "shop_curr" shop.currency.iso_code }}
{{#unless shop_curr}}
  {{ assign "shop_curr" shop.currency }}
{{/unless}}

<meta id="magic-ga4-config" 
      data-measurement-id="{{ final_id }}" 
      data-currency="{{ shop_curr }}" 
      data-enabled-events="{{ meta_events }}"
      data-app-enabled="{{ final_enabled }}">

{{#if final_id}}
  {{#if product}}
  <meta id="magic-ga4-product-data"
        data-id="{{ product.id }}"
        data-title="{{ product.title }}"
        data-price="{{ product.price }}"
        data-vendor="{{ product.vendor }}"
        data-type="{{ product.type }}"
        data-variant-title="{{ product.selected_or_first_available_variant.title }}">
  {{/if}}

  {{#if cart}}
  
  {{ assign "cart_curr" cart.currency.iso_code }}
  {{#unless cart_curr}}
    {{ assign "cart_curr" cart.currency }}
  {{/unless}}

  <script type="application/json" id="magic-ga4-cart-blob">
  {
    "total_price": {{ cart.total_price }},
    "currency": "{{ cart_curr }}",
    "items": [
      {{#each cart.items}}
      {
        "id": "{{ product_id }}",
        "title": "{{ title }}",
        "product_title": "{{ product.title }}",
        "price": {{ final_price }},
        "quantity": {{ quantity }},
        "variant": "{{ variant_title }}",
        "brand": "{{ product.vendor }}", 
        "category": "{{ product.type }}"
      }{{#unless @last}},{{/unless}}
      {{/each}}
    ]
  }
  </script>
  
  <script>
    (function(){
      try {
        var el = document.getElementById('magic-ga4-cart-blob');
        if (el) window.MAGIC_CART_DATA = JSON.parse(el.textContent);
      } catch(e) { console.error('MagicGA4 Data Error', e); }
    })();
  </script>
  {{/if}}

  <script async src="https://www.googletagmanager.com/gtag/js?id={{ final_id }}"></script>
{{/if}}

{{#schema}}
{
  "name": "Magic Google Analytics 4",
  "target": "head",
  "javascript": ["magic-ga4.js"]
}
{{/schema}}