✨ Add APY for USD0++ (#529)

* ✨ Add APY for USD0++ * 🐞 Remove pills from USD0++ cauldron and USD0 pool * consider magicusd0++ fee
Abracadabra-money · Jan 4, 2025 · 27d520d · 27d520d
1 parent 6b191dd
commit 27d520d
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 422 deletions.
diff --git a/src/assets/images/pools/pills-potions.png b/src/assets/images/pools/pills-potions.png
diff --git a/src/assets/images/pools/rewards/pills-icon.svg b/src/assets/images/pools/rewards/pills-icon.svg
diff --git a/src/components/cauldrons/CauldronCardItem.vue b/src/components/cauldrons/CauldronCardItem.vue
@@ -82,7 +82,6 @@ export default {
   data() {
     return {
       elixirPotions: [43, 44],
-      pillsPoints: [45],
     };
   },
 

diff --git a/src/components/cauldrons/RewardInfo.vue b/src/components/cauldrons/RewardInfo.vue
@@ -20,13 +20,6 @@
     </div>
   </div>
 
-  <div :class="['reward-info', { small }]" v-else-if="isPillsPoints">
-    <div class="additional-info">
-      <div class="additional-info-title">Pills Multiplier</div>
-      <div class="additional-info-value">1x - 6.3x</div>
-    </div>
-  </div>
-
   <div :class="['column', 'apr', { small }]" v-else>
     {{ loopApr }}
   </div>
@@ -53,7 +46,6 @@ export default {
   data() {
     return {
       elixirPotions: [43, 44],
-      pillsPoints: [45],
     };
   },
 
@@ -65,13 +57,6 @@ export default {
       );
     },
 
-    isPillsPoints() {
-      return (
-        this.cauldron.config.chainId === MAINNET_CHAIN_ID &&
-        this.pillsPoints.includes(this.cauldron.config.id)
-      );
-    },
-
     loopApr(): string {
       if (!this.cauldron.apr.value) return "-";
 

diff --git a/src/components/market/DynamicPillsMultiplier.vue b/src/components/market/DynamicPillsMultiplier.vue
diff --git a/src/components/market/LeverageBlock.vue b/src/components/market/LeverageBlock.vue
@@ -27,8 +27,6 @@
     v-if="hasElixirPotions"
   />
 
-  <DynamicPillsMultiplier :multiplier="multiplier" v-if="hasPillsPotions" />
-
   <DynamicallyEstimatedPrice
     :multiplier="multiplier"
     :cauldron="cauldron"
@@ -173,10 +171,6 @@ export default {
     hasElixirPotions() {
       return this.cauldron.config.cauldronSettings.hasElixirPotions;
     },
-
-    hasPillsPotions() {
-      return this.cauldron.config.cauldronSettings.isUSD0;
-    },
   },
 
   watch: {
@@ -308,9 +302,6 @@ export default {
     DynamicElixirPotionsMultiplier: defineAsyncComponent(
       () => import("@/components/market/DynamicElixirPotionsMultiplier.vue")
     ),
-    DynamicPillsMultiplier: defineAsyncComponent(
-      () => import("@/components/market/DynamicPillsMultiplier.vue")
-    ),
   },
 };
 </script>

diff --git a/src/components/market/MarketHead.vue b/src/components/market/MarketHead.vue
@@ -134,7 +134,6 @@ export default {
     potionText() {
       if (this.cauldron.config.cauldronSettings.hasElixirPotions)
         return "Earning Elixir Potions";
-      if (this.cauldron.config.cauldronSettings.isUSD0) return "Earning Pills";
 
       return "";
     },

diff --git a/src/components/pools/PoolListCard.vue b/src/components/pools/PoolListCard.vue
@@ -128,23 +128,6 @@
         <div class="pool-multiplier">5x Multiplier</div>
       </div>
     </template>
-
-    <template v-if="isPillsPotions">
-      <div class="line"></div>
-      <div class="rewards-wrap">
-        <div class="pool-rewards">
-          Rewards
-
-          <img
-            class="reward-icons"
-            src="@/assets/images/pools/pills-potions.png"
-            alt=""
-          />
-        </div>
-
-        <div class="pool-multiplier">1x Multiplier</div>
-      </div>
-    </template>
   </div>
 </template>
 
@@ -242,10 +225,6 @@ export default {
     isElixir() {
       return this.pool.config.id === 1 && this.pool.config.chainId === 1;
     },
-
-    isPillsPotions() {
-      return this.pool.config.id === 2 && this.pool.config.chainId === 1;
-    },
   },
 
   methods: {

diff --git a/src/components/pools/pool/PillsPotions.vue b/src/components/pools/pool/PillsPotions.vue
diff --git a/src/components/pools/pool/TokenPair.vue b/src/components/pools/pool/TokenPair.vue
@@ -26,10 +26,6 @@
       <p class="name">
         {{ pool.name }}
       </p>
-      <div class="pills-wrap" v-if="isPillsLabel">
-        <img src="@/assets/images/pools/rewards/pills-icon.svg" />
-        <span>1x Multiplier </span>
-      </div>
       <div class="deprecated-wrap" v-if="isDeprecatedFarm">
         <span>Deprecated</span>
       </div>
@@ -92,12 +88,6 @@ export default {
     quoteTokenConfig() {
       return this.pool.tokens.quoteToken.config;
     },
-
-    isPillsLabel() {
-      return (
-        this.pool.config.settings.rewardPointsType === "pills" && this.isLabal
-      );
-    },
   },
 
   methods: { getChainIcon },
@@ -164,31 +154,4 @@ export default {
   text-align: start;
   min-width: 110px;
 }
-
-.pills-wrap {
-  border-radius: 33px;
-  border: 1px solid var(--Primary-Gradient, #2d4a96);
-  background: linear-gradient(90deg, #1c2b53 0%, #303063 100%),
-    linear-gradient(
-      90deg,
-      rgba(45, 74, 150, 0.12) 0%,
-      rgba(116, 92, 210, 0.12) 100%
-    );
-  display: flex;
-  padding: 2px 5px;
-  align-items: flex-start;
-  gap: 4px;
-
-  font-size: 14px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: normal;
-  min-width: 120px;
-}
-
-@media screen and (max-width: 600px) {
-  .pills-wrap {
-    display: none;
-  }
-}
 </style>