Merge branch 'main' into wt/sticker

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

@@ -60,5 +60,5 @@ jobs:
           env:
             JOB_STATUS: ${{ job.status == 'success' && ':white_check_mark:' || job.status == 'failure' && ':x:' }}
             JOB_STATUS_COLOR: ${{ job.status == 'success' && '#36a64f' || job.status == 'failure' && '#FF0000' }}
-            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+            SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_SLACK_TOKEN }}
             SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

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

@@ -64,4 +64,4 @@ jobs:
   call-firefox-ios-autofill-playwrite-tests:
     uses: ./.github/workflows/firefox-ios-autofill-playwrite-tests.yml
     secrets:
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_SLACK_TOKEN }}

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

@@ -69,7 +69,7 @@ jobs:
         env:
           JOB_STATUS: ${{ job.status == 'success' && ':white_check_mark:' || job.status == 'failure' && ':x:' }}
           JOB_STATUS_COLOR: ${{ job.status == 'success' && '#36a64f' || job.status == 'failure' && '#FF0000' }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_URL: ${{ secrets.WEBHOOK_SLACK_TOKEN }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
         with:
           payload-file-path: "./test-fixtures/ci/slack-notification-payload-remote-settings-fetch.json"

.github/workflows/update_readme_current_tech_stack.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
     update_readme_with_current_stack:
-        runs-on: ubuntu-latest
+        runs-on: macos-latest
 
         steps:
             - name: Checkout code

BrowserKit/Package.swift

@@ -58,7 +58,7 @@ let package = Package(
             exact: "2.0.0"),
         .package(
             url: "https://github.com/getsentry/sentry-cocoa.git",
-            exact: "8.36.0"),
+            exact: "8.21.0"),
         .package(
             url: "https://github.com/nbhasin2/GCDWebServer.git",
             branch: "master"),

BrowserKit/Sources/Common/Utilities/AppInfo.swift

@@ -20,15 +20,24 @@ open class AppInfo {
     }
 
     public static var bundleIdentifier: String {
-        return applicationBundle.object(forInfoDictionaryKey: "CFBundleIdentifier") as! String
+        guard let bundleIdentifier = applicationBundle.object(forInfoDictionaryKey: "CFBundleIdentifier") as? String else {
+            fatalError("CFBundleIdentifier not found in info.plist")
+        }
+        return bundleIdentifier
     }
 
     public static var appVersion: String {
-        return applicationBundle.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
+        guard let appVersion = applicationBundle.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String else {
+            fatalError("CFBundleShortVersionString not found in info.plist")
+        }
+        return appVersion
     }
 
     public static var buildNumber: String {
-        return applicationBundle.object(forInfoDictionaryKey: String(kCFBundleVersionKey)) as! String
+        guard let buildNumber = applicationBundle.object(forInfoDictionaryKey: String(kCFBundleVersionKey)) as? String else {
+            fatalError("kCFBundleVersionKey not found in info.plist")
+        }
+        return buildNumber
     }
 
     /// Return the base bundle identifier.
@@ -38,7 +47,9 @@ open class AppInfo {
     /// of the *base* bundle identifier.
     public static var baseBundleIdentifier: String {
         let bundle = Bundle.main
-        let packageType = bundle.object(forInfoDictionaryKey: "CFBundlePackageType") as! String
+        guard let packageType = bundle.object(forInfoDictionaryKey: "CFBundlePackageType") as? String else {
+            fatalError("CFBundlePackageType not found in info.plist")
+        }
         let baseBundleIdentifier = bundle.bundleIdentifier!
         if packageType == "XPC!" {
             let components = baseBundleIdentifier.components(separatedBy: ".")

BrowserKit/Sources/ComponentLibrary/Headers/NavigationHeaderView.swift

@@ -98,11 +98,16 @@ public final class NavigationHeaderView: UIView {
 
     public func setupAccessibility(closeButtonA11yLabel: String,
                                    closeButtonA11yId: String,
+                                   titleA11yId: String? = nil,
                                    backButtonA11yLabel: String,
                                    backButtonA11yId: String) {
         let closeButtonViewModel = CloseButtonViewModel(a11yLabel: closeButtonA11yLabel,
                                                         a11yIdentifier: closeButtonA11yId)
         closeButton.configure(viewModel: closeButtonViewModel)
+        if let titleA11yId {
+            titleLabel.isAccessibilityElement = true
+            titleLabel.accessibilityIdentifier = titleA11yId
+        }
         backButton.accessibilityIdentifier = backButtonA11yId
         backButton.accessibilityLabel = backButtonA11yLabel
     }

BrowserKit/Sources/MenuKit/MenuDetailView.swift

@@ -49,10 +49,12 @@ public final class MenuDetailView: UIView,
 
     public func setupAccessibilityIdentifiers(closeButtonA11yLabel: String,
                                               closeButtonA11yId: String,
+                                              titleA11yId: String? = nil,
                                               backButtonA11yLabel: String,
                                               backButtonA11yId: String) {
         detailHeaderView.setupAccessibility(closeButtonA11yLabel: closeButtonA11yLabel,
                                             closeButtonA11yId: closeButtonA11yId,
+                                            titleA11yId: titleA11yId,
                                             backButtonA11yLabel: backButtonA11yLabel,
                                             backButtonA11yId: backButtonA11yId)
     }

BrowserKit/Sources/Redux/DispatchStore.swift

@@ -9,8 +9,8 @@ public protocol DispatchStore {
     func dispatch(_ action: Action)
 }
 
-public protocol DefaultDispatchStore: DispatchStore {
-    associatedtype State: StateType
+public protocol DefaultDispatchStore<State>: DispatchStore where State: StateType {
+    associatedtype State
 
     var state: State { get }
 

BrowserKit/Sources/Redux/Store.swift

@@ -96,6 +96,7 @@ public class Store<State: StateType>: DefaultDispatchStore {
         // (Note: this is true even if the action's UUID differs from the screen's window's UUID).
         // Typically, reducers should compare the action's UUID to the incoming state UUID and skip
         // processing for actions originating in other windows.
+        // Note that only reducers for active screens are processed.
         let newState = reducer(state, action)
 
         // Middlewares are all given an opportunity to respond to the action. This is only done once

BrowserKit/Sources/ToolbarKit/AddressToolbar/BrowserAddressToolbar.swift

@@ -257,9 +257,15 @@ public class BrowserAddressToolbar: UIView,
     }
 
     private func updateActionStack(stackView: UIStackView, toolbarElements: [ToolbarElement]) {
+        let existingButtons = stackView.arrangedSubviews.compactMap { $0 as? ToolbarButton }
         stackView.removeAllArrangedViews()
+
         toolbarElements.forEach { toolbarElement in
-            let button = toolbarElement.numberOfTabs != nil ? TabNumberButton() : ToolbarButton()
+            // find existing button or create new one
+            // we do this to avoid having a new button every time we re-configure the address toolbar
+            // as this can result in button taps not resulting in correct action because the action
+            // as the reference to an old and not displayed button (e.g. the menu that is displayed from the menu button)
+            let button = newOrExistingToolbarButton(for: toolbarElement, existingButtons: existingButtons)
             button.configure(element: toolbarElement)
             stackView.addArrangedSubview(button)
 
@@ -279,6 +285,17 @@ public class BrowserAddressToolbar: UIView,
         }
     }
 
+    private func newOrExistingToolbarButton(for element: ToolbarElement,
+                                            existingButtons: [ToolbarButton]) -> ToolbarButton {
+        let existingButton = existingButtons.first { $0.isButtonFor(toolbarElement: element) }
+
+        guard let existingButton else {
+            return element.numberOfTabs != nil ? TabNumberButton() : ToolbarButton()
+        }
+
+        return existingButton
+    }
+
     private func updateActionSpacing() {
         // Browser action spacing
         let hasBrowserActions = !browserActionStack.arrangedSubviews.isEmpty

BrowserKit/Sources/ToolbarKit/AddressToolbar/LocationView/LocationView.swift

@@ -16,6 +16,7 @@ final class LocationView: UIView,
         static let gradientViewWidth: CGFloat = 40
         static let iconContainerCornerRadius: CGFloat = 8
         static let lockIconImageViewSize = CGSize(width: 40, height: 24)
+        static let iconContainerNoLockLeadingSpace: CGFloat = 16
     }
 
     private var urlAbsolutePath: String?
@@ -248,7 +249,10 @@ final class LocationView: UIView,
         removeContainerIcons()
         iconContainerStackView.addArrangedSubview(lockIconButton)
         updateURLTextFieldLeadingConstraint()
-        iconContainerStackViewLeadingConstraint?.constant = 0
+
+        let leadingConstraint = lockIconImageName == nil ? UX.iconContainerNoLockLeadingSpace : 0.0
+
+        iconContainerStackViewLeadingConstraint?.constant = leadingConstraint
         updateGradient()
     }
 
@@ -282,7 +286,7 @@ final class LocationView: UIView,
         urlTextField.text = text
 
         // Start overlay mode & select text when in edit mode with a search term
-        if shouldShowKeyboard == true && state.shouldSelectSearchTerm == true {
+        if shouldShowKeyboard, state.shouldSelectSearchTerm {
             DispatchQueue.main.async {
                 self.urlTextField.text = text
                 self.urlTextField.selectAll(nil)

BrowserKit/Sources/ToolbarKit/ToolbarButton.swift

@@ -70,6 +70,12 @@ class ToolbarButton: UIButton, ThemeApplicable {
             if let maskImageName = element.maskImageName {
                 addMaskIcon(maskImageName: maskImageName)
             }
+        } else {
+            // Remove badge & mask icons
+            imageView?.subviews.forEach { view in
+                guard view as? UIImageView != nil else { return }
+                view.removeFromSuperview()
+            }
         }
         layoutIfNeeded()
     }
@@ -96,6 +102,17 @@ class ToolbarButton: UIButton, ThemeApplicable {
         configuration = updatedConfiguration
     }
 
+    public func isButtonFor(toolbarElement: ToolbarElement) -> Bool {
+        guard let config = configuration else { return false }
+
+        return isSelected == toolbarElement.isSelected &&
+            config.image == imageConfiguredForRTL(for: toolbarElement) &&
+            isEnabled == toolbarElement.isEnabled &&
+            accessibilityIdentifier == toolbarElement.a11yId &&
+            accessibilityLabel == toolbarElement.a11yLabel &&
+            accessibilityHint == toolbarElement.a11yHint
+    }
+
     private func addBadgeIcon(imageName: String) {
         badgeImageView = UIImageView(image: UIImage(named: imageName))
         guard let badgeImageView, configuration?.image != nil else { return }

firefox-ios/Account/FxAPushMessageHandler.swift

@@ -6,6 +6,7 @@ import Shared
 import Account
 import Common
 import enum MozillaAppServices.IncomingDeviceCommand
+import enum MozillaAppServices.AccountEvent
 
 let PendingAccountDisconnectedKey = "PendingAccountDisconnect"
 
@@ -34,36 +35,15 @@ extension FxAPushMessageHandler {
             RustFirefoxAccounts.reconfig(prefs: self.profile.prefs) { accountManager in
                 accountManager.deviceConstellation()?.handlePushMessage(pushPayload: message) { result in
                     guard case .success(let event) = result else {
-                        let err: PushMessageError
-                        if case .failure(let error) = result {
-                            self.logger.log("Failed to get any events from FxA",
-                                            level: .warning,
-                                            category: .sync,
-                                            description: error.localizedDescription)
-                            err = PushMessageError.messageIncomplete(error.localizedDescription)
-                        } else {
-                            self.logger.log("Got zero events from FxA",
-                                            level: .warning,
-                                            category: .sync,
-                                            description: "No events retrieved from fxa")
-                            err = PushMessageError.messageIncomplete("empty message")
-                        }
+                        let err = self.makePushErrorMessageFrom(result: result)
                         completion(.failure(err))
                         return
                     }
 
                     switch event {
                     case .commandReceived(let deviceCommand):
-                        switch deviceCommand {
-                        case .tabReceived(_, let tabData):
-                            let title = tabData.entries.last?.title ?? ""
-                            let url = tabData.entries.last?.url ?? ""
-                            let command = CommandReceived.tabReceived(tab: ["title": title, "url": url])
-                            completion(.success(PushMessage.commandReceived(command: command)))
-                        case .tabsClosed(_, let payload):
-                            let command = CommandReceived.tabsClosed(urls: payload.urls)
-                            completion(.success(PushMessage.commandReceived(command: command)))
-                        }
+                        let pushMessage = self.makePushMessageFrom(deviceCommand: deviceCommand)
+                        completion(.success(pushMessage))
                     case .deviceConnected(let deviceName):
                         completion(.success(PushMessage.deviceConnected(deviceName)))
                     case let .deviceDisconnected(_, isLocalDevice):
@@ -83,6 +63,35 @@ extension FxAPushMessageHandler {
             }
         }
     }
+
+    private func makePushErrorMessageFrom(result: Result<AccountEvent, Error>) -> PushMessageError {
+        if case .failure(let error) = result {
+            self.logger.log("Failed to get any events from FxA",
+                            level: .warning,
+                            category: .sync,
+                            description: error.localizedDescription)
+            return PushMessageError.messageIncomplete(error.localizedDescription)
+        } else {
+            self.logger.log("Got zero events from FxA",
+                            level: .warning,
+                            category: .sync,
+                            description: "No events retrieved from fxa")
+            return PushMessageError.messageIncomplete("empty message")
+        }
+    }
+
+    private func makePushMessageFrom(deviceCommand: IncomingDeviceCommand) -> PushMessage {
+        switch deviceCommand {
+        case .tabReceived(_, let tabData):
+            let title = tabData.entries.last?.title ?? ""
+            let url = tabData.entries.last?.url ?? ""
+            let command = CommandReceived.tabReceived(tab: ["title": title, "url": url])
+            return PushMessage.commandReceived(command: command)
+        case .tabsClosed(_, let payload):
+            let command = CommandReceived.tabsClosed(urls: payload.urls)
+            return PushMessage.commandReceived(command: command)
+        }
+    }
 }
 
 enum PushMessageType: String {