iotaledger · Tuditi · Feb 21, 2023 · Feb 21, 2023 · Feb 21, 2023
diff --git a/packages/desktop/App.svelte b/packages/desktop/App.svelte
@@ -27,7 +27,7 @@
         setPlatform,
     } from '@core/app'
     import { showAppNotification } from '@auxiliary/notification'
-    import { closePopup, openPopup, popupState } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId, popupState } from '@auxiliary/popup'
     import { initialiseOnboardingFlow } from '@contexts/onboarding'
     import { NetworkProtocol, NetworkType } from '@core/network'
     import { getLocalisedMenuItems } from './lib/helpers'
@@ -127,17 +127,17 @@
         })
         Platform.onEvent('menu-check-for-update', () => {
             openPopup({
-                id: 'version',
+                id: PopupId.Version,
                 props: {
                     currentVersion: $appVersionDetails.currentVersion,
                 },
             })
         })
         Platform.onEvent('menu-error-log', () => {
-            openPopup({ id: 'errorLog' })
+            openPopup({ id: PopupId.ErrorLog })
         })
         Platform.onEvent('menu-diagnostics', () => {
-            openPopup({ id: 'diagnostics' })
+            openPopup({ id: PopupId.Diagnostics })
         })
         Platform.onEvent('menu-create-developer-profile', () => {
             void initialiseOnboardingFlow({

diff --git a/packages/desktop/components/modals/AccountSwitcherModal.svelte b/packages/desktop/components/modals/AccountSwitcherModal.svelte
@@ -8,7 +8,7 @@
     import { activeProfile, visibleActiveAccounts } from '@core/profile'
     import { formatTokenAmountBestMatch } from '@core/wallet'
     import { Icon as IconEnum } from '@auxiliary/icon'
-    import { openPopup } from '@auxiliary/popup'
+    import { openPopup, PopupId } from '@auxiliary/popup'
 
     export let modal: Modal = undefined
 
@@ -22,7 +22,7 @@
 
     function handleCreateAccountClick(): void {
         modal?.close()
-        openPopup({ id: 'createAccount' })
+        openPopup({ id: PopupId.CreateAccount })
     }
 </script>
 

diff --git a/packages/desktop/components/popups/ActivityDetailsPopup.svelte b/packages/desktop/components/popups/ActivityDetailsPopup.svelte
@@ -27,7 +27,7 @@
     import { activeProfile, checkActiveProfileAuth } from '@core/profile'
     import { setClipboard } from '@core/utils'
     import { truncateString } from '@core/utils'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { onMount } from 'svelte'
     import { ExplorerEndpoint } from '@core/network'
 
@@ -96,7 +96,7 @@
     async function claim(): Promise<void> {
         await claimActivity(activity)
         openPopup({
-            id: 'activityDetails',
+            id: PopupId.ActivityDetails,
             props: { activityId },
         })
     }
@@ -107,7 +107,7 @@
 
     function reject(): void {
         openPopup({
-            id: 'confirmation',
+            id: PopupId.Confirmation,
             props: {
                 title: localize('actions.confirmRejection.title'),
                 description: localize('actions.confirmRejection.description'),
@@ -121,7 +121,7 @@
                 },
                 onCancel: () =>
                     openPopup({
-                        id: 'activityDetails',
+                        id: PopupId.ActivityDetails,
                         props: { activityId },
                     }),
             },

diff --git a/packages/desktop/components/popups/AddProposalPopup.svelte b/packages/desktop/components/popups/AddProposalPopup.svelte
@@ -11,6 +11,7 @@
     import { registeredProposalsForSelectedAccount } from '@contexts/governance'
     import { activeAccounts } from '@core/profile'
     import { selectedAccount } from '@core/account'
+    import { PopupId } from '@auxiliary/popup'
 
     export let eventId: string
     export let nodeUrl: string
@@ -64,7 +65,7 @@
 
     function openNodeAuthRequiredPopup(): void {
         openPopup({
-            id: 'nodeAuthRequired',
+            id: PopupId.NodeAuthRequired,
             props: { onSubmit: registerParticipationWrapper },
         })
     }

diff --git a/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte b/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Button, Text, TextHint, FontWeight, TextType, ButtonVariant, KeyValueBox } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { burnAsset, formatTokenAmountBestMatch, IAsset } from '@core/wallet'
     import { checkActiveProfileAuth } from '@core/profile'
     import { handleError } from '@core/error/handlers'
@@ -16,7 +16,7 @@
 
     function onBack(): void {
         openPopup({
-            id: 'burnNativeTokens',
+            id: PopupId.BurnNativeTokens,
             props: { asset, rawAmount },
         })
     }

diff --git a/packages/desktop/components/popups/BurnNativeTokensPopup.svelte b/packages/desktop/components/popups/BurnNativeTokensPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Button, Text, TextHint, FontWeight, TextType, AssetAmountInput } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { IAsset } from '@core/wallet'
 
     export let asset: IAsset
@@ -13,7 +13,7 @@
         try {
             await assetAmountInput.validate()
             openPopup({
-                id: 'burnNativeTokensConfirm',
+                id: PopupId.BurnNativeTokensConfirmation,
                 props: { asset, rawAmount },
             })
         } catch (err) {

diff --git a/packages/desktop/components/popups/ManageVotingPowerPopup.svelte b/packages/desktop/components/popups/ManageVotingPowerPopup.svelte
@@ -13,6 +13,7 @@
     import { onMount } from 'svelte'
     import { modifyPopupState } from '@auxiliary/popup/helpers'
     import { isSelectedAccountVoting } from '@contexts/governance/utils'
+    import { PopupId } from '@auxiliary/popup'
 
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
     export let newVotingPower: string = undefined
@@ -48,7 +49,7 @@
 
             const isVoting = isSelectedAccountVoting()
             if (amount === '0' && isVoting) {
-                openPopup({ id: 'votingPowerToZero' })
+                openPopup({ id: PopupId.VotingPowerToZero })
                 return
             }
 

diff --git a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
@@ -9,7 +9,7 @@
         formatTokenAmountPrecise,
         IIrc30Metadata,
     } from '@core/wallet'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { Button, KeyValueBox, Text, FontWeight } from 'shared/components'
     import { onMount } from 'svelte'
     import { selectedAccount } from '@core/account'
@@ -93,7 +93,7 @@
     function handleBack(): void {
         closePopup()
         openPopup({
-            id: 'mintNativeTokenForm',
+            id: PopupId.MintNativeTokenForm,
             overflow: true,
         })
     }

diff --git a/packages/desktop/components/popups/MintNativeTokenFormPopup.svelte b/packages/desktop/components/popups/MintNativeTokenFormPopup.svelte
@@ -2,7 +2,7 @@
     import { BaseError } from '@core/error'
     import { localize } from '@core/i18n'
     import { setMintTokenDetails, mintTokenDetails } from '@core/wallet'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import {
         Button,
         Error,
@@ -65,7 +65,7 @@
                 aliasId,
             })
             openPopup({
-                id: 'mintNativeTokenConfirmation',
+                id: PopupId.MintNativeTokenConfirmation,
                 overflow: true,
             })
         }

diff --git a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
@@ -6,7 +6,7 @@
     import { buildNftOutputData, formatTokenAmountPrecise, mintNft, mintNftDetails } from '@core/wallet'
     import { activeProfile, checkActiveProfileAuth } from '@core/profile'
     import { handleError } from '@core/error/handlers/handleError'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { CURRENT_IRC27_VERSION } from '@core/nfts'
     import { BASE_TOKEN } from '@core/network'
 
@@ -70,7 +70,7 @@
     function handleBack(): void {
         closePopup()
         openPopup({
-            id: 'mintNftForm',
+            id: PopupId.MintNftForm,
             overflow: true,
         })
     }

diff --git a/packages/desktop/components/popups/MintNftFormPopup.svelte b/packages/desktop/components/popups/MintNftFormPopup.svelte
@@ -11,7 +11,7 @@
         NumberInput,
         TooltipIcon,
     } from 'shared/components'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { BaseError } from '@core/error/classes'
     import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
@@ -64,7 +64,7 @@
         if (valid) {
             setMintNftDetails(convertInputsToMetadataType(optionalInputs))
             openPopup({
-                id: 'mintNftConfirmation',
+                id: PopupId.MintNftConfirmation,
                 overflow: true,
             })
         }

diff --git a/packages/desktop/components/popups/TokenInformationPopup.svelte b/packages/desktop/components/popups/TokenInformationPopup.svelte
@@ -11,7 +11,7 @@
         VerifiedStatus,
         NewTransactionType,
     } from '@core/wallet'
