Skip to content

Commit bc1863c

Browse files
author
anujHstk
authored
Merge pull request #423 from 0xHashstack/development-V1
REFACTORING Updated pool apr checks for jediswap and removed the apr calculations wherever necessary [DONE]
2 parents 1d9d570 + b365536 commit bc1863c

File tree

6 files changed

+31
-67
lines changed

6 files changed

+31
-67
lines changed

‎src/components/layouts/degenDashboard/index.tsx‎

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ const DegenDashboard: React.FC<BorrowDashboardProps> = ({
14501450
display="flex"
14511451
justifyContent="space-between"
14521452
gap={10}
1453-
mb={borrow?.dappName === 'ZKlend' ? '2' : '0'}
1453+
mb="2"
14541454
>
14551455
<Text>$STRK APR ({borrow?.leverage ===5 ?4.98:borrow?.leverage}x):</Text>
14561456
<Text>
@@ -1462,12 +1462,11 @@ const DegenDashboard: React.FC<BorrowDashboardProps> = ({
14621462
</Text>
14631463
</Box>
14641464

1465-
{borrow?.dappName === 'Jediswap' && (
1465+
{/* {borrow?.dappName === 'Jediswap' && (
14661466
<Box
14671467
display="flex"
14681468
justifyContent="space-between"
14691469
gap={10}
1470-
mb="2"
14711470
>
14721471
<Text>
14731472
Jedi STRK APR ({borrow?.leverage ===5 ?4.98:borrow?.leverage}x):
@@ -1493,7 +1492,7 @@ const DegenDashboard: React.FC<BorrowDashboardProps> = ({
14931492
%
14941493
</Text>
14951494
</Box>
1496-
)}
1495+
)} */}
14971496
<hr />
14981497
<Box
14991498
display="flex"
@@ -1515,21 +1514,8 @@ const DegenDashboard: React.FC<BorrowDashboardProps> = ({
15151514
borrow?.secondary,
15161515
borrow?.dappName
15171516
) +
1518-
getBoostedApr(borrow?.debt) +
1519-
(100 *
1520-
365 *
1521-
(getStrkAlloaction(
1522-
borrow?.secondary
1523-
) *
1524-
oraclePrices?.find(
1525-
(curr: any) =>
1526-
curr.name === 'STRK'
1527-
)?.price)) /
1528-
getTvlByPool(
1529-
poolAprs,
1530-
borrow?.secondary,
1531-
borrow?.dappName
1532-
)) +
1517+
getBoostedApr(borrow?.debt)
1518+
) +
15331519
(stats?.find(
15341520
(stat: any) =>
15351521
stat?.token === borrow?.collateral
@@ -1588,18 +1574,8 @@ const DegenDashboard: React.FC<BorrowDashboardProps> = ({
15881574
borrow?.secondary,
15891575
borrow?.dappName
15901576
) +
1591-
getBoostedApr(borrow?.debt) +
1592-
(100 *
1593-
365 *
1594-
(getStrkAlloaction(borrow?.secondary) *
1595-
oraclePrices?.find(
1596-
(curr: any) => curr.name === 'STRK'
1597-
)?.price)) /
1598-
getTvlByPool(
1599-
poolAprs,
1600-
borrow?.secondary,
1601-
borrow?.dappName
1602-
)) +
1577+
getBoostedApr(borrow?.debt)
1578+
) +
16031579
(stats?.find(
16041580
(stat: any) =>
16051581
stat?.token === borrow?.collateral

‎src/components/layouts/strkDashboard/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,15 +1112,15 @@ const StrkDashboard = () => {
11121112
{pool}
11131113
</Text>
11141114
</Box>
1115-
<Box display="flex" mt="0.5rem" gap="0.8rem">
1115+
<Box display="flex" justifyContent="center" mt="0.5rem" gap="0.8rem" width="150px">
11161116
<Text fontSize="10px" color="#BDBFC1" fontWeight="400">
11171117
Pool APR:{' '}
11181118
{numberFormatterPercentage(
11191119
getAprByPool(poolApr, pool, 'Jediswap')
11201120
)}
11211121
%
11221122
</Text>
1123-
<Text fontSize="10px" color="#BDBFC1" fontWeight="400">
1123+
{/* <Text fontSize="10px" color="#BDBFC1" fontWeight="400">
11241124
$STRK APR:{' '}
11251125
{numberFormatterPercentage(
11261126
String(
@@ -1134,7 +1134,7 @@ const StrkDashboard = () => {
11341134
)
11351135
)}
11361136
%
1137-
</Text>
1137+
</Text> */}
11381138
</Box>
11391139
<Box
11401140
mt="0.5rem"

‎src/components/modals/LiquidityProvision.tsx‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ import AnimatedButton from "../uiElements/buttons/AnimationButton";
101101
import ErrorButton from "../uiElements/buttons/ErrorButton";
102102
import SuccessButton from "../uiElements/buttons/SuccessButton";
103103
import SliderTooltip from "../uiElements/sliders/sliderTooltip";
104+
import STRKLogo from "@/assets/icons/coins/strk";
104105
const LiquidityProvisionModal = ({
105106
borrowIDCoinMap,
106107
borrowIds,
@@ -281,6 +282,8 @@ const LiquidityProvisionModal = ({
281282
return <ETHLogo height={"16px"} width={"16px"} />;
282283
case "DAI":
283284
return <DAILogo height={"16px"} width={"16px"} />;
285+
case 'STRK':
286+
return <STRKLogo height={'16px'} width={'16px'} />
284287
case "Jediswap":
285288
return <JediswapLogo />;
286289
case "ETH/USDT":
@@ -1162,11 +1165,11 @@ const LiquidityProvisionModal = ({
11621165
alignItems="center"
11631166
gap="1"
11641167
pr="2"
1165-
borderBottom={
1166-
index == 2 && currentSwap == "Jediswap"
1167-
? "1px solid #30363D"
1168-
: ""
1169-
}
1168+
// borderBottom={
1169+
// index == 2 && currentSwap == "Jediswap"
1170+
// ? "1px solid #30363D"
1171+
// : ""
1172+
// }
11701173
onMouseEnter={()=>{
11711174
sethoverPoolIndex(index)
11721175
}}
@@ -1270,7 +1273,7 @@ const LiquidityProvisionModal = ({
12701273
)}
12711274
%
12721275
</Box>
1273-
{index <= 2 && currentSwap == "Jediswap" && (
1276+
{/* {index <= 2 && currentSwap == "Jediswap" && (
12741277
<Box
12751278
fontSize="10px"
12761279
color="#B1B0B5"
@@ -1296,7 +1299,7 @@ const LiquidityProvisionModal = ({
12961299
)}
12971300
%
12981301
</Box>
1299-
)}
1302+
)} */}
13001303
</Box>
13011304
</Box>
13021305
</Box>

‎src/components/modals/borrowModal.tsx‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3356,11 +3356,6 @@ const [currentSplit, setCurrentSplit] = useState<
33563356
//@ts-ignore
33573357
setToMarketLiqB(pool.split('/')[1])
33583358
}}
3359-
borderBottom={
3360-
index == 2 && currentDapp == 'Jediswap'
3361-
? '1px solid #30363D'
3362-
: ''
3363-
}
33643359
>
33653360
{(poolHoverIndex===-1? pool === currentPool:poolHoverIndex===index) && (
33663361
<Box
@@ -3463,7 +3458,7 @@ const [currentSplit, setCurrentSplit] = useState<
34633458
)}
34643459
%
34653460
</Box>
3466-
{index <= 2 &&
3461+
{/* {index <= 2 &&
34673462
currentDapp == 'Jediswap' && (
34683463
<Box
34693464
fontSize="10px"
@@ -3490,7 +3485,7 @@ const [currentSplit, setCurrentSplit] = useState<
34903485
)}
34913486
%
34923487
</Box>
3493-
)}
3488+
)} */}
34943489
</Box>
34953490
</Box>
34963491
</Box>

‎src/components/modals/tradeModal.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3323,11 +3323,11 @@ const TradeModal = ({
33233323
//@ts-ignore
33243324
setToMarketLiqB(pool.split('/')[1])
33253325
}}
3326-
borderBottom={
3327-
index == 2 && currentDapp == 'Jediswap'
3328-
? '1px solid #30363D'
3329-
: ''
3330-
}
3326+
// borderBottom={
3327+
// index == 2 && currentDapp == 'Jediswap'
3328+
// ? '1px solid #30363D'
3329+
// : ''
3330+
// }
33313331
>
33323332
{(poolHoverIndex===-1? pool === currentPool:poolHoverIndex===index) && (
33333333
<Box
@@ -3429,7 +3429,7 @@ const TradeModal = ({
34293429
)}
34303430
%
34313431
</Box>
3432-
{index <= 2 &&
3432+
{/* {index <= 2 &&
34333433
currentDapp == 'Jediswap' && (
34343434
<Box
34353435
fontSize="10px"
@@ -3456,7 +3456,7 @@ const TradeModal = ({
34563456
)}
34573457
%
34583458
</Box>
3459-
)}
3459+
)} */}
34603460
</Box>
34613461
</Box>
34623462
</Box>

‎src/pages/v1/degen/index.tsx‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -523,18 +523,8 @@ const Degen: NextPage = () => {
523523
borrow?.secondary,
524524
borrow?.dappName
525525
) +
526-
getBoostedApr(borrow?.debt) +
527-
(100 *
528-
365 *
529-
(getStrkAlloaction(borrow?.secondary) *
530-
oraclePrices?.find(
531-
(curr: any) => curr.name === 'STRK'
532-
)?.price)) /
533-
getTvlByPool(
534-
poolAprs,
535-
borrow?.secondary,
536-
borrow?.dappName
537-
)) +
526+
getBoostedApr(borrow?.debt)
527+
) +
538528
(stats?.find(
539529
(stat: any) =>
540530
stat?.token === borrow?.collateral

0 commit comments

Comments
 (0)