From da0eb4721bacb8545048d3dea8ed31d80adf4167 Mon Sep 17 00:00:00 2001 From: situchan Date: Sat, 9 Dec 2023 02:14:29 +0600 Subject: [PATCH] fix style regressions --- src/components/FocusModeNotification.js | 3 ++- src/components/SAMLLoadingIndicator.js | 3 ++- src/pages/iou/request/step/IOURequestStepDescription.js | 2 +- src/pages/iou/request/step/IOURequestStepDistance.js | 3 ++- src/pages/iou/request/step/StepScreenDragAndDropWrapper.js | 4 +++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/FocusModeNotification.js b/src/components/FocusModeNotification.js index 37d8e4848b98..ea6db244091a 100644 --- a/src/components/FocusModeNotification.js +++ b/src/components/FocusModeNotification.js @@ -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'; @@ -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); }, []); diff --git a/src/components/SAMLLoadingIndicator.js b/src/components/SAMLLoadingIndicator.js index d00c5a032a72..d6d061122eff 100644 --- a/src/components/SAMLLoadingIndicator.js +++ b/src/components/SAMLLoadingIndicator.js @@ -1,8 +1,8 @@ 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'; @@ -10,6 +10,7 @@ import Text from './Text'; function SAMLLoadingIndicator() { const {translate} = useLocalize(); + const styles = useThemeStyles(); return ( diff --git a/src/pages/iou/request/step/IOURequestStepDescription.js b/src/pages/iou/request/step/IOURequestStepDescription.js index 446a6fabdbb5..6cf9f86068a6 100644 --- a/src/pages/iou/request/step/IOURequestStepDescription.js +++ b/src/pages/iou/request/step/IOURequestStepDescription.js @@ -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'; diff --git a/src/pages/iou/request/step/IOURequestStepDistance.js b/src/pages/iou/request/step/IOURequestStepDistance.js index 4ac0f3649b98..39e9d6f03afa 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance.js +++ b/src/pages/iou/request/step/IOURequestStepDistance.js @@ -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'; @@ -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); diff --git a/src/pages/iou/request/step/StepScreenDragAndDropWrapper.js b/src/pages/iou/request/step/StepScreenDragAndDropWrapper.js index e7247422e1f2..a369775d7110 100644 --- a/src/pages/iou/request/step/StepScreenDragAndDropWrapper.js +++ b/src/pages/iou/request/step/StepScreenDragAndDropWrapper.js @@ -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 */ @@ -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; }