@@ -41,6 +41,7 @@ import {
41
41
LicenseInfoDialogType ,
42
42
DevtronLicenseInfo ,
43
43
useUserPreferences ,
44
+ AboutDevtronDialog ,
44
45
} from '@devtron-labs/devtron-fe-common-lib'
45
46
import { Route , Switch , useRouteMatch , useHistory , useLocation } from 'react-router-dom'
46
47
import * as Sentry from '@sentry/browser'
@@ -350,7 +351,8 @@ export default function NavigationRoutes() {
350
351
result . canOnlyViewPermittedEnvOrgLevel ??
351
352
ENVIRONMENT_DATA_FALLBACK [ 'canOnlyViewPermittedEnvOrgLevel' ] ,
352
353
featureGitOpsFlags : parsedFeatureGitOpsFlags ,
353
- canFetchHelmAppStatus : result . canFetchHelmAppStatus ?? ENVIRONMENT_DATA_FALLBACK [ 'canFetchHelmAppStatus' ] ,
354
+ canFetchHelmAppStatus :
355
+ result . canFetchHelmAppStatus ?? ENVIRONMENT_DATA_FALLBACK [ 'canFetchHelmAppStatus' ] ,
354
356
devtronManagedLicensingEnabled :
355
357
result . devtronManagedLicensingEnabled ??
356
358
ENVIRONMENT_DATA_FALLBACK [ 'devtronManagedLicensingEnabled' ] ,
@@ -438,6 +440,20 @@ export default function NavigationRoutes() {
438
440
439
441
const showStackManager = ! devtronManagedLicensingEnabled
440
442
443
+ const renderAboutDevtronDialog = ( ) => {
444
+ if ( ! licenseInfoDialogType ) {
445
+ return null
446
+ }
447
+ return licenseData && LicenseInfoDialog ? (
448
+ < LicenseInfoDialog
449
+ handleCloseLicenseInfoDialog = { handleCloseLicenseInfoDialog }
450
+ initialDialogType = { licenseInfoDialogType }
451
+ />
452
+ ) : (
453
+ < AboutDevtronDialog handleCloseLicenseInfoDialog = { handleCloseLicenseInfoDialog } />
454
+ )
455
+ }
456
+
441
457
return (
442
458
< MainContextProvider
443
459
value = { {
@@ -485,13 +501,7 @@ export default function NavigationRoutes() {
485
501
handleUpdateUserThemePreference = { handleUpdateUserThemePreference }
486
502
/>
487
503
) }
488
- { licenseInfoDialogType && LicenseInfoDialog && (
489
- < LicenseInfoDialog
490
- handleCloseLicenseInfoDialog = { handleCloseLicenseInfoDialog }
491
- currentVersion = { currentServerInfo . serverInfo ?. currentVersion }
492
- initialDialogType = { licenseInfoDialogType }
493
- />
494
- ) }
504
+ { renderAboutDevtronDialog ( ) }
495
505
{ ! _isOnboardingPage && (
496
506
< Navigation
497
507
currentServerInfo = { currentServerInfo }
0 commit comments