Merge branch 'master' into supportURLChange

Trust/Localization/en.lproj/Localizable.strings

@@ -268,7 +268,7 @@
 "Balance" = "Balance";
 "confirmSignMessage" = "Confirm signing this message:";
 "blockchain.ethereum" = "Ethereum Blockchain";
-"ticket.issuer" = "Shengkai";
+"ticket.issuer" = "Shankai";
 "touch.id" = "Touch ID";
 "face.id" = "Face ID";
 "undefined.error" = "Undefined error";

Trust/Localization/es.lproj/Localizable.strings

@@ -268,7 +268,7 @@
 "Balance" = "Balance";
 "confirmSignMessage" = "Confirm signing this message:";
 "blockchain.ethereum" = "Ethereum Blockchain";
-"ticket.issuer" = "Shengkai";
+"ticket.issuer" = "Shankai";
 "touch.id" = "Touch ID";
 "face.id" = "Face ID";
 "undefined.error" = "Undefined error";

Trust/Tokens/ViewControllers/TicketsViewController.swift

@@ -122,7 +122,7 @@ class TicketsViewController: UIViewController {
         tableView.dataSource = self
 
         if let tokenObject = tokenObject {
-            header.configure(viewModel: .init(tokenObject: tokenObject))
+            header.configure(viewModel: .init(config: tokensStorage.config, tokenObject: tokenObject))
             tableView.tableHeaderView = header
         }
 

Trust/Tokens/ViewControllers/TokensViewController.swift

@@ -247,12 +247,14 @@ extension TokensViewController: UITableViewDelegate {
             return cellViewModel.cellHeight
         case .stormBird:
             let cellViewModel = TicketTokenViewCellViewModel(
+                    config: dataStore.config,
                     token: token,
                     ticker: viewModel.ticker(for: token)
             )
             return cellViewModel.cellHeight
         case .stormBirdOrder:
             let cellViewModel = TicketTokenViewCellViewModel(
+                config: dataStore.config,
                 token: token,
                 ticker: viewModel.ticker(for: token)
             )
@@ -319,6 +321,7 @@ extension TokensViewController: UITableViewDataSource {
             let cell = tableView.dequeueReusableCell(withIdentifier: TicketTokenViewCell.identifier, for: indexPath) as! TicketTokenViewCell
             cell.configure(
                     viewModel: .init(
+                            config: dataStore.config,
                             token: token,
                             ticker: viewModel.ticker(for: token)
                     )
@@ -329,6 +332,7 @@ extension TokensViewController: UITableViewDataSource {
             let cell = tableView.dequeueReusableCell(withIdentifier: TicketTokenViewCell.identifier, for: indexPath) as! TicketTokenViewCell
             cell.configure(
                 viewModel: .init(
+                    config: dataStore.config,
                     token: token,
                     ticker: viewModel.ticker(for: token)
                 )

Trust/Tokens/ViewModels/TicketTokenViewCellViewModel.swift

@@ -8,12 +8,15 @@ struct TicketTokenViewCellViewModel {
     private let shortFormatter = EtherNumberFormatter.short
     private let token: TokenObject
 
+    let config: Config
     let ticker: CoinTicker?
 
     init(
+        config: Config,
         token: TokenObject,
         ticker: CoinTicker?
     ) {
+        self.config = config
         self.token = token
         self.ticker = ticker
     }
@@ -28,7 +31,19 @@ struct TicketTokenViewCellViewModel {
     }
 
     var issuer: String {
-        return "\(R.string.localizable.aWalletContentsIssuerTitle()): \(R.string.localizable.ticketIssuer())"
+        if config.server == .main {
+            return "\(R.string.localizable.aWalletContentsIssuerTitle()): \(R.string.localizable.ticketIssuer())"
+        } else {
+            return ""
+        }
+    }
+
+    var issuerSeparator: String {
+        if issuer.isEmpty {
+            return ""
+        } else {
+            return "|"
+        }
     }
 
     var blockChainName: String {

Trust/Tokens/ViewModels/TicketsViewControllerHeaderViewModel.swift

@@ -4,9 +4,11 @@ import UIKit
 import BigInt
 
 struct TicketsViewControllerHeaderViewModel {
+    let config: Config
     private let tokenObject: TokenObject
 
-    init(tokenObject: TokenObject) {
+    init(config: Config, tokenObject: TokenObject) {
+        self.config = config
         self.tokenObject = tokenObject
     }
 
@@ -15,7 +17,19 @@ struct TicketsViewControllerHeaderViewModel {
     }
 
     var issuer: String {
-        return "\(R.string.localizable.aWalletContentsIssuerTitle()): \(R.string.localizable.ticketIssuer())"
+        if config.server == .main {
+            return "\(R.string.localizable.aWalletContentsIssuerTitle()): \(R.string.localizable.ticketIssuer())"
+        } else {
+            return ""
+        }
+    }
+
+    var issuerSeparator: String {
+        if issuer.isEmpty {
+            return ""
+        } else {
+            return "|"
+        }
     }
 
     var blockChainName: String {

Trust/Tokens/Views/TicketTokenViewCell.swift

@@ -72,6 +72,6 @@ class TicketTokenViewCell: UITableViewCell {
 
         separator.textColor = viewModel.subtitleColor
         separator.font = viewModel.subtitleFont
-        separator.text = "|"
+        separator.text = viewModel.issuerSeparator
     }
 }

Trust/Tokens/Views/TicketsViewControllerHeader.swift

@@ -63,11 +63,10 @@ class TicketsViewControllerHeader: UIView {
         if issuer.isEmpty {
             issuerLabel.text = ""
         } else {
-            issuerLabel.text = "\(R.string.localizable.aWalletContentsIssuerTitle()): \(issuer)"
+            issuerLabel.text = issuer
         }
-
         separator.textColor = viewModel.subtitleColor
         separator.font = viewModel.subtitleFont
-        separator.text = "|"
+        separator.text = viewModel.issuerSeparator
     }
-}
+}