From 9bba7399328b42682c4cb281d198b3f1b59da011 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Tue, 20 Jun 2023 15:49:08 -0700
Subject: [PATCH] More error handling cleanup within connectWallet

---
 apps/web/src/composables/users.ts  |  3 +--
 apps/web/src/composables/wallet.ts | 17 ++++++++---------
 services/users/src/routes/user.ts  |  2 --
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/web/src/composables/users.ts b/apps/web/src/composables/users.ts
index 2527f1a82..0a93cad25 100644
--- a/apps/web/src/composables/users.ts
+++ b/apps/web/src/composables/users.ts
@@ -25,8 +25,7 @@ export default function useUsers () {
             user.value = userAccount
             return { error, message, data: userAccount }
         } catch (error) {
-            console.log('Error in addAccount in wallet.ts :>> ', error)
-            return { error: true, message: 'Error adding account', data: null }
+            throw new Error(error.message || 'Error adding account')
         }
     }
 
diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index a7d2cafe8..5b385c505 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -89,15 +89,14 @@ export default function useWallet() {
             ownerAddress: user?.value?.address.toLowerCase() as string,
             walletProvider: selectedProvider.value
           }
-          const addAccountResponse = await addAccount(account)
-          if (!addAccountResponse?.error) {
-            const getUserResponse = await getUser()
-            setUser(getUserResponse.data)
-            setPrimaryAddress(user?.value?.address as string)
-          } else {
-            console.error('There was an error adding the account :>> ', addAccountResponse.message)
-            throw new Error(addAccountResponse.message)
-          }
+          const { error: addAccountError, message: addAccountMessage } = await addAccount(account)
+          if (addAccountError) throw new Error(addAccountMessage || 'There was an error adding the account')
+          
+          const { error: getUserError, message: getUserMessage, data: getUserData } = await getUser()
+          if (getUserError) throw new Error(getUserMessage || 'There was an error getting the user')
+
+          setUser(getUserData)
+          setPrimaryAddress(user?.value?.address as string) 
         }
       }
       await setUserAccountBalances()
diff --git a/services/users/src/routes/user.ts b/services/users/src/routes/user.ts
index 289296d60..679f279a1 100644
--- a/services/users/src/routes/user.ts
+++ b/services/users/src/routes/user.ts
@@ -8,7 +8,6 @@ const { addAccount, getUser, updateUserAddress, removeAccount } = useDB()
 
 router.get('/', verifySession(), async (req: SessionRequest, res: express.Response) => {
     try {
-        console.log('go to / in user.ts')
         const address = req.session?.getUserId().toLowerCase() as string
         const user = await getUser(address)
         const message = user ? 'User found' : 'User not found'
@@ -21,7 +20,6 @@ router.get('/', verifySession(), async (req: SessionRequest, res: express.Respon
             user
         })
     } catch (err) {
-        console.log('Error in / route of user.ts :>> ', err)
         res.status(500)
         res.json({
             message: 'Error getting user',