fix: imports and remove TODO blocks

Expensify · Nov 2, 2023 · 0c74c17 · 0c74c17
1 parent bb89e03
commit 0c74c17
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/src/styles/ThemeStylesProvider.tsx b/src/styles/ThemeStylesProvider.tsx
@@ -3,9 +3,6 @@ import React, {useMemo} from 'react';
 import useTheme from './themes/useTheme';
 import ThemeStylesContext from './ThemeStylesContext';
 import {stylesGenerator} from './styles';
-import {stylesGenerator as stylesUntyped} from './styles';
-
-const styles = stylesUntyped;
 
 type ThemeStylesProviderProps = {
     children: React.ReactNode;

diff --git a/src/styles/styles.ts b/src/styles/styles.ts
@@ -4013,10 +4013,6 @@ const styles = (theme: ThemeColors) =>
         },
     } satisfies Styles);
 
-// For now we need to export the styles function that takes the theme as an argument
-// as something named different than "styles", because a lot of files import the "defaultStyles"
-// as "styles", which causes ESLint to throw an error.
-// TODO: Remove "stylesGenerator" and instead only return "styles" once the app is migrated to theme switching hooks and HOCs and "styles/theme/default.js" is not used anywhere anymore (GH issue: https://github.com/Expensify/App/issues/27337)
 const stylesGenerator = styles;
 const defaultStyles = styles(defaultTheme);
 

diff --git a/src/styles/themes/default.ts b/src/styles/themes/default.ts
@@ -1,6 +1,6 @@
-import {ThemeColors} from './types';
 import colors from '@styles/colors';
 import SCREENS from '@src/SCREENS';
+import {ThemeColors} from './types';
 
 const darkTheme = {
     // Figma keys

diff --git a/src/styles/themes/light.ts b/src/styles/themes/light.ts
@@ -1,6 +1,6 @@
-import {ThemeColors} from './types';
 import colors from '@styles/colors';
 import SCREENS from '@src/SCREENS';
+import {ThemeColors} from './types';
 
 const lightTheme = {
     // Figma keys