Merge remote-tracking branch 'origin/develop' into chore/rename-selec…

…ted-chain-to-selected-network
bloomwalletio · May 2, 2024 · 0a95863 · 0a95863
2 parents f863c44 + d2aa87d
commit 0a95863
Show file tree

Hide file tree

Showing 51 changed files with 227 additions and 243 deletions.
diff --git a/packages/desktop/components/menus/CollectibleDetailsMenu.svelte b/packages/desktop/components/menus/CollectibleDetailsMenu.svelte
@@ -4,8 +4,8 @@
     import { localize } from '@core/i18n'
     import { isEvmNetwork } from '@core/network'
     import { IIrc27Nft, Nft, getPrimaryNftUrl, isNftLocked, isValidNftUri } from '@core/nfts'
-    import { addNftsToDownloadQueue, updateNftInAllAccountNfts } from '@core/nfts/actions'
-    import { updatePersistedNft } from '@core/nfts/stores'
+    import { addNftsToDownloadQueue } from '@core/nfts/actions'
+    import { updateNftForAllAccounts, updatePersistedNft } from '@core/nfts/stores'
     import { activeProfile, updateActiveProfile } from '@core/profile/stores'
     import { Platform } from '@core/app'
 
@@ -36,14 +36,14 @@
         }
 
         updatePersistedNft(nft.id, { downloadMetadata: {} })
-        updateNftInAllAccountNfts(nft.id, { downloadMetadata: {}, isLoaded: false })
+        updateNftForAllAccounts({ id: nft.id, downloadMetadata: {}, isLoaded: false })
         addNftsToDownloadQueue([nft])
         menu?.close()
     }
 
     function onHideClick(): void {
         updatePersistedNft(nft.id, { hidden: !nft.hidden })
-        updateNftInAllAccountNfts(nft.id, { hidden: !nft.hidden })
+        updateNftForAllAccounts({ id: nft.id, hidden: !nft.hidden })
         menu?.close()
     }
 

diff --git a/packages/desktop/components/popup/popups/EvmActivityDetailsPopup.svelte b/packages/desktop/components/popup/popups/EvmActivityDetailsPopup.svelte
@@ -8,9 +8,8 @@
     import { ExplorerEndpoint } from '@core/network'
     import { getDefaultExplorerUrl } from '@core/network/utils'
     import { NftStandard } from '@core/nfts'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
     import { Nft } from '@core/nfts/interfaces'
-    import { ownedNfts, selectedNftId } from '@core/nfts/stores'
+    import { ownedNfts, selectedNftId, getNftByIdForAccount } from '@core/nfts/stores'
     import { CollectiblesRoute, DashboardRoute, collectiblesRouter, dashboardRouter } from '@core/router'
     import { getTokenFromSelectedAccountTokens } from '@core/token/stores'
     import { buildUrl, setClipboard, truncateString } from '@core/utils'
@@ -45,7 +44,7 @@
                 _activity.tokenTransfer.standard === NftStandard.Erc721 ||
                 _activity.tokenTransfer.standard === NftStandard.Irc27
             ) {
-                return getNftByIdFromAllAccountNfts($selectedAccountIndex, _activity.tokenTransfer.tokenId) as Nft
+                return getNftByIdForAccount($selectedAccountIndex, _activity.tokenTransfer.tokenId)
             }
         }
     }
