cleanups

src/Dashboard/Dashboard.tsx

@@ -9,10 +9,10 @@ import {Banner, Button, Modal, StatusBar} from '../components'
 import {useBalances, useIsOnline, useSync} from '../hooks'
 import globalMessages from '../i18n/global-messages'
 import {getCardanoBaseConfig} from '../legacy/config'
-import {getCardanoNetworkConfigById} from '../legacy/networks'
-import {isEmptyString} from '../legacy/utils'
 import {useWalletNavigation} from '../navigation'
 import {useSelectedWallet} from '../SelectedWallet'
+import {isEmptyString} from '../utils/utils'
+import {getCardanoNetworkConfigById} from '../yoroi-wallets/cardano/networks'
 import {Amounts} from '../yoroi-wallets/utils'
 import {
   genCurrentEpochLength,

src/Dashboard/StakePoolInfo.tsx

@@ -5,9 +5,9 @@ import {StyleSheet} from 'react-native'
 import {useQuery, UseQueryOptions} from 'react-query'
 
 import {Button, CopyButton, Text, TitledCard} from '../components'
-import {isEmptyString} from '../legacy/utils'
 import {useSelectedWallet} from '../SelectedWallet'
 import {COLORS} from '../theme'
+import {isEmptyString} from '../utils/utils'
 import {YoroiWallet} from '../yoroi-wallets'
 import {StakePoolInfoAndHistory} from '../yoroi-wallets/types'
 

src/Dashboard/WithdrawStakingRewards/TransferSummary/TransferSummary.tsx

@@ -6,9 +6,9 @@ import {Linking, StyleSheet, TouchableOpacity, View, ViewProps} from 'react-nati
 import {Text} from '../../../components'
 import {confirmationMessages, txLabels} from '../../../i18n/global-messages'
 import {formatTokenWithText} from '../../../legacy/format'
-import {getNetworkConfigById} from '../../../legacy/networks'
 import {COLORS} from '../../../theme'
 import {YoroiWallet} from '../../../yoroi-wallets'
+import {getNetworkConfigById} from '../../../yoroi-wallets/cardano/networks'
 import {YoroiStaking, YoroiUnsignedTx} from '../../../yoroi-wallets/types'
 import {Amounts, Entries} from '../../../yoroi-wallets/utils'
 

src/Receive/Addresses.tsx

@@ -5,9 +5,9 @@ import {StyleSheet, TouchableOpacity, View} from 'react-native'
 
 import {CopyButton, Icon, Spacer, Text} from '../components'
 import {useReceiveAddresses} from '../hooks'
-import {isEmptyString} from '../legacy/utils'
 import {useSelectedWallet} from '../SelectedWallet'
 import {COLORS} from '../theme'
+import {isEmptyString} from '../utils/utils'
 import {Address as AddressType} from '../yoroi-wallets/types'
 import AddressModal from './AddressModal'
 

src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx

@@ -10,11 +10,11 @@ import {useOpenWallet, useWalletMetas} from '../../hooks'
 import globalMessages, {errorMessages} from '../../i18n/global-messages'
 import {CONFIG, isNightly} from '../../legacy/config'
 import {InvalidState, NetworkError} from '../../legacy/errors'
-import {isJormungandr} from '../../legacy/networks'
 import {useWalletNavigation} from '../../navigation'
 import {COLORS} from '../../theme'
 import {useWalletManager} from '../../WalletManager'
 import {WalletMeta} from '../../yoroi-wallets'
+import {isJormungandr} from '../../yoroi-wallets/cardano/networks'
 import {useSetSelectedWallet, useSetSelectedWalletMeta} from '..'
 import {WalletListItem} from './WalletListItem'
 

src/Send/SendScreen/utils.ts

@@ -4,8 +4,8 @@ import _ from 'lodash'
 import {IntlShape} from 'react-intl'
 
 import {formatTokenAmount, formatTokenInteger, normalizeTokenAmount} from '../../legacy/format'
-import {getCardanoNetworkConfigById, isHaskellShelleyNetwork} from '../../legacy/networks'
 import {AssetOverflowError, getMinAda, NotEnoughMoneyToSendError, YoroiWallet} from '../../yoroi-wallets'
+import {getCardanoNetworkConfigById, isHaskellShelleyNetwork} from '../../yoroi-wallets/cardano/networks'
 import {DefaultAsset, Quantity, SendTokenList, Token, YoroiUnsignedTx} from '../../yoroi-wallets/types'
 import {RawUtxo} from '../../yoroi-wallets/types/other'
 import {Amounts, Quantities} from '../../yoroi-wallets/utils'

src/Settings/ChangeWalletName/ChangeWalletName.tsx

@@ -7,9 +7,9 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 import {Button, TextInput} from '../../components'
 import {useChangeWalletName, useWalletName, useWalletNames} from '../../hooks'
 import globalMessages from '../../i18n/global-messages'
-import {isEmptyString} from '../../legacy/utils'
 import {useSelectedWallet} from '../../SelectedWallet'
 import {COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {useWalletManager} from '../../WalletManager'
 import {getWalletNameError, validateWalletName} from '../../yoroi-wallets/utils/validators'
 

src/Settings/Currency/CurrencyContext.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
 import {useMutation, UseMutationOptions, useQuery, useQueryClient} from 'react-query'
 
-import {isEmptyString} from '../../legacy/utils'
 import {useStorage} from '../../Storage'
+import {isEmptyString} from '../../utils/utils'
 import {ConfigCurrencies, configCurrencies, CurrencySymbol, supportedCurrencies} from '../../yoroi-wallets/types/other'
 import {parseSafe} from '../../yoroi-wallets/utils/parsing'
 

src/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx

@@ -10,9 +10,9 @@ import {LoadingOverlay} from '../../components/LoadingOverlay'
 import {showErrorDialog} from '../../dialogs'
 import {errorMessages} from '../../i18n/global-messages'
 import {WrongPassword} from '../../legacy/errors'
-import {isEmptyString} from '../../legacy/utils'
 import {useSelectedWallet, useSelectedWalletMeta, useSetSelectedWalletMeta} from '../../SelectedWallet'
 import {COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 
 export const EnableEasyConfirmationScreen = () => {
   const intl = useIntl()

src/Settings/WalletSettings/WalletSettingsScreen.tsx

@@ -10,10 +10,10 @@ import {DIALOG_BUTTONS, showConfirmationDialog} from '../../dialogs'
 import {useResync, useWalletName} from '../../hooks'
 import {confirmationMessages} from '../../i18n/global-messages'
 import {isByron, isHaskellShelley} from '../../legacy/config'
-import {getNetworkConfigById} from '../../legacy/networks'
 import {useWalletNavigation} from '../../navigation'
 import {useSelectedWallet, useSetSelectedWallet, useSetSelectedWalletMeta} from '../../SelectedWallet'
 import {NetworkId, WalletImplementationId} from '../../yoroi-wallets'
+import {getNetworkConfigById} from '../../yoroi-wallets/cardano/networks'
 import {
   NavigatedSettingsItem,
   PressableSettingsItem,

src/Staking/StakingCenter/StakingCenter.tsx

@@ -12,10 +12,10 @@ import {useLanguage} from '../../i18n'
 import globalMessages, {errorMessages} from '../../i18n/global-messages'
 import {CONFIG, isNightly, SHOW_PROD_POOLS_IN_DEV} from '../../legacy/config'
 import {Logger} from '../../legacy/logging'
-import {getNetworkConfigById} from '../../legacy/networks'
 import {StakingCenterRouteNavigation} from '../../navigation'
 import {useSelectedWallet} from '../../SelectedWallet'
 import {NotEnoughMoneyToSendError} from '../../yoroi-wallets'
+import {getNetworkConfigById} from '../../yoroi-wallets/cardano/networks'
 import {PoolDetailScreen} from '../PoolDetails'
 
 export const StakingCenter = () => {

src/TxHistory/AssetList/AssetList.tsx

@@ -7,9 +7,9 @@ import {AssetItem, AssetItemProps} from '../../components/AssetItem'
 import {Spacer} from '../../components/Spacer'
 import {useBalances, useTokenInfos} from '../../hooks'
 import globalMessages, {actionMessages} from '../../i18n/global-messages'
-import {getNetworkConfigById} from '../../legacy/networks'
 import {useSelectedWallet} from '../../SelectedWallet'
 import {sortTokenInfos} from '../../utils'
+import {getNetworkConfigById} from '../../yoroi-wallets/cardano/networks'
 import {TokenInfo} from '../../yoroi-wallets/types'
 import {Amounts} from '../../yoroi-wallets/utils'
 import {ActionsBanner} from './ActionsBanner'

src/TxHistory/TxDetails/TxDetails.tsx

@@ -11,12 +11,12 @@ import {Banner, Boundary, Button, CopyButton, FadeIn, Icon, StatusBar, Text} fro
 import {useTipStatus, useTransactionInfos} from '../../hooks'
 import globalMessages from '../../i18n/global-messages'
 import {formatDateToSeconds, formatTokenWithSymbol} from '../../legacy/format'
-import {getNetworkConfigById} from '../../legacy/networks'
-import {isEmptyString} from '../../legacy/utils'
 import AddressModal from '../../Receive/AddressModal'
 import {useSelectedWallet} from '../../SelectedWallet'
 import {brand, COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {MultiToken, TokenEntry, YoroiWallet} from '../../yoroi-wallets'
+import {getNetworkConfigById} from '../../yoroi-wallets/cardano/networks'
 import {TransactionInfo} from '../../yoroi-wallets/types'
 import {AssetList} from './AssetList'
 import assetListStyle from './AssetListTransaction.style'

src/TxHistory/TxHistoryList/TxHistoryListItem.tsx

@@ -16,10 +16,10 @@ import {
   getAssetDenominationOrId,
 } from '../../legacy/format'
 import utfSymbols from '../../legacy/utfSymbols'
-import {isEmptyString} from '../../legacy/utils'
 import {TxHistoryRouteNavigation} from '../../navigation'
 import {useSelectedWallet} from '../../SelectedWallet'
 import {COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {MultiToken, YoroiWallet} from '../../yoroi-wallets'
 import {IOData, TransactionAssurance, TransactionDirection, TransactionInfo} from '../../yoroi-wallets/types'
 

src/WalletInit/CreateWallet/CreateWalletScreen.tsx

@@ -4,9 +4,9 @@ import React from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {isEmptyString} from '../../legacy/utils'
 import {WalletInitRouteNavigation, WalletInitRoutes} from '../../navigation'
 import {COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {generateAdaMnemonic} from '../../yoroi-wallets'
 import {MnemonicExplanationModal} from '../MnemonicExplanationModal'
 import {WalletForm} from '../WalletForm'

src/WalletInit/MnemonicInput/MnemonicInput.tsx

@@ -4,8 +4,8 @@ import {defineMessages, useIntl} from 'react-intl'
 import {Keyboard, ScrollView, StyleSheet, TextInput as RNTextInput, View} from 'react-native'
 
 import {Menu, TextInput, useScrollView} from '../../components'
-import {isEmptyString} from '../../legacy/utils'
 import {COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 
 export const MnemonicInput = ({
   length,

src/WalletInit/MnemonicShow/MnemonicShowScreen.tsx

@@ -7,8 +7,8 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 import recoveryPhrase from '../../assets/img/recovery_phrase.png'
 import {Button, StatusBar, Text} from '../../components'
 import assert from '../../legacy/assert'
-import {isEmptyString} from '../../legacy/utils'
 import {WalletInitRouteNavigation, WalletInitRoutes} from '../../navigation'
+import {isEmptyString} from '../../utils/utils'
 import {MnemonicBackupImportanceModal} from '../MnemonicBackupModal'
 
 export const MnemonicShowScreen = () => {

src/WalletInit/RestoreWallet/RestoreWalletScreen.tsx

@@ -6,8 +6,8 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 
 import {Button, KeyboardSpacer, ScrollableView, Spacer, StatusBar, Text} from '../../components'
 import {getWalletConfigById} from '../../legacy/config'
-import {isEmptyString} from '../../legacy/utils'
 import {WalletInitRouteNavigation, WalletInitRoutes} from '../../navigation'
+import {isEmptyString} from '../../utils/utils'
 import {MnemonicInput} from '../MnemonicInput'
 
 export const RestoreWalletScreen = () => {

src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx

@@ -10,9 +10,9 @@ import {useCreateBip44Wallet, usePlate} from '../../hooks'
 import {errorMessages} from '../../i18n/global-messages'
 import {CONFIG} from '../../legacy/config'
 import {NetworkError} from '../../legacy/errors'
-import {isEmptyString} from '../../legacy/utils'
 import {useWalletNavigation, WalletInitRoutes} from '../../navigation'
 import {theme} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {NetworkId} from '../../yoroi-wallets'
 import {WalletAddress} from '../WalletAddress'
 import {WalletNameForm} from '../WalletNameForm'

src/WalletInit/WalletAddress/WalletAddress.tsx

@@ -2,8 +2,8 @@ import React from 'react'
 import {Linking, StyleSheet, TouchableOpacity, View, ViewStyle} from 'react-native'
 
 import {CopyButton, Text} from '../../components'
-import {getNetworkConfigById} from '../../legacy/networks'
 import {NetworkId} from '../../yoroi-wallets'
+import {getNetworkConfigById} from '../../yoroi-wallets/cardano/networks'
 
 export const WalletAddress = ({
   addressHash,

src/WalletInit/WalletForm.tsx

@@ -6,8 +6,8 @@ import {Button, Checkmark, Spacer, TextInput} from '../components'
 import {useWalletNames} from '../hooks'
 import globalMessages from '../i18n/global-messages'
 import {CONFIG} from '../legacy/config'
-import {isEmptyString} from '../legacy/utils'
 import {COLORS} from '../theme'
+import {isEmptyString} from '../utils/utils'
 import {useWalletManager} from '../WalletManager'
 import {
   getWalletNameError,

src/WalletInit/WalletInit/WalletInitScreen.tsx

@@ -8,10 +8,10 @@ import {Button, Modal, ScreenBackground, StatusBar} from '../../components'
 import {LedgerTransportSwitchModal} from '../../HW'
 import globalMessages from '../../i18n/global-messages'
 import {CONFIG, isByron, isHaskellShelley} from '../../legacy/config'
-import {isJormungandr} from '../../legacy/networks'
 import {WalletInitRouteNavigation, WalletInitRoutes} from '../../navigation'
 import {COLORS} from '../../theme'
 import {NetworkId, WalletImplementationId} from '../../yoroi-wallets'
+import {isJormungandr} from '../../yoroi-wallets/cardano/networks'
 import {WalletDescription} from '../WalletDescription'
 import {ExpandableItem} from './ExpandableItem'
 

src/components/ConfirmTx/ConfirmTx.tsx

@@ -11,9 +11,9 @@ import {confirmationMessages, errorMessages, txLabels} from '../../i18n/global-m
 import LocalizableError from '../../i18n/LocalizableError'
 import {CONFIG} from '../../legacy/config'
 import {WrongPassword} from '../../legacy/errors'
-import {isEmptyString} from '../../legacy/utils'
 import {useSelectedWallet} from '../../SelectedWallet'
 import {COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {CardanoTypes, DeviceId, DeviceObj, walletManager, withBLE, withUSB} from '../../yoroi-wallets'
 import {YoroiUnsignedTx} from '../../yoroi-wallets/types'
 import {Button, ButtonProps, ValidatedTextInput} from '..'

src/components/ErrorModal/ErrorModal.tsx

@@ -4,8 +4,8 @@ import {Image, LayoutAnimation, ScrollView, StyleSheet, Text, TouchableOpacity,
 
 import image from '../../assets/img/error.png'
 import globalMessages, {errorMessages} from '../../i18n/global-messages'
-import {isEmptyString} from '../../legacy/utils'
 import {brand, COLORS, spacing} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {Button, Icon, Modal} from '..'
 
 type ErrorViewProps = {

src/components/Icon/WalletAccount.tsx

@@ -3,8 +3,8 @@ import {StyleSheet, View, ViewStyle} from 'react-native'
 import Blockies from 'react-native-blockies-svg'
 import tinycolor from 'tinycolor2'
 
-import {isEmptyString} from '../../legacy/utils'
 import {COLORS as APP_COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 
 const mkcolor = (primary, secondary, spots) => ({primary, secondary, spots})
 const COLORS = [

src/components/Modal/Modal.tsx

@@ -15,8 +15,8 @@ import {NavigationProp, useNavigation} from '@react-navigation/native'
 import React from 'react'
 import {Modal as RNModal, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
-import {isEmptyString} from '../../legacy/utils'
 import {COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {Icon} from '../Icon'
 
 type Props = {

src/components/TextInput/TextInput.tsx

@@ -10,8 +10,8 @@ import {
 } from 'react-native'
 import {HelperText, TextInput as RNPTextInput} from 'react-native-paper'
 
-import {isEmptyString} from '../../legacy/utils'
 import {COLORS} from '../../theme'
+import {isEmptyString} from '../../utils/utils'
 import {Icon} from '../Icon'
 
 type Props = TextInputProps &

src/components/ValidatedTextInput.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
 import {Platform, StyleSheet, TextInput, TextInputProps, TouchableOpacity, View, ViewStyle} from 'react-native'
 
-import {isEmptyString} from '../legacy/utils'
 import {COLORS} from '../theme'
+import {isEmptyString} from '../utils/utils'
 import {Icon} from './Icon'
 import {Text} from './Text'
 

src/index.tsx

@@ -15,10 +15,10 @@ import translations from './i18n/translations'
 import {CONFIG} from './legacy/config'
 import {ApiError, NetworkError} from './legacy/errors'
 import {Logger, setLogLevel} from './legacy/logging'
-import {isEmptyString} from './legacy/utils'
 import {CurrencyProvider} from './Settings/Currency/CurrencyContext'
 import {StorageProvider, useMigrations} from './Storage'
 import {ThemeProvider} from './theme'
+import {isEmptyString} from './utils/utils'
 import {WalletManagerProvider} from './WalletManager'
 import {walletManager} from './yoroi-wallets'
 import {storage} from './yoroi-wallets/storage'

src/legacy/DeveloperScreen.tsx

@@ -16,10 +16,10 @@ import {useCreateWallet} from '../hooks'
 import {errorMessages} from '../i18n/global-messages'
 import {AppRoutes, useWalletNavigation} from '../navigation'
 import {useSelectedWalletContext} from '../SelectedWallet'
+import {isEmptyString} from '../utils/utils'
 import {generateAdaMnemonic} from '../yoroi-wallets'
 import assert from './assert'
 import {NetworkError} from './errors'
-import {isEmptyString} from './utils'
 
 const routes: Array<{label: string; path: keyof AppRoutes}> = [
   {label: 'Storybook', path: 'storybook'},

src/legacy/config.ts

@@ -1,17 +1,17 @@
 import {LogLevel} from '../legacy/logging'
-import {DefaultAsset} from '../yoroi-wallets/types'
-import type {NetworkId, WalletImplementation, WalletImplementationId} from '../yoroi-wallets/types/other'
-import {DERIVATION_TYPES, WALLET_IMPLEMENTATION_REGISTRY} from '../yoroi-wallets/types/other'
-import env from './env'
-import type {CardanoHaskellShelleyNetwork} from './networks'
+import type {CardanoHaskellShelleyNetwork} from '../yoroi-wallets/cardano/networks'
 import {
   DEFAULT_ASSETS,
   getNetworkConfigById,
   isHaskellShelleyNetwork,
   NETWORKS,
   PRIMARY_ASSET_CONSTANTS,
-} from './networks'
-import {NUMBERS} from './numbers'
+} from '../yoroi-wallets/cardano/networks'
+import {NUMBERS} from '../yoroi-wallets/cardano/numbers'
+import {DefaultAsset} from '../yoroi-wallets/types'
+import type {NetworkId, WalletImplementation, WalletImplementationId} from '../yoroi-wallets/types/other'
+import {DERIVATION_TYPES, WALLET_IMPLEMENTATION_REGISTRY} from '../yoroi-wallets/types/other'
+import env from './env'
 
 const IS_DEBUG = __DEV__
 

src/utils/index.ts

@@ -1 +1,2 @@
 export * from './sorting'
+export * from './utils'

src/yoroi-wallets/cardano/CardanoWallet.ts

@@ -21,12 +21,6 @@ import {
 } from '../../legacy/config'
 import {CardanoError, InvalidState} from '../../legacy/errors'
 import {Logger} from '../../legacy/logging'
-import {
-  CardanoHaskellShelleyNetwork,
-  getCardanoNetworkConfigById,
-  isHaskellShelleyNetwork,
-  isJormungandr,
-} from '../../legacy/networks'
 import {IsLockedError, nonblockingSynchronize, synchronize} from '../../legacy/promise'
 import {HWDeviceInfo} from '../hw'
 import {makeMemosManager, MemosManager} from '../memos'
@@ -67,6 +61,12 @@ import {
 import * as api from './api'
 import {AddressChain, AddressChainJSON, Addresses, AddressGenerator} from './chain'
 import {signTxWithLedger} from './hw'
+import {
+  CardanoHaskellShelleyNetwork,
+  getCardanoNetworkConfigById,
+  isHaskellShelleyNetwork,
+  isJormungandr,
+} from './networks'
 import {processTxHistoryData} from './processTransactions'
 import {filterAddressesByStakingKey, getDelegationStatus} from './shelley/delegationUtils'
 import {yoroiSignedTx} from './signedTx'

src/yoroi-wallets/cardano/assetUtils.ts

@@ -1,8 +1,8 @@
 import BigNumber from 'bignumber.js'
 
-import {getCardanoNetworkConfigById} from '../../legacy/networks'
 import {NetworkId, RawUtxo} from '../types/other'
 import {CardanoMobile} from '.'
+import {getCardanoNetworkConfigById} from './networks'
 import {cardanoValueFromRemoteFormat} from './utils'
 
 export async function calcLockedDeposit(utxos: RawUtxo[], networkId: NetworkId) {