From ef5a10b1a58f7fdff69cdc2cec6ea393dc3fe824 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:56:21 +0200
Subject: [PATCH] feature(wallet-mobile): new tx review for yoroi swap (#3688)
Signed-off-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
---
.../.storybook/storybook.requires.js | 39 +-
apps/wallet-mobile/src/InitApp.tsx | 2 +-
apps/wallet-mobile/src/WalletNavigator.tsx | 4 +-
apps/wallet-mobile/src/YoroiApp.tsx | 5 +-
.../common => components/Divider}/Divider.tsx | 2 +-
.../HideableText/HideableText.stories.tsx | 2 +-
.../components/HideableText/HideableText.tsx | 2 +-
.../PairedBalance/PairedBalance.tsx | 4 +-
.../features/Discover/DiscoverNavigator.tsx | 2 +-
.../SelectDappFromListScreen.tsx | 2 +-
apps/wallet-mobile/src/features/Menu/Menu.tsx | 2 +-
.../src/features/Portfolio/NftsNavigator.tsx | 2 +-
.../features/Portfolio/PortfolioNavigator.tsx | 2 +-
.../TokenAmountItem/TokenAmountItem.tsx | 2 +-
.../common/hooks/useGetPortfolioTokenChart.ts | 2 +-
.../BalanceCard/BalanceCard.tsx | 2 +-
.../BalanceCard/BalanceCardContent.tsx | 4 +-
.../PortfolioDashboard/BalanceCard/Rate.tsx | 2 +-
.../DashboardTokenItem.tsx | 4 +-
.../PortfolioTokenChart/TokenPerformance.tsx | 2 +-
.../PortfolioTokenListScreen.tsx | 2 +-
.../ListMediaGalleryScreen.tsx | 2 +-
.../TokenBalanceItem.tsx | 4 +-
.../TotalTokensValue/TokenValueBalance.tsx | 4 +-
.../TokenValuePairedBalance.tsx | 2 +-
.../TotalTokensValueContent.tsx | 4 +-
.../RegisterCatalyst/CatalystNavigator.tsx | 2 +-
.../features/ReviewTx/common/Accordion.tsx | 4 +-
.../features/ReviewTx/common/CopiableText.tsx | 31 +-
.../ReviewTx/common/ReviewTxProvider.tsx | 29 +
.../ReviewTx/common/hooks/useAddressType.tsx | 12 -
.../common/hooks/useFormattedMetadata.tsx | 13 +
.../ReviewTx/common/hooks/useFormattedTx.tsx | 46 +-
.../ReviewTx/common/hooks/useStrings.tsx | 15 +
.../ReviewTx/common/hooks/useTxBody.tsx | 3 +-
.../src/features/ReviewTx/common/types.ts | 8 +
.../ReviewTxScreen/Metadata/MetadataTab.tsx | 90 ++
.../ReviewTxScreen/Overview/OverviewTab.tsx | 80 +-
.../ReviewTxScreen/ReviewTxScreen.tsx | 61 +-
.../ReviewTxScreen/UTxOs/UTxOsTab.tsx | 2 +-
.../Settings/ApplicationSettings/index.ts | 1 -
.../src/features/Settings/SettingsItems.tsx | 2 +-
.../Settings/SettingsScreenNavigator.tsx | 46 +-
.../features/Settings/WalletSettings/index.ts | 1 -
.../src/features/Settings/index.ts | 1 -
.../About/About.stories.tsx | 4 +-
.../changeAppSettings}/About/About.tsx | 8 +-
.../changeAppSettings}/About/index.ts | 0
.../ApplicationSettingsScreen.stories.tsx | 0
.../ApplicationSettingsScreen.tsx | 32 +-
.../ChangeLanguageScreen.stories.tsx | 2 +-
.../ChangeLanguage/ChangeLanguageScreen.tsx | 2 +-
.../ChangeLanguage/index.ts | 0
.../ChangeNetworkScreen.stories.tsx | 2 +-
.../ChangeNetwork/ChangeNetworkScreen.tsx | 12 +-
.../ChangeNetwork/NetworkPickerItem.tsx | 4 +-
.../ChangeNetwork/NetworkPickerList.tsx | 14 +-
.../ChangeNetwork/NetworkTag.tsx | 18 +-
.../ChangeNetwork/PreparingNetworkScreen.tsx | 2 +-
.../ChangeNetwork/strings.ts | 2 +-
.../useLaunchRouteAfterSyncing.tsx | 4 +-
.../ChangeTheme/ChangeThemeScreen.stories.tsx | 2 +-
.../ChangeTheme/ChangeThemeScreen.tsx | 2 +-
.../ChangeTheme/ThemePickerItem.tsx | 8 +-
.../ChangeTheme/ThemePickerList.tsx | 2 +-
.../Currency/ChangeCurrencyScreen.stories.tsx | 0
.../Currency/ChangeCurrencyScreen.tsx | 2 +-
.../Currency/CurrencyContext.tsx | 6 +-
.../Currency/CurrencyPickerItem.tsx | 8 +-
.../Currency/CurrencyPickerList.tsx | 2 +-
.../EnableLoginWithOsScreen.stories.tsx | 0
.../EnableLoginWithOsScreen.tsx | 8 +-
.../EnableLoginWithOs/index.ts | 0
.../PrivacyMode/PrivacyMode.tsx | 0
.../PrivacyPolicyScreen.stories.tsx | 0
.../PrivacyPolicy/PrivacyPolicyScreen.tsx | 4 +-
.../changeAppSettings}/PrivacyPolicy/index.ts | 0
.../ScreenShare/ScreenShare.ts | 0
.../changeAppSettings}/ScreenShare/index.ts | 0
.../SystemLogScreen.stories.tsx | 4 +-
.../SystemLogScreen/SystemLogScreen.tsx | 6 +-
.../TermsOfServiceScreen.stories.tsx | 0
.../TermsOfService/TermsOfServiceScreen.tsx | 4 +-
.../TermsOfService/index.ts | 0
.../ChangePasswordScreen.stories.tsx | 6 +-
.../ChangePassword/ChangePasswordScreen.tsx | 16 +-
.../ChangePassword/index.ts | 0
.../DisableEasyConfirmationScreen.tsx | 8 +-
.../EasyConfirmationScreen.stories.tsx | 12 +-
.../EnableEasyConfirmationScreen.tsx | 20 +-
.../EasyConfirmation/index.ts | 0
.../ManageCollateral/CollateralInfoModal.tsx | 0
.../ConfirmTx/FailedTx/FailedTxImage.tsx | 0
.../FailedTx/FailedTxScreen.stories.tsx | 0
.../ConfirmTx/FailedTx/FailedTxScreen.tsx | 10 +-
.../SubmittedTx/SubmittedTxImage.tsx | 0
.../SubmittedTx/SubmittedTxScreen.stories.tsx | 0
.../SubmittedTx/SubmittedTxScreen.tsx | 12 +-
.../InitialCollateralInfoModal.tsx | 4 +-
.../ManageCollateralScreen.stories.tsx | 6 +-
.../ManageCollateralScreen.tsx | 47 +-
.../ManageCollateral/helpers.ts | 6 +-
.../illustrations/InfoModalIllustration.tsx | 0
.../ManageCollateral/index.ts | 0
.../ManageCollateral/navigation.ts | 2 +-
.../ManageCollateral/strings.ts | 0
.../RemoveWalletScreen.stories.tsx | 4 +-
.../RemoveWallet/RemoveWalletScreen.tsx | 18 +-
.../RemoveWallet/index.ts | 0
.../RenameWalletScreen.stories.tsx | 4 +-
.../RenameWalletScreen/RenameWalletScreen.tsx | 18 +-
.../WalletSettingsScreen.stories.tsx | 4 +-
.../WalletSettingsScreen.tsx | 26 +-
.../SetupWallet/SetupWalletNavigator.tsx | 2 +-
.../Governance/GovernanceNavigator.tsx | 2 +-
.../src/features/Swap/common/navigation.ts | 2 +-
.../src/features/Swap/common/strings.ts | 15 +-
.../useCases/ConfirmTxScreen/ConfirmTx.tsx | 41 -
.../ConfirmTxScreen.stories.tsx | 107 --
.../ConfirmTxScreen/ConfirmTxWithHW.tsx | 104 --
.../ConfirmTxScreen/ConfirmTxWithPassword.tsx | 74 --
.../ReviewSwap.tsx} | 126 +-
.../TransactionSummary.stories.tsx | 5 +-
.../TransactionSummary.tsx | 256 ++--
.../CreateOrder/StartSwapOrderScreen.tsx | 2 +-
.../ListOrders/OpenOrders.tsx | 2 +-
.../src/features/Swap/useCases/index.ts | 1 -
.../Transactions/TxHistoryNavigator.tsx | 15 +-
.../useCases/TxDetails/AssetList.tsx | 2 +-
.../useCases/TxDetails/TxDetails.tsx | 2 +-
.../useCases/TxHistory/BalanceBanner.tsx | 2 +-
.../useCases/TxHistory/LockedDeposit.tsx | 2 +-
.../useCases/TxList/TxListItem.tsx | 4 +-
.../AggregatedBalance.tsx | 2 +-
.../src/hooks/useAllowScreenShot.tsx | 2 +-
.../src/kernel/i18n/locales/en-US.json | 5 +
apps/wallet-mobile/src/kernel/navigation.tsx | 2 +-
.../legacy/Dashboard/DashboardNavigator.tsx | 2 +-
.../src/legacy/Dashboard/UserSummary.tsx | 2 +-
.../yoroi-wallets/cardano/cip30/cip30.test.ts | 1 +
.../src/yoroi-wallets/cardano/utils.ts | 53 +-
.../messages/src/WalletNavigator.json | 48 +-
.../PairedBalance/PairedBalance.json | 4 +-
.../ReviewTx/common/hooks/useStrings.json | 245 ++--
.../ApplicationSettingsScreen.json | 76 +-
.../Settings/SettingsScreenNavigator.json | 160 +--
.../WalletSettings/WalletSettingsScreen.json | 84 +-
.../changeAppSettings/About/About.json | 107 ++
.../ApplicationSettingsScreen.json | 287 +++++
.../ChangeNetwork/strings.json | 122 ++
.../EnableLoginWithOsScreen.json | 77 ++
.../ChangePassword/ChangePasswordScreen.json | 92 ++
.../DisableEasyConfirmationScreen.json | 32 +
.../EnableEasyConfirmationScreen.json | 62 +
.../ManageCollateral/strings.json | 197 +++
.../RemoveWallet/RemoveWalletScreen.json | 107 ++
.../RenameWalletScreen.json | 32 +
.../SettingsScreenNavigator.json | 302 +++++
.../WalletSettingsScreen.json | 317 +++++
.../SetupWallet/SetupWalletNavigator.json | 48 +-
.../src/features/Swap/common/strings.json | 1063 +++++++++--------
.../Transactions/TxHistoryNavigator.json | 171 +--
.../legacy/Dashboard/DashboardNavigator.json | 4 +-
.../src/legacy/Dashboard/UserSummary.json | 16 +-
164 files changed, 3515 insertions(+), 1913 deletions(-)
rename apps/wallet-mobile/src/{features/ReviewTx/common => components/Divider}/Divider.tsx (92%)
delete mode 100644 apps/wallet-mobile/src/features/ReviewTx/common/hooks/useAddressType.tsx
create mode 100644 apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
create mode 100644 apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
delete mode 100644 apps/wallet-mobile/src/features/Settings/ApplicationSettings/index.ts
delete mode 100644 apps/wallet-mobile/src/features/Settings/WalletSettings/index.ts
delete mode 100644 apps/wallet-mobile/src/features/Settings/index.ts
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/About/About.stories.tsx (60%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/About/About.tsx (93%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/About/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ApplicationSettings => useCases/changeAppSettings}/ApplicationSettingsScreen.stories.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ApplicationSettings => useCases/changeAppSettings}/ApplicationSettingsScreen.tsx (92%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeLanguage/ChangeLanguageScreen.stories.tsx (81%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeLanguage/ChangeLanguageScreen.tsx (87%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeLanguage/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/ChangeNetworkScreen.stories.tsx (81%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/ChangeNetworkScreen.tsx (90%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/NetworkPickerItem.tsx (95%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/NetworkPickerList.tsx (75%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/NetworkTag.tsx (87%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/PreparingNetworkScreen.tsx (95%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/strings.ts (97%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/useLaunchRouteAfterSyncing.tsx (82%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeTheme/ChangeThemeScreen.stories.tsx (80%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeTheme/ChangeThemeScreen.tsx (90%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeTheme/ThemePickerItem.tsx (90%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeTheme/ThemePickerList.tsx (91%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/ChangeCurrencyScreen.stories.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/ChangeCurrencyScreen.tsx (90%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/CurrencyContext.tsx (91%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/CurrencyPickerItem.tsx (91%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/CurrencyPickerList.tsx (92%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/EnableLoginWithOs/EnableLoginWithOsScreen.tsx (87%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/EnableLoginWithOs/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/PrivacyMode/PrivacyMode.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/PrivacyPolicy/PrivacyPolicyScreen.tsx (85%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/PrivacyPolicy/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ScreenShare/ScreenShare.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ScreenShare/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/SystemLogScreen/SystemLogScreen.stories.tsx (64%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/SystemLogScreen/SystemLogScreen.tsx (92%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/TermsOfService/TermsOfServiceScreen.stories.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/TermsOfService/TermsOfServiceScreen.tsx (85%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/TermsOfService/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ChangePassword/ChangePasswordScreen.stories.tsx (60%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ChangePassword/ChangePasswordScreen.tsx (91%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ChangePassword/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/EasyConfirmation/DisableEasyConfirmationScreen.tsx (87%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/EasyConfirmation/EasyConfirmationScreen.stories.tsx (80%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/EasyConfirmation/EnableEasyConfirmationScreen.tsx (84%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/EasyConfirmation/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/CollateralInfoModal.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/FailedTx/FailedTxImage.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx (79%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxImage.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx (79%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/InitialCollateralInfoModal.tsx (90%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ManageCollateralScreen.stories.tsx (90%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ManageCollateralScreen.tsx (82%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/helpers.ts (65%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/illustrations/InfoModalIllustration.tsx (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/navigation.ts (85%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/strings.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RemoveWallet/RemoveWalletScreen.stories.tsx (64%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RemoveWallet/RemoveWalletScreen.tsx (89%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RemoveWallet/index.ts (100%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RenameWalletScreen/RenameWalletScreen.stories.tsx (64%)
rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RenameWalletScreen/RenameWalletScreen.tsx (82%)
rename apps/wallet-mobile/src/features/Settings/{WalletSettings => useCases/changeWalletSettings}/WalletSettingsScreen.stories.tsx (66%)
rename apps/wallet-mobile/src/features/Settings/{WalletSettings => useCases/changeWalletSettings}/WalletSettingsScreen.tsx (92%)
delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTx.tsx
delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx
delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx
delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithPassword.tsx
rename apps/wallet-mobile/src/features/Swap/useCases/{ConfirmTxScreen/ConfirmTxScreen.tsx => ReviewSwap/ReviewSwap.tsx} (58%)
rename apps/wallet-mobile/src/features/Swap/useCases/{ConfirmTxScreen => ReviewSwap}/TransactionSummary.stories.tsx (95%)
rename apps/wallet-mobile/src/features/Swap/useCases/{ConfirmTxScreen => ReviewSwap}/TransactionSummary.tsx (63%)
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/About/About.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.json
create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.json
diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 21011eaba6..41fde2e017 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -185,24 +185,24 @@ const getStories = () => {
"./src/features/Send/useCases/StartMultiTokenTx/NotifySupportedNameServers/NotifySupportedNameServers.stories.tsx": require("../src/features/Send/useCases/StartMultiTokenTx/NotifySupportedNameServers/NotifySupportedNameServers.stories.tsx"),
"./src/features/Send/useCases/StartMultiTokenTx/SelectNameServer/SelectNameServer.stories.tsx": require("../src/features/Send/useCases/StartMultiTokenTx/SelectNameServer/SelectNameServer.stories.tsx"),
"./src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.stories.tsx": require("../src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.stories.tsx"),
- "./src/features/Settings/About/About.stories.tsx": require("../src/features/Settings/About/About.stories.tsx"),
- "./src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.stories.tsx": require("../src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.stories.tsx"),
- "./src/features/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx": require("../src/features/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx"),
- "./src/features/Settings/ChangeNetwork/ChangeNetworkScreen.stories.tsx": require("../src/features/Settings/ChangeNetwork/ChangeNetworkScreen.stories.tsx"),
- "./src/features/Settings/ChangePassword/ChangePasswordScreen.stories.tsx": require("../src/features/Settings/ChangePassword/ChangePasswordScreen.stories.tsx"),
- "./src/features/Settings/ChangeTheme/ChangeThemeScreen.stories.tsx": require("../src/features/Settings/ChangeTheme/ChangeThemeScreen.stories.tsx"),
- "./src/features/Settings/Currency/ChangeCurrencyScreen.stories.tsx": require("../src/features/Settings/Currency/ChangeCurrencyScreen.stories.tsx"),
- "./src/features/Settings/EasyConfirmation/EasyConfirmationScreen.stories.tsx": require("../src/features/Settings/EasyConfirmation/EasyConfirmationScreen.stories.tsx"),
- "./src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx": require("../src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx"),
- "./src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx": require("../src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx"),
- "./src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx": require("../src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx"),
- "./src/features/Settings/ManageCollateral/ManageCollateralScreen.stories.tsx": require("../src/features/Settings/ManageCollateral/ManageCollateralScreen.stories.tsx"),
- "./src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx": require("../src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx"),
- "./src/features/Settings/RemoveWallet/RemoveWalletScreen.stories.tsx": require("../src/features/Settings/RemoveWallet/RemoveWalletScreen.stories.tsx"),
- "./src/features/Settings/RenameWalletScreen/RenameWalletScreen.stories.tsx": require("../src/features/Settings/RenameWalletScreen/RenameWalletScreen.stories.tsx"),
- "./src/features/Settings/SystemLogScreen/SystemLogScreen.stories.tsx": require("../src/features/Settings/SystemLogScreen/SystemLogScreen.stories.tsx"),
- "./src/features/Settings/TermsOfService/TermsOfServiceScreen.stories.tsx": require("../src/features/Settings/TermsOfService/TermsOfServiceScreen.stories.tsx"),
- "./src/features/Settings/WalletSettings/WalletSettingsScreen.stories.tsx": require("../src/features/Settings/WalletSettings/WalletSettingsScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/About/About.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/About/About.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EasyConfirmationScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EasyConfirmationScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.stories.tsx"),
+ "./src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.stories.tsx"),
"./src/features/SetupWallet/common/ButtonCard/ButtonCard.stories.tsx": require("../src/features/SetupWallet/common/ButtonCard/ButtonCard.stories.tsx"),
"./src/features/SetupWallet/common/CardAboutPhrase/CardAboutPhrase.stories.tsx": require("../src/features/SetupWallet/common/CardAboutPhrase/CardAboutPhrase.stories.tsx"),
"./src/features/SetupWallet/common/LearnMoreButton/LearnMoreButton.stories.tsx": require("../src/features/SetupWallet/common/LearnMoreButton/LearnMoreButton.stories.tsx"),
@@ -241,10 +241,9 @@ const getStories = () => {
"./src/features/Swap/common/LiquidityPool/LiquidityPool.stories.tsx": require("../src/features/Swap/common/LiquidityPool/LiquidityPool.stories.tsx"),
"./src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.stories.tsx": require("../src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.stories.tsx"),
"./src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx": require("../src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx"),
- "./src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx"),
"./src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.stories.tsx"),
"./src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx"),
- "./src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.stories.tsx"),
+ "./src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx": require("../src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx"),
"./src/features/Swap/useCases/ShowPreprodNoticeScreen/ShowPreprodNoticeScreen.stories.tsx": require("../src/features/Swap/useCases/ShowPreprodNoticeScreen/ShowPreprodNoticeScreen.stories.tsx"),
"./src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx": require("../src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx"),
"./src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/AmountActions.stories.tsx": require("../src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/AmountActions.stories.tsx"),
diff --git a/apps/wallet-mobile/src/InitApp.tsx b/apps/wallet-mobile/src/InitApp.tsx
index cbda481e8a..e0c8b7e3e7 100644
--- 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
index c1d3857a7f..2fcf6cc04d 100644
--- 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
index 655676b9c4..cfd5918dc8 100644
--- 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/apps/wallet-mobile/src/features/ReviewTx/common/Divider.tsx b/apps/wallet-mobile/src/components/Divider/Divider.tsx
similarity index 92%
rename from apps/wallet-mobile/src/features/ReviewTx/common/Divider.tsx
rename to apps/wallet-mobile/src/components/Divider/Divider.tsx
index 1733930fda..d87afd1b14 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/Divider.tsx
+++ b/apps/wallet-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
index 1146d2ac55..429f85b291 100644
--- 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
index 17ddc8a7be..d87d04021b 100644
--- 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
index e5a450f392..6a15669aeb 100644
--- 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
index aca6bcf848..1b16ebd52f 100644
--- 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/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
index 39a2ee4b6c..28aec24bdb 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
+++ b/apps/wallet-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
index 590e375bfd..fdf416276d 100644
--- 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
index 3c8323b85b..b7e3757c96 100644
--- 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
index 9d934d67c0..78ab679ccc 100644
--- 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
index 53713bf733..987be00e51 100644
--- 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
index af3b08f03e..23bf03f74c 100644
--- 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 {features} from '../../../../kernel/features'
import {useLanguage} from '../../../../kernel/i18n'
import {logger} from '../../../../kernel/logger/logger'
import {fetchPtPriceActivity} from '../../../../yoroi-wallets/cardano/usePrimaryTokenActivity'
-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/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx
index 3ae304e27e..b274a546c7 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx
+++ b/apps/wallet-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'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent.tsx
index 7a65980aaf..0933854186 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent.tsx
@@ -6,8 +6,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
import {formatPriceChange, priceChange} from '../../../common/helpers/priceChange'
import {useNavigateTo} from '../../../common/hooks/useNavigateTo'
import {PnlTag} from '../../../common/PnlTag/PnlTag'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/Rate.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/Rate.tsx
index 60db55acf8..c89411c969 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/Rate.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/Rate.tsx
@@ -2,7 +2,7 @@ import {useTheme} from '@yoroi/theme'
import * as React from 'react'
import {StyleSheet, Text} from 'react-native'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
type Props = {rate: number; name: string}
export const Rate = ({rate, name}: Props) => {
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokenItem.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokenItem.tsx
index db49a33b5f..6d3401bf3c 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokenItem.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokenItem.tsx
@@ -7,8 +7,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
import {formatPriceChange, priceChange} from '../../../common/helpers/priceChange'
import {useNavigateTo} from '../../../common/hooks/useNavigateTo'
import {PnlTag} from '../../../common/PnlTag/PnlTag'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
index b14eaef25b..04d66d481a 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
@@ -5,7 +5,7 @@ import {StyleSheet, View} from 'react-native'
import {Text} from '../../../../../components/Text'
import {Tooltip} from '../../../../../components/Tooltip/Tooltip'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
import {formatPriceChange} from '../../../common/helpers/priceChange'
import {TOKEN_CHART_INTERVAL, TokenChartInterval} from '../../../common/hooks/useGetPortfolioTokenChart'
import {useStrings} from '../../../common/hooks/useStrings'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioTokenListScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioTokenListScreen.tsx
index 684c305a1f..b12faf3bb2 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioTokenListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioTokenListScreen.tsx
@@ -6,7 +6,7 @@ import {SafeAreaView} from 'react-native-safe-area-context'
import {Tab, TabPanel, Tabs} from '../../../../components/Tabs/Tabs'
import {useMetrics} from '../../../../kernel/metrics/metricsManager'
import {useSearchOnNavBar} from '../../../Search/SearchContext'
-import {NetworkTag} from '../../../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../../../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
import {useGetDAppsPortfolioBalance} from '../../common/hooks/useGetDAppsPortfolioBalance'
import {useStrings} from '../../common/hooks/useStrings'
import {PortfolioListTab, usePortfolio} from '../../common/PortfolioProvider'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen.tsx
index f953cfeccb..7dafd5b684 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen.tsx
@@ -9,7 +9,7 @@ import {SafeAreaView} from 'react-native-safe-area-context'
import {Space} from '../../../../../../components/Space/Space'
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 {useSelectedWallet} from '../../../../../WalletManager/common/hooks/useSelectedWallet'
import {usePortfolioBalances} from '../../../../common/hooks/usePortfolioBalances'
import {useStrings} from '../../../../common/hooks/useStrings'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TokenBalanceItem.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TokenBalanceItem.tsx
index 43ae21f7d8..1c9cca4d84 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TokenBalanceItem.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TokenBalanceItem.tsx
@@ -6,8 +6,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
import {formatPriceChange, priceChange} from '../../../common/helpers/priceChange'
import {useNavigateTo} from '../../../common/hooks/useNavigateTo'
import {PnlTag} from '../../../common/PnlTag/PnlTag'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValueBalance.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValueBalance.tsx
index 0be7da56c9..909559e7ad 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValueBalance.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValueBalance.tsx
@@ -4,8 +4,8 @@ import {Portfolio} from '@yoroi/types'
import * as React from 'react'
import {StyleSheet, Text, View} from 'react-native'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
import {SkeletonPrimaryToken} from './SkeletonPrimaryToken'
type Props = {
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValuePairedBalance.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValuePairedBalance.tsx
index a32669d6c6..28fad6bca3 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValuePairedBalance.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValuePairedBalance.tsx
@@ -5,7 +5,7 @@ import * as React from 'react'
import {StyleSheet, Text} from 'react-native'
import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
import {SkeletonPairedToken} from './SkeletonPairedToken'
type Props = {
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TotalTokensValueContent.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TotalTokensValueContent.tsx
index 18efd6bf30..619f8d5e10 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TotalTokensValueContent.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TotalTokensValueContent.tsx
@@ -6,8 +6,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
import {Icon} from '../../../../../components/Icon'
import {Spacer} from '../../../../../components/Spacer/Spacer'
import {Tooltip} from '../../../../../components/Tooltip/Tooltip'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
import {formatPriceChange, priceChange} from '../../../common/helpers/priceChange'
import {useStrings} from '../../../common/hooks/useStrings'
import {PnlTag} from '../../../common/PnlTag/PnlTag'
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
index ae20582593..de0fd14e4d 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
@@ -8,7 +8,6 @@ import {useIntl} from 'react-intl'
import {StyleSheet} from 'react-native'
import {Boundary} from '../../components/Boundary/Boundary'
-import {NetworkTag} from '../../features/Settings/ChangeNetwork/NetworkTag'
import globalMessages from '../../kernel/i18n/global-messages'
import {useMetrics} from '../../kernel/metrics/metricsManager'
import {
@@ -17,6 +16,7 @@ import {
VotingRegistrationRouteNavigation,
VotingRegistrationRoutes,
} from '../../kernel/navigation'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
import {ConfirmPin} from './useCases/ConfirmPin/ConfirmPin'
import {ConfirmVotingTx} from './useCases/ConfirmVotingTx/ConfirmVotingTx'
import {DisplayPin} from './useCases/DisplayPin/DisplayPin'
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/Accordion.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/Accordion.tsx
index 92e7bfb3ac..7256cff2d0 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/Accordion.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/Accordion.tsx
@@ -1,6 +1,6 @@
import {useTheme} from '@yoroi/theme'
import * as React from 'react'
-import {Animated, LayoutAnimation, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
+import {Animated, Easing, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
import {Icon} from '../../../components/Icon'
@@ -10,12 +10,12 @@ export const Accordion = ({label, children}: {label: string; children: React.Rea
const animatedHeight = React.useRef(new Animated.Value(0)).current
const toggleSection = () => {
- LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
setIsOpen(!isOpen)
Animated.timing(animatedHeight, {
toValue: isOpen ? 0 : 1,
duration: 300,
useNativeDriver: false,
+ easing: Easing.ease,
}).start()
}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
index 9d2865f4c1..45dea2a1e6 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
@@ -1,25 +1,40 @@
import {useTheme} from '@yoroi/theme'
import * as React from 'react'
-import {StyleSheet, TouchableOpacity, View} from 'react-native'
+import {StyleSheet, TouchableOpacity, View, ViewStyle} from 'react-native'
import {useCopy} from '../../../components/Clipboard/ClipboardProvider'
import {Icon} from '../../../components/Icon'
-export const CopiableText = ({children, textToCopy}: {children: React.ReactNode; textToCopy: string}) => {
- const {styles, colors} = useStyles()
- const {copy} = useCopy()
+export const CopiableText = ({
+ children,
+ style,
+ textToCopy,
+}: {
+ children: React.ReactNode
+ style?: ViewStyle
+ textToCopy: string
+}) => {
+ const {styles} = useStyles()
return (
-
+
{children}
- copy({text: textToCopy})} activeOpacity={0.5}>
-
-
+
)
}
+export const CopyButton = ({textToCopy}: {textToCopy: string}) => {
+ const {colors} = useStyles()
+ const {copy} = useCopy()
+ return (
+ copy({text: textToCopy})} activeOpacity={0.5}>
+
+
+ )
+}
+
const useStyles = () => {
const {atoms, color} = useTheme()
const styles = StyleSheet.create({
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
index 05dd6ec924..93f5632b61 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
@@ -24,6 +24,9 @@ export const ReviewTxProvider = ({
cborChanged: (cbor: ReviewTxState['cbor']) => dispatch({type: ReviewTxActionType.CborChanged, cbor}),
operationsChanged: (operations: ReviewTxState['operations']) =>
dispatch({type: ReviewTxActionType.OperationsChanged, operations}),
+ customReceiverTitleChanged: (customReceiverTitle: ReviewTxState['customReceiverTitle']) =>
+ dispatch({type: ReviewTxActionType.CustomReceiverTitleChanged, customReceiverTitle}),
+ detailsChanged: (details: ReviewTxState['details']) => dispatch({type: ReviewTxActionType.DetailsChanged, details}),
onSuccessChanged: (onSuccess: ReviewTxState['onSuccess']) =>
dispatch({type: ReviewTxActionType.OnSuccessChanged, onSuccess}),
onErrorChanged: (onError: ReviewTxState['onError']) => dispatch({type: ReviewTxActionType.OnErrorChanged, onError}),
@@ -55,6 +58,14 @@ const reviewTxReducer = (state: ReviewTxState, action: ReviewTxAction) => {
draft.operations = action.operations
break
+ case ReviewTxActionType.CustomReceiverTitleChanged:
+ draft.customReceiverTitle = action.customReceiverTitle
+ break
+
+ case ReviewTxActionType.DetailsChanged:
+ draft.details = action.details
+ break
+
case ReviewTxActionType.OnSuccessChanged:
draft.onSuccess = action.onSuccess
break
@@ -82,6 +93,14 @@ type ReviewTxAction =
type: ReviewTxActionType.OperationsChanged
operations: ReviewTxState['operations']
}
+ | {
+ type: ReviewTxActionType.CustomReceiverTitleChanged
+ customReceiverTitle: ReviewTxState['customReceiverTitle']
+ }
+ | {
+ type: ReviewTxActionType.DetailsChanged
+ details: ReviewTxState['details']
+ }
| {
type: ReviewTxActionType.OnSuccessChanged
onSuccess: ReviewTxState['onSuccess']
@@ -95,6 +114,8 @@ export type ReviewTxState = {
unsignedTx: YoroiUnsignedTx | null
cbor: string | null
operations: Array | null
+ customReceiverTitle: React.ReactNode | null
+ details: {title: string; component: React.ReactNode} | null
onSuccess: ((signedTx: YoroiSignedTx) => void) | null
onError: (() => void) | null
}
@@ -103,6 +124,8 @@ type ReviewTxActions = {
unsignedTxChanged: (unsignedTx: ReviewTxState['unsignedTx']) => void
cborChanged: (cbor: ReviewTxState['cbor']) => void
operationsChanged: (operations: ReviewTxState['operations']) => void
+ customReceiverTitleChanged: (customReceiverTitle: ReviewTxState['customReceiverTitle']) => void
+ detailsChanged: (details: ReviewTxState['details']) => void
onSuccessChanged: (onSuccess: ReviewTxState['onSuccess']) => void
onErrorChanged: (onError: ReviewTxState['onError']) => void
}
@@ -111,6 +134,8 @@ const defaultState: ReviewTxState = Object.freeze({
unsignedTx: null,
cbor: null,
operations: null,
+ customReceiverTitle: null,
+ details: null,
onSuccess: null,
onError: null,
})
@@ -124,6 +149,8 @@ const initialReviewTxContext: ReviewTxContext = {
unsignedTxChanged: missingInit,
cborChanged: missingInit,
operationsChanged: missingInit,
+ customReceiverTitleChanged: missingInit,
+ detailsChanged: missingInit,
onSuccessChanged: missingInit,
onErrorChanged: missingInit,
}
@@ -132,6 +159,8 @@ enum ReviewTxActionType {
UnsignedTxChanged = 'unsignedTxChanged',
CborChanged = 'cborChanged',
OperationsChanged = 'operationsChanged',
+ CustomReceiverTitleChanged = 'customReceiverTitleChanged',
+ DetailsChanged = 'detailsChanged',
OnSuccessChanged = 'onSuccessChanged',
OnErrorChanged = 'onErrorChanged',
}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useAddressType.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useAddressType.tsx
deleted file mode 100644
index 6e054df944..0000000000
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useAddressType.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import {useQuery} from 'react-query'
-
-import {getAddressType} from '../../../../yoroi-wallets/cardano/utils'
-
-export const useAddressType = (address: string) => {
- const query = useQuery(['useAddressType', address], () => getAddressType(address), {
- suspense: true,
- })
-
- if (query.data === undefined) throw new Error('invalid address type')
- return query.data
-}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
new file mode 100644
index 0000000000..7b67530d7c
--- /dev/null
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
@@ -0,0 +1,13 @@
+import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
+import {TransactionBody} from '../types'
+
+export const formatMetadata = (unsignedTx: YoroiUnsignedTx, txBody: TransactionBody) => {
+ const hash = txBody.auxiliary_data_hash ?? null
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const metadata = unsignedTx.metadata?.['674']?.['msg' as any] ?? null
+
+ return {
+ hash,
+ metadata: {msg: [JSON.parse(metadata)]},
+ }
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
index 7949d9541d..91ef9f2d30 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
@@ -1,10 +1,13 @@
-import {invalid, isNonNullable} from '@yoroi/common'
+// import {CredKind} from '@emurgo/csl-mobile-bridge'
+import {CredKind} from '@emurgo/cross-csl-core'
+import {isNonNullable} from '@yoroi/common'
import {infoExtractName} from '@yoroi/portfolio'
import {Portfolio} from '@yoroi/types'
import _ from 'lodash'
import {useQuery} from 'react-query'
import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
+import {deriveRewardAddressFromAddress} from '../../../../yoroi-wallets/cardano/utils'
import {wrappedCsl} from '../../../../yoroi-wallets/cardano/wrappedCsl'
import {formatTokenWithText} from '../../../../yoroi-wallets/utils/format'
import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
@@ -14,12 +17,13 @@ import {
FormattedFee,
FormattedInputs,
FormattedOutputs,
+ FormattedTx,
TransactionBody,
TransactionInputs,
TransactionOutputs,
} from '../types'
-export const useFormattedTx = (data: TransactionBody) => {
+export const useFormattedTx = (data: TransactionBody): FormattedTx => {
const {wallet} = useSelectedWallet()
const inputs = data?.inputs ?? []
@@ -93,10 +97,14 @@ const formatInputs = async (
inputs.map(async (input) => {
const receiveUTxO = getUtxoByTxIdAndIndex(wallet, input.transaction_id, input.index)
const address = receiveUTxO?.receiver
- const rewardAddress =
- address !== undefined ? await deriveRewardAddressFromAddress(address, wallet.networkManager.chainId) : null
const coin = receiveUTxO?.amount != null ? asQuantity(receiveUTxO.amount) : null
+ const addressKind = address != null ? await getAddressKind(address) : null
+ const rewardAddress =
+ address != null && addressKind === CredKind.Key
+ ? await deriveAddress(address, wallet.networkManager.chainId)
+ : null
+
const primaryAssets =
coin != null
? [
@@ -130,6 +138,7 @@ const formatInputs = async (
return {
assets: [...primaryAssets, ...multiAssets].filter(isNonNullable),
address,
+ addressKind: addressKind ?? null,
rewardAddress,
ownAddress: address != null && isOwnedAddress(wallet, address),
txIndex: input.index,
@@ -147,9 +156,12 @@ const formatOutputs = async (
return Promise.all(
outputs.map(async (output) => {
const address = output.address
- const rewardAddress = await deriveRewardAddressFromAddress(address, wallet.networkManager.chainId)
const coin = asQuantity(output.amount.coin)
+ const addressKind = await getAddressKind(address)
+ const rewardAddress =
+ addressKind === CredKind.Key ? await deriveAddress(address, wallet.networkManager.chainId) : null
+
const primaryAssets = [
{
tokenInfo: wallet.portfolioPrimaryTokenInfo,
@@ -183,6 +195,7 @@ const formatOutputs = async (
return {
assets,
address,
+ addressKind,
rewardAddress,
ownAddress: isOwnedAddress(wallet, address),
}
@@ -202,20 +215,21 @@ export const formatFee = (wallet: YoroiWallet, data: TransactionBody): Formatted
}
}
-export const deriveRewardAddressFromAddress = async (address: string, chainId: number): Promise => {
+const deriveAddress = async (address: string, chainId: number) => {
+ try {
+ return await deriveRewardAddressFromAddress(address, chainId)
+ } catch {
+ return null
+ }
+}
+
+const getAddressKind = async (addressBech32: string): Promise => {
const {csl, release} = wrappedCsl()
try {
- const result = await csl.Address.fromBech32(address)
- .then((address) => csl.BaseAddress.fromAddress(address))
- .then((baseAddress) => baseAddress?.stakeCred() ?? invalid('invalid base address'))
- .then((stakeCredential) => csl.RewardAddress.new(chainId, stakeCredential))
- .then((rewardAddress) => rewardAddress.toAddress())
- .then((rewardAddrAsAddress) => rewardAddrAsAddress.toBech32(undefined))
- .catch((error) => error)
-
- if (typeof result !== 'string') throw new Error('Its not possible to derive reward address')
- return result
+ const address = await csl.Address.fromBech32(addressBech32)
+ const addressKind = await (await address.paymentCred())?.kind()
+ return addressKind ?? null
} finally {
release()
}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
index 9914016ec2..b6e245d124 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
@@ -11,6 +11,9 @@ export const useStrings = () => {
title: intl.formatMessage(messages.title),
utxosTab: intl.formatMessage(messages.utxosTab),
overviewTab: intl.formatMessage(messages.overviewTab),
+ metadataTab: intl.formatMessage(messages.metadataTab),
+ metadataHash: intl.formatMessage(messages.metadataHash),
+ metadataJsonLabel: intl.formatMessage(messages.metadataJsonLabel),
walletLabel: intl.formatMessage(messages.walletLabel),
feeLabel: intl.formatMessage(messages.feeLabel),
myWalletLabel: intl.formatMessage(messages.myWalletLabel),
@@ -52,6 +55,18 @@ const messages = defineMessages({
id: 'txReview.tabLabel.overview',
defaultMessage: '!!!Overview',
},
+ metadataTab: {
+ id: 'txReview.tabLabel.metadataTab',
+ defaultMessage: '!!!Metadata',
+ },
+ metadataHash: {
+ id: 'txReview.metadata.metadataHash',
+ defaultMessage: '!!!Metadata hash',
+ },
+ metadataJsonLabel: {
+ id: 'txReview.metadata.metadataJsonLabel',
+ defaultMessage: '!!!Metadata',
+ },
walletLabel: {
id: 'txReview.overview.wallet',
defaultMessage: '!!!Wallet',
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
index 9de33bb075..75588bd47a 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
@@ -2,8 +2,9 @@ import {useQuery} from 'react-query'
import {wrappedCsl} from '../../../../yoroi-wallets/cardano/wrappedCsl'
import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
+import {TransactionBody} from '../types'
-export const useTxBody = ({cbor, unsignedTx}: {cbor?: string; unsignedTx?: YoroiUnsignedTx}) => {
+export const useTxBody = ({cbor, unsignedTx}: {cbor?: string; unsignedTx?: YoroiUnsignedTx}): TransactionBody => {
const query = useQuery(
['useTxBody', cbor, unsignedTx],
async () => {
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/types.ts b/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
index 45744a4cf6..74cb9b2451 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
@@ -3,6 +3,7 @@ import {
TransactionInputsJSON,
TransactionOutputsJSON,
} from '@emurgo/cardano-serialization-lib-nodejs'
+import {CredKind} from '@emurgo/cross-csl-core'
import {Balance, Portfolio} from '@yoroi/types'
export type TransactionBody = TransactionBodyJSON
@@ -18,6 +19,7 @@ export type FormattedInput = {
isPrimary: boolean
}>
address: string | undefined
+ addressKind: CredKind | null
rewardAddress: string | null
ownAddress: boolean
txIndex: number
@@ -35,6 +37,7 @@ export type FormattedOutput = {
isPrimary: boolean
}>
address: string
+ addressKind: CredKind | null
rewardAddress: string | null
ownAddress: boolean
}
@@ -54,3 +57,8 @@ export type FormattedTx = {
outputs: FormattedOutputs
fee: FormattedFee
}
+
+export type Metadata = {
+ json: string | null
+ hash: string | null
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
new file mode 100644
index 0000000000..c60e4d1c60
--- /dev/null
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
@@ -0,0 +1,90 @@
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {StyleSheet, Text, View} from 'react-native'
+
+import {Space} from '../../../../../components/Space/Space'
+import {CopiableText, CopyButton} from '../../../common/CopiableText'
+import {useStrings} from '../../../common/hooks/useStrings'
+
+type Props = {
+ hash: string | null
+ metadata: {msg: Array} | null
+}
+
+export const MetadataTab = ({metadata, hash}: Props) => {
+ const {styles} = useStyles()
+ const strings = useStrings()
+
+ if (hash == null || metadata == null) return null
+
+ const metadataFormatted = JSON.stringify(metadata, null, 2)
+
+ return (
+
+
+
+
+ {strings.metadataHash}
+
+
+
+
+ {hash}
+
+
+
+
+
+
+
+ {strings.metadataJsonLabel}
+
+
+
+
+
+
+ {metadataFormatted}
+
+
+ )
+}
+
+const useStyles = () => {
+ const {atoms, color} = useTheme()
+ const styles = StyleSheet.create({
+ root: {
+ ...atoms.flex_1,
+ ...atoms.px_lg,
+ backgroundColor: color.bg_color_max,
+ },
+ title: {
+ ...atoms.flex_row,
+ ...atoms.justify_between,
+ },
+ label: {
+ ...atoms.body_2_md_regular,
+ color: color.text_gray_low,
+ },
+ text: {
+ ...atoms.text_right,
+ ...atoms.flex_1,
+ ...atoms.body_2_md_regular,
+ color: color.text_gray_medium,
+ },
+ hashContainer: {
+ ...atoms.flex_1,
+ },
+ metadata: {
+ backgroundColor: color.bg_color_min,
+ ...atoms.rounded_sm,
+ ...atoms.p_lg,
+ },
+ metadataLabel: {
+ ...atoms.body_1_lg_medium,
+ color: color.text_gray_medium,
+ },
+ })
+
+ return {styles} as const
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx
index 92278d03ba..cd04aeeb68 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx
@@ -1,11 +1,14 @@
// 🚧 TODO: grouping by staking address 🚧
+import {CredKind} from '@emurgo/cross-csl-core'
import {Blockies} from '@yoroi/identicon'
import {useTheme} from '@yoroi/theme'
import * as React from 'react'
import {Linking, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
+import {Divider} from '../../../../../components/Divider/Divider'
import {Icon} from '../../../../../components/Icon'
+import {useModal} from '../../../../../components/Modal/ModalContext'
import {Space} from '../../../../../components/Space/Space'
import {formatTokenWithText} from '../../../../../yoroi-wallets/utils/format'
import {Quantities} from '../../../../../yoroi-wallets/utils/utils'
@@ -13,14 +16,20 @@ import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelec
import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
import {Accordion} from '../../../common/Accordion'
import {CopiableText} from '../../../common/CopiableText'
-import {Divider} from '../../../common/Divider'
-import {useAddressType} from '../../../common/hooks/useAddressType'
import {useStrings} from '../../../common/hooks/useStrings'
-import {ReviewTxState} from '../../../common/ReviewTxProvider'
+import {ReviewTxState, useReviewTx} from '../../../common/ReviewTxProvider'
import {TokenItem} from '../../../common/TokenItem'
import {FormattedOutputs, FormattedTx} from '../../../common/types'
-export const OverviewTab = ({tx, operations}: {tx: FormattedTx; operations: ReviewTxState['operations']}) => {
+export const OverviewTab = ({
+ tx,
+ operations,
+ details,
+}: {
+ tx: FormattedTx
+ operations: ReviewTxState['operations']
+ details: ReviewTxState['details']
+}) => {
const {styles} = useStyles()
const notOwnedOutputs = React.useMemo(() => tx.outputs.filter((output) => !output.ownAddress), [tx.outputs])
@@ -37,6 +46,8 @@ export const OverviewTab = ({tx, operations}: {tx: FormattedTx; operations: Revi
+
+