Merge pull request #115 from Safelite/feature/CSR-242

Keep static strings and replace dynamic ones

src/helpers/cms-content-helper.js

@@ -50,8 +50,15 @@ function mapStringToState(str) {
       }
     }
 
+    const stringWithReplacement = str.replace(match[0], storeState);
+
+    // If we still have values we need to substitute, call this function again.
+    if(stringWithReplacement.includes('{globalState:')) {
+      return mapStringToState(stringWithReplacement);
+    }
+
     // Concatenate the string.
-    stringBuilder = `${stringBuilder} ${storeState}`;
+    stringBuilder = `${stringBuilder} ${stringWithReplacement}`;
   }
 
   return stringBuilder.trimStart();