From effafacb400866e589b81185566467c96cb4df19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Wed, 3 Apr 2024 15:11:49 +0200
Subject: [PATCH 1/2] feat: add mana rewards and base token locked funds to
 balance breakdown

---
 .../popups/BalanceBreakdownPopup.svelte       | 31 ++++++++++++++++---
 packages/shared/locales/en.json               | 16 +++++++---
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index 73857b2fde3..614c70d20dd 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -1,16 +1,17 @@
 <script lang="ts">
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { isVestingOutputId, selectedWalletVestingOverview } from '@contexts/vesting'
-    import { selectedWallet } from '@core/wallet'
     import { localize } from '@core/i18n'
-    import { checkActiveProfileAuth } from '@core/profile'
     import { getManaBalance } from '@core/network'
+    import { checkActiveProfileAuth } from '@core/profile'
+    import { selectedWallet } from '@core/wallet'
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
-    import { UnlockCondition, UnlockConditionType, CommonOutput } from '@iota/sdk/out/types'
+    import features from '@features/features'
+    import { CommonOutput, OutputType, UnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
     import { BalanceSummarySection, Button, FontWeight, Text, TextType } from '@ui'
     import { TextHintVariant } from '@ui/enums'
-    import features from '@features/features'
+    import { get } from 'svelte/store'
 
     interface BalanceBreakdown {
         amount: number
@@ -32,6 +33,7 @@
     async function setBreakdown(): Promise<void> {
         const availableBreakdown = getAvailableBreakdown()
         const pendingBreakdown = await getPendingBreakdown()
+        const lockedBreakdown = getLockedBreakdown()
         const storageDepositBreakdown = getStorageDepositBreakdown()
         const vestingBreakdown = getVestingBreakdown()
         const manaBreakdown = getManaBreakdown()
@@ -39,6 +41,7 @@
         breakdown = {
             available: availableBreakdown,
             pending: pendingBreakdown,
+            locked: lockedBreakdown,
             storageDeposit: storageDepositBreakdown,
             mana: manaBreakdown,
             ...(features.vesting.enabled && { vesting: vestingBreakdown }),
@@ -53,11 +56,13 @@
         const totalPasiveMana = getManaBalance(walletBalance?.mana?.total)
         const availablePasiveBalance = getManaBalance(walletBalance?.mana?.available)
         const totalMana = totalPasiveMana + (walletBalance?.totalWalletBic ?? 0)
+        const manaRewards = Number(walletBalance?.mana?.rewards ?? 0)
 
         const subBreakdown = {
             availableMana: { amount: availablePasiveBalance },
             lockedMana: { amount: totalPasiveMana - availablePasiveBalance },
             bicMana: { amount: walletBalance?.totalWalletBic },
+            manaRewards: { amount: manaRewards },
         }
         return { amount: totalMana, subBreakdown, isBaseToken: false }
     }
@@ -102,6 +107,24 @@
         return { amount: pendingOutputsStorageDeposit, subBreakdown }
     }
 
+    function getLockedBreakdown(): BalanceBreakdown {
+        const delegationOutputs =
+            get(selectedWallet)?.walletUnspentOutputs?.filter(
+                (output) => output?.output?.type === OutputType.Delegation
+            ) || []
+        const implicitAccounts = get(selectedWallet)?.implicitAccountOutputs || []
+        const delegatedAmount = Number(delegationOutputs.reduce((acc, prev) => acc + Number(prev.output.amount), 0))
+        const implicitAccountsAmount = Number(
+            implicitAccounts.reduce((acc, prev) => acc + Number(prev.output.amount), 0)
+        )
+        const totalLockedAmount = delegatedAmount + implicitAccountsAmount
+        const subBreakdown = {
+            delegation: { amount: delegatedAmount },
+            implicitAccounts: { amount: implicitAccountsAmount },
+        }
+        return { amount: totalLockedAmount, subBreakdown }
+    }
+
     function getStorageDepositBreakdown(): BalanceBreakdown {
         const storageDeposits = walletBalance?.requiredStorageDeposit
         const totalStorageDeposit = storageDeposits
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
index af3859b7e3e..1c4026a9ded 100644
--- a/packages/shared/locales/en.json
+++ b/packages/shared/locales/en.json
@@ -790,7 +790,7 @@
             },
             "locked": {
                 "title": "Locked",
-                "subtitle": "Temporarily locked for governance"
+                "subtitle": "Temporarily locked in delegation or pending accounts"
             },
             "storageDeposit": {
                 "title": "Storage deposit",
@@ -828,9 +828,13 @@
                 "title": "SDRUC",
                 "subtitle": "Temporarily locked in Storage Deposit Return"
             },
-            "governance": {
-                "title": "Governance",
-                "subtitle": "Reserved for voting power"
+            "delegation": {
+                "title": "Delegation",
+                "subtitle": "Delegated funds"
+            },
+            "implicitAccounts": {
+                "title": "Pending accounts",
+                "subtitle": "Pending accounts"
             },
             "vesting": {
                 "title": "Vesting",
@@ -848,6 +852,10 @@
                 "title": "BIC Mana",
                 "subtitle": "Block Issuance Credits Mana"
             },
+            "manaRewards": {
+                "title": "Mana Rewards",
+                "subtitle": "Mana Rewards (Delegation & Staking)"
+            },
             "availableMana": {
                 "title": "Available Mana",
                 "subtitle": "Mana available to send and issue blocks"

From deb8e0018d825a6ba46be197419c076f73da31a1 Mon Sep 17 00:00:00 2001
From: cpl121 <cpeon@boxfish.studio>
Date: Wed, 3 Apr 2024 19:33:07 +0200
Subject: [PATCH 2/2] fix: minor improvement

---
 .../components/popups/BalanceBreakdownPopup.svelte        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index 614c70d20dd..b4d052d24bd 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -11,7 +11,6 @@
     import { CommonOutput, OutputType, UnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
     import { BalanceSummarySection, Button, FontWeight, Text, TextType } from '@ui'
     import { TextHintVariant } from '@ui/enums'
-    import { get } from 'svelte/store'
 
     interface BalanceBreakdown {
         amount: number
@@ -109,10 +108,9 @@
 
     function getLockedBreakdown(): BalanceBreakdown {
         const delegationOutputs =
-            get(selectedWallet)?.walletUnspentOutputs?.filter(
-                (output) => output?.output?.type === OutputType.Delegation
-            ) || []
-        const implicitAccounts = get(selectedWallet)?.implicitAccountOutputs || []
+            $selectedWallet?.walletUnspentOutputs?.filter((output) => output?.output?.type === OutputType.Delegation) ||
+            []
+        const implicitAccounts = $selectedWallet?.implicitAccountOutputs || []
         const delegatedAmount = Number(delegationOutputs.reduce((acc, prev) => acc + Number(prev.output.amount), 0))
         const implicitAccountsAmount = Number(
             implicitAccounts.reduce((acc, prev) => acc + Number(prev.output.amount), 0)