Merge branch 'develop' into yomo-1943

Emurgo · Oct 16, 2024 · 5a5e38e · 5a5e38e
2 parents 1d327ba + 6fbf24a
commit 5a5e38e
Show file tree

Hide file tree

Showing 181 changed files with 3,764 additions and 2,060 deletions.
diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
diff --git a/apps/wallet-mobile/src/InitApp.tsx b/apps/wallet-mobile/src/InitApp.tsx
@@ -5,7 +5,7 @@ import {Platform, UIManager} from 'react-native'
 import uuid from 'uuid'
 
 import {AppNavigator} from './AppNavigator'
-import {useInitScreenShare} from './features/Settings/ScreenShare'
+import {useInitScreenShare} from './features/Settings/useCases/changeAppSettings/ScreenShare'
 import {useWalletManager} from './features/WalletManager/context/WalletManagerProvider'
 import {storageVersionMaker} from './kernel/storage/migrations/storageVersion'
 

diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -26,8 +26,8 @@ import {PortfolioNavigator} from './features/Portfolio/PortfolioNavigator'
 import {CatalystNavigator} from './features/RegisterCatalyst/CatalystNavigator'
 import {ReviewTxNavigator} from './features/ReviewTx/ReviewTxNavigator'
 import {SearchProvider} from './features/Search/SearchContext'
-import {SettingsScreenNavigator} from './features/Settings'
-import {NetworkTag} from './features/Settings/ChangeNetwork/NetworkTag'
+import {SettingsScreenNavigator} from './features/Settings/SettingsScreenNavigator'
+import {NetworkTag} from './features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {SetupWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
 import {GovernanceNavigator} from './features/Staking/Governance/GovernanceNavigator'
 import {SwapFormProvider} from './features/Swap/common/SwapFormProvider'

diff --git a/apps/wallet-mobile/src/YoroiApp.tsx b/apps/wallet-mobile/src/YoroiApp.tsx
@@ -7,7 +7,7 @@ import React from 'react'
 import {LogBox, StyleSheet} from 'react-native'
 import * as RNP from 'react-native-paper'
 import {initialWindowMetrics, SafeAreaProvider} from 'react-native-safe-area-context'
-import {enableFreeze, enableScreens} from 'react-native-screens'
+import {enableScreens} from 'react-native-screens'
 import {QueryClientProvider} from 'react-query'
 
 import {LoadingBoundary} from './components/Boundary/Boundary'
@@ -16,7 +16,7 @@ import {AuthProvider} from './features/Auth/AuthProvider'
 import {BrowserProvider} from './features/Discover/common/BrowserProvider'
 import {PortfolioTokenActivityProvider} from './features/Portfolio/common/PortfolioTokenActivityProvider'
 import {ReviewTxProvider} from './features/ReviewTx/common/ReviewTxProvider'
-import {CurrencyProvider} from './features/Settings/Currency/CurrencyContext'
+import {CurrencyProvider} from './features/Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {AutomaticWalletOpenerProvider} from './features/WalletManager/context/AutomaticWalletOpeningProvider'
 import {WalletManagerProvider} from './features/WalletManager/context/WalletManagerProvider'
 import {walletManager} from './features/WalletManager/wallet-manager'
@@ -32,7 +32,6 @@ import {PoolTransitionProvider} from './legacy/Staking/PoolTransition/PoolTransi
 import {useThemeStorageMaker} from './yoroi-wallets/hooks'
 
 enableScreens(true)
