Skip to content

Commit

Permalink
Revert "remove default exports"
Browse files Browse the repository at this point in the history
This reverts commit 692ce7e.
  • Loading branch information
wolverineks committed Nov 22, 2021
1 parent a1d75ec commit b6f9812
Show file tree
Hide file tree
Showing 17 changed files with 52 additions and 24 deletions.
6 changes: 4 additions & 2 deletions src/App.tsx
Expand Up @@ -10,7 +10,7 @@ import {QueryClient, QueryClientProvider} from 'react-query'
import {useDispatch} from 'react-redux'

import {initApp} from '../legacy/actions'
import {AppNavigator} from './AppNavigator'
import AppNavigator from './AppNavigator'
import {SelectedWalletMetaProvider} from './SelectedWallet/SelectedWalletContext'

const queryClient = new QueryClient()
Expand Down Expand Up @@ -46,7 +46,7 @@ const useHideScreenInAppSwitcher = () => {
}, [])
}

export const App = () => {
const App = () => {
useHideScreenInAppSwitcher()
useInitializeApp()

Expand All @@ -62,3 +62,5 @@ export const App = () => {
</SafeAreaProvider>
)
}

export default App
10 changes: 6 additions & 4 deletions src/AppNavigator.tsx
Expand Up @@ -25,10 +25,10 @@ import {
isSystemAuthEnabledSelector,
} from '../legacy/selectors'
import type {State} from '../legacy/state'
import {FirstRunNavigator} from './FirstRun/FirstRunNavigator'
import FirstRunNavigator from './FirstRun/FirstRunNavigator'
import {CustomPinLogin} from './Login'
import {StorybookScreen} from './StorybookScreen'
import {WalletNavigator} from './WalletNavigator'
import StorybookScreen from './StorybookScreen'
import WalletNavigator from './WalletNavigator'

const IS_STORYBOOK = env.getBoolean('IS_STORYBOOK', false)

Expand Down Expand Up @@ -152,6 +152,8 @@ const StoryBook = () => (
</Stack.Navigator>
)

export const AppNavigator = () => {
const AppNavigator = () => {
return <NavigationContainer>{IS_STORYBOOK ? <StoryBook /> : <NavigatorSwitch />}</NavigationContainer>
}

export default AppNavigator
4 changes: 3 additions & 1 deletion src/FirstRun/AcceptTermsOfService.stories.tsx
@@ -1,6 +1,8 @@
// @flow

import {storiesOf} from '@storybook/react-native'
import React from 'react'

import {AcceptTermsOfServiceScreen} from './AcceptTermsOfServiceScreen'
import AcceptTermsOfServiceScreen from './AcceptTermsOfServiceScreen'

storiesOf('AcceptTermsOfServiceScreen', module).add('Default', () => <AcceptTermsOfServiceScreen />)
5 changes: 4 additions & 1 deletion src/FirstRun/AcceptTermsOfServiceScreen.tsx
@@ -1,3 +1,5 @@
// @flow

import {useNavigation} from '@react-navigation/native'
import React from 'react'
import {defineMessages, useIntl} from 'react-intl'
Expand All @@ -13,7 +15,7 @@ import {canBiometricEncryptionBeEnabled} from '../../legacy/helpers/deviceSettin
import globalMessages from '../../legacy/i18n/global-messages'
import {FIRST_RUN_ROUTES} from '../../legacy/RoutesList'

export const AcceptTermsOfServiceScreen = () => {
const AcceptTermsOfServiceScreen = () => {
const strings = useStrings()
const navigation = useNavigation()
const [acceptedTos, setAcceptedTos] = React.useState(false)
Expand Down Expand Up @@ -78,6 +80,7 @@ export const AcceptTermsOfServiceScreen = () => {
</SafeAreaView>
)
}
export default AcceptTermsOfServiceScreen

const Footer = ({children}: {children: React.ReactNode}) => <View style={styles.footer}>{children}</View>

Expand Down
4 changes: 3 additions & 1 deletion src/FirstRun/CustomPinScreen.stories.tsx
@@ -1,7 +1,9 @@
// @flow

import {storiesOf} from '@storybook/react-native'
import React from 'react'

import {CustomPinScreen} from './CustomPinScreen'
import CustomPinScreen from './CustomPinScreen'

storiesOf('CustomPinScreen', module).add('Default', () => {
return <CustomPinScreen />
Expand Down
6 changes: 5 additions & 1 deletion src/FirstRun/CustomPinScreen.tsx
@@ -1,3 +1,5 @@
// @flow

import React from 'react'
import {defineMessages, useIntl} from 'react-intl'
import {StyleSheet} from 'react-native'
Expand All @@ -9,7 +11,7 @@ import PinRegistrationForm from '../../legacy/components/Common/PinRegistrationF
import {StatusBar} from '../../legacy/components/UiKit'
import {isAuthenticatedSelector} from '../../legacy/selectors'

export const CustomPinScreen = () => {
const CustomPinScreen = () => {
const strings = useStrings()
const isAuth = useSelector(isAuthenticatedSelector)
const dispatch = useDispatch()
Expand Down Expand Up @@ -38,6 +40,8 @@ export const CustomPinScreen = () => {
)
}

export default CustomPinScreen

const messages = defineMessages({
pinInputTitle: {
id: 'components.firstrun.custompinscreen.pinInputTitle',
Expand Down
11 changes: 7 additions & 4 deletions src/FirstRun/FirstRunNavigator.tsx
@@ -1,11 +1,13 @@
// @flow

import {createStackNavigator} from '@react-navigation/stack'
import React from 'react'
import {defineMessages, useIntl} from 'react-intl'

import {defaultNavigationOptions, defaultStackNavigatorOptions} from '../../legacy/navigationOptions'
import {AcceptTermsOfServiceScreen} from './AcceptTermsOfServiceScreen'
import {CustomPinScreen} from './CustomPinScreen'
import {LanguagePickerScreen} from './LanguagePickerScreen'
import AcceptTermsOfServiceScreen from './AcceptTermsOfServiceScreen'
import CustomPinScreen from './CustomPinScreen'
import LanguagePickerScreen from './LanguagePickerScreen'

/* eslint-disable @typescript-eslint/no-explicit-any */
type FirstRunRoute = {
Expand All @@ -17,7 +19,7 @@ type FirstRunRoute = {

const Stack = createStackNavigator<FirstRunRoute>()

export const FirstRunNavigator = () => {
const FirstRunNavigator = () => {
const strings = useStrings()

return (
Expand All @@ -44,6 +46,7 @@ export const FirstRunNavigator = () => {
</Stack.Navigator>
)
}
export default FirstRunNavigator

const messages = defineMessages({
acceptTermsTitle: {
Expand Down
4 changes: 3 additions & 1 deletion src/FirstRun/LanguagePickerScreen.stories.tsx
@@ -1,8 +1,10 @@
// @flow

import {storiesOf} from '@storybook/react-native'
import React from 'react'

import {ReduxProvider} from '../../storybook/ReduxProvider'
import {LanguagePickerScreen} from './LanguagePickerScreen'
import LanguagePickerScreen from './LanguagePickerScreen'

storiesOf('LanguagePickerScreen', module).add('Default', () => (
<ReduxProvider>
Expand Down
6 changes: 5 additions & 1 deletion src/FirstRun/LanguagePickerScreen.tsx
@@ -1,3 +1,5 @@
// @flow

import {useNavigation} from '@react-navigation/native'
import React from 'react'
import {StyleSheet} from 'react-native'
Expand All @@ -9,7 +11,7 @@ import LanguagePicker from '../../legacy/components/Common/LanguagePicker'
import {FIRST_RUN_ROUTES} from '../../legacy/RoutesList'
import {languageSelector} from '../../legacy/selectors'

export const LanguagePickerScreen = () => {
const LanguagePickerScreen = () => {
const navigation = useNavigation()
const languageCode = useSelector(languageSelector) || 'en-US'
const dispatch = useDispatch()
Expand All @@ -27,6 +29,8 @@ export const LanguagePickerScreen = () => {
)
}

export default LanguagePickerScreen

const styles = StyleSheet.create({
safeAreaView: {
flex: 1,
Expand Down
4 changes: 3 additions & 1 deletion src/StorybookScreen.tsx
Expand Up @@ -2,4 +2,6 @@ import React from 'react'

import StorybookUIRoot from '../storybook'

export const StorybookScreen = () => <StorybookUIRoot />
const StorybookScreen = () => <StorybookUIRoot />

export default StorybookScreen
2 changes: 1 addition & 1 deletion src/TxHistory/TxHistoryList.tsx
Expand Up @@ -10,7 +10,7 @@ import {Text} from '../../legacy/components/UiKit'
import {actionMessages} from '../../legacy/i18n/global-messages'
import {transactionsInfoSelector} from '../../legacy/selectors'
import {formatDateRelative} from '../../legacy/utils/format'
import {features} from '../features'
import features from '../features'
import {TxListActionsBannerForTransactionsTab} from './TxListActionsBanner'
import {TransactionInfo} from './types'

Expand Down
2 changes: 1 addition & 1 deletion src/TxHistory/TxListActionsBanner.tsx
Expand Up @@ -3,7 +3,7 @@ import {StyleSheet, TouchableOpacity, View} from 'react-native'
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'

import {Spacer} from '../components/Spacer'
import {features} from '../features'
import features from '../features'
import {ChipButton} from './ChipButton'

type AssetsOptions = 'tokens' | 'nfts'
Expand Down
2 changes: 1 addition & 1 deletion src/TxHistory/WalletHero/ActionsBanner.tsx
Expand Up @@ -9,7 +9,7 @@ import {WALLET_ROUTES} from '../../../legacy/RoutesList'
import {isReadOnlySelector} from '../../../legacy/selectors'
import {COLORS} from '../../../legacy/styles/config'
import {Icon, Spacer} from '../../components'
import {features} from '../../features'
import features from '../../features'

const ACTION_PROPS = {
height: 36,
Expand Down
2 changes: 1 addition & 1 deletion src/TxHistory/WalletHero/BalanceBanner.tsx
Expand Up @@ -8,7 +8,7 @@ import {formatTokenWithText, formatTokenWithTextWhenHidden} from '../../../legac
import closedEyeIcon from '../../assets/img/icon/visibility-closed.png'
import openedEyeIcon from '../../assets/img/icon/visibility-opened.png'
import {Icon, Spacer} from '../../components'
import {features} from '../../features'
import features from '../../features'

const BALANCE_WHEN_HIDDEN = '*.******'
const TOTAL_WHEN_HIDDEN = '*.**'
Expand Down
4 changes: 3 additions & 1 deletion src/WalletNavigator.tsx
Expand Up @@ -122,7 +122,7 @@ type WalletStackRoute = {
/* eslint-enable @typescript-eslint/no-explicit-any */

const Stack = createStackNavigator<WalletStackRoute>()
export const WalletNavigator = () => (
const WalletNavigator = () => (
<Stack.Navigator initialRouteName={'wallet-selection'} screenOptions={{headerShown: false}}>
<Stack.Screen name={'wallet-selection'} component={WalletSelectionScreen} />
<Stack.Screen name={'main-wallet-routes'} component={WalletTabNavigator} />
Expand All @@ -131,6 +131,8 @@ export const WalletNavigator = () => (
</Stack.Navigator>
)

export default WalletNavigator

const messages = defineMessages({
transactionsButton: {
id: 'components.common.navigation.transactionsButton',
Expand Down
2 changes: 1 addition & 1 deletion src/features.ts
@@ -1,7 +1,7 @@
// Testing purposes forcing prod view
// const __DEV__ = false

export const features = {
export default {
walletHero: {
fiat: __DEV__ || false,
buy: __DEV__ || false,
Expand Down
2 changes: 1 addition & 1 deletion src/index.tsx
Expand Up @@ -10,7 +10,7 @@ import getConfiguredStore from '../legacy/helpers/configureStore'
import translations from '../legacy/i18n/translations'
import {languageSelector} from '../legacy/selectors'
import {setLogLevel} from '../legacy/utils/logging'
import {App} from './App'
import App from './App'
import {name as appName} from './app.json'

setLogLevel(CONFIG.LOG_LEVEL)
Expand Down

0 comments on commit b6f9812

Please sign in to comment.