@@ -62,7 +61,7 @@
             const { tokenId, rawAmount, standard } = _activity.tokenTransfer
             if (standard === NftStandard.Erc721 || standard === NftStandard.Irc27) {
                 return {
-                    nft: getNftByIdFromAllAccountNfts($selectedAccountIndex, _activity.tokenTransfer.tokenId) as Nft,
+                    nft: getNftByIdForAccount($selectedAccountIndex, _activity.tokenTransfer.tokenId) as Nft,
                 }
             } else {
                 const token = getTokenFromSelectedAccountTokens(tokenId, _activity.sourceNetworkId)

diff --git a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
@@ -20,7 +20,6 @@
     import { getTransferInfoFromTransactionData } from '@core/layer-2/utils/getTransferInfoFromTransactionData'
     import { TokenTransferData } from '@core/wallet'
     import { Nft } from '@core/nfts'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
     import { Alert, Link, Table, Text } from '@bloomwalletio/ui'
     import { PopupId, closePopup, modifyPopupState, openPopup } from '@desktop/auxiliary/popup'
     import { buildUrl, truncateString } from '@core/utils'
@@ -33,6 +32,7 @@
     import { LegacyTransaction } from '@ethereumjs/tx'
     import { getActiveProfileId } from '@core/profile/stores'
     import { IAccountState } from '@core/account'
+    import { getNftByIdForAccount } from '@core/nfts/stores'
 
     export let preparedTransaction: EvmTransactionData
     export let evmNetwork: IEvmNetwork
@@ -77,7 +77,7 @@
                 break
             }
             case StardustActivityType.Nft: {
-                nft = getNftByIdFromAllAccountNfts($selectedAccount.index, transferInfo.nftId)
+                nft = getNftByIdForAccount($selectedAccount.index, transferInfo.nftId)
                 break
             }
             case StardustActivityType.SmartContract: {

diff --git a/packages/desktop/components/popup/popups/ImportErc721TokenFormPopup.svelte b/packages/desktop/components/popup/popups/ImportErc721TokenFormPopup.svelte
@@ -7,17 +7,13 @@
     import PopupTemplate from '../PopupTemplate.svelte'
     import { closePopup } from '@desktop/auxiliary/popup'
     import { showNotification } from '@auxiliary/notification'
-    import {
-        addNftsToDownloadQueue,
-        addNewTrackedNftToActiveProfile,
-        persistErc721Nft,
-        updateAllAccountNftsForAccount,
-    } from '@core/nfts/actions'
+    import { addNftsToDownloadQueue, addNewTrackedNftToActiveProfile, persistErc721Nft } from '@core/nfts/actions'
     import { buildNftFromPersistedErc721Nft } from '@core/nfts/utils'
     import { activeAccounts } from '@core/profile/stores'
     import { getAddressFromAccountForNetwork } from '@core/account'
     import { TokenTrackingStatus } from '@core/token'
     import { selectedAccount } from '@core/account/stores'
+    import { addOrUpdateNftForAccount } from '@core/nfts/stores'
 
     let busy = false
 
@@ -46,7 +42,7 @@
             for (const account of $activeAccounts) {
                 const l2Address = getAddressFromAccountForNetwork(account, networkId)
                 const nft = buildNftFromPersistedErc721Nft(persistedNft, l2Address)
-                updateAllAccountNftsForAccount(account.index, nft)
+                addOrUpdateNftForAccount(account.index, nft)
                 void addNftsToDownloadQueue([nft])
             }
 

diff --git a/packages/desktop/components/popup/popups/StardustActivityDetailsPopup.svelte b/packages/desktop/components/popup/popups/StardustActivityDetailsPopup.svelte
@@ -13,8 +13,7 @@
     import { localize } from '@core/i18n'
     import { ExplorerEndpoint } from '@core/network'
     import { getDefaultExplorerUrl } from '@core/network/utils'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
-    import { ownedNfts, selectedNftId } from '@core/nfts/stores'
+    import { getNftByIdForAccount, ownedNfts, selectedNftId } from '@core/nfts/stores'
     import { CollectiblesRoute, DashboardRoute, collectiblesRouter, dashboardRouter } from '@core/router'
     import { buildUrl, setClipboard, truncateString } from '@core/utils'
     import { claimActivity, rejectActivity } from '@core/wallet'
@@ -34,7 +33,7 @@
     $: transactionAssets = getTransactionAssets(activity, $selectedAccountIndex)
     $: nft =
         activity.type === StardustActivityType.Nft
-            ? getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+            ? getNftByIdForAccount($selectedAccountIndex, activity.nftId)
             : undefined
     $: nftIsOwned = nft ? $ownedNfts.some((_nft) => _nft.id === nft?.id) : false
 

diff --git a/packages/desktop/views/dashboard/campaigns/views/CampaignDetailsView.svelte b/packages/desktop/views/dashboard/campaigns/views/CampaignDetailsView.svelte
@@ -11,9 +11,9 @@
     import { handleError } from '@core/error/handlers'
     import { EvmNetworkId, NetworkNamespace, getEvmNetwork } from '@core/network'
     import { buildNftFromPersistedErc721Nft } from '@core/nfts'
-    import { addNftsToDownloadQueue, updateAllAccountNftsForAccount } from '@core/nfts/actions'
+    import { addNftsToDownloadQueue } from '@core/nfts/actions'
     import { persistErc721Nft } from '@core/nfts/actions/persistErc721Nft'
-    import { ownedNfts } from '@core/nfts/stores'
+    import { addOrUpdateNftForAccount, ownedNfts } from '@core/nfts/stores'
     import { TideApi } from '@core/tide/apis'
     import { onDestroy, onMount } from 'svelte'
     import Leaderboard from '../components/Leaderboard.svelte'
@@ -79,7 +79,7 @@
             if (persistedNft) {
                 const nft = buildNftFromPersistedErc721Nft(persistedNft, accountAddress)
                 void addNftsToDownloadQueue([nft])
-                updateAllAccountNftsForAccount(index, nft)
+                addOrUpdateNftForAccount(index, nft)
             }
         } catch (_) {
             // Switching account too swiftly results in an error from persistErc721Nft.

diff --git a/packages/desktop/views/dashboard/collectibles/components/NftMediaAlert.svelte b/packages/desktop/views/dashboard/collectibles/components/NftMediaAlert.svelte
@@ -2,8 +2,9 @@
     import { DownloadErrorType, DownloadWarningType, IDownloadMetadata, Nft, NftDownloadOptions } from '@core/nfts'
     import { Alert, Link, Text } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
-    import { addNftsToDownloadQueue, updateNftInAllAccountNfts } from '@core/nfts/actions'
+    import { addNftsToDownloadQueue } from '@core/nfts/actions'
     import { getFormattedFileSize } from '@core/utils'
+    import { updateNftForAllAccounts } from '@core/nfts/stores'
 
     export let type: DownloadErrorType | DownloadWarningType | undefined
     export let message: string | undefined
@@ -54,7 +55,8 @@
                 break
         }
 
