Fix #8435: NFT images failing to show in Activity tab Send transactions

Sources/BraveWallet/Crypto/AssetIconView.swift

@@ -147,7 +147,10 @@ struct NFTIconView: View {
   }
 
   var body: some View {
-    NFTImageView(urlString: url?.absoluteString ?? "", isLoading: isLoadingMetadata) {
+    NFTImageView( // logo populated for auto-discovered NFTs
+      urlString: url?.absoluteString ?? token.logo,
+      isLoading: isLoadingMetadata
+    ) {
       LoadingNFTView(shimmer: false)
     }
     .cornerRadius(5)

Sources/BraveWallet/Crypto/Stores/AccountActivityStore.swift

@@ -304,6 +304,7 @@ class AccountActivityStore: ObservableObject, WalletObserverStore {
           userAssets: userAssets,
           allTokens: allTokens,
           assetRatios: assetRatios,
+          nftMetadata: [:],
           solEstimatedTxFee: solEstimatedTxFees[transaction.id],
           currencyFormatter: currencyFormatter
         )

Sources/BraveWallet/Crypto/Stores/AssetDetailStore.swift

@@ -376,6 +376,7 @@ class AssetDetailStore: ObservableObject, WalletObserverStore {
           userAssets: userAssets,
           allTokens: allTokens,
           assetRatios: assetRatios,
+          nftMetadata: [:],
           solEstimatedTxFee: solEstimatedTxFees[transaction.id],
           currencyFormatter: self.currencyFormatter
         )

Sources/BraveWallet/Crypto/Stores/CryptoStore.swift

@@ -190,6 +190,7 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
       blockchainRegistry: blockchainRegistry,
       txService: txService,
       solTxManagerProxy: solTxManagerProxy,
+      ipfsApi: ipfsApi,
       userAssetManager: userAssetManager
     )
     self.marketStore = .init(

Sources/BraveWallet/Crypto/Stores/TransactionConfirmationStore.swift

@@ -319,6 +319,7 @@ public class TransactionConfirmationStore: ObservableObject, WalletObserverStore
         userAssets: userAssets,
         allTokens: allTokens,
         assetRatios: assetRatios,
+        nftMetadata: [:],
         solEstimatedTxFee: solEstimatedTxFee,
         currencyFormatter: currencyFormatter
       ) else {

Sources/BraveWallet/Crypto/Stores/TransactionDetailsStore.swift

@@ -112,6 +112,7 @@ class TransactionDetailsStore: ObservableObject, WalletObserverStore {
         userAssets: userAssets,
         allTokens: allTokens,
         assetRatios: assetRatios,
+        nftMetadata: [:],
         solEstimatedTxFee: solEstimatedTxFee,
         currencyFormatter: currencyFormatter
       ) else {

Sources/BraveWallet/Crypto/Stores/TransactionsActivityStore.swift

@@ -31,6 +31,8 @@ class TransactionsActivityStore: ObservableObject, WalletObserverStore {
 
   private var solEstimatedTxFeesCache: [String: UInt64] = [:]
   private var assetPricesCache: [String: Double] = [:]
+  /// Cache of metadata for NFTs. The key is the token's `id`.
+  private var metadataCache: [String: NFTMetadata] = [:]
 
   private let keyringService: BraveWalletKeyringService
   private let rpcService: BraveWalletJsonRpcService
@@ -39,6 +41,7 @@ class TransactionsActivityStore: ObservableObject, WalletObserverStore {
   private let blockchainRegistry: BraveWalletBlockchainRegistry
   private let txService: BraveWalletTxService
   private let solTxManagerProxy: BraveWalletSolanaTxManagerProxy
+  private let ipfsApi: IpfsAPI
   private let assetManager: WalletUserAssetManagerType
   private var keyringServiceObserver: KeyringServiceObserver?
   private var txServiceObserver: TxServiceObserver?
@@ -56,6 +59,7 @@ class TransactionsActivityStore: ObservableObject, WalletObserverStore {
     blockchainRegistry: BraveWalletBlockchainRegistry,
     txService: BraveWalletTxService,
     solTxManagerProxy: BraveWalletSolanaTxManagerProxy,
+    ipfsApi: IpfsAPI,
     userAssetManager: WalletUserAssetManagerType
   ) {
     self.keyringService = keyringService
@@ -65,6 +69,7 @@ class TransactionsActivityStore: ObservableObject, WalletObserverStore {
     self.blockchainRegistry = blockchainRegistry
     self.txService = txService
     self.solTxManagerProxy = solTxManagerProxy
+    self.ipfsApi = ipfsApi
     self.assetManager = userAssetManager
 
     self.setupObservers()
@@ -154,6 +159,7 @@ class TransactionsActivityStore: ObservableObject, WalletObserverStore {
         userAssets: userAssets,
         allTokens: allTokens,
         assetRatios: assetPricesCache,
+        nftMetadata: metadataCache,
         solEstimatedTxFees: solEstimatedTxFeesCache
       )
       guard !self.transactionSections.isEmpty else { return }
@@ -174,6 +180,42 @@ class TransactionsActivityStore: ObservableObject, WalletObserverStore {
         userAssets: userAssets,
         allTokens: allTokens,
         assetRatios: assetPricesCache,
+        nftMetadata: metadataCache,
+        solEstimatedTxFees: solEstimatedTxFeesCache
+      )
+
+      let nftsWithoutMetadata = transactionSections.flatMap(\.transactions)
+        .compactMap { parsedTx in
+          switch parsedTx.details {
+          case .erc721Transfer(let details):
+            return details.fromToken
+          case .solSplTokenTransfer(let details):
+            if let fromToken = details.fromToken, fromToken.isNft {
+              return fromToken
+            }
+            return nil
+          default:
+            return nil
+          }
+        }
+        .filter { token in // filter out already fetched metadata
+          !metadataCache.keys.contains(where: { $0.caseInsensitiveCompare(token.contractAddress) == .orderedSame })
+        }
+      guard !Task.isCancelled, !nftsWithoutMetadata.isEmpty else { return }
+      // fetch nft metadata for all NFTs
+      let allMetadata = await rpcService.fetchNFTMetadata(tokens: nftsWithoutMetadata, ipfsApi: ipfsApi)
+      for (key, value) in allMetadata { // update cached values
+        metadataCache[key] = value
+      }
+      guard !Task.isCancelled else { return }
+      self.transactionSections = buildTransactionSections(
+        transactions: allTransactions,
+        networksForCoin: networksForCoin,
+        accountInfos: allAccountInfos,
+        userAssets: userAssets,
+        allTokens: allTokens,
+        assetRatios: assetPricesCache,
+        nftMetadata: metadataCache,
         solEstimatedTxFees: solEstimatedTxFeesCache
       )
     }
@@ -186,6 +228,7 @@ class TransactionsActivityStore: ObservableObject, WalletObserverStore {
     userAssets: [BraveWallet.BlockchainToken],
     allTokens: [BraveWallet.BlockchainToken],
     assetRatios: [String: Double],
+    nftMetadata: [String: NFTMetadata],
     solEstimatedTxFees: [String: UInt64]
   ) -> [TransactionSection] {
     // Group transactions by day (only compare day/month/year)
@@ -211,6 +254,7 @@ class TransactionsActivityStore: ObservableObject, WalletObserverStore {
             userAssets: userAssets,
             allTokens: allTokens,
             assetRatios: assetRatios,
+            nftMetadata: nftMetadata,
             solEstimatedTxFee: solEstimatedTxFees[transaction.id],
             currencyFormatter: currencyFormatter,
             decimalFormatStyle: .decimals(precision: 4)

Sources/BraveWallet/Crypto/Transactions/TransactionParser+TransactionSummary.swift

@@ -44,6 +44,7 @@ extension TransactionParser {
     userAssets: [BraveWallet.BlockchainToken],
     allTokens: [BraveWallet.BlockchainToken],
     assetRatios: [String: Double],
+    nftMetadata: [String: NFTMetadata],
     solEstimatedTxFee: UInt64?,
     currencyFormatter: NumberFormatter
   ) -> TransactionSummary {
@@ -54,6 +55,7 @@ extension TransactionParser {
       userAssets: userAssets,
       allTokens: allTokens,
       assetRatios: assetRatios,
+      nftMetadata: nftMetadata,
       solEstimatedTxFee: solEstimatedTxFee,
       currencyFormatter: currencyFormatter,
       decimalFormatStyle: .balance // use 4 digit precision for summary

Sources/BraveWallet/Crypto/Transactions/TransactionParser.swift

@@ -73,7 +73,7 @@ enum TransactionParser {
           gasFee = .init(fee: gasFeeString, fiat: "$0.00")
         }
       }
-    case .btc:
+    case .btc, .zec:
       break
     @unknown default:
       break
@@ -103,6 +103,7 @@ enum TransactionParser {
     userAssets: [BraveWallet.BlockchainToken],
     allTokens: [BraveWallet.BlockchainToken],
     assetRatios: [String: Double],
+    nftMetadata: [String: NFTMetadata],
     solEstimatedTxFee: UInt64?,
     currencyFormatter: NumberFormatter,
     decimalFormatStyle: WeiFormatter.DecimalFormatStyle? = nil
@@ -185,6 +186,7 @@ enum TransactionParser {
               fromValue: fromValue,
               fromAmount: fromValueFormatted,
               fromFiat: fromFiat,
+              fromTokenMetadata: nil,
               gasFee: gasFee(
                 from: transaction,
                 network: network,
@@ -230,6 +232,7 @@ enum TransactionParser {
             fromValue: fromValue,
             fromAmount: fromAmount,
             fromFiat: fromFiat,
+            fromTokenMetadata: nil,
             gasFee: gasFee(
               from: transaction,
               network: network,
@@ -359,6 +362,12 @@ enum TransactionParser {
         return nil
       }
       let token = token(for: tokenContractAddress, network: network, userAssets: userAssets, allTokens: allTokens)
+      let tokenNFTMetadata: NFTMetadata?
+      if let token {
+        tokenNFTMetadata = nftMetadata[token.id]
+      } else { 
+        tokenNFTMetadata = nil
+      }
 
       return .init(
         transaction: transaction,
@@ -372,6 +381,7 @@ enum TransactionParser {
             fromToken: token,
             fromValue: "1", // Can only send 1 erc721 at a time
             fromAmount: "1",
+            nftMetadata: tokenNFTMetadata,
             owner: owner,
             tokenId: tokenId,
             gasFee: gasFee(
@@ -413,6 +423,7 @@ enum TransactionParser {
             fromValue: fromValue,
             fromAmount: fromValueFormatted,
             fromFiat: fromFiat,
+            fromTokenMetadata: nil,
             gasFee: gasFee(
               from: transaction,
               network: network,
@@ -431,6 +442,12 @@ enum TransactionParser {
         return nil
       }
       let fromToken = token(for: splTokenMintAddress, network: network, userAssets: userAssets, allTokens: allTokens)
+      let tokenNFTMetadata: NFTMetadata?
+      if let fromToken {
+        tokenNFTMetadata = nftMetadata[fromToken.id]
+      } else {
+        tokenNFTMetadata = nil
+      }
       let fromValue = "\(amount)"
       var fromValueFormatted = ""
       var fromFiat = "$0.00"
@@ -464,6 +481,7 @@ enum TransactionParser {
             fromValue: fromValue,
             fromAmount: fromValueFormatted,
             fromFiat: fromFiat,
+            fromTokenMetadata: tokenNFTMetadata,
             gasFee: gasFee(
               from: transaction,
               network: network,
@@ -696,7 +714,9 @@ struct ParsedTransaction: Equatable {
     case let .solDappTransaction(details),
       let .solSwapTransaction(details):
       return details.gasFee
-    case .erc721Transfer, .other:
+    case let .erc721Transfer(details):
+      return details.gasFee
+    case .other:
       return nil
     case let .filSend(details):
       return details.gasFee
@@ -801,6 +821,8 @@ struct SendDetails: Equatable {
   let fromAmount: String
   /// The amount formatted as currency
   let fromFiat: String?
+  /// Metadata if `fromToken` is an NFT
+  let fromTokenMetadata: NFTMetadata?
 
   /// Gas fee for the transaction
   let gasFee: GasFee?
@@ -836,6 +858,8 @@ struct Eth721TransferDetails: Equatable {
   let fromValue: String
   /// From amount formatted
   let fromAmount: String
+  /// Metadata for the NFT being sent
+  let nftMetadata: NFTMetadata?
 
   /// Owner (must not be confused with the caller (fromAddress)
   let owner: String
@@ -906,6 +930,7 @@ extension BraveWallet.TransactionInfo {
     userAssets: [BraveWallet.BlockchainToken],
     allTokens: [BraveWallet.BlockchainToken],
     assetRatios: [String: Double],
+    nftMetadata: [String: NFTMetadata],
     solEstimatedTxFee: UInt64? = nil,
     currencyFormatter: NumberFormatter,
     decimalFormatStyle: WeiFormatter.DecimalFormatStyle? = nil
@@ -917,6 +942,7 @@ extension BraveWallet.TransactionInfo {
       userAssets: userAssets,
       allTokens: allTokens,
       assetRatios: assetRatios,
+      nftMetadata: nftMetadata,
       solEstimatedTxFee: solEstimatedTxFee,
       currencyFormatter: currencyFormatter,
       decimalFormatStyle: decimalFormatStyle
@@ -984,11 +1010,13 @@ extension BraveWallet.TransactionInfo {
       if let erc721ContractAddress {
         return [erc721ContractAddress]
       }
+    case .solanaSplTokenTransfer, .solanaSplTokenTransferWithAssociatedTokenAccountCreation:
+      if let splTokenMintAddress = txDataUnion.solanaTxData?.splTokenMintAddress {
+        return [splTokenMintAddress]
+      }
     case .ethSend, .erc1155SafeTransferFrom, .other:
       break
     case .solanaSystemTransfer,
-        .solanaSplTokenTransfer,
-        .solanaSplTokenTransferWithAssociatedTokenAccountCreation,
         .solanaDappSignTransaction,
         .solanaDappSignAndSendTransaction,
         .solanaSwap:

Sources/BraveWallet/Crypto/Transactions/TransactionSummaryViews.swift

@@ -19,6 +19,7 @@ struct TransactionSummaryViewContainer: View {
       SendTransactionSummaryView(
         sentFromAccountName: parsedTransaction.namedFromAddress,
         token: details.fromToken,
+        nftMetadata: details.fromTokenMetadata,
         network: parsedTransaction.network,
         valueSent: details.fromAmount,
         fiatValueSent: details.fromFiat ?? "",
@@ -67,6 +68,7 @@ struct TransactionSummaryViewContainer: View {
       SendTransactionSummaryView(
         sentFromAccountName: parsedTransaction.namedFromAddress,
         token: details.fromToken,
+        nftMetadata: details.nftMetadata,
         network: parsedTransaction.network,
         valueSent: nil,
         fiatValueSent: nil,
@@ -101,6 +103,7 @@ struct SendTransactionSummaryView: View {
 
   let sentFromAccountName: String
   let token: BraveWallet.BlockchainToken?
+  let nftMetadata: NFTMetadata?
   let network: BraveWallet.NetworkInfo
   let valueSent: String?
   let fiatValueSent: String?
@@ -110,13 +113,15 @@ struct SendTransactionSummaryView: View {
   init(
     sentFromAccountName: String,
     token: BraveWallet.BlockchainToken?,
+    nftMetadata: NFTMetadata? = nil,
     network: BraveWallet.NetworkInfo,
     valueSent: String?,
     fiatValueSent: String?,
     status: BraveWallet.TransactionStatus,
     time: Date
   ) {
     self.sentFromAccountName = sentFromAccountName
+    self.nftMetadata = nftMetadata
     self.token = token
     self.network = network
     self.valueSent = valueSent
@@ -162,7 +167,7 @@ struct SendTransactionSummaryView: View {
               NFTIconView(
                 token: token,
                 network: network,
-                url: nil,
+                url: nftMetadata?.imageURL,
                 shouldShowNetworkIcon: true,
                 length: length,
                 maxLength: maxLength,