Show matured balance

greymass · Jun 25, 2024 · bf3cf53 · bf3cf53
1 parent 14c661a
commit bf3cf53
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/src/pages/earn/index.svelte b/src/pages/earn/index.svelte
@@ -78,6 +78,23 @@
         }
     )
 
+    const maturedBalance: Readable<Asset> = derived(
+        [currentAccount, stateREX, systemToken],
+        ([$currentAccount, $stateREX, $systemToken]) => {
+            let value = 0
+            if ($currentAccount && $currentAccount.rex_info && $stateREX && $stateREX.value) {
+                if ($stateREX.value === 0.0001) {
+                    value =
+                        ($stateREX.total_lendable.value / $stateREX.total_rex.value) *
+                        Number($currentAccount.rex_info.matured_rex)
+                } else {
+                    value = $stateREX.value * Number($currentAccount.rex_info.matured_rex)
+                }
+            }
+            return Asset.fromUnits(value, $systemToken!.symbol)
+        }
+    )
+
     const rexToken: Readable<Token> = derived(
         [systemToken, rexBalance],
         ([$systemToken, $rexBalance]) => {
@@ -248,6 +265,7 @@
             />
         {:else if $step === Step.Overview}
             <REXOverview
+                maturedBalance={$maturedBalance}
                 rexBalance={$rexBalance}
                 toStake={() => switchStep(Step.Stake)}
                 toUnstake={() => switchStep(Step.Unstake)}
@@ -263,7 +281,7 @@
             <REXUnstake
                 bind:amount={selectedAmount}
                 token={$rexToken}
-                availableTokens={$rexBalance}
+                availableTokens={$maturedBalance}
                 nextStep={() => toStakeConfirm(Step.Unstake)}
             />
         {:else if $step === Step.Confirm}

diff --git a/src/pages/earn/step/overview.svelte b/src/pages/earn/step/overview.svelte
@@ -3,6 +3,7 @@
 
     import Button from '~/components/elements/button.svelte'
 
+    export let maturedBalance: Asset
     export let rexBalance: Asset
     export let toStake: () => void
     export let toUnstake: () => void
@@ -96,7 +97,8 @@
         <div class="rex">
             <div class="label">currently staked balance</div>
             <div class="balance">
-                {rexBalance}
+                {maturedBalance.value} / {rexBalance.value}
+                {rexBalance.symbol.name}
             </div>
             <div class="buttons">
                 <Button

diff --git a/src/pages/earn/step/unstake.svelte b/src/pages/earn/step/unstake.svelte
@@ -16,10 +16,12 @@
     export let availableTokens: Asset
     export let nextStep: () => void
 
+    let selectedToken: Token
+
     let tokenOptions: Token[] = []
     if (token) {
-        let newToken = {...token}
-        newToken.balance = availableTokens
+        let newToken = {...token, balance: availableTokens}
+        selectedToken = newToken
         tokenOptions = [newToken]
     }
     let amountValid = false
@@ -92,9 +94,9 @@
             <InputLabel>amount to unstake</InputLabel>
             <div class="token-selector">
                 <TokenSelector
-                    defaultToken={token}
+                    defaultToken={selectedToken}
                     {tokenOptions}
-                    selectedToken={token}
+                    {selectedToken}
                     onTokenSelect={() => {}}
                 />
             </div>