Migrate / rename: PortfolioAccountId → AccountId

src/components/AccountIdResolver.svelte

@@ -1,8 +1,9 @@
 <script lang="ts">
+	// Constants/types
 	import type { Ethereum } from '../data/networks/types'
 	import type { ENS } from '../api/ens'
 	import type { LensName } from '../api/lens'
-	import type { PortfolioAccountId } from '../state/portfolio-accounts'
+	import type { AccountId } from '../data/accountId'
 
 	import { NetworkProvider } from '../data/networkProviders/types'
 	import { getEthersProvider } from '../data/networkProviders'
@@ -14,7 +15,7 @@
 	export let network = networksByChainID[1]
 	export let providerName: NetworkProvider
 	export let provider: Ethereum.Provider
-	export let accountId: PortfolioAccountId
+	export let accountId: AccountId
 	export let passiveForwardResolution = false
 	export let passiveReverseResolution = false
 

src/components/Portfolio.svelte

@@ -8,12 +8,13 @@
 
 
 <script lang="ts">
+	import type { AccountId } from '../data/accountId'
 	import type { Ethereum } from '../data/networks/types'
 	import type { DefiProvider } from '../data/defiProviders'
 	import type { NotificationsProvider } from '../data/notificationsProvider'
 	import type { QuoteCurrency } from '../data/currencies'
 
-	import type { Portfolio, PortfolioAccountId } from '../state/portfolio-accounts'
+	import type { Portfolio } from '../state/portfolio-accounts'
 	import { defaultAccountNetworks, getNetworkColor, networksByChainID } from '../data/networks'
 
 	import { preferences } from '../state/preferences'
@@ -61,7 +62,7 @@
 		networks: Ethereum.Network[],
 	}) => {
 		const added = portfolio.addAccount({
-			id: id as PortfolioAccountId,
+			id: id as AccountId,
 			nickname,
 			networks,
 		})

src/data/accountId.ts

@@ -0,0 +1,6 @@
+import type { Ethereum } from '../data/networks/types'
+import type { ENS } from '../api/ens'
+import type { LensName } from '../api/lens'
+
+
+export type AccountId = Ethereum.Address | ENS.Name | LensName

src/routes/apps/_appsParams.ts

@@ -1,4 +1,4 @@
-import type { PortfolioAccountId } from '../../state/portfolio-accounts'
+import type { AccountId } from '../../data/accountId'
 
 
 import { derived, writable, type Readable } from 'svelte/store'
@@ -7,7 +7,7 @@ import { derived, writable, type Readable } from 'svelte/store'
 // Param stores
 
 export const web3AppSlug = writable('')
-export const accountId = writable<PortfolioAccountId | ''>('')
+export const accountId = writable<AccountId | ''>('')
 export const audiusQuery = writable('')
 export const audiusPlaylistId = writable('')
 export const audiusTrackId = writable('')

src/state/portfolio-accounts.ts

@@ -1,6 +1,5 @@
 import type { Ethereum } from '../data/networks/types'
-import type { ENS } from '../api/ens'
-import type { LensName } from '../api/lens'
+import type { AccountId } from '../data/accountId'
 
 
 import { memoized } from '../utils/memoized'
@@ -146,8 +145,6 @@ function getDefaultPortfolioAccountView(){
 // Local storage v4 'localPortfoliosV4'
 
 namespace V4 {
-	export type PortfolioAccountId = Ethereum.Address | ENS.Name | LensName
-
 	type PortfolioAccountView = {
 		chainId: Ethereum.ChainID,
 		showBalances: boolean,
@@ -193,7 +190,7 @@ namespace V4 {
 	})
 
 	export type PortfolioAccount = {
-		id: PortfolioAccountId,
+		id: AccountId,
 		nickname: string,
 		views: PortfolioAccountView[],
 		showFeed: boolean,
@@ -203,7 +200,7 @@ namespace V4 {
 	}
 
 	type SerializedPortfolioAccount = {
-		id: PortfolioAccountId,
+		id: AccountId,
 		nickname: string,
 		views: SerializedPortfolioAccountView[],
 		showFeed: boolean,
@@ -248,7 +245,7 @@ namespace V4 {
 		name: string,
 		accounts: PortfolioAccount[],
 
-		addAccount: (_: { id: PortfolioAccountId, nickname: string, networks: Ethereum.Network[] }) => boolean,
+		addAccount: (_: { id: AccountId, nickname: string, networks: Ethereum.Network[] }) => boolean,
 		deleteAccount: (i: number) => PortfolioAccount,
 	}
 
@@ -310,7 +307,7 @@ const getLocalPortfoliosV4 = () => (
 			nickname,
 			networks,
 		}) => ({
-			id: id as V4.PortfolioAccountId,
+			id: id as AccountId,
 			nickname,
 			views: networks.filter(({ show }) => show).map(({
 				chainID,
@@ -337,7 +334,6 @@ const localPortfoliosV4 = localStorageWritable(
 
 export type Portfolio = V4.Portfolio
 export type PortfolioAccount = V4.PortfolioAccount
-export type PortfolioAccountId = V4.PortfolioAccountId
 
 export const createPortfolio = V4.createPortfolio