From 244b6dc1be9414d9a8a23d1ad53bdddd41e10792 Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Mon, 7 Dec 2020 09:43:42 -0800
Subject: [PATCH] Fix Messenger not showing up in Sandy

Summary: Metro and Mac device were always hidden in Sandy, but they should only be hidden if they don't have underlying Clients. Fixes https://fb.workplace.com/groups/748354712423318/permalink/775342569724532/

Reviewed By: nikoant

Differential Revision: D25369492

fbshipit-source-id: fdc25c3646d8339ae029425b4c45d8631bbee762
---
 .../sandy-chrome/appinspect/AppSelector.tsx   | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
index 7e1265f9c..da6c41f9d 100644
--- a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
+++ b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
@@ -172,29 +172,38 @@ function computeEntries(
   onSelectDevice: (device: BaseDevice) => void,
   onSelectApp: (device: BaseDevice, client: Client) => void,
 ) {
-  const entries = devices.filter(canBeDefaultDevice).map((device) => {
-    const deviceEntry = (
-      <Menu.Item
-        icon={getOsIcon(device.os)}
-        key={device.serial}
-        style={{fontWeight: 'bold'}}
-        onClick={() => {
-          onSelectDevice(device);
-        }}>
-        {device.displayTitle()}
-      </Menu.Item>
-    );
-    const clientEntries = getAvailableClients(device, clients).map((client) => (
-      <Menu.Item
-        key={client.id}
-        onClick={() => {
-          onSelectApp(device, client);
-        }}>
-        <Radio value={client.id}>{client.query.app}</Radio>
-      </Menu.Item>
-    ));
-    return [deviceEntry, ...clientEntries];
-  });
+  const entries = devices
+    .filter(
+      (device) =>
+        // hide non default devices, unless they have a connected client
+        canBeDefaultDevice(device) ||
+        clients.some((c) => c.deviceSync === device),
+    )
+    .map((device) => {
+      const deviceEntry = (
+        <Menu.Item
+          icon={getOsIcon(device.os)}
+          key={device.serial}
+          style={{fontWeight: 'bold'}}
+          onClick={() => {
+            onSelectDevice(device);
+          }}>
+          {device.displayTitle()}
+        </Menu.Item>
+      );
+      const clientEntries = getAvailableClients(device, clients).map(
+        (client) => (
+          <Menu.Item
+            key={client.id}
+            onClick={() => {
+              onSelectApp(device, client);
+            }}>
+            <Radio value={client.id}>{client.query.app}</Radio>
+          </Menu.Item>
+        ),
+      );
+      return [deviceEntry, ...clientEntries];
+    });
   if (uninitializedClients.length) {
     entries.push([
       <Menu.Item key="connecting" style={{fontWeight: 'bold'}}>