From 5897f5a8dd1fc57d86a253d04581201b68e9b5f4 Mon Sep 17 00:00:00 2001
From: Nicholas Stebbings <nickolarse@riseup.net>
Date: Sun, 11 Aug 2024 15:55:28 +0100
Subject: [PATCH] refine update flow. add feedback link again

---
 ui/src/components/Settings.tsx | 12 ++++++++++--
 ui/src/components/style.css    |  2 +-
 ui/src/update.ts               |  9 ++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ui/src/components/Settings.tsx b/ui/src/components/Settings.tsx
index abe1bfef..602ad6f4 100644
--- a/ui/src/components/Settings.tsx
+++ b/ui/src/components/Settings.tsx
@@ -1,4 +1,3 @@
-import { PlusCircleOutlined } from '@ant-design/icons';
 import { Button } from 'flowbite-react';
 import { HelperText } from 'habit-fract-design-system';
 import React from 'react';
@@ -49,7 +48,7 @@ const Settings: React.FC<SettingsProps> = ({ spheres, setIsModalOpen }) => {
     <div className="p-4 settings flex flex-col h-full justify-between">
       <section>
         <div className="check-updates">
-          <HelperText>Updates</HelperText>
+          <HelperText withInfo={false}>Updates</HelperText>
           <Button onClick={() => {
             checkForAppUpdates(true)
           }} className="btn btn-primary w-64 h-12 my-2" size="sm">
@@ -68,6 +67,15 @@ const Settings: React.FC<SettingsProps> = ({ spheres, setIsModalOpen }) => {
             <span>Clear</span>
           </Button>
         </div>
+        <div className="feedback-link">
+          <HelperText withInfo={true} onClickInfo={() => ({
+            title: "Open Feedback Form",
+            body: "Click this link to open a window to a feedback form (requires an internet connection) so that you can report comments, feedback or bug reports. If you are reporting a bug, please let me know which operating system you are using and any other relevant information. You will need to right click and press back (or restart) to come back to the app. Thanks!",
+          })}><span>Bugs/Feedback</span></HelperText>
+          <Button className="btn btn-secondary w-48 h-12 my-2" size="sm" onClick={(e) => {e.currentTarget.querySelector('a')?.click()}}>
+            <a href="https://habitfract.net/feedback/" className='text-white'>Link</a>
+          </Button>
+        </div>
       </section>
       <section className="danger-zone">
         <HelperText withInfo={true} onClickInfo={() => ({
diff --git a/ui/src/components/style.css b/ui/src/components/style.css
index 38bd41d2..7242de15 100644
--- a/ui/src/components/style.css
+++ b/ui/src/components/style.css
@@ -413,7 +413,7 @@ ul.ant-menu-inline .ant-menu-submenu-title[role="menuitem"] {
   width: initial;
 }
 
-.danger-zone, .cache-settings, .check-updates {
+.danger-zone, .feedback-link, .cache-settings, .check-updates {
   @apply flex gap-8 mb-4 justify-between items-center pr-2 pb-2 pl-4 border-2;
   border-radius: 1.5rem;
 }
diff --git a/ui/src/update.ts b/ui/src/update.ts
index 47d65301..10546c57 100644
--- a/ui/src/update.ts
+++ b/ui/src/update.ts
@@ -15,8 +15,15 @@ export async function checkForAppUpdates(onUserClick: false) {
         cancelLabel: 'Cancel'
       });
       if (yes) {
+        message('Update will download in the background... as you were!')
         await update.downloadAndInstall();
-        await relaunch();
+        const restart = await ask(`Note: AppImage users will need to re-set the .AppImage as executable after this, and then re-run the file manually. MacOS users may need to move the program into the Applications folder if this update doesn't work, then re-run the update. Debian users may need to set write-access to successfully update.`, { 
+          title: 'Update complete! Restart now?',
+          kind: 'info',
+          okLabel: 'Restart',
+          cancelLabel: 'Cancel'
+        });
+        restart && await relaunch();
       }
     }
 }