-    import { openPopup, updatePopupProps } from '@auxiliary/popup'
+    import { openPopup, PopupId, updatePopupProps } from '@auxiliary/popup'
     import { AssetIcon, Button, Text, TextHint, AssetActionsButton, KeyValueBox, FontWeight } from 'shared/components'
 
     export let asset: IAsset
@@ -21,7 +21,7 @@
         unverifyAsset(asset.id, NotVerifiedStatus.Skipped)
         if (activityId) {
             openPopup({
-                id: 'activityDetails',
+                id: PopupId.ActivityDetails,
                 props: { activityId },
             })
         } else {
@@ -35,7 +35,7 @@
         verifyAsset(asset.id, VerifiedStatus.SelfVerified)
         if (activityId) {
             openPopup({
-                id: 'activityDetails',
+                id: PopupId.ActivityDetails,
                 props: { activityId },
             })
         } else {
@@ -53,7 +53,7 @@
             disableAssetSelection: true,
         })
         openPopup({
-            id: 'sendForm',
+            id: PopupId.SendForm,
             overflow: true,
         })
     }

diff --git a/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte b/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte
@@ -9,6 +9,7 @@
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { closePopup, openPopup } from '@auxiliary/popup/actions'
     import { popupState } from '@auxiliary/popup/stores'
