Avoid throwing an NPE in the Grid UI

regularfry · Jul 6, 2021 · ee0193d · ee0193d
1 parent 9049a6f
commit ee0193d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/javascript/grid-ui/src/util/browser-logo.tsx b/javascript/grid-ui/src/util/browser-logo.tsx
@@ -9,6 +9,10 @@ import safariTechnologyPreviewLogo
 import unknownBrowserLogo from '../assets/browsers/unknown.svg'
 
 const browserLogo = (browser: string): string => {
+  if (!browser) {
+    return unknownBrowserLogo
+  }
+
   switch (browser.toLowerCase()) {
     case 'chrome':
       return chromeLogo

diff --git a/javascript/grid-ui/src/util/os-logo.tsx b/javascript/grid-ui/src/util/os-logo.tsx
@@ -4,6 +4,10 @@ import linuxLogo from '../assets/operating-systems/linux.svg'
 import unknownOsLogo from '../assets/operating-systems/unknown.svg'
 
 const osLogo = (os: string): string => {
+  if (!os) {
+    return unknownOsLogo
+  }
+
   const osLowerCase: string = os.toLowerCase()
   if (osLowerCase.includes('win')) {
     return windowsLogo