Merge pull request #1040 from The-Commit-Company/push-notification-pr…

…omise-toast fix: show loading toast when enabling push notifications
The-Commit-Company · Aug 31, 2024 · d77e527 · d77e527
2 parents 5172c99 + 23c3247
commit d77e527
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/frontend/src/components/feature/userSettings/PushNotifications/PushNotificationToggle.tsx b/frontend/src/components/feature/userSettings/PushNotifications/PushNotificationToggle.tsx
@@ -35,23 +35,28 @@ const PushNotificationToggle = (props: Props) => {
     }
 
     const enablePushNotifications = async () => {
-        // @ts-expect-error
-        window.frappePushNotification
-            .enableNotification()
-            .then((data: any) => {
-                if (data.permission_granted) {
-                    setPushNotificationsEnabled(true)
-                    toast.success("Push notifications enabled")
-                } else {
-                    toast.error("Permission denied for push notifications")
+
+
+        toast.promise(
+            // @ts-expect-error
+            window.frappePushNotification
+                .enableNotification()
+                .then((data: any) => {
+                    if (data.permission_granted) {
+                        setPushNotificationsEnabled(true)
+                    } else {
+                        setPushNotificationsEnabled(false)
+                        throw new Error("Permission denied for push notifications")
+                    }
+                })
+                .catch((error: any) => {
                     setPushNotificationsEnabled(false)
-                }
-            })
-            .catch((error: any) => {
-                toast.error("Error enabling push notifications", {
-                    description: getErrorMessage(error)
+                    throw error
                 })
-                setPushNotificationsEnabled(false)
+            , {
+                success: "Push notifications enabled",
+                loading: "Enabling...",
+                error: (e: Error) => e.message
             })
     }