fix building issues after merge

Session/Conversations/Message Cells/Content Views/MediaView.swift

@@ -507,17 +507,20 @@ struct MediaView_SwiftUI: UIViewRepresentable {
     private let mediaCache: NSCache<NSString, AnyObject>?
     public let attachment: Attachment
     private let isOutgoing: Bool
+    private let shouldSupressControls: Bool
     private let cornerRadius: CGFloat
     
     public init(
         mediaCache: NSCache<NSString, AnyObject>? = nil,
         attachment: Attachment,
         isOutgoing: Bool,
+        shouldSupressControls: Bool,
         cornerRadius: CGFloat
     ) {
         self.mediaCache = mediaCache
         self.attachment = attachment
         self.isOutgoing = isOutgoing
+        self.shouldSupressControls = shouldSupressControls
         self.cornerRadius = cornerRadius
     }
     
@@ -526,6 +529,7 @@ struct MediaView_SwiftUI: UIViewRepresentable {
             mediaCache: mediaCache,
             attachment: attachment,
             isOutgoing: isOutgoing,
+            shouldSupressControls: shouldSupressControls,
             cornerRadius: cornerRadius
         )
         

Session/Media Viewing & Editing/MessageInfoView.swift

@@ -125,6 +125,7 @@ struct MessageInfoView: View {
                                     MediaView_SwiftUI(
                                         attachment: attachments[0],
                                         isOutgoing: (messageViewModel.variant == .standardOutgoing),
+                                        shouldSupressControls: true,
                                         cornerRadius: 0
                                     )
                                     .frame(

Session/Onboarding/LoadAccountView.swift

@@ -305,7 +305,7 @@ struct ScanQRCodeView: View {
                     Button {
                         requestCameraAccess()
                     } label: {
-                        Text("vc_scan_qr_code_grant_camera_access_button_title".localized())
+                        Text("continue_2".localized())
                             .bold()
                             .font(.system(size: Values.mediumFontSize))
                             .foregroundColor(themeColor: .primary)

Session/Shared/SessionCarouselView+SwiftUI.swift

@@ -30,6 +30,7 @@ public struct SessionCarouselView_SwiftUI: View {
                     MediaView_SwiftUI(
                         attachment: attachment,
                         isOutgoing: self.isOutgoing,
+                        shouldSupressControls: true,
                         cornerRadius: 0
                     )
                 }