From 5c8aaabf71e1313d41efe03dca27a5d4766bfc0c Mon Sep 17 00:00:00 2001
From: Felipe <84182706+felipe-rod123@users.noreply.github.com>
Date: Tue, 13 Dec 2022 18:02:44 -0300
Subject: [PATCH 1/2] fix some dark theme bugs

---
 .../apps/AppDetailsPage/AppDetailsPageHeader.tsx     |  8 ++++++--
 .../AppDetailsPage/tabs/AppDetails/AppDetails.tsx    | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
index b177f0c3746f1..edac46226d2bf 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
@@ -31,12 +31,16 @@ const AppDetailsPageHeader = ({ app }: { app: App }): ReactElement => {
 			<AppAvatar size='x124' mie='x20' iconFileContent={iconFileContent} iconFileData={iconFileData} />
 			<Box display='flex' flexDirection='column'>
 				<Box display='flex' flexDirection='row' alignItems='center' mbe='x8'>
-					<Box fontScale='h1' mie='x8'>
+					<Box fontScale='h1' mie='x8' color='default'>
 						{name}
 					</Box>
 					{bundledIn && Boolean(bundledIn.length) && <BundleChips bundledIn={bundledIn} />}
 				</Box>
-				{app?.shortDescription && <Box mbe='x16'>{app.shortDescription}</Box>}
+				{app?.shortDescription && (
+					<Box mbe='x16' color='default'>
+						{app.shortDescription}
+					</Box>
+				)}
 
 				<Box display='flex' flexDirection='row' alignItems='center' mbe='x16'>
 					<AppStatus app={app} installed={installed} isAppDetailsPage />
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index 2222989070567..5e698e5bef02c 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -46,14 +46,18 @@ const AppDetails = ({ app }: { app: AppInfo }): ReactElement => {
 					{isCarouselVisible && <ScreenshotCarouselAnchor screenshots={screenshots} />}
 
 					<Box is='section'>
-						<Box fontScale='h4' mbe='x8'>
+						<Box fontScale='h4' mbe='x8' color='default'>
 							{t('Description')}
 						</Box>
-						<Box dangerouslySetInnerHTML={{ __html: isMarkdown ? detailedDescription.rendered : description }} withRichContent />
+						<Box
+							dangerouslySetInnerHTML={{ __html: isMarkdown ? detailedDescription.rendered : description }}
+							withRichContent
+							color='default'
+						/>
 					</Box>
 
 					<Box is='section'>
-						<Box fontScale='h4' mbe='x8'>
+						<Box fontScale='h4' mbe='x8' color='default'>
 							{t('Categories')}
 						</Box>
 						<ButtonGroup medium flexWrap='wrap'>
@@ -66,7 +70,7 @@ const AppDetails = ({ app }: { app: AppInfo }): ReactElement => {
 					</Box>
 
 					<Box is='section'>
-						<Box fontScale='h4' mbe='x8'>
+						<Box fontScale='h4' mbe='x8' color='default'>
 							{t('Contact')}
 						</Box>
 						<Box display='flex' flexDirection='row' flexGrow={1} justifyContent='space-around' flexWrap='wrap'>

From f5a2da6747a4c6a72074683036d92b3e271b2d5c Mon Sep 17 00:00:00 2001
From: Felipe <84182706+felipe-rod123@users.noreply.github.com>
Date: Fri, 13 Jan 2023 17:30:51 -0300
Subject: [PATCH 2/2] fix review

---
 .../admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx |  8 ++------
 .../apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx | 10 +++-------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
index ed12fe62d8bfa..842b001218005 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/AppDetailsPageHeader.tsx
@@ -31,16 +31,12 @@ const AppDetailsPageHeader = ({ app }: { app: App }): ReactElement => {
 			<AppAvatar size='x124' mie='x20' iconFileContent={iconFileContent} iconFileData={iconFileData} />
 			<Box display='flex' flexDirection='column'>
 				<Box display='flex' flexDirection='row' alignItems='center' mbe='x8'>
-					<Box fontScale='h1' mie='x8' color='default'>
+					<Box fontScale='h1' mie='x8'>
 						{name}
 					</Box>
 					{bundledIn && Boolean(bundledIn.length) && <BundleChips bundledIn={bundledIn} />}
 				</Box>
-				{app?.shortDescription && (
-					<Box mbe='x16' color='default'>
-						{app.shortDescription}
-					</Box>
-				)}
+				{app?.shortDescription && <Box mbe='x16'>{app.shortDescription}</Box>}
 
 				<Box display='flex' flexDirection='row' alignItems='center' mbe='x16'>
 					<AppStatus app={app} installed={installed} isAppDetailsPage />
diff --git a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index 8ad4fb93e17fc..8cb855e12af2c 100644
--- a/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -41,7 +41,7 @@ const AppDetails = ({ app }: { app: AppInfo }): ReactElement => {
 				</>
 			)}
 
-			<Box display='flex' flexDirection='column' color='default'>
+			<Box display='flex' flexDirection='column'>
 				<Margins block='x17'>
 					{isCarouselVisible && <ScreenshotCarouselAnchor screenshots={screenshots} />}
 
@@ -49,11 +49,7 @@ const AppDetails = ({ app }: { app: AppInfo }): ReactElement => {
 						<Box fontScale='h4' mbe='x8' color='titles-labels'>
 							{t('Description')}
 						</Box>
-						<Box
-							dangerouslySetInnerHTML={{ __html: isMarkdown ? detailedDescription.rendered : description }}
-							withRichContent
-							color='default'
-						/>
+						<Box dangerouslySetInnerHTML={{ __html: isMarkdown ? detailedDescription.rendered : description }} withRichContent />
 					</Box>
 
 					<Box is='section'>
@@ -70,7 +66,7 @@ const AppDetails = ({ app }: { app: AppInfo }): ReactElement => {
 					</Box>
 
 					<Box is='section'>
-						<Box fontScale='h4' mbe='x8' color='default'>
+						<Box fontScale='h4' mbe='x8'>
 							{t('Contact')}
 						</Box>
 						<Box display='flex' flexDirection='row' flexGrow={1} justifyContent='space-around' flexWrap='wrap'>