+    import { PopupId } from '@auxiliary/popup'
 
     const ZERO_VOTING_POWER = '0'
 
@@ -25,7 +26,7 @@
 
             await checkActiveProfileAuth(async () => {
                 openPopup({
-                    id: 'manageVotingPower',
+                    id: PopupId.ManageVotingPower,
                     props: { newVotingPower: ZERO_VOTING_POWER },
                 })
                 await setVotingPower(ZERO_VOTING_POWER, true)

diff --git a/packages/desktop/components/popups/WalletFinderPopup.svelte b/packages/desktop/components/popups/WalletFinderPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { onDestroy } from 'svelte'
     import { Button, KeyValueBox, Text, TextHint, FontWeight } from 'shared/components'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { showAppNotification } from '@auxiliary/notification'
     import { displayNotificationForLedgerProfile, ledgerNanoStatus } from '@core/ledger'
     import { sumBalanceForAccounts } from '@core/account'
@@ -45,17 +45,17 @@
     async function handleFindBalances(): Promise<void> {
         if ($isSoftwareProfile && $isStrongholdLocked) {
             openPopup({
-                id: 'unlockStronghold',
+                id: PopupId.UnlockStronghold,
                 props: {
                     onSuccess: function () {
                         openPopup({
-                            id: 'walletFinder',
+                            id: PopupId.WalletFinder,
                             props: { searchForBalancesOnLoad: true },
                         })
                     },
                     onCancelled: function () {
                         openPopup({
-                            id: 'walletFinder',
+                            id: PopupId.WalletFinder,
                         })
                     },
                 },

diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
@@ -36,7 +36,7 @@
         getAssetById,
         ActivityAction,
     } from '@core/wallet'
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { ledgerPreparedOutput } from '@core/ledger'
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
     import { handleError } from '@core/error/handlers/handleError'
@@ -191,7 +191,7 @@
     function onBack(): void {
         closePopup()
         openPopup({
-            id: 'sendForm',
+            id: PopupId.SendForm,
             overflow: true,
         })
     }

diff --git a/packages/desktop/components/popups/send/SendFormPopup.svelte b/packages/desktop/components/popups/send/SendFormPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { closePopup, openPopup } from '@auxiliary/popup'
+    import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
     import { isLayer1Destination } from '@core/layer-2'
     import { selectedAccountNfts } from '@core/nfts'
@@ -148,7 +148,7 @@
         if (valid) {
             setTransactionDetails()
             openPopup({
-                id: 'sendConfirmation',
+                id: PopupId.SendConfirmation,
                 overflow: true,
             })
         }

diff --git a/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte b/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte
@@ -32,6 +32,7 @@
         OUTPUT_TYPE_NFT,
     } from '@core/wallet'
     import { NewTransactionType, selectedAccountActivities, setNewTransactionDetails } from '@core/wallet/stores'
+    import { PopupId } from '@auxiliary/popup'
 
     let modal: Modal
     let error: string
@@ -126,7 +127,7 @@
             disableAssetSelection: true,
         })
         openPopup({
-            id: 'sendForm',
+            id: PopupId.SendForm,
             overflow: true,
         })
     }

diff --git a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
@@ -43,6 +43,7 @@
         clearParticipationEventStatusPoll,
         pollParticipationEventStatus,
     } from '@contexts/governance/actions/pollParticipationEventStatus'
+    import { PopupId } from '@auxiliary/popup'
 
     const { metadata } = $visibleSelectedAccountAssets?.baseCoin
 
@@ -164,7 +165,7 @@
 
     function onStopVotingClick(): void {
         openPopup({
-            id: 'stopVoting',
+            id: PopupId.StopVoting,
         })
     }
 
@@ -173,7 +174,7 @@
             answerValue === undefined ? ABSTAIN_VOTE_VALUE : answerValue
         )
         openPopup({
-            id: 'voteForProposal',
+            id: PopupId.VoteForProposal,
             props: { selectedAnswerValues: chosenAnswerValues },
         })
     }

diff --git a/packages/desktop/views/dashboard/settings/views/advanced/Diagnostics.svelte b/packages/desktop/views/dashboard/settings/views/advanced/Diagnostics.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
     import { Button, Text, ButtonSize } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { openPopup } from '@auxiliary/popup'
+    import { openPopup, PopupId } from '@auxiliary/popup'
 
     function handleDiagnosticsClick(): void {
-        openPopup({ id: 'diagnostics' })
+        openPopup({ id: PopupId.Diagnostics })
     }
 </script>