From 3f45414846336850a748aae936d24ea2f290a483 Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Fri, 31 Jan 2020 05:07:44 -0800
Subject: [PATCH] Make sure important errors are always shown to the user

Summary:
This diff makes sure that important errors are always shown to the user, such as an xcode version mismatch.

Also made some small styling improvements

Reviewed By: jknoxville

Differential Revision: D19660337

fbshipit-source-id: 24dfb4d98bfdd1666164403f87b6a4e1dc915ddb
---
 src/chrome/ErrorBar.tsx      | 44 +++++++++++++++++++++++-------------
 src/dispatcher/iOSDevice.tsx |  1 +
 src/dispatcher/server.tsx    |  2 ++
 src/reducers/connections.tsx |  1 +
 src/utils/argvUtils.tsx      |  1 -
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/chrome/ErrorBar.tsx b/src/chrome/ErrorBar.tsx
index 9d62bbae9..d451cd097 100644
--- a/src/chrome/ErrorBar.tsx
+++ b/src/chrome/ErrorBar.tsx
@@ -37,10 +37,13 @@ const ErrorBar = memo(function ErrorBar(props: Props) {
     0,
   );
 
+  const urgentErrors = props.errors.filter(e => e.urgent);
+
   return (
     <ErrorBarContainer>
-      <ErrorRows className={collapsed ? 'collapsed' : ''}>
-        {props.errors.map((error, index) => (
+      <ErrorRows
+        className={collapsed && urgentErrors.length === 0 ? 'collapsed' : ''}>
+        {(collapsed ? urgentErrors : props.errors).map((error, index) => (
           <ErrorTile
             onDismiss={() => props.dismissError(index)}
             key={index}
@@ -81,16 +84,18 @@ function ErrorTile({
 }) {
   const [collapsed, setCollapsed] = useState(true);
   return (
-    <ErrorRow>
+    <ErrorRow className={`${error.urgent ? 'urgent' : ''}`}>
       <FlexRow style={{flexDirection: 'row-reverse'}}>
         <ButtonSection>
           <ButtonGroup>
             {(error.details || error.error) && (
-              <Button onClick={() => setCollapsed(s => !s)}>
-                {collapsed ? `▼ ` : '▲ '} Details
-              </Button>
+              <Button
+                onClick={() => setCollapsed(s => !s)}
+                icon={collapsed ? `chevron-down` : 'chevron-up'}
+                iconSize={12}
+              />
             )}
-            <Button onClick={onDismiss}>Dismiss</Button>
+            <Button onClick={onDismiss} icon="cross-circle" iconSize={12} />
           </ButtonGroup>
         </ButtonSection>
         {error.occurrences! > 1 && (
@@ -149,22 +154,28 @@ const ErrorDetails = styled.div({
 });
 
 const ErrorRows = styled.div({
-  backgroundColor: colors.cherry,
   color: '#fff',
   maxHeight: '600px',
   overflowY: 'auto',
   overflowX: 'hidden',
   transition: 'max-height 0.3s ease',
+  borderBottom: '1px solid #b3b3b3',
   '&.collapsed': {
     maxHeight: '0px',
+    borderBottom: 'none',
   },
 });
 
 const ErrorRow = styled.div({
   padding: '4px 12px',
-  borderBottom: '1px solid ' + colors.cherryDark3,
   verticalAlign: 'middle',
   lineHeight: '28px',
+  backgroundColor: colors.yellowTint,
+  color: colors.yellow,
+  '&.urgent': {
+    backgroundColor: colors.redTint,
+    color: colors.red,
+  },
 });
 
 const ButtonSection = styled(FlexColumn)({
@@ -174,15 +185,16 @@ const ButtonSection = styled(FlexColumn)({
 });
 
 const ErrorCounter = styled(FlexColumn)({
-  backgroundColor: colors.cherryDark3,
-  color: colors.cherry,
-  width: 24,
-  height: 24,
-  borderRadius: 24,
-  marginTop: 2,
-  lineHeight: '24px',
+  border: `1px solid ${colors.light20}`,
+  color: colors.light20,
+  width: 20,
+  height: 20,
+  borderRadius: 20,
+  marginTop: 4,
+  lineHeight: '18px',
   textAlign: 'center',
   flexShrink: 0,
   flexGrow: 0,
   marginLeft: '8px',
+  fontSize: '10px',
 });
diff --git a/src/dispatcher/iOSDevice.tsx b/src/dispatcher/iOSDevice.tsx
index 9701b8ad7..21074f816 100644
--- a/src/dispatcher/iOSDevice.tsx
+++ b/src/dispatcher/iOSDevice.tsx
@@ -191,6 +191,7 @@ async function checkXcodeVersionMismatch(store: Store) {
             message: errorMessage,
             details:
               "You might want to run 'sudo xcode-select -s /Applications/Xcode.app/Contents/Developer'",
+            urgent: true,
           },
         });
         // Fire a console.error as well, so that it gets reported to the backend.
diff --git a/src/dispatcher/server.tsx b/src/dispatcher/server.tsx
index 569ec9d6c..977462bea 100644
--- a/src/dispatcher/server.tsx
+++ b/src/dispatcher/server.tsx
@@ -46,10 +46,12 @@ export default (store: Store, logger: Logger) => {
       err.code === 'EADDRINUSE'
         ? "Couldn't start websocket server. Looks like you have multiple copies of Flipper running."
         : err.message || 'Unknown error';
+    const urgent = err.code === 'EADDRINUSE';
 
     store.dispatch({
       type: 'SERVER_ERROR',
       payload: {message},
+      urgent,
     });
   });
 
diff --git a/src/reducers/connections.tsx b/src/reducers/connections.tsx
index b113a4907..717bf43cb 100644
--- a/src/reducers/connections.tsx
+++ b/src/reducers/connections.tsx
@@ -43,6 +43,7 @@ export type FlipperError = {
   message: string;
   details?: string;
   error?: Error | string;
+  urgent?: boolean; // if true this error should always popup up
 };
 
 export type State = {
diff --git a/src/utils/argvUtils.tsx b/src/utils/argvUtils.tsx
index 9f14e8cf3..45f9f8804 100644
--- a/src/utils/argvUtils.tsx
+++ b/src/utils/argvUtils.tsx
@@ -7,7 +7,6 @@
  * @format
  */
 
-import electron from 'electron';
 import isProduction from './isProduction';
 import processConfig from './processConfig';