Fixes for composer and DM

Dimillian · Feb 21, 2023 · ed9b2a3 · ed9b2a3
1 parent bf49a45
commit ed9b2a3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift b/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift
@@ -30,24 +30,23 @@ public struct ConversationDetailView: View {
 
   public var body: some View {
     ScrollViewReader { proxy in
-      ZStack(alignment: .bottom) {
-        ScrollView {
-          LazyVStack {
-            if viewModel.isLoadingMessages {
-              loadingView
-            }
-            ForEach(viewModel.messages) { message in
-              ConversationMessageView(message: message,
-                                      conversation: viewModel.conversation)
-                .padding(.vertical, 4)
-                .id(message.id)
-            }
-            bottomAnchorView
+      ScrollView {
+        LazyVStack {
+          if viewModel.isLoadingMessages {
+            loadingView
           }
-          .padding(.horizontal, .layoutPadding)
-          .padding(.bottom, 30)
+          ForEach(viewModel.messages) { message in
+            ConversationMessageView(message: message,
+                                    conversation: viewModel.conversation)
+              .padding(.vertical, 4)
+              .id(message.id)
+          }
+          bottomAnchorView
         }
-        .scrollDismissesKeyboard(.interactively)
+        .padding(.horizontal, .layoutPadding)
+      }
+      .scrollDismissesKeyboard(.interactively)
+      .safeAreaInset(edge: .bottom) {
         inputTextView
       }
       .onAppear {

diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
@@ -202,7 +202,7 @@ public struct StatusEditorView: View {
       dismiss()
       NotificationCenter.default.post(name: NotificationsName.shareSheetClose,
                                       object: nil)
-      if !viewModel.mode.isInShareExtension && !preferences.requestedReview {
+      if !viewModel.mode.isInShareExtension, !preferences.requestedReview, !ProcessInfo.processInfo.isiOSAppOnMac {
         if let scene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene {
           SKStoreReviewController.requestReview(in: scene)
         }