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.

Sign up for GitHub

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

fix(deps): update dependency react-redux to v9 #5025

Merged
merged 5 commits into from
Mar 5, 2024
Merged

fix(deps): update dependency react-redux to v9 #5025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c839ed
fix(deps): update dependency react-redux to v9
renovate[bot] Mar 4, 2024
cc17ace
Use custom useDispatch and useSelector throughout the app
jeanregisser Mar 4, 2024
c03f94a
Fix jest
jeanregisser Mar 5, 2024
ba005d2
Merge remote-tracking branch 'origin/main' into renovate/react-redux-9.x
jeanregisser Mar 5, 2024
8e24420
Fix bad merge
jeanregisser Mar 5, 2024
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 jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ module.exports = {
'^.+\\.(txt)$': require.resolve('./node_modules/react-native/jest/assetFileTransformer.js'),
},
transformIgnorePatterns: [
'node_modules/(?!(@celo/)?@?react-native|@react-navigation|@react-native-community|uuid|statsig-js|@react-native-firebase|react-navigation|redux-persist|date-fns|victory-*|@walletconnect/react-native-compat)',
'node_modules/(?!(@celo/)?@?react-native|@react-navigation|@react-native-community|uuid|statsig-js|@react-native-firebase|react-navigation|redux-persist|date-fns|victory-*|@walletconnect/react-native-compat|react-redux)',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was needed to avoid the following error, when running jest:

/Users/jean/src/github.com/valora-inc/wallet/node_modules/react-redux/dist/react-redux.legacy-esm.js:34
    import * as React2 from "react";
    ^^^^^^

    SyntaxError: Cannot use import statement outside a module

],
}
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
"react-native-url-polyfill": "^1.3.0",
"react-native-video": "^6.0.0-beta.3",
"react-native-webview": "^13.8.1",
"react-redux": "^7.2.9",
"react-redux": "^9.1.0",
"redux": "^5.0.1",
"redux-persist": "^6.0.0",
"redux-persist-fs-storage": "^1.3.0",
Expand Down Expand Up @@ -223,6 +223,7 @@
"@types/crypto-js": "^4.1.1",
"@types/fast-levenshtein": "^0.0.2",
"@types/fs-extra": "^9.0.13",
"@types/hoist-non-react-statics": "^3.3.5",
"@types/isomorphic-fetch": "^0.0.35",
"@types/jest": "^29.5.3",
"@types/lodash": "^4.14.136",
Expand All @@ -232,7 +233,6 @@
"@types/react-native-auth0": "^2.17.5",
"@types/react-native-fs": "^2.13.0",
"@types/react-native-video": "^5.0.15",
"@types/react-redux": "^7.1.7",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The types are now directly included in the react-redux package.

