Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme switching: Add TypeScript types #24178

Merged
merged 43 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
2da64c9
add ts type for theme
Aug 5, 2023
899d38e
adapt light and dark theme to ts type
Aug 5, 2023
e089833
use light theme in ThemeProvider
Aug 5, 2023
b32f538
adapt colors to new ts type
Aug 5, 2023
21787ba
change usage of "default.js" to "dark.js"
Aug 5, 2023
0e02b13
fix: rename back dark.ts
Sep 16, 2023
1d2de3f
Merge branch 'main' into @chrispader/theme-switching-ts-types
Sep 16, 2023
2ba934c
add TODO comment about renaming default.ts
Sep 16, 2023
4b10b95
fix: update outdated comment
Sep 16, 2023
84c4731
fix: add TODO comment
Sep 16, 2023
429e2b6
fix: add types for the rest of theme switching logic
Sep 16, 2023
b7b1179
fix: type remaining file with TODO
Sep 16, 2023
b77e4d0
Merge branch 'main' into @chrispader/theme-switching-ts-types
Sep 19, 2023
f69116a
fix: remove theme spreading and abstraction
Sep 19, 2023
08f5b4f
fix: changed colors
Sep 19, 2023
fd4e5aa
fix: remove more diffs to main
Sep 19, 2023
c794fd1
fix: typo
Sep 19, 2023
10f4778
update todo comments
Sep 19, 2023
dba25a2
fix: naming
Sep 19, 2023
283467a
Merge branch 'ts/style/styles-refactor' into @chrispader/theme-switch…
Sep 19, 2023
0bbcd56
fix: update styles.ts
Sep 19, 2023
2b6f412
feat: update types int ThemeStylesProvider logic
Sep 19, 2023
b2d6054
Merge branch 'main' into @chrispader/theme-switching-ts-types
Sep 20, 2023
e4d4a10
fix: merge main
Sep 20, 2023
3f28300
enforce consistent themes
Sep 20, 2023
fb20af7
fix: move ThemeColors to types.ts
Sep 20, 2023
33d0bc8
fix: make colors non optional
Sep 20, 2023
0b7a872
fix: add remaining color in light theme
Sep 20, 2023
6a41699
Merge branch 'main' into @chrispader/theme-switching-ts-types
Sep 27, 2023
8fb99cc
Merge branch 'main' into @chrispader/theme-switching-ts-types
Oct 16, 2023
6f0eb4c
Merge branch 'main' into @chrispader/theme-switching-ts-types
Oct 19, 2023
58a59de
remove TODO
Oct 19, 2023
2caad03
replace comment
Oct 19, 2023
ef2771c
remove TODO
Oct 19, 2023
23bcb92
remove TODO block
Oct 19, 2023
5a3cbad
Merge branch 'main' into @chrispader/theme-switching-ts-types
Oct 19, 2023
e70f1a9
Merge branch 'main' into @chrispader/theme-switching-ts-types
Oct 20, 2023
0b54f57
Merge branch 'main' into @chrispader/theme-switching-ts-types
Oct 22, 2023
bbdb468
Merge branch 'main' into @chrispader/theme-switching-ts-types
chrispader Nov 2, 2023
bb89e03
Merge branch 'main' into @chrispader/theme-switching-ts-types
chrispader Nov 2, 2023
0c74c17
fix: imports and remove TODO blocks
chrispader Nov 2, 2023
0eb2fe6
Merge branch 'main' into @chrispader/theme-switching-ts-types
chrispader Nov 5, 2023
b46f0b2
fix: prettier
chrispader Nov 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/AddPlaidBankAccount.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import PlaidLink from './PlaidLink';
import * as BankAccounts from '../libs/actions/BankAccounts';
import ONYXKEYS from '../ONYXKEYS';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import compose from '../libs/compose';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import Picker from './Picker';
Expand Down
2 changes: 1 addition & 1 deletion src/components/AddressSearch/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {GooglePlacesAutocomplete} from 'react-native-google-places-autocomplete'
import lodashGet from 'lodash/get';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import TextInput from '../TextInput';
import * as ApiUtils from '../../libs/ApiUtils';
import * as GooglePlacesUtils from '../../libs/GooglePlacesUtils';
Expand Down
2 changes: 1 addition & 1 deletion src/components/AttachmentCarousel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {withOnyx} from 'react-native-onyx';
import _ from 'underscore';
import * as Expensicons from '../Icon/Expensicons';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import CarouselActions from './CarouselActions';
import Button from '../Button';
import AttachmentView from '../AttachmentView';
Expand Down
2 changes: 1 addition & 1 deletion src/components/AttachmentModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import AttachmentCarousel from './AttachmentCarousel';
import styles from '../styles/styles';
import * as StyleUtils from '../styles/StyleUtils';
import * as FileUtils from '../libs/fileDownload/FileUtils';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import compose from '../libs/compose';
import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
import Button from './Button';
Expand Down
2 changes: 1 addition & 1 deletion src/components/AttachmentView.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import withLocalize, {withLocalizePropTypes} from './withLocalize';
import compose from '../libs/compose';
import Text from './Text';
import Tooltip from './Tooltip';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import variables from '../styles/variables';
import addEncryptedAuthTokenToURL from '../libs/addEncryptedAuthTokenToURL';
import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Avatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import _ from 'underscore';
import stylePropTypes from '../styles/stylePropTypes';
import Icon from './Icon';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import CONST from '../CONST';
import * as StyleUtils from '../styles/StyleUtils';
import * as Expensicons from './Icon/Expensicons';
Expand Down
2 changes: 1 addition & 1 deletion src/components/AvatarCropModal/AvatarCropModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {runOnUI, interpolate, useAnimatedGestureHandler, useSharedValue, useWork
import CONST from '../../CONST';
import compose from '../../libs/compose';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import Button from '../Button';
import HeaderWithBackButton from '../HeaderWithBackButton';
import Icon from '../Icon';
Expand Down
2 changes: 1 addition & 1 deletion src/components/AvatarWithDisplayName.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import participantPropTypes from './participantPropTypes';
import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import SubscriptAvatar from './SubscriptAvatar';
import * as ReportUtils from '../libs/ReportUtils';
import MultipleAvatars from './MultipleAvatars';
Expand Down
2 changes: 1 addition & 1 deletion src/components/AvatarWithImagePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Icon from './Icon';
import PopoverMenu from './PopoverMenu';
import * as Expensicons from './Icon/Expensicons';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import AttachmentPicker from './AttachmentPicker';
import AvatarCropModal from './AvatarCropModal/AvatarCropModal';
import OfflineWithFeedback from './OfflineWithFeedback';
Expand Down
2 changes: 1 addition & 1 deletion src/components/BlockingViews/BlockingView.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import styles from '../../styles/styles';
import variables from '../../styles/variables';
import Icon from '../Icon';
import Text from '../Text';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import TextLink from '../TextLink';
import Navigation from '../../libs/Navigation/Navigation';
import AutoEmailLink from '../AutoEmailLink';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, {Component} from 'react';
import {ActivityIndicator, View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import Text from '../Text';
import KeyboardShortcut from '../../libs/KeyboardShortcut';
import Icon from '../Icon';
Expand Down
2 changes: 1 addition & 1 deletion src/components/ButtonWithDropdownMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Button from './Button';
import PopoverMenu from './PopoverMenu';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import CONST from '../CONST';

const propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Checkbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import stylePropTypes from '../styles/stylePropTypes';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Composer/index.android.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {StyleSheet} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import RNTextInput from '../RNTextInput';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import * as ComposerUtils from '../../libs/ComposerUtils';

const propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Composer/index.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {StyleSheet} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import RNTextInput from '../RNTextInput';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import * as ComposerUtils from '../../libs/ComposerUtils';

const propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Composer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import ExpensiMark from 'expensify-common/lib/ExpensiMark';
import RNTextInput from '../RNTextInput';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import Growl from '../../libs/Growl';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import updateIsFullComposerAvailable from '../../libs/ComposerUtils/updateIsFullComposerAvailable';
import * as ComposerUtils from '../../libs/ComposerUtils';
import * as Browser from '../../libs/Browser';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {Circle, Rect} from 'react-native-svg';
import {View} from 'react-native';
import * as StyleUtils from '../../styles/StyleUtils';
import CONST from '../../CONST';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import variables from '../../styles/variables';
import styles from '../../styles/styles';

Expand Down
2 changes: 1 addition & 1 deletion src/components/CustomStatusBar/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {useEffect} from 'react';
import StatusBar from '../../libs/StatusBar';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';

function CustomStatusBar() {
useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/DatePicker/index.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import Popover from '../Popover';
import CONST from '../../CONST';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import {propTypes, defaultProps} from './datepickerPropTypes';
import withKeyboardState, {keyboardStatePropTypes} from '../withKeyboardState';

Expand Down
2 changes: 1 addition & 1 deletion src/components/EmojiPicker/CategoryShortcutButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import variables from '../../styles/variables';
import styles from '../../styles/styles';
import * as StyleUtils from '../../styles/StyleUtils';
import getButtonState from '../../libs/getButtonState';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
import CONST from '../../CONST';

Expand Down
2 changes: 1 addition & 1 deletion src/components/ExpensifyWordmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import StagingLogo from '../../assets/images/expensify-logo--staging.svg';
import AdHocLogo from '../../assets/images/expensify-logo--adhoc.svg';
import CONST from '../CONST';
import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import styles from '../styles/styles';
import * as StyleUtils from '../styles/StyleUtils';
import variables from '../styles/variables';
Expand Down
2 changes: 1 addition & 1 deletion src/components/FloatingActionButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
import styles from '../styles/styles';
import * as StyleUtils from '../styles/StyleUtils';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import Tooltip from './Tooltip';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import PressableWithFeedback from './Pressable/PressableWithFeedback';
Expand Down
2 changes: 1 addition & 1 deletion src/components/FullscreenLoadingIndicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'underscore';
import React from 'react';
import {ActivityIndicator, StyleSheet, View} from 'react-native';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import stylePropTypes from '../styles/stylePropTypes';

const propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/GrowlNotification/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
import {Directions, FlingGestureHandler, State} from 'react-native-gesture-handler';
import {View, Animated} from 'react-native';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import Text from '../Text';
import Icon from '../Icon';
import * as Expensicons from '../Icon/Expensicons';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import htmlRendererPropTypes from './htmlRendererPropTypes';
import withLocalize, {withLocalizePropTypes} from '../../withLocalize';
import Text from '../../Text';
import variables from '../../../styles/variables';
import themeColors from '../../../styles/themes/default';
import themeColors from '../../../styles/themes/dark';
import styles from '../../../styles/styles';
import editedLabelStyles from '../../../styles/editedLabelStyles';

Expand Down
2 changes: 1 addition & 1 deletion src/components/Icon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, {PureComponent} from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import variables from '../../styles/variables';
import * as StyleUtils from '../../styles/StyleUtils';
import IconWrapperStyles from './IconWrapperStyles';
Expand Down
2 changes: 1 addition & 1 deletion src/components/IllustratedHeaderPageLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import headerWithBackButtonPropTypes from './HeaderWithBackButton/headerWithBack
import HeaderWithBackButton from './HeaderWithBackButton';
import ScreenWrapper from './ScreenWrapper';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import * as StyleUtils from '../styles/StyleUtils';
import useWindowDimensions from '../hooks/useWindowDimensions';
import FixedFooter from './FixedFooter';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Indicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import * as PolicyUtils from '../libs/PolicyUtils';
import * as PaymentMethods from '../libs/actions/PaymentMethods';
import * as ReimbursementAccountProps from '../pages/ReimbursementAccount/reimbursementAccountPropTypes';
import * as UserUtils from '../libs/UserUtils';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';

const propTypes = {
/* Onyx Props */
Expand Down
2 changes: 1 addition & 1 deletion src/components/InlineSystemMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../styles/styles';
import theme from '../styles/themes/default';
import theme from '../styles/themes/dark';
import Text from './Text';
import * as Expensicons from './Icon/Expensicons';
import Icon from './Icon';
Expand Down
2 changes: 1 addition & 1 deletion src/components/LHNOptionsList/OptionRowLHN.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import colors from '../../styles/colors';
import Text from '../Text';
import SubscriptAvatar from '../SubscriptAvatar';
import CONST from '../../CONST';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import OfflineWithFeedback from '../OfflineWithFeedback';
import PressableWithSecondaryInteraction from '../PressableWithSecondaryInteraction';
import * as ReportActionContextMenu from '../../pages/home/report/ContextMenu/ReportActionContextMenu';
Expand Down
2 changes: 1 addition & 1 deletion src/components/LocalePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ONYXKEYS from '../ONYXKEYS';
import CONST from '../CONST';
import Picker from './Picker';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';

const propTypes = {
/** Indicates which locale the user currently has selected */
Expand Down
2 changes: 1 addition & 1 deletion src/components/MenuItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import {View} from 'react-native';
import Text from './Text';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import * as StyleUtils from '../styles/StyleUtils';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/BaseModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ReactNativeModal from 'react-native-modal';
import {SafeAreaInsetsContext} from 'react-native-safe-area-context';
import styles from '../../styles/styles';
import * as StyleUtils from '../../styles/StyleUtils';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import {propTypes as modalPropTypes, defaultProps as modalDefaultProps} from './modalPropTypes';
import * as Modal from '../../libs/actions/Modal';
import getModalStyles from '../../styles/getModalStyles';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/index.web.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import withWindowDimensions from '../withWindowDimensions';
import BaseModal from './BaseModal';
import {propTypes, defaultProps} from './modalPropTypes';
import * as StyleUtils from '../../styles/StyleUtils';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import StatusBar from '../../libs/StatusBar';
import CONST from '../../CONST';

Expand Down
2 changes: 1 addition & 1 deletion src/components/MoneyRequestConfirmationList.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import optionPropTypes from './optionPropTypes';
import * as CurrencyUtils from '../libs/CurrencyUtils';
import Button from './Button';
import * as Expensicons from './Icon/Expensicons';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import Image from './Image';
import ReceiptHTML from '../../assets/images/receipt-html.png';
import ReceiptDoc from '../../assets/images/receipt-doc.png';
Expand Down
2 changes: 1 addition & 1 deletion src/components/MoneyRequestDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Text from './Text';
import participantPropTypes from './participantPropTypes';
import Avatar from './Avatar';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import CONST from '../CONST';
import withWindowDimensions from './withWindowDimensions';
import compose from '../libs/compose';
Expand Down
2 changes: 1 addition & 1 deletion src/components/MultipleAvatars.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import styles from '../styles/styles';
import Avatar from './Avatar';
import Tooltip from './Tooltip';
import Text from './Text';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import * as StyleUtils from '../styles/StyleUtils';
import CONST from '../CONST';
import variables from '../styles/variables';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Onfido/BaseOnfidoWeb.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as OnfidoSDK from 'onfido-sdk-ui';
import onfidoPropTypes from './onfidoPropTypes';
import CONST from '../../CONST';
import variables from '../../styles/variables';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import fontWeightBold from '../../styles/fontWeight/bold';
import fontFamily from '../../styles/fontFamily';
import Log from '../../libs/Log';
Expand Down
2 changes: 1 addition & 1 deletion src/components/OptionRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import * as Expensicons from './Icon/Expensicons';
import MultipleAvatars from './MultipleAvatars';
import Hoverable from './Hoverable';
import DisplayNames from './DisplayNames';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import Text from './Text';
import SelectCircle from './SelectCircle';
Expand Down
2 changes: 1 addition & 1 deletion src/components/OptionsListSkeletonView.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import {Rect, Circle} from 'react-native-svg';
import SkeletonViewContentLoader from 'react-content-loader/native';
import CONST from '../CONST';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import styles from '../styles/styles';

const propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Picker/BasePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as Expensicons from '../Icon/Expensicons';
import FormHelpMessage from '../FormHelpMessage';
import Text from '../Text';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import themeColors from '../../styles/themes/dark';
import {ScrollContext} from '../ScrollViewWithContext';

const propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/PinButton.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import themeColors from '../styles/themes/dark';
import Icon from './Icon';
import Tooltip from './Tooltip';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
Expand Down
2 changes: 1 addition & 1 deletion src/components/QRCode/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import QRCodeLibrary from 'react-native-qrcode-svg';
import PropTypes from 'prop-types';
import defaultTheme from '../../styles/themes/default';
import defaultTheme from '../../styles/themes/dark';
import CONST from '../../CONST';

const propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/QRShare/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, {Component} from 'react';
import {View} from 'react-native';
import _ from 'underscore';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import defaultTheme from '../../styles/themes/default';
import defaultTheme from '../../styles/themes/dark';
import styles from '../../styles/styles';
import Text from '../Text';
import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
Expand Down
Loading