From a758ef10d3b2ba5df2901287983bbda656d32065 Mon Sep 17 00:00:00 2001
From: cpl121 <100352899+cpl121@users.noreply.github.com>
Date: Tue, 19 Dec 2023 09:58:04 +0100
Subject: [PATCH] refactor: Fix Login and onboarding improvements  (#7779)

* refactor: login WIP

* fix: selected wallet id

* mmm, some improvements and fixes

* fixes and improvements

* fixes and clean up

---------

Co-authored-by: marc2332 <mespinsanz@gmail.com>
---
 .../desktop/components/AccountSummary.svelte  |  4 +-
 .../desktop/components/AccountSwitcher.svelte |  4 +-
 .../modals/WalletActionsMenu.svelte           |  2 +-
 .../components/popups/AddNodePopup.svelte     |  4 +-
 .../components/popups/AddProposalPopup.svelte | 18 +++---
 .../popups/CreateWalletPopup.svelte           |  2 +-
 ...tPopup.svelte => ManageWalletPopup.svelte} | 28 +++++-----
 .../desktop/components/popups/Popup.svelte    |  6 +-
 .../popups/RemoveProposalPopup.svelte         |  4 +-
 packages/desktop/electron/preload.js          | 50 +++++++++++------
 .../login/views/SelectProfileView.svelte      |  1 -
 .../views/FinishOnboardingView.svelte         |  1 -
 .../views/ChooseCreateProfileFlowView.svelte  |  1 -
 .../views/shared/EncryptMnemonicView.svelte   |  5 +-
 packages/shared/components/ColorPicker.svelte | 20 +++----
 packages/shared/components/SubjectBox.svelte  |  6 +-
 .../ToggleHiddenAccountMenuItem.svelte        |  7 +--
 .../deep-link/handlers/handleDeepLink.ts      |  4 +-
 .../auxiliary/popup/enums/popup-id.enum.ts    |  2 +-
 .../lib/contexts/governance/actions/index.ts  |  2 +-
 .../initializeParticipationOverviews.ts       | 10 ++--
 ...unts.ts => registerProposalsForWallets.ts} |  6 +-
 .../actions/registerProposalsFromNodes.ts     |  4 +-
 .../actions/completeOnboardingProcess.ts      | 31 +++++------
 ...liseProfileManagerFromOnboardingProfile.ts |  2 -
 .../actions/verifyAndStoreMnemonic.ts         |  1 +
 ...vertOnboardingProfileToPersistedProfile.ts |  4 +-
 .../helpers/getSortedRenamedBoundAccounts.ts  |  2 +-
 .../stores/onboarding-profile.store.ts        |  8 +--
 .../stores/onboarding-secret-manager.store.ts | 55 +++++++++++++------
 .../lib/core/api/interfaces/api.interface.ts  |  3 +-
 .../constants/official-node-urls.constant.ts  |  2 +-
 .../core/network/stores/node-info.store.ts    |  4 +-
 .../utils/getNetworkIdFromNetworkName.ts      |  1 +
 .../shared/lib/core/nfts/actions/index.ts     |  2 +-
 .../nfts/actions/loadNftsForActiveProfile.ts  | 30 +++++-----
 ...fts.ts => setWalletNftsInAllWalletNfts.ts} |  4 +-
 ...ress.ts => findActiveWalletWithAddress.ts} |  2 +-
 .../profile/actions/active-accounts/index.ts  |  4 +-
 ....ts => updateActiveWalletPersistedData.ts} |  3 +-
 .../checkAndUpdateActiveProfileNetwork.ts     |  3 +-
 .../actions/active-profile/loadWallets.ts     |  2 +-
 .../profile/actions/active-profile/login.ts   | 45 ++++++++-------
 .../active-profile/saveActiveProfile.ts       |  2 +-
 .../profile/actions/clearProfileFromMemory.ts |  4 ++
 .../lib/core/profile/actions/createWallet.ts  | 39 ++++++++-----
 .../lib/core/profile/actions/deleteWallet.ts  |  2 +-
 .../lib/core/profile/actions/getWallet.ts     |  2 +-
 .../lib/core/profile/actions/getWallets.ts    |  8 +--
 .../checkAndMigrateChrysalisProfiles.ts       | 12 ++--
 ...fault-persisted-profile-object.constant.ts |  2 +-
 .../interfaces/login-options.interface.ts     |  2 +-
 .../interfaces/persisted-profile.interface.ts |  6 +-
 .../profile/stores/active-profile.store.ts    | 16 +++---
 .../profile/stores/active-wallets.store.ts    |  2 +-
 .../utils/getSecretManagerFromProfileType.ts  |  2 +-
 .../secret-manager/actions/storeMnemonic.ts   |  5 +-
 .../generateAndStoreActivitiesForAccount.ts   | 32 -----------
 .../generateAndStoreActivitiesForWallet.ts    | 31 +++++++++++
 .../core/wallet/actions/activities/index.ts   |  8 +--
 ...Accounts.ts => loadAssetsForAllWallets.ts} |  8 +--
 ...count.ts => preprocessOutputsForWallet.ts} | 18 +++---
 ....ts => preprocessTransactionsForWallet.ts} |  6 +-
 .../setAsyncStatusOfAccountActivities.ts      |  4 +-
 .../core/wallet/actions/buildWalletState.ts   | 16 +++---
 .../buildWalletStateAndPersistedData.ts       | 17 +++---
 .../core/wallet/actions/createNewWallet.ts    | 21 ++++---
 .../handleTransactionInclusionEvent.ts        |  6 +-
 ...enerateAndStoreActivitiesForAllAccounts.ts | 15 -----
 ...generateAndStoreActivitiesForAllWallets.ts | 15 +++++
 .../wallet/actions/getAddressesWithOutputs.ts |  3 +
 .../lib/core/wallet/actions/getClient.ts      |  9 ++-
 .../lib/core/wallet/actions/getNodeInfo.ts    |  3 +-
 .../shared/lib/core/wallet/actions/index.ts   |  4 +-
 .../lib/core/wallet/actions/loadWallet.ts     |  5 +-
 ...=> refreshWalletAssetsForActiveProfile.ts} | 12 ++--
 .../core/wallet/actions/setClientOptions.ts   |  1 +
 .../wallet/actions/setStrongholdPassword.ts   |  1 -
 .../lib/core/wallet/enums/subject.enum.ts     |  2 +-
 .../interfaces/wallet-subject.interface.ts    |  6 +-
 .../selected-wallet-activities.store.ts       |  4 +-
 .../lib/core/wallet/types/subject.type.ts     |  4 +-
 .../helper/getSubjectFromActivity.ts          |  4 +-
 .../getIrc30MetadataFromFoundryOutput.ts      |  4 +-
 .../wallet/utils/getSubjectFromAddress.ts     |  6 +-
 .../core/wallet/utils/isSubjectInternal.ts    |  2 +-
 .../outputs/preprocessOutgoingTransaction.ts  |  4 +-
 packages/shared/locales/en.json               |  5 +-
 88 files changed, 417 insertions(+), 362 deletions(-)
 rename packages/desktop/components/popups/{ManageAccountPopup.svelte => ManageWalletPopup.svelte} (69%)
 rename packages/shared/lib/contexts/governance/actions/{registerProposalsForAccounts.ts => registerProposalsForWallets.ts} (60%)
 rename packages/shared/lib/core/nfts/actions/{setAccountNftsInAllAccountNfts.ts => setWalletNftsInAllWalletNfts.ts} (51%)
 rename packages/shared/lib/core/profile/actions/active-accounts/{findActiveAccountWithAddress.ts => findActiveWalletWithAddress.ts} (85%)
 rename packages/shared/lib/core/profile/actions/active-accounts/{updateActiveAccountPersistedData.ts => updateActiveWalletPersistedData.ts} (83%)
 delete mode 100644 packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForAccount.ts
 create mode 100644 packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForWallet.ts
 rename packages/shared/lib/core/wallet/actions/activities/{loadAssetsForAllAccounts.ts => loadAssetsForAllWallets.ts} (73%)
 rename packages/shared/lib/core/wallet/actions/activities/{preprocessOutputsForAccount.ts => preprocessOutputsForWallet.ts} (69%)
 rename packages/shared/lib/core/wallet/actions/activities/{preprocessTransactionsForAccount.ts => preprocessTransactionsForWallet.ts} (73%)
 delete mode 100644 packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllAccounts.ts
 create mode 100644 packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllWallets.ts
 rename packages/shared/lib/core/wallet/actions/{refreshAccountAssetsForActiveProfile.ts => refreshWalletAssetsForActiveProfile.ts} (82%)

diff --git a/packages/desktop/components/AccountSummary.svelte b/packages/desktop/components/AccountSummary.svelte
index dabca0bd6d5..8ff8e230589 100644
--- a/packages/desktop/components/AccountSummary.svelte
+++ b/packages/desktop/components/AccountSummary.svelte
@@ -4,11 +4,11 @@
     import { TextType } from '@ui/enums'
 
     import { localize } from '@core/i18n'
-    import { nodeInfo } from '@core/network'
+    import { nodeInfoNetworkName } from '@core/network'
     import { selectedWalletAssets } from '@core/wallet'
     import { activeProfile } from '@core/profile'
 
-    $: fomattedNetworkName = $nodeInfo?.protocol.networkName
+    $: fomattedNetworkName = $nodeInfoNetworkName
         .split(' ')
         .map((word) => word[0].toUpperCase() + word.substring(1))
         .join(' ')
diff --git a/packages/desktop/components/AccountSwitcher.svelte b/packages/desktop/components/AccountSwitcher.svelte
index 3a7f999e137..0c28b0a6616 100644
--- a/packages/desktop/components/AccountSwitcher.svelte
+++ b/packages/desktop/components/AccountSwitcher.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { AccountLabel, Icon, Modal } from '@ui'
+    import { WalletLabel, Icon, Modal } from '@ui'
     import { WalletSwitcherModal } from '@components'
     import { selectedWallet } from '@core/wallet/stores'
     import { Icon as IconEnum } from '@auxiliary/icon'
@@ -19,7 +19,7 @@
 <svelte:window on:click={onOutsideClick} />
 <account-switcher>
     <button type="button" on:click={onButtonClick} class="flex flex-row justify-center items-center space-x-2">
-        <AccountLabel account={$selectedWallet} />
+        <WalletLabel wallet={$selectedWallet} />
         <icon-container class:rotate={isModalOpened}>
             <Icon height="18" width="18" icon={IconEnum.ChevronDown} classes="text-gray-800 dark:text-white" />
         </icon-container>
diff --git a/packages/desktop/components/modals/WalletActionsMenu.svelte b/packages/desktop/components/modals/WalletActionsMenu.svelte
index 23e8e6a7f8c..380eee868ea 100644
--- a/packages/desktop/components/modals/WalletActionsMenu.svelte
+++ b/packages/desktop/components/modals/WalletActionsMenu.svelte
@@ -20,7 +20,7 @@
      // $selectedWallet?.id === $activeWallets?.length - 1 && $visibleActiveWallets?.length > 1
 
     function onCustomiseAccountClick(): void {
-        openPopup({ id: PopupId.ManageAccount })
+        openPopup({ id: PopupId.ManageWallet })
         modal?.close()
     }
 
diff --git a/packages/desktop/components/popups/AddNodePopup.svelte b/packages/desktop/components/popups/AddNodePopup.svelte
index 14fcf526cfd..3f469271971 100644
--- a/packages/desktop/components/popups/AddNodePopup.svelte
+++ b/packages/desktop/components/popups/AddNodePopup.svelte
@@ -5,7 +5,7 @@
     import { showAppNotification } from '@auxiliary/notification'
     import { closePopup } from '@auxiliary/popup'
     import { Platform } from '@core/app'
-    import { activeAccounts, activeProfile } from '@core/profile'
+    import { activeWallets, activeProfile } from '@core/profile'
     import { registerProposalsForAccounts } from '@contexts/governance'
 
     export let node: INode = structuredClone(EMPTY_NODE)
@@ -33,7 +33,7 @@
             }
 
             if (Platform.isFeatureFlagEnabled('governance')) {
-                await registerProposalsForAccounts({ node }, $activeAccounts)
+                await registerProposalsForAccounts({ node }, $activeWallets)
             }
 
             onSuccess()
diff --git a/packages/desktop/components/popups/AddProposalPopup.svelte b/packages/desktop/components/popups/AddProposalPopup.svelte
index ed60dc26566..fd529fb14f8 100644
--- a/packages/desktop/components/popups/AddProposalPopup.svelte
+++ b/packages/desktop/components/popups/AddProposalPopup.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import { showAppNotification } from '@auxiliary/notification/actions'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { registerProposalsForAccounts, registeredProposalsForSelectedWallet } from '@contexts/governance'
+    import { registerProposalsForWallets, registeredProposalsForSelectedWallet } from '@contexts/governance'
     import { selectedWallet } from '@core/wallet'
     import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
-    import { activeAccounts, updateActiveAccountPersistedData } from '@core/profile'
+    import { activeWallets, updateActiveWalletPersistedData } from '@core/profile'
     import { truncateString } from '@core/utils/string'
     import type { Auth } from '@iota/sdk/out/types'
     import { Button, Checkbox, NodeInput, Text, TextInput, TextType } from 'shared/components'
@@ -21,7 +21,7 @@
     let nodeInputError: string
     let isBusy = false
     let isRegisteringAllProposals = false
-    let isAddingForAllAccounts = false
+    let isAddingForAllWallets = false
 
     $: isEditMode = !!initialEventId && !!initialNodeUrl
     $: disabled = isBusy || !nodeUrl || (!isRegisteringAllProposals && !eventId)
