Merge pull request #69 from oasisprotocol/ml/amend-vote-loading-flow

Show loading screen, after user confirms vote tx
oasisprotocol · Apr 2, 2024 · c4f09f2 · c4f09f2
2 parents 5ee209e + 92b0d53
commit c4f09f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/frontend/src/pages/HomePage/index.tsx b/frontend/src/pages/HomePage/index.tsx
@@ -20,6 +20,7 @@ export const HomePage: FC = () => {
   const {
     state: { isConnected, account },
     vote,
+    getTransaction,
     canVoteOnPoll,
   } = useWeb3()
   const {
@@ -90,15 +91,16 @@ export const HomePage: FC = () => {
     setIsLoading(true)
 
     try {
-      setPageStatus('loading')
-
       const canVote = await handleCanVoteOnPoll()
       if (canVote === null) {
         setIsLoading(false)
         return
       }
 
-      await vote(selectedChoice)
+      const txResponse = (await vote(selectedChoice))!
+      setPageStatus('loading')
+      await getTransaction(txResponse.hash)
+
       setPreviousVoteForCurrentWallet(selectedChoice)
 
       setPageStatus('success')

diff --git a/frontend/src/providers/Web3Provider.tsx b/frontend/src/providers/Web3Provider.tsx
@@ -253,9 +253,7 @@ export const Web3ContextProvider: FC<PropsWithChildren> = ({ children }) => {
     unsignedTx.gasLimit = MAX_GAS_LIMIT
     unsignedTx.value = 0n
 
-    const txResponse = await signer.sendTransaction(unsignedTx).catch(handleKnownEthersErrors)
-
-    return await getTransaction(txResponse.hash)
+    return await signer.sendTransaction(unsignedTx).catch(handleKnownEthersErrors)
   }
 
   const getVoteCounts = async () => {