diff --git a/Multisig/Data/Services/Safe Client Gateway Service/SCGModels.swift b/Multisig/Data/Services/Safe Client Gateway Service/SCGModels.swift index 695dca455..295ca32c2 100644 --- a/Multisig/Data/Services/Safe Client Gateway Service/SCGModels.swift +++ b/Multisig/Data/Services/Safe Client Gateway Service/SCGModels.swift @@ -174,6 +174,8 @@ extension SCGModels { case rejection(Rejection) case creation(Creation) case swapOrder(SwapOrder) + case swapTransfer(SwapOrder) + case twapOrder(TwapOrder) case unknown init(from decoder: Decoder) throws { @@ -200,6 +202,10 @@ extension SCGModels { self = try .creation(Creation(from: decoder)) case "SwapOrder": self = try .swapOrder(SwapOrder(from: decoder)) + case "SwapTransfer": + self = try .swapTransfer(SwapOrder(from: decoder)) + case "TwapOrder": + self = try .twapOrder(TwapOrder(from: decoder)) case "Unknown": fallthrough default: @@ -379,10 +385,13 @@ extension SCGModels { struct SwapOrder: Decodable { var uid: String - var status: String - var kind: String var explorerUrl: URL } + + struct TwapOrder: Codable { + var kind: String + var status: String + } } struct DataDecoded: Decodable { diff --git a/Multisig/Info.plist b/Multisig/Info.plist index fac10d85a..079ea1c49 100644 --- a/Multisig/Info.plist +++ b/Multisig/Info.plist @@ -50,7 +50,7 @@ CFBundleVersion - 1 + 3 CLAIMING_DATA_URL $(CLAIMING_DATA_URL) CLAIM_CHAT_URL diff --git a/Multisig/UI/Transaction/TransactionDetailsViewController/TransactionDetailCellBuilder.swift b/Multisig/UI/Transaction/TransactionDetailsViewController/TransactionDetailCellBuilder.swift index a0d2cef4c..9b5ae70e5 100644 --- a/Multisig/UI/Transaction/TransactionDetailsViewController/TransactionDetailCellBuilder.swift +++ b/Multisig/UI/Transaction/TransactionDetailsViewController/TransactionDetailCellBuilder.swift @@ -377,6 +377,11 @@ class TransactionDetailCellBuilder { case .swapOrder(let orderInfo): text("Swap order", title: "Contract Interaction", expandableTitle: nil, copyText: nil) externalURL(text: "Order details", url: orderInfo.explorerUrl) + case .swapTransfer(let orderInfo): + text("Swap transfer", title: "Contract Interaction", expandableTitle: nil, copyText: nil) + externalURL(text: "Order details", url: orderInfo.explorerUrl) + case .twapOrder(_): + text("Twap order", title: "Contract Interaction", expandableTitle: nil, copyText: nil) case .creation(_): // ignore fallthrough @@ -664,6 +669,12 @@ class TransactionDetailCellBuilder { case .swapOrder(_): type = "Swap order" icon = UIImage(named: "ico-custom-tx") + case .swapTransfer(_): + type = "Swap transfer" + icon = UIImage(named: "ico-custom-tx") + case .twapOrder(_): + type = "Twap order" + icon = UIImage(named: "ico-custom-tx") case .unknown: type = "Unknown operation" icon = UIImage(named: "ico-custom-tx") diff --git a/Multisig/UI/Transaction/TransactionListViewController/TransactionListViewController.swift b/Multisig/UI/Transaction/TransactionListViewController/TransactionListViewController.swift index 51eae7ddf..57896820f 100644 --- a/Multisig/UI/Transaction/TransactionListViewController/TransactionListViewController.swift +++ b/Multisig/UI/Transaction/TransactionListViewController/TransactionListViewController.swift @@ -368,6 +368,12 @@ class TransactionListViewController: LoadableViewController, UITableViewDelegate case .swapOrder(_): image = UIImage(named: "ico-custom-tx") title = "Swap order" + case .swapTransfer(_): + image = UIImage(named: "ico-custom-tx") + title = "Swap transfer" + case .twapOrder(_): + image = UIImage(named: "ico-custom-tx") + title = "Twap order" case .unknown: image = UIImage(named: "ico-custom-tx") title = "Unknown operation" diff --git a/Multisig/UI/WalletConnect/Server/Safes/Incoming Transaction/WCIncomingTransactionRequestViewController.swift b/Multisig/UI/WalletConnect/Server/Safes/Incoming Transaction/WCIncomingTransactionRequestViewController.swift index dce480fc9..85845f395 100644 --- a/Multisig/UI/WalletConnect/Server/Safes/Incoming Transaction/WCIncomingTransactionRequestViewController.swift +++ b/Multisig/UI/WalletConnect/Server/Safes/Incoming Transaction/WCIncomingTransactionRequestViewController.swift @@ -128,7 +128,7 @@ class WCIncomingTransactionRequestViewController: ReviewSafeTransactionViewContr case .settingsChange(let settingsChangeInfo): name = settingsChangeInfo.dataDecoded.method imageName = "ico-settings-tx" - case .custom(let _): + case .custom(_): name = "Contract interaction" imageName = "ico-custom-tx" case .rejection(_): @@ -140,6 +140,12 @@ class WCIncomingTransactionRequestViewController: ReviewSafeTransactionViewContr case .swapOrder(_): imageName = "ico-custom-tx" name = "Swap order" + case .swapTransfer(_): + imageName = "ico-custom-tx" + name = "Swap transfer" + case .twapOrder(_): + imageName = "ico-custom-tx" + name = "Twap transfer" case .unknown: imageName = "ico-custom-tx" name = "Unknown operation" diff --git a/MultisigIntegrationTests/Info.plist b/MultisigIntegrationTests/Info.plist index 5a1b4e7ca..bb0f8efe8 100644 --- a/MultisigIntegrationTests/Info.plist +++ b/MultisigIntegrationTests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 3.26.0 CFBundleVersion - 1 + 3 diff --git a/MultisigTests/Info.plist b/MultisigTests/Info.plist index 5a1b4e7ca..bb0f8efe8 100644 --- a/MultisigTests/Info.plist +++ b/MultisigTests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 3.26.0 CFBundleVersion - 1 + 3 diff --git a/NotificationServiceExtension/Info.plist b/NotificationServiceExtension/Info.plist index c3d786f80..87b4ed761 100644 --- a/NotificationServiceExtension/Info.plist +++ b/NotificationServiceExtension/Info.plist @@ -21,7 +21,7 @@ CFBundleShortVersionString 3.26.0 CFBundleVersion - 1 + 3 NSExtension NSExtensionPointIdentifier