Fix Homepage navigation

DuckDuckGo/BrowserTab/Model/Tab.swift

@@ -198,7 +198,7 @@ final class Tab: NSObject {
     }
 
     func update(url: URL?, userEntered: Bool = true) {
-        self.content = .url(url ?? .emptyPage)
+        self.content = url == .homePage ? .homepage : .url(url ?? .blankPage)
 
         // This function is called when the user has manually typed in a new address, which should reset the login detection flow.
         userEnteredUrl = userEntered
@@ -287,8 +287,19 @@ final class Tab: NSObject {
     }
 
     private func reloadIfNeeded(shouldLoadInBackground: Bool = false) {
+        let url: URL
+        switch self.content {
+        case .url(let value):
+            url = value
+        case .homepage:
+            url = .homePage
+        default:
+            url = .blankPage
+        }
         guard webView.superview != nil || shouldLoadInBackground,
-              webView.url != self.content.url
+              webView.url != url
+                // Initial Home Page shouldn't show Back Button
+                && webView.url != self.content.url
         else { return }
 
         if let sessionStateData = self.sessionStateData {
@@ -299,11 +310,7 @@ final class Tab: NSObject {
                 os_log("Tab:setupWebView could not restore session state %s", "\(error)")
             }
         }
-        if let url = self.content.url {
-            webView.load(url)
-        } else {
-            webView.load(URL.emptyPage)
-        }
+        webView.load(url)
     }
 
     func stopLoading() {

DuckDuckGo/BrowserTab/ViewModel/TabViewModel.swift

@@ -124,15 +124,15 @@ final class TabViewModel {
     }
 
     private func updateCanReload() {
-        canReload = tab.content.url ?? .emptyPage != .emptyPage
+        canReload = tab.content.url ?? .blankPage != .blankPage
     }
 
     func updateCanGoBack() {
         canGoBack = tab.canGoBack || tab.canBeClosedWithBack
     }
 
     private func updateCanBeBookmarked() {
-        canBeBookmarked = tab.content.url ?? .emptyPage != .emptyPage
+        canBeBookmarked = tab.content.url ?? .blankPage != .blankPage
     }
 
     private func updateAddressBarStrings() {
@@ -170,7 +170,7 @@ final class TabViewModel {
         if let searchQuery = url.searchQuery {
             addressBarString = searchQuery
             passiveAddressBarString = searchQuery
-        } else if url == URL.emptyPage {
+        } else if [.blankPage, .homePage].contains(url) {
             addressBarString = ""
             passiveAddressBarString = ""
         } else {

DuckDuckGo/BrowserTab/ViewModel/WebViewStateObserver.swift

@@ -81,7 +81,7 @@ final class WebViewStateObserver: NSObject {
         switch keyPath {
         case #keyPath(WKWebView.url):
             if let url = webView.url {
-                tabViewModel.tab.setContent(.url(url))
+                tabViewModel.tab.setContent(url == .homePage ? .homepage : .url(url))
                 tabViewModel.tab.addVisit(of: url)
             }
             updateTitle() // The title might not change if webView doesn't think anything is different so update title here as well

DuckDuckGo/Common/Extensions/URLExtension.swift

@@ -68,10 +68,14 @@ extension URL {
         return url
     }
 
-    static var emptyPage: URL {
+    static var blankPage: URL {
         return URL(string: "about:blank")!
     }
 
+    static var homePage: URL {
+        return URL(string: "about:home")!
+    }
+
     // MARK: Pixel
 
     static let pixelBase = ProcessInfo.processInfo.environment["PIXEL_BASE_URL", default: "https://improving.duckduckgo.com"]

DuckDuckGo/FileDownload/Services/DownloadListCoordinator.swift

@@ -341,7 +341,7 @@ private extension DownloadListItem {
         self.init(identifier: UUID(),
                   added: now,
                   modified: now,
-                  url: task.originalRequest?.url ?? .emptyPage,
+                  url: task.originalRequest?.url ?? .blankPage,
                   websiteURL: task.originalRequest?.mainDocumentURL,
                   progress: task.progress,
                   destinationURL: nil,

DuckDuckGo/NavigationBar/ViewModel/WKBackForwardListItemViewModel.swift

@@ -36,7 +36,7 @@ final class WKBackForwardListItemViewModel {
     var title: String {
         switch backForwardListItem {
         case .backForwardListItem(let item):
-            if item.url == URL.emptyPage {
+            if item.url == .homePage {
                 return UserText.tabHomeTitle
             }
 
@@ -61,7 +61,7 @@ final class WKBackForwardListItemViewModel {
     }
 
     var image: NSImage? {
-        if backForwardListItem.url == URL.emptyPage {
+        if backForwardListItem.url == .homePage {
             return NSImage(named: "HomeFavicon")
         }
 

DuckDuckGo/TabBar/View/TabBarViewController.swift

@@ -588,7 +588,7 @@ extension TabBarViewController: NSCollectionViewDelegate {
         if let url = tabCollectionViewModel.tabCollection.tabs[indexPath.item].content.url {
             return url as NSURL
         } else {
-            return URL.emptyPage as NSURL
+            return URL.blankPage as NSURL
         }
     }
 

Unit Tests/Configuration/ConfigurationDownloaderTests.swift

@@ -328,22 +328,22 @@ fileprivate extension HTTPURLResponse {
     static let ifNoneMatchHeader = "If-None-Match"
     static let etagValue = "test-etag"
 
-    static let success = HTTPURLResponse(url: URL.emptyPage,
+    static let success = HTTPURLResponse(url: URL.blankPage,
                                          statusCode: 200,
                                          httpVersion: nil,
                                          headerFields: [HTTPURLResponse.etagHeader: HTTPURLResponse.etagValue])!
 
-    static let notModified = HTTPURLResponse(url: URL.emptyPage,
+    static let notModified = HTTPURLResponse(url: URL.blankPage,
                                              statusCode: 304,
                                              httpVersion: nil,
                                              headerFields: [HTTPURLResponse.etagHeader: HTTPURLResponse.etagValue])!
 
-    static let internalServerError = HTTPURLResponse(url: URL.emptyPage,
+    static let internalServerError = HTTPURLResponse(url: URL.blankPage,
                                                      statusCode: 500,
                                                      httpVersion: nil,
                                                      headerFields: [:])!
 
-    static let successNoEtag = HTTPURLResponse(url: URL.emptyPage,
+    static let successNoEtag = HTTPURLResponse(url: URL.blankPage,
                                                statusCode: 200,
                                                httpVersion: nil,
                                                headerFields: [:])!

Unit Tests/TabBar/ViewModel/TabCollectionViewModelTests.swift

@@ -383,6 +383,6 @@ fileprivate extension TabCollectionViewModel {
 
 extension Tab {
     convenience init(parentTab: Tab) {
-        self.init(content: .url(.emptyPage), parentTab: parentTab)
+        self.init(content: .url(.blankPage), parentTab: parentTab)
     }
 }