From 2d190c27bef05fc6d8429cd73ff38c85f5220d78 Mon Sep 17 00:00:00 2001 From: jorbuedo Date: Mon, 10 Jun 2024 16:21:49 +0200 Subject: [PATCH] Fix conflicts --- .../.storybook/storybook.requires.js | 2 +- apps/wallet-mobile/package.json | 4 +- .../src/Staking/FailedTx/FailedTxScreen.tsx | 4 +- .../PoolTransition/usePoolTransition.tsx | 34 +++--- .../Staking/StakingCenter/StakingCenter.tsx | 14 +-- .../src/components/Modal/ModalScreen.tsx | 2 +- apps/wallet-mobile/src/features/Menu/Menu.tsx | 13 --- .../features/Send/common/useSendAddress.tsx | 2 +- .../messages/src/Dashboard/Dashboard.json | 10 +- .../src/Dashboard/DashboardNavigator.json | 6 +- .../src/Staking/FailedTx/FailedTxScreen.json | 34 +++--- .../PoolTransition/usePoolTransition.json | 106 +++++++++--------- .../Staking/StakingCenter/StakingCenter.json | 18 +-- .../messages/src/TxHistory/TxHistory.json | 10 +- yarn.lock | 33 +++--- 15 files changed, 138 insertions(+), 154 deletions(-) diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js index 2445910993..f3a090b1da 100644 --- a/apps/wallet-mobile/.storybook/storybook.requires.js +++ b/apps/wallet-mobile/.storybook/storybook.requires.js @@ -182,6 +182,7 @@ const getStories = () => { "./src/features/SetupWallet/common/LogoBanner/LogoBanner.stories.tsx": require("../src/features/SetupWallet/common/LogoBanner/LogoBanner.stories.tsx"), "./src/features/SetupWallet/common/PreparingWallet/PreparingWallet.stories.tsx": require("../src/features/SetupWallet/common/PreparingWallet/PreparingWallet.stories.tsx"), "./src/features/SetupWallet/common/StepperProgress/StepperProgress.stories.tsx": require("../src/features/SetupWallet/common/StepperProgress/StepperProgress.stories.tsx"), + "./src/features/SetupWallet/common/TextInput/TextInput.stories.tsx": require("../src/features/SetupWallet/common/TextInput/TextInput.stories.tsx"), "./src/features/SetupWallet/legacy/CheckNanoX/CheckNanoXScreen.stories.tsx": require("../src/features/SetupWallet/legacy/CheckNanoX/CheckNanoXScreen.stories.tsx"), "./src/features/SetupWallet/legacy/ConnectNanoX/ConnectNanoXScreen.stories.tsx": require("../src/features/SetupWallet/legacy/ConnectNanoX/ConnectNanoXScreen.stories.tsx"), "./src/features/SetupWallet/legacy/ImportReadOnlyWallet/ImportReadOnlyWalletScreen.stories.tsx": require("../src/features/SetupWallet/legacy/ImportReadOnlyWallet/ImportReadOnlyWalletScreen.stories.tsx"), @@ -197,7 +198,6 @@ const getStories = () => { "./src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.stories.tsx": require("../src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.stories.tsx"), "./src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.stories.tsx": require("../src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.stories.tsx"), "./src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.stories.tsx"), - "./src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/TextInput/TextInput.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/TextInput/TextInput.stories.tsx"), "./src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.stories.tsx"), "./src/features/Staking/Governance/common/Action/Action.stories.tsx": require("../src/features/Staking/Governance/common/Action/Action.stories.tsx"), "./src/features/Staking/Governance/common/LearnMoreLink/LearnMoreLink.stories.tsx": require("../src/features/Staking/Governance/common/LearnMoreLink/LearnMoreLink.stories.tsx"), diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index e92c5f104a..d6d3abd0d5 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -99,7 +99,7 @@ "@emurgo/csl-mobile-bridge": "6.0.0-alpha.9", "@emurgo/react-native-blockies-svg": "^0.0.2", "@emurgo/react-native-hid": "^5.15.6", - "@emurgo/yoroi-lib": "0.15.5-alpha.7", + "@emurgo/yoroi-lib": "0.15.5-alpha.8", "@formatjs/intl-datetimeformat": "^6.7.0", "@formatjs/intl-getcanonicallocales": "^2.1.0", "@formatjs/intl-locale": "^3.2.1", @@ -127,11 +127,11 @@ "@yoroi/exchange": "2.0.1", "@yoroi/links": "1.5.4", "@yoroi/resolver": "2.0.5", + "@yoroi/setup-wallet": "1.0.0", "@yoroi/staking": "1.5.1", "@yoroi/swap": "1.5.2", "@yoroi/theme": "^1.0.0", "@yoroi/transfer": "1.0.0", - "@yoroi/setup-wallet": "1.0.0", "add": "2.0.6", "assert": "^2.0.0", "axios": "^1.5.0", diff --git a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx index 8b5cf31ce4..5271bf4187 100644 --- a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx +++ b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx @@ -39,7 +39,7 @@ const useNavigateTo = () => { return { buyAda: () => - navigation.navigate('app-root', { + navigation.navigate('manage-wallets', { screen: 'main-wallet-routes', params: { screen: 'history', @@ -49,7 +49,7 @@ const useNavigateTo = () => { }, }), main: () => - navigation.navigate('app-root', { + navigation.navigate('manage-wallets', { screen: 'main-wallet-routes', params: { screen: 'history', diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx index 9ebf0b3eb5..43c4655ca1 100644 --- a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx +++ b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx @@ -6,14 +6,10 @@ import * as React from 'react' import {defineMessages, useIntl} from 'react-intl' import {useQuery} from 'react-query' -import {features} from '../../../features' -import {useSelectedWallet} from '../../../features/WalletManager/context/SelectedWalletContext' -import {getCardanoNetworkConfigById} from '../../../yoroi-wallets/cardano/networks' -import {YoroiWallet} from '../../../yoroi-wallets/cardano/types' -import {asQuantity, Quantities} from '../../../yoroi-wallets/utils' import {useStakingInfo} from '../../Dashboard/StakePoolInfos' import {features} from '../../features' -import {useSelectedWallet} from '../../features/WalletManager/Context' +import {useSelectedWallet} from '../../features/WalletManager/Context/SelectedWalletContext' +import {getCardanoNetworkConfigById} from '../../yoroi-wallets/cardano/networks' import {YoroiWallet} from '../../yoroi-wallets/cardano/types' import {asQuantity, Quantities} from '../../yoroi-wallets/utils' @@ -57,23 +53,29 @@ export const usePoolTransition = () => { const navigateToUpdate = React.useCallback(async () => { try { const yoroiUnsignedTx = await createDelegationTx(wallet, poolId) - navigation.navigate('app-root', { - screen: 'staking-dashboard', + navigation.navigate('manage-wallets', { + screen: 'main-wallet-routes', params: { - screen: 'delegation-confirmation', - initial: false, + screen: 'staking-dashboard', params: { - poolId, - yoroiUnsignedTx, + screen: 'delegation-confirmation', + initial: false, + params: { + poolId, + yoroiUnsignedTx, + }, }, }, }) } catch (err) { - navigation.navigate('app-root', { - screen: 'staking-dashboard', + navigation.navigate('manage-wallets', { + screen: 'main-wallet-routes', params: { - screen: 'delegation-failed-tx', - initial: false, + screen: 'staking-dashboard', + params: { + screen: 'delegation-failed-tx', + initial: false, + }, }, }) } diff --git a/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx b/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx index fd72c1ecef..87c611d9b7 100644 --- a/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx +++ b/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx @@ -5,18 +5,7 @@ import {defineMessages, useIntl} from 'react-intl' import {View} from 'react-native' import {WebView, WebViewMessageEvent} from 'react-native-webview' -import {PleaseWaitModal, Spacer} from '../../../components' -import {features} from '../../../features' -import {useSelectedWallet} from '../../../features/WalletManager/context/SelectedWalletContext' -import {showErrorDialog} from '../../../kernel/dialogs' -import {isNightly} from '../../../kernel/env' -import {useLanguage} from '../../../kernel/i18n' -import globalMessages from '../../../kernel/i18n/global-messages' -import {useMetrics} from '../../../kernel/metrics/metricsManager' -import {StakingCenterRouteNavigation} from '../../../kernel/navigation' -import {NETWORKS} from '../../../yoroi-wallets/cardano/networks' -import {NotEnoughMoneyToSendError} from '../../../yoroi-wallets/cardano/types' -import {usePlate} from '../../../yoroi-wallets/hooks' +import {PleaseWaitModal, Spacer} from '../../components' import {useStakingTx} from '../../Dashboard/StakePoolInfos' import {showErrorDialog} from '../../dialogs' import {features} from '../../features' @@ -29,6 +18,7 @@ import {useMetrics} from '../../metrics/metricsManager' import {StakingCenterRouteNavigation} from '../../navigation' import {getNetworkConfigById, NETWORKS} from '../../yoroi-wallets/cardano/networks' import {NotEnoughMoneyToSendError} from '../../yoroi-wallets/cardano/types' +import {usePlate} from '../../yoroi-wallets/hooks' import {PoolDetailScreen} from '../PoolDetails' export const StakingCenter = () => { diff --git a/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx b/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx index e5b6db04b0..33e9cc8754 100644 --- a/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx +++ b/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx @@ -108,7 +108,7 @@ const useStyles = () => { }, sheet: { flex: 1, - backgroundColor: color.gray_cmin, + backgroundColor: color.gray['min'], alignSelf: 'stretch', paddingHorizontal: 16, paddingBottom: 16, diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx index c880506ab7..148a1a2f3e 100644 --- a/apps/wallet-mobile/src/features/Menu/Menu.tsx +++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx @@ -11,10 +11,8 @@ import {useCanVote} from '../../Catalyst/hooks' import {InsufficientFundsModal} from '../../Catalyst/InsufficientFundsModal' import {Boundary, Icon, Spacer, Text} from '../../components' import {usePrefetchStakingInfo} from '../../Dashboard/StakePoolInfos' -import {CONFIG} from '../../legacy/config' import {useMetrics} from '../../metrics/metricsManager' import {defaultStackNavigationOptions, useWalletNavigation} from '../../navigation' -import {usePoolTransition} from '../../Staking/PoolTransition/usePoolTransition' import {useIsGovernanceFeatureEnabled} from '../Staking/Governance' import {useSelectedWallet} from '../WalletManager/Context/SelectedWalletContext' @@ -43,7 +41,6 @@ export const Menu = () => { const {styles, color} = useStyles() const navigateTo = useNavigateTo() const wallet = useSelectedWallet() - const {isPoolRetiring} = usePoolTransition() const {track} = useMetrics() useFocusEffect( @@ -62,15 +59,6 @@ export const Menu = () => { left={} /> - {CONFIG.DAPP_EXPLORER_ENABLED && ( - } - right={isPoolRetiring ? : null} - /> - )} - {isGovernanceFeatureEnabled && ( { diff --git a/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json b/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json index 6116ff6c5e..345e991e8f 100644 --- a/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json +++ b/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Go to Staking Center", "file": "src/Dashboard/Dashboard.tsx", "start": { - "line": 240, + "line": 252, "column": 23, - "index": 7906 + "index": 8064 }, "end": { - "line": 243, + "line": 255, "column": 3, - "index": 8039 + "index": 8197 } } -] +] \ No newline at end of file diff --git a/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json b/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json index 9a6623fad5..836bb0b0f3 100644 --- a/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json +++ b/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json @@ -6,12 +6,12 @@ "start": { "line": 65, "column": 9, - "index": 2064 + "index": 2086 }, "end": { "line": 68, "column": 3, - "index": 2152 + "index": 2174 } } -] +] \ No newline at end of file diff --git a/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json b/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json index 804caa0440..f245ca9780 100644 --- a/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json +++ b/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Not enough funds", "file": "src/Staking/FailedTx/FailedTxScreen.tsx", "start": { - "line": 104, + "line": 105, "column": 18, - "index": 2490 + "index": 2563 }, "end": { - "line": 107, + "line": 108, "column": 3, - "index": 2606 + "index": 2679 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!Your transaction cannot be processed due to lack of funds on your wallet balance", "file": "src/Staking/FailedTx/FailedTxScreen.tsx", "start": { - "line": 108, + "line": 109, "column": 20, - "index": 2628 + "index": 2701 }, "end": { - "line": 111, + "line": 112, "column": 3, - "index": 2810 + "index": 2883 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!Buy ada", "file": "src/Staking/FailedTx/FailedTxScreen.tsx", "start": { - "line": 112, + "line": 113, "column": 10, - "index": 2822 + "index": 2895 }, "end": { - "line": 115, + "line": 116, "column": 3, - "index": 2921 + "index": 2994 } }, { @@ -49,14 +49,14 @@ "defaultMessage": "!!!Go to main wallet page", "file": "src/Staking/FailedTx/FailedTxScreen.tsx", "start": { - "line": 116, + "line": 117, "column": 12, - "index": 2935 + "index": 3008 }, "end": { - "line": 119, + "line": 120, "column": 3, - "index": 3051 + "index": 3124 } } -] +] \ No newline at end of file diff --git a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json index 46c7862438..c5cd53b40f 100644 --- a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json +++ b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Upgrade your stake pool", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 105, + "line": 114, "column": 9, - "index": 3607 + "index": 4001 }, "end": { - "line": 108, + "line": 117, "column": 3, - "index": 3705 + "index": 4099 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!The current stake pool you're using will soon close. Migrate to the new EMURGO pool to sustain reward generation.", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 109, + "line": 118, "column": 11, - "index": 3718 + "index": 4112 }, "end": { - "line": 113, + "line": 122, "column": 3, - "index": 3914 + "index": 4308 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!The current stake pool you're using is decommissioned and NOT generating reward anymore. Update it to continue earning", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 114, + "line": 123, "column": 16, - "index": 3932 + "index": 4326 }, "end": { - "line": 118, + "line": 127, "column": 3, - "index": 4138 + "index": 4532 } }, { @@ -49,14 +49,14 @@ "defaultMessage": "!!!Current pool", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 119, + "line": 128, "column": 15, - "index": 4155 + "index": 4549 }, "end": { - "line": 122, + "line": 131, "column": 3, - "index": 4248 + "index": 4642 } }, { @@ -64,14 +64,14 @@ "defaultMessage": "!!!New pool", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 123, + "line": 132, "column": 11, - "index": 4261 + "index": 4655 }, "end": { - "line": 126, + "line": 135, "column": 3, - "index": 4346 + "index": 4740 } }, { @@ -79,14 +79,14 @@ "defaultMessage": "!!!Estimated ROA", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 127, + "line": 136, "column": 16, - "index": 4364 + "index": 4758 }, "end": { - "line": 130, + "line": 139, "column": 3, - "index": 4459 + "index": 4853 } }, { @@ -94,14 +94,14 @@ "defaultMessage": "!!!Fee", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 131, + "line": 140, "column": 7, - "index": 4468 + "index": 4862 }, "end": { - "line": 134, + "line": 143, "column": 3, - "index": 4544 + "index": 4938 } }, { @@ -109,14 +109,14 @@ "defaultMessage": "!!!This pool continues to generate staking rewards", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 135, + "line": 144, "column": 24, - "index": 4570 + "index": 4964 }, "end": { - "line": 138, + "line": 147, "column": 3, - "index": 4707 + "index": 5101 } }, { @@ -124,14 +124,14 @@ "defaultMessage": "!!!This pool is NOT generating staking rewards anymore", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 139, + "line": 148, "column": 17, - "index": 4726 + "index": 5120 }, "end": { - "line": 142, + "line": 151, "column": 3, - "index": 4860 + "index": 5254 } }, { @@ -139,14 +139,14 @@ "defaultMessage": "!!!This pool will stop generating rewards in", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 143, + "line": 152, "column": 23, - "index": 4885 + "index": 5279 }, "end": { - "line": 146, + "line": 155, "column": 3, - "index": 5015 + "index": 5409 } }, { @@ -154,14 +154,14 @@ "defaultMessage": "!!!Skip and stop receiving rewards", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 147, + "line": 156, "column": 17, - "index": 5034 + "index": 5428 }, "end": { - "line": 150, + "line": 159, "column": 3, - "index": 5148 + "index": 5542 } }, { @@ -169,14 +169,14 @@ "defaultMessage": "!!!Update now and keep earning", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 151, + "line": 160, "column": 21, - "index": 5171 + "index": 5565 }, "end": { - "line": 154, + "line": 163, "column": 3, - "index": 5285 + "index": 5679 } }, { @@ -184,14 +184,14 @@ "defaultMessage": "!!!Update pool", "file": "src/Staking/PoolTransition/usePoolTransition.tsx", "start": { - "line": 155, + "line": 164, "column": 10, - "index": 5297 + "index": 5691 }, "end": { - "line": 158, + "line": 167, "column": 3, - "index": 5384 + "index": 5778 } } -] +] \ No newline at end of file diff --git a/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json b/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json index f5c80c46b5..50eff097e6 100644 --- a/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json +++ b/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Invalid Pool Data", "file": "src/Staking/StakingCenter/StakingCenter.tsx", "start": { - "line": 99, + "line": 100, "column": 9, - "index": 3339 + "index": 3531 }, "end": { - "line": 102, + "line": 103, "column": 3, - "index": 3447 + "index": 3639 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!The data from the stake pool(s) you selected is invalid. Please try again", "file": "src/Staking/StakingCenter/StakingCenter.tsx", "start": { - "line": 103, + "line": 104, "column": 11, - "index": 3460 + "index": 3652 }, "end": { - "line": 106, + "line": 107, "column": 3, - "index": 3626 + "index": 3818 } } -] +] \ No newline at end of file diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json index 32cfc0a6ac..bc9469f272 100644 --- a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json +++ b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json @@ -6,12 +6,12 @@ "start": { "line": 136, "column": 9, - "index": 4437 + "index": 4448 }, "end": { "line": 139, "column": 3, - "index": 4536 + "index": 4547 } }, { @@ -21,12 +21,12 @@ "start": { "line": 140, "column": 11, - "index": 4549 + "index": 4560 }, "end": { "line": 143, "column": 3, - "index": 4731 + "index": 4742 } } -] +] \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index b7018762a7..d9785c077a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -626,10 +626,10 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== -"@babel/helper-string-parser@^7.23.4": - version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e" - integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ== +"@babel/helper-string-parser@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2" + integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg== "@babel/helper-validator-identifier@^7.22.20": version "7.22.20" @@ -641,6 +641,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== +"@babel/helper-validator-identifier@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" + integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== + "@babel/helper-validator-option@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040" @@ -2358,13 +2363,13 @@ "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" -"@babel/types@^7.23.6": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002" - integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q== +"@babel/types@^7.22.19": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2" + integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q== dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-string-parser" "^7.24.7" + "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -2775,10 +2780,10 @@ bignumber.js "^9.0.1" easy-crc "1.1.0" -"@emurgo/yoroi-lib@0.15.5-alpha.7": - version "0.15.5-alpha.7" - resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.5-alpha.7.tgz#08c5f5e6b6cd611dc3134d5f1d5363aec0f49227" - integrity sha512-e5MK8rE8z2b9lJGY2NpGAzbZNpAI+KIxrou5OOi5skIlNJWGDbCpZg8HvwLOjWBYuS8pI+ii4rui5X0kTNqPjA== +"@emurgo/yoroi-lib@0.15.5-alpha.8": + version "0.15.5-alpha.8" + resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.5-alpha.8.tgz#71791392419f718d19256c4aaedd1ac8d3a37bbe" + integrity sha512-avc0cwttCgEgBMflxKK2Kaxw4IbErLa+ezlWWgJ4iGN0fgHYcpY335xXd2g+cQmsRKpPyhNWWqPXafo6e8lT8Q== dependencies: "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0" "@emurgo/cross-csl-core" "4.4.0"