Merge pull request #33 from gov4git/error

Error

.changeset/smooth-pianos-tickle.md

@@ -0,0 +1,5 @@
+---
+'gov4git-desktop-app': patch
+---
+
+Update gov4git dependency to v1.1.13

.changeset/thin-numbers-leave.md

@@ -0,0 +1,8 @@
+---
+'gov4git-desktop-app': patch
+---
+
+Improve error handling
+
+- Report voting errors within the vote window
+- Scroll to top of the page when error logs are presented

package.json

@@ -96,7 +96,7 @@
   "dependencies": {
     "@fluentui/react-components": "^9.22.0",
     "@fluentui/react-icons": "^2.0.204",
-    "@gov4git/js-client": "1.1.12",
+    "@gov4git/js-client": "1.1.13",
     "@vscode/codicons": "^0.0.33",
     "better-sqlite3": "^9.0.0",
     "drizzle-orm": "^0.28.6",
@@ -118,4 +118,4 @@
     "type": "git",
     "url": "https://github.com/gov4git/desktop-application.git"
   }
-}
+}

src/renderer/src/components/IssueBallot.tsx

@@ -118,21 +118,28 @@ export const IssueBallot: FC<IssueBallotProps> = function IssueBallot({
             choice: ballot.choices[0] ?? '',
             strength: `${voteStrengthInCredits}`,
           })
+          .then(() => {
+            eventBus.emit('voted', { ballotId: ballot.identifier })
+          })
           .catch(async (ex) => {
             if (
               ex != null &&
               ex.message != null &&
               typeof ex.message === 'string' &&
               (ex.message as string).toLowerCase().endsWith('ballot is closed')
             ) {
+              setFetchingNewBallot(false)
               setVoteError(
                 'Sorry, this ballot is closed to voting. Please refresh the page to get the latest list of ballots.',
               )
             } else {
               await catchError(`Failed to cast vote. ${ex}`)
+              setFetchingNewBallot(false)
+              setVoteError(
+                `There was an error voting. Please view the full logs at the top of the page.`,
+              )
             }
           })
-        eventBus.emit('voted', { ballotId: ballot.identifier })
       }
     }
     void run()

src/renderer/src/hooks/useCatchError.ts

@@ -20,9 +20,11 @@ export function useCatchError() {
           setConfigErrors(configErrors)
           navigate(routes.settings.path)
         } else {
+          window.scrollTo(0, 0)
           setErrorMessage(error)
         }
       } catch (ex) {
+        window.scrollTo(0, 0)
         setErrorMessage(error)
       }
     },