Rebase Web Viewer on latest upstream

.claude/skills/bootstrap/SKILL.md

@@ -0,0 +1,31 @@
+---
+name: bootstrap
+description: Setup both Firefox and Focus for iOS after fetching from git.
+allowed-tools: Bash(brew *) Bash(which *)
+---
+
+First, check if `fxios` is installed:
+
+```
+which fxios
+```
+
+If it is not installed, run:
+
+```
+brew tap mozilla-mobile/fxios
+brew install fxios
+```
+
+If it is installed, upgrade to the latest version:
+
+```
+brew upgrade fxios
+```
+
+Then run these steps in sequence from the root of the firefox-ios repository:
+
+1. `fxios --version`
+2. `fxios bootstrap --all`
+
+Stop and report if any step fails.

.github/workflows/check-kingfisher-dependency.yml

@@ -0,0 +1,101 @@
+name: Create a PR to update Kingfisher to the newest version available
+on:
+  schedule:
+    - cron: '0 8 * * 1'
+  workflow_dispatch:
+    inputs:
+      branchName:
+        description: 'Branch used as target for automation'
+        required: true
+        default: 'main'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.10.16]
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r ./test-fixtures/requirements.txt
+
+    - name: Update Kingfisher version in Package.swift and all Package.resolved files
+      run: |
+        python ./test-fixtures/update-kingfisher-version.py
+
+    - name: Get new Kingfisher version to be used in the PR info
+      run: |
+        if [ -f test-fixtures/newest_kingfisher_tag.txt ]; then
+          echo "kingfisher_version=$(cat test-fixtures/newest_kingfisher_tag.txt | tr -d '[:space:]')" >> $GITHUB_ENV
+        fi
+
+    - name: Remove temp file created to store the tag info
+      run: |
+        [ ! -e test-fixtures/newest_kingfisher_tag.txt ] || rm test-fixtures/newest_kingfisher_tag.txt
+
+    - name: Script to check if branch exists to not commit again
+      run: |-
+        branch=$(curl -X GET -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/mozilla-mobile/firefox-ios/branches?per_page=100 | jq -r '.[].name | select(contains("update-spm-new-kingfisher-tag-${{ env.kingfisher_version }}"))')
+        echo $branch
+        if [ -z "$branch" ]; then echo "BRANCH_CREATED=false" >> $GITHUB_ENV; else echo "BRANCH_CREATED=true" >> $GITHUB_ENV; fi
+
+    - name: Determine PR Version Number
+      id: versioning
+      run: |
+        output=$(bash test-fixtures/ci/get-next-pr-version)
+        echo "$output"
+        next_version=$(echo "$output" | tail -n 1)
+        echo "Next Firefox iOS version is: v${next_version}"
+        echo "next_app_version=${next_version}" >> $GITHUB_ENV
+
+    - name: Stage updated files
+      if: env.BRANCH_CREATED == 'false' && env.kingfisher_version != ''
+      run: |-
+        git diff
+        git diff --quiet || (git add \
+          BrowserKit/Package.swift \
+          BrowserKit/Package.resolved \
+          firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved \
+          SampleComponentLibraryApp/SampleComponentLibraryApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved \
+          focus-ios/Blockzilla.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v6
+      if: env.BRANCH_CREATED == 'false' && env.kingfisher_version != ''
+      with:
+        commit-message: Auto update SPM with latest Kingfisher release ${{ env.kingfisher_version }}
+        author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+        committer: GitHub <noreply@github.com>
+        title: Bump FXIOS [Dependency] Auto update SPM for v${{ env.next_app_version }} with latest Kingfisher ${{ env.kingfisher_version }}
+        branch: update-spm-new-kingfisher-tag-${{ env.kingfisher_version }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set job log URL
+      if: always()
+      run: echo "JOB_LOG_URL=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
+
+    - name: Send Slack notification if action fails
+      if: '!cancelled()'
+      id: slack
+      uses: slackapi/slack-github-action@v2.0.0
+      env:
+        ACTION_NAME: Kingfisher dependency update
+        JOB_STATUS: ${{ job.status == 'success' && ':white_check_mark:' || job.status == 'failure' && ':x:' }}
+        JOB_STATUS_COLOR: ${{ job.status == 'success' && '#36a64f' || job.status == 'failure' && '#FF0000' }}
+      with:
+        payload-file-path: "./test-fixtures/ci/slack-notification-payload-generic.json"
+        payload-templated: true
+        webhook: ${{ secrets.WEBHOOK_SLACK_TOKEN }}
+        webhook-type: incoming-webhook

.github/workflows/firefox-ios-autofill-playwrite-tests.yml

@@ -56,10 +56,11 @@ jobs:
           id: slack
           uses: slackapi/slack-github-action@v2.0.0
           with:
-            payload-file-path: "./test-fixtures/ci/slack-notification-payload-autofill-test.json"
+            payload-file-path: "./test-fixtures/ci/slack-notification-payload-generic.json"
             payload-templated: true
             webhook: ${{ secrets.WEBHOOK_SLACK_TOKEN }}
             webhook-type: incoming-webhook
           env:
+            ACTION_NAME: credential provider playwrite tests
             JOB_STATUS: ${{ job.status == 'success' && ':white_check_mark:' || job.status == 'failure' && ':x:' }}
             JOB_STATUS_COLOR: ${{ job.status == 'success' && '#36a64f' || job.status == 'failure' && '#FF0000' }}

.github/workflows/firefox-ios-update_credential_provider_script.yml

@@ -55,10 +55,11 @@ jobs:
       id: slack
       uses: slackapi/slack-github-action@v2.0.0
       env:
+        ACTION_NAME: credential provider script
         JOB_STATUS: ${{ job.status == 'success' && ':white_check_mark:' || job.status == 'failure' && ':x:' }}
         JOB_STATUS_COLOR: ${{ job.status == 'success' && '#36a64f' || job.status == 'failure' && '#FF0000' }}
       with:
-        payload-file-path: "./test-fixtures/ci/slack-notification-payload-autofill.json"
+        payload-file-path: "./test-fixtures/ci/slack-notification-payload-generic.json"
         payload-templated: true
         webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
         webhook-type: incoming-webhook

.github/workflows/firefox-ios-update_remote_settings_data_script.yml

@@ -67,10 +67,11 @@ jobs:
         id: slack
         uses: slackapi/slack-github-action@v2.0.0
         env:
+          ACTION_NAME: remote settings fetch
           JOB_STATUS: ${{ job.status == 'success' && ':white_check_mark:' || job.status == 'failure' && ':x:' }}
           JOB_STATUS_COLOR: ${{ job.status == 'success' && '#36a64f' || job.status == 'failure' && '#FF0000' }}
         with:
-          payload-file-path: "./test-fixtures/ci/slack-notification-payload-remote-settings-fetch.json"
+          payload-file-path: "./test-fixtures/ci/slack-notification-payload-generic.json"
           payload-templated: true
           webhook: ${{ secrets.WEBHOOK_SLACK_TOKEN }}
           webhook-type: incoming-webhook

BrowserKit/.swiftpm/xcode/xcshareddata/xcschemes/QuickAnswersKit.xcscheme

@@ -28,7 +28,30 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES"
       shouldAutocreateTestPlan = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "QuickAnswers"
+            BuildableName = "QuickAnswers"
+            BlueprintName = "QuickAnswers"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </CodeCoverageTargets>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "QuickAnswersTests"
+               BuildableName = "QuickAnswersTests"
+               BlueprintName = "QuickAnswersTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

BrowserKit/Package.swift

@@ -271,7 +271,7 @@ let package = Package(
             ]),
         .target(
             name: "QuickAnswersKit",
-            dependencies: ["Common", "Shared", "MLPAKit", "LLMKit"],
+            dependencies: ["Common", "Shared", "MLPAKit", "LLMKit", "SiteImageView"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"])
             ]

BrowserKit/Sources/ComponentLibrary/Buttons/ChipButton.swift

@@ -28,6 +28,7 @@ public final class ChipButton: UIButton, ThemeApplicable {
         configuration?.cornerStyle = .capsule
         configuration?.background.backgroundColorTransformer = nil
         configuration?.titleLineBreakMode = .byTruncatingTail
+        layer.masksToBounds = false
 
         addTarget(self, action: #selector(tapped), for: .touchUpInside)
     }
@@ -56,6 +57,11 @@ public final class ChipButton: UIButton, ThemeApplicable {
         )
     }
 
+    override public func layoutSubviews() {
+        super.layoutSubviews()
+        layer.shadowPath = UIBezierPath(roundedRect: bounds, cornerRadius: bounds.height / 2).cgPath
+    }
+
     override public func updateConfiguration() {
         guard var updatedConfiguration = configuration else { return }
 
@@ -83,6 +89,7 @@ public final class ChipButton: UIButton, ThemeApplicable {
         }
 
         configuration = updatedConfiguration
+        layer.shadowOpacity = isEnabled ? FxShadow.shadow200.opacity : 0
 
         if !isEnabled {
             accessibilityTraits = [.button, .notEnabled]
@@ -116,6 +123,7 @@ public final class ChipButton: UIButton, ThemeApplicable {
         selectedForegroundColor = theme.colors.textInverted
         disabledBackgroundColor = theme.colors.layer2
         disabledForegroundColor = theme.colors.textDisabled
+        applyShadow(FxShadow.shadow200, theme: theme)
         setNeedsUpdateConfiguration()
     }
 

BrowserKit/Sources/ComponentLibrary/ChipPickerView.swift

@@ -6,13 +6,14 @@ import Common
 import UIKit
 
 /// A horizontally scrolling picker that renders selectable options as chip buttons.
-public final class ChipPickerView: UIView, ThemeApplicable {
+public final class ChipPickerView: UIView, ThemeApplicable, UIScrollViewDelegate {
     public struct UX {
         public static let itemSpacing: CGFloat = 10
     }
 
     private lazy var scrollView: UIScrollView = .build { scrollView in
         scrollView.showsHorizontalScrollIndicator = false
+        scrollView.clipsToBounds = false
     }
 
     private lazy var stackView: UIStackView = .build { stackView in
@@ -26,9 +27,11 @@ public final class ChipPickerView: UIView, ThemeApplicable {
     private var items = [ChipPickerItem]()
     private var selectedID: String?
     private var onSelection: (@MainActor (String) -> Void)?
+    private var onScroll: ((CGFloat) -> Void)?
 
     override public init(frame: CGRect) {
         super.init(frame: frame)
+        clipsToBounds = false
         setupLayout()
     }
 
@@ -39,26 +42,41 @@ public final class ChipPickerView: UIView, ThemeApplicable {
     public func configure(
         items: [ChipPickerItem],
         selectedID: String?,
+        contentOffsetX: CGFloat = 0,
+        onScroll: ((CGFloat) -> Void)? = nil,
         onSelection: (@MainActor (String) -> Void)? = nil
     ) {
         self.items = items
         self.selectedID = selectedID
         self.onSelection = onSelection
+        self.onScroll = onScroll
         rebuildButtons()
+        updateContentOffsetX(contentOffsetX)
     }
 
     public func applyTheme(theme: Theme) {
         currentTheme = theme
         chipButtons.forEach { $0.applyTheme(theme: theme) }
     }
 
+    public func updateSelectedID(_ selectedID: String?) {
+        self.selectedID = selectedID
+        rebuildButtons()
+        scrollView.layoutIfNeeded()
+    }
+
+    public func updateContentOffsetX(_ contentOffsetX: CGFloat) {
+        scrollView.setContentOffset(CGPoint(x: contentOffsetX, y: 0), animated: false)
+    }
+
     private var chipButtons: [ChipButton] {
         stackView.arrangedSubviews.compactMap { $0 as? ChipButton }
     }
 
     private func setupLayout() {
         addSubview(scrollView)
         scrollView.addSubview(stackView)
+        scrollView.delegate = self
 
         NSLayoutConstraint.activate([
             scrollView.topAnchor.constraint(equalTo: topAnchor),
@@ -104,4 +122,10 @@ public final class ChipPickerView: UIView, ThemeApplicable {
         rebuildButtons()
         onSelection?(id)
     }
+
+    // MARK: = UIScrollViewDelegate
+
+    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        onScroll?(scrollView.contentOffset.x)
+    }
 }

BrowserKit/Sources/LLMKit/LiteLLMCreator.swift

@@ -4,8 +4,14 @@
 import Shared
 import MLPAKit
 
-public struct LiteLLMCreator {
-    public static func createAppAttestLiteLLM(using prefs: Prefs) -> LiteLLMClient? {
+public protocol LiteLLMCreating {
+    func createAppAttestLiteLLM(using prefs: Prefs) -> LiteLLMClientProtocol?
+}
+
+public struct LiteLLMCreator: LiteLLMCreating {
+    public init() { }
+
+    public func createAppAttestLiteLLM(using prefs: Prefs) -> LiteLLMClientProtocol? {
         let mlpaEnvironmentKey = prefs.stringForKey(PrefsKeys.MLPASettings.mlpaEndpointEnvironment) ?? ""
         let mlpaEnvironment = MLPAEnvironment(rawValue: mlpaEnvironmentKey) ?? .prod
         guard let endPoint = MLPAConstants.completionsEndpoint(with: mlpaEnvironment),

BrowserKit/Sources/MLPAKit/MLPAJWTPayload.swift

@@ -19,6 +19,9 @@ public enum MLPAConstants {
     static let assertionObjParam = "assertion_obj_b64"
 
     static let serviceTypeHeader = "service-type"
+
+    // TODO: FXIOS-15123 - need to create an enum service type here
+    // eventually to also account for quick-answers
     static let serviceTypeValue = "s2s"
     static let useAppAttestHeader = "use-app-attest"