-        updateNftInAllAccountNfts(nft.id, {
+        updateNftForAllAccounts({
+            id: nft.id,
             isLoaded: false,
             downloadMetadata: { ...nft.downloadMetadata, warning: undefined, error: undefined },
         })

diff --git a/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte b/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte
@@ -1,9 +1,14 @@
 <script lang="ts">
     import { Pane } from '@ui'
     import { Collection, Nft } from '@core/nfts/interfaces'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
     import { NftStandard } from '@core/nfts/enums'
-    import { allAccountNfts, selectedAccountCollections, selectedCollectionId, selectedNftId } from '@core/nfts/stores'
+    import {
+        activeProfileNftsPerAccount,
+        getNftByIdForAccount,
+        selectedAccountCollections,
+        selectedCollectionId,
+        selectedNftId,
+    } from '@core/nfts/stores'
     import { selectedAccountIndex } from '@core/account/stores'
     import { CollectionDetails, Erc721CollectibleDetails, Irc27CollectibleDetails } from '../components'
     import { time } from '@core/app/stores'
@@ -12,10 +17,10 @@
 
     let nft: Nft | undefined
     let collection: Collection | undefined
-    $: $allAccountNfts, (nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, $selectedNftId))
+    $: $activeProfileNftsPerAccount, (nft = getNftByIdForAccount($selectedAccountIndex, $selectedNftId))
     $: collection = $selectedCollectionId ? $selectedAccountCollections[$selectedCollectionId] : undefined
 
-    $: returnIfNftWasSent($allAccountNfts[$selectedAccountIndex], $time)
+    $: returnIfNftWasSent($activeProfileNftsPerAccount[$selectedAccountIndex], $time)
 
     function returnIfNftWasSent(ownedNfts: Nft[], currentTime: Date): void {
         if (!nft) return

diff --git a/...sktop/views/dashboard/wallet/tab-section/activity/components/AssetPillsForActivity.svelte b/...sktop/views/dashboard/wallet/tab-section/activity/components/AssetPillsForActivity.svelte
@@ -4,11 +4,11 @@
     import { Activity, StardustActivityType, isEvmTokenActivity } from '@core/activity'
     import { getTokenFromActivity } from '@core/activity/utils/getTokenFromActivity'
     import { BASE_TOKEN_ID } from '@core/token'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
+    import { getNftByIdForAccount } from '@core/nfts/stores'
     import { selectedAccountIndex } from '@core/account/stores'
     import { NetworkNamespace } from '@core/network/enums'
     import { EvmActivityType } from '@core/activity/enums/evm'
-    import { NftStandard } from '@core/nfts'
+    import { NftStandard } from '@core/nfts/enums'
     import { convertCamelCaseToPhrase } from '@core/utils/string'
 
     export let activity: Activity
@@ -29,7 +29,7 @@
                     standardPill = ''
                 }
             } else if (activity.type === StardustActivityType.Nft) {
-                const nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+                const nft = getNftByIdForAccount($selectedAccountIndex, activity.nftId)
                 standardPill = nft?.standard ?? ''
                 typePill = 'nft'
             } else if (activity.type === StardustActivityType.Alias) {

diff --git a/...dashboard/wallet/tab-section/activity/components/row-sections/ActivityAssetSection.svelte b/...dashboard/wallet/tab-section/activity/components/row-sections/ActivityAssetSection.svelte
@@ -15,10 +15,9 @@
     import { darkMode, time } from '@core/app/stores'
     import { localize } from '@core/i18n'
     import { NetworkNamespace } from '@core/network'
-    import { NftStandard } from '@core/nfts'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
+    import { NftStandard } from '@core/nfts/enums'
+    import { getNftByIdForAccount, selectedAccountNfts } from '@core/nfts/stores'
     import { Nft } from '@core/nfts/interfaces'
-    import { selectedAccountNfts } from '@core/nfts/stores'
     import { ITokenWithBalance } from '@core/token'
     import { selectedAccountTokens } from '@core/token/stores'
     import { GovernanceAvatar, NftAvatar, TokenAvatar } from '@ui'
@@ -47,10 +46,10 @@
                 activity.tokenTransfer.standard === NftStandard.Erc721 ||
                 activity.tokenTransfer.standard === NftStandard.Irc27
             ) {
-                return getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.tokenTransfer.tokenId)
+                return getNftByIdForAccount($selectedAccountIndex, activity.tokenTransfer.tokenId)
             }
         } else if (activity.namespace === NetworkNamespace.Stardust && activity.type === StardustActivityType.Nft) {
-            return getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+            return getNftByIdForAccount($selectedAccountIndex, activity.nftId)
         }
     }
 </script>

