Merge branch 'main' into release/7.139.0

duckduckgo · Sep 27, 2024 · 6e6a8c3 · 6e6a8c3
2 parents 4a6642a + 9046336
commit 6e6a8c3
Show file tree

Hide file tree

Showing 45 changed files with 334 additions and 533 deletions.
diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
@@ -103,7 +103,6 @@ jobs:
 
     steps:
     - name: Create Asana task when workflow failed
-      if: ${{ failure() }}
       run: |
         curl -s "https://app.asana.com/api/1.0/tasks" \
           --header "Accept: application/json" \

diff --git a/.github/workflows/pr-task-url.yml b/.github/workflows/pr-task-url.yml
@@ -2,7 +2,7 @@ name: Asana PR Task URL
 
 on: 
   pull_request:
-    types: [opened, edited, closed, synchronize, review_requested]
+    types: [opened, edited, closed, synchronize, review_requested, ready_for_review]
 
 jobs:
 
@@ -14,6 +14,8 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    if: ${{ !github.event.pull_request.draft }}
+
     outputs:
       task_id: ${{ steps.get-task-id.outputs.task_id }}
       task_in_project: ${{ steps.check-board-membership.outputs.task_in_project }}
@@ -47,7 +49,7 @@ jobs:
 
     - name: Add Task to the App Board Project
       id: add-task-to-project
-      if: ${{ github.event.action == 'opened' && steps.check-board-membership.outputs.task_in_project == '0' }}
+      if: ${{ (github.event.action == 'opened' || github.event.action == 'ready_for_review') && steps.check-board-membership.outputs.task_in_project == '0' }}
       env:
         ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
         ASANA_PROJECT_ID: ${{ vars.IOS_APP_BOARD_ASANA_PROJECT_ID }}

diff --git a/.maestro/release_tests/tabs.yaml b/.maestro/release_tests/tabs.yaml
@@ -46,6 +46,27 @@ tags:
 - assertVisible: ".*Privacy Test Pages.*"
 - tapOn: "Refresh Page"
 
+# Suggestions
+- assertVisible:
+    id: "searchEntry"
+
+- tapOn: 
+    id: "searchEntry"
+- inputText: "ad click"
+- assertVisible: "Switch to Tab.*search-company.site"
+- tapOn: "Switch to Tab.*search-company.site"
+- assertVisible: ".*Ad Click Flow.*"
+
+- tapOn: 
+    id: "searchEntry"
+- inputText: "privacy"
+- assertVisible: "Switch to Tab.*privacy-test-pages.site"
+- tapOn: "Switch to Tab.*privacy-test-pages.site"
+- assertVisible: ".*Privacy Test Pages.*"
+
+# Needed or else test can't see the Tab Switcher button for some reason
+- tapOn: "Refresh Page"
+
 # Close Tab
 - assertVisible: Tab Switcher
 - tapOn: Tab Switcher
@@ -57,3 +78,26 @@ tags:
 - assertNotVisible: ".*Ad Click Flow.*"
 - assertVisible: "1 Private Tab"
 - tapOn: "Done"
