[7.x] [APM]: Fix render error when license has not been loaded… (elas…

…tic#54777)
dgieselaar · Jan 14, 2020 · 51dccb9 · 51dccb9
1 parent 17135a6
commit 51dccb9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/x-pack/legacy/plugins/apm/public/context/LicenseContext/index.tsx b/x-pack/legacy/plugins/apm/public/context/LicenseContext/index.tsx
@@ -16,8 +16,9 @@ export const LicenseContext = React.createContext<ILicense | undefined>(
 
 export function LicenseProvider({ children }: { children: React.ReactChild }) {
   const { license$ } = useApmPluginContext().plugins.licensing;
-  const license = useObservable(license$, { isActive: true } as ILicense);
-  const hasInvalidLicense = !license.isActive;
+  const license = useObservable(license$);
+  // if license is not loaded yet, consider it valid
+  const hasInvalidLicense = license?.isActive === false;
 
   // if license is invalid show an error message
   if (hasInvalidLicense) {