chore: fix cherry-pick conflicts

wireapp · Jan 17, 2025 · 7de7f38 · 7de7f38
1 parent de27928
commit 7de7f38
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift b/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift
@@ -505,20 +505,7 @@ extension AuthenticationCoordinator {
 
     /// Opens the URL in the selected browser
     private func openURL(_ url: URL) {
-<<<<<<< HEAD
-        let browser = BrowserViewController(url: url)
-        browser.onDismiss = {
-            if let alertModel = self.pendingAlert {
-                self.stopActivityIndicator()
-                self.presentAlert(for: alertModel)
-                self.pendingAlert = nil
-            }
-        }
-
-        presenter?.present(browser, animated: true, completion: nil)
-=======
         url.open()
->>>>>>> 4714bdf90b (feat: open password reset link in browser - WPB-11685 (#2095))
     }
 
     /// Presents an error alert.

diff --git a/...ources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift b/...ources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift
@@ -403,7 +403,6 @@ extension SettingsCellDescriptorFactory {
 
     func resetPasswordElement() -> any SettingsCellDescriptorType {
         let resetPasswordTitle = L10n.Localizable.Self.Settings.PasswordResetMenu.title
-<<<<<<< HEAD
         return SettingsExternalScreenCellDescriptor(
             title: resetPasswordTitle,
             isDestructive: false,
@@ -413,12 +412,6 @@ extension SettingsCellDescriptorFactory {
             },
             previewGenerator: .none
         )
-=======
-        return SettingsExternalScreenCellDescriptor(title: resetPasswordTitle, isDestructive: false, presentationStyle: .modal, presentationAction: {
-            URL.wr_passwordReset.open()
-            return nil
-        }, previewGenerator: .none)
->>>>>>> 4714bdf90b (feat: open password reset link in browser - WPB-11685 (#2095))
     }
 
     func deleteAccountButtonElement() -> any SettingsCellDescriptorType {