diff --git a/src/features/leverage-tokens/components/leverage-token-mint-modal/ConfirmStep.tsx b/src/features/leverage-tokens/components/leverage-token-mint-modal/ConfirmStep.tsx index 8db850a1..41c66e48 100644 --- a/src/features/leverage-tokens/components/leverage-token-mint-modal/ConfirmStep.tsx +++ b/src/features/leverage-tokens/components/leverage-token-mint-modal/ConfirmStep.tsx @@ -1,4 +1,4 @@ -import { ArrowDown, TrendingUp, Zap } from 'lucide-react' +import { ArrowDown, Zap } from 'lucide-react' import { AssetDisplay } from '../../../../components/ui/asset-display' import { Button } from '../../../../components/ui/button' import { Card } from '../../../../components/ui/card' @@ -18,6 +18,16 @@ interface LeverageTokenConfig { name: string leverageRatio: number chainId: number + collateralAsset: { + symbol: string + name: string + address: string + } + debtAsset: { + symbol: string + name: string + address: string + } } interface ConfirmStepProps { @@ -69,10 +79,10 @@ export function ConfirmStep({
-
- Minting -
- +
+ Depositing +
+ {amount} {selectedToken.symbol} @@ -83,19 +93,34 @@ export function ConfirmStep({
-
+
Receiving -
- +
+
{expectedTokens} {leverageTokenConfig.symbol} - {expectedDebtAmount && expectedDebtAmount !== '0' && debtAssetSymbol && ( - <> - {' '} +
+
+ + +
+ {expectedDebtAmount && expectedDebtAmount !== '0' && debtAssetSymbol && ( + <> +
+ {expectedDebtAmount} {debtAssetSymbol} - - )} - - +
+
+ +
+ + )}
diff --git a/src/features/leverage-tokens/components/leverage-token-mint-modal/InputStep.tsx b/src/features/leverage-tokens/components/leverage-token-mint-modal/InputStep.tsx index 3601ea9c..86ab60e7 100644 --- a/src/features/leverage-tokens/components/leverage-token-mint-modal/InputStep.tsx +++ b/src/features/leverage-tokens/components/leverage-token-mint-modal/InputStep.tsx @@ -1,4 +1,4 @@ -import { AlertTriangle, ArrowDown, Loader2, Settings, TrendingUp } from 'lucide-react' +import { AlertTriangle, ArrowDown, Loader2, Settings } from 'lucide-react' import { useEffect, useId, useRef } from 'react' import { cn } from '@/lib/utils/cn' import { Alert } from '../../../../components/ui/alert' @@ -36,6 +36,12 @@ interface LeverageTokenConfig { address: string decimals: number } + debtAsset: { + symbol: string + name: string + address: string + decimals: number + } slippagePresets?: { mint?: { defaultShareSlippage?: string @@ -316,48 +322,47 @@ export function InputStep({
Preview
- {isCalculating && ( -
- -
- )} -
- -
-
-
- {isCalculating ? : expectedTokens} -
- {!isCalculating && ( - <> -
- {expectedExcessDebt && expectedExcessDebt !== '0' && debtAssetSymbol && ( - <> - {' '} - + {expectedExcessDebt} {debtAssetSymbol} - - )} -
-
- {expectedTokensUsdOutStr && - expectedDebtUsdOutStr && - expectedTotalUsdOutStr && - expectedDebtUsdOutStr !== '0' - ? `≈ $${expectedTokensUsdOutStr} + $${expectedDebtUsdOutStr} = $${expectedTotalUsdOutStr}` - : `≈ $${expectedTokensUsdOutStr}`} -
- +
+ {isCalculating && ( + )} -
- -
-
- +
+ +
-
+ {leverageTokenConfig.symbol} -
+ +
+
+ +
+
+ {isCalculating ? : expectedTokens}
+ {!isCalculating && ( + <> +
+ {expectedExcessDebt && expectedExcessDebt !== '0' && debtAssetSymbol && ( + <> + + {expectedExcessDebt} {debtAssetSymbol} + + )} +
+
+ {expectedTokensUsdOutStr && + expectedDebtUsdOutStr && + expectedTotalUsdOutStr && + expectedDebtUsdOutStr !== '0' + ? `≈ $${expectedTokensUsdOutStr} + $${expectedDebtUsdOutStr} = $${expectedTotalUsdOutStr}` + : `≈ $${expectedTokensUsdOutStr}`} +
+ + )}
diff --git a/src/features/leverage-tokens/components/leverage-token-mint-modal/PendingStep.tsx b/src/features/leverage-tokens/components/leverage-token-mint-modal/PendingStep.tsx index b734edae..6cfbc47d 100644 --- a/src/features/leverage-tokens/components/leverage-token-mint-modal/PendingStep.tsx +++ b/src/features/leverage-tokens/components/leverage-token-mint-modal/PendingStep.tsx @@ -50,7 +50,7 @@ export function PendingStep({
- Minting + Receiving {expectedTokens} {leverageTokenConfig.symbol} {expectedDebtAmount && expectedDebtAmount !== '0' && debtAssetSymbol && ( diff --git a/src/features/leverage-tokens/components/leverage-token-mint-modal/SuccessStep.tsx b/src/features/leverage-tokens/components/leverage-token-mint-modal/SuccessStep.tsx index 0150b126..882f1feb 100644 --- a/src/features/leverage-tokens/components/leverage-token-mint-modal/SuccessStep.tsx +++ b/src/features/leverage-tokens/components/leverage-token-mint-modal/SuccessStep.tsx @@ -42,15 +42,15 @@ export function SuccessStep({

Mint Success!

- Your {amount} {selectedToken.symbol} has been successfully minted into {expectedTokens}{' '} - {leverageTokenSymbol}. + Your {amount} {selectedToken.symbol} has been successfully deposited to mint{' '} + {expectedTokens} {leverageTokenSymbol}.

- Minted + Deposited {amount} {selectedToken.symbol} diff --git a/src/features/leverage-tokens/components/leverage-token-mint-modal/index.tsx b/src/features/leverage-tokens/components/leverage-token-mint-modal/index.tsx index 5df7031e..fab1acb4 100644 --- a/src/features/leverage-tokens/components/leverage-token-mint-modal/index.tsx +++ b/src/features/leverage-tokens/components/leverage-token-mint-modal/index.tsx @@ -917,6 +917,8 @@ export function LeverageTokenMintModal({ name: leverageTokenConfig.name, leverageRatio: leverageTokenConfig.leverageRatio, chainId: leverageTokenConfig.chainId, + collateralAsset: leverageTokenConfig.collateralAsset, + debtAsset: leverageTokenConfig.debtAsset, }} onConfirm={handleConfirm} disabled={ @@ -971,8 +973,10 @@ export function LeverageTokenMintModal({
-
+
Redeeming -
- +
+ {amount} {selectedToken.symbol} - +
+ + +
@@ -88,19 +106,33 @@ export function ConfirmStep({
-
+
Receiving -
- +
+
{expectedAmount} {selectedAsset} - {expectedDebtAmount && expectedDebtAmount !== '0' && debtAssetSymbol && ( - <> - {' '} +
+
+ +
+ {expectedDebtAmount && expectedDebtAmount !== '0' && debtAssetSymbol && ( + <> +
+ {expectedDebtAmount} {debtAssetSymbol} - - )} - - +
+
+ +
+ + )}
@@ -113,10 +145,6 @@ export function ConfirmStep({ Leverage Token {leverageTokenConfig.name}
-
- Redeem Asset - {selectedAsset} -
Redemption Fee diff --git a/src/features/leverage-tokens/components/leverage-token-redeem-modal/InputStep.tsx b/src/features/leverage-tokens/components/leverage-token-redeem-modal/InputStep.tsx index aee24c38..9162db1a 100644 --- a/src/features/leverage-tokens/components/leverage-token-redeem-modal/InputStep.tsx +++ b/src/features/leverage-tokens/components/leverage-token-redeem-modal/InputStep.tsx @@ -1,8 +1,9 @@ -import { AlertTriangle, ArrowDown, Loader2, Settings, TrendingDown } from 'lucide-react' +import { AlertTriangle, ArrowDown, Loader2, Settings } from 'lucide-react' import { useEffect, useId, useRef } from 'react' import { SlippageInput } from '@/features/leverage-tokens/components/SlippageInput' import { cn } from '@/lib/utils/cn' import { Alert } from '../../../../components/ui/alert' +import { AssetDisplay } from '../../../../components/ui/asset-display' import { Button } from '../../../../components/ui/button' import { Card } from '../../../../components/ui/card' import { Input } from '../../../../components/ui/input' @@ -35,6 +36,12 @@ interface LeverageTokenConfig { address: string decimals: number } + debtAsset: { + symbol: string + name: string + address: string + decimals: number + } slippagePresets?: { redeem?: { defaultCollateralSlippage?: string @@ -208,9 +215,14 @@ export function InputStep({
-
-
- +
+
+ +
{leverageTokenConfig.symbol} @@ -298,46 +310,42 @@ export function InputStep({
Preview
- {isCalculating && ( -
- -
- )} -
- -
-
-
- {isCalculating ? : expectedTokens} -
- {!isCalculating && ( - <> -
- {expectedExcessDebt && expectedExcessDebt !== '0' && debtAssetSymbol && ( - <> - {' '} - + {expectedExcessDebt} {debtAssetSymbol} - - )} -
-
- {expectedTokensUsdOutStr && - expectedDebtUsdOutStr && - expectedTotalUsdOutStr && - expectedDebtUsdOutStr !== '0' - ? `≈ $${expectedTokensUsdOutStr} + $${expectedDebtUsdOutStr} = $${expectedTotalUsdOutStr}` - : `≈ $${expectedTokensUsdOutStr}`} -
- +
+ {isCalculating && ( + )} + + {collateralAssetSymbol}
+
-
-
- -
-
{collateralAssetSymbol}
+
+
+ {isCalculating ? : expectedTokens}
+ {!isCalculating && ( + <> +
+ {expectedExcessDebt && expectedExcessDebt !== '0' && debtAssetSymbol && ( + <> + + {expectedExcessDebt} {debtAssetSymbol} + + )} +
+
+ {expectedTokensUsdOutStr && + expectedDebtUsdOutStr && + expectedTotalUsdOutStr && + expectedDebtUsdOutStr !== '0' + ? `≈ $${expectedTokensUsdOutStr} + $${expectedDebtUsdOutStr} = $${expectedTotalUsdOutStr}` + : `≈ $${expectedTokensUsdOutStr}`} +
+ + )}
diff --git a/src/features/leverage-tokens/components/leverage-token-redeem-modal/SuccessStep.tsx b/src/features/leverage-tokens/components/leverage-token-redeem-modal/SuccessStep.tsx index 84832329..39f17ac7 100644 --- a/src/features/leverage-tokens/components/leverage-token-redeem-modal/SuccessStep.tsx +++ b/src/features/leverage-tokens/components/leverage-token-redeem-modal/SuccessStep.tsx @@ -36,7 +36,7 @@ export function SuccessStep({

Redemption Completed!

Your {amount} {leverageTokenSymbol} have been successfully redeemed for {expectedAmount}{' '} - {selectedAsset}. + {selectedAsset} and {actualDebtAmount} {debtAssetSymbol}.

@@ -81,8 +81,8 @@ export function SuccessStep({ Redemption complete

- Your {selectedAsset} has been transferred to your wallet. Track your remaining positions - in your Portfolio. + Your {selectedAsset} and {debtAssetSymbol} has been transferred to your wallet. Track + your remaining positions in your Portfolio.

diff --git a/src/features/leverage-tokens/components/leverage-token-redeem-modal/index.tsx b/src/features/leverage-tokens/components/leverage-token-redeem-modal/index.tsx index 2cc72715..1f0f70e4 100644 --- a/src/features/leverage-tokens/components/leverage-token-redeem-modal/index.tsx +++ b/src/features/leverage-tokens/components/leverage-token-redeem-modal/index.tsx @@ -929,6 +929,8 @@ export function LeverageTokenRedeemModal({ name: leverageTokenConfig.name, leverageRatio: leverageTokenConfig.leverageRatio, chainId: leverageTokenConfig.chainId, + collateralAsset: leverageTokenConfig.collateralAsset, + debtAsset: leverageTokenConfig.debtAsset, }} redemptionFee={fees?.redeemTreasuryFee} isRedemptionFeeLoading={isFeesLoading} @@ -986,11 +988,9 @@ export function LeverageTokenRedeemModal({