Merge branch 'apporc_fix' into kurt-resource-test

greymass · Oct 2, 2024 · 94b3cbb · 94b3cbb
2 parents f8631b6 + 466a721
commit 94b3cbb
Showing 1 changed file with 31 additions and 25 deletions.
diff --git a/src/pages/earn/index.svelte b/src/pages/earn/index.svelte
@@ -121,9 +121,32 @@
         return Asset.fromUnits(result, $systemToken!.symbol)
     }
 
+    const rexEOSBalance: Writable<Asset> = writable(Asset.from(0, $systemToken!.symbol))
+    onMount(async () => {
+        const client = getClient($activeBlockchain.chainId)
+        const unsubscribe = currentAccount.subscribe(async (account) => {
+            const result = await client.v1.chain.get_table_rows({
+                code: 'eosio',
+                scope: 'eosio',
+                table: 'rexfund',
+                json: true,
+                lower_bound: $currentAccount?.account_name,
+                upper_bound: $currentAccount?.account_name,
+            })
+            if (result.rows.length > 0) {
+                rexEOSBalance.set(Asset.from(result.rows[0].balance, $systemToken!.symbol))
+            } else {
+                rexEOSBalance.set(Asset.from(0, $systemToken!.symbol))
+            }
+        })
+        return () => {
+            unsubscribe()
+        }
+    })
+
     const rexInfo: Readable<REXInfo> = derived(
-        [currentAccount, stateREX, systemToken],
-        ([$currentAccount, $stateREX, $systemToken]) => {
+        [currentAccount, stateREX, systemToken, rexEOSBalance],
+        ([$currentAccount, $stateREX, $systemToken, $rexEOSBalance]) => {
             let defaultZero = Asset.from(0, $systemToken!.symbol)
             let total = defaultZero
             let savings = defaultZero
@@ -138,6 +161,12 @@
                 apy = ((annualReward / totalStaked) * 100).toFixed(2)
                 if ($currentAccount && $currentAccount.rex_info) {
                     total = convertRexToEos($currentAccount.rex_info.rex_balance.value)
+                    if ($rexEOSBalance.value > 0) {
+                        total = Asset.fromUnits(
+                            total.units.adding($rexEOSBalance.units),
+                            $systemToken!.symbol
+                        )
+                    }
 
                     const claimableBuckets = $currentAccount.rex_info.rex_maturities.filter(
                         (maturity) => +new Date(maturity.first!.toString()) < +now
@@ -190,29 +219,6 @@
         return result
     })
 
-    const rexEOSBalance: Writable<Asset> = writable(Asset.from(0, $systemToken!.symbol))
-    onMount(async () => {
-        const client = getClient($activeBlockchain.chainId)
-        const unsubscribe = currentAccount.subscribe(async (account) => {
-            const result = await client.v1.chain.get_table_rows({
-                code: 'eosio',
-                scope: 'eosio',
-                table: 'rexfund',
-                json: true,
-                lower_bound: $currentAccount?.account_name,
-                upper_bound: $currentAccount?.account_name,
-            })
-            if (result.rows.length > 0) {
-                rexEOSBalance.set(Asset.from(result.rows[0].balance, $systemToken!.symbol))
-            } else {
-                rexEOSBalance.set(Asset.from(0, $systemToken!.symbol))
-            }
-        })
-        return () => {
-            unsubscribe()
-        }
-    })
-
     const initialStep: Step = Step.Bootstrap
     const step: Writable<Step> = writable(initialStep, () => {
         const unsubscribeStep = defaultStep.subscribe((s) => {