-enableFreeze(true)
 
 if (disableLogbox) {
   LogBox.ignoreAllLogs()

diff --git a/.../src/features/ReviewTx/common/Divider.tsx → ...mobile/src/components/Divider/Divider.tsx b/.../src/features/ReviewTx/common/Divider.tsx → ...mobile/src/components/Divider/Divider.tsx
@@ -2,7 +2,7 @@ import {SpacingSize, useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {StyleSheet, View} from 'react-native'
 
-import {Space} from '../../../components/Space/Space'
+import {Space} from '../Space/Space'
 
 export const Divider = ({verticalSpace = 'none'}: {verticalSpace?: SpacingSize}) => {
   const {styles} = useStyles()

diff --git a/apps/wallet-mobile/src/components/HideableText/HideableText.stories.tsx b/apps/wallet-mobile/src/components/HideableText/HideableText.stories.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {usePrivacyMode} from '../../features/Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {Button} from '../Button/Button'
 import {Spacer} from '../Spacer/Spacer'
 import {Text} from '../Text'

diff --git a/apps/wallet-mobile/src/components/HideableText/HideableText.tsx b/apps/wallet-mobile/src/components/HideableText/HideableText.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import {TextProps} from 'react-native'
 
-import {usePrivacyMode} from '../../features/Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {Text} from '../Text'
 
 type Props = TextProps & {

diff --git a/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx b/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx
@@ -7,8 +7,8 @@ import {StyleSheet, Text, TextStyle} from 'react-native'
 
 import {usePortfolio} from '../../features/Portfolio/common/PortfolioProvider'
 import {usePortfolioTokenActivity} from '../../features/Portfolio/common/PortfolioTokenActivityProvider'
-import {useCurrencyPairing} from '../../features/Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../features/Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../features/Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useWalletManager} from '../../features/WalletManager/context/WalletManagerProvider'
 import {CurrencySymbol} from '../../yoroi-wallets/types/other'
 import {Boundary, ResetError, ResetErrorRef} from '../Boundary/Boundary'

diff --git a/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx b/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
@@ -7,7 +7,7 @@ import {ErrorBoundary} from 'react-error-boundary'
 import {LoadingBoundary} from '../../components/Boundary/Boundary'
 import {SomethingWentWrong} from '../../components/SomethingWentWrong/SomethingWentWrong'
 import {defaultStackNavigationOptions, DiscoverRoutes} from '../../kernel/navigation'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {BrowserNavigator} from './BrowserNavigator'
 import {useStrings} from './common/useStrings'
 import {ReviewTransaction} from './useCases/ReviewTransaction/ReviewTransaction'

diff --git a/...let-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx b/...let-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
@@ -7,7 +7,7 @@ import {SimpleTab} from '../../../../components/SimpleTab/SimpleTab'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
 import {useSearch, useSearchOnNavBar} from '../../../Search/SearchContext'
-import {NetworkTag} from '../../../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../../../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {ChainDAppsWarning} from '../../common/ChainDAppsWarning'
 import {getGoogleSearchItem} from '../../common/helpers'
 import {useDAppsConnected} from '../../common/useDAppsConnected'

diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx
@@ -19,7 +19,7 @@ import {usePrefetchStakingInfo} from '../../legacy/Dashboard/StakePoolInfos'
 import {usePoolTransition} from '../../legacy/Staking/PoolTransition/usePoolTransition'
 import {useCanVote} from '../RegisterCatalyst/common/hooks'
 import {InsufficientFundsModal} from '../RegisterCatalyst/common/InsufficientFundsModal'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {useIsGovernanceFeatureEnabled} from '../Staking/Governance/common/helpers'
 import {useSelectedWallet} from '../WalletManager/common/hooks/useSelectedWallet'
 

diff --git a/apps/wallet-mobile/src/features/Portfolio/NftsNavigator.tsx b/apps/wallet-mobile/src/features/Portfolio/NftsNavigator.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 
 import {useMetrics} from '../../kernel/metrics/metricsManager'
 import {defaultStackNavigationOptions, NftRoutes} from '../../kernel/navigation'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {useStrings} from './common/hooks/useStrings'
 import {MediaDetailsScreen} from './common/MediaDetailsScreen/MediaDetailsScreen'
 import {ListMediaGalleryScreen} from './useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen'

diff --git a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
@@ -5,7 +5,7 @@ import * as React from 'react'
 import {Boundary} from '../../components/Boundary/Boundary'
 import {defaultStackNavigationOptions, PortfolioRoutes} from '../../kernel/navigation'
 import {SearchProvider} from '../Search/SearchContext'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {TxDetails} from '../Transactions/useCases/TxDetails/TxDetails'
 import {useStrings} from './common/hooks/useStrings'
 import {PortfolioProvider} from './common/PortfolioProvider'

diff --git a/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenAmountItem.tsx b/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenAmountItem.tsx
@@ -8,7 +8,7 @@ import {Icon} from '../../../../components/Icon'
 import {PairedBalance} from '../../../../components/PairedBalance/PairedBalance'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {Text} from '../../../../components/Text'
-import {usePrivacyMode} from '../../../Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {usePriceImpactRiskTheme} from '../../../Swap/common/helpers'
 import {SwapPriceImpactRisk} from '../../../Swap/common/types'
 import {TokenInfoIcon} from './TokenInfoIcon'

diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts
@@ -8,7 +8,7 @@ import {useLanguage} from '../../../../kernel/i18n'
 import {logger} from '../../../../kernel/logger/logger'
 import {fetchPtPriceActivity} from '../../../../yoroi-wallets/cardano/usePrimaryTokenActivity'
 import {delay} from '../../../../yoroi-wallets/utils/timeUtils'
-import {useCurrencyPairing} from '../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {useSelectedNetwork} from '../../../WalletManager/common/hooks/useSelectedNetwork'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {networkConfigs} from '../../../WalletManager/network-manager/network-manager'

diff --git a/...let-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx b/...let-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx
@@ -4,7 +4,7 @@ import * as React from 'react'
 import {StyleSheet, View} from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
 
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {aggregatePrimaryAmount} from '../../../common/helpers/aggregatePrimaryAmount'
 import {usePortfolioTokenActivity} from '../../../common/PortfolioTokenActivityProvider'