From cbbcaa5e830f51cf38f796e60966a73278767c52 Mon Sep 17 00:00:00 2001
From: David Edler <david.edler@canonical.com>
Date: Tue, 29 Aug 2023 11:19:53 +0200
Subject: [PATCH] fix(snapshots) remove workaround for fixed bug, fix
 notification message

---
 src/api/snapshots.tsx                               | 13 +------------
 .../actions/snapshots/SnapshotBulkDelete.tsx        |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/api/snapshots.tsx b/src/api/snapshots.tsx
index e59261548..cfc99a0dd 100644
--- a/src/api/snapshots.tsx
+++ b/src/api/snapshots.tsx
@@ -59,18 +59,7 @@ export const deleteSnapshotBulk = (
       )
     )
       .then(resolve)
-      .catch((e: Error) => {
-        // A hack to ignore this error, should be removed once fixed in
-        // @see https://github.com/lxc/lxd/issues/11538
-        const msg =
-          "Instance snapshot record count doesn't match instance snapshot volume record count";
-        const isNotError = e.toString().includes(msg);
-        if (isNotError) {
-          setTimeout(() => resolve(e), 1000);
-        } else {
-          reject(e);
-        }
-      });
+      .catch(reject);
   });
 };
 
diff --git a/src/pages/instances/actions/snapshots/SnapshotBulkDelete.tsx b/src/pages/instances/actions/snapshots/SnapshotBulkDelete.tsx
index d681c4953..b98b09f6d 100644
--- a/src/pages/instances/actions/snapshots/SnapshotBulkDelete.tsx
+++ b/src/pages/instances/actions/snapshots/SnapshotBulkDelete.tsx
@@ -58,7 +58,7 @@ const SnapshotBulkDelete: FC<Props> = ({
         title: "Confirm delete",
         children: (
           <>
-            This will permanently delete <b>{count}</b>
+            This will permanently delete <b>{count}</b>{" "}
             {pluralizeSnapshot(count)}
             .<br />
             This action cannot be undone, and can result in data loss.