Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
GhenadieVP committed Feb 13, 2025
1 parent 644c50c commit 66609ed
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 22 deletions.
6 changes: 1 addition & 5 deletions RadixWallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -2510,7 +2509,6 @@
E62449D32AFBA61100272C67 /* Home+AccountRow+Reducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Home+AccountRow+Reducer.swift"; sourceTree = "<group>"; };
E62449D42AFBA61100272C67 /* Home+AccountRow+View.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Home+AccountRow+View.swift"; sourceTree = "<group>"; };
E62BB7622AEA856300D46DAC /* ImportMnemonicGridTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportMnemonicGridTests.swift; sourceTree = "<group>"; };
E63257642BB314F600952051 /* ExecutionSummary+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ExecutionSummary+Extensions.swift"; sourceTree = "<group>"; };
E634CA2D2AFD25B100C43DB7 /* DebugKeychainContents+View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DebugKeychainContents+View.swift"; sourceTree = "<group>"; };
E634CA2E2AFD25B100C43DB7 /* DebugKeychainContents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugKeychainContents.swift; sourceTree = "<group>"; };
E64463FD2B75304C0006CAF8 /* Dictionary+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Dictionary+Extensions.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2697,7 +2695,6 @@
482752142BDB8F5A007854E0 /* SargonExtensions */ = {
isa = PBXGroup;
children = (
E63257642BB314F600952051 /* ExecutionSummary+Extensions.swift */,
48AF19CD2BB71C1600796130 /* IntoSargon+Bridge.swift */,
482752172BDB9032007854E0 /* DisplayName+NonEmptyString.swift */,
482752192BDB90D4007854E0 /* FactorSourceCommon+New+Dependencies.swift */,
Expand Down Expand Up @@ -8001,7 +7998,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 */,
Expand Down Expand Up @@ -9464,7 +9460,7 @@
repositoryURL = "https://github.com/radixdlt/sargon/";
requirement = {
kind = exactVersion;
version = 1.1.138;
version = 1.1.140;
};
};
5B634A922C91D2A0004B2FBC /* XCRemoteSwiftPackageReference "ScreenshotPreventing-iOS" */ = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/radixdlt/sargon",
"state" : {
"revision" : "e861a22507af9d428c08f88e94a176e128701bdb",
"version" : "1.1.138"
"revision" : "89f7a2305f034723cf4fdb231ae5af40ac8cae97",
"version" : "1.1.140"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ extension InteractionReview.Sections {
return newlyCreatedMetadata
}

switch summary.detailedManifestClass {
switch summary.detailedClassification {
case nil:
return nil

case .generalSubintent:
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 }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 66609ed

Please sign in to comment.