Merge pull request #277 from wearekickback/dev

Added warning when not logged in (#276)
wearekickback · Jan 31, 2020 · 5513b01 · 5513b01
2 parents b7f9d90 + 1e8a105
commit 5513b01
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/api/resolvers/tokenResolvers.js b/src/api/resolvers/tokenResolvers.js
@@ -282,14 +282,15 @@ const resolvers = {
           const balance = await web3.eth.getBalance(account)
           return {
             balance,
+            account,
             allowance: balance
           }
         }
 
         const contract = getTokenContract(web3, tokenAddress, detailedERC20ABI)
         const allowance = await contract.allowance(account, partyAddress).call()
         const balance = await contract.balanceOf(account).call()
-        return { allowance, balance }
+        return { allowance, balance, account }
       } catch (err) {
         console.log('Failed to fetch tokenAllowance', err)
         return { allowance: null }

diff --git a/src/components/SingleEvent/Approve.js b/src/components/SingleEvent/Approve.js
@@ -17,12 +17,19 @@ const Approve = ({
   decimals,
   isAllowed,
   hasBalance,
-  refetch
+  refetch,
+  account
 }) => {
   const canRSVP = isAllowed && hasBalance
 
   if (canRSVP) {
     return <Going>You can now RSVP</Going>
+  } else if (!account) {
+    return (
+      <WarningBox>
+        We cannot read your wallet balance. Please Sign in first.
+      </WarningBox>
+    )
   } else if (!hasBalance) {
     return (
       <WarningBox>

diff --git a/src/components/SingleEvent/EventCTA.js b/src/components/SingleEvent/EventCTA.js
@@ -123,7 +123,7 @@ class EventCTA extends Component {
           >
             {({
               data: {
-                tokenAllowance: { allowance, balance }
+                tokenAllowance: { allowance, balance, account }
               },
               loading,
               refetch
@@ -142,6 +142,7 @@ class EventCTA extends Component {
                 balance,
                 isAllowed,
                 hasBalance,
+                account,
                 refetch
               })
             }}
@@ -170,7 +171,8 @@ class EventCTA extends Component {
     isAllowed,
     hasBalance,
     balance,
-    refetch
+    refetch,
+    account
   }) {
     return (
       <>
@@ -204,6 +206,7 @@ class EventCTA extends Component {
                   isAllowed={isAllowed}
                   hasBalance={hasBalance}
                   refetch={refetch}
+                  account={account}
                 />
                 <RSVP
                   tokenAddress={tokenAddress}