From b128a8ef5366d7bc560d18124d848d12bb71b51a Mon Sep 17 00:00:00 2001
From: Marius Vollmer <marius.vollmer@gmail.com>
Date: Mon, 17 Jun 2024 17:18:57 +0300
Subject: [PATCH] FIXUP - rebase conflicts

---
 pkg/storaged/block/erase-dialog.jsx  | 4 ++--
 pkg/storaged/block/format-dialog.jsx | 2 +-
 pkg/storaged/swap/format-dialog.jsx  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/storaged/block/erase-dialog.jsx b/pkg/storaged/block/erase-dialog.jsx
index 2486ce42ef9..b186658bdf8 100644
--- a/pkg/storaged/block/erase-dialog.jsx
+++ b/pkg/storaged/block/erase-dialog.jsx
@@ -28,7 +28,7 @@ import {
     dialog_open,
     CheckBoxes,
     BlockingMessage, TeardownMessage,
-    init_active_usage_processes
+    init_teardown_usage,
 } from "../dialog.jsx";
 
 import { job_progress_wrapper } from "../jobs-panel.jsx";
@@ -64,7 +64,7 @@ export function erase_dialog(block) {
             }
         },
         Inits: [
-            init_active_usage_processes(client, usage),
+            init_teardown_usage(client, usage),
         ]
     });
 }
diff --git a/pkg/storaged/block/format-dialog.jsx b/pkg/storaged/block/format-dialog.jsx
index 30fa19c0afc..3748b7d3cb3 100644
--- a/pkg/storaged/block/format-dialog.jsx
+++ b/pkg/storaged/block/format-dialog.jsx
@@ -534,7 +534,7 @@ export function format_dialog(block, options) {
             }
         },
         Inits: [
-            init_active_usage_processes(client, usage),
+            init_teardown_usage(client, usage),
         ]
     });
 }
diff --git a/pkg/storaged/swap/format-dialog.jsx b/pkg/storaged/swap/format-dialog.jsx
index f963140f6ae..2ff830cecd9 100644
--- a/pkg/storaged/swap/format-dialog.jsx
+++ b/pkg/storaged/swap/format-dialog.jsx
@@ -27,7 +27,7 @@ import {
 import {
     dialog_open,
     BlockingMessage, TeardownMessage,
-    init_active_usage_processes
+    init_teardown_usage,
 } from "../dialog.jsx";
 
 import { job_progress_wrapper } from "../jobs-panel.jsx";
@@ -92,7 +92,7 @@ export function format_swap_dialog(block) {
             }
         },
         Inits: [
-            init_active_usage_processes(client, usage),
+            init_teardown_usage(client, usage),
         ]
     });
 }