diff --git a/packages/client/screens/Header/Header.tsx b/packages/client/screens/Header/Header.tsx index 3b0c4b4..c977179 100644 --- a/packages/client/screens/Header/Header.tsx +++ b/packages/client/screens/Header/Header.tsx @@ -32,8 +32,9 @@ const TabsContainer = styled.div` const StyledTab = styled.div<{ active: boolean; + theme: Theme; }>` - background: ${({ active, theme }: { active: boolean; theme: Theme }) => + background: ${({ active, theme }) => active ? theme.colors.complementary : theme.colors.secondary}; padding: 12px 0px; text-align: center; @@ -46,6 +47,6 @@ const StyledTab = styled.div<{ } `; -const TabText = styled.h3` - color: ${({ theme }: { theme: Theme }) => theme.colors.textColor.primary}; +const TabText = styled.h3<{ theme: Theme }>` + color: ${({ theme }) => theme.colors.textColor.primary}; `; diff --git a/packages/client/screens/SpendScreen/SpendScreen.tsx b/packages/client/screens/SpendScreen/SpendScreen.tsx index 72c89d7..a14f8fa 100644 --- a/packages/client/screens/SpendScreen/SpendScreen.tsx +++ b/packages/client/screens/SpendScreen/SpendScreen.tsx @@ -41,7 +41,7 @@ export const SpendScreen = (): JSX.Element => { ); }; -const SpendScreenContainer = styled.div` - background-color: ${({ theme }: { theme: Theme }) => theme.colors.primary}; +const SpendScreenContainer = styled.div<{ theme: Theme }>` + background-color: ${({ theme }) => theme.colors.primary}; height: 100%; `; diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 709cf1e..ceacd99 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -107,5 +107,5 @@ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true /* Skip type checking all .d.ts files. */ }, - "include": ["./*"] + "include": ["./**/*"] }