From 7445b003ca666d146c03cf3246980d8495bc14a3 Mon Sep 17 00:00:00 2001 From: Gustaf Kugelberg <123396602+kugel3@users.noreply.github.com> Date: Fri, 1 Sep 2023 16:52:03 +0200 Subject: [PATCH] [ABW-2051] NFT images not displaying (#704) --- Sources/Core/SharedModels/Assets/AccountPortfolio.swift | 7 +++++-- .../Components/Row/NonFungibleAssetRow+View.swift | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Sources/Core/SharedModels/Assets/AccountPortfolio.swift b/Sources/Core/SharedModels/Assets/AccountPortfolio.swift index 9603c7cf9b..1dc60aa188 100644 --- a/Sources/Core/SharedModels/Assets/AccountPortfolio.swift +++ b/Sources/Core/SharedModels/Assets/AccountPortfolio.swift @@ -354,8 +354,11 @@ extension [AccountPortfolio.NonFungibleResource.NonFungibleToken.NFTData] { } public var keyImageURL: URL? { - guard let string = self[Field.keyImageURL]?.string else { return nil } - return URL(string: string) + if let string = self[.keyImageURL]?.string { + return URL(string: string) + } else { + return self[.keyImageURL]?.url + } } public var tokenDescription: String? { diff --git a/Sources/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Row/NonFungibleAssetRow+View.swift b/Sources/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Row/NonFungibleAssetRow+View.swift index 17e5f536db..81eff4b17d 100644 --- a/Sources/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Row/NonFungibleAssetRow+View.swift +++ b/Sources/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Row/NonFungibleAssetRow+View.swift @@ -45,21 +45,21 @@ extension NonFungibleAssetList.Row.View { } private func rowView(_ viewStore: ViewStoreOf) -> some SwiftUI.View { - HStack { + HStack(spacing: .small1) { NFTThumbnail(viewStore.resource.iconURL, size: .small) VStack(alignment: .leading, spacing: .small2) { Text(viewStore.resource.name ?? "") .foregroundColor(.app.gray1) + .lineSpacing(-4) .textStyle(.secondaryHeader) Text(viewStore.supply) .font(.app.body2HighImportance) .foregroundColor(.app.gray2) } - - Spacer() } + .frame(maxWidth: .infinity, alignment: .leading) .padding(.horizontal, .medium1) .frame(height: headerHeight) .background(.app.white)