🔀 Merge #1920 updates into deploy/rinkeby

likecoin · Oct 29, 2024 · 0391b4c · 0391b4c
2 parents 47b438d + caa903f
commit 0391b4c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/src/constant/index.js b/src/constant/index.js
@@ -326,12 +326,20 @@ export const CROSS_SELL_PRODUCT_IDS_MAP = IS_TESTNET
       likenft1434x9tl07ysrjq9lvxv0thgn0zt2fxwhntefd249lawrznw08lrskr3jfp: [
         'likenft1l2v3qdv4qj0pyv2tmme42dv0962csaxxhezk04jr9s2rved08s4s4x6633',
       ],
+      likenft1xl38uu5q7fsxcr02msjtx7jstsfz8lu6ex8nq0pksfgxx3yszkws6ngwr9: [
+        'likenft1e4espt79md5gg2lc0wqfu5zf75jsvce3qjfsxmfctdgyaede7vaq6qh94n',
+        'likenft19fnr8azkstpn2u8k6qc4hvk6qfhf3dly5d9gqsxrdt0c525w4gask7zmje',
+        'likenft1uq0jhw2wng9u0d7fgqdhy6zwwp48ympwfcafcekasyd7aq3j6xpqsch6px',
+        'likenft1t32cf8pnfqh7rsuz8gqa6y39mzc36yglehskp2t86g8ph07n0r2swezn2m',
+        'likenft1ekvx3en9l0640kv9fd5n5hvltwyfl443ymyu2cnhmalvjfy0cdcqqa3l6h',
+      ],
     };
 
 export const DISABLED_CROSS_SELL_POPUP_LIST = [
   'likenft17zq3r5t2qwfatle04sz680vl3ka0l8wfeu4n5jv26mnvawnfqs4qd773ny', // 坐監情緒學
   'likenft1434x9tl07ysrjq9lvxv0thgn0zt2fxwhntefd249lawrznw08lrskr3jfp', // 來一場散步學
   'likenft1l2v3qdv4qj0pyv2tmme42dv0962csaxxhezk04jr9s2rved08s4s4x6633', // 鯨魚之城
+  'likenft1xl38uu5q7fsxcr02msjtx7jstsfz8lu6ex8nq0pksfgxx3yszkws6ngwr9', // 基恩敬拜
 ];
 
 export const AFFILIATION_CHANNEL_LEGACY_STRINGS = {

diff --git a/src/mixins/bookstore.js b/src/mixins/bookstore.js
@@ -18,7 +18,9 @@ export default {
       return this.$i18n.locale.includes(items.locales);
     },
     filterBookstoreListItemsByLocale(books) {
-      return books.filter(this.checkBookstoreListItemIsMatchedLocale);
+      return Array.isArray(books)
+        ? books.filter(this.checkBookstoreListItemIsMatchedLocale)
+        : [];
     },
   },
 };
diff --git a/src/mixins/wallet-login.js b/src/mixins/wallet-login.js
@@ -56,7 +56,7 @@ export default {
           logTrackerEvent(
             this,
             'user',
-            `connect_wallet_done$_with_login`,
+            `connect_wallet_done_with_login`,
             'connect_wallet_done',
             1
           );

diff --git a/src/pages/store/index.vue b/src/pages/store/index.vue
@@ -591,7 +591,12 @@ export default {
   head() {
     const title = this.$t('store_index_page_title');
     const description = this.$t('store_books_page_description');
-    const link = [{ rel: 'canonical', href: `${this.$route.path}` }];
+    const link = [
+      {
+        rel: 'canonical',
+        href: this.canonicalLink,
+      },
+    ];
     const classIds = Array.from(
       new Set(this.bookstoreItems.map(b => b.classId).flat())
     );
@@ -681,6 +686,16 @@ export default {
       'getNFTClassMetadataById',
     ]),
 
+    canonicalLink() {
+      const { tag, q } = this.$route.query;
+      if (tag) {
+        return `${this.$route.path}?tag=${tag}`;
+      }
+      if (q && this.sortedBookstoreItems.length) {
+        return `${this.$route.path}?q=${q}`;
+      }
+      return this.$route.path;
+    },
     // Price filter related
     priceFilterList() {
       return [