🔀 Merge master to deploy/rinkeby

likecoin · Sep 27, 2024 · b757cf1 · b757cf1
2 parents e8f3520 + 76e0fd7
commit b757cf1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/mixins/nft.js b/src/mixins/nft.js
@@ -203,7 +203,7 @@ export default {
       if (this.nftIsNFTBook) {
         return this.iscnDescription || this.NFTClassMetadata.description || '';
       }
-      return this.NFTClassMetadata.description;
+      return this.NFTClassMetadata.description || '';
     },
     nftDescription() {
       const overrideKey = `nft_override_${this.classId}_description`;

diff --git a/src/plugins/gtag.client.js b/src/plugins/gtag.client.js
@@ -12,8 +12,12 @@ export default (ctx, inject) => {
     Vue.use(
       VueGtag,
       {
-        config: { id: process.env.GA_TRACKING_ID },
-        bootstrap: !(window.doNotTrack || navigator.doNotTrack),
+        config: {
+          id: process.env.GA_TRACKING_ID,
+          allow_enhanced_conversions: !(
+            window.doNotTrack || navigator.doNotTrack
+          ),
+        },
         includes,
       },
       router

diff --git a/src/util/EventLogger.js b/src/util/EventLogger.js
@@ -78,6 +78,9 @@ export function updateLoggerUserInfo(
     };
     vue.$sentry.setUser(opt);
   }
+  if (vue.$gtag) {
+    if (email) vue.$gtag.set('user_data', { email });
+  }
   if (vue.$crisp) {
     if (email) {
       vue.$crisp.push(['set', 'user:email', [email, crispToken]]);