- {#if features?.wallet?.accountSummary?.enabled}
-
+ {#if features?.wallet?.walletSummary?.enabled}
+
{/if}
@@ -31,7 +31,7 @@
{#if features?.wallet?.activityHistory?.enabled}
-
+
{/if}
diff --git a/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte b/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
index ca735cb4d2d..90455196fe2 100644
--- a/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
+++ b/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
@@ -43,7 +43,7 @@
updateOnboardingProfile({ clientOptions: { nodes: [node], primaryNode: node } })
await initialiseOnboardingProfile(true)
- // The API request to check if a node is reachable requires an existing account manager.
+ // The API request to check if a node is reachable requires an existing wallet manager.
const nodeInfoResponse = await getNodeInfo(node.url)
// Check network of node matches selected id
if (
diff --git a/packages/shared/components/inputs/RecipientInput.svelte b/packages/shared/components/inputs/RecipientInput.svelte
index 80498e5143c..dba8f10260b 100644
--- a/packages/shared/components/inputs/RecipientInput.svelte
+++ b/packages/shared/components/inputs/RecipientInput.svelte
@@ -7,6 +7,7 @@
import { Layer1RecipientError } from '@core/layer-2/errors'
import { getNetworkHrp, getWalletColorById, visibleActiveWallets } from '@core/profile'
import { selectedWalletId } from '@core/wallet/stores'
+ import { SubjectType } from 'shared/lib/core/wallet'
export let recipient: Subject
export let disabled = false
@@ -17,11 +18,11 @@
let error: string
let selected: IOption =
- recipient?.type === 'account'
- ? { key: recipient.account.name, value: recipient.account.depositAddress }
+ recipient?.type === SubjectType.Wallet
+ ? { key: recipient.wallet.name, value: recipient.wallet.depositAddress }
: { value: recipient?.address }
- $: accountOptions = isLayer2 ?
[] : getLayer1AccountOptions()
+ $: walletOptions = isLayer2 ? [] : getLayer1WalletOptions()
$: recipient = getSubjectFromAddress(selected?.value)
$: isLayer2, (error = '')
@@ -37,7 +38,7 @@
} else {
validateBech32Address(getNetworkHrp(), recipient?.address)
}
- } else if (recipient?.type === 'account') {
+ } else if (recipient?.type === SubjectType.Wallet) {
if (isLayer2) {
throw new Layer1RecipientError()
}
@@ -52,7 +53,7 @@
}
}
- function getLayer1AccountOptions(): IOption[] {
+ function getLayer1WalletOptions(): IOption[] {
return $visibleActiveWallets
.filter((wallet) => wallet.id !== $selectedWalletId)
.map((wallet) => ({
@@ -70,7 +71,7 @@
bind:modal
bind:error
{disabled}
- options={accountOptions}
+ options={walletOptions}
pickerHeight="max-h-48"
{...$$restProps}
let:option
diff --git a/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte b/packages/shared/components/menu-items/ToggleHiddenWalletMenuItem.svelte
similarity index 71%
rename from packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte
rename to packages/shared/components/menu-items/ToggleHiddenWalletMenuItem.svelte
index d80cffac866..a2a3b5c69e7 100644
--- a/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte
+++ b/packages/shared/components/menu-items/ToggleHiddenWalletMenuItem.svelte
@@ -7,24 +7,24 @@
export let onClick: () => unknown
- function onShowAccountClick(): void {
+ function onShowWalletClick(): void {
if ($selectedWallet) {
updateActiveWalletPersistedData($selectedWallet.id, { hidden: false })
onClick && onClick()
}
}
- function onHideAccountClick(): void {
+ function onHideWalletClick(): void {
if ($nonHiddenActiveWallets.length > 1) {
if ($selectedWallet) {
updateActiveWalletPersistedData($selectedWallet.id, { hidden: true })
- if (!$activeProfile.showHiddenAccounts) {
+ if (!$activeProfile.showHiddenWallets) {
setNextSelectedWallet()
}
onClick && onClick()
}
} else {
- console.error('Not enough accounts visible: ', $nonHiddenActiveWallets.length)
+ console.error('Not enough wallets visible: ', $nonHiddenActiveWallets.length)
}
}
@@ -32,8 +32,8 @@
{#if $selectedWallet}