Fix after rebase
This commit is contained in:
@@ -3,12 +3,12 @@ import PropTypes from 'prop-types'
|
|||||||
import { View, FlatList, ActivityIndicator } from 'react-native'
|
import { View, FlatList, ActivityIndicator } from 'react-native'
|
||||||
|
|
||||||
import NoData from './no-data'
|
import NoData from './no-data'
|
||||||
import AppLoadingView from '../app-loading'
|
import AppLoadingView from '../common/app-loading'
|
||||||
import YAxis from './y-axis'
|
import YAxis from './y-axis'
|
||||||
import nfpLines from './nfp-lines'
|
import nfpLines from './nfp-lines'
|
||||||
import DayColumn from './day-column'
|
import DayColumn from './day-column'
|
||||||
import HorizontalGrid from './horizontal-grid'
|
import HorizontalGrid from './horizontal-grid'
|
||||||
import AppText from '../app-text'
|
import AppText from '../common/app-text'
|
||||||
|
|
||||||
import { connect } from 'react-redux'
|
import { connect } from 'react-redux'
|
||||||
import { navigate } from '../../slices/navigation'
|
import { navigate } from '../../slices/navigation'
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import React from 'react'
|
|||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import { View } from 'react-native'
|
import { View } from 'react-native'
|
||||||
|
|
||||||
import AppText from '../app-text'
|
import AppText from '../common/app-text'
|
||||||
import SettingsButton from '../settings/shared/settings-button'
|
import SettingsButton from '../settings/shared/settings-button'
|
||||||
|
|
||||||
import { shared } from '../../i18n/en/labels'
|
import { shared } from '../../i18n/en/labels'
|
||||||
|
|||||||
Reference in New Issue
Block a user