Optimize layout for transaction and improve gas calculation logic

Trust/Extensions/Address.swift

@@ -16,3 +16,9 @@ enum Errors: LocalizedError {
         }
     }
 }
+
+extension Address {
+    static var zero: Address {
+        return Address(string: "0x0000000000000000000000000000000000000000")!
+    }
+}

Trust/Style/AppStyle.swift

@@ -5,13 +5,16 @@ import UIKit
 enum AppStyle {
     case heading
     case paragraph
+    case largeAmount
 
     var font: UIFont {
         switch self {
         case .heading:
             return UIFont.systemFont(ofSize: 18, weight: .medium)
         case .paragraph:
             return UIFont.systemFont(ofSize: 15, weight: .light)
+        case .largeAmount:
+            return UIFont.systemFont(ofSize: 20, weight: .medium)
         }
     }
 
@@ -21,6 +24,8 @@ enum AppStyle {
             return Colors.black
         case .paragraph:
             return Colors.charcoal
+        case .largeAmount:
+            return UIColor.black // Usually colors based on the amount
         }
     }
 }

Trust/Transactions/Layout/TransactionsLayout.swift

@@ -5,7 +5,7 @@ import UIKit
 
 struct TransactionsLayout {
     struct tableView {
-        static let height: CGFloat = 68
+        static let height: CGFloat = 70
         static let layoutInsets = UIEdgeInsets(top: 0, left: 58, bottom: 0, right: 0)
     }
 }

Trust/Transactions/Storage/Transaction.swift

