🔀 Merge #2006 into deploy/rinkeby

likecoin · Dec 31, 2024 · a92720e · a92720e
2 parents fcd314f + e375bec
commit a92720e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 34 deletions.
diff --git a/src/components/SiteTopBannerForChristmas.vue b/src/components/SiteTopBannerForChristmas.vue
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="flex flex-col items-stretch min-h-screen">
-    <SiteTopBannerForChristmas />
     <!-- <AlertBanner
       v-if="getRouteBaseName($route) !== 'nft-class-classId' && $route.params.classId !== alertBannerNFTClassId"
       :primary-button-text="$t('alert_banner_actions_purchase')"

diff --git a/src/layouts/index.vue b/src/layouts/index.vue
@@ -3,7 +3,6 @@
     <AlertBanner v-if="uiIsChainUpgrading">{{
       $t('notice_chain_upgrading')
     }}</AlertBanner>
-    <SiteTopBannerForChristmas />
 
     <nuxt
       :class="[

diff --git a/src/mixins/coupon.js b/src/mixins/coupon.js
@@ -1,22 +1,8 @@
-import {
-  CHRISTMAS_CAMPAIGN_MIN_SPEND,
-  CHRISTMAS_CAMPAIGN_COUPON,
-} from '@/constant/index';
-
 export default {
-  computed: {
-    mixinCoupon() {
-      return this.$route.query.coupon || '';
-    },
-  },
   methods: {
     getApplicableCoupon({ cartCoupon, checkoutPrice }) {
-      if (this.mixinCoupon || cartCoupon) {
-        return this.mixinCoupon || cartCoupon;
-      }
-      return checkoutPrice > CHRISTMAS_CAMPAIGN_MIN_SPEND
-        ? CHRISTMAS_CAMPAIGN_COUPON
-        : '';
+      const queryCoupon = this.$route.query.coupon || '';
+      return queryCoupon || cartCoupon || undefined;
     },
   },
 };
diff --git a/src/pages/store/index.vue b/src/pages/store/index.vue
@@ -13,7 +13,7 @@
             'w-full',
           ]"
         >
-          <nav class="relative flex items-center w-full">
+          <nav class="relative flex items-center min-w-0">
             <!-- Left arrow -->
             <div
               v-if="isTagsContainerOverflowing && !isTagsContainerAtStart"