Merge branch 'master' into fix-wrong-locale-value-used

Trust/Localization/en.lproj/Localizable.strings

@@ -68,7 +68,7 @@
 "wallet.import.button.title" = "Import Wallet";
 "wallet.import.subtitle" = "Importing wallet as easy as creating";
 "wallets.backup.alertSheet.title" = "Backup Keystore";
-"transactions.tabbar.item.title" = "Transactions";
+"transactions.tabbar.item.title" = "My Transactions";
 "transaction.navigation.title" = "Transaction";
 "import.navigation.title" = "Import Wallet";
 "configureTransaction.data.label.title" = "Transaction Data (Optional)";

Trust/Localization/zh-Hans.lproj/Localizable.strings

@@ -56,7 +56,7 @@
 "transactions.noTransactions.label.title" = "暂无记录";
 "wallet.navigation.title" = "钱包";
 "wallets.backup.alertSheet.title" = "备份 Keystore";
-"transactions.tabbar.item.title" = "交易";
+"transactions.tabbar.item.title" = "我的账单";
 "transaction.navigation.title" = "交易";
 "import.navigation.title" = "导入钱包";
 "configureTransaction.data.label.title" = "交易数据(可选)";

Trust/Transactions/ViewControllers/TransactionsViewController.swift

@@ -24,10 +24,6 @@ class TransactionsViewController: UIViewController {
     let tableView = UITableView(frame: .zero, style: .plain)
     let refreshControl = UIRefreshControl()
 
-    lazy var titleView: BalanceTitleView = {
-        return BalanceTitleView.make(from: self.session, .ether(destination: .none))
-    }()
-
     weak var delegate: TransactionsViewControllerDelegate?
     let dataCoordinator: TransactionDataCoordinator
     let session: WalletSession
@@ -66,6 +62,8 @@ class TransactionsViewController: UIViewController {
         self.tokensStorage = tokensStorage
         super.init(nibName: nil, bundle: nil)
 
+        title = R.string.localizable.transactionsTabbarItemTitle()
+
         tokensStorage.updatePrices()
         view.backgroundColor = viewModel.backgroundColor
         tableView.translatesAutoresizingMaskIntoConstraints = false
@@ -130,9 +128,6 @@ class TransactionsViewController: UIViewController {
             view.isDepositAvailable = viewModel.isBuyActionAvailable
             return view
         }()
-
-        navigationItem.titleView = titleView
-        titleView.viewModel = BalanceViewModel()
     }
 
     override func viewWillAppear(_ animated: Bool) {