From e3a167b97b92ebb34e8a1d795b07351f97ce7700 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Mon, 1 Apr 2024 16:02:37 +0700 Subject: [PATCH 1/7] fix message hightlight color --- src/pages/home/report/ReportActionItem.tsx | 2 +- src/styles/theme/themes/dark.ts | 1 + src/styles/theme/themes/light.ts | 1 + src/styles/theme/types.ts | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index 2716fedcf59a..51708596fb8f 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -197,7 +197,7 @@ function ReportActionItem({ const reportScrollManager = useReportScrollManager(); const highlightedBackgroundColorIfNeeded = useMemo( - () => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(theme.hoverComponentBG) : {}), + () => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(theme.messageHighlight) : {}), [StyleUtils, isReportActionLinked, theme.hoverComponentBG], ); diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts index 52a9e2dd2cd7..5bf16fe0474b 100644 --- a/src/styles/theme/themes/dark.ts +++ b/src/styles/theme/themes/dark.ts @@ -46,6 +46,7 @@ const darkTheme = { shadow: colors.black, componentBG: colors.productDark100, hoverComponentBG: colors.productDark300, + messageHighlight: '#402B02', activeComponentBG: colors.productDark400, signInSidebar: colors.green800, sidebar: colors.productDark100, diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts index 671bb36847c9..81e5d8284248 100644 --- a/src/styles/theme/themes/light.ts +++ b/src/styles/theme/themes/light.ts @@ -45,6 +45,7 @@ const lightTheme = { inverse: colors.productLight900, shadow: colors.black, componentBG: colors.productLight100, + messageHighlight: colors.yellow100, hoverComponentBG: colors.productLight300, activeComponentBG: colors.productLight400, signInSidebar: colors.green800, diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts index 35a48e39805d..d78198ebf7a1 100644 --- a/src/styles/theme/types.ts +++ b/src/styles/theme/types.ts @@ -11,6 +11,7 @@ type ThemeColors = { appBG: Color; splashBG: Color; highlightBG: Color; + messageHighlight: Color; border: Color; borderLighter: Color; borderFocus: Color; From d9145f8d275328959a56729fd5e9ed9c6165dcf6 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 2 Apr 2024 10:33:54 +0700 Subject: [PATCH 2/7] add custom colors theme --- src/styles/theme/colors.ts | 1 + src/styles/theme/themes/dark.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/theme/colors.ts b/src/styles/theme/colors.ts index 0312e6613baf..59106efdef98 100644 --- a/src/styles/theme/colors.ts +++ b/src/styles/theme/colors.ts @@ -28,6 +28,7 @@ const colors: Record = { productDark700: '#8B9C8F', productDark800: '#AFBBB0', productDark900: '#E7ECE9', + messageHightlightDark: '#402B02', // Light Mode Theme Colors productLight100: '#FCFBF9', diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts index 5bf16fe0474b..e526deff4cfa 100644 --- a/src/styles/theme/themes/dark.ts +++ b/src/styles/theme/themes/dark.ts @@ -46,7 +46,7 @@ const darkTheme = { shadow: colors.black, componentBG: colors.productDark100, hoverComponentBG: colors.productDark300, - messageHighlight: '#402B02', + messageHighlight: colors.messageHightlightDark, activeComponentBG: colors.productDark400, signInSidebar: colors.green800, sidebar: colors.productDark100, From 4f3f754a09afdb0f029953be941277ce6fc13c6a Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 2 Apr 2024 10:43:09 +0700 Subject: [PATCH 3/7] fix lint --- src/pages/home/report/ReportActionItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index 51708596fb8f..92d82c437782 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -198,7 +198,7 @@ function ReportActionItem({ const highlightedBackgroundColorIfNeeded = useMemo( () => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(theme.messageHighlight) : {}), - [StyleUtils, isReportActionLinked, theme.hoverComponentBG], + [StyleUtils, isReportActionLinked, theme.messageHighlight], ); const isDeletedParentAction = ReportActionsUtils.isDeletedParentAction(action); From 447ccf089e3c3ebd7c4c35de1959cad671c352fe Mon Sep 17 00:00:00 2001 From: nkdengineer <161821005+nkdengineer@users.noreply.github.com> Date: Wed, 3 Apr 2024 06:13:47 +0700 Subject: [PATCH 4/7] Update src/styles/theme/colors.ts Co-authored-by: Pujan Shah --- src/styles/theme/colors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/theme/colors.ts b/src/styles/theme/colors.ts index 59106efdef98..426d47d52142 100644 --- a/src/styles/theme/colors.ts +++ b/src/styles/theme/colors.ts @@ -28,7 +28,7 @@ const colors: Record = { productDark700: '#8B9C8F', productDark800: '#AFBBB0', productDark900: '#E7ECE9', - messageHightlightDark: '#402B02', + messageHighlightDark: '#402B02', // Light Mode Theme Colors productLight100: '#FCFBF9', From c86185fde171ac7e13795823bb1be29e1296163d Mon Sep 17 00:00:00 2001 From: nkdengineer <161821005+nkdengineer@users.noreply.github.com> Date: Wed, 3 Apr 2024 06:14:19 +0700 Subject: [PATCH 5/7] Update src/styles/theme/themes/dark.ts Co-authored-by: Pujan Shah --- src/styles/theme/themes/dark.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts index e526deff4cfa..0ff97a2e7c3d 100644 --- a/src/styles/theme/themes/dark.ts +++ b/src/styles/theme/themes/dark.ts @@ -46,7 +46,7 @@ const darkTheme = { shadow: colors.black, componentBG: colors.productDark100, hoverComponentBG: colors.productDark300, - messageHighlight: colors.messageHightlightDark, + messageHighlightBG: colors.messageHightlightDark, activeComponentBG: colors.productDark400, signInSidebar: colors.green800, sidebar: colors.productDark100, From 3fe0da1f4d86751b1d2dba425c7f750c7f0791bd Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 3 Apr 2024 06:20:51 +0700 Subject: [PATCH 6/7] rename variable --- src/pages/home/report/ReportActionItem.tsx | 4 ++-- src/styles/theme/themes/light.ts | 2 +- src/styles/theme/types.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index 92d82c437782..485d75c9099b 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -197,8 +197,8 @@ function ReportActionItem({ const reportScrollManager = useReportScrollManager(); const highlightedBackgroundColorIfNeeded = useMemo( - () => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(theme.messageHighlight) : {}), - [StyleUtils, isReportActionLinked, theme.messageHighlight], + () => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(theme.messageHighlightBG) : {}), + [StyleUtils, isReportActionLinked, theme.messageHighlightBG], ); const isDeletedParentAction = ReportActionsUtils.isDeletedParentAction(action); diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts index 81e5d8284248..6444cb9d4073 100644 --- a/src/styles/theme/themes/light.ts +++ b/src/styles/theme/themes/light.ts @@ -45,7 +45,7 @@ const lightTheme = { inverse: colors.productLight900, shadow: colors.black, componentBG: colors.productLight100, - messageHighlight: colors.yellow100, + messageHighlightBG: colors.yellow100, hoverComponentBG: colors.productLight300, activeComponentBG: colors.productLight400, signInSidebar: colors.green800, diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts index d78198ebf7a1..8d16223de849 100644 --- a/src/styles/theme/types.ts +++ b/src/styles/theme/types.ts @@ -11,7 +11,7 @@ type ThemeColors = { appBG: Color; splashBG: Color; highlightBG: Color; - messageHighlight: Color; + messageHighlightBG: Color; border: Color; borderLighter: Color; borderFocus: Color; From 6743c61db7e9b36dacc184c1c6b957143acfdbc9 Mon Sep 17 00:00:00 2001 From: nkdengineer <161821005+nkdengineer@users.noreply.github.com> Date: Wed, 3 Apr 2024 09:57:13 +0700 Subject: [PATCH 7/7] Update src/styles/theme/themes/dark.ts Co-authored-by: Pujan Shah --- src/styles/theme/themes/dark.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts index 0ff97a2e7c3d..e43341f3e8a9 100644 --- a/src/styles/theme/themes/dark.ts +++ b/src/styles/theme/themes/dark.ts @@ -46,7 +46,7 @@ const darkTheme = { shadow: colors.black, componentBG: colors.productDark100, hoverComponentBG: colors.productDark300, - messageHighlightBG: colors.messageHightlightDark, + messageHighlightBG: colors.messageHighlightDark, activeComponentBG: colors.productDark400, signInSidebar: colors.green800, sidebar: colors.productDark100,