@@ -35,11 +35,11 @@
         try {
             isBusy = true
             await Promise.all([
-                !isRegisteringAllProposals && validateEventId(!isAddingForAllAccounts && !isEditMode),
+                !isRegisteringAllProposals && validateEventId(!isAddingForAllWallets && !isEditMode),
                 nodeInput?.validate(),
             ])
             await registerParticipationWrapper()
-            updateActiveAccountPersistedData($selectedWallet.id, {
+            updateActiveWalletPersistedData($selectedWallet.id, {
                 removedProposalIds: $selectedWallet.removedProposalIds?.filter((id) => id !== inputtedEventId),
             })
             isBusy = false
@@ -82,8 +82,8 @@
             node: { url: nodeUrl, auth },
             eventsToRegister: isRegisteringAllProposals ? [] : [eventId],
         }
-        const accounts = isAddingForAllAccounts ? $activeAccounts : [$selectedWallet]
-        await registerProposalsForAccounts(options, accounts)
+        const wallets = isAddingForAllWallets ? $activeWallets : [$selectedWallet]
+        await registerProposalsForWallets(options, wallets)
         showAppNotification({
             type: 'success',
             message: generateSuccessMessage(),
@@ -96,7 +96,7 @@
         if (isEditMode) {
             return localize('views.governance.proposals.successEdit')
         } else {
-            return localize(`views.governance.proposals.${isAddingForAllAccounts ? 'successAddAll' : 'successAdd'}`, {
+            return localize(`views.governance.proposals.${isAddingForAllWallets ? 'successAddAll' : 'successAdd'}`, {
                 values: { numberOfProposals: isRegisteringAllProposals ? 'other' : 'one' },
             })
         }
@@ -139,7 +139,7 @@
             label={localize('views.governance.details.proposalInformation.eventId')}
         />
         {#if !isEditMode}
-            <Checkbox label={localize('popups.addProposal.addToAllAccounts')} bind:checked={isAddingForAllAccounts} />
+            <Checkbox label={localize('popups.addProposal.addToAllAccounts')} bind:checked={isAddingForAllWallets} />
         {/if}
     </div>
     <div class="flex w-full space-x-4 mt-6">
diff --git a/packages/desktop/components/popups/CreateWalletPopup.svelte b/packages/desktop/components/popups/CreateWalletPopup.svelte
index a749b215867..1024cca4c8d 100644
--- a/packages/desktop/components/popups/CreateWalletPopup.svelte
+++ b/packages/desktop/components/popups/CreateWalletPopup.svelte
@@ -73,7 +73,7 @@
             <Input
                 {error}
                 bind:value={accountAlias}
-                placeholder={localize('general.accountName')}
+                placeholder={localize('general.walletName')}
                 autofocus
                 submitHandler={onCreateClick}
                 disabled={isBusy}
diff --git a/packages/desktop/components/popups/ManageAccountPopup.svelte b/packages/desktop/components/popups/ManageWalletPopup.svelte
similarity index 69%
rename from packages/desktop/components/popups/ManageAccountPopup.svelte
rename to packages/desktop/components/popups/ManageWalletPopup.svelte
index 3f450d9fc1e..1a5587b5c8a 100644
--- a/packages/desktop/components/popups/ManageAccountPopup.svelte
+++ b/packages/desktop/components/popups/ManageWalletPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
-    import { updateActiveAccountPersistedData } from '@core/profile/actions'
+    import { updateActiveWalletPersistedData } from '@core/profile/actions'
     import { getTrimmedLength } from '@core/utils'
     import { selectedWallet, validateWalletName } from '@core/wallet'
     import { Button, ColorPicker, Input, Text, TextType } from '@ui'
@@ -9,26 +9,26 @@
     export let error = ''
 
     let isBusy = false
-    let accountAlias = $selectedWallet.name
+    let walletAlias = $selectedWallet.name
     let color = $selectedWallet.color
 
-    $: accountAlias, (error = '')
-    $: trimmedAccountAlias = accountAlias.trim()
-    $: invalidAliasUpdate = !getTrimmedLength(accountAlias) || isBusy || accountAlias === $selectedWallet.name
+    $: walletAlias, (error = '')
+    $: trimmedWalletAlias = walletAlias.trim()
+    $: invalidAliasUpdate = !getTrimmedLength(walletAlias) || isBusy || walletAlias === $selectedWallet.name
     $: hasColorChanged = $selectedWallet.color !== color
 
     async function onSaveClick(): Promise<void> {
-        if (trimmedAccountAlias) {
+        if (trimmedWalletAlias) {
             error = ''
             try {
-                await validateWalletName(trimmedAccountAlias, true, trimmedAccountAlias !== $selectedWallet.name)
+                await validateWalletName(trimmedWalletAlias, true, trimmedWalletAlias !== $selectedWallet.name)
             } catch ({ message }) {
                 error = message
                 return
             }
 
             isBusy = true
-            saveAccountPersistedData()
+            saveWalletPersistedData()
         }
     }
 
@@ -36,10 +36,10 @@
         closePopup()
     }
 
-    function saveAccountPersistedData(): void {
+    function saveWalletPersistedData(): void {
         try {
-            if (trimmedAccountAlias || color) {
-                updateActiveAccountPersistedData($selectedWallet?.id, { name: trimmedAccountAlias, color })
+            if (trimmedWalletAlias || color) {
+                updateActiveWalletPersistedData($selectedWallet?.id, { name: trimmedWalletAlias, color })
                 closePopup()
             }
         } finally {
@@ -51,13 +51,13 @@
 <manage-account-popup class="flex flex-col h-full justify-between space-y-4">
     <div>
         <title-container class="flex flex-row mb-6">
-            <Text type={TextType.h5}>{localize('general.manageAccount')}</Text>
+            <Text type={TextType.h5}>{localize('general.manageWallet')}</Text>
         </title-container>
         <manage-account-popup-inputs class="w-full flex flex-col justify-between space-y-4">
             <Input
                 {error}
-                bind:value={accountAlias}
-                placeholder={localize('general.accountName')}
+                bind:value={walletAlias}
+                placeholder={localize('general.walletName')}
                 autofocus
                 submitHandler={onSaveClick}
                 disabled={isBusy}
diff --git a/packages/desktop/components/popups/Popup.svelte b/packages/desktop/components/popups/Popup.svelte
index a33aa0c5b85..6923aed36a6 100644
--- a/packages/desktop/components/popups/Popup.svelte
+++ b/packages/desktop/components/popups/Popup.svelte
@@ -30,7 +30,7 @@
     import LedgerAppGuidePopup from './LedgerAppGuidePopup.svelte'
     import LedgerConnectionGuidePopup from './LedgerConnectionGuidePopup.svelte'
     import LegalUpdatePopup from './LegalUpdatePopup.svelte'
-    import ManageAccountPopup from './ManageAccountPopup.svelte'
+    import ManageWalletPopup from './ManageWalletPopup.svelte'
     import ManageVotingPowerPopup from './ManageVotingPowerPopup.svelte'
     import MintNativeTokenConfirmationPopup from './MintNativeTokenConfirmationPopup.svelte'
     import MintNativeTokenFormPopup from './MintNativeTokenFormPopup.svelte'
@@ -79,7 +79,7 @@
     $: switch (id) {
         case PopupId.ConnectLedger:
         case PopupId.createWallet:
-        case PopupId.ManageAccount:
+        case PopupId.ManageWallet:
             size = PopupSize.Small
             break
         case PopupId.LedgerAppGuide:
@@ -116,7 +116,7 @@
         [PopupId.LedgerAppGuide]: LedgerAppGuidePopup,
         [PopupId.LedgerConnection]: LedgerConnectionGuidePopup,
         [PopupId.LegalUpdate]: LegalUpdatePopup,
-        [PopupId.ManageAccount]: ManageAccountPopup,
+        [PopupId.ManageWallet]: ManageWalletPopup,
         [PopupId.ManageVotingPower]: ManageVotingPowerPopup,
         [PopupId.MetricSystemInfo]: MetricSystemInfoPopup,
         [PopupId.MintNativeTokenConfirmation]: MintNativeTokenConfirmationPopup,
diff --git a/packages/desktop/components/popups/RemoveProposalPopup.svelte b/packages/desktop/components/popups/RemoveProposalPopup.svelte
index 484b18094d4..9d08566b7e6 100644
--- a/packages/desktop/components/popups/RemoveProposalPopup.svelte
+++ b/packages/desktop/components/popups/RemoveProposalPopup.svelte
@@ -11,7 +11,7 @@
     import { selectedWallet } from '@core/wallet/stores'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
-    import { updateActiveAccountPersistedData } from '@core/profile/actions'
+    import { updateActiveWalletPersistedData } from '@core/profile/actions'
     import { governanceRouter } from '@core/router'
     import { Button, Text, TextHint, TextType } from 'shared/components'
     import { ButtonVariant, TextHintVariant } from 'shared/components/enums'
@@ -23,7 +23,7 @@
     async function onConfirmClick(): Promise<void> {
         try {
             await $selectedWallet.deregisterParticipationEvent($selectedProposalId)
-            updateActiveAccountPersistedData($selectedWallet.id, {
+            updateActiveWalletPersistedData($selectedWallet.id, {
                 removedProposalIds: [...($selectedWallet.removedProposalIds ?? []), $selectedProposalId],
             })
             $governanceRouter.previous()
diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index ccc44c5c9b2..9ff2765f25c 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -109,23 +109,36 @@ try {
     contextBridge.exposeInMainWorld('__WALLET__API__', {
         ...methods,
         async createSecretManager(options) {
-            const manager = new IotaSdk.SecretManager(options)
+            const manager = IotaSdk.SecretManager.create(options)
             bindMethodsAcrossContextBridge(IotaSdk.SecretManager.prototype, manager)
             return manager
         },
-        // TODO(2.0): rename to createWallet
-        async createWallet(id, options) {
-            const wallet = new IotaSdk.Wallet(options)
-            wallet.id = id
-            wallets[id] = wallet
-            bindMethodsAcrossContextBridge(IotaSdk.Wallet.prototype, wallet)
+        async getClientFromWallet(id){
+            const wallet = wallets[id];
+            // Why is this here?:
+            // We cannot create classes from exposed functions 
+            // https://www.electronjs.org/docs/latest/api/context-bridge
+            const client =  await wallet.getClient();
+            bindMethodsAcrossContextBridge(IotaSdk.Client.prototype, client)
+            return client
+        },
+        // TODO(2.0): Is there a difference between this and getWallet? They both really make the same thing
+        async createWallet(id, walletOptions) {
+            let wallet = wallets[id]
+            if (!wallet) {
+                wallet = await IotaSdk.Wallet.create(walletOptions)
+                wallet.id = id
+                wallets[id] = wallet
+                bindMethodsAcrossContextBridge(IotaSdk.Wallet.prototype, wallet)
+            }
             return wallet
         },
-        // TODO(2.0): also remove from file system
-        deleteWallet(id) {
+        // TODO(2.0): also remove from file system? Does it make sense? file system != memoery
+        async deleteWallet(id) {
             if (id && id in wallets) {
                 const wallet = wallets[id]
-                wallet.destroy()
+                await wallet.stopBackgroundSync()
+                await wallet.destroy()
                 delete wallets[id]
             }
         },
@@ -133,9 +146,10 @@ try {
         async getWallet(id, walletOptions) {
             let wallet = wallets[id]
             if (!wallet) {
-                wallet = new IotaSdk.Wallet(walletOptions)
+                wallet = await IotaSdk.Wallet.create(walletOptions)
+                wallet.id = id
                 wallets[id] = wallet
-                bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, wallet)
+                bindMethodsAcrossContextBridge(IotaSdk.Wallet.prototype, wallet)
             }
             return wallet
         },
@@ -143,15 +157,15 @@ try {
         async recoverAccounts(managerId, payload) {
             const manager = wallets[managerId]
             const accounts = await manager.recoverAccounts(...Object.values(payload))
-            accounts.forEach((account) => bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, account))
+            accounts.forEach((account) => bindMethodsAcrossContextBridge(IotaSdk.Wallet.prototype, account))
             return accounts
         },
-        clearWalletsFromMemory() {
-            Object.keys(wallets).forEach((id) => {
-                const wallet = wallets[id]
-                wallet.destroy()
+        async clearWalletsFromMemory() {
+            for(const [id, wallet] of Object.entries(wallets)){
+                await wallet.stopBackgroundSync()
+                await wallet.destroy()
                 delete wallets[id]
-            })
+            }
         },
         async migrateStrongholdSnapshotV2ToV3(currentPath, newPath, currentPassword, newPassword) {
             const snapshotSaltV2 = 'wallet.rs'
diff --git a/packages/desktop/views/login/views/SelectProfileView.svelte b/packages/desktop/views/login/views/SelectProfileView.svelte
index 2e6ab5daef4..e37e90d2e12 100644
--- a/packages/desktop/views/login/views/SelectProfileView.svelte
+++ b/packages/desktop/views/login/views/SelectProfileView.svelte
@@ -31,7 +31,6 @@
     async function onAddProfileClick(): Promise<void> {
         onboardingRouter.set(new OnboardingRouter())
         await initialiseOnboardingProfile(shouldBeDeveloperProfile())
-        console.log("shuld be created")
         $routerManager.goToAppContext(AppContext.Onboarding)
     }
 
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
index 308b1c81e93..4d1c983e7f3 100644
--- a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
+++ b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
@@ -28,7 +28,6 @@
     }
 
     async function _continue(): Promise<void> {
-        console.log($onboardingProfile)
         // Note: needed to cover the cases where the user has waited so long that the stronghold is locked
         if ($onboardingProfile?.restoreProfileType === RestoreProfileType.Stronghold) {
             await setStrongholdPassword($onboardingProfile.strongholdPassword)
diff --git a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
index 72f1360041c..9b1f21e5fa9 100644
--- a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
+++ b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
@@ -28,7 +28,6 @@
         const type = createProfileType === CreateProfileType.Ledger ? ProfileType.Ledger : ProfileType.Software
         const storagePath = await getStorageDirectoryOfProfile($onboardingProfile.id)
         const secretManagerOptions = getSecretManagerFromProfileType(type, storagePath)
-        console.log("secretManagerOptions", secretManagerOptions)
         updateOnboardingProfile({ createProfileType, type, secretManagerOptions })
         $createProfileRouter.next()
     }
diff --git a/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte b/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte
index 53178a8c5f4..4d0c78c4845 100644
--- a/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte
+++ b/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte
@@ -2,7 +2,7 @@
     import { AnimationEnum } from '@auxiliary/animation'
     import { showAppNotification } from '@auxiliary/notification'
     import { OnboardingLayout } from '@components'
-    import { updateOnboardingProfile, verifyAndStoreMnemonic } from '@contexts/onboarding'
+    import { buildOnboardingSecretManager, updateOnboardingProfile, verifyAndStoreMnemonic } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
     import { MAX_STRONGHOLD_PASSWORD_LENGTH } from '@core/profile'
     import { Subrouter } from '@core/router'
@@ -45,8 +45,9 @@
             try {
                 busy = true
                 await setStrongholdPassword(strongholdPassword)
-                await verifyAndStoreMnemonic()
                 updateOnboardingProfile({ strongholdPassword, hasStoredMnemonic: true })
+                await buildOnboardingSecretManager();
+                await verifyAndStoreMnemonic()
                 router.next()
             } catch (err) {
                 console.error(err)
diff --git a/packages/shared/components/ColorPicker.svelte b/packages/shared/components/ColorPicker.svelte
index b90a489ff6b..4a21018f0fc 100644
--- a/packages/shared/components/ColorPicker.svelte
+++ b/packages/shared/components/ColorPicker.svelte
@@ -9,28 +9,28 @@
     export let active: string = ''
     export let isCustomColorEnabled: boolean = false
 
-    const accountColors = Object.values(WalletColors).filter((c) => /[#]/.test(c as string))
-    const activeAccountColorIndex = accountColors.findIndex((_, i) => accountColors[i] === active)
+    const walletColors = Object.values(WalletColors).filter((c) => /[#]/.test(c as string))
+    const activeWalletColorIndex = walletColors.findIndex((_, i) => walletColors[i] === active)
 
-    let indexOfActiveElement = activeAccountColorIndex >= 0 ? activeAccountColorIndex : accountColors.length
+    let indexOfActiveElement = activeWalletColorIndex >= 0 ? activeWalletColorIndex : walletColors.length
     let cachedColor = '#000000'
-    let inputValue: string = activeAccountColorIndex >= 0 ? cachedColor : active
+    let inputValue: string = activeWalletColorIndex >= 0 ? cachedColor : active
     let iconColor = ''
     let isTooltipVisible = false
     let tooltipAnchor: HTMLElement
 
     $: inputValue = `#${/[0-9|a-f|A-F]+/.exec(inputValue) || ''}`
-    $: isSelectedCustomElement = indexOfActiveElement === accountColors.length
+    $: isSelectedCustomElement = indexOfActiveElement === walletColors.length
 
     $: {
-        if (indexOfActiveElement === accountColors.length) {
+        if (indexOfActiveElement === walletColors.length) {
             active === cachedColor
         }
 
-        if (indexOfActiveElement === accountColors.length) {
+        if (indexOfActiveElement === walletColors.length) {
             active = inputValue.length === 7 || inputValue.length === 4 ? inputValue : cachedColor
         } else {
-            active = accountColors?.[indexOfActiveElement]?.toString()
+            active = walletColors?.[indexOfActiveElement]?.toString()
         }
 
         if (inputValue.length) {
@@ -52,7 +52,7 @@
 
     function onColorClick(index: number): void {
         indexOfActiveElement = index
-        if (index !== accountColors.length) {
+        if (index !== walletColors.length) {
             isTooltipVisible = false
         }
     }
@@ -68,7 +68,7 @@
     function activeCustomColor(event: KeyboardEvent | MouseEvent): void {
         const isEnterKeyPressed = event.type === 'keypress' && (event as KeyboardEvent).key === 'Enter'
         if (event.type === 'click' || isEnterKeyPressed) {
-            indexOfActiveElement = accountColors.length
+            indexOfActiveElement = walletColors.length
         }
     }
 
diff --git a/packages/shared/components/SubjectBox.svelte b/packages/shared/components/SubjectBox.svelte
index c3b11b7a635..20848c9e48d 100644
--- a/packages/shared/components/SubjectBox.svelte
+++ b/packages/shared/components/SubjectBox.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
     import { Subject, SubjectType } from '@core/wallet'
-    import { Box, AddressBox, Text, AccountLabel, TextType, FontWeight } from 'shared/components'
+    import { Box, AddressBox, Text, WalletLabel, TextType, FontWeight } from 'shared/components'
 
     export let subject: Subject | null = null
 </script>
 
-{#if subject?.type === SubjectType.Account}
+{#if subject?.type === SubjectType.Wallet}
     <Box row clearBackground clearPadding classes="justify-center">
-        <AccountLabel account={subject?.account} />
+        <WalletLabel wallet={subject?.wallet} />
     </Box>
 {:else if subject?.type === SubjectType.Address}
     <AddressBox clearBackground clearPadding isCopyable address={subject?.address} />
diff --git a/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte b/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte
index 029dfc8f95d..d80cffac866 100644
--- a/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte
+++ b/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
     import { selectedWallet, setNextSelectedWallet } from '@core/wallet'
     import { localize } from '@core/i18n'
-    import { activeProfile, nonHiddenActiveWallets } from '@core/profile'
-    import { updateActiveAccountPersistedData } from '@core/profile/actions'
+    import { activeProfile, nonHiddenActiveWallets, updateActiveWalletPersistedData } from '@core/profile'
     import { Icon } from '@lib/auxiliary/icon'
     import { MenuItem } from '@ui'
 
@@ -10,7 +9,7 @@
 
     function onShowAccountClick(): void {
         if ($selectedWallet) {
-            updateActiveAccountPersistedData($selectedWallet.id, { hidden: false })
+            updateActiveWalletPersistedData($selectedWallet.id, { hidden: false })
             onClick && onClick()
         }
     }
@@ -18,7 +17,7 @@
     function onHideAccountClick(): void {
         if ($nonHiddenActiveWallets.length > 1) {
             if ($selectedWallet) {
-                updateActiveAccountPersistedData($selectedWallet.id, { hidden: true })
+                updateActiveWalletPersistedData($selectedWallet.id, { hidden: true })
                 if (!$activeProfile.showHiddenAccounts) {
                     setNextSelectedWallet()
                 }
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts b/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
index e3e0e5b9160..c0a2b9ecc49 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/handleDeepLink.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 
 import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-import { visibleActiveAccounts } from '@core/profile/stores'
+import { visibleActiveWallets } from '@core/profile/stores'
 import { dashboardRouter } from '@core/router/routers'
 import { DashboardRoute } from '@core/router/enums'
 
@@ -33,7 +33,7 @@ export function handleDeepLink(input: string): void {
             throw new Error(`Does not start with ${process.env.APP_PROTOCOL}://`)
         }
 
-        if (get(visibleActiveAccounts).length > 1) {
+        if (get(visibleActiveWallets).length > 1) {
             openPopup({
                 id: PopupId.AccountSwitcher,
                 overflow: true,
diff --git a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
index 22007bd3cc4..49889abdbba 100644
--- a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
+++ b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
@@ -22,7 +22,7 @@ export enum PopupId {
     LedgerAppGuide = 'ledgerAppGuide',
     LedgerConnection = 'ledgerConnection',
     LegalUpdate = 'legalUpdate',
-    ManageAccount = 'manageAccount',
+    ManageWallet = 'manageWallet',
     ManageVotingPower = 'manageVotingPower',
     MetricSystemInfo = 'metricSystemInfo',
     MintNativeTokenConfirmation = 'mintNativeTokenConfirmation',
diff --git a/packages/shared/lib/contexts/governance/actions/index.ts b/packages/shared/lib/contexts/governance/actions/index.ts
index 1d269afa272..081653a99d3 100644
--- a/packages/shared/lib/contexts/governance/actions/index.ts
+++ b/packages/shared/lib/contexts/governance/actions/index.ts
@@ -5,7 +5,7 @@ export * from './initializeParticipationOverviews'
 export * from './initializeRegisteredProposals'
 export * from './pollParticipationEventStatus'
 export * from './registerParticipationEvents'
-export * from './registerProposalsForAccounts'
+export * from './registerProposalsForWallets'
 export * from './registerProposalsFromNodes'
 export * from './setVotingPower'
 export * from './stopVotingForProposal'
diff --git a/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts b/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
index 17bb8016ba7..31ce8cd4e11 100644
--- a/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
+++ b/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
@@ -1,15 +1,15 @@
-import { activeAccounts } from '@core/profile'
+import { activeWallets } from '@core/profile'
 import { ParticipationOverview } from '@iota/sdk/out/types'
 import { get } from 'svelte/store'
 import { DEFAULT_PARTICIPATION_OVERVIEW } from '../constants'
 import { allParticipationOverviews } from '../stores'
 
 export async function initializeParticipationOverviews(): Promise<void> {
-    const allOverviews: { [accountId: number]: ParticipationOverview } = {}
+    const allOverviews: { [walletId: string]: ParticipationOverview } = {}
 
-    for (const account of get(activeAccounts)) {
-        const overview = await account.getParticipationOverview()
-        allOverviews[account.index] = overview ?? DEFAULT_PARTICIPATION_OVERVIEW
+    for (const wallet of get(activeWallets)) {
+        const overview = await wallet.getParticipationOverview()
+        allOverviews[wallet.id] = overview ?? DEFAULT_PARTICIPATION_OVERVIEW
     }
     allParticipationOverviews.set(allOverviews)
 }
diff --git a/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts b/packages/shared/lib/contexts/governance/actions/registerProposalsForWallets.ts
similarity index 60%
rename from packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts
rename to packages/shared/lib/contexts/governance/actions/registerProposalsForWallets.ts
index a20ea460e07..3c185b470bd 100644
--- a/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerProposalsForWallets.ts
@@ -4,9 +4,9 @@ import { IWalletState } from '@core/wallet/interfaces'
 
 import { registerParticipationEvents } from './registerParticipationEvents'
 
-export async function registerProposalsForAccounts(
+export async function registerProposalsForWallets(
     registrationOptions: ParticipationEventRegistrationOptions,
-    accounts: IWalletState[]
+    wallets: IWalletState[]
 ): Promise<void> {
-    await Promise.all(accounts.map((account) => registerParticipationEvents(registrationOptions, account)))
+    await Promise.all(wallets.map((wallet) => registerParticipationEvents(registrationOptions, wallet)))
 }
diff --git a/packages/shared/lib/contexts/governance/actions/registerProposalsFromNodes.ts b/packages/shared/lib/contexts/governance/actions/registerProposalsFromNodes.ts
index 64bf6e5d31d..ef0d50b85ec 100644
--- a/packages/shared/lib/contexts/governance/actions/registerProposalsFromNodes.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerProposalsFromNodes.ts
@@ -4,10 +4,10 @@ import { IWalletState } from '@core/wallet/interfaces'
 import { INode } from '@core/network/interfaces'
 import { activeProfile } from '@core/profile/stores'
 
-import { registerProposalsForAccounts } from './registerProposalsForAccounts'
+import { registerProposalsForWallets } from './registerProposalsForWallets'
 
 // TODO(2.0) FIx this
 export async function registerProposalsFromNodes(accounts: IWalletState[], nodes?: INode[]): Promise<void> {
     const _nodes = nodes ? nodes : get(activeProfile)?.clientOptions?.nodes
-    await Promise.all(_nodes.map((node) => registerProposalsForAccounts({ node }, accounts)))
+    await Promise.all(_nodes.map((node) => registerProposalsForWallets({ node }, accounts)))
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts b/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
index 4a4dcf979a2..03eed757a3d 100644
--- a/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
@@ -1,50 +1,49 @@
-import { IWallet, activeProfile, activeWallets, addWalletPersistedDataToActiveProfile, createWallet, login } from '@core/profile'
+import { activeProfile, activeWallets, addWalletPersistedDataToActiveProfile, addWalletToActiveWallets, createWallet, login } from '@core/profile'
 import { get } from 'svelte/store'
 import { OnboardingType } from '../enums'
 import { addWalletPersistedDataToOnboardingProfile, onboardingProfile } from '../stores'
 import { createNewProfileFromOnboardingProfile } from './createNewProfileFromOnboardingProfile'
 import { showBalanceOverviewPopup } from '@contexts/dashboard/stores'
-import { buildWalletStateAndPersistedData, createNewWallet, IWalletState } from '@core/wallet'
+import { addEmptyWalletActivitiesToAllWalletActivities, buildWalletStateAndPersistedData, createNewWallet, IWalletState } from '@core/wallet'
 import { localize } from '@core/i18n'
 
 export async function completeOnboardingProcess(): Promise<void> {
     // if we already have an active profile
     // it means we are trying to load again after an error
     // and we don't need to add it again
-    console.log("get(activeProfile), get(onboardingProfile)", get(activeProfile), get(onboardingProfile))
     if (!get(activeProfile)?.id) {
         createNewProfileFromOnboardingProfile()
     }
 
     const onboardingType = get(onboardingProfile)?.onboardingType
-    const shouldRecoverAccounts = onboardingType === OnboardingType.Restore || onboardingType === OnboardingType.Claim
-    showBalanceOverviewPopup.set(shouldRecoverAccounts)
+    const shouldRecoverWallets = onboardingType === OnboardingType.Restore || onboardingType === OnboardingType.Claim
+    showBalanceOverviewPopup.set(shouldRecoverWallets)
 
     await createOnboardingWallet()
-    void login({ isFromOnboardingFlow: true, shouldRecoverAccounts })
+    void login({ isFromOnboardingFlow: true, shouldRecoverWallets })
 
     onboardingProfile.set(undefined)
 }
 
-export async function createOnboardingWallet(name?: string, color?: string): Promise<IWallet> {
+export async function createOnboardingWallet(name?: string, color?: string): Promise<IWalletState> {
     // 1. Get the wallet name
-    const walletName = name || `${localize('general.account')} ${(get(activeWallets)?.length ?? 0) + 1}`;
+    const walletName = name || `${localize('general.wallet')} ${(get(activeWallets)?.length ?? 0) + 1}`;
 
     // 2. Create the wallet instance
-    const wallet = await createWallet()
+    const wallet = await createWallet() // TODO(2.0) Not sure about this, I think this should be createWallet instead
 
     // 3. Sync the wallet with the Node
     // TODO(2.0): test & fix sync when we have iota2.0 nodes
-    //await wallet.sync(DEFAULT_SYNC_OPTIONS)
+    await wallet.sync(DEFAULT_SYNC_OPTIONS)
     // 4. Create a wrapper over the wallet instance and the persisted data
-    // const [walletState, accountPersistedData] = await buildWalletStateAndPersistedData(wallet, walletName, color)
+    const [walletState, walletPersistedData] = await buildWalletStateAndPersistedData(wallet, walletName, color)
 
     // TODO(2.0) Fix
-    // addAccountToActiveAccounts(walletState)
-    // addWalletPersistedDataToOnboardingProfile(walletState.id, accountPersistedData)
+    addWalletToActiveWallets(walletState)
+    addWalletPersistedDataToOnboardingProfile(walletState.id, walletPersistedData)
+    addWalletPersistedDataToActiveProfile(walletState.id, walletPersistedData) // TODO(2.0) Not sure about this,
     // TODO(2.0) Fix
-    // addEmptyAccountActivitiesToAllAccountActivities(walletState.id)
+    addEmptyWalletActivitiesToAllWalletActivities(walletState.id)
 
-
-    return wallet
+    return walletState
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts
index 8d515cb0f80..351aaa8a4f5 100644
--- a/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts
@@ -26,7 +26,5 @@ export async function initialiseOnboardingProfileWithSecretManager(checkForExist
 
     const secretManagerOptions = getSecretManagerFromProfileType(activeOnboardingProfile.type, storagePath)
 
-    console.log("secretManagerOptions", secretManagerOptions)
-
     updateOnboardingProfile({ secretManagerOptions, hasInitialisedProfileManager: true })
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts b/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts
index e0191632e1c..85b471cca61 100644
--- a/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts
@@ -6,6 +6,7 @@ import { onboardingProfile } from '../stores'
  * Verifies, stores, then clears the mnemonic used in the onboarding flow.
  */
 export async function verifyAndStoreMnemonic(): Promise<void> {
+    // TODO(2.0) This shouldn't use the onboarding profile always
     const mnemonic = get(onboardingProfile)?.mnemonic?.join(' ') ?? ''
 
     await verifyMnemonic(mnemonic)
diff --git a/packages/shared/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts b/packages/shared/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
index da8ded0b733..7c92b593ee2 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
@@ -17,8 +17,8 @@ export function convertOnboardingProfileToPersistedProfile(
         }),
         ...(onboardingProfile?.settings && { settings: onboardingProfile.settings }),
         ...(onboardingProfile?.strongholdVersion && { strongholdVersion: onboardingProfile.strongholdVersion }),
-        ...(onboardingProfile?.accountPersistedData && {
-            accountPersistedData: onboardingProfile.accountPersistedData,
+        ...(onboardingProfile?.walletPersistedData && {
+            walletPersistedData: onboardingProfile.walletPersistedData,
         }),
         ...(onboardingProfile?.isDeveloperProfile && { isDeveloperProfile: onboardingProfile.isDeveloperProfile }),
         ...(onboardingProfile?.hasVisitedDashboard && { hasVisitedDashboard: onboardingProfile.hasVisitedDashboard }),
diff --git a/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts b/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
index 0cb2153a104..ee28bc220b8 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
@@ -14,7 +14,7 @@ export async function getSortedRenamedBoundAccounts(
             accounts.map(async (account) => {
                 const { index, alias } = account?.getMetadata() ?? {}
                 const boundAccount = await getBoundAccount(index, true, profileManager)
-                const boundAccountAlias = Number.isNaN(alias) ? alias : `${localize('general.account')} ${index + 1}`
+                const boundAccountAlias = Number.isNaN(alias) ? alias : `${localize('general.wallet')} ${index + 1}`
                 await boundAccount.setAlias(boundAccountAlias)
                 return boundAccount
             })
diff --git a/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts b/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts
index 7c04d09bcfc..940671c3962 100644
--- a/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts
+++ b/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts
@@ -9,7 +9,6 @@ import { IPersistedNetwork } from '@core/network'
 export const onboardingProfile = writable<IOnboardingProfile | null | undefined>(null)
 
 export const isOnboardingLedgerProfile: Readable<boolean> = derived(onboardingProfile, ($onboardingProfile) =>{
-    console.log("Changed?")
     return  isLedgerProfile($onboardingProfile?.type)
 })
 
@@ -20,7 +19,6 @@ export const onboardingProfileNetwork: Readable<IPersistedNetwork | undefined> =
 
 export function updateOnboardingProfile(payload: Partial<IOnboardingProfile>): void {
     onboardingProfile.update((state) => ({ ...state, ...payload }))
-    console.log("UPDATED", get(onboardingProfile))
 }
 
 export function updateShimmerClaimingAccount(shimmerClaimingAccount: IShimmerClaimingWallet): void {
@@ -48,10 +46,10 @@ export function addWalletPersistedDataToOnboardingProfile(
     walletPersistedData: IPersistedWalletData
 ): void {
     onboardingProfile?.update((state) => {
-        if (!state?.accountPersistedData) {
-            state.accountPersistedData = {}
+        if (!state?.walletPersistedData) {
+            state.walletPersistedData = {}
         }
-        state.accountPersistedData[walletId] = walletPersistedData
+        state.walletPersistedData[walletId] = walletPersistedData
         return state
     })
 }
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 da32400043e..edd8143ecb0 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,29 +1,50 @@
 import { onboardingProfile } from '@contexts/onboarding/stores';
 import { api } from '@core/api';
-import { SecretManager } from '@iota/sdk';
-import { Readable, derived, get } from 'svelte/store';
+import { SecretManager, SecretManagerType } from '@iota/sdk';
+import { USE_LEDGER_SIMULATOR } from 'shared/lib/core/ledger';
+import { getStorageDirectoryOfProfile, ProfileType } from 'shared/lib/core/profile';
+import { get, writable, Writable } from 'svelte/store';
 
-onboardingProfile.subscribe(console.log)
+export const onboardingProfileSecretManager: Writable<SecretManager | null> = writable(null);
 
+export async function buildOnboardingSecretManager(){
+    const profile = get(onboardingProfile);
+    if(profile){
+        const { id, type, strongholdPassword } = profile;
 
-const onboardingProfileSecretManagerOptions = derived(onboardingProfile, ($onboardingProfile) => {
-    console.log("derived", $onboardingProfile?.secretManagerOptions)
-    return $onboardingProfile?.secretManagerOptions
-});
+        const storagePath = await getStorageDirectoryOfProfile(id)
+        const secretManagerOptions = getSecretManagerFromProfileType(type, {
+            storagePath, 
+            strongholdPassword
+        })
+     
+        const secretManager = await api.createSecretManager(secretManagerOptions);
 
-export const onboardingProfileSecretManager: Readable<SecretManager | null> = derived(onboardingProfileSecretManagerOptions, ($onboardingProfileSecretManagerOptions, set) => {
-    console.log("creating SC", $onboardingProfileSecretManagerOptions)
-    if ($onboardingProfileSecretManagerOptions) {
-        api.createSecretManager($onboardingProfileSecretManagerOptions)
-            .then((secretManager) => {
-                console.log("secret manager created", secretManager)
-                set(secretManager)
-            })
+        onboardingProfileSecretManager.set(secretManager)
     } else {
-        set(null)
+        onboardingProfileSecretManager.set(null)
     }
-})
+}
 
 export function isOnboardingSecretManagerInitialized(): boolean {
     return !!get(onboardingProfileSecretManager)
 }
+
+export function getSecretManagerFromProfileType(type?: ProfileType, { storagePath, strongholdPassword }: {
+    storagePath?: string, strongholdPassword?: string
+} = {}): SecretManagerType {
+    const strongholdSecretManager = {
+        stronghold: { snapshotPath: `${storagePath}/wallet.stronghold`, password: strongholdPassword },
+    }
+    const ledgerSecretManager = {
+        ledgerNano: USE_LEDGER_SIMULATOR,
+    }
+
+    switch (type) {
+        case ProfileType.Ledger:
+            return ledgerSecretManager
+        case ProfileType.Software:
+        default:
+            return strongholdSecretManager
+    }
+}
\ No newline at end of file
diff --git a/packages/shared/lib/core/api/interfaces/api.interface.ts b/packages/shared/lib/core/api/interfaces/api.interface.ts
index 22200274516..b5f73c3fc05 100644
--- a/packages/shared/lib/core/api/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/api/interfaces/api.interface.ts
@@ -1,4 +1,4 @@
-import { SecretManager } from '@iota/sdk'
+import { Client, SecretManager } from '@iota/sdk'
 import {
     AccountId,
     FoundryId,
@@ -15,6 +15,7 @@ import { IWallet } from '@core/profile/interfaces'
 
 // TODO(2.0): Every method should return a promise (maybe except Utils, needs research)
 export interface IApi {
+    getClientFromWallet(id: string): Promise<Client>
     createSecretManager(options: SecretManagerType): Promise<SecretManager>
     createWallet(id: string, payload: WalletOptions): Promise<IWallet>
     deleteWallet(id: string): void
diff --git a/packages/shared/lib/core/network/constants/official-node-urls.constant.ts b/packages/shared/lib/core/network/constants/official-node-urls.constant.ts
index f4674b99460..946ef084858 100644
--- a/packages/shared/lib/core/network/constants/official-node-urls.constant.ts
+++ b/packages/shared/lib/core/network/constants/official-node-urls.constant.ts
@@ -4,5 +4,5 @@ export const OFFICIAL_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
     [NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
     [NetworkId.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'],
     [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
-    [NetworkId.Testnet]: ['https://api.testnet.shimmer.network'],
+    [NetworkId.Testnet]: [':)'],
 }
diff --git a/packages/shared/lib/core/network/stores/node-info.store.ts b/packages/shared/lib/core/network/stores/node-info.store.ts
index 8b6708bc65c..ec533b85fb8 100644
--- a/packages/shared/lib/core/network/stores/node-info.store.ts
+++ b/packages/shared/lib/core/network/stores/node-info.store.ts
@@ -1,8 +1,10 @@
 import { INodeInfo } from '@iota/sdk/out/types'
-import { writable } from 'svelte/store'
+import { derived, writable } from 'svelte/store'
 
 export const nodeInfo = writable<INodeInfo | undefined>(undefined)
 
 export function setNodeInfo(newNodeInfo: INodeInfo | undefined): void {
     return nodeInfo.set(newNodeInfo)
 }
+
+export const nodeInfoNetworkName = derived(nodeInfo, ($nodeInfo) => $nodeInfo?.protocolParameters[0]?.parameters?.networkName)
\ No newline at end of file
diff --git a/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts b/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts
index ec04f5458d4..e0d3525da39 100644
--- a/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts
+++ b/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts
@@ -13,6 +13,7 @@ export function getNetworkIdFromNetworkName(networkName: string): NetworkId {
         case 'testnet':
         case 'testnet-1':
         case 'testnet-2':
+        case 'docker':
             return NetworkId.Testnet
         default:
             return NetworkId.Custom
diff --git a/packages/shared/lib/core/nfts/actions/index.ts b/packages/shared/lib/core/nfts/actions/index.ts
index 44895de615f..3ef50d9c896 100644
--- a/packages/shared/lib/core/nfts/actions/index.ts
+++ b/packages/shared/lib/core/nfts/actions/index.ts
@@ -4,6 +4,6 @@ export * from './downloadNextNftInQueue'
 export * from './getNftByIdFromAllAccountNfts'
 export * from './interruptNftDownloadAfterTimeout'
 export * from './loadNftsForActiveProfile'
-export * from './setAccountNftsInAllAccountNfts'
+export * from './setWalletNftsInAllWalletNfts'
 export * from './stopDownloadingNftMediaFromQueue'
 export * from './updateNftInAllAccountNfts'
diff --git a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
index 29566653b8c..e5b0267a2c5 100644
--- a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
+++ b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
@@ -1,31 +1,31 @@
 import { IWalletState } from '@core/wallet/interfaces'
-import { activeAccounts } from '@core/profile/stores'
+import { activeWallets } from '@core/profile/stores'
 import { getNftId } from '@core/wallet/utils'
 import { IWrappedOutput } from '@core/wallet/interfaces'
 import { get } from 'svelte/store'
 import { INft } from '../interfaces'
 import { buildNftFromNftOutput } from '../utils'
-import { setAccountNftsInAllAccountNfts } from './setAccountNftsInAllAccountNfts'
 import { NftOutput, OutputType } from '@iota/sdk/out/types'
+import { setWalletNftsInAllWalletNfts } from './setWalletNftsInAllWalletNfts'
 
 export async function loadNftsForActiveProfile(): Promise<void> {
-    const allAccounts = get(activeAccounts)
-    for (const account of allAccounts) {
-        await loadNftsForAccount(account)
+    const allWallets = get(activeWallets)
+    for (const wallet of allWallets) {
+        await loadNftsForWallet(wallet)
     }
 }
 
-async function loadNftsForAccount(account: IWalletState): Promise<void> {
-    const accountNfts: INft[] = []
-    const unspentOutputs = await account.unspentOutputs()
+async function loadNftsForWallet(wallet: IWalletState): Promise<void> {
+    const walletNfts: INft[] = []
+    const unspentOutputs = await wallet.unspentOutputs()
     for (const outputData of unspentOutputs) {
         if (outputData.output.type === OutputType.Nft) {
-            const nft = buildNftFromNftOutput(outputData as IWrappedOutput, account.depositAddress)
-            accountNfts.push(nft)
+            const nft = buildNftFromNftOutput(outputData as IWrappedOutput, wallet.depositAddress)
+            walletNfts.push(nft)
         }
     }
 
-    const allOutputs = await account.outputs()
+    const allOutputs = await wallet.outputs()
     const sortedNftOutputs = allOutputs
         .filter((output) => output.output.type === OutputType.Nft)
         .sort((a, b) => b.metadata.milestoneTimestampBooked - a.metadata.milestoneTimestampBooked)
@@ -33,11 +33,11 @@ async function loadNftsForAccount(account: IWalletState): Promise<void> {
         if (outputData.output.type === OutputType.Nft) {
             const nftOutput = outputData.output as NftOutput
             const nftId = getNftId(nftOutput.nftId, outputData.outputId)
-            if (!accountNfts.some((nft) => nft.id === nftId)) {
-                const nft = buildNftFromNftOutput(outputData as IWrappedOutput, account.depositAddress, false)
-                accountNfts.push(nft)
+            if (!walletNfts.some((nft) => nft.id === nftId)) {
+                const nft = buildNftFromNftOutput(outputData as IWrappedOutput, wallet.depositAddress, false)
+                walletNfts.push(nft)
             }
         }
     }
-    setAccountNftsInAllAccountNfts(account.index, accountNfts)
+    setWalletNftsInAllWalletNfts(wallet.id, walletNfts)
 }
diff --git a/packages/shared/lib/core/nfts/actions/setAccountNftsInAllAccountNfts.ts b/packages/shared/lib/core/nfts/actions/setWalletNftsInAllWalletNfts.ts
similarity index 51%
rename from packages/shared/lib/core/nfts/actions/setAccountNftsInAllAccountNfts.ts
rename to packages/shared/lib/core/nfts/actions/setWalletNftsInAllWalletNfts.ts
index b8561682a8f..7a5044e7cc3 100644
--- a/packages/shared/lib/core/nfts/actions/setAccountNftsInAllAccountNfts.ts
+++ b/packages/shared/lib/core/nfts/actions/setWalletNftsInAllWalletNfts.ts
@@ -1,9 +1,9 @@
 import { allWalletNfts } from '../stores'
 import { INft } from '../interfaces'
 
-export function setAccountNftsInAllAccountNfts(accountIndex: number, accountNfts: INft[]): void {
+export function setWalletNftsInAllWalletNfts(walletId: string, walletNfts: INft[]): void {
     allWalletNfts.update((state) => {
-        state[accountIndex] = accountNfts
+        state[walletId] = walletNfts
         return state
     })
 }
diff --git a/packages/shared/lib/core/profile/actions/active-accounts/findActiveAccountWithAddress.ts b/packages/shared/lib/core/profile/actions/active-accounts/findActiveWalletWithAddress.ts
similarity index 85%
rename from packages/shared/lib/core/profile/actions/active-accounts/findActiveAccountWithAddress.ts
rename to packages/shared/lib/core/profile/actions/active-accounts/findActiveWalletWithAddress.ts
index b9e517d3fd8..86f84d192d3 100644
--- a/packages/shared/lib/core/profile/actions/active-accounts/findActiveAccountWithAddress.ts
+++ b/packages/shared/lib/core/profile/actions/active-accounts/findActiveWalletWithAddress.ts
@@ -7,7 +7,7 @@ import { activeWallets } from '../../stores'
  * @param address The address to find
  * @returns The wallet matching the address or undefined if not found
  */
-export function findActiveAccountWithAddress(address: string): IWalletState {
+export function findActiveWalletWithAddress(address: string): IWalletState {
     if (!address) {
         return
     }
diff --git a/packages/shared/lib/core/profile/actions/active-accounts/index.ts b/packages/shared/lib/core/profile/actions/active-accounts/index.ts
index 88085deb5d3..b6ff630c968 100644
--- a/packages/shared/lib/core/profile/actions/active-accounts/index.ts
+++ b/packages/shared/lib/core/profile/actions/active-accounts/index.ts
@@ -1,3 +1,3 @@
-export * from './findActiveAccountWithAddress'
-export * from './updateActiveAccountPersistedData'
+export * from './findActiveWalletWithAddress'
+export * from './updateActiveWalletPersistedData'
 export * from './getWalletColorById'
\ No newline at end of file
diff --git a/packages/shared/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts b/packages/shared/lib/core/profile/actions/active-accounts/updateActiveWalletPersistedData.ts
similarity index 83%
rename from packages/shared/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts
rename to packages/shared/lib/core/profile/actions/active-accounts/updateActiveWalletPersistedData.ts
index af7c0f5e27e..4104901deea 100644
--- a/packages/shared/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts
+++ b/packages/shared/lib/core/profile/actions/active-accounts/updateActiveWalletPersistedData.ts
@@ -2,8 +2,7 @@ import { updateWalletPersistedDataOnActiveProfile } from '@core/profile'
 import { IPersistedWalletData, updateSelectedWallet, selectedWalletId } from '@core/wallet'
 import { get } from 'svelte/store'
 
-// TODO(2.0) Update this this and fix all usages
-export function updateActiveAccountPersistedData(
+export function updateActiveWalletPersistedData(
     walletId: string,
     partialWalletPersistedData: Partial<IPersistedWalletData>
 ): void {
diff --git a/packages/shared/lib/core/profile/actions/active-profile/checkAndUpdateActiveProfileNetwork.ts b/packages/shared/lib/core/profile/actions/active-profile/checkAndUpdateActiveProfileNetwork.ts
index a21eba0b11e..3bfcec10170 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/checkAndUpdateActiveProfileNetwork.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/checkAndUpdateActiveProfileNetwork.ts
@@ -7,11 +7,12 @@ export async function checkAndUpdateActiveProfileNetwork(): Promise<void> {
     const $activeProfile = get(activeProfile)
     const nodeInfoResponse = await getAndUpdateNodeInfo(true)
     const networkId = $activeProfile?.network?.id
+    const networkName = nodeInfoResponse?.nodeInfo?.protocolParameters[0]?.parameters?.networkName
     if (!networkId || networkId === NetworkId.Custom) {
         const network = buildPersistedNetworkFromNodeInfoResponse(nodeInfoResponse)
         network.chains = $activeProfile.network?.chains || []
         updateActiveProfile({ network })
-    } else if (networkId !== getNetworkIdFromNetworkName(nodeInfoResponse?.nodeInfo?.protocol?.networkName)) {
+    } else if (networkId !== getNetworkIdFromNetworkName(networkName)) {
         throw new Error('error.node.networkIdMismatch')
     }
 }
diff --git a/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts b/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts
index d918fa165b7..477775e2e36 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts
@@ -1,4 +1,4 @@
-import { loadWallet } from '@core/wallet'
+import { loadWallet, setSelectedWallet } from '@core/wallet'
 import { get } from 'svelte/store'
 import { activeWallets, activeProfile } from '../../stores'
 import { getWallets } from '../getWallets'
diff --git a/packages/shared/lib/core/profile/actions/active-profile/login.ts b/packages/shared/lib/core/profile/actions/active-profile/login.ts
index f741716598f..e841c832a6b 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/login.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/login.ts
@@ -10,7 +10,7 @@ import { loadNftsForActiveProfile } from '@core/nfts'
 import { routerManager } from '@core/router/stores'
 import { SECONDS_PER_MINUTE } from '@core/utils'
 import { sleep } from '@core/utils/os'
-import { createNewWallet, generateAndStoreActivitiesForAllAccounts, isStrongholdUnlocked, refreshAccountAssetsForActiveProfile, setSelectedWallet } from '@core/wallet/actions'
+import { createNewWallet, generateAndStoreActivitiesForAllWallets, isStrongholdUnlocked, refreshWalletAssetsForActiveProfile, setSelectedWallet } from '@core/wallet/actions'
 import { get } from 'svelte/store'
 import {
     CHECK_PREVIOUS_MANAGER_IS_DESTROYED_INTERVAL,
@@ -48,15 +48,16 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
             // Step 1: create profile manager if its doesn't exist
             incrementLoginProgress()
             await waitForPreviousManagerToBeDestroyed()
-            if (!isOnboardingSecretManagerInitialized()) {
-                // TODO(2.0) Not sure about this
-                await initialiseOnboardingProfileWithSecretManager(true)
-            }
+            // if (!isOnboardingSecretManagerInitialized()) {
+            //     // TODO(2.0) Not sure about this
+            //     await initialiseOnboardingProfileWithSecretManager(true)
+            // }
 
             // Step 3: load and build all the profile data
             incrementLoginProgress()
             let wallets: IWallet[] = []
-            if (loginOptions?.isFromOnboardingFlow && loginOptions?.shouldRecoverAccounts) {
+            
+            if (loginOptions?.isFromOnboardingFlow && loginOptions?.shouldRecoverWallets) {
                 /*
                 const { initialAccountRange, addressGapLimit } = DEFAULT_ACCOUNT_RECOVERY_CONFIGURATION[type]
                 const recoverAccountsPayload: RecoverAccountsPayload = {
@@ -71,7 +72,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
                 wallets = await getWallets()
             }
             /**
-             * NOTE: In the case no accounts with funds were recovered, we must
+             * NOTE: In the case no wallets with funds were recovered, we must
              * create one for the new profile.
              */
             if (wallets?.length === 0) {
@@ -81,7 +82,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
                         return Promise.resolve()
                     }
                     const onCancel = () => resolve(false)
-                    const config = { stronghold: false, ledger: false }
+                    const config = { stronghold: false, ledger: false }                    
                     checkActiveProfileAuth(onSuccess, config, onCancel)
                 })
                 const success = await onUnlocked
@@ -93,27 +94,31 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
                 }
             }
 
-            // Step 4: load accounts
+            // Step 4: load wallets
             incrementLoginProgress()
             await loadWallets()
 
             let initialSelectedWalletId = get(activeWallets)?.[0]?.id
-            if (
-                initialSelectedWalletId &&
-                get(activeWallets)?.find((wallet) => wallet.id === initialSelectedWalletId)
-            ) {
-                initialSelectedWalletId = lastUsedWalletId
-            }
+            
+            // TODO(2.0): is needed lastUsedWalletId?
+            // if (
+            //     initialSelectedWalletId &&
+            //     get(activeWallets)?.find((wallet) => wallet.id === initialSelectedWalletId)
+            // ) {
+            //     initialSelectedWalletId = lastUsedWalletId
+            // }
+            // console.log("initialSelectedWalletId", initialSelectedWalletId);
+
             setSelectedWallet(initialSelectedWalletId)
 
             // Step 2: get node info to check we have a synced node
             incrementLoginProgress()
             await checkAndUpdateActiveProfileNetwork()
             void pollNetworkStatus()
-
+            
             // Step 5: load assets
             incrementLoginProgress()
-            await refreshAccountAssetsForActiveProfile(
+            await refreshWalletAssetsForActiveProfile(
                 _activeProfile.forceAssetRefresh,
                 _activeProfile.forceAssetRefresh
             )
@@ -121,9 +126,9 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
             await loadNftsForActiveProfile()
             checkAndRemoveProfilePicture()
 
-            // Step 6: generate and store activities for all accounts
+            // Step 6: generate and store activities for all wallets
             incrementLoginProgress()
-            await generateAndStoreActivitiesForAllAccounts()
+            await generateAndStoreActivitiesForAllWallets()
 
             if (type === ProfileType.Software) {
                 // Step 7: set initial stronghold status
@@ -168,7 +173,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
             throw Error('No active profile error')
         }
     } catch (err) {
-        console.log(err)
+        console.error(err)
         handleError(err)
         if (!loginOptions?.isFromOnboardingFlow) {
             void logout(false)
diff --git a/packages/shared/lib/core/profile/actions/active-profile/saveActiveProfile.ts b/packages/shared/lib/core/profile/actions/active-profile/saveActiveProfile.ts
index 8247e1ceed5..8de951500ed 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/saveActiveProfile.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/saveActiveProfile.ts
@@ -19,7 +19,7 @@ export function saveActiveProfile(): void {
             ...(_activeProfile.strongholdVersion && { strongholdVersion: _activeProfile.strongholdVersion }),
             ...(_activeProfile.hasVisitedDashboard && { hasVisitedDashboard: _activeProfile.hasVisitedDashboard }),
             ...(_activeProfile.lastUsedAccountIndex && { lastUsedAccountIndex: _activeProfile.lastUsedAccountIndex }),
-            ...(_activeProfile.accountPersistedData && { accountPersistedData: _activeProfile.accountPersistedData }),
+            ...(_activeProfile.walletPersistedData && { walletPersistedData: _activeProfile.walletPersistedData }),
             ...(_activeProfile.pfp && { pfp: _activeProfile.pfp }),
         }
         saveProfile(profileToPersist)
diff --git a/packages/shared/lib/core/profile/actions/clearProfileFromMemory.ts b/packages/shared/lib/core/profile/actions/clearProfileFromMemory.ts
index 7fd6db98ee3..354199c985e 100644
--- a/packages/shared/lib/core/profile/actions/clearProfileFromMemory.ts
+++ b/packages/shared/lib/core/profile/actions/clearProfileFromMemory.ts
@@ -1,5 +1,9 @@
 import { api } from '@core/api'
+import { selectedWalletId } from '@core/wallet'
+import { activeWallets } from '../stores'
 
 export async function clearProfileFromMemory(): Promise<void> {
+    selectedWalletId.set(null)
+    activeWallets.set([])
     await api.clearWalletsFromMemory()
 }
diff --git a/packages/shared/lib/core/profile/actions/createWallet.ts b/packages/shared/lib/core/profile/actions/createWallet.ts
index e21659f9e97..88d46199bc2 100644
--- a/packages/shared/lib/core/profile/actions/createWallet.ts
+++ b/packages/shared/lib/core/profile/actions/createWallet.ts
@@ -1,10 +1,26 @@
 import { api } from '@core/api'
 import { generateRandomId } from '@core/utils'
 import { get } from 'svelte/store'
-import { IWallet } from '../interfaces'
+import { IProfile, IWallet } from '../interfaces'
 import { activeProfile as activeProfileStore } from '../stores'
 import { getSecretManagerFromProfileType, getStorageDirectoryOfProfile } from '../utils'
-import { WalletOptions } from '@iota/sdk'
+import { Wallet, WalletOptions } from '@iota/sdk'
+import { selectedWalletId } from '../../wallet'
+
+export function getWalletOptions(profile: IProfile, storagePath:string): WalletOptions {
+    const walletOptions: WalletOptions = {
+        clientOptions: profile.clientOptions,
+        storagePath,
+        secretManager: getSecretManagerFromProfileType(profile.type, storagePath),
+        bipPath: {
+            coinType: profile.network.coinType,
+            account: 0,
+            addressIndex: 0
+        },
+    }
+
+    return walletOptions
+}
 
 // TODO(2.0): Fix and finish this method
 /* - __storage__/
@@ -14,24 +30,17 @@ import { WalletOptions } from '@iota/sdk'
         - __wallet2__/
 */
 export async function createWallet(activeProfile = get(activeProfileStore)): Promise<IWallet> {
-    const id = generateRandomId()
+    const id = activeProfile.id;
     const storagePath = await getStorageDirectoryOfProfile(id)
-    // const snapshotPath = ''
 
-    const walletOptions: WalletOptions = {
-        clientOptions: activeProfile.clientOptions,
-        secretManager: getSecretManagerFromProfileType(activeProfile.type, storagePath),
-        bipPath: {
-            coinType: activeProfile.network.coinType,
-            account: 0,
-            addressIndex: 0
-        },
-        coinType: activeProfile.network.coinType
-    }
-    console.log("walletOptions", walletOptions);
+    const walletOptions = getWalletOptions(activeProfile, storagePath);
+    
     const wallet = await api.createWallet(id, {
         ...walletOptions,
         storagePath,
     })
+
+    // TODO(2.0): Fix 
+    selectedWalletId.set(id)
     return wallet
 }
diff --git a/packages/shared/lib/core/profile/actions/deleteWallet.ts b/packages/shared/lib/core/profile/actions/deleteWallet.ts
index 1d01bee77c4..86378cf2d9c 100644
--- a/packages/shared/lib/core/profile/actions/deleteWallet.ts
+++ b/packages/shared/lib/core/profile/actions/deleteWallet.ts
@@ -18,7 +18,7 @@ export async function deleteWallet(id: string): Promise<void> {
 
     try {
         await api.deleteWallet(id)
-        // TODO(2.0) do we need this?: removeAccountFromActiveAccounts(id)
+        // TODO(2.0) do we need this?: removewalletFromactiveWallets(id)
         setSelectedWallet(wallets[0]?.id ?? null)
         get(routerManager).resetRouterForAppContext(AppContext.Dashboard)
     } catch (err) {
diff --git a/packages/shared/lib/core/profile/actions/getWallet.ts b/packages/shared/lib/core/profile/actions/getWallet.ts
index 67f31aa9e0d..25b79352075 100644
--- a/packages/shared/lib/core/profile/actions/getWallet.ts
+++ b/packages/shared/lib/core/profile/actions/getWallet.ts
@@ -7,7 +7,7 @@ import {activeProfile } from '../stores'
 // TODO(2.0): Fix all usages of this method, before numeric index, now string
 export async function getWallet(walletId: string): Promise<IWallet> {
     const profile: IPersistedProfile = get(activeProfile)
-    const persistedWallet: IPersistedWalletData = profile?.accountPersistedData[walletId]
+    const persistedWallet: IPersistedWalletData = profile?.walletPersistedData[walletId]
     const wallet = await api.getWallet(walletId, persistedWallet.walletOptions)
     return wallet
 }
diff --git a/packages/shared/lib/core/profile/actions/getWallets.ts b/packages/shared/lib/core/profile/actions/getWallets.ts
index 56c8be15f31..414f4fd9d20 100644
--- a/packages/shared/lib/core/profile/actions/getWallets.ts
+++ b/packages/shared/lib/core/profile/actions/getWallets.ts
@@ -7,10 +7,10 @@ import { IWallet } from '../interfaces/wallet.interface'
 // TODO(2.0): Finalize when new profile is ready
 export async function getWallets(): Promise<IWallet[]> {
     const profile = get(activeProfile)
-    let wallets: IWallet[] = []
-    if (profile.accountPersistedData) {
-        wallets = await Promise.all(Object.entries(profile.accountPersistedData)
-            .map(([id, data]) => api.getWallet(id, data.walletOptions)))
+    let wallets: IWallet[] = [] 
+    if (profile.walletPersistedData) {
+        wallets = await Promise.all(Object.entries(profile.walletPersistedData)
+        .map(([id, data]) => api.getWallet(id, data.walletOptions)))
     }
     return wallets
 }
diff --git a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
index de38c2cdb08..c04493802fc 100644
--- a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
+++ b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
@@ -26,7 +26,7 @@ export function checkAndMigrateChrysalisProfiles(): boolean {
                     chrysalisProfile.lastStrongholdBackupTime ??
                     DEFAULT_PERSISTED_PROFILE_OBJECT.lastStrongholdBackupTime,
                 settings: DEFAULT_PERSISTED_PROFILE_OBJECT.settings,
-                accountPersistedData: DEFAULT_PERSISTED_PROFILE_OBJECT.accountPersistedData,
+                walletPersistedData: DEFAULT_PERSISTED_PROFILE_OBJECT.walletPersistedData,
                 isDeveloperProfile:
                     chrysalisProfile.isDeveloperProfile ?? DEFAULT_PERSISTED_PROFILE_OBJECT.isDeveloperProfile,
                 hasVisitedDashboard: chrysalisProfile.hasVisitedDashboard ?? undefined,
@@ -37,13 +37,13 @@ export function checkAndMigrateChrysalisProfiles(): boolean {
                 needsChrysalisToStardustDbMigration: true,
             }
 
-            // accountPersistedData
+            // walletPersistedData
             if (chrysalisProfile.accounts) {
-                const accountPersistedData: {
-                    [accountId: string]: IPersistedWalletData
+                const walletPersistedData: {
+                    [walletId: string]: IPersistedWalletData
                 } = {}
                 chrysalisProfile.accounts.forEach((account, index) => {
-                    accountPersistedData[index] = {
+                    walletPersistedData[index] = {
                         name: `Wallet ${index + 1}`,
                         color: account.color,
                         hidden: chrysalisProfile.hiddenAccounts?.includes(account.id) ?? false,
@@ -54,7 +54,7 @@ export function checkAndMigrateChrysalisProfiles(): boolean {
                         migratedProfile.lastUsedAccountIndex = index
                     }
                 })
-                migratedProfile.accountPersistedData = accountPersistedData
+                migratedProfile.walletPersistedData = walletPersistedData
             }
 
             // settings
diff --git a/packages/shared/lib/core/profile/constants/default-persisted-profile-object.constant.ts b/packages/shared/lib/core/profile/constants/default-persisted-profile-object.constant.ts
index fac29c52fbd..ac7fb9cb97a 100644
--- a/packages/shared/lib/core/profile/constants/default-persisted-profile-object.constant.ts
+++ b/packages/shared/lib/core/profile/constants/default-persisted-profile-object.constant.ts
@@ -18,7 +18,7 @@ export const DEFAULT_PERSISTED_PROFILE_OBJECT: IPersistedProfile = {
         maxMediaDownloadTimeInSeconds: DEFAULT_MAX_NFT_DOWNLOADING_TIME_IN_SECONDS,
         hideNetworkStatistics: true,
     },
-    accountPersistedData: {},
+    walletPersistedData: {},
     isDeveloperProfile: false,
     forceAssetRefresh: false,
     strongholdVersion: undefined,
diff --git a/packages/shared/lib/core/profile/interfaces/login-options.interface.ts b/packages/shared/lib/core/profile/interfaces/login-options.interface.ts
index 765a0df73c3..e879ea970df 100644
--- a/packages/shared/lib/core/profile/interfaces/login-options.interface.ts
+++ b/packages/shared/lib/core/profile/interfaces/login-options.interface.ts
@@ -1,4 +1,4 @@
 export interface ILoginOptions {
     isFromOnboardingFlow?: boolean
-    shouldRecoverAccounts?: boolean
+    shouldRecoverWallets?: boolean
 }
diff --git a/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts b/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
index 63ff1070067..6ad3ad1a30e 100644
--- a/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
+++ b/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
@@ -13,14 +13,14 @@ export interface IPersistedProfile {
     network: IPersistedNetwork
     lastStrongholdBackupTime: Date
     settings: IProfileSettings
-    accountPersistedData: { // TODO(2.0) Shouldn't we rename this field?
-        [accountId: string]: IPersistedWalletData
+    walletPersistedData: {
+        [walletId: string]: IPersistedWalletData
     }
     isDeveloperProfile: boolean
     hasVisitedDashboard?: boolean
     lastUsedWalletId?: string // Todo(2.0) Fix all usages of lastUsedAccountIndex
     clientOptions: ClientOptions
-    secretManagerOptions: SecretManagerType,
+    secretManagerOptions: SecretManagerType, // TODO(2.0) This sould be gone.
     forceAssetRefresh: boolean
     strongholdVersion?: StrongholdVersion
     needsChrysalisToStardustDbMigration?: boolean
diff --git a/packages/shared/lib/core/profile/stores/active-profile.store.ts b/packages/shared/lib/core/profile/stores/active-profile.store.ts
index 4629b695962..56ebc7a914a 100644
--- a/packages/shared/lib/core/profile/stores/active-profile.store.ts
+++ b/packages/shared/lib/core/profile/stores/active-profile.store.ts
@@ -26,16 +26,16 @@ export function addWalletPersistedDataToActiveProfile(
     walletPersistedData: IPersistedWalletData
 ): void {
     activeProfile?.update((state) => {
-        if (!state?.accountPersistedData) {
-            state.accountPersistedData = {}
+        if (!state?.walletPersistedData) {
+            state.walletPersistedData = {}
         }
-        state.accountPersistedData[walletId] = walletPersistedData
+        state.walletPersistedData[walletId] = walletPersistedData
         return state
     })
 }
 
 export function getActiveProfilePersistedWalletData(walletId: string): IPersistedWalletData | undefined {
-    return get(activeProfile)?.accountPersistedData?.[walletId]
+    return get(activeProfile)?.walletPersistedData?.[walletId]
 }
 
 export function updateWalletPersistedDataOnActiveProfile(
@@ -43,11 +43,11 @@ export function updateWalletPersistedDataOnActiveProfile(
     partialWalletPersistedData: Partial<IPersistedWalletData>
 ): void {
     activeProfile?.update((state) => {
-        if (!state?.accountPersistedData) {
-            state.accountPersistedData = {}
+        if (!state?.walletPersistedData) {
+            state.walletPersistedData = {}
         }
-        state.accountPersistedData[walletId] = {
-            ...state?.accountPersistedData?.[walletId],
+        state.walletPersistedData[walletId] = {
+            ...state?.walletPersistedData?.[walletId],
             ...partialWalletPersistedData,
         }
         return state
diff --git a/packages/shared/lib/core/profile/stores/active-wallets.store.ts b/packages/shared/lib/core/profile/stores/active-wallets.store.ts
index b6fb83d668f..15cbd3ca386 100644
--- a/packages/shared/lib/core/profile/stores/active-wallets.store.ts
+++ b/packages/shared/lib/core/profile/stores/active-wallets.store.ts
@@ -8,7 +8,7 @@ export function removewalletFromactiveWallets(walletId: string): void {
     activeWallets?.update((state) => state.filter((wallet) => wallet.id !== walletId))
 }
 
-export function addwalletToactiveWallets(wallet: IWalletState): void {
+export function addWalletToActiveWallets(wallet: IWalletState): void {
     activeWallets?.update((state) => [...state, wallet])
 }
 
diff --git a/packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts b/packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts
index 3d8423ae974..555b35a70f4 100644
--- a/packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts
+++ b/packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts
@@ -6,7 +6,7 @@ import { ProfileType } from '@core/profile'
 // TODO(2.0) Fix all usages
 export function getSecretManagerFromProfileType(type?: ProfileType, storagePath?: string): SecretManagerType {
     const strongholdSecretManager = {
-        stronghold: { snapshotPath: `${storagePath}/wallet.stronghold`, password: 'mellamobego' },
+        stronghold: { snapshotPath: `${storagePath}/wallet.stronghold`, password: 'mellamobego' }, // TODO(2.0) Remove this harcoded password
     }
     const ledgerSecretManager = {
         ledgerNano: USE_LEDGER_SIMULATOR,
diff --git a/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts b/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts
index 458c9457321..c0178194168 100644
--- a/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts
+++ b/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts
@@ -4,10 +4,7 @@ import { activeProfileSecretManager } from '../stores'
 
 export async function storeMnemonic(mnemonic: string): Promise<void> {
     // TODO(2.0) There are two secret managers, but we might only actually need one to store the mnemonic.
-    const secretManager = get(onboardingProfileSecretManager)
-
-    console.log("storeMnemonic", mnemonic, "secretManager", secretManager);
-    
+    const secretManager = get(onboardingProfileSecretManager)    
 
     if (!secretManager) {
         return undefined
diff --git a/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForAccount.ts
deleted file mode 100644
index 009b3930aaf..00000000000
--- a/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForAccount.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { IWalletState } from '@core/wallet/interfaces'
-
-import { setAccountActivitiesInAllAccountActivities } from '../../stores'
-
-import { setOutgoingAsyncActivitiesToClaimed } from '../setOutgoingAsyncActivitiesToClaimed'
-import { preprocessTransactionsForAccount } from './preprocessTransactionsForAccount'
-import { preprocessOutputsForAccount } from './preprocessOutputsForAccount'
-import { linkTransactionsWithClaimingTransactions } from './linkTransactionsWithClaimingTransactions'
-import { hideActivitiesForFoundries } from './hideActivitiesForFoundries'
-import { generateActivitiesFromProcessedTransactions } from './generateActivitiesFromProcessedTransactions'
-import { loadAssetsForAllActivities } from './loadAssetsForAllAccounts'
-
-export async function generateAndStoreActivitiesForAccount(account: IWalletState): Promise<void> {
-    // Step 1: process account transactions and outputs into processed transactions
-    const processedTransactions = [
-        ...(await preprocessTransactionsForAccount(account)),
-        ...(await preprocessOutputsForAccount(account)),
-    ]
-
-    // Step 2: link transactions with corresponding claiming transactions
-    const linkedProcessedTransactions = linkTransactionsWithClaimingTransactions(processedTransactions, account)
-
-    // Step 3: generate activities from processed transactions
-    const activities = await generateActivitiesFromProcessedTransactions(linkedProcessedTransactions, account)
-
-    // Step 4: set account activities with generated activities
-    setAccountActivitiesInAllAccountActivities(account.index, activities)
-
-    hideActivitiesForFoundries(account)
-    await setOutgoingAsyncActivitiesToClaimed(account)
-    await loadAssetsForAllActivities(account)
-}
diff --git a/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForWallet.ts b/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForWallet.ts
new file mode 100644
index 00000000000..8e8cb8c2fb8
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForWallet.ts
@@ -0,0 +1,31 @@
+import { IWalletState } from '@core/wallet/interfaces'
+
+import { setOutgoingAsyncActivitiesToClaimed } from '../setOutgoingAsyncActivitiesToClaimed'
+import { preprocessTransactionsForWallet } from './preprocessTransactionsForWallet'
+import { preprocessOutputsForWallet } from './preprocessOutputsForWallet'
+import { linkTransactionsWithClaimingTransactions } from './linkTransactionsWithClaimingTransactions'
+import { hideActivitiesForFoundries } from './hideActivitiesForFoundries'
+import { generateActivitiesFromProcessedTransactions } from './generateActivitiesFromProcessedTransactions'
+import { loadAssetsForAllWallets } from './loadAssetsForAllWallets'
+import { setWalletActivitiesInAllWalletActivities } from '../../stores'
+
+export async function generateAndStoreActivitiesForWallet(wallet: IWalletState): Promise<void> {
+    // Step 1: process wallet transactions and outputs into processed transactions
+    const processedTransactions = [
+        ...(await preprocessTransactionsForWallet(wallet)),
+        ...(await preprocessOutputsForWallet(wallet)),
+    ]
+
+    // Step 2: link transactions with corresponding claiming transactions
+    const linkedProcessedTransactions = linkTransactionsWithClaimingTransactions(processedTransactions, wallet)
+
+    // Step 3: generate activities from processed transactions
+    const activities = await generateActivitiesFromProcessedTransactions(linkedProcessedTransactions, wallet)
+
+    // Step 4: set wallet activities with generated activities
+    setWalletActivitiesInAllWalletActivities(wallet.id, activities)
+
+    hideActivitiesForFoundries(wallet)
+    await setOutgoingAsyncActivitiesToClaimed(wallet)
+    await loadAssetsForAllWallets(wallet)
+}
diff --git a/packages/shared/lib/core/wallet/actions/activities/index.ts b/packages/shared/lib/core/wallet/actions/activities/index.ts
index 2dcf831d634..b3f1619fafb 100644
--- a/packages/shared/lib/core/wallet/actions/activities/index.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/index.ts
@@ -1,9 +1,9 @@
 export * from './linkTransactionsWithClaimingTransactions'
-export * from './generateAndStoreActivitiesForAccount'
+export * from './generateAndStoreActivitiesForWallet'
 export * from './hideActivitiesForFoundries'
 export * from './hideActivitiesForHiddenAssets'
-export * from './preprocessOutputsForAccount'
-export * from './preprocessTransactionsForAccount'
-export * from './loadAssetsForAllAccounts'
+export * from './preprocessOutputsForWallet'
+export * from './preprocessTransactionsForWallet'
+export * from './loadAssetsForAllWallets'
 export * from './setAsyncStatusOfAccountActivities'
 export * from './updateClaimingTransactionInclusion'
diff --git a/packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllAccounts.ts b/packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllWallets.ts
similarity index 73%
rename from packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllAccounts.ts
rename to packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllWallets.ts
index 33727cbd93f..19afb3ad237 100644
--- a/packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllAccounts.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllWallets.ts
@@ -2,14 +2,14 @@ import { getOrRequestAssetFromPersistedAssets } from '../getOrRequestAssetFromPe
 import { IWalletState } from '@core/wallet/interfaces'
 import { get } from 'svelte/store'
 import { ActivityType } from '@core/wallet/enums'
-import { allAccountActivities, addPersistedAsset } from '../../stores'
+import { allWalletActivities, addPersistedAsset } from '../../stores'
 import { IPersistedAsset } from '@core/wallet/interfaces'
 
-export async function loadAssetsForAllActivities(account: IWalletState): Promise<void> {
-    const accountActivities = get(allAccountActivities)[account.index]
+export async function loadAssetsForAllWallets(wallet: IWalletState): Promise<void> {
+    const walletActivities = get(allWalletActivities)[wallet.id]
 
     const persistedAssets: IPersistedAsset[] = []
-    for (const activity of accountActivities) {
+    for (const activity of walletActivities) {
         try {
             if (activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry) {
                 const asset = await getOrRequestAssetFromPersistedAssets(activity.assetId)
diff --git a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForWallet.ts
similarity index 69%
rename from packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
rename to packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForWallet.ts
index f838e5c9032..3a27552097c 100644
--- a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForWallet.ts
@@ -1,16 +1,16 @@
-import type { OutputData, OutputResponse, Transaction } from '@iota/sdk/out/types'
+import type { OutputData, OutputResponse, TransactionWithMetadata } from '@iota/sdk/out/types'
 
 import { IWalletState } from '@core/wallet/interfaces'
 
 import { preprocessGroupedOutputs } from '../../utils/outputs'
 import { IProcessedTransaction } from '../../interfaces'
 
-export async function preprocessOutputsForAccount(account: IWalletState): Promise<IProcessedTransaction[]> {
-    const outputs = await account.outputs()
+export async function preprocessOutputsForWallet(wallet: IWalletState): Promise<IProcessedTransaction[]> {
+    const outputs = await wallet.outputs()
 
-    const transactions = await account.transactions()
+    const transactions = await wallet.transactions()
     const transactionMap = getTransactionsMapFromList(transactions)
-    const incomingTransactions = getMapFromList(await account.incomingTransactions())
+    const incomingTransactions = getMapFromList(await wallet.incomingTransactions())
 
     const groupedOutputs: { [key: string]: OutputData[] } = {}
     for (const output of outputs) {
@@ -29,7 +29,7 @@ export async function preprocessOutputsForAccount(account: IWalletState): Promis
     for (const transactionId of Object.keys(groupedOutputs)) {
         try {
             const inputs: OutputResponse[] = incomingTransactions[transactionId]?.inputs ?? []
-            const processedTransaction = preprocessGroupedOutputs(groupedOutputs[transactionId], inputs, account)
+            const processedTransaction = preprocessGroupedOutputs(groupedOutputs[transactionId], inputs, wallet)
 
             processedTransactions.push(processedTransaction)
         } catch (err) {
@@ -39,7 +39,7 @@ export async function preprocessOutputsForAccount(account: IWalletState): Promis
     return processedTransactions
 }
 
-function getTransactionsMapFromList(transactions: Transaction[]): { [transactionId: string]: boolean } {
+function getTransactionsMapFromList(transactions: TransactionWithMetadata[]): { [transactionId: string]: boolean } {
     const transactionMap = {}
     for (const transaction of transactions) {
         transactionMap[transaction?.transactionId] = true
@@ -47,8 +47,8 @@ function getTransactionsMapFromList(transactions: Transaction[]): { [transaction
     return transactionMap
 }
 
-function getMapFromList(transactions: Transaction[]): {
-    [transactionId: string]: Transaction
+function getMapFromList(transactions: TransactionWithMetadata[]): {
+    [transactionId: string]: TransactionWithMetadata
 } {
     const transactionMap = {}
     for (const transaction of transactions) {
diff --git a/packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForWallet.ts
similarity index 73%
rename from packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForAccount.ts
rename to packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForWallet.ts
index 24d65360f71..fb072035e2c 100644
--- a/packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForWallet.ts
@@ -2,14 +2,14 @@ import { IWalletState } from '@core/wallet/interfaces'
 import { preprocessOutgoingTransaction } from '../../utils'
 import { IProcessedTransaction } from '../../interfaces/processed-transaction.interface'
 
-export async function preprocessTransactionsForAccount(account: IWalletState): Promise<IProcessedTransaction[]> {
-    const transactions = await account.transactions()
+export async function preprocessTransactionsForWallet(wallet: IWalletState): Promise<IProcessedTransaction[]> {
+    const transactions = await wallet.transactions()
 
     const processedTransactions: IProcessedTransaction[] = []
 
     for (const transaction of transactions) {
         try {
-            const processedTransaction = await preprocessOutgoingTransaction(transaction, account)
+            const processedTransaction = await preprocessOutgoingTransaction(transaction, wallet)
             processedTransactions.push(processedTransaction)
         } catch (err) {
             console.error(err)
diff --git a/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfAccountActivities.ts b/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfAccountActivities.ts
index f0f89406b3f..c4b3b08930d 100644
--- a/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfAccountActivities.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfAccountActivities.ts
@@ -2,7 +2,7 @@ import { syncBalance } from 'shared/lib/core/wallet/actions/syncBalance'
 import { updateNftInAllAccountNfts } from '@core/nfts'
 import { ActivityAsyncStatus, ActivityDirection, ActivityType } from '@core/wallet/enums'
 import { allAccountActivities } from '../../stores'
-import { refreshAccountAssetsForActiveProfile } from '../refreshAccountAssetsForActiveProfile'
+import { refreshWalletAssetsForActiveProfile } from '../refreshWalletAssetsForActiveProfile'
 import { getAsyncStatus } from '@core/wallet/utils/generateActivity/helper'
 
 export function setAsyncStatusOfAccountActivities(time: Date): void {
@@ -42,6 +42,6 @@ export function setAsyncStatusOfAccountActivities(time: Date): void {
         syncBalance(accountIndex)
     }
     if (balancesToUpdate.length) {
-        void refreshAccountAssetsForActiveProfile()
+        void refreshWalletAssetsForActiveProfile()
     }
 }
diff --git a/packages/shared/lib/core/wallet/actions/buildWalletState.ts b/packages/shared/lib/core/wallet/actions/buildWalletState.ts
index 65afd00967e..ad6ab86b1ff 100644
--- a/packages/shared/lib/core/wallet/actions/buildWalletState.ts
+++ b/packages/shared/lib/core/wallet/actions/buildWalletState.ts
@@ -33,13 +33,15 @@ export async function buildWalletState(
     
     let depositAddress = ''
     let votingPower = ''
-    try {
-        balances = await wallet.getBalance()
-        depositAddress = await getDepositAddress(wallet)
-        votingPower = balances.baseCoin.votingPower
-    } catch (err) {
-        console.error(err)
-    }
+
+    // TODO(2.0) Fix
+    // try {
+    //     balances = await wallet.getBalance()
+    //     depositAddress = await getDepositAddress(wallet)
+    //     votingPower = balances.baseCoin.votingPower
+    // } catch (err) {
+    //     console.error(err)
+    // }
     const addressesWithOutputs = await getAddressesWithOutputs(wallet)
 
     return {
diff --git a/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts b/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts
index f787ef46f21..10166f06d11 100644
--- a/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts
+++ b/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts
@@ -4,23 +4,24 @@ import { IWallet } from '@core/profile/interfaces';
 import { IWalletState } from '../interfaces/wallet-state.interface';
 import { IPersistedWalletData } from '../interfaces/persisted-wallet-data.interface';
 import { buildWalletState } from './buildWalletState'
+import { activeProfile, getStorageDirectoryOfProfile, getWalletOptions } from '@core/profile';
+import { get } from 'svelte/store';
 
 export async function buildWalletStateAndPersistedData(
     wallet: IWallet,
     name?: string,
     color?: string
 ): Promise<[IWalletState, IPersistedWalletData]> {
+    const storagePath = await getStorageDirectoryOfProfile(wallet.id)
+    const walletOptions = getWalletOptions(get(activeProfile), storagePath)
 
     const persistedWalletData: IPersistedWalletData = {
-        name: name || `${localize('general.account')}`,
+        name: name || `${localize('general.wallet')}`,
         color: color || getRandomWalletColor(),
         hidden: false,
         shouldRevote: false,
-        walletOptions: {}
-    }
-    console.log("persistedWalletData", persistedWalletData);
-    
-    const accountState = await buildWalletState(wallet, persistedWalletData)
-    console.log("accountState", accountState);
-    return [accountState, persistedWalletData]
+        walletOptions
+    }    
+    const walletState = await buildWalletState(wallet, persistedWalletData)
+    return [walletState, persistedWalletData]
 }
diff --git a/packages/shared/lib/core/wallet/actions/createNewWallet.ts b/packages/shared/lib/core/wallet/actions/createNewWallet.ts
index 6b5ddfcb504..d1c308038d5 100644
--- a/packages/shared/lib/core/wallet/actions/createNewWallet.ts
+++ b/packages/shared/lib/core/wallet/actions/createNewWallet.ts
@@ -1,33 +1,32 @@
 import { localize } from '@core/i18n'
-import { activeAccounts, addWalletPersistedDataToActiveProfile, addAccountToActiveAccounts, createWallet } from '@core/profile'
-import { addEmptyAccountActivitiesToAllAccountActivities } from '@core/wallet/stores'
+import { activeWallets, addWalletPersistedDataToActiveProfile, addWalletToActiveWallets, createWallet } from '@core/profile'
 import { get } from 'svelte/store'
 
-import { DEFAULT_SYNC_OPTIONS } from '../../account/constants'
-import { IWalletState } from '../../account/interfaces'
+import { DEFAULT_SYNC_OPTIONS } from '@core/wallet/constants'
+import { IWalletState } from '@core/wallet/interfaces'
 
 import { buildWalletStateAndPersistedData } from './buildWalletStateAndPersistedData'
+import { addEmptyWalletActivitiesToAllWalletActivities } from '../stores'
 
 export async function createNewWallet(name?: string, color?: string): Promise<IWalletState> {
     // 1. Get the wallet name
-    const walletName = name || `${localize('general.account')} ${(get(activeAccounts)?.length ?? 0) + 1}`;
+    const walletName = name || `${localize('general.wallet')} ${(get(activeWallets)?.length ?? 0) + 1}`;
 
     // 2. Create the wallet instance
     const wallet = await createWallet()
 
     // 3. Sync the wallet with the Node
     // TODO(2.0): test & fix sync when we have iota2.0 nodes
-    //await account.sync(DEFAULT_SYNC_OPTIONS)
+    await wallet.sync(DEFAULT_SYNC_OPTIONS)
 
     // 4. Create a wrapper over the wallet instance and the persisted data
-    const [walletState, accountPersistedData] = await buildWalletStateAndPersistedData(wallet, walletName, color)
+    const [walletState, walletPersistedData] = await buildWalletStateAndPersistedData(wallet, walletName, color)
 
     // TODO(2.0) Fix
-    // addAccountToActiveAccounts(walletState)
-    addWalletPersistedDataToActiveProfile(walletState.id, accountPersistedData)
+    addWalletToActiveWallets(walletState)
+    addWalletPersistedDataToActiveProfile(walletState.id, walletPersistedData)
     // TODO(2.0) Fix
-    // addEmptyAccountActivitiesToAllAccountActivities(walletState.id)
-
+    addEmptyWalletActivitiesToAllWalletActivities(walletState.id)
 
     return walletState
 }
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 f1854680860..a73f9bf391b 100644
--- a/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts
+++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts
@@ -4,7 +4,7 @@ import { Event, TransactionInclusionWalletEvent, WalletEventType } from '@iota/s
 import { updateParticipationOverview } from '@contexts/governance/stores'
 import { isWalletVoting } from 'shared/lib/contexts/governance/utils/isWalletVoting'
 import { updateNftInAllAccountNfts } from '@core/nfts'
-import { updateActiveAccountPersistedData } from '@core/profile/actions'
+import { updateActiveWalletPersistedData } from '@core/profile/actions'
 import { syncVotingPower, getActivityByTransactionId,
     updateActivityByTransactionId, validateWalletApiEvent, updateClaimingTransactionInclusion,  ActivityAction, ActivityDirection, ActivityType, GovernanceActivity, InclusionState } from '@core/wallet'
 import { get } from 'svelte/store'
@@ -66,12 +66,12 @@ function handleGovernanceTransactionInclusionEvent(
         if (wallet.hasVotingPowerTransactionInProgress) {
             updateActiveWallet(walletId, { hasVotingPowerTransactionInProgress: false })
             if (isWalletVoting(walletId) && activity.votingPower !== 0) {
-                updateActiveAccountPersistedData(walletId, { shouldRevote: true })
+                updateActiveWalletPersistedData(walletId, { shouldRevote: true })
                 openPopup({ id: PopupId.Revote })
             }
         } else {
             updateActiveWallet(walletId, { hasVotingTransactionInProgress: false })
-            updateActiveAccountPersistedData(walletId, { shouldRevote: false })
+            updateActiveWalletPersistedData(walletId, { shouldRevote: false })
         }
         void updateParticipationOverview(walletId)
     }
diff --git a/packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllAccounts.ts b/packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllAccounts.ts
deleted file mode 100644
index 1ef5d806e4a..00000000000
--- a/packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllAccounts.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { get } from 'svelte/store'
-
-import { activeAccounts } from '@core/profile/stores'
-
-import { generateAndStoreActivitiesForAccount } from './activities'
-
-export async function generateAndStoreActivitiesForAllAccounts(): Promise<void> {
-    try {
-        await Promise.all(
-            get(activeAccounts)?.map((activeAccount) => generateAndStoreActivitiesForAccount(activeAccount))
-        )
-    } catch (err) {
-        console.error(err)
-    }
-}
diff --git a/packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllWallets.ts b/packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllWallets.ts
new file mode 100644
index 00000000000..990a98a496b
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/generateAndStoreActivitiesForAllWallets.ts
@@ -0,0 +1,15 @@
+import { get } from 'svelte/store'
+
+import { activeWallets } from '@core/profile/stores'
+
+import { generateAndStoreActivitiesForWallet } from './activities'
+
+export async function generateAndStoreActivitiesForAllWallets(): Promise<void> {
+    try {
+        await Promise.all(
+            get(activeWallets)?.map((activeWallet) => generateAndStoreActivitiesForWallet(activeWallet))
+        )
+    } catch (err) {
+        console.error(err)
+    }
+}
diff --git a/packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts b/packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts
index dc96e69a2da..64a9db7d95f 100644
--- a/packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts
+++ b/packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts
@@ -5,6 +5,9 @@ import { Address } from '@iota/sdk/out/types'
 // TODO(2.0) Fix all usages
 export async function getAddressesWithOutputs(wallet: IWallet | IWalletState): Promise<AddressWithOutputs[]> {
     let addressesWithOutputs: AddressWithOutputs[] = []
+    // TODO (2.0): fix
+    return addressesWithOutputs
+
     const addresses: Address[] = [] // await account.accounts
     const outputs = await wallet.outputs()
 
diff --git a/packages/shared/lib/core/wallet/actions/getClient.ts b/packages/shared/lib/core/wallet/actions/getClient.ts
index 0389e1da384..dd29ea4b7ae 100644
--- a/packages/shared/lib/core/wallet/actions/getClient.ts
+++ b/packages/shared/lib/core/wallet/actions/getClient.ts
@@ -1,7 +1,10 @@
 import { Client } from '@iota/sdk/out/client'
-import { getSelectedWallet } from '@core/wallet/stores'
+import { getSelectedWallet, selectedWalletId } from '@core/wallet/stores'
+import { api } from '../../api';
+import { get } from 'svelte/store';
 
 export function getClient(): Promise<Client> {
-    const wallet = getSelectedWallet();
-    return wallet!.getClient()
+    const selectedWallet = get(selectedWalletId);
+
+    return api.getClientFromWallet(selectedWallet)
 }
diff --git a/packages/shared/lib/core/wallet/actions/getNodeInfo.ts b/packages/shared/lib/core/wallet/actions/getNodeInfo.ts
index 6ce86354605..f1b476730c7 100644
--- a/packages/shared/lib/core/wallet/actions/getNodeInfo.ts
+++ b/packages/shared/lib/core/wallet/actions/getNodeInfo.ts
@@ -4,8 +4,9 @@ import { getClient } from './getClient'
 
 export async function getNodeInfo(url?: string, auth?: IAuth): Promise<INodeInfoResponse> {
     const client = await getClient();
+    
     const nodeUrl = url ?? (await client.getNode()).url
-
+    
     const nodeInfo = await client.getNodeInfo(nodeUrl, auth)
 
     return {
diff --git a/packages/shared/lib/core/wallet/actions/index.ts b/packages/shared/lib/core/wallet/actions/index.ts
index 28a59e405a3..1cad1843848 100644
--- a/packages/shared/lib/core/wallet/actions/index.ts
+++ b/packages/shared/lib/core/wallet/actions/index.ts
@@ -3,9 +3,9 @@ export * from './burnAsset'
 export * from './burnNft'
 export * from './claimActivity'
 export * from './getWalletAssetsForSelectedWallet'
-export * from './generateAndStoreActivitiesForAllAccounts'
+export * from './generateAndStoreActivitiesForAllWallets'
 export * from './rejectActivity'
-export * from './refreshAccountAssetsForActiveProfile'
+export * from './refreshWalletAssetsForActiveProfile'
 export * from './requestPersistedAsset'
 export * from './sendOutput'
 export * from './setOutgoingAsyncActivitiesToClaimed'
diff --git a/packages/shared/lib/core/wallet/actions/loadWallet.ts b/packages/shared/lib/core/wallet/actions/loadWallet.ts
index e903d760dfe..ebf37412fcb 100644
--- a/packages/shared/lib/core/wallet/actions/loadWallet.ts
+++ b/packages/shared/lib/core/wallet/actions/loadWallet.ts
@@ -8,6 +8,7 @@ import { buildWalletState } from './buildWalletState'
 export async function loadWallet(wallet: IWallet): Promise<IWalletState> {
     // Temporary sync on load until we enable background sync and event listeners
     const walletId = wallet.id
+    // TODO(2.0): test & fix sync when we have iota2.0 nodes
     await wallet.sync({ ...DEFAULT_SYNC_OPTIONS })
     const walletPersistedData = getActiveProfilePersistedWalletData(walletId)
 
@@ -15,8 +16,8 @@ export async function loadWallet(wallet: IWallet): Promise<IWalletState> {
     if (walletPersistedData) {
         accountState = await buildWalletState(wallet, walletPersistedData)
     } else {
-        const [newAccountState, accountPersistedData] = await buildWalletStateAndPersistedData(wallet)
-        addWalletPersistedDataToActiveProfile(walletId, accountPersistedData)
+        const [newAccountState, walletPersistedData] = await buildWalletStateAndPersistedData(wallet)
+        addWalletPersistedDataToActiveProfile(walletId, walletPersistedData)
         accountState = newAccountState
     }
     
diff --git a/packages/shared/lib/core/wallet/actions/refreshAccountAssetsForActiveProfile.ts b/packages/shared/lib/core/wallet/actions/refreshWalletAssetsForActiveProfile.ts
similarity index 82%
rename from packages/shared/lib/core/wallet/actions/refreshAccountAssetsForActiveProfile.ts
rename to packages/shared/lib/core/wallet/actions/refreshWalletAssetsForActiveProfile.ts
index 6e033c8ad2e..8ae9d224a5b 100644
--- a/packages/shared/lib/core/wallet/actions/refreshAccountAssetsForActiveProfile.ts
+++ b/packages/shared/lib/core/wallet/actions/refreshWalletAssetsForActiveProfile.ts
@@ -1,6 +1,6 @@
-import { activeAccounts, activeProfile, getBaseToken, getCoinType } from '@core/profile'
+import { activeWallets, activeProfile, getBaseToken, getCoinType } from '@core/profile'
 import { get } from 'svelte/store'
-import { getOrRequestAssetFromPersistedAssets } from '../actions'
+import { getOrRequestAssetFromPersistedAssets } from '.'
 import { TokenStandard, VerifiedStatus } from '../enums'
 import { IPersistedAsset } from '../interfaces'
 import {
@@ -9,7 +9,7 @@ import {
     persistedAssets,
 } from '../stores/persisted-assets.store'
 
-export async function refreshAccountAssetsForActiveProfile(
+export async function refreshWalletAssetsForActiveProfile(
     clearPersistedAssets = false,
     keepVerificationStatus = false
 ): Promise<void> {
@@ -31,9 +31,9 @@ export async function refreshAccountAssetsForActiveProfile(
     }
 
     const assets: IPersistedAsset[] = []
-    const accounts = get(activeAccounts)
-    for (const account of accounts) {
-        const tokens = account?.balances?.nativeTokens ?? []
+    const wallets = get(activeWallets)
+    for (const wallet of wallets) {
+        const tokens = wallet?.balances?.nativeTokens ?? []
         for (const token of tokens) {
             try {
                 const persistedAsset = await getOrRequestAssetFromPersistedAssets(token.tokenId)
diff --git a/packages/shared/lib/core/wallet/actions/setClientOptions.ts b/packages/shared/lib/core/wallet/actions/setClientOptions.ts
index c28e655fe86..dfdda355d3c 100644
--- a/packages/shared/lib/core/wallet/actions/setClientOptions.ts
+++ b/packages/shared/lib/core/wallet/actions/setClientOptions.ts
@@ -3,5 +3,6 @@ import { getSelectedWallet } from '../stores'
 
 export async function setClientOptions(clientOptions: Partial<ClientOptions>): Promise<void> {
     const wallet = getSelectedWallet();
+    
     await wallet.setClientOptions(clientOptions)
 }
diff --git a/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts b/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts
index 2422d731cbd..97611fcec00 100644
--- a/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts
+++ b/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts
@@ -2,7 +2,6 @@ import { get } from 'svelte/store'
 import { selectedWallet } from '../stores/selected-wallet.store'
 
 export async function setStrongholdPassword(password: string): Promise<void> {
-    console.log(password)
     const wallet = get(selectedWallet)
     // Otherwise error is thrown, if password is still present in memory
     await wallet?.clearStrongholdPassword()
diff --git a/packages/shared/lib/core/wallet/enums/subject.enum.ts b/packages/shared/lib/core/wallet/enums/subject.enum.ts
index f664f25e6fd..1ca8304f6ae 100644
--- a/packages/shared/lib/core/wallet/enums/subject.enum.ts
+++ b/packages/shared/lib/core/wallet/enums/subject.enum.ts
@@ -1,4 +1,4 @@
 export enum SubjectType {
-    Account = 'account', // TODO(2.0) This should be Wallet?
+    Wallet = 'wallet', // TODO(2.0) This should be Wallet?
     Address = 'address',
 }
diff --git a/packages/shared/lib/core/wallet/interfaces/wallet-subject.interface.ts b/packages/shared/lib/core/wallet/interfaces/wallet-subject.interface.ts
index 3a5a64f0e1a..d171b8e00f5 100644
--- a/packages/shared/lib/core/wallet/interfaces/wallet-subject.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wallet-subject.interface.ts
@@ -1,7 +1,7 @@
 import { IWalletState } from '@core/wallet/interfaces'
 import { SubjectType } from '../enums'
 
-export interface IAccountSubject {
-    type: SubjectType.Account
-    account: IWalletState
+export interface IWalletSubject {
+    type: SubjectType.Wallet
+    wallet: IWalletState
 }
diff --git a/packages/shared/lib/core/wallet/stores/selected-wallet-activities.store.ts b/packages/shared/lib/core/wallet/stores/selected-wallet-activities.store.ts
index 117c125e025..6ad7af83d0c 100644
--- a/packages/shared/lib/core/wallet/stores/selected-wallet-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/selected-wallet-activities.store.ts
@@ -78,8 +78,8 @@ function getFieldsToSearchFromActivity(activity: Activity): string[] {
         fieldsToSearch.push(getFormattedAmountFromActivity(activity, false)?.toLowerCase())
     }
 
-    if (activity.subject?.type === SubjectType.Account) {
-        fieldsToSearch.push(activity.subject?.account?.name)
+    if (activity.subject?.type === SubjectType.Wallet) {
+        fieldsToSearch.push(activity.subject?.wallet?.name)
     } else if (activity.subject?.type === SubjectType.Address) {
         fieldsToSearch.push(activity.subject?.address)
     }
diff --git a/packages/shared/lib/core/wallet/types/subject.type.ts b/packages/shared/lib/core/wallet/types/subject.type.ts
index c7a77317880..649495f7551 100644
--- a/packages/shared/lib/core/wallet/types/subject.type.ts
+++ b/packages/shared/lib/core/wallet/types/subject.type.ts
@@ -1,3 +1,3 @@
-import { IAccountSubject, IAddressSubject } from '../interfaces'
+import { IWalletSubject, IAddressSubject } from '../interfaces'
 
-export type Subject = IAccountSubject | IAddressSubject
+export type Subject = IWalletSubject | IAddressSubject
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSubjectFromActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSubjectFromActivity.ts
index 25f0b3b69b9..0fab008e8dd 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSubjectFromActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSubjectFromActivity.ts
@@ -27,8 +27,8 @@ export function getSubjectLocaleFromActivity(activity: Activity): string {
         return localize('general.shimmerGenesis')
     } else if (activity.type === ActivityType.Vesting) {
         return localize('general.stardustGenesis')
-    } else if (subject?.type === SubjectType.Account) {
-        return truncateString(subject?.account?.name, 13, 0)
+    } else if (subject?.type === SubjectType.Wallet) {
+        return truncateString(subject?.wallet?.name, 13, 0)
     } else if (subject?.type === SubjectType.Address) {
         const address = activity?.parsedLayer2Metadata?.ethereumAddress ?? subject?.address
         const network = getLayer2NetworkFromAddress(address)
diff --git a/packages/shared/lib/core/wallet/utils/getIrc30MetadataFromFoundryOutput.ts b/packages/shared/lib/core/wallet/utils/getIrc30MetadataFromFoundryOutput.ts
index dd5958d6ebd..7bf0c7b0d1a 100644
--- a/packages/shared/lib/core/wallet/utils/getIrc30MetadataFromFoundryOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/getIrc30MetadataFromFoundryOutput.ts
@@ -3,11 +3,11 @@ import { get } from 'svelte/store'
 import { Converter } from '@core/utils'
 import { validateIrc30Metadata } from './validateIrc30Metadata'
 import { getMetadataFromFoundryOutput } from './getMetadataFromFoundryOutput'
-import { activeAccounts } from '@core/profile'
+import { activeWallets } from '@core/profile'
 
 export async function getIrc30MetadataFromFoundryOutput(tokenId: string): Promise<IIrc30Metadata | undefined> {
     try {
-        const foundry = await get(activeAccounts)?.[0]?.getFoundryOutput(tokenId)
+        const foundry = await get(activeWallets)?.[0]?.getFoundryOutput(tokenId)
         const data = getMetadataFromFoundryOutput(foundry)
         if (data) {
             const metadata = JSON.parse(Converter.hexToUtf8(data))
diff --git a/packages/shared/lib/core/wallet/utils/getSubjectFromAddress.ts b/packages/shared/lib/core/wallet/utils/getSubjectFromAddress.ts
index 0bef3df6576..c0a146ad6a5 100644
--- a/packages/shared/lib/core/wallet/utils/getSubjectFromAddress.ts
+++ b/packages/shared/lib/core/wallet/utils/getSubjectFromAddress.ts
@@ -1,11 +1,11 @@
-import { findActiveAccountWithAddress } from '@core/profile'
+import { findActiveWalletWithAddress } from '@core/profile'
 import { Subject } from '../types'
 import { SubjectType } from '../enums'
 
 export function getSubjectFromAddress(address: string): Subject {
-    const account = findActiveAccountWithAddress(address)
+    const account = findActiveWalletWithAddress(address)
     if (account) {
-        return { type: SubjectType.Account, account: account }
+        return { type: SubjectType.Wallet, wallet: account }
     } else {
         return { type: SubjectType.Address, address }
     }
diff --git a/packages/shared/lib/core/wallet/utils/isSubjectInternal.ts b/packages/shared/lib/core/wallet/utils/isSubjectInternal.ts
index f700a83cf02..68d673e069a 100644
--- a/packages/shared/lib/core/wallet/utils/isSubjectInternal.ts
+++ b/packages/shared/lib/core/wallet/utils/isSubjectInternal.ts
@@ -2,5 +2,5 @@ import { SubjectType } from '../enums'
 import { Subject } from '../types'
 
 export function isSubjectInternal(subject: Subject | undefined): boolean {
-    return subject?.type === SubjectType.Account
+    return subject?.type === SubjectType.Wallet
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts
index 18b7919e449..ee88a230cbe 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts
@@ -1,12 +1,12 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
-import { Output, OutputType, RegularTransactionEssence, Transaction, UTXOInput } from '@iota/sdk/out/types'
+import { Output, OutputType, RegularTransactionEssence, 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'
 
 export async function preprocessOutgoingTransaction(
-    transaction: Transaction,
+    transaction: TransactionWithMetadata,
     account: IWalletState
 ): Promise<IProcessedTransaction> {
     const regularTransactionEssence = transaction.payload.essence as RegularTransactionEssence
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
index 0008200935c..2a2b4e09553 100644
--- a/packages/shared/locales/en.json
+++ b/packages/shared/locales/en.json
@@ -1461,9 +1461,8 @@
         "sendNftToAddress": "Send NFT to an address",
         "scanQrOrPaste": "Scan a QR code or paste an Address",
         "moveFundsBetweenAccounts": "Move funds between wallets",
-        "manageAccount": "Manage Wallet",
+        "manageWallet": "Manage Wallet",
         "customizeAcount": "Customize your wallet",
-        "account": "Wallet",
         "sendingToAddress": "Sending to address",
         "amount": "Amount",
         "addAddress": "Add Address",
@@ -1504,7 +1503,7 @@
         "dev": "Dev",
         "createWallet": "Create a Wallet",
         "addAWallet": "Add a wallet",
-        "accountName": "Wallet name",
+        "walletName": "Wallet name",
         "latestTransactions": "Latest Transactions",
         "transactions": "Transactions",
         "activity": "Activity",