+
@@ -23,8 +23,8 @@
{{ walletStatus.daemonHeight ?? 'Unavailable' }}
-
- {{ resolveMoneroWalletSyncStatusLabel(walletStatus.syncStatus) }}
+
+ {{ resolveWalletSyncStatusLabel(walletStatus.syncStatus) }}
{{ walletStatus.balanceXmr }} XMR
@@ -90,10 +90,12 @@
import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus';
import { computed, onBeforeMount, reactive, ref } from 'vue';
import { storeToRefs } from 'pinia';
-import { MoneroWalletSyncStatus } from '@/types/moneroWallet/MoneroWalletSyncStatus';
+import { WalletSyncStatus } from '@/types/wallet/WalletSyncStatus';
import { useMoneroWalletStore } from '@/stores/moneroWallet';
import { isMoneroStandardAddress } from '@/utils/monero/isMoneroStandardAddress';
import { resolveAxiosErrorMessage } from '@/utils/resolveAxiosErrorMessage';
+import { resolveWalletSyncStatusLabel } from '@/utils/wallet/resolveWalletSyncStatusLabel';
+import { resolveWalletSyncStatusTagType } from '@/utils/wallet/resolveWalletSyncStatusTagType';
const moneroWalletStore = useMoneroWalletStore();
@@ -125,7 +127,7 @@ const withdrawFormRules = computed
(() => ({
destinationAddress: [
{
validator: (_rule, value, callback) => {
- if (walletStatus.value?.syncStatus !== MoneroWalletSyncStatus.Synced) {
+ if (walletStatus.value?.syncStatus !== WalletSyncStatus.Synced) {
callback(new Error('Wait until the wallet finishes syncing before withdrawing'));
return;
@@ -287,26 +289,4 @@ const onRevealSeedClick = async (): Promise => {
const clearSeed = (): void => {
revealedMnemonic.value = '';
};
-
-const resolveMoneroWalletSyncStatusLabel = (syncStatus: MoneroWalletSyncStatus): string => {
- switch (syncStatus) {
- case MoneroWalletSyncStatus.Synced:
- return 'Synced';
- case MoneroWalletSyncStatus.Syncing:
- return 'Syncing';
- default:
- return 'Unknown';
- }
-};
-
-const resolveMoneroWalletSyncStatusTagType = (syncStatus: MoneroWalletSyncStatus): 'success' | 'warning' | 'info' => {
- switch (syncStatus) {
- case MoneroWalletSyncStatus.Synced:
- return 'success';
- case MoneroWalletSyncStatus.Syncing:
- return 'warning';
- default:
- return 'info';
- }
-};
diff --git a/cms/src/types/moneroWallet/MoneroWalletStatus.ts b/cms/src/types/moneroWallet/MoneroWalletStatus.ts
index 716b95b..795de6a 100644
--- a/cms/src/types/moneroWallet/MoneroWalletStatus.ts
+++ b/cms/src/types/moneroWallet/MoneroWalletStatus.ts
@@ -1,12 +1,12 @@
import type { MoneroNetwork } from './MoneroNetwork';
-import type { MoneroWalletSyncStatus } from './MoneroWalletSyncStatus';
+import type { WalletSyncStatus } from '../wallet/WalletSyncStatus';
export interface MoneroWalletStatus {
network: MoneroNetwork;
rpcVersion: string;
walletHeight: number;
daemonHeight: number | null;
- syncStatus: MoneroWalletSyncStatus;
+ syncStatus: WalletSyncStatus;
balanceXmr: string;
unlockedBalanceXmr: string;
}
diff --git a/cms/src/types/moneroWallet/MoneroWalletSyncStatus.ts b/cms/src/types/wallet/WalletSyncStatus.ts
similarity index 66%
rename from cms/src/types/moneroWallet/MoneroWalletSyncStatus.ts
rename to cms/src/types/wallet/WalletSyncStatus.ts
index c17d00a..1b164d8 100644
--- a/cms/src/types/moneroWallet/MoneroWalletSyncStatus.ts
+++ b/cms/src/types/wallet/WalletSyncStatus.ts
@@ -1,4 +1,4 @@
-export enum MoneroWalletSyncStatus {
+export enum WalletSyncStatus {
Synced = 'synced',
Syncing = 'syncing',
Unknown = 'unknown'
diff --git a/cms/src/utils/wallet/resolveWalletSyncStatusLabel.ts b/cms/src/utils/wallet/resolveWalletSyncStatusLabel.ts
new file mode 100644
index 0000000..e54e19a
--- /dev/null
+++ b/cms/src/utils/wallet/resolveWalletSyncStatusLabel.ts
@@ -0,0 +1,12 @@
+import { WalletSyncStatus } from '@/types/wallet/WalletSyncStatus';
+
+export const resolveWalletSyncStatusLabel = (syncStatus: WalletSyncStatus): string => {
+ switch (syncStatus) {
+ case WalletSyncStatus.Synced:
+ return 'Synced';
+ case WalletSyncStatus.Syncing:
+ return 'Syncing';
+ default:
+ return 'Unknown';
+ }
+};
diff --git a/cms/src/utils/wallet/resolveWalletSyncStatusTagType.ts b/cms/src/utils/wallet/resolveWalletSyncStatusTagType.ts
new file mode 100644
index 0000000..7415db7
--- /dev/null
+++ b/cms/src/utils/wallet/resolveWalletSyncStatusTagType.ts
@@ -0,0 +1,12 @@
+import { WalletSyncStatus } from '@/types/wallet/WalletSyncStatus';
+
+export const resolveWalletSyncStatusTagType = (syncStatus: WalletSyncStatus): 'success' | 'warning' | 'info' => {
+ switch (syncStatus) {
+ case WalletSyncStatus.Synced:
+ return 'success';
+ case WalletSyncStatus.Syncing:
+ return 'warning';
+ default:
+ return 'info';
+ }
+};