From 0607fad3e517ab2c66efe180990a9e28c13d13f6 Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Sun, 10 Dec 2023 17:41:03 -0700
Subject: [PATCH] remove the 'never' option for notifications & close on 'maybe
 later'

---
 project.task.yaml |  8 +++++---
 src/App.vue       | 37 +++++++++++++------------------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/project.task.yaml b/project.task.yaml
index eea95451a..383e0dbd4 100644
--- a/project.task.yaml
+++ b/project.task.yaml
@@ -1,13 +1,12 @@
 
 tasks:
 
-- 40 notifications :
-  - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
+- 08 notifications :
   - lock down regenerate_vapid endpoint (so only we admins can do it on demand)
   - remove sleep in py-push-server app.py
-  - revisit "maybe" and "never" buttons on account screen
   - see if we can detect OS-level notifications if turned off
   - write troubleshooting docs for notifications
+  - make the "App Notifications" toggle on when they first turn notifications on
   - in py-push-server, when sending a push to a subscriber and we get on a 410 "error #106", delete the subscription record
   - https://gitea.anomalistdesign.com/trent_larson/py-push-server/pulls/3/files
 
@@ -57,6 +56,9 @@ tasks:
 - switch some checks for activeDid to check for isRegistered
 - .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
 - .5 fix cert generation on server (since it didn't happen automatically for Nov 30)
+
+- 04 fix lack of initial notification in Firefox (on MacOS, maybe others)
+
 - contacts v+ :
   - 01 Import all the non-sensitive data (ie. contacts & settings).
   - .2 show error to user when adding a duplicate contact
diff --git a/src/App.vue b/src/App.vue
index e63adf97e..698cc4327 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -169,20 +169,12 @@
                 >
                   Turn on Notifications
                 </button>
-                <div class="grid grid-cols-2 gap-2">
-                  <button
-                    @click="maybeLater(notification.id)"
-                    class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
-                  >
-                    Maybe Later
-                  </button>
-                  <button
-                    @click="never(notification.id)"
-                    class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md"
-                  >
-                    Never
-                  </button>
-                </div>
+                <button
+                  @click="close(notification.id)"
+                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
+                >
+                  Maybe Later
+                </button>
               </div>
             </div>
           </div>
@@ -452,8 +444,13 @@ export default class App extends Vue {
           });
       })
       .catch((error) => {
-        console.error("An error occurred:", error);
-        alert("Some error occurred." + error);
+        console.error(
+          "An error occurred setting notification permissions:",
+          error,
+        );
+        alert(
+          "Some error occurred setting notification permissions. See logs.",
+        );
       });
   }
 
@@ -534,13 +531,5 @@ export default class App extends Vue {
       console.log("Subscription sent to server successfully.");
     });
   }
-
-  never(ID: string) {
-    alert(ID);
-  }
-
-  maybeLater(ID: string) {
-    alert(ID);
-  }
 }
 </script>