Move data field outside of the confirm view

yuhao-git-star · Apr 17, 2018 · 03ccd54 · 03ccd54
1 parent 6bde174
commit 03ccd54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/Trust/Transfer/ViewControllers/ConfigureTransactionViewController.swift b/Trust/Transfer/ViewControllers/ConfigureTransactionViewController.swift
@@ -136,10 +136,18 @@ class ConfigureTransactionViewController: FormViewController {
         +++ Section()
 
         <<< AppFormAppearance.textFieldFloat(tag: Values.data) {
-            $0.title = NSLocalizedString("configureTransaction.data.label.title", value: "Transaction Data (Optional)", comment: "")
+            let dataText = String(format:
+                NSLocalizedString(
+                    "configureTransaction.dataField.label.title",
+                    value: "Data (Optional). %@",
+                    comment: ""
+            ), self.configuration.data.description)
+            $0.title = dataText
             $0.value = self.configuration.data.hexEncoded
         }
 
+        +++ Section()
+
         <<< AppFormAppearance.textFieldFloat(tag: Values.nonce) {
             $0.title = NSLocalizedString("configureTransaction.nonce.label.title", value: "Nonce", comment: "")
             $0.value = "\(self.configuration.nonce)"

diff --git a/Trust/Transfer/ViewControllers/ConfirmPaymentViewController.swift b/Trust/Transfer/ViewControllers/ConfirmPaymentViewController.swift
@@ -130,13 +130,6 @@ class ConfirmPaymentViewController: UIViewController {
             ))
         }
 
-        items.append(TransactionAppearance.item(
-            title: detailsViewModel.dataTitle,
-            subTitle: detailsViewModel.dataText
-        ) { [unowned self] _, _, _ in
-            self.edit()
-        })
-
         for item in items {
             stackViewController.addItem(item)
         }

diff --git a/Trust/Transfer/ViewModels/ConfirmPaymentDetailsViewModel.swift b/Trust/Transfer/ViewModels/ConfirmPaymentDetailsViewModel.swift
@@ -108,14 +108,6 @@ struct ConfirmPaymentDetailsViewModel {
         return totalViewModel.feeText
     }
 
-    var dataTitle: String {
-        return NSLocalizedString("confirmPayment.data.label.title", value: "Data", comment: "")
-    }
-
-    var dataText: String {
-        return transaction.data.description
-    }
-
     var amountAttributedString: NSAttributedString {
         switch transaction.transferType {
         case .token(let token):