@@ -121,6 +121,14 @@ class Transaction: Object, Decodable {
     var state: TransactionState {
         return TransactionState(int: self.internalState)
     }
+
+    var toAddress: Address? {
+        return Address(string: to)
+    }
+
+    var fromAddress: Address? {
+        return Address(string: from)
+    }
 }
 
 extension Transaction {

Trust/Transactions/ViewControllers/TransactionViewController.swift

@@ -44,7 +44,9 @@ class TransactionViewController: UIViewController {
 
         let header = TransactionHeaderView()
         header.translatesAutoresizingMaskIntoConstraints = false
-        header.amountLabel.attributedText = viewModel.amountAttributedString
+        header.amountLabel.text = viewModel.amountString
+        header.amountLabel.textColor = viewModel.amountTextColor
+        header.amountLabel.font = viewModel.amountFont
 
         let dividerColor = Colors.whisper
         let dividerOffset = UIEdgeInsets(top: 0, left: 26, bottom: 0, right: 26)

Trust/Transactions/ViewModels/TransactionCellViewModel.swift

@@ -79,11 +79,22 @@ struct TransactionCellViewModel {
     }
 
     var subTitle: String {
+        if transaction.toAddress == nil {
+            return NSLocalizedString("transaction.deployContract.label.title", value: "Deploy smart contract", comment: "")
+        }
         switch transactionViewModel.direction {
         case .incoming:
-            return "From: \(transactionViewModel.transactionFrom)"
+            return String(
+                format: "%@: %@",
+                NSLocalizedString("transaction.from.label.title", value: "From", comment: ""),
+                transactionViewModel.transactionFrom
+            )
         case .outgoing:
-            return "To: \(transactionViewModel.transactionTo)"
+            return String(
+                format: "%@: %@",
+                NSLocalizedString("transaction.to.label.title", value: "To", comment: ""),
+                transactionViewModel.transactionTo
+            )
         }
     }
 
@@ -105,8 +116,7 @@ struct TransactionCellViewModel {
     }
 
     var amountText: String {
-        let value = transactionViewModel.shortValue
-        return transactionViewModel.amountWithSign(for: value.amount) + " " + value.symbol
+        return transactionViewModel.amountText
     }
 
     var amountFont: UIFont {

Trust/Transactions/ViewModels/TransactionDetailsViewModel.swift

@@ -3,6 +3,7 @@
 import BigInt
 import Foundation
 import UIKit
+import TrustCore
 
 struct TransactionDetailsViewModel {
 
@@ -85,6 +86,9 @@ struct TransactionDetailsViewModel {
     }
 
     var address: String {
+        if transaction.toAddress == nil {
+            return Address.zero.description
+        }
         if transactionViewModel.direction == .incoming {
             return transaction.from
         } else {
@@ -133,7 +137,7 @@ struct TransactionDetailsViewModel {
     var gasFeeLabelTitle: String {
         return NSLocalizedString("transaction.gasFee.label.title", value: "Gas Fee", comment: "")
     }
-        
+
     var confirmation: String {
         guard let confirmation = chainState.confirmations(fromBlock: transaction.blockNumber) else {
             return "--"
@@ -145,8 +149,16 @@ struct TransactionDetailsViewModel {
         return NSLocalizedString("transaction.confirmation.label.title", value: "Confirmation", comment: "")
     }
 
-    var amountAttributedString: NSAttributedString {
-        return transactionViewModel.fullAmountAttributedString
+    var amountString: String {
+        return transactionViewModel.amountText
+    }
+
+    var amountTextColor: UIColor {
+        return transactionViewModel.amountTextColor
+    }
+
+    var amountFont: UIFont {
+        return AppStyle.largeAmount.font
     }
 
     var shareItem: URL? {

Trust/Transactions/ViewModels/TransactionViewModel.swift

@@ -61,33 +61,6 @@ struct TransactionViewModel {
         return transactionValue(for: fullFormatter)
     }
 
-    var shortAmountAttributedString: NSAttributedString {
-        return amountAttributedString(for: shortValue)
-    }
-
-    var fullAmountAttributedString: NSAttributedString {
-        return amountAttributedString(for: fullValue)
-    }
-
-    func amountAttributedString(for value: TransactionValue) -> NSAttributedString {
-        let amount = NSAttributedString(
-            string: amountWithSign(for: value.amount),
-            attributes: [
-                .font: UIFont.systemFont(ofSize: 24),
-                .foregroundColor: amountTextColor,
-            ]
-        )
-
-        let currency = NSAttributedString(
-            string: " " + value.symbol,
-            attributes: [
-                .font: UIFont.systemFont(ofSize: 14),
-            ]
-        )
-
-        return amount + currency
-    }
-
     func amountWithSign(for amount: String) -> String {
         guard amount != "0" else { return amount }
         switch direction {
@@ -124,4 +97,9 @@ struct TransactionViewModel {
             return R.image.transaction_pending()
         }
     }
+
+    var amountText: String {
+        let value = shortValue
+        return amountWithSign(for: value.amount) + " " + value.symbol
+    }
 }

Trust/Transactions/Views/TransactionViewCell.swift

@@ -35,7 +35,12 @@ class TransactionViewCell: UITableViewCell {
         rightStackView.translatesAutoresizingMaskIntoConstraints = false
         rightStackView.axis = .vertical
 
-        let stackView = UIStackView(arrangedSubviews: [statusImageView, titlesStackView, rightStackView])
+        let stackView = UIStackView(arrangedSubviews: [
+            statusImageView,
+            titlesStackView,
+            .spacerWidth(),
+            rightStackView,
+        ])
         stackView.translatesAutoresizingMaskIntoConstraints = false
         stackView.axis = .horizontal
         stackView.spacing = 15
@@ -44,6 +49,8 @@ class TransactionViewCell: UITableViewCell {
         statusImageView.setContentHuggingPriority(UILayoutPriority.defaultLow, for: .horizontal)
         subTitleLabel.setContentHuggingPriority(UILayoutPriority.defaultLow, for: .horizontal)
         titleLabel.setContentHuggingPriority(UILayoutPriority.defaultLow, for: .horizontal)
+        titleLabel.setContentCompressionResistancePriority(.required, for: .vertical)
+        subTitleLabel.setContentCompressionResistancePriority(.required, for: .vertical)
 
         amountLabel.setContentHuggingPriority(UILayoutPriority.required, for: .horizontal)
         stackView.setContentHuggingPriority(UILayoutPriority.required, for: .horizontal)

Trust/Transfer/Controllers/TransactionConfigurator.swift

@@ -30,17 +30,7 @@ class TransactionConfigurator {
             configurationUpdate.value = configuration
         }
     }
-    lazy var calculatedGasPrice: BigInt = {
-        return max(transaction.gasPrice ?? configuration.gasPrice, GasPriceConfiguration.min)
-    }()
-
-    var calculatedGasLimit: BigInt? {
-        return transaction.gasLimit
-    }
-
-    var requestEstimateGas: Bool {
-        return transaction.gasLimit == .none
-    }
+    var requestEstimateGas: Bool
 
     var configurationUpdate: Subscribable<TransactionConfiguration> = Subscribable(nil)
 
@@ -52,15 +42,30 @@ class TransactionConfigurator {
         self.session = session
         self.account = account
         self.transaction = transaction
+        self.requestEstimateGas = transaction.gasLimit == .none
+
+        let nonce = transaction.nonce ?? BigInt(session.nonceProvider.nextNonce ?? -1)
+        let data: Data = TransactionConfigurator.data(for: transaction)
+        let calculatedGasLimit = transaction.gasLimit ?? TransactionConfigurator.gasLimit(for: transaction.transferType)
+        let calculatedGasPrice = min(max(transaction.gasPrice ?? session.chainState.gasPrice ?? GasPriceConfiguration.default, GasPriceConfiguration.min), GasPriceConfiguration.max)
 
         self.configuration = TransactionConfiguration(
-            gasPrice: min(max(transaction.gasPrice ?? session.chainState.gasPrice ?? GasPriceConfiguration.default, GasPriceConfiguration.min), GasPriceConfiguration.max),
-            gasLimit: transaction.gasLimit ?? TransactionConfigurator.gasLimit(for: transaction.transferType),
-            data: transaction.data ?? Data(),
-            nonce: transaction.nonce ?? BigInt(session.nonceProvider.nextNonce ?? -1)
+            gasPrice: calculatedGasPrice,
+            gasLimit: calculatedGasLimit,
+            data: data,
+            nonce: nonce
         )
     }
 
+    private static func data(for transaction: UnconfirmedTransaction) -> Data {
+        switch transaction.transferType {
+        case .ether, .dapp:
+            return transaction.data ?? Data()
+        case .token:
+            return ERC20Encoder.encodeTransfer(to: transaction.to!, tokens: transaction.value.magnitude)
+        }
+    }
+
     private static func gasLimit(for type: TransferType) -> BigInt {
         switch type {
         case .ether:
@@ -77,40 +82,12 @@ class TransactionConfigurator {
     }
 
     func load(completion: @escaping (Result<Void, AnyError>) -> Void) {
-        refreshConfiguration()
         if requestEstimateGas {
             estimateGasLimit()
         }
         loadNonce(completion: completion)
     }
 
-    func refreshConfiguration() {
-        switch transaction.transferType {
-        case .ether:
-            self.configuration = TransactionConfiguration(
-                gasPrice: calculatedGasPrice,
-                gasLimit: GasLimitConfiguration.default,
-                data: transaction.data ?? configuration.data,
-                nonce: configuration.nonce
-            )
-        case .token:
-            let encoded = ERC20Encoder.encodeTransfer(to: transaction.to!, tokens: transaction.value.magnitude)
-            self.configuration = TransactionConfiguration(
-                gasPrice: calculatedGasPrice,
-                gasLimit: GasLimitConfiguration.tokenTransfer,
-                data: encoded,
-                nonce: configuration.nonce
-            )
-        case .dapp:
-            self.configuration = TransactionConfiguration(
-                gasPrice: calculatedGasPrice,
-                gasLimit: GasLimitConfiguration.dappTransfer,
-                data: transaction.data ?? configuration.data,
-                nonce: configuration.nonce
-            )
-        }
-    }
-
     func estimateGasLimit() {
         let request = EstimateGasRequest(transaction: signTransaction())
         Session.send(EtherServiceRequest(batch: BatchFactory().create(request))) { [weak self] result in
@@ -124,24 +101,38 @@ class TransactionConfigurator {
                     }
                     return limit + (limit * 20 / 100)
                 }()
-
-                self.configuration =  TransactionConfiguration(
-                    gasPrice: self.calculatedGasPrice,
-                    gasLimit: gasLimit,
-                    data: self.configuration.data,
-                    nonce: self.configuration.nonce
-                )
+                self.refreshGasLimit(gasLimit)
             case .failure(let error):
                 NSLog("estimateGasLimit \(error)")
             }
         }
     }
 
+    // combine into one function
+
+    func refreshGasLimit(_ gasLimit: BigInt) {
+        configuration = TransactionConfiguration(
+            gasPrice: configuration.gasPrice,
+            gasLimit: gasLimit,
+            data: configuration.data,
+            nonce: configuration.nonce
+        )
+    }
+
+    func refreshNonce(_ nonce: BigInt) {
+        configuration = TransactionConfiguration(
+            gasPrice: configuration.gasPrice,
+            gasLimit: configuration.gasLimit,
+            data: configuration.data,
+            nonce: nonce
+        )
+    }
+
     func loadNonce(completion: @escaping (Result<Void, AnyError>) -> Void) {
         session.nonceProvider.getNextNonce(force: false) { [weak self] result in
             switch result {
-            case .success:
-                self?.refreshConfiguration()
+            case .success(let nonce):
+                self?.refreshNonce(nonce)
                 completion(.success(()))
             case .failure(let error):
                 completion(.failure(error))

Trust/Transfer/ViewControllers/ConfirmPaymentViewController.swift

@@ -89,6 +89,7 @@ class ConfirmPaymentViewController: UIViewController {
         header.translatesAutoresizingMaskIntoConstraints = false
         header.amountLabel.text = detailsViewModel.amountString
         header.amountLabel.font = detailsViewModel.amountFont
+        header.amountLabel.textColor = detailsViewModel.amountTextColor
 
         var items: [UIView] = [
             .spacer(),

Trust/Transfer/ViewModels/ConfirmPaymentDetailsViewModel.swift

@@ -121,7 +121,7 @@ struct ConfirmPaymentDetailsViewModel {
     }
 
     var amountFont: UIFont {
-        return UIFont.systemFont(ofSize: 20, weight: .medium)
+        return AppStyle.largeAmount.font
     }
 
     private func amountWithSign(for amount: String) -> String {

Trust/Welcome/ViewControllers/WelcomeViewController.swift

@@ -40,12 +40,10 @@ class WelcomeViewController: UIViewController {
         return button
     }()
     let importWalletButton: UIButton = {
-        let importWalletButton = Button(size: .large, style: .solid)
+        let importWalletButton = Button(size: .large, style: .border)
         importWalletButton.translatesAutoresizingMaskIntoConstraints = false
         importWalletButton.setTitle(NSLocalizedString("welcome.importWallet.button.title", value: "IMPORT WALLET", comment: ""), for: .normal)
         importWalletButton.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: UIFont.Weight.semibold)
-        importWalletButton.setBackgroundColor(Colors.gray, forState: .normal)
-        importWalletButton.setBackgroundColor(Colors.lightGray, forState: .highlighted)
         importWalletButton.accessibilityIdentifier = "import-wallet"
         return importWalletButton
     }()