remove redemption fee from stats, make it always visible on redemptio…

…n page, clarify that redemption fee is not for repaying a loan
dvdese · Apr 13, 2021 · 81e3d1c · 81e3d1c
1 parent 8cd2750
commit 81e3d1c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/packages/dev-frontend/src/components/Redemption/DisabledRedemption.tsx b/packages/dev-frontend/src/components/Redemption/DisabledRedemption.tsx
@@ -13,7 +13,7 @@ export const DisabledRedemption: React.FC<DisabledRedemptionProps> = ({
   unlockDate
 }) => (
   <Card>
-    <Heading>Redemption</Heading>
+    <Heading>Redeem</Heading>
 
     <Box sx={{ p: [2, 3] }}>
       <InfoMessage

diff --git a/packages/dev-frontend/src/components/Redemption/RedemptionManager.tsx b/packages/dev-frontend/src/components/Redemption/RedemptionManager.tsx
@@ -88,7 +88,7 @@ export const RedemptionManager: React.FC = () => {
   return (
     <Card>
       <Heading>
-        Redemption
+        Redeem
         {dirty && !changePending && (
           <Button
             variant="titleIcon"
@@ -113,15 +113,13 @@ export const RedemptionManager: React.FC = () => {
           setEditedAmount={amount => setLUSDAmount(Decimal.from(amount))}
         />
 
-        {dirty && (
-          <StaticRow
-            label="Fee"
-            inputId="redeem-fee"
-            amount={ethFee.toString(4)}
-            pendingAmount={feePct.toString(2)}
-            unit="ETH"
-          />
-        )}
+        <StaticRow
+          label="Redemption Fee"
+          inputId="redeem-fee"
+          amount={ethFee.toString(4)}
+          pendingAmount={feePct.toString(2)}
+          unit="ETH"
+        />
 
         {((dirty || !canRedeem) && description) || (
           <ActionDescription>Enter the amount of {COIN} you'd like to redeem.</ActionDescription>

diff --git a/packages/dev-frontend/src/components/SystemStats.tsx b/packages/dev-frontend/src/components/SystemStats.tsx
@@ -72,7 +72,6 @@ export const SystemStats: React.FC<SystemStatsProps> = ({ variant = "info", show
     lusdInStabilityPool,
     total,
     borrowingRate,
-    redemptionRate,
     totalStakedLQTY,
     kickbackRate
   } = useLiquitySelector(select);
@@ -81,7 +80,6 @@ export const SystemStats: React.FC<SystemStatsProps> = ({ variant = "info", show
     total.debt.nonZero && new Percent(lusdInStabilityPool.div(total.debt));
   const totalCollateralRatioPct = new Percent(total.collateralRatio(price));
   const borrowingFeePct = new Percent(borrowingRate);
-  const redemptionFeePct = new Percent(redemptionRate);
   const kickbackRatePct = frontendTag === AddressZero ? "100" : kickbackRate?.mul(100).prettify();
 
   return (
@@ -100,12 +98,6 @@ export const SystemStats: React.FC<SystemStatsProps> = ({ variant = "info", show
       >
         {borrowingFeePct.toString(2)}
       </Statistic>
-      <Statistic
-        name="Redemption Fee"
-        tooltip="The Redemption Fee is charged as a percentage of the redeemed Ether. The Redemption Fee depends on LUSD redemption volumes and is 0.5% at minimum.        "
-      >
-        {redemptionFeePct.toString(2)}
-      </Statistic>
 
       <Statistic
         name="TVL"

diff --git a/packages/dev-frontend/src/pages/RedemptionPage.tsx b/packages/dev-frontend/src/pages/RedemptionPage.tsx
@@ -26,13 +26,17 @@ export const RedemptionPage: React.FC = () => {
                 Redemptions are expected to be carried out by bots when arbitrage opportunities
                 emerge.
               </Paragraph>
-              <Paragraph>
+              <Paragraph sx={{ mt: 2 }}>
                 Most of the time you will get a better rate for converting LUSD to ETH on{" "}
                 <Link href={uniLink(addresses["lusdToken"])} target="_blank">
                   Uniswap <Icon name="external-link-alt" size="xs" />
                 </Link>{" "}
                 or other exchanges.
               </Paragraph>
+              <Paragraph sx={{ mt: 2 }}>
+                <strong>Note</strong>: Redemption is not for repaying your loan. To repay your loan,
+                adjust your Trove on the <Link href="#/">Dashboard</Link>.
+              </Paragraph>
             </InfoMessage>
           </Box>
         </Card>