fix toolbar icon and fix a few warnings (#31)

Task/Issue URL: https://app.asana.com/0/1144193759412024/1204184574938009/f Tech Design URL: CC: Description: fix toolbar icon and fix a few warnings Steps to test this PR: Install the Safari extension and enable it Ensure DDG icon shown next to address bar and in the "customise toolbar" view
duckduckgo · Mar 24, 2023 · e62c366 · e62c366
1 parent ce03b5c
commit e62c366
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/SafariAppExtension/Dashboard/Support/ToolbarIcon.pdf b/SafariAppExtension/Dashboard/Support/ToolbarIcon.pdf
diff --git a/SafariAppExtension/Dashboard/SwiftUI/RequestsDetailViewModel.swift b/SafariAppExtension/Dashboard/SwiftUI/RequestsDetailViewModel.swift
@@ -156,7 +156,6 @@ class RequestsDetailViewModel: ObservableObject {
 
     }
 
-    // swiftlint:disable function_body_length
     func updateState() {
         guard let pageData = pageData, !isNewTab else { return }
 
@@ -224,7 +223,6 @@ class RequestsDetailViewModel: ObservableObject {
         }
 
     }
-    // swiftlint:enable function_body_length
 
 }
 

diff --git a/SafariAppExtension/Dashboard/SwiftUI/TrackersDetailViewModel.swift b/SafariAppExtension/Dashboard/SwiftUI/TrackersDetailViewModel.swift
@@ -64,7 +64,6 @@ class TrackersDetailViewModel: ObservableObject {
         blockedEntities = EntityDetailsModel.entityDetailsFromTrackers(pageData.blockedTrackers)
     }
 
-    // swiftlint:disable function_body_length
     func updateState() {
         guard let pageData = pageData, !isNewTab else { return }
 
@@ -132,6 +131,5 @@ class TrackersDetailViewModel: ObservableObject {
         }
 
     }
-    // swiftlint:enable function_body_length
 
 }
diff --git a/SafariAppExtension/Extension/SafariExtensionActor.swift b/SafariAppExtension/Extension/SafariExtensionActor.swift
@@ -128,7 +128,7 @@ actor SafariExtensionActor {
         guard let activePage = await activeWindow.activeTab()?.activePage(),
               let properties = await activePage.properties(),
               let url = properties.url else {
-            await SafariExtensionViewController.shared.dismissPopover()
+            SafariExtensionViewController.shared.dismissPopover()
             toolbarItem.setImage(ToolbarIcon.currentIcon)
             return
         }

diff --git a/UnitTests/TrackerDetectionTests.swift b/UnitTests/TrackerDetectionTests.swift
@@ -21,8 +21,8 @@ import XCTest
 @testable import TrackerBlocking
 @testable import TrackerRadarKit
 
-/// This is subject to change once known trackers are available to the app.
 // swiftlint:disable type_body_length
+/// This is subject to change once known trackers are available to the app.
 class TrackerDetectionTests: XCTestCase {
 
     struct TestCase: Codable {