From 9ddf75a69d93dc5040d5c1207024ac624db2d4cd Mon Sep 17 00:00:00 2001 From: vantuz-subhuman Date: Thu, 14 Sep 2023 14:58:15 +0300 Subject: [PATCH 1/3] delegating by id page is now categorised as hidden but allowed (accessible by url) --- packages/yoroi-extension/app/containers/wallet/Wallet.js | 5 ++++- .../yoroi-extension/app/stores/stateless/topbarCategories.js | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/yoroi-extension/app/containers/wallet/Wallet.js b/packages/yoroi-extension/app/containers/wallet/Wallet.js index a461c2cae4..4c00050da3 100644 --- a/packages/yoroi-extension/app/containers/wallet/Wallet.js +++ b/packages/yoroi-extension/app/containers/wallet/Wallet.js @@ -96,7 +96,10 @@ class Wallet extends Component { // ex: a cardano-only page for an Ergo wallet // or no category is selected yet (wallet selected for the first time) const visibilityContext = { selected: publicDeriver, walletHasAssets }; - if (!activeCategory?.isVisible(visibilityContext)) { + if ( + !activeCategory?.isVisible(visibilityContext) + && activeCategory?.isHiddenButAllowed !== true + ) { const firstValidCategory = categories.find(c => c.isVisible(visibilityContext)); if (firstValidCategory == null) { throw new Error(`Selected wallet has no valid category`); diff --git a/packages/yoroi-extension/app/stores/stateless/topbarCategories.js b/packages/yoroi-extension/app/stores/stateless/topbarCategories.js index 3af14b795e..67121d52ff 100644 --- a/packages/yoroi-extension/app/stores/stateless/topbarCategories.js +++ b/packages/yoroi-extension/app/stores/stateless/topbarCategories.js @@ -66,6 +66,7 @@ export type TopbarCategory = {| selected: PublicDeriver<>, walletHasAssets: boolean, |}) => boolean | {| disabledReason: MessageDescriptor |}, + isHiddenButAllowed?: boolean, |}; export const allCategories: Array = []; @@ -142,6 +143,7 @@ export const CARDANO_DELEGATION: TopbarCategory = registerCategory({ || networkId === networks.CardanoPreviewTestnet.NetworkId ); }, + isHiddenButAllowed: true, }); /** Revamp Wallet categoriess */ From d449a81fbfbc8317228aa35b60e410c49169b4c4 Mon Sep 17 00:00:00 2001 From: vantuz-subhuman Date: Thu, 14 Sep 2023 15:01:47 +0300 Subject: [PATCH 2/3] ergo warning updated --- .../app/components/topbar/banners/TestnetWarningBanner.js | 4 ++-- .../app/components/topbar/banners/TestnetWarningBanner.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/yoroi-extension/app/components/topbar/banners/TestnetWarningBanner.js b/packages/yoroi-extension/app/components/topbar/banners/TestnetWarningBanner.js index 67d80efdba..1103a0297e 100644 --- a/packages/yoroi-extension/app/components/topbar/banners/TestnetWarningBanner.js +++ b/packages/yoroi-extension/app/components/topbar/banners/TestnetWarningBanner.js @@ -63,9 +63,9 @@ export default class TestnetWarningBanner extends Component {
- NOTE: Due to the planned gradual termination of the Ergo wallets support in Yoroi extension, + NOTE: Due to the planned termination of the Ergo wallets support in Yoroi extension,
- Starting with the next version any Ergo wallets in the list will be visible, but not operational! + Starting with the next version any Ergo wallets will be removed and no longer accessible!
Please make sure to migrate your Ergo funds and wallets to another application.
diff --git a/packages/yoroi-extension/app/components/topbar/banners/TestnetWarningBanner.scss b/packages/yoroi-extension/app/components/topbar/banners/TestnetWarningBanner.scss index 7bd2c43f07..c671508543 100644 --- a/packages/yoroi-extension/app/components/topbar/banners/TestnetWarningBanner.scss +++ b/packages/yoroi-extension/app/components/topbar/banners/TestnetWarningBanner.scss @@ -50,7 +50,7 @@ display: flex; justify-content: center; align-items: center; - background: var(--yoroi-palette-background-banner-warning); + background: red; .shelleyTestnetWarningIcon { margin-right: 9px; } From 991db5b6f794b45a3cb6ccd0d519e0189ef626e1 Mon Sep 17 00:00:00 2001 From: vantuz-subhuman Date: Thu, 14 Sep 2023 15:29:21 +0300 Subject: [PATCH 3/3] Version bump: 4.22.600 --- packages/yoroi-extension/package-lock.json | 2 +- packages/yoroi-extension/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json index 44bf056a2d..230bb9ef5b 100644 --- a/packages/yoroi-extension/package-lock.json +++ b/packages/yoroi-extension/package-lock.json @@ -1,6 +1,6 @@ { "name": "yoroi", - "version": "4.22.500", + "version": "4.22.600", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json index b556439646..6ec99f5999 100644 --- a/packages/yoroi-extension/package.json +++ b/packages/yoroi-extension/package.json @@ -1,6 +1,6 @@ { "name": "yoroi", - "version": "4.22.500", + "version": "4.22.600", "description": "Cardano ADA wallet", "scripts": { "dev:build": "rimraf dev/ && babel-node scripts/build --type=debug",