diff --git a/RadixWallet.xcodeproj/project.pbxproj b/RadixWallet.xcodeproj/project.pbxproj index 8ce5d24a65..0435ac66aa 100644 --- a/RadixWallet.xcodeproj/project.pbxproj +++ b/RadixWallet.xcodeproj/project.pbxproj @@ -1213,7 +1213,6 @@ E62449D52AFBA61100272C67 /* Home+AccountRow+Reducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E62449D32AFBA61100272C67 /* Home+AccountRow+Reducer.swift */; }; E62449D62AFBA61100272C67 /* Home+AccountRow+View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E62449D42AFBA61100272C67 /* Home+AccountRow+View.swift */; }; E62BB7632AEA856300D46DAC /* ImportMnemonicGridTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E62BB7622AEA856300D46DAC /* ImportMnemonicGridTests.swift */; }; - E63257652BB314F600952051 /* ExecutionSummary+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E63257642BB314F600952051 /* ExecutionSummary+Extensions.swift */; }; E634CA2F2AFD25B100C43DB7 /* DebugKeychainContents+View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E634CA2D2AFD25B100C43DB7 /* DebugKeychainContents+View.swift */; }; E634CA302AFD25B100C43DB7 /* DebugKeychainContents.swift in Sources */ = {isa = PBXBuildFile; fileRef = E634CA2E2AFD25B100C43DB7 /* DebugKeychainContents.swift */; }; E63D123D2ADD1FC00001CBB1 /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = E63D123C2ADD1FC00001CBB1 /* SwiftUIIntrospect */; }; @@ -2526,7 +2525,6 @@ E62449D32AFBA61100272C67 /* Home+AccountRow+Reducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Home+AccountRow+Reducer.swift"; sourceTree = ""; }; E62449D42AFBA61100272C67 /* Home+AccountRow+View.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Home+AccountRow+View.swift"; sourceTree = ""; }; E62BB7622AEA856300D46DAC /* ImportMnemonicGridTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportMnemonicGridTests.swift; sourceTree = ""; }; - E63257642BB314F600952051 /* ExecutionSummary+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ExecutionSummary+Extensions.swift"; sourceTree = ""; }; E634CA2D2AFD25B100C43DB7 /* DebugKeychainContents+View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DebugKeychainContents+View.swift"; sourceTree = ""; }; E634CA2E2AFD25B100C43DB7 /* DebugKeychainContents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugKeychainContents.swift; sourceTree = ""; }; E64463FD2B75304C0006CAF8 /* Dictionary+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Dictionary+Extensions.swift"; sourceTree = ""; }; @@ -2729,7 +2727,6 @@ 482752142BDB8F5A007854E0 /* SargonExtensions */ = { isa = PBXGroup; children = ( - E63257642BB314F600952051 /* ExecutionSummary+Extensions.swift */, 48AF19CD2BB71C1600796130 /* IntoSargon+Bridge.swift */, 482752172BDB9032007854E0 /* DisplayName+NonEmptyString.swift */, 482752192BDB90D4007854E0 /* FactorSourceCommon+New+Dependencies.swift */, @@ -8128,7 +8125,6 @@ 48CFC37C2ADC10D900E77A5C /* PoolUnitDetails+View.swift in Sources */, 48CFC5C52ADC10DA00E77A5C /* LoadingView.swift in Sources */, 48CFC59C2ADC10DA00E77A5C /* Button+Extra.swift in Sources */, - E63257652BB314F600952051 /* ExecutionSummary+Extensions.swift in Sources */, 5BBC7D9E2C3D390E00B04BD6 /* BootstrapClient+Interface.swift in Sources */, A408159E2C7E0D08005E65B9 /* MetadataPublicKeyHashValue.swift in Sources */, 48CFC4322ADC10DA00E77A5C /* Async+Extra.swift in Sources */, @@ -9600,7 +9596,7 @@ repositoryURL = "https://github.com/radixdlt/sargon/"; requirement = { kind = exactVersion; - version = 1.1.137; + version = 1.1.140; }; }; 5B634A922C91D2A0004B2FBC /* XCRemoteSwiftPackageReference "ScreenshotPreventing-iOS" */ = { diff --git a/RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 573064126d..1122290ca1 100644 --- a/RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -105,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/radixdlt/sargon", "state" : { - "revision" : "0cf5b6fc5e7cce6d0847500eb7571724f21b1920", - "version" : "1.1.137" + "revision" : "89f7a2305f034723cf4fdb231ae5af40ac8cae97", + "version" : "1.1.140" } }, { diff --git a/RadixWallet/Clients/TransactionClient/Models/TransactionModels.swift b/RadixWallet/Clients/TransactionClient/Models/TransactionModels.swift index 3e31ef8f7c..335f20f384 100644 --- a/RadixWallet/Clients/TransactionClient/Models/TransactionModels.swift +++ b/RadixWallet/Clients/TransactionClient/Models/TransactionModels.swift @@ -282,7 +282,7 @@ struct FeePayerSelectionResult: Equatable, Sendable { extension ExecutionSummary { func guranteesCost() throws -> Decimal192 { - switch detailedManifestClass { + switch detailedClassification { case .general, .transfer: deposits.flatMap(\.value).reduce(.zero) { result, resource in switch resource { diff --git a/RadixWallet/Core/SargonExtensions/ExecutionSummary+Extensions.swift b/RadixWallet/Core/SargonExtensions/ExecutionSummary+Extensions.swift deleted file mode 100644 index 4fa7a3c936..0000000000 --- a/RadixWallet/Core/SargonExtensions/ExecutionSummary+Extensions.swift +++ /dev/null @@ -1,7 +0,0 @@ -import Sargon - -extension ExecutionSummary { - var detailedManifestClass: DetailedManifestClass? { - self.detailedClassification.first - } -} diff --git a/RadixWallet/Features/AssetTransferFeature/Components/TransferAccountList/ReceivingAccount/Asset/ResourceAsset+Reducer.swift b/RadixWallet/Features/AssetTransferFeature/Components/TransferAccountList/ReceivingAccount/Asset/ResourceAsset+Reducer.swift index e7f6fa2ffa..8c3b6dd5f7 100644 --- a/RadixWallet/Features/AssetTransferFeature/Components/TransferAccountList/ReceivingAccount/Asset/ResourceAsset+Reducer.swift +++ b/RadixWallet/Features/AssetTransferFeature/Components/TransferAccountList/ReceivingAccount/Asset/ResourceAsset+Reducer.swift @@ -241,7 +241,7 @@ extension OnLedgerEntity.OwnedFungibleResource { extension OnLedgerEntity.NonFungibleToken { fileprivate var resourceQuantifier: NonFungibleResourceIndicator { - .byIds(ids: [id.nonFungibleLocalId]) + .guaranteed(ids: [id.nonFungibleLocalId]) } } diff --git a/RadixWallet/Features/InteractionReview/Sections/Sections+ExecutionSummary.swift b/RadixWallet/Features/InteractionReview/Sections/Sections+ExecutionSummary.swift index 7325c2e8d3..6b13d1729e 100644 --- a/RadixWallet/Features/InteractionReview/Sections/Sections+ExecutionSummary.swift +++ b/RadixWallet/Features/InteractionReview/Sections/Sections+ExecutionSummary.swift @@ -39,12 +39,15 @@ extension InteractionReview.Sections { return newlyCreatedMetadata } - switch summary.detailedManifestClass { + switch summary.detailedClassification { case nil: return nil + case .securifyEntity: + return nil + case .general, .transfer: - if summary.detailedManifestClass == .general { + if summary.detailedClassification == .general { guard !summary.deposits.isEmpty || !summary.withdrawals.isEmpty else { return nil } } @@ -742,7 +745,7 @@ extension [AccountAddress: [ResourceIndicator]] { extension ResourceIndicator { var isGuaranteedAmount: Bool { switch self { - case .fungible(_, .guaranteed), .nonFungible(_, .byIds): + case .fungible(_, .guaranteed), .nonFungible(_, .guaranteed): return true default: assertionFailure("Cannot sum up the predicted amounts") @@ -788,8 +791,8 @@ extension FungibleResourceIndicator { extension NonFungibleResourceIndicator { func adding(_ other: Self) -> Self { switch (self, other) { - case let (.byIds(ids), .byIds(otherIds)): - return .byIds(ids: ids + otherIds) + case let (.guaranteed(ids), .guaranteed(otherIds)): + return .guaranteed(ids: ids + otherIds) default: assertionFailure("Cannot sum up the predicted amounts") return self diff --git a/RadixWallet/Features/TransactionReviewFeature/TransactionReview.swift b/RadixWallet/Features/TransactionReviewFeature/TransactionReview.swift index 7cb902dba2..32ba7ed76f 100644 --- a/RadixWallet/Features/TransactionReviewFeature/TransactionReview.swift +++ b/RadixWallet/Features/TransactionReviewFeature/TransactionReview.swift @@ -304,7 +304,7 @@ struct TransactionReview: Sendable, FeatureReducer { signingFactors: preview.signingFactors, accountWithdraws: preview.analyzedManifestToReview.withdrawals, accountDeposits: preview.analyzedManifestToReview.deposits, - isNonConforming: preview.analyzedManifestToReview.detailedManifestClass == nil + isNonConforming: preview.analyzedManifestToReview.detailedClassification == nil ) state.reviewedTransaction = reviewedTransaction