"@types/react-test-renderer": "^18.0.0",
"@types/redux-mock-store": "^1.0.6",
"@types/seedrandom": "^3.0.5",
Expand Down
2 changes: 1 addition & 1 deletion src/RevokePhoneNumber.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { StyleSheet, Text, View } from 'react-native'
import { useSelector } from 'react-redux'
import { defaultCountryCodeSelector, e164NumberSelector } from 'src/account/selectors'
import { SettingsEvents } from 'src/analytics/Events'
import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
Expand All @@ -12,6 +11,7 @@ import ToastWithCTA from 'src/components/ToastWithCTA'
import AttentionIcon from 'src/icons/Attention'
import { navigate } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import { useSelector } from 'src/redux/hooks'
import { Colors } from 'src/styles/colors'
import fontStyles from 'src/styles/fonts'
import { Spacing } from 'src/styles/styles'
Expand Down
4 changes: 2 additions & 2 deletions src/account/FiatExchange.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { fiatExchange } from 'src/images/Images'
import DrawerTopBar from 'src/navigator/DrawerTopBar'
import { navigate } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import useTypedSelector from 'src/redux/useSelector'
import { useSelector } from 'src/redux/hooks'
import colors from 'src/styles/colors'
import fontStyles from 'src/styles/fonts'
import variables from 'src/styles/variables'
Expand All @@ -32,7 +32,7 @@ export function FiatExchangeSection({
showDrawerTopNav?: boolean
}) {
const [timestamp, setTimestamp] = useState<number | null>(null)
const appState = useTypedSelector((state) => state.app.appState)
const appState = useSelector((state) => state.app.appState)

useEffect(() => {
if (appState === AppState.Active && timestamp) {
Expand Down
5 changes: 2 additions & 3 deletions src/account/GoldEducation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React, { useEffect } from 'react'
import { useTranslation } from 'react-i18next'
import { Platform } from 'react-native'
import { useDispatch } from 'react-redux'
import { setGoldEducationCompleted } from 'src/account/actions'
import Education, { EducationTopic, EmbeddedNavBar } from 'src/account/Education'
import { setGoldEducationCompleted } from 'src/account/actions'
import { celoEducationCompletedSelector } from 'src/account/selectors'
import { OnboardingEvents } from 'src/analytics/Events'
import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
Expand All @@ -12,7 +11,7 @@ import { celoEducation1, celoEducation2, celoEducation3, celoEducation4 } from '
import { noHeader } from 'src/navigator/Headers'
import { navigate, navigateBack } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import useSelector from 'src/redux/useSelector'
import { useDispatch, useSelector } from 'src/redux/hooks'

export default function GoldEducation() {
const { t } = useTranslation()
Expand Down
2 changes: 1 addition & 1 deletion src/account/Persona.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useCallback, useState } from 'react'
import { useAsync } from 'react-async-hook'
import { useTranslation } from 'react-i18next'
import { Fields, Inquiry } from 'react-native-persona'
import { useDispatch, useSelector } from 'react-redux'
import { KycStatus } from 'src/account/reducer'
import { showError } from 'src/alert/actions'
import { CICOEvents } from 'src/analytics/Events'
Expand All @@ -12,6 +11,7 @@ import { ErrorMessages } from 'src/app/ErrorMessages'
import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
import { getPersonaTemplateId } from 'src/firebase/firebase'
import { createPersonaAccount, verifyWalletAddress } from 'src/in-house-liquidity'
import { useDispatch, useSelector } from 'src/redux/hooks'
import Logger from 'src/utils/Logger'
import networkConfig from 'src/web3/networkConfig'
import { walletAddressSelector } from 'src/web3/selectors'
Expand Down
4 changes: 2 additions & 2 deletions src/account/Profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next'
import { StyleSheet, Text, View } from 'react-native'
import * as RNFS from 'react-native-fs'
import { SafeAreaView } from 'react-native-safe-area-context'
import { useDispatch, useSelector } from 'react-redux'
import { saveNameAndPicture } from 'src/account/actions'
import { nameSelector, pictureSelector } from 'src/account/selectors'
import { showError, showMessage } from 'src/alert/actions'
Expand All @@ -24,11 +23,12 @@ import { emptyHeader } from 'src/navigator/Headers'
import { Screens } from 'src/navigator/Screens'
import { StackParamList } from 'src/navigator/types'
import PictureInput from 'src/onboarding/registration/PictureInput'
import { useDispatch, useSelector } from 'src/redux/hooks'
import colors from 'src/styles/colors'
import fontStyles from 'src/styles/fonts'
import { Spacing } from 'src/styles/styles'
import { saveProfilePicture } from 'src/utils/image'
import Logger from 'src/utils/Logger'
import { saveProfilePicture } from 'src/utils/image'

type Props = NativeStackScreenProps<StackParamList, Screens.Profile>

Expand Down
10 changes: 5 additions & 5 deletions src/account/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
View,
} from 'react-native'
import { SafeAreaView } from 'react-native-safe-area-context'
import { useDispatch, useSelector } from 'react-redux'
import RevokePhoneNumber from 'src/RevokePhoneNumber'
import {
clearStoredAccount,
devModeTriggerClicked,
Expand Down Expand Up @@ -48,6 +48,8 @@ import {
import BottomSheet, { BottomSheetRefType } from 'src/components/BottomSheet'
import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
import Dialog from 'src/components/Dialog'
import { Severity } from 'src/components/InLineNotification'
import InLineNotificationModal from 'src/components/InLineNotificationModal'
import SectionHead from 'src/components/SectionHead'
import SessionId from 'src/components/SessionId'
import {
Expand All @@ -72,19 +74,17 @@ import { ensurePincode, navigate } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import { StackParamList } from 'src/navigator/types'
import { removeStoredPin, setPincodeWithBiometry } from 'src/pincode/authentication'
import RevokePhoneNumber from 'src/RevokePhoneNumber'
import { useDispatch, useSelector } from 'src/redux/hooks'
import { getFeatureGate } from 'src/statsig/index'
import { StatsigFeatureGates } from 'src/statsig/types'
import colors from 'src/styles/colors'
import fontStyles from 'src/styles/fonts'
import { Spacing } from 'src/styles/styles'
import { navigateToURI } from 'src/utils/linking'
import Logger from 'src/utils/Logger'
import { navigateToURI } from 'src/utils/linking'
import { useRevokeCurrentPhoneNumber } from 'src/verify/hooks'
import { selectSessions } from 'src/walletConnect/selectors'
import { walletAddressSelector } from 'src/web3/selectors'
import InLineNotificationModal from 'src/components/InLineNotificationModal'
import { Severity } from 'src/components/InLineNotification'

type Props = NativeStackScreenProps<StackParamList, Screens.Settings>

Expand Down
4 changes: 2 additions & 2 deletions src/account/ShakeForSupport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import Touchable from 'src/components/Touchable'
import Times from 'src/icons/Times'
import { navigate } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import useTypedSelector from 'src/redux/useSelector'
import { useSelector } from 'src/redux/hooks'
import colors from 'src/styles/colors'
import fontStyles from 'src/styles/fonts'
import variables from 'src/styles/variables'
import Logger from 'src/utils/Logger'

export default function ShakeForSupport() {
const { t } = useTranslation()
const appState = useTypedSelector(appStateSelector)
const appState = useSelector(appStateSelector)
const [isVisible, setIsVisible] = React.useState(false)

React.useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/account/StoreWipeRecoveryScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react'
import { useTranslation } from 'react-i18next'
import { useDispatch, useSelector } from 'react-redux'
import AccountErrorScreen from 'src/account/AccountErrorScreen'
import { startStoreWipeRecovery } from 'src/account/actions'
import { recoveringFromStoreWipeSelector } from 'src/account/selectors'
import { noHeaderGestureDisabled } from 'src/navigator/Headers'
import { navigate } from 'src/navigator/NavigationService'
import { firstOnboardingScreen } from 'src/onboarding/steps'
import { requestPincodeInput } from 'src/pincode/authentication'
import { useDispatch, useSelector } from 'src/redux/hooks'
import { getExperimentParams } from 'src/statsig'
import { ExperimentConfigs } from 'src/statsig/constants'
import { StatsigExperiments } from 'src/statsig/types'
Expand Down
2 changes: 1 addition & 1 deletion src/account/SupportContact.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import React, { useCallback, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { ActivityIndicator, Platform, ScrollView, StyleSheet, Text, View } from 'react-native'
import DeviceInfo from 'react-native-device-info'
import { useDispatch, useSelector } from 'react-redux'
import { e164NumberSelector, nameSelector } from 'src/account/selectors'
import { sendSupportRequest } from 'src/account/zendesk'
import { showMessage } from 'src/alert/actions'
Expand All @@ -24,6 +23,7 @@ import { Screens } from 'src/navigator/Screens'
import { StackParamList } from 'src/navigator/types'
import { userLocationDataSelector } from 'src/networkInfo/selectors'
import { hooksPreviewApiUrlSelector } from 'src/positions/selectors'
import { useDispatch, useSelector } from 'src/redux/hooks'
import colors from 'src/styles/colors'
import fontStyles from 'src/styles/fonts'
import Logger from 'src/utils/Logger'
Expand Down
3 changes: 1 addition & 2 deletions src/alert/AlertBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { noop } from 'lodash'
import React, { memo, useMemo, useState } from 'react'
import { StyleSheet, View } from 'react-native'
import { useDispatch } from 'react-redux'
import { AlertTypes, hideAlert } from 'src/alert/actions'
import { Alert, ErrorDisplayType } from 'src/alert/reducer'
import SmartTopAlert from 'src/components/SmartTopAlert'
import ToastWithCTA from 'src/components/ToastWithCTA'
import useSelector from 'src/redux/useSelector'
import { useDispatch, useSelector } from 'src/redux/hooks'

function AlertBanner() {
const [toastAlert, setToastAlert] = useState<(Alert & { isActive: boolean }) | null>(null)
Expand Down
2 changes: 1 addition & 1 deletion src/app/AppInitGate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React, { useEffect } from 'react'
import { useAsync } from 'react-async-hook'
import { Dimensions } from 'react-native'
import { findBestAvailableLanguage } from 'react-native-localize'
import { useDispatch, useSelector } from 'react-redux'
import { AppEvents } from 'src/analytics/Events'
import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
import { appMounted, appUnmounted } from 'src/app/actions'
Expand All @@ -12,6 +11,7 @@ import i18n from 'src/i18n'
import { currentLanguageSelector } from 'src/i18n/selectors'
import useChangeLanguage from 'src/i18n/useChangeLanguage'
import { navigateToError } from 'src/navigator/NavigationService'
import { useDispatch, useSelector } from 'src/redux/hooks'
import { waitUntilSagasFinishLoading } from 'src/redux/sagas'
import Logger from 'src/utils/Logger'

Expand Down
2 changes: 1 addition & 1 deletion src/app/MultichainBeta.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next'
import { StyleSheet, Text, View } from 'react-native'
import { ScrollView } from 'react-native-gesture-handler'
import { SafeAreaView } from 'react-native-safe-area-context'
import { useDispatch, useSelector } from 'react-redux'
import { AppEvents } from 'src/analytics/Events'
import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
import { MultichainBetaStatus, optMultichainBeta } from 'src/app/actions'
Expand All @@ -15,6 +14,7 @@ import i18n from 'src/i18n'
import { emptyHeader } from 'src/navigator/Headers'
import { navigate, navigateHome } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import { useDispatch, useSelector } from 'src/redux/hooks'
import { patchUpdateStatsigUser } from 'src/statsig'
import Colors from 'src/styles/colors'
import { typeScale } from 'src/styles/fonts'
Expand Down
3 changes: 1 addition & 2 deletions src/app/useDeepLinks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ import CleverTap from 'clevertap-react-native'
import { useEffect, useState } from 'react'
import { useAsync } from 'react-async-hook'
import { Linking, Platform } from 'react-native'
import { useDispatch } from 'react-redux'
import { deepLinkDeferred, openDeepLink } from 'src/app/actions'
import { pendingDeepLinkSelector } from 'src/app/selectors'
import { DYNAMIC_LINK_DOMAIN_URI_PREFIX, FIREBASE_ENABLED } from 'src/config'
import { hasVisitedHomeSelector } from 'src/home/selectors'
import useSelector from 'src/redux/useSelector'
import { useDispatch, useSelector } from 'src/redux/hooks'
import Logger from 'src/utils/Logger'
import { walletAddressSelector } from 'src/web3/selectors'

Expand Down
2 changes: 1 addition & 1 deletion src/backup/BackupComplete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Checkmark from 'src/icons/Checkmark'
import { navigate, navigateHome } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import { StackParamList } from 'src/navigator/types'
import useSelector from 'src/redux/useSelector'
import { useSelector } from 'src/redux/hooks'
import fontStyles from 'src/styles/fonts'

/**
Expand Down
2 changes: 1 addition & 1 deletion src/backup/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import {
import CryptoJS from 'crypto-js'
import { useAsync } from 'react-async-hook'
import * as bip39 from 'react-native-bip39'
import { useDispatch, useSelector } from 'react-redux'
import { showError } from 'src/alert/actions'
import { OnboardingEvents } from 'src/analytics/Events'
import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
import { ErrorMessages } from 'src/app/ErrorMessages'
import { getPassword } from 'src/pincode/authentication'
import { useDispatch, useSelector } from 'src/redux/hooks'
import { removeStoredItem, retrieveStoredItem, storeItem } from 'src/storage/keychain'
import Logger from 'src/utils/Logger'
import { ETHEREUM_DERIVATION_PATH } from 'src/web3/consts'
Expand Down
4 changes: 2 additions & 2 deletions src/components/Avatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react'
import { WithTranslation } from 'react-i18next'
import { StyleSheet, Text, TextStyle, View } from 'react-native'
import { useSelector } from 'react-redux'
import { defaultCountryCodeSelector } from 'src/account/selectors'
import ContactCircle from 'src/components/ContactCircle'
import PhoneNumberWithFlag from 'src/components/PhoneNumberWithFlag'
import { formatShortenedAddress } from 'src/components/ShortenedAddress'
import { withTranslation } from 'src/i18n'
import { getDisplayName, Recipient } from 'src/recipients/recipient'
import { Recipient, getDisplayName } from 'src/recipients/recipient'
import { useSelector } from 'src/redux/hooks'
import fontStyles from 'src/styles/fonts'

const DEFAULT_ICON_SIZE = 40
Expand Down
2 changes: 1 addition & 1 deletion src/components/AvatarSelf.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { TextStyle } from 'react-native'
import { e164NumberSelector, nameSelector, userContactDetailsSelector } from 'src/account/selectors'
import Avatar from 'src/components/Avatar'
import { Recipient, RecipientType } from 'src/recipients/recipient'
import useSelector from 'src/redux/useSelector'
import { useSelector } from 'src/redux/hooks'
import { currentAccountSelector } from 'src/web3/selectors'

interface Props {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContactCircleSelf.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as React from 'react'
import { ViewStyle } from 'react-native'
import { useSelector } from 'react-redux'
import { currentUserRecipientSelector } from 'src/account/selectors'
import ContactCircle from 'src/components/ContactCircle'
import { Recipient } from 'src/recipients/recipient'
import { useSelector } from 'src/redux/hooks'
interface Props {
style?: ViewStyle
size?: number
Expand Down
6 changes: 3 additions & 3 deletions src/components/InviteOptionsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import getPhoneHash from '@celo/phone-utils/lib/getPhoneHash'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
import { Share } from 'react-native'
import { useSelector } from 'react-redux'
import { InviteEvents } from 'src/analytics/Events'
import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
import { INVITE_REWARDS_NFTS_LEARN_MORE, INVITE_REWARDS_STABLETOKEN_LEARN_MORE } from 'src/config'
import { inviteModal } from 'src/images/Images'
import { useShareUrl } from 'src/invite/hooks'
import InviteModal from 'src/invite/InviteModal'
import { getDisplayName, Recipient } from 'src/recipients/recipient'
import { useShareUrl } from 'src/invite/hooks'
import { Recipient, getDisplayName } from 'src/recipients/recipient'
import { useSelector } from 'src/redux/hooks'
import { inviteRewardsActiveSelector, inviteRewardsTypeSelector } from 'src/send/selectors'
import { InviteRewardsType } from 'src/send/types'

Expand Down
2 changes: 1 addition & 1 deletion src/components/TokenBalance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
} from 'react-native'
import { getNumberFormatSettings } from 'react-native-localize'
import Animated, { useAnimatedStyle, useSharedValue } from 'react-native-reanimated'
import { useDispatch, useSelector } from 'react-redux'
import { hideAlert, showToast } from 'src/alert/actions'
import { AssetsEvents, FiatExchangeEvents, HomeEvents } from 'src/analytics/Events'
import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
Expand All @@ -36,6 +35,7 @@ import {
import { navigate } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import { totalPositionsBalanceUsdSelector } from 'src/positions/selectors'
import { useDispatch, useSelector } from 'src/redux/hooks'
import { getFeatureGate } from 'src/statsig'
import { StatsigFeatureGates } from 'src/statsig/types'
import Colors from 'src/styles/colors'
Expand Down
2 changes: 1 addition & 1 deletion src/components/TokenDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react'
import { StyleProp, Text, TextStyle } from 'react-native'
import { LocalCurrencyCode, LocalCurrencySymbol } from 'src/localCurrency/consts'
import { getLocalCurrencySymbol, usdToLocalCurrencyRateSelector } from 'src/localCurrency/selectors'
import useSelector from 'src/redux/useSelector'
import { useSelector } from 'src/redux/hooks'
import { useTokenInfo } from 'src/tokens/hooks'
import { LocalAmount } from 'src/transactions/types'

Expand Down
3 changes: 1 addition & 2 deletions src/consumerIncentives/ConsumerIncentivesHomeScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React, { useEffect, useState } from 'react'
import { Trans, useTranslation } from 'react-i18next'
import { ActivityIndicator, Image, ScrollView, StyleSheet, Text, View } from 'react-native'
import { SafeAreaView } from 'react-native-safe-area-context'
import { useDispatch } from 'react-redux'
import { showError } from 'src/alert/actions'
import { RewardsEvents } from 'src/analytics/Events'
import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
Expand Down Expand Up @@ -36,7 +35,7 @@ import { noHeader } from 'src/navigator/Headers'
import { navigate, navigateBack } from 'src/navigator/NavigationService'
import { Screens } from 'src/navigator/Screens'
import { userLocationDataSelector } from 'src/networkInfo/selectors'
import useSelector from 'src/redux/useSelector'
import { useDispatch, useSelector } from 'src/redux/hooks'
import { getFeatureGate } from 'src/statsig'
import { StatsigFeatureGates } from 'src/statsig/types'
import colors from 'src/styles/colors'
Expand Down
Loading
Loading