diff --git a/packages/desktop/views/settings/views/collectibles/DownloadNftPermissions.svelte b/packages/desktop/views/settings/views/collectibles/DownloadNftPermissions.svelte
@@ -4,7 +4,7 @@
     import { DownloadPermission } from '@core/nfts'
     import { activeProfile, updateActiveProfileSettings } from '@core/profile/stores'
     import SettingsSection from '../SettingsSection.svelte'
-    import { allAccountNfts } from '@core/nfts/stores'
+    import { getAllNftsForActiveProfile } from '@core/nfts/stores'
     import { addNftsToDownloadQueue } from '@core/nfts/actions'
 
     const options: IOption[] = [
@@ -40,7 +40,7 @@
             },
         })
 
-        const allNfts = $allAccountNfts.flatMap((nfts) => nfts)
+        const allNfts = getAllNftsForActiveProfile()
         await addNftsToDownloadQueue(allNfts)
     }
 </script>

diff --git a/packages/desktop/views/settings/views/collectibles/MaxMediaSize.svelte b/packages/desktop/views/settings/views/collectibles/MaxMediaSize.svelte
@@ -3,8 +3,8 @@
     import { Platform } from '@core/app'
     import { localize } from '@core/i18n'
     import { DownloadWarningType, Nft } from '@core/nfts'
-    import { addNftsToDownloadQueue, updateNftInAllAccountNfts } from '@core/nfts/actions'
-    import { persistedNftForActiveProfile, selectedAccountNfts } from '@core/nfts/stores'
+    import { addNftsToDownloadQueue } from '@core/nfts/actions'
+    import { persistedNftForActiveProfile, selectedAccountNfts, updateNftForAllAccounts } from '@core/nfts/stores'
     import { activeProfile, updateActiveProfileSettings } from '@core/profile/stores'
     import SettingsSection from '../SettingsSection.svelte'
 
@@ -69,7 +69,8 @@
                 }
 
                 await Platform.deleteFile(nft.downloadMetadata.filePath)
