Merge pull request #1370 from nukeador/dev

fix: prevent "name is undefined" error in CompanyIcon component

Author: miles-grant-ibigroup

Diff for: lib/components/util/company-icon-internal.tsx

@@ -12,7 +12,7 @@ const CompanyIcon = ({
   fallbackContent = null,
   ...otherProps
 }: Props): ReactElement | null => {
-  const CompanyIcon = getCompanyIcon ? getCompanyIcon(company) : null
+  const CompanyIcon = getCompanyIcon && company ? getCompanyIcon(company) : null
   return CompanyIcon ? (
     <Suspense fallback={<span>{company}</span>}>
       <CompanyIcon {...otherProps} />

Diff for: lib/components/viewers/nearby/rental-station.tsx

@@ -25,7 +25,7 @@ const RentalStation = ({ companies, fromToSlot, place }: Props) => {
 
   const stationIcon = (
     <CompanyIcon
-      company={company}
+      company={company || ''}
       fallbackContent={<Bicycle />}
       height={22}
       style={{ marginRight: '5px' }}

Diff for: lib/components/viewers/nearby/vehicle-rent.tsx

@@ -97,7 +97,7 @@ const Vehicle = ({
           <IconWithText
             icon={
               <CompanyIcon
-                company={vehicle.network}
+                company={vehicle.network || ''}
                 fallbackContent={getVehicleIcon(formFactor)}
                 height={22}
                 style={{ marginRight: '5px' }}