Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Add APY for USD0++ #529

Merged
merged 4 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed src/assets/images/pools/pills-potions.png
Binary file not shown.
9 changes: 0 additions & 9 deletions src/assets/images/pools/rewards/pills-icon.svg

This file was deleted.

1 change: 0 additions & 1 deletion src/components/cauldrons/CauldronCardItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ export default {
data() {
return {
elixirPotions: [43, 44],
pillsPoints: [45],
};
},

Expand Down
15 changes: 0 additions & 15 deletions src/components/cauldrons/RewardInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -53,7 +46,6 @@ export default {
data() {
return {
elixirPotions: [43, 44],
pillsPoints: [45],
};
},

Expand All @@ -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 "-";

Expand Down
93 changes: 0 additions & 93 deletions src/components/market/DynamicPillsMultiplier.vue

This file was deleted.

9 changes: 0 additions & 9 deletions src/components/market/LeverageBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
v-if="hasElixirPotions"
/>

<DynamicPillsMultiplier :multiplier="multiplier" v-if="hasPillsPotions" />

<DynamicallyEstimatedPrice
:multiplier="multiplier"
:cauldron="cauldron"
Expand Down Expand Up @@ -173,10 +171,6 @@ export default {
hasElixirPotions() {
return this.cauldron.config.cauldronSettings.hasElixirPotions;
},

hasPillsPotions() {
return this.cauldron.config.cauldronSettings.isUSD0;
},
},

watch: {
Expand Down Expand Up @@ -308,9 +302,6 @@ export default {
DynamicElixirPotionsMultiplier: defineAsyncComponent(
() => import("@/components/market/DynamicElixirPotionsMultiplier.vue")
),
DynamicPillsMultiplier: defineAsyncComponent(
() => import("@/components/market/DynamicPillsMultiplier.vue")
),
},
};
</script>
Expand Down
1 change: 0 additions & 1 deletion src/components/market/MarketHead.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 "";
},
Expand Down
21 changes: 0 additions & 21 deletions src/components/pools/PoolListCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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: {
Expand Down
90 changes: 0 additions & 90 deletions src/components/pools/pool/PillsPotions.vue

This file was deleted.

37 changes: 0 additions & 37 deletions src/components/pools/pool/TokenPair.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 },
Expand Down Expand Up @@ -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>
Loading