Merge remote-tracking branch 'upstream/master' into sort-favorites

flutter/lib/common/widgets/chat_page.dart

@@ -73,7 +73,7 @@ class ChatPage extends StatelessWidget implements PageShape {
                               ? InputDecoration(
                                   isDense: true,
                                   hintText:
-                                      "${translate('Write a message')}...",
+                                      "${translate('Write a message')}",
                                   filled: true,
                                   fillColor:
                                       Theme.of(context).colorScheme.background,
@@ -88,7 +88,7 @@ class ChatPage extends StatelessWidget implements PageShape {
                                 )
                               : defaultInputDecoration(
                                   hintText:
-                                      "${translate('Write a message')}...",
+                                      "${translate('Write a message')}",
                                   fillColor:
                                       Theme.of(context).colorScheme.background),
                           sendButtonBuilder: defaultSendButton(

flutter/lib/common/widgets/peer_card.dart

@@ -890,13 +890,10 @@ class DiscoveredPeerCard extends BasePeerCard {
       menuItems.add(_createShortCutAction(peer.id));
     }
 
-    final inRecent = await bind.mainIsInRecentPeers(id: peer.id);
-    if (inRecent) {
-      if (!favs.contains(peer.id)) {
-        menuItems.add(_addFavAction(peer.id));
-      } else {
-        menuItems.add(_rmFavAction(peer.id, () async {}));
-      }
+    if (!favs.contains(peer.id)) {
+      menuItems.add(_addFavAction(peer.id));
+    } else {
+      menuItems.add(_rmFavAction(peer.id, () async {}));
     }
 
     if (gFFI.userModel.userName.isNotEmpty) {

flutter/lib/desktop/widgets/remote_menubar.dart

@@ -509,7 +509,10 @@ class _MonitorMenu extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (stateGlobal.displaysCount.value < 2) return Offstage();
+    if (PrivacyModeState.find(id).isTrue ||
+        stateGlobal.displaysCount.value < 2) {
+      return Offstage();
+    }
     return _IconSubmenuButton(
         icon: icon(),
         ffi: ffi,
@@ -1546,6 +1549,16 @@ class _DisplayMenuState extends State<_DisplayMenu> {
         value: rxValue.value,
         onChanged: (value) {
           if (value == null) return;
+          if (widget.ffi.ffiModel.pi.currentDisplay != 0) {
+            msgBox(
+                widget.id,
+                'custom-nook-nocancel-hasclose',
+                'info',
+                'Please switch to Display 1 first',
+                '',
+                widget.ffi.dialogManager);
+            return;
+          }
           bind.sessionToggleOption(id: widget.id, value: option);
         },
         ffi: widget.ffi,

flutter/lib/models/server_model.dart

@@ -456,7 +456,8 @@ class ServerModel with ChangeNotifier {
     Future.delayed(Duration.zero, () async {
       if (!hideCm) window_on_top(null);
     });
-    if (client.authorized) {
+    // Only do the hidden task when on Desktop.
+    if (client.authorized && isDesktop) {
       cmHiddenTimer = Timer(const Duration(seconds: 3), () {
         if (!hideCm) windowManager.minimize();
         cmHiddenTimer = null;