Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhancement: add correct calculation for SDRUC on storage deposit breakdown #5224

Merged
merged 10 commits into from
Nov 16, 2022
13 changes: 7 additions & 6 deletions packages/shared/components/atoms/BalanceSummarySection.svelte
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<script lang="typescript">
import { Text, FontWeight } from 'shared/components'
import { formatTokenAmountPrecise } from '@core/wallet'
import { BASE_TOKEN } from '@core/network'
import { activeProfile } from '@core/profile'
import { formatCurrency } from '@core/i18n'
import { getMarketAmountFromAssetValue } from '@core/market/utils'
import { formatTokenAmountPrecise, IAsset } from '@core/wallet'
import { FontWeight, Text } from 'shared/components'

export let totalRow = false
export let title: string
export let subtitle: string = ''
export let amount: number
export let asset: IAsset

$: formattedAmount = formatTokenAmountPrecise(amount, BASE_TOKEN[$activeProfile.networkProtocol])
$: convertedAmount = '-'
$: formattedAmount = formatTokenAmountPrecise(amount, asset.metadata)
$: convertedAmount = formatCurrency(getMarketAmountFromAssetValue(amount, asset))

const PRIMARY_COLOR = 'gray-800'
const PRIMARY_DARK_COLOR = 'white'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
<script lang="typescript">
import { HR, BalanceSummarySection, Text, FontWeight, Button } from 'shared/components'
import { closePopup, openPopup } from '@auxiliary/popup'
import { selectedAccount } from '@core/account'
import { localize } from '@core/i18n'
import { closePopup, openPopup } from '@auxiliary/popup'
import { checkActiveProfileAuth } from '@core/profile'
import { selectedAccountAssets } from '@core/wallet'
import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
import { BalanceSummarySection, Button, FontWeight, HR, Text } from 'shared/components'

$: ({ baseCoin } = $selectedAccountAssets)

let accountBalance
$: $selectedAccount, void getAccountBalance()
async function getAccountBalance(): Promise<void> {
accountBalance = await $selectedAccount.getBalance()
}

let potentiallyLockedOutputsStorageDeposit
$: accountBalance, void calculatePendingTransactionStorageDeposit()
async function calculatePendingTransactionStorageDeposit(): Promise<void> {
potentiallyLockedOutputsStorageDeposit = 0
for (const [outputId, unlocked] of Object.entries(accountBalance?.potentiallyLockedOutputs ?? {})) {
if (!unlocked) {
const output = (await $selectedAccount.getOutput(outputId)).output
const storageDeposit = getStorageDepositFromOutput(output).storageDeposit
potentiallyLockedOutputsStorageDeposit += storageDeposit
}
}
}

function handleConsolidation(): void {
openPopup({
Expand Down Expand Up @@ -33,16 +56,17 @@
<BalanceSummarySection
title={localize('popups.storageDepositBreakdown.pendingTransactions.title')}
subtitle={localize('popups.storageDepositBreakdown.pendingTransactions.subtitle')}
amount={(Number($selectedAccount?.balances.baseCoin.total) ?? 0) -
Number($selectedAccount?.balances.baseCoin.available ?? 0)}
amount={potentiallyLockedOutputsStorageDeposit}
asset={baseCoin}
/>
<HR hidden />
<BalanceSummarySection
title={localize('popups.storageDepositBreakdown.totalStorageDeposit')}
amount={$selectedAccount.balances.requiredStorageDeposit}
amount={Number($selectedAccount.balances.requiredStorageDeposit) + potentiallyLockedOutputsStorageDeposit}
asset={baseCoin}
totalRow
/>
<Button onClick={handleConsolidation}
>{localize('popups.storageDepositBreakdown.minimizeStorageDepositButton')}</Button
>
<Button onClick={handleConsolidation}>
{localize('popups.storageDepositBreakdown.minimizeStorageDepositButton')}
</Button>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { destroyProfileManager, profileManager } from '@core/profile-manager'
import { removeProfileFolder } from '@core/profile'

export async function cleanupOnboardingProfileManager(): Promise<void> {
const { id } = get(profileManager)
if (!get(profileManager)) {
return
}

const { id } = get(profileManager)

destroyProfileManager()
await removeProfileFolder(id)
}
4 changes: 2 additions & 2 deletions packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getIssuerFromNftOutput, getMetadataFromNftOutput, getNftId } from '@core/wallet'
import { INftOutput } from '@iota/types'
import { INft } from '../interfaces'
import { DEFAULT_NFT_NAME } from '../constants'
import { getIssuerFromNftOutput, getMetadataFromNftOutput, getNftId } from '@core/wallet'
import { INft } from '../interfaces'
import { parseNftMetadata } from './parseNftMetadata'

export function buildNftFromNftOutput(nftOutput: INftOutput, outputId: string, isOwned: boolean): INft {
Expand Down