Merge branch 'feat/devtron-license' into feat/license-ga

AbhishekA1509 · AbhishekA1509 · commit d9dbbe15952b · 2025-03-27T15:01:49.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.9.8-beta-7",
+    "version": "1.9.8-beta-8",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Shared/Components/DevtronLicenseCard/types.ts b/src/Shared/Components/DevtronLicenseCard/types.ts
@@ -24,7 +24,7 @@ export type DevtronLicenseCardProps = {
       }
 )
 
-export type DevtronLicenseInfo = DevtronLicenseCardProps &
+export type DevtronLicenseInfo = Omit<DevtronLicenseCardProps, 'appTheme'> &
     Pick<DevtronLicenseDTO, 'fingerprint' | 'showLicenseData' | 'licenseStatusError'>
 
 export interface InstallFingerprintInfoProps extends Pick<DevtronLicenseBaseDTO, 'fingerprint'> {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@devtron-labs/devtron-fe-common-lib",`
`3`		`- "version": "1.9.8-beta-7",`
	`3`	`+ "version": "1.9.8-beta-8",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export type DevtronLicenseCardProps = {`
`24`	`24`	`}`
`25`	`25`	`)`
`26`	`26`
`27`		`-export type DevtronLicenseInfo = DevtronLicenseCardProps &`
	`27`	`+export type DevtronLicenseInfo = Omit<DevtronLicenseCardProps, 'appTheme'> &`
`28`	`28`	`Pick<DevtronLicenseDTO, 'fingerprint' \| 'showLicenseData' \| 'licenseStatusError'>`
`29`	`29`
`30`	`30`	`export interface InstallFingerprintInfoProps extends Pick<DevtronLicenseBaseDTO, 'fingerprint'> {`