iotaledger · begonaalvarezd · Jan 23, 2024 · Dec 21, 2023 · Dec 22, 2023 · Dec 22, 2023
diff --git a/packages/desktop/App.svelte b/packages/desktop/App.svelte
@@ -44,7 +44,7 @@
 
     appStage.set(AppStage[process.env.STAGE.toUpperCase()] ?? AppStage.ALPHA)
 
-    const { loggedIn, hasLoadedAccounts } = $activeProfile
+    const { loggedIn, hasLoadedWallets } = $activeProfile
 
     $: if ($activeProfile && !$loggedIn) {
         closePopup(true)
@@ -68,7 +68,7 @@
         document.dir = $localeDirection
     }
 
-    $: isDashboardVisible = $appRoute === AppRoute.Dashboard && $hasLoadedAccounts && $popupState.id !== 'busy'
+    $: isDashboardVisible = $appRoute === AppRoute.Dashboard && $hasLoadedWallets && $popupState.id !== 'busy'
 
     $: $nftDownloadQueue, downloadNextNftInQueue()
 

diff --git a/packages/desktop/components/AccountActivity.svelte b/packages/desktop/components/AccountActivity.svelte
@@ -6,7 +6,7 @@
         activitySearchTerm,
         queriedActivities,
         selectedWalletActivities,
-        setAsyncStatusOfAccountActivities,
+        setAsyncStatusOfWalletActivities,
     } from '@core/wallet'
     import { ActivityTile, Text, TextInput, TogglableButton, FontWeight } from '@ui'
     import { Filter } from '@components'
@@ -21,7 +21,7 @@
 
     $: if (searchActive && inputElement) inputElement.focus()
     $: searchValue = searchActive ? searchValue.toLowerCase() : ''
