From 658ee85887250c95e5f639c2f2c1b9c176d3407f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Papie=C5=BC?= Date: Thu, 29 Aug 2024 16:17:20 +0200 Subject: [PATCH] adjust changes after merge --- public/locales/en/setup-view.json | 2 +- public/locales/pl/setup-view.json | 2 +- src-tauri/src/main.rs | 4 ++-- src-tauri/src/node_adapter.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/locales/en/setup-view.json b/public/locales/en/setup-view.json index c5f137bd2..b90c842ad 100644 --- a/public/locales/en/setup-view.json +++ b/public/locales/en/setup-view.json @@ -10,7 +10,7 @@ "checking-latest-version-xmrig": "Checking for latest version of xmrig", "waiting-for-wallet": "Waiting for wallet", "waiting-for-node": "Waiting for node to sync", - "waiting-for-initial-sync": "Waiting for initial sync", + "preparing-for-initial-sync": "Preparing for initial sync", "starting-mmproxy": "Starting merge mining proxy", "application-started": "Applications started", "downloading": "Downloading", diff --git a/public/locales/pl/setup-view.json b/public/locales/pl/setup-view.json index 81e45e713..32d5b6765 100644 --- a/public/locales/pl/setup-view.json +++ b/public/locales/pl/setup-view.json @@ -10,7 +10,7 @@ "checking-latest-version-xmrig": "Sprawdzanie najnowszej wersji xmrig", "waiting-for-wallet": "Oczekiwanie na portfel", "waiting-for-node": "Oczekiwanie na synchronizację węzła", - "waiting-for-initial-sync": "Oczekiwanie na początkową synchronizację", + "preparing-for-initial-sync": "Przygotowywanie do początkowej synchronizacji", "starting-mmproxy": "Uruchamianie mmproxy", "application-started": "Aplikacje uruchomione", "downloading": "Pobieranie", diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index a9f8dbda9..30cb70463 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -253,13 +253,13 @@ async fn setup_inner<'r>( progress.set_max(80).await; progress - .update("Waiting for node to sync".to_string(), 0) + .update("preparing-for-initial-sync".to_string(), 0) .await; state.node_manager.wait_synced(progress.clone()).await?; progress.set_max(100).await; progress - .update("Starting merge mining proxy".to_string(), 0) + .update("starting-merge-mining-proxy".to_string(), 0) .await; let base_node_grpc_port = state.node_manager.get_grpc_port().await?; diff --git a/src-tauri/src/node_adapter.rs b/src-tauri/src/node_adapter.rs index f66291065..8f314dd09 100644 --- a/src-tauri/src/node_adapter.rs +++ b/src-tauri/src/node_adapter.rs @@ -230,10 +230,10 @@ impl MinotariNodeStatusMonitor { break; } info!(target: LOG_TARGET, "Sync progress: {:?}", sync_progress); - + if sync_progress.state == SyncState::Startup as i32 { progress_tracker - .update("Preparing for initial sync..".to_string(), 10) + .update("preparing-for-initial-sync".to_string(), 10) .await; } else if sync_progress.state == SyncState::Header as i32 { if sync_util.syncing_type != SyncingType::Headers {