From b18da8ae8ec6771a00462168ddea8457d81d3dae Mon Sep 17 00:00:00 2001 From: marc2332 Date: Wed, 7 Feb 2024 14:04:33 +0100 Subject: [PATCH 01/11] chore: Clean up imports --- .../dashboard/wallet/implicit-account-creation-router.ts | 2 +- packages/desktop/views/onboarding/onboarding-router.ts | 3 +-- .../auxiliary/deep-link/constants/time-unit-ms.constant.ts | 2 +- .../deep-link/utils/getExpirationDateFromSearchParam.ts | 2 +- .../actions/addProposalsFromParticipationEventMap.ts | 2 +- .../shared/lib/contexts/governance/actions/getVotingEvent.ts | 2 +- .../actions/getWalletsParticipationEventStatusForEvent.ts | 4 ++-- .../governance/actions/initializeRegisteredProposals.ts | 4 ++-- .../governance/actions/registerParticipationEvents.ts | 2 +- .../shared/lib/contexts/governance/actions/setVotingPower.ts | 2 +- .../lib/contexts/governance/actions/stopVotingForProposal.ts | 2 +- .../stores/selected-participation-event-status.store.ts | 2 +- .../contexts/governance/utils/getParticipationsForProposal.ts | 2 +- .../contexts/onboarding/actions/cleanupOnboardingProfile.ts | 2 +- .../contexts/onboarding/actions/initialiseOnboardingFlow.ts | 2 +- .../onboarding/actions/initialiseOnboardingProfile.ts | 4 ++-- .../contexts/onboarding/actions/syncShimmerClaimingAccount.ts | 2 +- .../onboarding/helpers/getSortedRenamedBoundAccounts.ts | 2 +- .../contexts/onboarding/helpers/validateStrongholdCoinType.ts | 2 +- .../onboarding/stores/onboarding-secret-manager.store.ts | 2 +- .../actions/activities/setAsyncStatusOfWalletActivities.ts | 2 +- .../wallet/actions/events-handlers/handleSpentOutputEvent.ts | 4 ++-- .../events-handlers/handleTransactionInclusionEvent.ts | 2 +- .../utils/generateActivity/generateSingleAliasActivity.ts | 2 +- .../generateActivity/helper/getTimelockDateFromOutput.ts | 2 +- .../core/wallet/utils/outputs/getExpirationDateFromOutput.ts | 2 +- packages/shared/lib/core/wallet/utils/outputs/getNftId.ts | 2 +- .../lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts | 4 ++-- .../lib/core/wallet/utils/send/validateSendConfirmation.ts | 2 +- .../wallet/utils/transactions/getSenderAddressFromInputs.ts | 2 +- 30 files changed, 35 insertions(+), 36 deletions(-) diff --git a/packages/desktop/views/dashboard/wallet/implicit-account-creation-router.ts b/packages/desktop/views/dashboard/wallet/implicit-account-creation-router.ts index 4c517b3d456..470d4566188 100644 --- a/packages/desktop/views/dashboard/wallet/implicit-account-creation-router.ts +++ b/packages/desktop/views/dashboard/wallet/implicit-account-creation-router.ts @@ -1,5 +1,5 @@ import { get, writable } from 'svelte/store' -import { Router } from '../../../../shared/lib/core/router/classes' +import { Router } from '@lib/core/router/classes' import { ImplicitAccountCreationRoute } from './implicit-account-creation.enum' export const implicitAccountCreationRouter = writable(null) diff --git a/packages/desktop/views/onboarding/onboarding-router.ts b/packages/desktop/views/onboarding/onboarding-router.ts index 7d79d760953..95c3845f86a 100644 --- a/packages/desktop/views/onboarding/onboarding-router.ts +++ b/packages/desktop/views/onboarding/onboarding-router.ts @@ -1,8 +1,7 @@ import { OnboardingType, onboardingProfile } from '@contexts/onboarding' import { hasCompletedAppSetup } from '@core/app' import { get, writable } from 'svelte/store' -import { Router } from '../../../shared/lib/core/router/classes' -import { appRouter } from '../../../shared/lib/core/router/routers/app-router' +import { Router, appRouter } from '@core/router' import { OnboardingRoute } from './onboarding-route.enum' import { CompleteOnboardingRouter, completeOnboardingRouter } from './views/complete-onboarding' import { CreateProfileRouter, createProfileRouter } from './views/create-profile' diff --git a/packages/shared/lib/auxiliary/deep-link/constants/time-unit-ms.constant.ts b/packages/shared/lib/auxiliary/deep-link/constants/time-unit-ms.constant.ts index 97561be9ae7..e7cda4473d6 100644 --- a/packages/shared/lib/auxiliary/deep-link/constants/time-unit-ms.constant.ts +++ b/packages/shared/lib/auxiliary/deep-link/constants/time-unit-ms.constant.ts @@ -3,7 +3,7 @@ import { MILLISECONDS_PER_HOUR, MILLISECONDS_PER_MINUTE, MILLISECONDS_PER_WEEK, -} from 'shared/lib/core/utils' +} from '@core/utils' import { TimeUnit } from '../enums' export const TIME_UNIT_MS_MAP: Record = { diff --git a/packages/shared/lib/auxiliary/deep-link/utils/getExpirationDateFromSearchParam.ts b/packages/shared/lib/auxiliary/deep-link/utils/getExpirationDateFromSearchParam.ts index 88320a2338c..f218e6ed048 100644 --- a/packages/shared/lib/auxiliary/deep-link/utils/getExpirationDateFromSearchParam.ts +++ b/packages/shared/lib/auxiliary/deep-link/utils/getExpirationDateFromSearchParam.ts @@ -1,4 +1,4 @@ -import { convertUnixTimestampToDate } from 'shared/lib/core/utils' +import { convertUnixTimestampToDate } from '@core/utils' import { EXPIRATION_DATE_REGEX, TIME_UNIT_MS_MAP } from '../constants' import { TimeUnit } from '../enums' import { InvalidExpirationDateError, PastExpirationDateError } from '../errors' diff --git a/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts b/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts index fe36989fc3d..89cfef3318d 100644 --- a/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts +++ b/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts @@ -2,7 +2,7 @@ import { ParticipationEventMap, ParticipationEventWithNodes } from '@iota/sdk/ou import { addOrUpdateProposalToRegisteredProposals } from '../stores' import { createProposalFromEvent } from '../utils' -import { IWalletState } from 'shared/lib/core/wallet' +import { IWalletState } from '@core/wallet' export function addProposalsFromParticipationEventMap(eventMap: ParticipationEventMap, wallet: IWalletState): void { Object.values(eventMap).forEach((event: ParticipationEventWithNodes) => { diff --git a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts index 33b623a2c26..91b1ec57112 100644 --- a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts +++ b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts @@ -1,5 +1,5 @@ import type { ParticipationEventId, ParticipationEventWithNodes } from '@iota/sdk/out/types' -import { getSelectedWallet } from 'shared/lib/core/wallet' +import { getSelectedWallet } from '@core/wallet' export function getVotingEvent(eventId: ParticipationEventId): Promise { const wallet = getSelectedWallet() diff --git a/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts b/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts index 52efac9b4c2..517d29d1f65 100644 --- a/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts +++ b/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts @@ -1,6 +1,6 @@ import type { ParticipationEventId, ParticipationEventStatus } from '@iota/sdk/out/types' -import { IWallet } from 'shared/lib/core/profile' -import { getSelectedWallet } from 'shared/lib/core/wallet/stores/selected-wallet.store' +import { IWallet } from '@core/profile' +import { getSelectedWallet } from '@core/wallet/stores/selected-wallet.store' export function getWalletsParticipationEventStatusForEvent( eventId: ParticipationEventId, diff --git a/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts b/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts index aff18a0c03d..608b446d2b7 100644 --- a/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts +++ b/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts @@ -1,5 +1,5 @@ -import { activeWallets } from 'shared/lib/core/profile' -import { getSelectedWallet /* IWalletState*/ } from 'shared/lib/core/wallet' +import { activeWallets } from '@core/profile' +import { getSelectedWallet /* IWalletState*/ } from '@core/wallet' import { get } from 'svelte/store' import { IRegisteredProposals } from '../interfaces' diff --git a/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts b/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts index fd3aa33c32f..508edc8ea5e 100644 --- a/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts +++ b/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts @@ -1,5 +1,5 @@ import { ParticipationEventMap /* ParticipationEventRegistrationOptions*/ } from '@iota/sdk/out/types' -// import { getSelectedWallet, IWalletState } from 'shared/lib/core/wallet' +// import { getSelectedWallet, IWalletState } from '@core/wallet' // import { addProposalsFromParticipationEventMap } from './addProposalsFromParticipationEventMap' // TODO: https://github.com/iotaledger/firefly/issues/7947 diff --git a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts index 6a1854de74a..166a316f1f0 100644 --- a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts +++ b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts @@ -3,7 +3,7 @@ import { plainToInstance } from 'class-transformer' import { processAndAddToActivities } from '@core/wallet/utils' import { handleError } from '@core/error/handlers' import { closePopup } from '@auxiliary/popup' -import { getSelectedWallet, updateSelectedWallet } from 'shared/lib/core/wallet' +import { getSelectedWallet, updateSelectedWallet } from '@core/wallet' export async function setVotingPower(rawAmount: string): Promise { const wallet = getSelectedWallet() diff --git a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts index 6e58c998e90..39a1a2e9bef 100644 --- a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts +++ b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts @@ -4,7 +4,7 @@ import { showAppNotification } from '@auxiliary/notification/actions' import { localize } from '@core/i18n' import { handleError } from '@core/error/handlers' import { processAndAddToActivities } from '@core/wallet/utils' -import { getSelectedWallet, updateSelectedWallet } from 'shared/lib/core/wallet' +import { getSelectedWallet, updateSelectedWallet } from '@core/wallet' export async function stopVotingForProposal(eventId: string): Promise { const wallet = getSelectedWallet() diff --git a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts index 66f532adc98..e98a4c166f5 100644 --- a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts +++ b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts @@ -1,5 +1,5 @@ import { ParticipationEventStatus } from '@iota/sdk/out/types' -import { selectedWalletId } from 'shared/lib/core/wallet' +import { selectedWalletId } from '@core/wallet' import { get, writable } from 'svelte/store' import { getWalletsParticipationEventStatusForEvent } from '../actions' import { createProposalFromError } from '../utils' diff --git a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts index d4fae484eac..99dda490b7c 100644 --- a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts +++ b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts @@ -1,7 +1,7 @@ import { get } from 'svelte/store' import type { ParticipationOverview, TrackedParticipationOverview } from '@iota/sdk/out/types' import { allParticipationOverviews } from '@contexts/governance/stores' -import { selectedWalletId } from 'shared/lib/core/wallet' +import { selectedWalletId } from '@core/wallet' export function getParticipationsForProposal(proposalId: string): { [outputId: string]: TrackedParticipationOverview } { const walletId = get(selectedWalletId) diff --git a/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfile.ts index e91676452dc..d6794839efb 100644 --- a/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfile.ts +++ b/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfile.ts @@ -1,5 +1,5 @@ import { clearProfileFromMemory, removeProfileFolder } from '@core/profile' -import { getSelectedWallet } from 'shared/lib/core/wallet' +import { getSelectedWallet } from '@core/wallet' export async function cleanupOnboardingProfile(): Promise { if (!getSelectedWallet()) { diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts index c0ca936d54d..8b446d15e06 100644 --- a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts +++ b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts @@ -9,7 +9,7 @@ import { IOnboardingInitialisationOptions } from '../interfaces' import { updateOnboardingProfile } from '../stores' import { deleteOnboardingProfile } from './deleteOnboardingProfile' import { initialiseOnboardingProfile } from './initialiseOnboardingProfile' -import { unsubscribeFromWalletApiEvents } from 'shared/lib/core/wallet' +import { unsubscribeFromWalletApiEvents } from '@core/wallet' export async function initialiseOnboardingFlow(options: IOnboardingInitialisationOptions): Promise { resetActiveProfile() diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts index 72dbe380a54..f9ad6f5a7fe 100644 --- a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts +++ b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts @@ -1,5 +1,5 @@ -import { stopPollingLedgerNanoStatus } from 'shared/lib/core/ledger' -import { clearProfileFromMemory } from 'shared/lib/core/profile' +import { stopPollingLedgerNanoStatus } from '@core/ledger' +import { clearProfileFromMemory } from '@core/profile' import { get } from 'svelte/store' import { OnboardingSecretManagerAlreadyInitializedError } from '../errors' import { buildInitialOnboardingProfile } from '../helpers' diff --git a/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts b/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts index 9c65333fbc0..a40716f3920 100644 --- a/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts +++ b/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts @@ -8,7 +8,7 @@ import { getOnboardingBaseToken, shimmerClaimingProfileManager, updateShimmerCla import { setTotalUnclaimedShimmerRewards } from '@contexts/onboarding' import { formatTokenAmountBestMatch } from '@core/wallet/utils' import { showAppNotification } from '@auxiliary/notification' -import { getWallet, IWallet } from 'shared/lib/core/profile' +import { getWallet, IWallet } from '@core/profile' // TODO(2.0) Fix export async function syncShimmerClaimingAccount(wallet: IWallet): Promise { diff --git a/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts b/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts index ee28bc220b8..8c709ee388c 100644 --- a/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts +++ b/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts @@ -2,7 +2,7 @@ import { Writable } from 'svelte/store' import { localize } from '@core/i18n' import { sortAccountsByIndex } from '@core/utils' -import { IWallet } from 'shared/lib/core/profile' +import { IWallet } from '@core/profile' // TODO(2.0) Fix this, account indexes are gone export async function getSortedRenamedBoundAccounts( diff --git a/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts b/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts index 4da699e44eb..73f1c33dbf7 100644 --- a/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts +++ b/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts @@ -1,5 +1,5 @@ import { COIN_TYPE, NetworkId } from '@core/network' -import { getActiveWallets } from 'shared/lib/core/profile' +import { getActiveWallets } from '@core/profile' import { get } from 'svelte/store' import { OnboardingType } from '../enums' import { CannotRestoreWithMismatchedCoinTypeError } from '../errors' diff --git a/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts b/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts index 030a954323a..b3d0991658a 100644 --- a/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts +++ b/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts @@ -1,7 +1,7 @@ import { onboardingProfile } from '@contexts/onboarding/stores' import { api } from '@core/api' import { SecretManager } from '@iota/sdk' -import { verifyMnemonic } from 'shared/lib/core/secret-manager' +import { verifyMnemonic } from '@core/secret-manager' import { get, writable, Writable } from 'svelte/store' export const onboardingProfileSecretManager: Writable = writable(null) diff --git a/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfWalletActivities.ts b/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfWalletActivities.ts index 78e0dc12dd0..d09e48846eb 100644 --- a/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfWalletActivities.ts +++ b/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfWalletActivities.ts @@ -1,4 +1,4 @@ -import { syncBalance } from 'shared/lib/core/wallet/actions/syncBalance' +import { syncBalance } from '@core/wallet/actions/syncBalance' import { updateNftInAllWalletNfts } from '@core/nfts' import { ActivityAsyncStatus, ActivityDirection, ActivityType } from '@core/wallet/enums' import { allWalletActivities } from '../../stores' diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts index 75960d20919..1d1c7a9d24f 100644 --- a/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts +++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts @@ -10,8 +10,8 @@ import { validateWalletApiEvent, } from '@core/wallet' import { AccountOutput, OutputType, SpentOutputWalletEvent, WalletEvent, WalletEventType } from '@iota/sdk/out/types' -import { nodeInfoProtocolParameters } from 'shared/lib/core/network' -import { getUnixTimestampFromNodeInfoAndSlotIndex } from 'shared/lib/core/network/helpers/getSlotInfoFromNodeProtocolParameters' +import { nodeInfoProtocolParameters } from '@core/network' +import { getUnixTimestampFromNodeInfoAndSlotIndex } from '@core/network/helpers/getSlotInfoFromNodeProtocolParameters' import { get } from 'svelte/store' export function handleSpentOutputEvent(walletId: string): WalletApiEventHandler { diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts index 12731d67125..3f2bf6fabfa 100644 --- a/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts +++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts @@ -19,7 +19,7 @@ import { WalletApiEventHandler, } from '@core/wallet' import { get } from 'svelte/store' -import { activeWallets, updateActiveWallet } from 'shared/lib/core/profile' +import { activeWallets, updateActiveWallet } from '@core/profile' export function handleTransactionInclusionEvent(walletId: string): WalletApiEventHandler { return (error: Error, rawEvent: WalletEvent) => { diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts index be36364cdb1..4011e1fd2f2 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts @@ -13,7 +13,7 @@ import { getStorageDepositFromOutput, getTagFromOutput, } from './helper' -import { AccountOutput } from 'shared/../../../iota-sdk/bindings/nodejs/out' +import { AccountOutput } from '@iota/sdk' import { api } from '@core/api' // TODO(2.0) Alias outputs are gone diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts index b372864a8c0..5353e54ac3d 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts @@ -1,5 +1,5 @@ import { CommonOutput, TimelockUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types' -import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network' +import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network' import { get } from 'svelte/store' export function getTimelockDateFromOutput(output: CommonOutput): Date | undefined { diff --git a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts index 5092e7b5bfe..eb044789e80 100644 --- a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts +++ b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts @@ -1,6 +1,6 @@ import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types' import { get } from 'svelte/store' -import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network' +import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network' export function getExpirationDateFromOutput(output: CommonOutput): Date | undefined { const expirationTime = getExpirationUnixTimeFromOutput(output) diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts b/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts index 75d10751a05..da053b2a668 100644 --- a/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts +++ b/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts @@ -1,5 +1,5 @@ import { EMPTY_HEX_ID } from '@core/wallet/constants' -import { api } from 'shared/lib/core/api' +import { api } from '@core/api' export function getNftId(nftId: string, outputId: string): string { const isNewNft = nftId === EMPTY_HEX_ID diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts index 74ec28eb5f2..343218bd9ae 100644 --- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts +++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts @@ -5,9 +5,9 @@ import { IProcessedTransaction, IWrappedOutput } from '../../interfaces' import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput' import { getSenderAddressFromInputs } from '../transactions' import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex' -import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network' +import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network' import { get } from 'svelte/store' -import { MILLISECONDS_PER_SECOND } from 'shared/lib/core/utils' +import { MILLISECONDS_PER_SECOND } from '@core/utils' // TODO(2.0) Fix all usages export function preprocessGroupedOutputs( diff --git a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts index 8b431b03e8c..2fe2356023c 100644 --- a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts +++ b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts @@ -1,7 +1,7 @@ import { InvalidExpirationDateTimeError } from '@contexts/wallet' import { convertUnixTimestampToDate, isValidExpirationDateTime } from '@core/utils' import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types' -import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network' +import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network' import { get } from 'svelte/store' export function validateSendConfirmation(output: CommonOutput): void { diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts index e218a1b02a8..4e1bfdcae40 100644 --- a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts +++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts @@ -8,7 +8,7 @@ import { UnlockConditionType, AccountAddress, } from '@iota/sdk/out/types' -import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from 'shared/lib/core/network' +import { getUnixTimestampFromNodeInfoAndSlotIndex, nodeInfoProtocolParameters } from '@core/network' import { get } from 'svelte/store' export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | undefined { From a6dfbf75629c4b7b32189d7a13c744a18749125a Mon Sep 17 00:00:00 2001 From: marc2332 Date: Thu, 8 Feb 2024 09:26:29 +0100 Subject: [PATCH 02/11] small tweaks --- packages/shared/components/inputs/RecipientInput.svelte | 2 +- .../shared/components/labels/TogglableAssetBalanceLabel.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shared/components/inputs/RecipientInput.svelte b/packages/shared/components/inputs/RecipientInput.svelte index dba8f10260b..99e545d3c0a 100644 --- a/packages/shared/components/inputs/RecipientInput.svelte +++ b/packages/shared/components/inputs/RecipientInput.svelte @@ -7,7 +7,7 @@ import { Layer1RecipientError } from '@core/layer-2/errors' import { getNetworkHrp, getWalletColorById, visibleActiveWallets } from '@core/profile' import { selectedWalletId } from '@core/wallet/stores' - import { SubjectType } from 'shared/lib/core/wallet' + import { SubjectType } from '@core/wallet' export let recipient: Subject export let disabled = false diff --git a/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte b/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte index 9ca88288091..428b82742dc 100644 --- a/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte +++ b/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte @@ -3,7 +3,7 @@ import { formatTokenAmountBestMatch, IAsset } from '@core/wallet' import { formatCurrency, localize } from '@core/i18n' import { getMarketAmountFromAssetValue } from '@core/market/utils' - import { DEFAULT_MANA } from 'shared/lib/core/network' + import { DEFAULT_MANA } from '@core/network' export let asset: IAsset export let mana: IAsset From 8d4e23f7cc25215ebaac1e836c695a54d2589946 Mon Sep 17 00:00:00 2001 From: marc2332 Date: Tue, 13 Feb 2024 09:49:24 +0100 Subject: [PATCH 03/11] final touches --- .../actions/events-handlers/handleTransactionInclusionEvent.ts | 3 +-- .../utils/generateActivity/generateSingleAnchorActivity.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts index 3f2bf6fabfa..3fb2771dd10 100644 --- a/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts +++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts @@ -1,8 +1,7 @@ import { closePopup, openPopup, PopupId } from '@auxiliary/popup' import { TransactionInclusionWalletEvent, WalletEvent, WalletEventType } from '@iota/sdk/out/types' - import { updateParticipationOverview } from '@contexts/governance/stores' -import { isWalletVoting } from 'shared/lib/contexts/governance/utils/isWalletVoting' +import { isWalletVoting } from '@contexts/governance/utils/isWalletVoting' import { updateNftInAllWalletNfts } from '@core/nfts' import { updateActiveWalletPersistedData } from '@core/profile/actions' import { diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts index 384f38121dc..63cf04b62b0 100644 --- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts +++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAnchorActivity.ts @@ -11,7 +11,7 @@ import { getStorageDepositFromOutput, getTagFromOutput, } from './helper' -import { AnchorOutput } from 'shared/../../../iota-sdk/bindings/nodejs/out' +import { AnchorOutput } from '@iota/sdk/out/types' export async function generateSingleAnchorActivity( wallet: IWalletState, From d056408abb4b65b4c27e48e85b97d17009ce2dfb Mon Sep 17 00:00:00 2001 From: marc2332 Date: Thu, 15 Feb 2024 10:19:44 +0100 Subject: [PATCH 04/11] Painful, but necessary. --- packages/desktop/components/Proposals.svelte | 4 ++-- .../desktop/components/WalletActivity.svelte | 3 +-- .../popup-buttons/MintNativeTokenButton.svelte | 2 +- .../RefreshTokenMetadataButton.svelte | 2 +- packages/desktop/components/index.js | 1 - packages/desktop/components/modals/index.js | 1 - .../popups/AccountConfirmationPopup.svelte | 2 +- .../popups/ActivityDetailsPopup.svelte | 4 ++-- .../components/popups/AddProposalPopup.svelte | 4 ++-- .../popups/AddressHistoryPopup.svelte | 2 +- .../popups/BackupStrongholdPopup.svelte | 4 ++-- .../popups/BalanceBreakdownPopup.svelte | 4 ++-- .../components/popups/BalanceFinderPopup.svelte | 15 ++------------- .../BurnNativeTokensConfirmationPopup.svelte | 4 ++-- .../popups/BurnNativeTokensPopup.svelte | 4 ++-- .../popups/CheckForUpdatesPopup.svelte | 4 ++-- .../components/popups/ConfirmationPopup.svelte | 4 ++-- .../components/popups/ConnectLedgerPopup.svelte | 4 ++-- .../components/popups/DeepLinkErrorPopup.svelte | 4 ++-- .../components/popups/DeleteProfilePopup.svelte | 2 +- .../components/popups/DeleteWalletPopup.svelte | 2 +- .../components/popups/DiagnosticsPopup.svelte | 2 +- .../popups/EnableLedgerBlindSigningPopup.svelte | 2 +- .../components/popups/ErrorLogPopup.svelte | 2 +- .../components/popups/FaucetRequestPopup.svelte | 2 +- .../popups/LedgerAppGuidePopup.svelte | 2 +- .../popups/LedgerConnectionGuidePopup.svelte | 2 +- .../components/popups/LegalUpdatePopup.svelte | 2 +- .../popups/ManageVotingPowerPopup.svelte | 4 ++-- .../MintNativeTokenConfirmationPopup.svelte | 2 +- .../popups/MintNativeTokenFormPopup.svelte | 11 +---------- .../popups/MintNftConfirmationPopup.svelte | 2 +- .../components/popups/MintNftFormPopup.svelte | 2 +- .../popups/NodeAuthRequiredPopup.svelte | 2 +- .../components/popups/NodeInfoPopup.svelte | 2 +- .../components/popups/PayoutDetailsPopup.svelte | 2 +- .../desktop/components/popups/RemoveNode.svelte | 2 +- .../popups/RemoveProposalPopup.svelte | 4 ++-- .../components/popups/RevotePopup.svelte | 4 ++-- .../components/popups/StopVotingPopup.svelte | 4 ++-- .../popups/TestDeepLinkFormPopup.svelte | 2 +- .../popups/TokenInformationPopup.svelte | 4 ++-- .../popups/UnlockStrongholdPopup.svelte | 2 +- .../popups/VerifyLedgerTransactionPopup.svelte | 4 ++-- .../popups/VestingCollectPopup.svelte | 2 +- .../popups/VestingRewardsFinderPopup.svelte | 4 ++-- .../popups/VoteForProposalPopup.svelte | 4 ++-- .../popups/VotingPowerToZeroPopup.svelte | 4 ++-- .../popups/WalletSwitcherPopup.svelte | 2 +- .../popups/WithdrawFromL2Popup.svelte | 2 +- .../popups/send/SendConfirmationPopup.svelte | 2 +- .../routers/utils/getSubroutersForAppContext.ts | 2 +- packages/desktop/views/Splash.svelte | 2 +- .../desktop/views/dashboard/Dashboard.svelte | 2 +- .../views/CollectiblesGalleryView.svelte | 2 +- .../governance/views/ProposalDetailsView.svelte | 2 +- .../views/advanced/BalanceFinder.svelte | 2 +- .../views/advanced/DeveloperToggle.svelte | 2 +- .../views/advanced/HiddenWallets.svelte | 2 +- .../views/collectibles/RefreshNftMedia.svelte | 2 +- .../views/general/CrashReporting.svelte | 2 +- .../settings/views/general/DeepLinks.svelte | 2 +- .../settings/views/general/Language.svelte | 2 +- .../settings/views/general/NetworkStatus.svelte | 2 +- .../settings/views/general/Notifications.svelte | 2 +- .../settings/views/general/Theme.svelte | 2 +- .../settings/views/help/Diagnostics.svelte | 2 +- .../settings/views/help/ErrorLog.svelte | 2 +- .../settings/views/help/HelpSection.svelte | 2 +- .../views/network/ConfigureNodeList.svelte | 2 +- .../views/network/LocalProofOfWork.svelte | 2 +- .../views/network/NetworkInformation.svelte | 2 +- .../views/profile/ChangeProfileName.svelte | 2 +- .../settings/views/profile/Currency.svelte | 2 +- .../settings/views/profile/DeleteProfile.svelte | 4 ++-- .../settings/views/security/AppLock.svelte | 2 +- .../views/security/ChangePassword.svelte | 11 +---------- .../views/security/ChangePincode.svelte | 2 +- .../views/security/ExportStronghold.svelte | 2 +- .../views/ImplicitAccountCreationView.svelte | 2 +- .../AccountCreationView.svelte | 2 +- .../FundConfirmationView.svelte | 2 +- .../InitView.svelte | 2 +- .../OneTimeDepositView.svelte | 2 +- packages/desktop/views/login/LoginRouter.svelte | 2 +- .../views/login/views/EnterPinView.svelte | 2 +- .../views/login/views/LoadProfileView.svelte | 2 +- .../views/login/views/SelectProfileView.svelte | 2 +- .../views/onboarding/onboarding-router.ts | 17 ++++++++++++----- .../CompleteOnboardingRouterView.svelte | 5 ++--- .../views/complete-onboarding/index.js | 3 --- .../views/EnterNameView.svelte | 2 +- .../views/EnterPinView.svelte | 2 +- .../views/FinishOnboardingView.svelte | 2 +- .../CreateFromLedgerRouterView.svelte | 3 +-- .../views/create-from-ledger/index.js | 3 --- .../views/InstallLedgerView.svelte | 2 +- .../CreateFromMnemonicRouterView.svelte | 3 +-- .../views/create-from-mnemonic/index.js | 3 --- .../views/VerifyMnemonicView.svelte | 2 +- .../views/ViewMnemonicView.svelte | 2 +- .../CreateProfileRouterView.svelte | 3 +-- .../onboarding/views/create-profile/index.js | 3 --- .../views/ChooseCreateProfileFlowView.svelte | 2 +- .../network-setup/NetworkSetupRouterView.svelte | 3 +-- .../onboarding/views/network-setup/index.js | 3 --- .../views/ChooseNetworkView.svelte | 2 +- .../views/CustomNetworkView.svelte | 2 +- .../RestoreFromMnemonicRouterView.svelte | 5 ++--- .../views/restore-from-mnemonic/index.js | 3 --- .../views/InputMnemonicView.svelte | 2 +- .../RestoreFromStrongholdRouterView.svelte | 5 ++--- .../views/restore-from-stronghold/index.js | 3 --- .../views/ImportStrongholdView.svelte | 2 +- .../views/UnlockStrongholdView.svelte | 2 +- .../RestoreProfileRouterView.svelte | 3 +-- .../onboarding/views/restore-profile/index.js | 3 --- .../views/ChooseRestoreProfileFlowView.svelte | 2 +- .../views/ClaimFinderView.svelte | 2 +- .../UpdateStrongholdRouterView.svelte | 3 +-- .../desktop/views/update-stronghold/index.js | 3 --- .../views/ChangePasswordView.svelte | 4 ++-- .../views/UpdateBackupView.svelte | 4 ++-- .../views/UpdateStrongholdView.svelte | 2 +- .../components/AccountActivityDetails.svelte | 2 +- .../components/ActivityInformation.svelte | 4 ++-- packages/shared/components/Alert.svelte | 2 +- packages/shared/components/AmountBox.svelte | 2 +- packages/shared/components/AssetIcon.svelte | 2 +- packages/shared/components/AssetList.svelte | 3 +-- .../shared/components/BalanceSummaryRow.svelte | 2 +- .../components/BalanceSummarySection.svelte | 2 +- .../components/BasicActivityDetails.svelte | 8 +------- packages/shared/components/Button.svelte | 2 +- packages/shared/components/ColorPicker.svelte | 2 +- .../ConsolidationActivityDetails.svelte | 2 +- .../shared/components/DateInputButton.svelte | 2 +- packages/shared/components/Error.svelte | 2 +- .../components/ExpirationTimePicker.svelte | 2 +- .../components/FoundryActivityDetails.svelte | 2 +- .../components/GovernanceActivityDetails.svelte | 2 +- .../shared/components/InformationTooltip.svelte | 2 +- .../shared/components/LedgerAnimation.svelte | 2 +- packages/shared/components/Link.svelte | 2 +- packages/shared/components/MarkdownBlock.svelte | 2 +- .../shared/components/MediaPlaceholder.svelte | 2 +- packages/shared/components/MenuItem.svelte | 2 +- .../shared/components/NftActivityDetails.svelte | 2 +- .../shared/components/NftGalleryItem.svelte | 2 +- .../shared/components/NftImageOrIconBox.svelte | 4 ++-- .../components/NodeConfigurationForm.svelte | 2 +- packages/shared/components/NodeListRow.svelte | 2 +- packages/shared/components/ProgressBar.svelte | 2 +- packages/shared/components/SelectorInput.svelte | 2 +- packages/shared/components/Spinner.svelte | 2 +- packages/shared/components/SubjectBox.svelte | 2 +- packages/shared/components/TextHint.svelte | 2 +- packages/shared/components/Toast.svelte | 2 +- .../AccountActivityInformation.svelte | 2 +- .../ConsolidationActivityInformation.svelte | 2 +- .../FoundryActivityInformation.svelte | 2 +- .../GenericActivityInformation.svelte | 2 +- .../GovernanceActivityInformation.svelte | 2 +- .../activity-info/NftActivityInformation.svelte | 2 +- .../activity-info/NftMetadataInformation.svelte | 2 +- .../SmartContractActivityInformation.svelte | 2 +- .../TokenActivityInformation.svelte | 2 +- .../components/badges/NetworkIconBadge.svelte | 4 ++-- .../components/badges/StrongholdBadge.svelte | 4 ++-- .../components/badges/VerificationBadge.svelte | 2 +- .../shared/components/boxes/AddressBox.svelte | 2 +- .../shared/components/boxes/CopyableBox.svelte | 2 +- .../shared/components/boxes/KeyValueBox.svelte | 2 +- .../buttons/ExportStrongholdButton.svelte | 2 +- .../components/buttons/OnboardingButton.svelte | 2 +- .../buttons/ReceiveAddressButton.svelte | 2 +- .../components/buttons/TooltipIcon.svelte | 2 +- .../filter-items/AssetFilterItem.svelte | 2 +- .../filter-items/DateFilterItem.svelte | 2 +- .../filter-items/NumberFilterItem.svelte | 2 +- .../filter-items/OrderFilterItem.svelte | 2 +- .../filter-items/SelectionFilterItem.svelte | 2 +- .../components/filter/Filter.svelte | 3 +-- .../components/filter/FilterItem.svelte | 0 .../components/filter/index.js | 0 packages/shared/components/index.js | 2 +- .../components/inputs/AccountInput.svelte | 2 +- .../shared/components/inputs/AmountInput.svelte | 2 +- .../components/inputs/AssetAmountInput.svelte | 2 +- .../components/inputs/AssetDropdown.svelte | 2 +- .../components/inputs/ClosableInput.svelte | 2 +- .../components/inputs/DateTimePicker.svelte | 2 +- .../shared/components/inputs/Dropdown.svelte | 2 +- .../shared/components/inputs/Dropdown2.svelte | 2 +- .../shared/components/inputs/Dropzone.svelte | 2 +- .../components/inputs/ImportTextfield.svelte | 2 +- packages/shared/components/inputs/Input.svelte | 2 +- .../components/inputs/NetworkInput.svelte | 2 +- .../shared/components/inputs/NftInput.svelte | 2 +- .../shared/components/inputs/NodeInput.svelte | 2 +- .../shared/components/inputs/NumberInput.svelte | 2 +- .../components/inputs/OptionalInput.svelte | 4 ++-- .../components/inputs/PasswordInput.svelte | 2 +- .../shared/components/inputs/PinInput.svelte | 2 +- packages/shared/components/inputs/Radio.svelte | 2 +- .../components/inputs/RecipientInput.svelte | 2 +- .../shared/components/inputs/SearchInput.svelte | 2 +- .../shared/components/inputs/TextInput.svelte | 2 +- .../components/inputs/TogglableButton.svelte | 2 +- .../shared/components/inputs/UnitInput.svelte | 2 +- .../components/inputs/WalletSelector.svelte | 2 +- .../labels/TogglableAssetBalanceLabel.svelte | 2 +- .../shared/components/labels/WalletLabel.svelte | 2 +- .../components/modals/AssetActionsModal.svelte | 2 +- .../modals/CollectibleActionsModal.svelte | 2 +- .../components/modals/FilterModal.svelte | 0 packages/shared/components/modals/index.js | 1 + .../pills/DeveloperIndicatorPill.svelte | 2 +- packages/shared/components/pills/Pill.svelte | 2 +- .../components/pills/ProposalStatusPill.svelte | 2 +- .../shared/components/tiles/ActivityTile.svelte | 2 +- .../shared/components/tiles/AssetTile.svelte | 2 +- .../components/tiles/ClickableTile.svelte | 2 +- .../tiles/ShimmerClaimingAccountTile.svelte | 2 +- .../AccountActivityTileContent.svelte | 2 +- .../tileContents/ActivityTileContent.svelte | 2 +- .../ConsolidationActivityTileContent.svelte | 2 +- .../FoundryActivityTileContent.svelte | 2 +- .../GovernanceActivityTileContent.svelte | 2 +- .../tileContents/NftActivityTileContent.svelte | 2 +- .../TransactionActivityTileContent.svelte | 2 +- .../VestingActivityTileContent.svelte | 2 +- .../tileFooters/AsyncActivityTileFooter.svelte | 12 ++---------- .../TimelockActivityTileFooter.svelte | 4 ++-- .../lib/core/app/utils/openUrlInBrowser.ts | 2 +- .../complete-onboarding-route.enum.ts | 0 .../complete-onboarding-router.ts | 0 .../subrouters/complete-onboarding/index.ts | 2 ++ .../create-from-ledger-route.enum.ts | 0 .../create-from-ledger-router.ts | 0 .../subrouters/create-from-ledger/index.ts | 2 ++ .../create-from-mnemonic-route.enum.ts | 0 .../create-from-mnemonic-router.ts | 0 .../subrouters/create-from-mnemonic/index.ts | 2 ++ .../create-profile/create-profile-route.enum.ts | 0 .../create-profile/create-profile-router.ts | 0 .../router/subrouters/create-profile/index.ts | 2 ++ .../shared/lib/core/router/subrouters/index.ts | 9 +++++++++ .../lib/core/router/subrouters/login-router.ts | 6 +----- .../router/subrouters/network-setup/index.ts | 2 ++ .../network-setup/network-setup-route.enum.ts | 0 .../network-setup/network-setup-router.ts | 0 .../subrouters/restore-from-mnemonic/index.ts | 2 ++ .../restore-from-mnemonic-route.enum.ts | 0 .../restore-from-mnemonic-router.ts | 0 .../subrouters/restore-from-stronghold/index.ts | 2 ++ .../restore-from-stronghold-route.enum.ts | 0 .../restore-from-stronghold-router.ts | 2 +- .../router/subrouters/restore-profile/index.ts | 2 ++ .../restore-profile-route.enum.ts | 0 .../restore-profile/restore-profile-router.ts | 0 .../subrouters/update-stronghold/index.ts | 2 ++ .../update-stronghold-route.enum.ts | 0 .../update-stronghold-router.ts | 0 264 files changed, 295 insertions(+), 348 deletions(-) rename packages/{desktop => shared}/components/filter/Filter.svelte (95%) rename packages/{desktop => shared}/components/filter/FilterItem.svelte (100%) rename packages/{desktop => shared}/components/filter/index.js (100%) rename packages/{desktop => shared}/components/modals/FilterModal.svelte (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/complete-onboarding/complete-onboarding-route.enum.ts (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/complete-onboarding/complete-onboarding-router.ts (100%) create mode 100644 packages/shared/lib/core/router/subrouters/complete-onboarding/index.ts rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/create-from-ledger/create-from-ledger-route.enum.ts (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/create-from-ledger/create-from-ledger-router.ts (100%) create mode 100644 packages/shared/lib/core/router/subrouters/create-from-ledger/index.ts rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/create-from-mnemonic/create-from-mnemonic-route.enum.ts (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/create-from-mnemonic/create-from-mnemonic-router.ts (100%) create mode 100644 packages/shared/lib/core/router/subrouters/create-from-mnemonic/index.ts rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/create-profile/create-profile-route.enum.ts (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/create-profile/create-profile-router.ts (100%) create mode 100644 packages/shared/lib/core/router/subrouters/create-profile/index.ts create mode 100644 packages/shared/lib/core/router/subrouters/network-setup/index.ts rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/network-setup/network-setup-route.enum.ts (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/network-setup/network-setup-router.ts (100%) create mode 100644 packages/shared/lib/core/router/subrouters/restore-from-mnemonic/index.ts rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/restore-from-mnemonic/restore-from-mnemonic-route.enum.ts (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/restore-from-mnemonic/restore-from-mnemonic-router.ts (100%) create mode 100644 packages/shared/lib/core/router/subrouters/restore-from-stronghold/index.ts rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/restore-from-stronghold/restore-from-stronghold-route.enum.ts (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/restore-from-stronghold/restore-from-stronghold-router.ts (98%) create mode 100644 packages/shared/lib/core/router/subrouters/restore-profile/index.ts rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/restore-profile/restore-profile-route.enum.ts (100%) rename packages/{desktop/views/onboarding/views => shared/lib/core/router/subrouters}/restore-profile/restore-profile-router.ts (100%) create mode 100644 packages/shared/lib/core/router/subrouters/update-stronghold/index.ts rename packages/{desktop/views => shared/lib/core/router/subrouters}/update-stronghold/update-stronghold-route.enum.ts (100%) rename packages/{desktop/views => shared/lib/core/router/subrouters}/update-stronghold/update-stronghold-router.ts (100%) diff --git a/packages/desktop/components/Proposals.svelte b/packages/desktop/components/Proposals.svelte index ee131002f83..0ce668e6a44 100644 --- a/packages/desktop/components/Proposals.svelte +++ b/packages/desktop/components/Proposals.svelte @@ -1,6 +1,6 @@ diff --git a/packages/desktop/components/popups/DeleteProfilePopup.svelte b/packages/desktop/components/popups/DeleteProfilePopup.svelte index f608695d5c5..25b5a0f6695 100644 --- a/packages/desktop/components/popups/DeleteProfilePopup.svelte +++ b/packages/desktop/components/popups/DeleteProfilePopup.svelte @@ -1,5 +1,5 @@ diff --git a/packages/shared/components/ExpirationTimePicker.svelte b/packages/shared/components/ExpirationTimePicker.svelte index a86e0f5be2a..b052094a6d6 100644 --- a/packages/shared/components/ExpirationTimePicker.svelte +++ b/packages/shared/components/ExpirationTimePicker.svelte @@ -1,5 +1,5 @@ diff --git a/packages/shared/components/TextHint.svelte b/packages/shared/components/TextHint.svelte index 49d8fb8fde4..f4dfe330ed2 100644 --- a/packages/shared/components/TextHint.svelte +++ b/packages/shared/components/TextHint.svelte @@ -1,5 +1,5 @@ - import { Text, FontWeight } from 'shared/components' + import { Text, FontWeight } from '@ui' export let data: string = '' export let textColor: string = 'gray-800' diff --git a/packages/shared/components/pills/ProposalStatusPill.svelte b/packages/shared/components/pills/ProposalStatusPill.svelte index 5df5db5d29c..2aa97419b16 100644 --- a/packages/shared/components/pills/ProposalStatusPill.svelte +++ b/packages/shared/components/pills/ProposalStatusPill.svelte @@ -1,5 +1,5 @@