GH-3432 added new tx types

safe-global · Jul 1, 2024 · c544ef5 · c544ef5
1 parent 00c24a4
commit c544ef5
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 7 deletions.
diff --git 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
@@ -50,7 +50,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>3</string>
 	<key>CLAIMING_DATA_URL</key>
 	<string>$(CLAIMING_DATA_URL)</string>
 	<key>CLAIM_CHAT_URL</key>

diff --git 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
@@ -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/...onnect/Server/Safes/Incoming Transaction/WCIncomingTransactionRequestViewController.swift b/...onnect/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
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.26.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>3</string>
 </dict>
 </plist>
diff --git a/MultisigTests/Info.plist b/MultisigTests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.26.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>3</string>
 </dict>
 </plist>
diff --git a/NotificationServiceExtension/Info.plist b/NotificationServiceExtension/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.26.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>