From d8f88d1f6c4293a18ee05e9dcd9cd35bad19b556 Mon Sep 17 00:00:00 2001 From: onmax Date: Fri, 24 Jan 2025 10:26:54 +0100 Subject: [PATCH] chore: replace hardcoded urls with RouteName enum --- src/components/AnnouncementBox.vue | 3 ++- src/components/MobileActionBar.vue | 16 +++++++++----- src/components/WalletStatusButton.vue | 8 ++++++- src/components/layouts/AccountOverview.vue | 9 ++++---- src/components/layouts/AddressOverview.vue | 12 +++++++--- src/components/layouts/Settings.vue | 4 +++- src/components/modals/AccountMenuModal.vue | 9 +++++--- src/components/modals/BtcActivationModal.vue | 3 ++- src/components/modals/BtcSendModal.vue | 4 +++- src/components/modals/BtcTransactionModal.vue | 19 ++++++++++++---- .../modals/PolygonActivationModal.vue | 7 +++--- src/components/modals/SendModal.vue | 4 +++- src/components/modals/StablecoinSendModal.vue | 4 +++- src/components/modals/TransactionModal.vue | 22 +++++++++++++++---- .../modals/UsdcTransactionModal.vue | 16 +++++++++++--- src/components/modals/UsdtAddedModal.vue | 5 ++++- .../modals/UsdtTransactionModal.vue | 17 +++++++++++--- .../overlays/BuyCryptoBankCheckOverlay.vue | 4 +++- src/components/staking/StakingButton.vue | 6 +++-- src/components/staking/StakingPreview.vue | 4 +++- .../staking/StakingSummaryMobile.vue | 7 ++++-- src/components/swap/SwapModal.vue | 11 ++++++++-- src/components/swap/SwapNotification.vue | 7 +++--- src/hub.ts | 14 ++++++------ src/router.ts | 4 +++- 25 files changed, 160 insertions(+), 59 deletions(-) diff --git a/src/components/AnnouncementBox.vue b/src/components/AnnouncementBox.vue index 97a806459..032902862 100644 --- a/src/components/AnnouncementBox.vue +++ b/src/components/AnnouncementBox.vue @@ -11,6 +11,7 @@ import { defineComponent, ref } from '@vue/composition-api'; import { ArrowRightSmallIcon } from '@nimiq/vue-components'; import { LocaleMessage } from 'vue-i18n'; +import { RouteName } from '@/router'; import BlueLink from './BlueLink.vue'; import CrossCloseButton from './CrossCloseButton.vue'; @@ -27,7 +28,7 @@ export default defineComponent({ // text = () => context.root.$t('Buy NIM & BTC with OASIS!'); text = () => ''; // Disables AnnouncementBox cta = () => context.root.$t('Try it now'); - action = () => context.root.$router.push('buy'); + action = () => context.root.$router.push({ name: RouteName.Buy }); storageKey = 'buy-with-oasis-1'; const wasDismissed = ref(window.localStorage.getItem(STORAGE_KEY) === storageKey); diff --git a/src/components/MobileActionBar.vue b/src/components/MobileActionBar.vue index 34db4dbe5..1ea89aa60 100644 --- a/src/components/MobileActionBar.vue +++ b/src/components/MobileActionBar.vue @@ -9,7 +9,7 @@ > {{ $t('Send') }} - @@ -19,6 +19,7 @@ import { defineComponent, computed } from '@vue/composition-api'; import { ArrowRightSmallIcon, ScanQrCodeIcon } from '@nimiq/vue-components'; import { useConfig } from '@/composables/useConfig'; +import { RouteName } from '@/router'; import { AddressType, useAddressStore } from '../stores/Address'; import { useAccountStore } from '../stores/Account'; import { CryptoCurrency } from '../lib/Constants'; @@ -58,9 +59,11 @@ export default defineComponent({ && (hasMultipleReceivableAddresses.value || hasBitcoinAddresses.value) ) { // redirect to the address selector - context.root.$router.push('/receive'); + context.root.$router.push({ name: RouteName.Receive }); } else { - context.root.$router.push(nimOrBtcOrStable('/receive/nim', '/receive/btc', '/receive/usdc')); + context.root.$router.push({ + name: nimOrBtcOrStable(RouteName.ReceiveNim, RouteName.ReceiveBtc, RouteName.ReceiveUsdc), + }); } } @@ -73,9 +76,11 @@ export default defineComponent({ && (hasMultipleSendableAddresses.value || hasBitcoinAddresses.value) ) { // redirect to the address selector - context.root.$router.push('/send'); + context.root.$router.push({ name: RouteName.Send }); } else { - context.root.$router.push(nimOrBtcOrStable('/send/nim', '/send/btc', '/send/usdc')); + context.root.$router.push({ + name: nimOrBtcOrStable(RouteName.SendNim, RouteName.SendBtc, RouteName.SendUsdc), + }); } } @@ -98,6 +103,7 @@ export default defineComponent({ receive, send, sendDisabled, + RouteName, }; }, components: { diff --git a/src/components/WalletStatusButton.vue b/src/components/WalletStatusButton.vue index d102dc0c2..8d93ca1fa 100644 --- a/src/components/WalletStatusButton.vue +++ b/src/components/WalletStatusButton.vue @@ -1,5 +1,5 @@