fix: coderrabit suggestions

Author: divyanshu-patil

app/sagas/login.js

@@ -228,6 +228,14 @@ const fetchWatchReplies = function* fetchWatchRepliesFork() {
 	try {
 		// we are getting replies from server settings
 		const state = yield select(state => state);
+
+		if (!state.settings?.Apple_Watch_Quick_Actions) {
+			yield delay(1000);
+			const newState = yield select();
+			syncWatchOSQuickRepliesWithServer(newState);
+			return;
+		}
+
 		syncWatchOSQuickRepliesWithServer(state);
 	} catch (e) {
 		log(e);

ios/RCTWatchModule.mm

@@ -124,8 +124,7 @@ - (NSString *)syncQuickReplies {
                         return message;
                     }
 
-                    NSString *replies = [array componentsJoinedByString:@", "];
-                    return replies;
+                    return @"SUCCESS";
                 } catch (const std::exception &e) {
                     NSString *message = @"[ERROR]: Watch sync exception";
                     RCTLogError(@"Watch sync exception: %s", e.what());

ios/RocketChat Watch App/Views/MessageComposerView.swift

@@ -4,7 +4,7 @@ struct MessageComposerView: View {
     @State private var message = ""
 
     let room: Room
-    let server: Server
+    @ObservedObject var server: Server
     let anchorID: String
     let onSend: (String) -> Void
 

ios/RocketChat Watch App/Views/MessageListView.swift

@@ -44,64 +44,70 @@ struct MessageListView: View {
                     }
                     Spacer()
                 }
-            }
-            ScrollViewReader{ proxy in
-                
-                ChatScrollView {
-                    VStack(spacing: 0) {
-                        if room.hasMoreMessages {
-                            Button("Load more...") {
-                                guard let oldestMessage = room.firstMessage?.ts
-                                else { return }
-                                
-                                messagesLoader.loadMore(from: oldestMessage)
+            } else {
+                ScrollViewReader { proxy in
+                    ChatScrollView {
+                        VStack(spacing: 0) {
+                            if room.hasMoreMessages {
+                                Button("Load more...") {
+                                    guard
+                                        let oldestMessage = room.firstMessage?
+                                            .ts
+                                    else { return }
+
+                                    messagesLoader.loadMore(from: oldestMessage)
+                                }
+                                .padding(.bottom, 8)
                             }
-                            .padding(.bottom, 8)
-                        }
-                        
-                        ForEach(messages.indices, id: \.self) { index in
-                            let message = messages[index]
-                            let previousMessage =
-                            messages.indices.contains(index - 1)
-                            ? messages[index - 1] : nil
-                            
-                            MessageView(
-                                viewModel: .init(
-                                    message: message,
-                                    previousMessage: previousMessage,
-                                    server: server,
-                                    lastOpen: lastOpen
-                                )
-                            ) { action in
-                                switch action {
-                                case .resend(let message):
-                                    messageSender.resendMessage(
+
+                            ForEach(messages.indices, id: \.self) { index in
+                                let message = messages[index]
+                                let previousMessage =
+                                    messages.indices.contains(index - 1)
+                                    ? messages[index - 1] : nil
+
+                                MessageView(
+                                    viewModel: .init(
                                         message: message,
-                                        in: room
+                                        previousMessage: previousMessage,
+                                        server: server,
+                                        lastOpen: lastOpen
                                     )
-                                    
-                                    lastOpen = nil
-                                case .delete(let message):
-                                    database.remove(message)
+                                ) { action in
+                                    switch action {
+                                    case .resend(let message):
+                                        messageSender.resendMessage(
+                                            message: message,
+                                            in: room
+                                        )
+
+                                        lastOpen = nil
+                                    case .delete(let message):
+                                        database.remove(message)
+                                    }
                                 }
                             }
+
+                            MessageComposerView(
+                                room: room,
+                                server: server,
+                                anchorID: bottomAnchor
+                            ) {
+                                messageSender.sendMessage($0, in: room)
+
+                                lastOpen = nil
+                            }
+                            .id(messageComposer)
+                            .padding(.top, 8)
                         }
-                        
-                        MessageComposerView(room: room, server: server, anchorID: bottomAnchor) {
-                            messageSender.sendMessage($0, in: room)
-                            
-                            lastOpen = nil
+                        .onAppear {
+                            scrollToBottom(proxy: proxy)
                         }
-                        .id(messageComposer)
-                        .padding(.top, 8)
-                    }
-                    .onAppear {
-                        scrollToBottom(proxy: proxy)
-                    }
-                    .onChange(of: messages.last?.ts) { _ in
-                        // Also scroll to bottom when new messages arrive
-                        withAnimation(.easeOut(duration: 0.3)) {
-                            proxy.scrollTo(bottomAnchor, anchor: .center)
+                        .onChange(of: messages.last?.ts) { _ in
+                            // Also scroll to bottom when new messages arrive
+                            withAnimation(.easeOut(duration: 0.3)) {
+                                proxy.scrollTo(bottomAnchor, anchor: .center)
+                            }
                         }
                     }
                 }
@@ -144,10 +150,11 @@ struct MessageListView: View {
             }
         }
     }
+    
     private func scrollToBottom(proxy: ScrollViewProxy) {
-            // Small delay ensures layout is complete before scrolling
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
-                proxy.scrollTo(bottomAnchor, anchor: .bottom)
-            }
+        // Small delay ensures layout is complete before scrolling
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            proxy.scrollTo(bottomAnchor, anchor: .bottom)
         }
+    }
 }