Merge branch 'develop' into chore/remove-evm-gas-price-poll

bloomwalletio · Apr 29, 2024 · 7ebe148 · 7ebe148
2 parents b5e4f45 + 196a43e
commit 7ebe148
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 9 deletions.
diff --git a/packages/desktop/components/menus/CollectibleDetailsMenu.svelte b/packages/desktop/components/menus/CollectibleDetailsMenu.svelte
@@ -4,9 +4,10 @@
     import { localize } from '@core/i18n'
     import { isEvmNetwork } from '@core/network'
     import { IIrc27Nft, Nft, getPrimaryNftUrl, isNftLocked, isValidNftUri } from '@core/nfts'
-    import { updateNftInAllAccountNfts } from '@core/nfts/actions'
+    import { addNftsToDownloadQueue, updateNftInAllAccountNfts } from '@core/nfts/actions'
     import { updatePersistedNft } from '@core/nfts/stores'
     import { activeProfile, updateActiveProfile } from '@core/profile/stores'
+    import { Platform } from '@core/app'
 
     export let menu: Menu | undefined = undefined
     export let nft: Nft
@@ -29,6 +30,17 @@
         menu?.close()
     }
 
+    async function onRefreshClick(): Promise<void> {
+        if (nft.downloadMetadata?.filePath) {
+            await Platform.deleteFile(nft.downloadMetadata?.filePath)
+        }
+
+        updatePersistedNft(nft.id, { downloadMetadata: {} })
+        updateNftInAllAccountNfts(nft.id, { downloadMetadata: {}, isLoaded: false })
+        addNftsToDownloadQueue([nft])
+        menu?.close()
+    }
+
     function onHideClick(): void {
         updatePersistedNft(nft.id, { hidden: !nft.hidden })
         updateNftInAllAccountNfts(nft.id, { hidden: !nft.hidden })
@@ -56,6 +68,11 @@
                 disabled: !isValidNftUri(nft.mediaUrl),
                 onClick: onOpenMediaClick,
             },
+            {
+                icon: IconName.Refresh,
+                title: localize('views.collectibles.details.menu.refresh'),
+                onClick: () => void onRefreshClick(),
+            },
             {
                 icon: nft.hidden ? IconName.Eye : IconName.EyeOff,
                 title: localize(`views.collectibles.details.menu.${nft.hidden ? 'unhide' : 'hide'}`),

diff --git a/packages/desktop/views/settings/views/collectibles/DownloadNftPermissions.svelte b/packages/desktop/views/settings/views/collectibles/DownloadNftPermissions.svelte
@@ -12,10 +12,10 @@
             value: DownloadPermission.All,
             label: localize('views.settings.downloadNftPermissions.all'),
         },
-        // {
-        //     value: DownloadPermission.AllExceptDenylist,
-        //     label: localize('views.settings.downloadNftPermissions.allExceptDenylist'),
-        // },
+        {
+            value: DownloadPermission.AllExceptDenylist,
+            label: localize('views.settings.downloadNftPermissions.allExceptDenylist'),
+        },
         {
             value: DownloadPermission.AllowListOnly,
             label: localize('views.settings.downloadNftPermissions.allowListOnly'),

diff --git a/packages/shared/src/lib/core/nfts/utils/checkIfNftShouldBeDownloaded.ts b/packages/shared/src/lib/core/nfts/utils/checkIfNftShouldBeDownloaded.ts
@@ -49,7 +49,6 @@ export async function checkIfNftShouldBeDownloaded(
 
         if (!skipDownloadSettingsCheck) {
             const nftSettings = getActiveProfile()?.settings?.nfts ?? {}
-            // TODO: Implement deny list
             switch (nftSettings.downloadPermissions) {
                 case DownloadPermission.None:
                     downloadMetadata.warning = { type: DownloadWarningType.DownloadNotAllowed }
@@ -59,20 +58,31 @@ export async function checkIfNftShouldBeDownloaded(
                     const remoteAllowlist = get(appParameters).allowlists.urls
                     const allowlist = [...remoteAllowlist, ...knownGateways]
                     const mediaUrl = new URL(nft.mediaUrl)
-                    const startsWithAllowedGateways =
+                    const startsWithAllowedGateway =
                         mediaUrl.protocol === 'ipfs:' ||
                         (mediaUrl.protocol === 'https:' &&
                             allowlist.some((allowedUrl) => {
                                 const url = new URL(allowedUrl)
                                 return mediaUrl.origin === url.origin
                             }))
-                    if (!startsWithAllowedGateways) {
+                    if (!startsWithAllowedGateway) {
+                        downloadMetadata.warning = { type: DownloadWarningType.DownloadNotAllowed }
+                        return { shouldDownload: false, isLoaded: false, downloadMetadata }
+                    }
+                    break
+                }
+                case DownloadPermission.AllExceptDenylist: {
+                    const denylist = get(appParameters).denylists.urls
+                    const mediaUrl = new URL(nft.mediaUrl)
+                    const startsWithDeniedGateway = denylist.some((blockedUrl) => {
+                        return mediaUrl.origin.includes(blockedUrl)
+                    })
+                    if (startsWithDeniedGateway) {
                         downloadMetadata.warning = { type: DownloadWarningType.DownloadNotAllowed }
                         return { shouldDownload: false, isLoaded: false, downloadMetadata }
                     }
                     break
                 }
-                case DownloadPermission.AllExceptDenylist:
                 case DownloadPermission.All:
                     break
             }

diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json
@@ -665,6 +665,7 @@
                     "loadMedia": "Load media in wallet",
                     "unsetPfp": "Unset NFT profile pic",
                     "view": "View media in browser",
+                    "refresh": "Refresh NFT",
                     "hide": "Hide NFT",
                     "unhide": "Unhide NFT",
                     "burn": "Burn NFT"