🔀 Merge master to deploy/rinkeby

likecoin · Sep 26, 2024 · 24a9737 · 24a9737
2 parents 6b244da + ff6bac6
commit 24a9737
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/src/mixins/nft-collection.js b/src/mixins/nft-collection.js
@@ -140,7 +140,6 @@ export default {
       await catchAxiosError(
         this.lazyFetchNFTCollectionPaymentPriceInfoByCollectionId({
           collectionId: this.collectionId,
-          coupon: this.$route.query.coupon,
         })
       );
     },

diff --git a/src/mixins/nft.js b/src/mixins/nft.js
@@ -818,7 +818,6 @@ export default {
         this.fetchNFTBookPaymentPriceInfoByClassIdAndPriceIndex({
           classId: this.classId,
           priceIndex: this.editionPriceIndex,
-          coupon: this.$route.query.coupon,
         })
       );
     },
@@ -827,7 +826,6 @@ export default {
         this.lazyFetchNFTBookPaymentPriceInfoByClassIdAndPriceIndex({
           classId: this.classId,
           priceIndex: this.editionPriceIndex,
-          coupon: this.$route.query.coupon,
         })
       );
     },
@@ -840,7 +838,6 @@ export default {
             this.lazyFetchNFTBookPaymentPriceInfoByClassIdAndPriceIndex({
               classId: this.classId,
               priceIndex: index,
-              coupon: this.$route.query.coupon,
             })
           );
         })

diff --git a/src/nuxt.config.js b/src/nuxt.config.js
@@ -258,7 +258,13 @@ const nuxtConfig = {
           'www.google.com',
           'googleads.g.doubleclick.net',
           'www.googleadservices.com',
+
+          // stripe
           'https://js.stripe.com',
+          'https://checkout.stripe.com',
+          'https://*.js.stripe.com',
+          'https://maps.googleapis.com',
+
           'https://unpkg.com/@google/[email protected]/',
           'https://substackapi.com',
           '*.crisp.chat',
@@ -269,7 +275,13 @@ const nuxtConfig = {
           'blob:',
           'www.google.com',
           'button.like.co',
+
+          // stripe
           'https://js.stripe.com',
+          'https://*.js.stripe.com',
+          'https://hooks.stripe.com',
+          'https://checkout.stripe.com',
+
           'bid.g.doubleclick.net',
           'td.doubleclick.net',
           'https://likecoin.github.io',
@@ -284,6 +296,12 @@ const nuxtConfig = {
           "'self'",
           'data:',
           '*',
+
+          // stripe
+          'https://checkout.stripe.com',
+          'https://api.stripe.com',
+          'https://maps.googleapis.com',
+
           'wss://client.relay.crisp.chat',
         ],
         'style-src': [

diff --git a/src/static/vendor/fbq.js b/src/static/vendor/fbq.js
@@ -7,5 +7,4 @@ t.src=v;s=b.getElementsByTagName(e)[0];
 s.parentNode.insertBefore(t,s)}(window, document,'script',
 'https://connect.facebook.net/en_US/fbevents.js');
 fbq('init', '1013529535523534');
-fbq('init', '4022559437964917');
 fbq('track', 'PageView');
diff --git a/src/store/modules/nft.js b/src/store/modules/nft.js
@@ -825,12 +825,12 @@ const actions = {
   },
   async fetchNFTBookPaymentPriceInfoByClassIdAndPriceIndex(
     { commit },
-    { classId, priceIndex, coupon }
+    { classId, priceIndex }
   ) {
     const {
       data: { fiatPrice, LIKEPrice },
     } = await this.$api.get(
-      api.getNFTBookPaymentPrice({ classId, priceIndex, coupon })
+      api.getNFTBookPaymentPrice({ classId, priceIndex })
     );
     const info = { fiatPrice, LIKEPrice };
     commit(TYPES.NFT_SET_NFT_CLASS_PAYMENT_PRICE_INFO, {
@@ -842,7 +842,7 @@ const actions = {
   },
   async lazyFetchNFTBookPaymentPriceInfoByClassIdAndPriceIndex(
     { getters, dispatch },
-    { classId, priceIndex, coupon }
+    { classId, priceIndex }
   ) {
     let info = getters.getNFTClassPaymentPriceById(classId, priceIndex);
     if (!info) {
@@ -851,7 +851,6 @@ const actions = {
         {
           classId,
           priceIndex,
-          coupon,
         }
       );
     }
@@ -916,14 +915,12 @@ const actions = {
   },
   async fetchNFTCollectionPaymentPriceInfoByCollectionId(
     { commit },
-    { collectionId, coupon }
+    { collectionId }
   ) {
     try {
       const {
         data: { fiatPricePrediscount, fiatPrice, LIKEPrice },
-      } = await this.$api.get(
-        api.getNFTBookPaymentPrice({ collectionId, coupon })
-      );
+      } = await this.$api.get(api.getNFTBookPaymentPrice({ collectionId }));
       const info = { fiatPricePrediscount, fiatPrice, LIKEPrice };
       commit(TYPES.NFT_SET_NFT_CLASS_PAYMENT_PRICE_INFO, {
         collectionId,
@@ -939,13 +936,13 @@ const actions = {
   },
   async lazyFetchNFTCollectionPaymentPriceInfoByCollectionId(
     { getters, dispatch },
-    { collectionId, coupon }
+    { collectionId }
   ) {
     let info = getters.getNFTClassPaymentPriceById(collectionId);
     if (!info) {
       info = await dispatch(
         'fetchNFTCollectionPaymentPriceInfoByCollectionId',
-        { collectionId, coupon }
+        { collectionId }
       );
     }
     return info;

diff --git a/src/util/api/index.js b/src/util/api/index.js
@@ -417,11 +417,9 @@ export const getNFTBookPaymentPrice = ({
   classId,
   collectionId,
   priceIndex,
-  coupon,
 }) => {
   const qsPayload = {
     price_index: priceIndex,
-    coupon,
   };
   return collectionId
     ? `${LIKECOIN_API_BASE}/likernft/book/collection/purchase/${collectionId}/price?${querystring.stringify(