From 6d919c677d657e731428d11890e23a475ccc1679 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Fri, 14 Oct 2022 14:50:56 +1100
Subject: [PATCH] fix: pr review - removed any typing from primaryColor logic

---
 ts/components/conversation/SessionEmojiPanel.tsx | 3 ++-
 ts/themes/constants/colors.tsx                   | 4 ++--
 ts/themes/switchPrimaryColor.tsx                 | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ts/components/conversation/SessionEmojiPanel.tsx b/ts/components/conversation/SessionEmojiPanel.tsx
index 0f08deec5..607592063 100644
--- a/ts/components/conversation/SessionEmojiPanel.tsx
+++ b/ts/components/conversation/SessionEmojiPanel.tsx
@@ -7,6 +7,7 @@ import { useSelector } from 'react-redux';
 import { getTheme } from '../../state/selectors/theme';
 import { FixedBaseEmoji, FixedPickerProps } from '../../types/Reaction';
 import {
+  ColorsType,
   COLORS,
   PrimaryColorStateType,
   THEMES,
@@ -56,7 +57,7 @@ export const StyledEmojiPanel = styled.div<{
     --rgb-accent: ${props =>
       hexColorToRGB(
         props.primaryColor
-          ? (COLORS.PRIMARY as any)[`${props.primaryColor.toUpperCase()}`]
+          ? COLORS.PRIMARY[`${props.primaryColor.toUpperCase() as keyof ColorsType['PRIMARY']}`]
           : COLORS.PRIMARY.GREEN
       )};
 
diff --git a/ts/themes/constants/colors.tsx b/ts/themes/constants/colors.tsx
index 102e95cc5..4f0191e04 100644
--- a/ts/themes/constants/colors.tsx
+++ b/ts/themes/constants/colors.tsx
@@ -4,7 +4,7 @@
  */
 
 // Colors
-type Colors = {
+export type ColorsType = {
   PRIMARY: {
     GREEN: string;
     BLUE: string;
@@ -63,7 +63,7 @@ const black = '#000000';
 // Grey
 const grey = '#616161';
 
-const COLORS: Colors = {
+const COLORS: ColorsType = {
   PRIMARY: {
     GREEN: primaryGreen,
     BLUE: primaryBlue,
diff --git a/ts/themes/switchPrimaryColor.tsx b/ts/themes/switchPrimaryColor.tsx
index 6a66d5fff..f7ec3ab60 100644
--- a/ts/themes/switchPrimaryColor.tsx
+++ b/ts/themes/switchPrimaryColor.tsx
@@ -1,7 +1,7 @@
 import { find } from 'lodash';
 import { Dispatch } from '@reduxjs/toolkit';
 import { applyPrimaryColor } from '../state/ducks/primaryColor';
-import { COLORS, getPrimaryColors, PrimaryColorStateType } from './constants/colors';
+import { ColorsType, COLORS, getPrimaryColors, PrimaryColorStateType } from './constants/colors';
 
 export function findPrimaryColorId(hexCode: string): PrimaryColorStateType | undefined {
   const primaryColors = getPrimaryColors();
@@ -15,7 +15,7 @@ export async function switchPrimaryColorTo(color: PrimaryColorStateType, dispatc
 
   document.documentElement.style.setProperty(
     '--primary-color',
-    (COLORS.PRIMARY as any)[`${color.toUpperCase()}`]
+    COLORS.PRIMARY[`${color.toUpperCase() as keyof ColorsType['PRIMARY']}`]
   );
   dispatch?.(applyPrimaryColor(color));
 }