-                updateNftInAllAccountNfts(nft.id, {
+                updateNftForAllAccounts({
+                    id: nft.id,
                     isLoaded: false,
                     downloadMetadata: {
                         ...nft.downloadMetadata,

diff --git a/packages/desktop/views/settings/views/collectibles/RefreshNftMedia.svelte b/packages/desktop/views/settings/views/collectibles/RefreshNftMedia.svelte
@@ -2,12 +2,8 @@
     import { Button } from '@bloomwalletio/ui'
     import { Platform } from '@core/app'
     import { localize } from '@core/i18n'
-    import {
-        addNftsToDownloadQueue,
-        stopDownloadingNftMediaFromQueue,
-        updateNftInAllAccountNfts,
-    } from '@core/nfts/actions'
-    import { selectedAccountNfts } from '@core/nfts/stores'
+    import { addNftsToDownloadQueue, stopDownloadingNftMediaFromQueue } from '@core/nfts/actions'
+    import { selectedAccountNfts, updateNftForAllAccounts } from '@core/nfts/stores'
     import { PopupId, closePopup, openPopup } from '@desktop/auxiliary/popup'
     import SettingsSection from '../SettingsSection.svelte'
 
@@ -34,7 +30,7 @@
             await Promise.all(
                 $selectedAccountNfts.map(async (nft) => {
                     await Platform.deleteFile(nft.downloadMetadata?.filePath)
-                    updateNftInAllAccountNfts(nft.id, { isLoaded: false })
+                    updateNftForAllAccounts({ id: nft.id, isLoaded: false })
                 })
             )
             void addNftsToDownloadQueue($selectedAccountNfts)

diff --git a/packages/shared/src/components/activities/evm/EvmActivityInformation.svelte b/packages/shared/src/components/activities/evm/EvmActivityInformation.svelte
@@ -4,7 +4,7 @@
     import { EvmActivity } from '@core/activity'
     import { EvmActivityType } from '@core/activity/enums/evm'
     import { Nft, NftStandard } from '@core/nfts'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
+    import { getNftByIdForAccount } from '@core/nfts/stores'
     import { KeyValue, NftMetadataTable, PopupTab, getTabItems } from '@ui'
     import { EvmGenericInformation, EvmSmartContractInformation } from './info'
     import { localize } from '@core/i18n'
@@ -27,7 +27,7 @@
                     activity.tokenTransfer.standard === NftStandard.Erc721 ||
                     activity.tokenTransfer.standard === NftStandard.Irc27
                 ) {
-                    nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.tokenTransfer.tokenId)
+                    nft = getNftByIdForAccount($selectedAccountIndex, activity.tokenTransfer.tokenId)
                     tabs = getTabItems([PopupTab.Transaction, PopupTab.NftMetadata])
                 } else {
                     tabs = getTabItems([PopupTab.Transaction])

diff --git a/packages/shared/src/components/activities/stardust/StardustActivityInformation.svelte b/packages/shared/src/components/activities/stardust/StardustActivityInformation.svelte
@@ -2,8 +2,8 @@
     import { Tabs } from '@bloomwalletio/ui'
     import { selectedAccountIndex } from '@core/account/stores'
     import { StardustActivity, StardustActivityType } from '@core/activity'
-    import { Nft } from '@core/nfts'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
+    import { Nft } from '@core/nfts/interfaces'
+    import { getNftByIdForAccount } from '@core/nfts/stores'
     import { TokenMetadata } from '@core/token'
     import { getPersistedToken } from '@core/token/stores'
     import { KeyValue, NftMetadataTable, PopupTab, TokenMetadataTable, getTabItems } from '@ui'
@@ -24,7 +24,7 @@
     $: {
         const storedNft =
             activity.type === StardustActivityType.Nft
-                ? getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+                ? getNftByIdForAccount($selectedAccountIndex, activity.nftId)
                 : undefined
         hasMetadata = !!storedNft?.metadata
     }
@@ -47,7 +47,7 @@
                     ...(hasMetadata ? [PopupTab.NftMetadata] : []),
                     ...(activity.smartContract ? [PopupTab.SmartContract] : []),
                 ])
-                nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+                nft = getNftByIdForAccount($selectedAccountIndex, activity.nftId)
                 break
             case StardustActivityType.Foundry:
                 tabs = getTabItems([PopupTab.Transaction, PopupTab.Foundry, PopupTab.Token])

diff --git a/packages/shared/src/components/activities/stardust/info/StardustNftInformation.svelte b/packages/shared/src/components/activities/stardust/info/StardustNftInformation.svelte
@@ -6,15 +6,15 @@
     import { localize } from '@core/i18n'
     import { ExplorerEndpoint } from '@core/network/enums'
     import { getDefaultExplorerUrl } from '@core/network/utils'
-    import { NftStandard } from '@core/nfts'
-    import { getNftByIdFromAllAccountNfts } from '@core/nfts/actions'
+    import { NftStandard } from '@core/nfts/enums'
+    import { getNftByIdForAccount } from '@core/nfts/stores'
     import { buildUrl } from '@core/utils'
     import { getBech32AddressFromAddressTypes, getHexAddressFromAddressTypes } from '@core/wallet'
     import { type Address, AddressType } from '@iota/sdk/out/types'
 
     export let activity: StardustNftActivity
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity?.nftId)
+    $: nft = getNftByIdForAccount($selectedAccountIndex, activity?.nftId)
     $: issuer = nft?.standard === NftStandard.Irc27 ? nft?.issuer : undefined
 
     function onNftIdClick(nftId: string) {