From 24e666cbcd2c185093ea1ddea360aba1aebcf770 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Mon, 27 Mar 2023 13:55:23 -0400
Subject: [PATCH] Improve wallet.ts connectWallet

---
 apps/web/src/composables/wallet.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
index 970d2bb5d..cd30640c6 100644
--- a/apps/web/src/composables/wallet.ts
+++ b/apps/web/src/composables/wallet.ts
@@ -7,7 +7,7 @@ import useEthers from '@/composables/ethers'
 import useWalletConnect from '@/composables/walletConnect'
 import useSolana from '@/composables/solana'
 import useUsers from '@/composables/users'
-import { Account, ProviderString } from '@casimir/types'
+import { Account, ProviderString, User } from '@casimir/types'
 import { TransactionInit } from '@/interfaces/TransactionInit'
 import { MessageInit } from '@/interfaces/MessageInit'
 import { Currency } from '@casimir/types'
@@ -91,9 +91,11 @@ export default function useWallet() {
       if (session.value) {
         const user = await getUser()
         setUser(user)
+        return user
       }
     } catch (error) {
       console.log('Error in getUserAccount in wallet.ts :>> ', error)
+      return null
     }
   }
 
@@ -111,15 +113,14 @@ export default function useWallet() {
         const connectedAddress = await getConnectedAddressFromProvider(provider, currency)
         const connectedCurrency = await detectCurrencyInProvider(provider) as Currency
         const loginResponse = await loginWithWallet(provider, connectedAddress, connectedCurrency)
-        // TODO: Also handle case where user is not logged in / errors
         if (!loginResponse?.error) {
           // STEP 2
-          await getUserAccount() // This is querying the API for the user's account
+          const user = await getUserAccount() // Queries the API for the user's account
           setSelectedProvider(provider)
           setSelectedAddress(connectedAddress)
           setSelectedCurrency(connectedCurrency)
           loggedIn.value = true
-          primaryAddress.value = user.value?.address as string
+          primaryAddress.value = user?.Address
         }
         loadingUserWallets.value = false
       } else { // Add account
@@ -137,7 +138,7 @@ export default function useWallet() {
       console.log('user.value after connecting wallet :>> ', user.value)
       return user.value
     } catch (error) {
-      console.error(error)
+      console.error('There was an error in connectWallet :>> ', error)
     }
   }