From 144f1d32d97dc3c091a94dccd827aed1325e0416 Mon Sep 17 00:00:00 2001 From: evavirseda Date: Thu, 28 Mar 2024 17:26:50 +0100 Subject: [PATCH 1/3] feat: show total tokens in the asset list (#8249) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: show token balance * fix: show total and available mana properly * fix: update balanceSummary details * fix import * improvements * feat: improve balance brekdown view, refine styles and update locales --------- Co-authored-by: Begoña Álvarez de la Cruz Co-authored-by: cpl121 <100352899+cpl121@users.noreply.github.com> --- .../popups/BalanceBreakdownPopup.svelte | 2 +- .../popups/TokenInformationPopup.svelte | 24 +++++++++- .../components/BalanceSummaryRow.svelte | 42 +++++++++-------- .../components/BalanceSummarySection.svelte | 46 +++++++++++++------ .../shared/components/tiles/AssetTile.svelte | 4 +- packages/shared/locales/en.json | 9 ++++ 6 files changed, 91 insertions(+), 36 deletions(-) diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte index 8ce6f90b4c4..10cc518c161 100644 --- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte +++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte @@ -175,7 +175,7 @@ subtitleKey={breakdownKey} amount={breakdown[breakdownKey].amount} subBreakdown={breakdown[breakdownKey].subBreakdown} - isBaseToken={breakdown[breakdownKey].isBaseToken} + isBaseToken={breakdownKey !== 'mana'} /> {/each} diff --git a/packages/desktop/components/popups/TokenInformationPopup.svelte b/packages/desktop/components/popups/TokenInformationPopup.svelte index f7b84d58b2d..d8690e44505 100644 --- a/packages/desktop/components/popups/TokenInformationPopup.svelte +++ b/packages/desktop/components/popups/TokenInformationPopup.svelte @@ -23,6 +23,7 @@ AssetActionsModal, MeatballMenuButton, Modal, + BalanceSummarySection, } from '@ui' import { TextHintVariant } from '@ui/enums' import { MANA_ID } from '@core/network' @@ -30,6 +31,8 @@ export let asset: IAsset export let activityId: string = undefined + const balanceSummary = getBalanceSummary() + let modal: Modal function onSkipClick(): void { @@ -72,10 +75,20 @@ overflow: true, }) } + + function getBalanceSummary(): { amount: number; details?: { [key: string]: { amount: number } } } { + const totalBalance = asset?.balance?.total + + const details = { + availableAmount: { amount: asset?.balance?.available }, + conditionallyLocked: { amount: asset?.balance?.total - asset?.balance?.available }, + } + return { amount: totalBalance, details } + } {#if asset} -
+
{/if} + + +
-
{#if asset.verification?.status === NotVerifiedStatus.New}
- {asset.metadata ? formatTokenAmountBestMatch(asset.balance?.total, asset.metadata) : '-'} + {asset.metadata ? formatTokenAmountBestMatch(total, asset.metadata) : '-'} {#if !squashed}
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json index c70c98480ec..341123cc2ca 100644 --- a/packages/shared/locales/en.json +++ b/packages/shared/locales/en.json @@ -851,6 +851,15 @@ "title": "Available Mana", "subtitle": "Mana available to send and issue blocks" }, + "totalBalanceAmount": { + "title": "Total balance amount" + }, + "availableAmount": { + "title": "Available amount" + }, + "conditionallyLocked": { + "title": "Conditionally locked amount" + }, "minimizeStorageDepositButton": "Minimize storage deposit" }, "minimizeStorageDeposit": { From 14afc15c421cbef7b9c2f365a6f30057c04606d8 Mon Sep 17 00:00:00 2001 From: Marc Espin Date: Thu, 28 Mar 2024 17:33:43 +0100 Subject: [PATCH 2/3] feat: add mana to txs in tx activities and activity details (#8278) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Sync SDK types * feat: stop generating txs out of outputs * fix: tx history: include account output in average txs * fix: Fix incorrect timestamp in Incoming txs * fix: Receive funds to implicit account address * feat: add mana to txs in tx activities and activity details Co-authored-by: Marc Espin --------- Co-authored-by: cpl121 Co-authored-by: cpl121 <100352899+cpl121@users.noreply.github.com> Co-authored-by: Begoña Álvarez de la Cruz --- .../GenericActivityInformation.svelte | 9 ++++++-- .../processed-transaction.interface.ts | 1 + .../types/activities/base-activity.type.ts | 1 + .../generateSingleAccountActivity.ts | 3 ++- .../generateSingleAnchorActivity.ts | 3 ++- .../generateSingleBasicActivity.ts | 3 ++- .../generateSingleConsolidationActivity.ts | 3 ++- .../generateSingleFoundryActivity.ts | 3 ++- .../generateSingleGovernanceActivity.ts | 3 ++- .../generateSingleNftActivity.ts | 3 ++- .../generateVestingActivity.ts | 3 ++- .../outputs/preprocessIncomingTransaction.ts | 8 +++++-- .../outputs/preprocessOutgoingTransaction.ts | 22 ++++++++++++++++++- packages/shared/locales/en.json | 3 ++- 14 files changed, 54 insertions(+), 14 deletions(-) diff --git a/packages/shared/components/activity-info/GenericActivityInformation.svelte b/packages/shared/components/activity-info/GenericActivityInformation.svelte index 9676ae27aa6..9713e0ce988 100644 --- a/packages/shared/components/activity-info/GenericActivityInformation.svelte +++ b/packages/shared/components/activity-info/GenericActivityInformation.svelte @@ -2,8 +2,8 @@ import { KeyValueBox } from '@ui' import { getFormattedTimeStamp, localize } from '@core/i18n' import { activeProfile, getBaseToken } from '@core/profile' - import { Activity, formatTokenAmountPrecise } from '@core/wallet' - import { ExplorerEndpoint } from '@core/network' + import { Activity, ActivityDirection, formatTokenAmountBestMatch, formatTokenAmountPrecise } from '@core/wallet' + import { DEFAULT_MANA, ExplorerEndpoint } from '@core/network' import { getOfficialExplorerUrl } from '@core/network/utils' import { openUrlInBrowser } from '@core/app' import { IKeyValueBoxList, truncateString } from '@core/utils' @@ -28,6 +28,8 @@ $: formattedGiftedStorageDeposit = formatTokenAmountPrecise(activity?.giftedStorageDeposit ?? 0, getBaseToken()) $: formattedSurplus = formatTokenAmountPrecise(activity?.surplus ?? 0, getBaseToken()) $: formattedGasFee = formatTokenAmountPrecise(Number(gasFee ?? 0), getBaseToken()) + $: formattedManaPrefix = activity.direction === ActivityDirection.Incoming ? '' : '- ' + $: formattedMana = formattedManaPrefix + formatTokenAmountBestMatch(Number(activity?.mana ?? 0), DEFAULT_MANA) let transactionDetailsList: IKeyValueBoxList $: transactionDetailsList = { @@ -62,6 +64,9 @@ timelockDate: { data: formattedTimelockDate, isTooltipVisible: true }, }), ...(claimedTime && { claimedTime: { data: claimedTime } }), + ...(typeof activity?.mana === 'number' && { + mana: { data: formattedMana }, + }), } function onTransactionIdClick(): void { diff --git a/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts b/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts index 70add6741e7..aad822312de 100644 --- a/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts +++ b/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts @@ -11,6 +11,7 @@ export interface IProcessedTransaction { utxoInputs: UTXOInput[] wrappedInputs: IWrappedOutput[] claimingData?: IClaimData + mana: number } export interface IClaimData { diff --git a/packages/shared/lib/core/wallet/types/activities/base-activity.type.ts b/packages/shared/lib/core/wallet/types/activities/base-activity.type.ts index 99de5e6d85e..ee4adc4f68b 100644 --- a/packages/shared/lib/core/wallet/types/activities/base-activity.type.ts +++ b/packages/shared/lib/core/wallet/types/activities/base-activity.type.ts @@ -23,6 +23,7 @@ export type BaseActivity = { asyncData: AsyncData destinationNetwork?: string parsedLayer2Metadata?: Partial + mana: number } export type AsyncData = { diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts index 14a0ed61d20..ecd5d3168df 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAccountActivity.ts @@ -18,7 +18,7 @@ export async function generateSingleAccountActivity( wallet: IWalletState, { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters ): Promise { - const { transactionId, claimingData, direction, time, inclusionState } = processedTransaction + const { transactionId, claimingData, direction, time, inclusionState, mana } = processedTransaction const output = wrappedOutput.output as AccountOutput const outputId = wrappedOutput.outputId @@ -57,6 +57,7 @@ export async function generateSingleAccountActivity( inclusionState, containsValue, asyncData, + mana, ...sendingInfo, } } diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts index 63cf04b62b0..538d4ea6702 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts @@ -17,7 +17,7 @@ export async function generateSingleAnchorActivity( wallet: IWalletState, { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters ): Promise { - const { transactionId, claimingData, direction, time, inclusionState } = processedTransaction + const { transactionId, claimingData, direction, time, inclusionState, mana } = processedTransaction const output = wrappedOutput.output as AnchorOutput const outputId = wrappedOutput.outputId @@ -56,6 +56,7 @@ export async function generateSingleAnchorActivity( inclusionState, containsValue, asyncData, + mana, ...sendingInfo, } } diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts index 40eeee55d6b..10ac98d2ebd 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts @@ -23,7 +23,7 @@ export async function generateSingleBasicActivity( fallbackAssetId?: string, fallbackAmount?: number ): Promise { - const { transactionId, direction, claimingData, time, inclusionState } = processedTransaction + const { transactionId, direction, claimingData, time, inclusionState, mana } = processedTransaction const isHidden = false const isAssetHidden = false @@ -102,6 +102,7 @@ export async function generateSingleBasicActivity( asyncData, destinationNetwork, parsedLayer2Metadata, + mana, ...sendingInfo, } } diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts index f7277940f3b..fe040b760f0 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts @@ -16,7 +16,7 @@ export async function generateSingleConsolidationActivity( wallet: IWalletState, { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters ): Promise { - const { transactionId, direction, claimingData, time, inclusionState, wrappedInputs } = processedTransaction + const { transactionId, direction, claimingData, time, inclusionState, wrappedInputs, mana } = processedTransaction const isHidden = false const isAssetHidden = false @@ -54,6 +54,7 @@ export async function generateSingleConsolidationActivity( tag, asyncData, amountConsolidatedInputs, + mana, ...sendingInfo, } } diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts index e90b2e74454..6d643efd84b 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts @@ -23,7 +23,7 @@ export async function generateSingleFoundryActivity( wallet: IWalletState, { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters ): Promise { - const { transactionId, claimingData, time, direction, inclusionState } = processedTransaction + const { transactionId, claimingData, time, direction, inclusionState, mana } = processedTransaction const output = wrappedOutput.output as FoundryOutput const outputId = wrappedOutput.outputId @@ -78,6 +78,7 @@ export async function generateSingleFoundryActivity( metadata, tag, asyncData, + mana, ...sendingInfo, } } diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts index d9ceb743c48..a7dd900c068 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts @@ -17,7 +17,7 @@ export async function generateSingleGovernanceActivity( wallet: IWalletState, { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters ): Promise { - const { transactionId, direction, time, inclusionState, wrappedInputs } = processedTransaction + const { transactionId, direction, time, inclusionState, wrappedInputs, mana } = processedTransaction const isHidden = false const isAssetHidden = false @@ -55,6 +55,7 @@ export async function generateSingleGovernanceActivity( metadata, tag, asyncData: null, + mana, ...governanceInfo, ...sendingInfo, } diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts index fee8c755beb..eab435c6618 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts @@ -19,7 +19,7 @@ export async function generateSingleNftActivity( { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters, nftIdFromInput?: string ): Promise { - const { claimingData, time, inclusionState, transactionId, direction } = processedTransaction + const { claimingData, time, inclusionState, transactionId, direction, mana } = processedTransaction const outputId = wrappedOutput.outputId const output = wrappedOutput.output as NftOutput const id = outputId || transactionId @@ -81,5 +81,6 @@ export async function generateSingleNftActivity( direction, destinationNetwork, parsedLayer2Metadata, + mana, } } diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts index 7b2b27a492c..7731b4e5d4b 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts @@ -19,7 +19,7 @@ export async function generateVestingActivity( wallet: IWalletState, { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters ): Promise { - const { transactionId, direction, claimingData, time, inclusionState } = processedTransaction + const { transactionId, direction, claimingData, time, inclusionState, mana } = processedTransaction const isHidden = false const isAssetHidden = false @@ -63,6 +63,7 @@ export async function generateVestingActivity( tag, asyncData, destinationNetwork, + mana, ...sendingInfo, ...parsedLayer2Metadata, } diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessIncomingTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessIncomingTransaction.ts index fc4037b45c1..df339a85cea 100644 --- a/packages/shared/lib/core/wallet/utils/outputs/preprocessIncomingTransaction.ts +++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessIncomingTransaction.ts @@ -1,5 +1,5 @@ import { IProcessedTransaction, IWrappedOutput } from '../../interfaces' -import { Output, OutputType, OutputWithMetadata, TransactionWithMetadata, UTXOInput } from '@iota/sdk/out/types' +import { Output, OutputType, TransactionWithMetadata, UTXOInput } from '@iota/sdk/out/types' import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex' import { ActivityDirection } from '../../enums' import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network' @@ -24,6 +24,10 @@ export function preprocessIncomingTransaction(transaction: TransactionWithMetada remainder: true, })) + const manaCost = outputs + .filter((output) => !output.remainder) + .reduce((acc, output) => acc + Number(output.output.mana), 0) + return { outputs, transactionId, @@ -31,6 +35,7 @@ export function preprocessIncomingTransaction(transaction: TransactionWithMetada time: new Date(slotUnixTimestamp * MILLISECONDS_PER_SECOND), inclusionState: transaction.inclusionState, wrappedInputs: inputs, + mana: manaCost, utxoInputs, } } @@ -50,7 +55,6 @@ function convertTransactionOutputTypeToWrappedOutput( outputType: Output ): IWrappedOutput { const outputId = getOutputIdFromTransactionIdAndIndex(transactionId, index) - OutputWithMetadata return { outputId, output: outputType, diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts index 9ae481372d1..e2643a26001 100644 --- a/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts +++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts @@ -1,9 +1,17 @@ import { IProcessedTransaction, IWrappedOutput } from '../../interfaces' -import { Output, OutputType, OutputWithMetadata, TransactionWithMetadata, UTXOInput } from '@iota/sdk/out/types' +import { + AccountOutput, + Output, + OutputType, + OutputWithMetadata, + TransactionWithMetadata, + UTXOInput, +} from '@iota/sdk/out/types' import { computeOutputId } from './computeOutputId' import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex' import { getDirectionFromOutgoingTransaction } from '../transactions' import { IWalletState } from '@core/wallet/interfaces' +import { getPassiveManaForOutput } from '@core/network' import { MILLISECONDS_PER_SECOND } from '@core/utils' import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network' import { get } from 'svelte/store' @@ -31,12 +39,24 @@ export async function preprocessOutgoingTransaction( const inputs = await Promise.all(inputIds.map((inputId) => wallet.getOutput(inputId))) + let manaCost = 0 + const prevAccountOutput = inputs.find((input) => (input.output as AccountOutput).accountId) + if (prevAccountOutput) { + const prevMana = getPassiveManaForOutput(prevAccountOutput) ?? 0 + const postAccountOutput = outputs.find( + (output) => + (prevAccountOutput.output as AccountOutput).accountId === (output.output as AccountOutput).accountId + ) + manaCost = prevMana - Number(postAccountOutput?.output?.mana ?? 0) + } + return { outputs: outputs, transactionId, direction, time: new Date(slotUnixTimestamp * MILLISECONDS_PER_SECOND), inclusionState: transaction.inclusionState, + mana: manaCost, wrappedInputs: inputs, } } diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json index 341123cc2ca..fd8bad973ac 100644 --- a/packages/shared/locales/en.json +++ b/packages/shared/locales/en.json @@ -1733,7 +1733,8 @@ "manaCost": "Estimated Mana cost", "availableMana": "Available mana", "insufficientMana": "Insufficient {availableMana}.", - "secondsToRefreshManaCost": "{seconds} seconds to refresh the mana cost" + "secondsToRefreshManaCost": "{seconds} seconds to refresh the mana cost", + "mana": "Mana" }, "filters":{ "title": "Filters", From 792561f43b8764fcaca75c4f20b99cbe9c6118a5 Mon Sep 17 00:00:00 2001 From: Marc Espin Date: Thu, 28 Mar 2024 17:36:20 +0100 Subject: [PATCH 3/3] fix: Use sdk types for inclusion state (#8265) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Sync SDK types * feat: stop generating txs out of outputs * fix: tx history: include account output in average txs * fix: Fix incorrect timestamp in Incoming txs * fix: Receive funds to implicit account address * feat: add mana to txs in tx activities and activity details Co-authored-by: Marc Espin * fix: Use sdk types for inclusion state * fix * fix --------- Co-authored-by: cpl121 Co-authored-by: cpl121 <100352899+cpl121@users.noreply.github.com> Co-authored-by: Begoña Álvarez de la Cruz --- .../desktop/components/popups/send/SendFormPopup.svelte | 2 +- .../components/pills/ActivityInclusionStatusPill.svelte | 2 +- .../pills/TransactionActivityStatusPill.svelte | 3 ++- packages/shared/components/tiles/ActivityTile.svelte | 2 +- .../handleTransactionInclusionEventForShimmerClaiming.ts | 4 ++-- .../activities/updateClaimingTransactionInclusion.ts | 3 ++- .../events-handlers/handleTransactionInclusionEvent.ts | 9 +++++++-- .../shared/lib/core/wallet/enums/inclusion-state.enum.ts | 6 ------ packages/shared/lib/core/wallet/enums/index.ts | 1 - .../wallet/interfaces/processed-transaction.interface.ts | 4 ++-- .../core/wallet/types/activities/base-activity.type.ts | 3 ++- .../shared/lib/core/wallet/utils/getActivityTileTitle.ts | 3 ++- .../shared/lib/core/wallet/utils/isVisibleActivity.ts | 3 ++- .../wallet/utils/outputs/preprocessGroupedOutputs.ts | 4 ++-- packages/shared/lib/core/wallet/utils/send/sendUtils.ts | 3 ++- 15 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 packages/shared/lib/core/wallet/enums/inclusion-state.enum.ts diff --git a/packages/desktop/components/popups/send/SendFormPopup.svelte b/packages/desktop/components/popups/send/SendFormPopup.svelte index 43b8f1ebe16..6f3a18f041e 100644 --- a/packages/desktop/components/popups/send/SendFormPopup.svelte +++ b/packages/desktop/components/popups/send/SendFormPopup.svelte @@ -4,7 +4,6 @@ import { selectedWallet } from '@core/wallet' import { isReservedTagKeyword, - InclusionState, selectedWalletActivities, newTransactionDetails, NewTransactionType, @@ -15,6 +14,7 @@ import SendNftForm from './SendNftForm.svelte' import { OptionalInputType, SendFormTab } from '@core/wallet/utils/send/sendUtils' import { FontWeight, Tabs, Text, TextType } from '@ui' + import { InclusionState } from '@iota/sdk/out/types' const tabs: SendFormTab[] = [SendFormTab.SendToken, SendFormTab.SendNft] const { type: transactionType, disableAssetSelection } = get(newTransactionDetails) diff --git a/packages/shared/components/pills/ActivityInclusionStatusPill.svelte b/packages/shared/components/pills/ActivityInclusionStatusPill.svelte index c300964eb52..9e658ee7179 100644 --- a/packages/shared/components/pills/ActivityInclusionStatusPill.svelte +++ b/packages/shared/components/pills/ActivityInclusionStatusPill.svelte @@ -1,7 +1,7 @@