From fa54d935d64b14df1c153b594eb3d6d164fbe5bf Mon Sep 17 00:00:00 2001 From: Matias Bzurovski Date: Thu, 4 Jul 2024 18:04:51 +0200 Subject: [PATCH 1/4] Show correct name for NFT --- .../Components/Details/NonFungibleTokenDetails+View.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RadixWallet/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Details/NonFungibleTokenDetails+View.swift b/RadixWallet/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Details/NonFungibleTokenDetails+View.swift index 2ad199ba69..cb11ed1027 100644 --- a/RadixWallet/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Details/NonFungibleTokenDetails+View.swift +++ b/RadixWallet/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Details/NonFungibleTokenDetails+View.swift @@ -14,7 +14,7 @@ extension NonFungibleTokenDetails.State { resourceAddress: resourceAddress, isXRD: false, validatorAddress: nil, - resourceName: resourceDetails.metadata.title, + resourceName: resourceDetails.metadata.name, currentSupply: resourceDetails.totalSupply.map { $0?.formatted() }, arbitraryDataFields: resourceDetails.metadata.arbitraryItems.asDataFields, behaviors: resourceDetails.behaviors, From cb38338c6c41625f82d774b101a14ed4ce244e03 Mon Sep 17 00:00:00 2001 From: Matias Bzurovski Date: Thu, 4 Jul 2024 18:07:56 +0200 Subject: [PATCH 2/4] Generate QR code only when necessary --- .../AddressView/AddressDetails+View.swift | 9 --------- .../AddressView/AddressDetails.swift | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift index 94744cdfdc..076f912b6b 100644 --- a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift +++ b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift @@ -220,15 +220,6 @@ private extension AddressDetails.View { } private extension AddressDetails.State { - var showQrCode: Bool { - switch address { - case .account: - true - default: - false - } - } - var showVerifyOnLedger: Bool { switch address { case let .account(_, isLedgerHWAccount): diff --git a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails.swift b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails.swift index 037416dc19..82e8c19b44 100644 --- a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails.swift +++ b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails.swift @@ -129,6 +129,9 @@ public struct AddressDetails: Sendable, FeatureReducer { } private func loadQrCodeEffect(state: inout State) -> Effect { + guard state.showQrCode else { + return .none + } state.qrImage = .loading let content = QR.addressPrefix + state.address.address return .run { send in @@ -142,6 +145,17 @@ public struct AddressDetails: Sendable, FeatureReducer { // MARK: - Helpers +extension AddressDetails.State { + var showQrCode: Bool { + switch address { + case .account: + true + default: + false + } + } +} + private extension OnLedgerEntity.Resource { var resourceTitle: String? { guard let name = metadata.name else { From 412c9f1601fd47051dc5718b9a6f2f4797078f0b Mon Sep 17 00:00:00 2001 From: Matias Bzurovski Date: Thu, 4 Jul 2024 18:32:08 +0200 Subject: [PATCH 3/4] Fix QR image shrinking --- .../AddressView/AddressDetails+View.swift | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift index 076f912b6b..da081212ae 100644 --- a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift +++ b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift @@ -74,10 +74,14 @@ public extension AddressDetails { Group { switch store.qrImage { case let .success(value): - Image(decorative: value, scale: 1) - .resizable() - .aspectRatio(1, contentMode: .fit) - .transition(.scale(scale: 0.95).combined(with: .opacity)) + GeometryReader { proxy in + Image(decorative: value, scale: 1) + .resizable() + .frame(width: proxy.size.height, height: proxy.size.height) + .frame(maxWidth: .infinity) + .transition(.scale(scale: 0.95).combined(with: .opacity)) + } + case .failure: Text(L10n.AddressDetails.qrCodeFailure) .textStyle(.body1HighImportance) From acf72c66b35f211be94441a77e38e8a6b133132e Mon Sep 17 00:00:00 2001 From: Matias Bzurovski Date: Fri, 5 Jul 2024 15:17:34 +0200 Subject: [PATCH 4/4] Lint --- .../Core/FeaturePrelude/AddressView/AddressDetails+View.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift index da081212ae..434b19bd6b 100644 --- a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift +++ b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift @@ -81,7 +81,6 @@ public extension AddressDetails { .frame(maxWidth: .infinity) .transition(.scale(scale: 0.95).combined(with: .opacity)) } - case .failure: Text(L10n.AddressDetails.qrCodeFailure) .textStyle(.body1HighImportance)