Skip to content

Commit 792561f

Browse files
marc2332cpl121cpl121begonaalvarezd
authored
fix: Use sdk types for inclusion state (#8265)
* 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 <mespinsanz@gmail.com> * fix: Use sdk types for inclusion state * fix * fix --------- Co-authored-by: cpl121 <cpeon@boxfish.studio> Co-authored-by: cpl121 <100352899+cpl121@users.noreply.github.com> Co-authored-by: Begoña Álvarez de la Cruz <balvarez@boxfish.studio>
1 parent 14afc15 commit 792561f

File tree

15 files changed

+28
-24
lines changed

15 files changed

+28
-24
lines changed

packages/desktop/components/popups/send/SendFormPopup.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import { selectedWallet } from '@core/wallet'
55
import {
66
isReservedTagKeyword,
7-
InclusionState,
87
selectedWalletActivities,
98
newTransactionDetails,
109
NewTransactionType,
@@ -15,6 +14,7 @@
1514
import SendNftForm from './SendNftForm.svelte'
1615
import { OptionalInputType, SendFormTab } from '@core/wallet/utils/send/sendUtils'
1716
import { FontWeight, Tabs, Text, TextType } from '@ui'
17+
import { InclusionState } from '@iota/sdk/out/types'
1818
1919
const tabs: SendFormTab[] = [SendFormTab.SendToken, SendFormTab.SendNft]
2020
const { type: transactionType, disableAssetSelection } = get(newTransactionDetails)

packages/shared/components/pills/ActivityInclusionStatusPill.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import { localize } from '@core/i18n'
3-
import { InclusionState } from '@core/wallet'
43
import Pill from './Pill.svelte'
4+
import { InclusionState } from '@iota/sdk/out/types'
55
66
export let localizationKey: string
77
export let inclusionState: InclusionState

packages/shared/components/pills/TransactionActivityStatusPill.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script lang="ts">
2-
import { ActivityAction, ActivityDirection, ActivityType, InclusionState } from '@core/wallet'
2+
import { ActivityAction, ActivityDirection, ActivityType } from '@core/wallet'
33
import ActivityInclusionStatusPill from './ActivityInclusionStatusPill.svelte'
4+
import { InclusionState } from '@iota/sdk/out/types'
45
56
export let isInternal: boolean
67
export let type: ActivityType

packages/shared/components/tiles/ActivityTile.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
ActivityAsyncStatus,
77
ActivityType,
88
IAsset,
9-
InclusionState,
109
NotVerifiedStatus,
1110
getTokenFromSelectedWallet,
1211
selectedWalletAssets,
1312
} from '@core/wallet'
13+
import { InclusionState } from '@iota/sdk/out/types'
1414
import {
1515
ActivityInclusionStatusPill,
1616
AccountActivityTileContent,

packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { get } from 'svelte/store'
22

3-
import { Event, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
3+
import { Event, InclusionState, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
44

55
import { localize } from '@core/i18n'
6-
import { InclusionState, MissingTransactionIdError, validateWalletApiEvent } from '@core/wallet'
6+
import { MissingTransactionIdError, validateWalletApiEvent } from '@core/wallet'
77
import { showAppNotification } from '@auxiliary/notification'
88

99
import { ShimmerClaimingWalletState } from '../enums'

packages/shared/lib/core/wallet/actions/activities/updateClaimingTransactionInclusion.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { ActivityAsyncStatus, ActivityType, InclusionState } from '@core/wallet/enums'
1+
import { ActivityAsyncStatus, ActivityType } from '@core/wallet/enums'
22
import { addClaimedActivity, allWalletActivities } from '@core/wallet/stores'
33
import { showAppNotification } from '@auxiliary/notification'
44
import { localize } from '@core/i18n'
55
import { updateActivityFromPartialActivity } from '@core/wallet/utils/generateActivity/helper'
6+
import { InclusionState } from '@iota/sdk/out/types'
67

78
export function updateClaimingTransactionInclusion(
89
transactionId: string,

packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
2-
import { AccountOutput, TransactionInclusionWalletEvent, WalletEvent, WalletEventType } from '@iota/sdk/out/types'
2+
import {
3+
AccountOutput,
4+
InclusionState,
5+
TransactionInclusionWalletEvent,
6+
WalletEvent,
7+
WalletEventType,
8+
} from '@iota/sdk/out/types'
39
import { updateParticipationOverview } from '@contexts/governance/stores'
410
import { isWalletVoting } from '@contexts/governance/utils/isWalletVoting'
511
import { updateNftInAllWalletNfts } from '@core/nfts'
@@ -14,7 +20,6 @@ import {
1420
ActivityDirection,
1521
ActivityType,
1622
GovernanceActivity,
17-
InclusionState,
1823
WalletApiEventHandler,
1924
} from '@core/wallet'
2025
import { getWalletById, updateActiveWallet } from '@core/profile'

packages/shared/lib/core/wallet/enums/inclusion-state.enum.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/shared/lib/core/wallet/enums/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export * from './not-verified-status.enum'
88
export * from './token-standard.enum'
99
export * from './verified-status.enum'
1010
export * from './return-strategy.enum'
11-
export * from './inclusion-state.enum'
1211
export * from './irc27-version.enum'
1312
export * from './subject.enum'
1413
export * from './wallet-colors.enum'

packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ActivityDirection, InclusionState } from '@core/wallet/enums'
1+
import { ActivityDirection } from '@core/wallet/enums'
22
import { IWrappedOutput } from './wrapped-output.interface'
3-
import { UTXOInput } from '@iota/sdk/out/types'
3+
import { InclusionState, UTXOInput } from '@iota/sdk/out/types'
44

55
export interface IProcessedTransaction {
66
outputs: IWrappedOutput[]

packages/shared/lib/core/wallet/types/activities/base-activity.type.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { ActivityAsyncStatus, ActivityDirection, InclusionState, ActivityAction } from '../../enums'
1+
import { InclusionState } from '@iota/sdk/out/types'
2+
import { ActivityAsyncStatus, ActivityDirection, ActivityAction } from '../../enums'
23
import { Subject } from '../subject.type'
34
import { Layer2Metadata } from '@core/layer-2'
45

packages/shared/lib/core/wallet/utils/getActivityTileTitle.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { ActivityAction, ActivityDirection, ActivityType, GovernanceAction, InclusionState } from '../enums'
1+
import { InclusionState } from '@iota/sdk/out/types'
2+
import { ActivityAction, ActivityDirection, ActivityType, GovernanceAction } from '../enums'
23
import { Activity } from '../types'
34

45
export function getActivityTileTitle(activity: Activity): string {

packages/shared/lib/core/wallet/utils/isVisibleActivity.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { get } from 'svelte/store'
22
import { Activity } from '../types'
33
import { activityFilter } from '../stores'
44
import { getAssetFromPersistedAssets } from './getAssetFromPersistedAssets'
5-
import { ActivityAsyncStatus, InclusionState, ActivityType } from '../enums'
5+
import { ActivityAsyncStatus, ActivityType } from '../enums'
66
import { dateIsAfterOtherDate, dateIsBeforeOtherDate, datesOnSameDay } from '@core/utils'
77
import { ActivityFilter } from '../interfaces'
88
import { convertToRawAmount } from '.'
@@ -15,6 +15,7 @@ import {
1515
NumberFilterOption,
1616
StatusFilterOption,
1717
} from '@core/utils/enums/filters'
18+
import { InclusionState } from '@iota/sdk/out/types'
1819

1920
// Filters activities based on activity properties. If none of the conditionals are valid, then activity is shown.
2021
export function isVisibleActivity(activity: Activity): boolean {

packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { CommonOutput, OutputData, OutputWithMetadata, UTXOInput } from '@iota/sdk/out/types'
1+
import { CommonOutput, InclusionState, OutputData, OutputWithMetadata, UTXOInput } from '@iota/sdk/out/types'
22
import { IWalletState } from '@core/wallet/interfaces'
3-
import { InclusionState, ActivityDirection } from '../../enums'
3+
import { ActivityDirection } from '../../enums'
44
import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
55
import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
66
import { getSenderAddressFromInputs } from '../transactions'

packages/shared/lib/core/wallet/utils/send/sendUtils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NewTransactionDetails, NftActivity, Subject, TransactionActivity, VestingActivity } from '@core/wallet/types'
22
import { NewTransactionType } from '@core/wallet/stores'
3-
import { ActivityAction, ActivityDirection, ActivityType, InclusionState } from '@core/wallet/enums'
3+
import { ActivityAction, ActivityDirection, ActivityType } from '@core/wallet/enums'
44
import { TimePeriod } from '@core/utils'
55
import { getAddressFromSubject } from '../getAddressFromSubject'
66
import {
@@ -11,6 +11,7 @@ import {
1111
TRANSFER_ALLOWANCE,
1212
getDestinationNetworkFromAddress,
1313
} from '@core/layer-2'
14+
import { InclusionState } from '@iota/sdk/out/types'
1415

1516
export enum SendFormTab {
1617
SendToken = 'general.sendToken',

0 commit comments

Comments
 (0)