-    $: setAsyncStatusOfAccountActivities($time)
+    $: setAsyncStatusOfWalletActivities($time)
     $: if (searchActive && $selectedWalletActivities) {
         debounce(() => {
             $activitySearchTerm = searchValue

diff --git a/packages/desktop/components/TitleBar.svelte b/packages/desktop/components/TitleBar.svelte
@@ -8,11 +8,11 @@
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { popupState } from '@auxiliary/popup'
 
-    const { hasLoadedAccounts } = $activeProfile
+    const { hasLoadedWallets } = $activeProfile
 
     let isMaximized = false
 
-    $: isDashboardVisible = $appRoute === AppRoute.Dashboard && $hasLoadedAccounts && $popupState.id !== 'busy'
+    $: isDashboardVisible = $appRoute === AppRoute.Dashboard && $hasLoadedWallets && $popupState.id !== 'busy'
     $: isWindows = $platform === PlatformOption.Windows
 
     async function onResize(): Promise<void> {

diff --git a/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte b/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte
@@ -8,8 +8,7 @@
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { TextHintVariant } from 'shared/components/enums'
 
-    // TODO(2.0) Should this be checking if it has accounts?
-    $: hasAccounts = $selectedWallet.balances?.accounts.length > 0
+    $: hasAccounts = $selectedWallet?.accountOutputs.length > 0
 
     function onMintNativeTokenClick(): void {
         resetMintTokenDetails()

diff --git a/packages/desktop/components/popups/AddNodePopup.svelte b/packages/desktop/components/popups/AddNodePopup.svelte
@@ -6,7 +6,7 @@
     import { closePopup } from '@auxiliary/popup'
     import { Platform } from '@core/app'
     import { activeWallets, activeProfile } from '@core/profile'
-    import { registerProposalsForAccounts } from '@contexts/governance'
+    import { registerProposalsForWallets } from '@contexts/governance'
 
     export let node: INode = structuredClone(EMPTY_NODE)
     export let isEditingNode: boolean = false
@@ -33,7 +33,7 @@
             }
 
             if (Platform.isFeatureFlagEnabled('governance')) {
-                await registerProposalsForAccounts({ node }, $activeWallets)
+                await registerProposalsForWallets({ node }, $activeWallets)
             }
 
             onSuccess()

diff --git a/packages/desktop/electron/lib/nftDownloadHandlers.js b/packages/desktop/electron/lib/nftDownloadHandlers.js
@@ -8,7 +8,7 @@ const downloadItems = {}
 
 export function initNftDownloadHandlers() {
     ipcMain.removeHandler('nft-download')
-    ipcMain.handle('nft-download', async (event, url, destination, nftId, accountIndex) => {
+    ipcMain.handle('nft-download', async (event, url, destination, nftId, walletId) => {
         const userPath = app.getPath('userData')
         const directory = app.isPackaged ? userPath : __dirname
 
@@ -20,11 +20,11 @@ export function initNftDownloadHandlers() {
             showProgressBar: true,
             onCompleted: () => {
                 delete downloadItems[nftId]
-                getOrInitWindow('main').webContents.send('nft-download-done', { nftId, accountIndex })
+                getOrInitWindow('main').webContents.send('nft-download-done', { nftId, walletId })
             },
             onCancel: () => {
                 delete downloadItems[nftId]
-                getOrInitWindow('main').webContents.send('nft-download-interrupted', { nftId, accountIndex })
+                getOrInitWindow('main').webContents.send('nft-download-interrupted', { nftId, walletId })
             },
             onStarted: (item) => (downloadItems[nftId] = item),
         })

diff --git a/packages/desktop/electron/main.js b/packages/desktop/electron/main.js
@@ -178,7 +178,7 @@ if (app.isPackaged) {
  * Handles url navigation events
  */
 const handleNavigation = (e, url) => {
-    if (url === 'http://localhost:8080/') {
+    if (url === 'http://localhost:3333/') {
         // if localhost would be opened on the build versions, we need to block it to prevent errors
         if (app.isPackaged) {
             e.preventDefault()
@@ -244,7 +244,7 @@ function createWindow() {
         // Enable dev tools only in developer mode
         windows.main.webContents.openDevTools()
 
-        windows.main.loadURL('http://localhost:8080')
+        windows.main.loadURL('http://localhost:3333')
     } else {
         initAutoUpdate()
 

diff --git a/packages/desktop/views/dashboard/Dashboard.svelte b/packages/desktop/views/dashboard/Dashboard.svelte
@@ -61,7 +61,7 @@
     }
 
     function handleDeepLinkRequest(data: string): void {
-        if ($activeProfile?.hasLoadedAccounts) {
+        if ($activeProfile?.hasLoadedWallets) {
             handleDeepLink(data)
         }
     }

diff --git a/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte b/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte
@@ -10,7 +10,7 @@
         NftDownloadMetadata,
         allWalletNfts,
         convertAndFormatNftMetadata,
-        getNftByIdFromAllAccountNfts,
+        getNftByIdFromAllWalletNfts,
         selectedNftId,
     } from '@core/nfts'
     import { getBaseToken } from '@core/profile/actions'
@@ -43,7 +43,7 @@
     let modal: Modal
 
     const explorerUrl = getOfficialExplorerUrl($activeProfile?.network?.id)
-    const nft: INft = getNftByIdFromAllAccountNfts($selectedWalletId, $selectedNftId)
+    const nft: INft = getNftByIdFromAllWalletNfts($selectedWalletId, $selectedNftId)
 
     const { id, name, issuer, address, metadata, downloadMetadata, storageDeposit } = nft ?? {}
     const { standard, version, type, uri, description, issuerName, collectionName, attributes, soonaverseAttributes } =

diff --git a/packages/desktop/views/dashboard/settings/views/advanced/HiddenAccounts.svelte b/packages/desktop/views/dashboard/settings/views/advanced/HiddenAccounts.svelte
@@ -7,7 +7,7 @@
     let showHiddenAccounts = $activeProfile?.showHiddenAccounts
     $: updateActiveProfile({ showHiddenAccounts: showHiddenAccounts })
 
-    $: if ($activeProfile?.hasLoadedAccounts && !showHiddenAccounts) {
+    $: if ($activeProfile?.hasLoadedWallets && !showHiddenAccounts) {
         setNextSelectedWallet()
     }
 </script>

diff --git a/packages/desktop/views/login/views/SelectProfileView.svelte b/packages/desktop/views/login/views/SelectProfileView.svelte
@@ -45,7 +45,7 @@
     onMount(async () => {
         // Clean up if user has navigated back to this view from onboarding
         if ($onboardingProfile) {
-            if ($onboardingProfile.hasInitialisedProfileManager) {
+            if ($onboardingProfile.secretManagerOptions) {
                 await clearProfileFromMemory()
                 await removeProfileFolder($onboardingProfile.id)
             }

diff --git a/...es/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte b/...es/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
@@ -40,11 +40,11 @@
 
     onMount(async () => {
         // Clean up if user has navigated back to this view
-        if ($onboardingProfile.hasInitialisedProfileManager) {
+        if ($onboardingProfile.secretManagerOptions) {
             await clearProfileFromMemory()
             await removeProfileFolder($onboardingProfile.id)
         }
-        updateOnboardingProfile({ type: undefined, createProfileType: undefined, hasInitialisedProfileManager: false })
+        updateOnboardingProfile({ type: undefined, createProfileType: undefined, secretManagerOptions: undefined })
     })
 </script>
 

diff --git a/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte b/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
@@ -2,8 +2,8 @@
     import { showAppNotification } from '@auxiliary/notification'
     import { OnboardingLayout } from '@components'
     import {
-        cleanupOnboardingProfileManager,
-        initialiseProfileManagerFromOnboardingProfile,
+        cleanupOnboardingProfile,
+        initialiseOnboardingProfile,
         updateOnboardingProfile,
     } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
@@ -41,7 +41,7 @@
                 validateClientOptions: false,
             })
             updateOnboardingProfile({ clientOptions: { nodes: [node], primaryNode: node } })
-            await initialiseProfileManagerFromOnboardingProfile(true)
+            await initialiseOnboardingProfile(true)
 
             // The API request to check if a node is reachable requires an existing account manager.
             const nodeInfoResponse = await getNodeInfo(node.url)
@@ -55,13 +55,13 @@
             const customCoinType = networkId === NetworkId.Custom ? Number(coinType) : undefined
             const network = buildPersistedNetworkFromNodeInfoResponse(nodeInfoResponse, customCoinType)
             updateOnboardingProfile({ network })
-            await cleanupOnboardingProfileManager()
+            await cleanupOnboardingProfile()
             $networkSetupRouter.next()
         } catch (err) {
             console.error(err)
 
             updateOnboardingProfile({ clientOptions: undefined, network: undefined })
-            await cleanupOnboardingProfileManager()
+            await cleanupOnboardingProfile()
 
             if (err?.error?.includes('error sending request for url')) {
                 formError = localize('error.node.unabledToConnect')

diff --git a/.../desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte b/.../desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte
@@ -1,6 +1,11 @@
 <script lang="ts">
     import { OnboardingLayout } from '@components'
-    import { RestoreProfileType, onboardingProfile, updateOnboardingProfile } from '@contexts/onboarding'
+    import {
+        RestoreProfileType,
+        initialiseOnboardingProfile,
+        onboardingProfile,
+        updateOnboardingProfile,
+    } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
     import { getNetworkNameFromNetworkId } from '@core/network'
     import { ProfileType, clearProfileFromMemory, removeProfileFolder } from '@core/profile'
@@ -25,8 +30,7 @@
         isBusy = { ...isBusy, [restoreProfileType]: true }
         const type = restoreProfileType === RestoreProfileType.Ledger ? ProfileType.Ledger : ProfileType.Software
         updateOnboardingProfile({ type, restoreProfileType })
-        // TODO(2.0) This is gone
-        await initialiseProfileManagerFromOnboardingProfile()
+        await initialiseOnboardingProfile()
         $restoreProfileRouter.next()
     }
 
@@ -36,11 +40,11 @@
 
     onMount(async () => {
         // Clean up if user has navigated back to this view
-        if ($onboardingProfile.hasInitialisedProfileManager) {
+        if ($onboardingProfile.secretManagerOptions) {
             await clearProfileFromMemory()
             await removeProfileFolder($onboardingProfile.id)
         }
-        updateOnboardingProfile({ type: undefined, restoreProfileType: undefined, hasInitialisedProfileManager: false })
+        updateOnboardingProfile({ type: undefined, restoreProfileType: undefined, secretManagerOptions: undefined })
     })
 </script>
 

diff --git a/packages/desktop/views/update-stronghold/UpdateStrongholdRouterView.svelte b/packages/desktop/views/update-stronghold/UpdateStrongholdRouterView.svelte
@@ -16,7 +16,7 @@
     </Transition>
 {:else if $updateStrongholdRoute === UpdateStrongholdRoute.ChangePassword}
     <Transition>
-        <ChangePasswordView bind:newPassword oldPassword={password} {isRecovery} />
+        <ChangePasswordView bind:newPassword oldPassword={password} />
     </Transition>
 {:else if $updateStrongholdRoute === UpdateStrongholdRoute.SaveBackup}
     <Transition>

diff --git a/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte b/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte
@@ -3,22 +3,18 @@
     import { OnboardingLayout } from '@components'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
-    import { MAX_STRONGHOLD_PASSWORD_LENGTH, unlockStronghold } from '@core/profile'
-    import { activeProfile, updateActiveProfile } from '@core/profile/stores'
+    import { MAX_STRONGHOLD_PASSWORD_LENGTH, changePasswordAndUnlockStronghold, unlockStronghold } from '@core/profile'
     import { PASSWORD_REASON_MAP } from '@core/stronghold'
     import { Animation, Button, PasswordInput, Text, TextHint } from '@ui'
     import { HTMLButtonType, TextType } from '@ui/enums'
-    import { onMount } from 'svelte'
     import zxcvbn from 'zxcvbn'
     import { updateStrongholdRouter } from '../update-stronghold-router'
     import { TextHintVariant } from 'shared/components/enums'
     import { AnimationEnum } from '@auxiliary/animation'
     import { onboardingProfile, updateOnboardingProfile } from '@contexts/onboarding'
-    import { changeStrongholdPassword } from '@core/secret-manager'
 
     export let oldPassword: string
     export let newPassword: string
-    export let isRecovery: boolean
 
     let passwordError: string = ''
     let confirmPassword: string = ''
@@ -63,7 +59,7 @@
         if (isPasswordValid) {
             try {
                 isSubmitBusy = true
-                await changeStrongholdPassword(oldPassword, newPassword)
+                await changePasswordAndUnlockStronghold(oldPassword, newPassword)
                 if ($onboardingProfile) {
                     updateOnboardingProfile({ strongholdPassword: newPassword })
                 }
@@ -95,24 +91,6 @@
             isSkipBusy = false
         }
     }
-
-    onMount(async () => {
-        // TODO(2.0) Profile manager is gone
-        if (!isRecovery && !$profileManager) {
-            const profileManagerOptions = await buildProfileManagerOptionsFromProfileData($activeProfile)
-            const { storagePath, coinType, clientOptions, secretManager } = profileManagerOptions
-            updateActiveProfile({ clientOptions })
-            // TODO(2.0): Update initialiseProfileManager to new logic
-            const manager = await initialiseProfileManager(
-                $activeProfile?.id,
-                storagePath,
-                coinType,
-                clientOptions,
-                secretManager
-            )
-            profileManager.set(manager)
-        }
-    })
 </script>
 
 <OnboardingLayout allowBack={false}>

diff --git a/packages/desktop/webpack.config.ts b/packages/desktop/webpack.config.ts
@@ -233,6 +233,7 @@ const webpackConfig: Configuration[] = [
                     warnings: false,
                 },
             },
+            port: 3333,
         },
     },
     {

diff --git a/packages/shared/components/ActivityInformation.svelte b/packages/shared/components/ActivityInformation.svelte
@@ -13,7 +13,7 @@
     } from 'shared/components'
     import { Tab } from 'shared/components/enums'
     import { ActivityType, Activity } from '@core/wallet'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts'
+    import { getNftByIdFromAllWalletNfts } from '@core/nfts'
     import { selectedWalletId } from '@core/wallet'
 
     export let activity: Activity
@@ -23,7 +23,7 @@
     $: {
         const storedNft =
             activity?.type === ActivityType.Nft
-                ? getNftByIdFromAllAccountNfts($selectedWalletId, activity?.nftId)
+                ? getNftByIdFromAllWalletNfts($selectedWalletId, activity?.nftId)
                 : undefined
         hasMetadata = !!storedNft?.metadata
     }

diff --git a/packages/shared/components/NftActivityDetails.svelte b/packages/shared/components/NftActivityDetails.svelte
@@ -3,7 +3,7 @@
     import { selectedWalletId } from '@core/wallet/stores'
     import { time } from '@core/app'
     import { localize } from '@core/i18n'
-    import { getNftByIdFromAllAccountNfts, ownedNfts, selectedNftId } from '@core/nfts'
+    import { getNftByIdFromAllWalletNfts, ownedNfts, selectedNftId } from '@core/nfts'
     import { CollectiblesRoute, collectiblesRouter, DashboardRoute, dashboardRouter } from '@core/router'
     import { ActivityAsyncStatus, NftActivity } from '@core/wallet'
     import { getSubjectFromActivity } from '@core/wallet/utils/generateActivity/helper'
@@ -22,7 +22,7 @@
 
     export let activity: NftActivity
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedWalletId, activity.nftId)
+    $: nft = getNftByIdFromAllWalletNfts($selectedWalletId, activity.nftId)
     $: nftIsOwned = $ownedNfts.some((nft) => nft.id === activity.nftId)
     $: isTimelocked = activity?.asyncData?.timelockDate > $time
     $: subject = getSubjectFromActivity(activity)

diff --git a/packages/shared/components/activity-info/NftActivityInformation.svelte b/packages/shared/components/activity-info/NftActivityInformation.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { selectedWalletId } from '@core/wallet'
     import { localize } from '@core/i18n'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts'
+    import { getNftByIdFromAllWalletNfts } from '@core/nfts'
     import { IKeyValueBoxList } from '@core/utils'
     import {
         ADDRESS_TYPE_ALIAS,
@@ -15,7 +15,7 @@
 
     export let activity: NftActivity
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedWalletId, activity.nftId)
+    $: nft = getNftByIdFromAllWalletNfts($selectedWalletId, activity.nftId)
     $: issuerAddress = nft?.issuer && getBech32AddressFromAddressTypes(nft.issuer)
     $: collectionId = nft?.issuer && getHexAddressFromAddressTypes(nft.issuer)
 

diff --git a/packages/shared/components/activity-info/NftMetadataInformation.svelte b/packages/shared/components/activity-info/NftMetadataInformation.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { selectedWalletId } from '@core/wallet'
     import { localize } from '@core/i18n'
-    import { convertAndFormatNftMetadata, getNftByIdFromAllAccountNfts, IIrc27Metadata } from '@core/nfts'
+    import { convertAndFormatNftMetadata, getNftByIdFromAllWalletNfts, IIrc27Metadata } from '@core/nfts'
     import { NftActivity } from '@core/wallet'
     import { KeyValueBox } from 'shared/components'
 
@@ -18,7 +18,7 @@
         }
     }
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedWalletId, activity?.nftId)
+    $: nft = getNftByIdFromAllWalletNfts($selectedWalletId, activity?.nftId)
     $: nftMetadataDetailsList = nft?.parsedMetadata
         ? createIrc27NftMetadataDetailsList(nft?.parsedMetadata)
         : createNftMetadataDetailsList(nft?.metadata)
-Original file line number
+Diff line change
@@ Expand Up / @@ -233,6 +233,7 @@ const webpackConfig: Configuration[] = [ @@
                         warnings: false,
                     },
                 },
+                port: 3333,
             },
         },
         {
@@ Expand Down @@