fix duplicated nft generation (#2394)

bloomwalletio · Apr 30, 2024 · 781747b · 781747b
1 parent 0c12d2a
commit 781747b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...re/nfts/actions/getPersistedErc721Nfts.ts → ...tions/getPersistedErc721NftsForNetwork.ts b/...re/nfts/actions/getPersistedErc721Nfts.ts → ...tions/getPersistedErc721NftsForNetwork.ts
@@ -3,12 +3,15 @@ import { getActiveProfile } from '@core/profile/stores'
 import { NftStandard } from '../enums'
 import { IPersistedErc721Nft } from '../interfaces'
 import { persistedNfts } from '../stores'
+import { NetworkId } from '@core/network'
 
-export function getPersistedErc721Nfts(): IPersistedErc721Nft[] {
+export function getPersistedErc721NftsForNetwork(networkId: NetworkId): IPersistedErc721Nft[] {
     const activeProfileId = getActiveProfile()?.id
     if (activeProfileId) {
         const profileNfts = Object.values(get(persistedNfts)[activeProfileId] ?? {})
-        return profileNfts.filter(({ standard }) => standard === NftStandard.Erc721) as IPersistedErc721Nft[]
+        return profileNfts.filter(
+            ({ standard, networkId: _networkId }) => standard === NftStandard.Erc721 && networkId === networkId
+        ) as IPersistedErc721Nft[]
     } else {
         throw new Error('Unable to get active profile')
     }

diff --git a/packages/shared/src/lib/core/nfts/actions/index.ts b/packages/shared/src/lib/core/nfts/actions/index.ts
@@ -4,7 +4,7 @@ export * from './buildNftFromNftOutput'
 export * from './checkForUntrackedNfts'
 export * from './downloadNextNftInQueue'
 export * from './getNftByIdFromAllAccountNfts'
-export * from './getPersistedErc721Nfts'
+export * from './getPersistedErc721NftsForNetwork'
 export * from './interruptNftDownloadAfterTimeout'
 export * from './isNftPersisted'
 export * from './loadNftsForActiveProfile'

diff --git a/packages/shared/src/lib/core/nfts/actions/loadNftsForActiveProfile.ts b/packages/shared/src/lib/core/nfts/actions/loadNftsForActiveProfile.ts
@@ -13,7 +13,7 @@ import { Nft } from '../interfaces'
 import { buildNftFromPersistedErc721Nft, getNftsFromNftIds } from '../utils'
 import { addNftsToDownloadQueue } from './addNftsToDownloadQueue'
 import { buildNftFromNftOutput } from './buildNftFromNftOutput'
-import { getPersistedErc721Nfts } from './getPersistedErc721Nfts'
+import { getPersistedErc721NftsForNetwork } from './getPersistedErc721NftsForNetwork'
 import { setAccountNftsInAllAccountNfts } from './setAccountNftsInAllAccountNfts'
 
 export async function loadNftsForActiveProfile(): Promise<void> {
@@ -70,7 +70,7 @@ export async function loadNftsForAccount(profileId: string, account: IAccountSta
         if (!evmAddress) {
             continue
         }
-        const erc721Nfts = getPersistedErc721Nfts()
+        const erc721Nfts = getPersistedErc721NftsForNetwork(evmNetwork.id)
         const convertedNfts: Nft[] = erc721Nfts.map((persistedErc721Nft) =>
             buildNftFromPersistedErc721Nft(persistedErc721Nft, evmAddress)
         )