From 35e2781f3e8e19cc3720409a22800cb41c0cffc5 Mon Sep 17 00:00:00 2001 From: evavirseda Date: Tue, 22 Apr 2025 12:27:37 +0200 Subject: [PATCH 1/3] add disclaimer and popup --- packages/desktop/App.svelte | 1 + .../desktop/components/popups/Popup.svelte | 2 ++ .../SwitchToWalletExtensionPopup.svelte | 19 +++++++++++++++++++ .../desktop/views/dashboard/Dashboard.svelte | 13 +++++++++++++ .../auxiliary/popup/enums/popup-id.enum.ts | 1 + 5 files changed, 36 insertions(+) create mode 100644 packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte diff --git a/packages/desktop/App.svelte b/packages/desktop/App.svelte index 521611d8da0..cab339e704c 100644 --- a/packages/desktop/App.svelte +++ b/packages/desktop/App.svelte @@ -81,6 +81,7 @@ void setupI18n({ fallbackLocale: 'en', initialLocale: $appSettings.language }) onMount(async () => { + openPopup({ id: PopupId.SwitchToWalletExtension }) features.analytics.appStart.enabled && Platform.trackEvent('app-start') await cleanupEmptyProfiles() checkAndMigrateProfiles() diff --git a/packages/desktop/components/popups/Popup.svelte b/packages/desktop/components/popups/Popup.svelte index af22af726d1..545c7ad54c0 100644 --- a/packages/desktop/components/popups/Popup.svelte +++ b/packages/desktop/components/popups/Popup.svelte @@ -58,6 +58,7 @@ import PayoutDetailsPopup from './PayoutDetailsPopup.svelte' import VestingRewardsFinderPopup from './VestingRewardsFinderPopup.svelte' import WithdrawFromL2Popup from './WithdrawFromL2Popup.svelte' + import SwitchToWalletExtensionPopup from './SwitchToWalletExtensionPopup.svelte' export let id: PopupId export let props: any @@ -146,6 +147,7 @@ [PopupId.PayoutDetails]: PayoutDetailsPopup, [PopupId.VestingRewardsFinder]: VestingRewardsFinderPopup, [PopupId.WithdrawFromL2]: WithdrawFromL2Popup, + [PopupId.SwitchToWalletExtension]: SwitchToWalletExtensionPopup, } function onKey(event: KeyboardEvent): void { diff --git a/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte b/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte new file mode 100644 index 00000000000..9a44ef157a1 --- /dev/null +++ b/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte @@ -0,0 +1,19 @@ + + +Switch to the New IOTA Wallet +
+
+ + For improved security, performance, and the latest features, please switch to our new browser extension. +
+ +
diff --git a/packages/desktop/views/dashboard/Dashboard.svelte b/packages/desktop/views/dashboard/Dashboard.svelte index 2326b963d49..e39409c5f86 100644 --- a/packages/desktop/views/dashboard/Dashboard.svelte +++ b/packages/desktop/views/dashboard/Dashboard.svelte @@ -141,6 +141,19 @@
+
+ Please switch to the new IOTA Wallet for continued support and updates. + + Download here +
diff --git a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts index 568a7fab5d4..3f3d0f336ec 100644 --- a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts +++ b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts @@ -50,4 +50,5 @@ export enum PopupId { PayoutDetails = 'payoutDetails', VestingRewardsFinder = 'vestingRewardsFinder', WithdrawFromL2 = 'withdrawFromL2', + SwitchToWalletExtension = 'switchToWalletExtension', } From 21f2daa49d7da5ca0d3f4695414fea2013a06a58 Mon Sep 17 00:00:00 2001 From: evavirseda Date: Mon, 28 Apr 2025 13:34:10 +0200 Subject: [PATCH 2/3] update popup for shimmer network --- .../SwitchToWalletExtensionPopup.svelte | 38 ++++++++++++++----- .../desktop/views/dashboard/Dashboard.svelte | 26 +++++++------ 2 files changed, 43 insertions(+), 21 deletions(-) diff --git a/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte b/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte index 9a44ef157a1..938c7f1892b 100644 --- a/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte +++ b/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte @@ -1,19 +1,39 @@ -Switch to the New IOTA Wallet -
-
- - For improved security, performance, and the latest features, please switch to our new browser extension. +{#if NETWORK_ID === [NetworkId.Shimmer] || NETWORK_ID === [NetworkId.ShimmerTestnet]} + Shimmer is no longer maintained +
+
+ + Firefly Shimmer is no longer actively maintained by the IOTA Foundation. Please use it at your own + risk, as future issues or vulnerabilities may not be addressed. +
+
+{:else} + Switch to the New IOTA Wallet +
+
+ + For improved security, performance, and the latest features, please switch to our new browser + extension. +
+
- -
+{/if} diff --git a/packages/desktop/views/dashboard/Dashboard.svelte b/packages/desktop/views/dashboard/Dashboard.svelte index e39409c5f86..35726470c3f 100644 --- a/packages/desktop/views/dashboard/Dashboard.svelte +++ b/packages/desktop/views/dashboard/Dashboard.svelte @@ -141,19 +141,21 @@
-
- Please switch to the new IOTA Wallet for continued support and updates. - - Download here -
+ Please switch to the new IOTA Wallet for continued support and updates. + + Download here +
+ {/if}
From 896cb8812c009fe1969d3246f98b0fbafecf6c6e Mon Sep 17 00:00:00 2001 From: evavirseda Date: Tue, 29 Apr 2025 14:56:42 +0200 Subject: [PATCH 3/3] update contetn, allow external url and rename popup --- packages/desktop/App.svelte | 2 +- ...ensionPopup.svelte => AppDeprecationPopup.svelte} | 12 +++++++----- packages/desktop/components/popups/Popup.svelte | 4 ++-- .../lib/auxiliary/popup/enums/popup-id.enum.ts | 2 +- .../app/constants/external-allowed-links.constant.ts | 2 ++ 5 files changed, 13 insertions(+), 9 deletions(-) rename packages/desktop/components/popups/{SwitchToWalletExtensionPopup.svelte => AppDeprecationPopup.svelte} (75%) diff --git a/packages/desktop/App.svelte b/packages/desktop/App.svelte index 2d83a0e9e1b..c19ace65a09 100644 --- a/packages/desktop/App.svelte +++ b/packages/desktop/App.svelte @@ -81,7 +81,7 @@ void setupI18n({ fallbackLocale: 'en', initialLocale: $appSettings.language }) onMount(async () => { - openPopup({ id: PopupId.SwitchToWalletExtension }) + openPopup({ id: PopupId.AppDeprecation }) features.analytics.appStart.enabled && Platform.trackEvent('app-start') await cleanupEmptyProfiles() checkAndMigrateProfiles() diff --git a/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte b/packages/desktop/components/popups/AppDeprecationPopup.svelte similarity index 75% rename from packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte rename to packages/desktop/components/popups/AppDeprecationPopup.svelte index 938c7f1892b..8bc64bef2c3 100644 --- a/packages/desktop/components/popups/SwitchToWalletExtensionPopup.svelte +++ b/packages/desktop/components/popups/AppDeprecationPopup.svelte @@ -2,6 +2,7 @@ import { Button, Text, TextType, TextHint } from 'shared/components' import { TextHintVariant } from 'shared/components/enums' import { getEnabledNetworkFromFeatureFlags } from '@core/network' + import { NetworkId } from '@core/network/enums' const NETWORK_ID = getEnabledNetworkFromFeatureFlags() @@ -11,7 +12,7 @@ {#if NETWORK_ID === [NetworkId.Shimmer] || NETWORK_ID === [NetworkId.ShimmerTestnet]} - Shimmer is no longer maintained + Firefly Shimmer is no longer maintained
{:else} - Switch to the New IOTA Wallet + Switch to the new IOTA Wallet
For improved security, performance, and the latest features, please switch to our new browser - extension. + >Firefly is no longer actively maintained by the IOTA Foundation and is no longer compatible with the + new IOTA Network. + + Please switch to our new IOTA Wallet browser extension.
diff --git a/packages/desktop/components/popups/Popup.svelte b/packages/desktop/components/popups/Popup.svelte index 00e3064afb7..31e9a10d860 100644 --- a/packages/desktop/components/popups/Popup.svelte +++ b/packages/desktop/components/popups/Popup.svelte @@ -58,7 +58,7 @@ import PayoutDetailsPopup from './PayoutDetailsPopup.svelte' import VestingRewardsFinderPopup from './VestingRewardsFinderPopup.svelte' import WithdrawFromL2Popup from './WithdrawFromL2Popup.svelte' - import SwitchToWalletExtensionPopup from './SwitchToWalletExtensionPopup.svelte' + import AppDeprecationPopup from './AppDeprecationPopup.svelte' import GetSeedPopup from './GetSeedPopup.svelte' export let id: PopupId @@ -148,7 +148,7 @@ [PopupId.PayoutDetails]: PayoutDetailsPopup, [PopupId.VestingRewardsFinder]: VestingRewardsFinderPopup, [PopupId.WithdrawFromL2]: WithdrawFromL2Popup, - [PopupId.SwitchToWalletExtension]: SwitchToWalletExtensionPopup, + [PopupId.AppDeprecation]: AppDeprecationPopup, [PopupId.GetSeedPopup]: GetSeedPopup, } diff --git a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts index 2430369916c..1c840a3a224 100644 --- a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts +++ b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts @@ -50,6 +50,6 @@ export enum PopupId { PayoutDetails = 'payoutDetails', VestingRewardsFinder = 'vestingRewardsFinder', WithdrawFromL2 = 'withdrawFromL2', - SwitchToWalletExtension = 'switchToWalletExtension', + AppDeprecation = 'AppDeprecation', GetSeedPopup = 'getseed', } diff --git a/packages/shared/lib/core/app/constants/external-allowed-links.constant.ts b/packages/shared/lib/core/app/constants/external-allowed-links.constant.ts index 69c28381c08..03185fa50c0 100644 --- a/packages/shared/lib/core/app/constants/external-allowed-links.constant.ts +++ b/packages/shared/lib/core/app/constants/external-allowed-links.constant.ts @@ -23,4 +23,6 @@ export const externalAllowedLinks = [ // Other 'support.ledger.com', + // New extension wallet + 'chromewebstore.google.com/detail/iota-wallet/iidjkmdceolghepehaaddojmnjnkkija', ]