Skip to content

Commit 40597b4

Browse files
committed
feat(gui): Display spinner when establishing tor circuits
1 parent 0f24a36 commit 40597b4

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

src-gui/src/renderer/components/alert/DaemonStatusAlert.tsx

+6
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ export default function DaemonStatusAlert() {
5757
Opening the local database
5858
</LoadingSpinnerAlert>
5959
);
60+
case "EstablishingTorCircuits":
61+
return (
62+
<LoadingSpinnerAlert severity="warning">
63+
Connecting to the Tor network
64+
</LoadingSpinnerAlert>
65+
);
6066
}
6167
break;
6268
case "Available":

swap/src/cli/api.rs

+12-2
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,17 @@ impl ContextBuilder {
366366
}
367367
}
368368

369-
let tor = init_tor_client(&data_dir).await?;
369+
self.tauri_handle
370+
.emit_context_init_progress_event(TauriContextStatusEvent::Initializing(
371+
TauriContextInitializationProgress::EstablishingTorCircuits,
372+
));
373+
374+
let tor = init_tor_client(&data_dir)
375+
.await
376+
.inspect_err(|err| {
377+
tracing::error!(%err, "Failed to establish Tor client");
378+
})
379+
.ok();
370380

371381
let context = Context {
372382
db,
@@ -385,7 +395,7 @@ impl ContextBuilder {
385395
swap_lock,
386396
tasks: Arc::new(PendingTaskList::default()),
387397
tauri_handle: self.tauri_handle,
388-
tor_client: Some(tor),
398+
tor_client: tor,
389399
};
390400

391401
Ok(context)

swap/src/cli/api/tauri_bindings.rs

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ pub enum TauriContextInitializationProgress {
123123
},
124124
OpeningMoneroWallet,
125125
OpeningDatabase,
126+
EstablishingTorCircuits,
126127
}
127128

128129
#[typeshare]

0 commit comments

Comments
 (0)