From 281dfc3bb44de1e214f09d3a3dc06295f0f50c15 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Thu, 19 Oct 2023 11:20:12 +1100
Subject: [PATCH] fix building issues after merge

---
 .../Conversations/Message Cells/Content Views/MediaView.swift | 4 ++++
 Session/Media Viewing & Editing/MessageInfoView.swift         | 1 +
 Session/Onboarding/LoadAccountView.swift                      | 2 +-
 Session/Shared/SessionCarouselView+SwiftUI.swift              | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Session/Conversations/Message Cells/Content Views/MediaView.swift b/Session/Conversations/Message Cells/Content Views/MediaView.swift
index 7c7b95323..72e93f718 100644
--- a/Session/Conversations/Message Cells/Content Views/MediaView.swift	
+++ b/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
         )
         
diff --git a/Session/Media Viewing & Editing/MessageInfoView.swift b/Session/Media Viewing & Editing/MessageInfoView.swift
index dfc8d7350..8e60f658b 100644
--- a/Session/Media Viewing & Editing/MessageInfoView.swift	
+++ b/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(
diff --git a/Session/Onboarding/LoadAccountView.swift b/Session/Onboarding/LoadAccountView.swift
index 81cfc5bd6..db2c4f23f 100644
--- a/Session/Onboarding/LoadAccountView.swift
+++ b/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)
diff --git a/Session/Shared/SessionCarouselView+SwiftUI.swift b/Session/Shared/SessionCarouselView+SwiftUI.swift
index d626a1c18..4e441922d 100644
--- a/Session/Shared/SessionCarouselView+SwiftUI.swift
+++ b/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
                     )
                 }