Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/components/FocusModeNotification.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {useEffect} from 'react';
import useEnvironment from '@hooks/useEnvironment';
import useLocalize from '@hooks/useLocalize';
import styles from '@styles/styles';
import useThemeStyles from '@styles/useThemeStyles';
import * as Link from '@userActions/Link';
import * as User from '@userActions/User';
import CONST from '@src/CONST';
Expand All @@ -12,6 +12,7 @@ import TextLinkWithRef from './TextLink';
function FocusModeNotification() {
const {environmentURL} = useEnvironment();
const {translate} = useLocalize();
const styles = useThemeStyles();
useEffect(() => {
User.updateChatPriorityMode(CONST.PRIORITY_MODE.GSD, true);
}, []);
Expand Down
3 changes: 2 additions & 1 deletion src/components/SAMLLoadingIndicator.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import React from 'react';
import {StyleSheet, View} from 'react-native';
import useLocalize from '@hooks/useLocalize';
import styles from '@styles/styles';
import themeColors from '@styles/themes/default';
import useThemeStyles from '@styles/useThemeStyles';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
import * as Illustrations from './Icon/Illustrations';
import Text from './Text';

function SAMLLoadingIndicator() {
const {translate} = useLocalize();
const styles = useThemeStyles();
return (
<View style={[StyleSheet.absoluteFillObject, styles.deeplinkWrapperContainer]}>
<View style={styles.deeplinkWrapperMessage}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/iou/request/step/IOURequestStepDescription.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import useLocalize from '@hooks/useLocalize';
import * as Browser from '@libs/Browser';
import compose from '@libs/compose';
import Navigation from '@libs/Navigation/Navigation';
import updateMultilineInputRange from '@libs/UpdateMultilineInputRange';
import updateMultilineInputRange from '@libs/updateMultilineInputRange';
import useThemeStyles from '@styles/useThemeStyles';
import * as IOU from '@userActions/IOU';
import CONST from '@src/CONST';
Expand Down
3 changes: 2 additions & 1 deletion src/pages/iou/request/step/IOURequestStepDistance.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import * as ErrorUtils from '@libs/ErrorUtils';
import Navigation from '@libs/Navigation/Navigation';
import * as TransactionUtils from '@libs/TransactionUtils';
import reportPropTypes from '@pages/reportPropTypes';
import styles from '@styles/styles';
import useThemeStyles from '@styles/useThemeStyles';
import variables from '@styles/variables';
import * as IOU from '@userActions/IOU';
import * as MapboxToken from '@userActions/MapboxToken';
Expand Down Expand Up @@ -53,6 +53,7 @@ function IOURequestStepDistance({
}) {
const {isOffline} = useNetwork();
const {translate} = useLocalize();
const styles = useThemeStyles();

const [optimisticWaypoints, setOptimisticWaypoints] = useState(null);
const [hasError, setHasError] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import DragAndDropProvider from '@components/DragAndDrop/Provider';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
import styles from '@styles/styles';
import useThemeStyles from '@styles/useThemeStyles';

const propTypes = {
/** The things to display inside the screenwrapper */
Expand Down Expand Up @@ -33,6 +33,8 @@ const defaultProps = {

function StepScreenDragAndDropWrapper({testID, headerTitle, onBackButtonPress, onEntryTransitionEnd, children, shouldShowWrapper}) {
const [isDraggingOver, setIsDraggingOver] = useState(false);
const styles = useThemeStyles();

if (!shouldShowWrapper) {
return children;
}
Expand Down