Rebase master

trustwallet · Mar 9, 2018 · 15aa971 · 15aa971
1 parent d2755b2
commit 15aa971
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/Trust.xcodeproj/project.pbxproj b/Trust.xcodeproj/project.pbxproj
@@ -2198,11 +2198,8 @@
 			children = (
 				902CAB582051818A00F96FFE /* BookmarkViewCell.xib */,
 				77B3BF492019247200EEC15A /* BrowserNavigationBar.swift */,
-<<<<<<< master
 				902CAB5A2051835E00F96FFE /* BookmarkViewCell.swift */,
-=======
 				BBB61E112050993A00428BBD /* BrowserErrorView.swift */,
->>>>>>> HEAD~0
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -2828,11 +2825,8 @@
 				29DBF2A71F9F145900327C60 /* StateViewModel.swift in Sources */,
 				2923D9B31FDA49F8000CF3F8 /* SkipBackupFilesInitializer.swift in Sources */,
 				294DFBA01FE0CADE004CEB56 /* TransactionDetailsViewModel.swift in Sources */,
-<<<<<<< master
 				90DDF48520518AE50016E6D4 /* BookmarkViewModel.swift in Sources */,
-=======
 				BBB61E122050993A00428BBD /* BrowserErrorView.swift in Sources */,
->>>>>>> HEAD~0
 				29C80D4B1FB51C460037B1E0 /* Decimal.swift in Sources */,
 				297800521F71FDCF003185C1 /* FormAppearance.swift in Sources */,
 				77B3BF3C201908ED00EEC15A /* ConfirmCoordinator.swift in Sources */,

diff --git a/Trust/Browser/ViewControllers/BrowserViewController.swift b/Trust/Browser/ViewControllers/BrowserViewController.swift
@@ -46,7 +46,6 @@ class BrowserViewController: UIViewController {
 
     lazy var errorView: BrowserErrorView = {
         let errorView = BrowserErrorView()
-        errorView.isHidden = false
         errorView.translatesAutoresizingMaskIntoConstraints = false
         return errorView
     }()
@@ -144,11 +143,13 @@ class BrowserViewController: UIViewController {
 
     private func goHome() {
         guard let url = URL(string: Constants.dappsBrowserURL) else { return }
+        hideErrorView()
         webView.load(URLRequest(url: url))
         browserNavBar?.textField.text = url.absoluteString
     }
 
     private func reload() {
+        hideErrorView()
         webView.reload()
     }
 

diff --git a/Trust/Browser/Views/BrowserErrorView.swift b/Trust/Browser/Views/BrowserErrorView.swift
@@ -12,7 +12,6 @@ class BrowserErrorView: UIView {
         label.numberOfLines = 0
         label.textColor = Colors.gray
         label.font = UIFont.systemFont(ofSize: 18)
-
         label.translatesAutoresizingMaskIntoConstraints = false
         return label
     }()