From 7e27dd17b2f22f54bbdd076427adb46169d65a0a Mon Sep 17 00:00:00 2001
From: Michael Schock <m@mjschock.com>
Date: Wed, 24 Jan 2018 15:35:35 -0800
Subject: [PATCH] STRF-4282 - Add support in Cornerstone to consume AMP ID

---
 CHANGELOG.md                      |  1 +
 config.json                       |  1 -
 schema.json                       | 10 ----------
 templates/layout/amp.html         |  2 +-
 templates/pages/amp/category.html |  4 ++--
 templates/pages/amp/product.html  |  4 ++--
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a691e9e17b..336afc38f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Draft
 - Fix logo not loading on order confirmation page [#1159](https://github.com/bigcommerce/cornerstone/pull/1159)
+- Add support in Cornerstone to consume AMP ID [#1155](https://github.com/bigcommerce/cornerstone/pull/1155)
 
 ## 1.12.1 (2018-01-23)
 - Fix event delegation error [#1151](https://github.com/bigcommerce/cornerstone/pull/1151)
diff --git a/config.json b/config.json
index 7171d65402..37f5ff5c1b 100644
--- a/config.json
+++ b/config.json
@@ -41,7 +41,6 @@
     "Firefox ESR"
   ],
   "settings": {
-    "amp_analytics_id": "",
     "homepage_new_products_count": 12,
     "homepage_featured_products_count": 8,
     "homepage_top_products_count": 8,
diff --git a/schema.json b/schema.json
index b465cbfd7b..60f4fc419c 100644
--- a/schema.json
+++ b/schema.json
@@ -2577,15 +2577,5 @@
         "id": "optimizedCheckout-loadingToaster-textColor"
       }
     ]
-  },
-  {
-    "name": "Google AMP (beta)",
-    "settings": [
-      {
-        "type": "text",
-        "label": "AMP Analytics ID",
-        "id": "amp_analytics_id"
-      }
-    ]
   }
 ]
diff --git a/templates/layout/amp.html b/templates/layout/amp.html
index 735b5acb88..3ba0911946 100644
--- a/templates/layout/amp.html
+++ b/templates/layout/amp.html
@@ -20,7 +20,7 @@
         {{{snippet 'htmlhead'}}}
         <script async custom-element="amp-form" src="https://cdn.ampproject.org/v0/amp-form-0.1.js"></script>
         <script async custom-element="amp-sidebar" src="https://cdn.ampproject.org/v0/amp-sidebar-0.1.js"></script>
-        {{#if theme_settings.amp_analytics_id}}
+        {{#if settings.amp_analytics_id}}
             <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
         {{/if}}
         {{#block "amp-scripts"}}{{/block}}
diff --git a/templates/pages/amp/category.html b/templates/pages/amp/category.html
index 7626847083..cc82531d23 100644
--- a/templates/pages/amp/category.html
+++ b/templates/pages/amp/category.html
@@ -42,12 +42,12 @@ <h1 class="categoryView-title">
     </main>
     {{> components/amp/category/subcategories}}
     {{> components/amp/common/footer }}
-    {{#if theme_settings.amp_analytics_id}}
+    {{#if settings.amp_analytics_id}}
         <amp-analytics type="googleanalytics">
             <script type="application/json">
             {
                 "vars": {
-                    "account": "{{theme_settings.amp_analytics_id}}"
+                    "account": "{{settings.amp_analytics_id}}"
                 },
                 "extraUrlParams": {
                     "cd1": "{{page_type}}",
diff --git a/templates/pages/amp/product.html b/templates/pages/amp/product.html
index 27d79a8c7d..f618dd458c 100644
--- a/templates/pages/amp/product.html
+++ b/templates/pages/amp/product.html
@@ -28,12 +28,12 @@
     <div itemscope itemtype="http://schema.org/Product">
         {{> components/amp/products/product-view schema=true}}
     </div>
-    {{#if theme_settings.amp_analytics_id}}
+    {{#if settings.amp_analytics_id}}
         <amp-analytics type="googleanalytics">
             <script type="application/json">
             {
                 "vars": {
-                    "account": "{{theme_settings.amp_analytics_id}}"
+                    "account": "{{settings.amp_analytics_id}}"
                 },
                 "extraUrlParams": {
                     "cd1": "{{page_type}}",