+
+# Switch tabs from new tab
+- tapOn: "Refresh Page"
+- assertVisible: Tab Switcher
+- tapOn: Tab Switcher
+- assertVisible: ".*Privacy Test Pages.*"
+- assertVisible: 
+    id: "Add"
+- tapOn:
+    id: "Add"
+- assertVisible:
+    id: "searchEntry"
+- tapOn: 
+    id: "searchEntry"
+- inputText: "privacy"
+- assertVisible: "Switch to Tab.*privacy-test-pages.site"
+- tapOn: "Switch to Tab.*privacy-test-pages.site"
+- assertVisible: ".*Privacy Test Pages.*"
+- tapOn: "Refresh Page"
+- assertVisible: Tab Switcher
+- tapOn: Tab Switcher
+- assertVisible: "1 Private Tab"
+
diff --git a/Core/AppURLs.swift b/Core/AppURLs.swift
@@ -35,7 +35,7 @@ public extension URL {
     static let emailProtectionSupportLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/email/settings/support"))!
     static let emailProtectionHelpPageLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/duckduckgo-help-pages/email-protection/what-is-duckduckgo-email-protection/"))!
     static let aboutLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/about"))!
-    static let apps = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/apps"))!
+    static let apps = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/apps?origin=funnel_app_ios"))!
     static let searchSettings = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/settings"))!
     static let autofillHelpPageLink = URL(string: AppDeepLinkSchemes.quickLink.appending("\(ddg.host!)/duckduckgo-help-pages/sync-and-backup/password-manager-security/"))!
 

diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -766,7 +766,6 @@ extension Pixel {
         case newTabPageMessageDismissed
 
         case newTabPageFavoritesPlaceholderTapped
-        case newTabPageFavoritesInfoTooltip
 
         case newTabPageFavoritesSeeMore
         case newTabPageFavoritesSeeLess
@@ -1581,7 +1580,6 @@ extension Pixel.Event {
         case .newTabPageMessageDismissed: return "m_new_tab_page_message_dismissed"
 
         case .newTabPageFavoritesPlaceholderTapped: return "m_new_tab_page_favorites_placeholder_click"
-        case .newTabPageFavoritesInfoTooltip: return "m_new_tab_page_favorites_info_tooltip"
 
         case .newTabPageFavoritesSeeMore: return "m_new_tab_page_favorites_see_more"
         case .newTabPageFavoritesSeeLess: return "m_new_tab_page_favorites_see_less"

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "4db50292abf1180d66da55cf83f75d37395df1f9",
-        "version" : "198.1.0"
+        "revision" : "b60b38bace7262e0c4a006018b7e4b060ba4b754",
+        "version" : "198.2.1"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "2bed9e2963b2a9232452911d0773fac8b56416a1",
-        "version" : "6.17.0"
+        "revision" : "1ed569676555d493c9c5575eaed22aa02569aac9",
+        "version" : "6.19.0"
       }
     },
     {

diff --git a/...ckGo/AddFavoritePlaceholderItemView.swift → DuckDuckGo/FavoriteAddItemView.swift b/...ckGo/AddFavoritePlaceholderItemView.swift → DuckDuckGo/FavoriteAddItemView.swift
@@ -1,5 +1,5 @@
 //
-//  AddFavoritePlaceholderItemView.swift
+//  FavoriteAddItemView.swift
 //  DuckDuckGo
 //
 //  Copyright © 2024 DuckDuckGo. All rights reserved.
@@ -20,7 +20,7 @@
 import SwiftUI
 import DesignResourcesKit
 
-struct AddFavoritePlaceholderItemView: View {
+struct FavoriteAddItemView: View {
     var body: some View {
         RoundedRectangle(cornerRadius: 8, style: .continuous)
             .fill(.clear)
@@ -33,6 +33,6 @@ struct AddFavoritePlaceholderItemView: View {
 }
 
 #Preview {
-    AddFavoritePlaceholderItemView()
+    FavoriteAddItemView()
         .frame(width: 100)
 }
diff --git a/DuckDuckGo/FavoriteItem.swift b/DuckDuckGo/FavoriteItem.swift
@@ -23,6 +23,7 @@ import UniformTypeIdentifiers
 enum FavoriteItem {
     case favorite(Favorite)
     case addFavorite
+    case placeholder(_ id: String)
 }
 
 extension FavoriteItem: Identifiable {
@@ -32,6 +33,8 @@ extension FavoriteItem: Identifiable {
             return favorite.id
         case .addFavorite:
             return "addFavorite"
+        case .placeholder(let id):
+            return id
         }
     }
 }
@@ -43,7 +46,7 @@ extension FavoriteItem: Reorderable {
             let itemProvider = NSItemProvider(object: (favorite.urlObject?.absoluteString ?? "") as NSString)
             let metadata = MoveMetadata(itemProvider: itemProvider, type: .plainText)
             return .movable(metadata)
-        case .addFavorite:
+        case .addFavorite, .placeholder:
             return .stationary
         }
     }

diff --git a/DuckDuckGo/FavoriteEmptyStateItem.swift → DuckDuckGo/FavoritePlaceholderItemView.swift b/DuckDuckGo/FavoriteEmptyStateItem.swift → DuckDuckGo/FavoritePlaceholderItemView.swift
@@ -1,5 +1,5 @@
 //
-//  FavoriteEmptyStateItem.swift
+//  FavoritePlaceholderItemView.swift
 //  DuckDuckGo
 //
 //  Copyright © 2024 DuckDuckGo. All rights reserved.
@@ -19,7 +19,7 @@
 
 import SwiftUI
 
-struct FavoriteEmptyStateItem: View {
+struct FavoritePlaceholderItemView: View {
     var body: some View {
         RoundedRectangle(cornerRadius: 8, style: .continuous)
             .stroke(Color(designSystemColor: .lines),
@@ -29,5 +29,5 @@ struct FavoriteEmptyStateItem: View {
 }
 
 #Preview {
-    FavoriteEmptyStateItem()
+    FavoritePlaceholderItemView()
 }