Merge pull request #303 from reflexer-labs/develop

Develop
reflexer-labs · Mar 4, 2022 · 4b89444 · 4b89444
2 parents e0171b7 + aa32459
commit 4b89444
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/containers/Auctions/AuctionsList.tsx b/src/containers/Auctions/AuctionsList.tsx
@@ -63,16 +63,14 @@ const AuctionsList = ({ type }: Props) => {
                     {account &&
                     auctions &&
                     auctions.length &&
-                    (Number(internalBalance) > 0 ||
-                        Number(protInternalBalance) > 0) ? (
+                    (Number(internalBalance) >= 0.0001 ||
+                        Number(protInternalBalance) >= 0.0001) ? (
                         <Button
                             text={t('claim_tokens')}
                             onClick={() => handleClick('claim_tokens')}
                         />
                     ) : null}
                 </Box>
-
-                <span>{`Status`}</span>
             </InfoBox>
             {auctions && auctions.length > 0 ? (
                 <>

diff --git a/src/containers/OnBoarding/ModifySafe.tsx b/src/containers/OnBoarding/ModifySafe.tsx
@@ -1,4 +1,4 @@
-import { ethers } from 'ethers'
+import { BigNumber, ethers } from 'ethers'
 import React, { useCallback, useMemo, useState } from 'react'
 import styled from 'styled-components'
 import Button from '../../components/Button'
@@ -90,20 +90,25 @@ const ModifySafe = ({
             onLeftInput(availableEth as string)
         }
     }
+
     const onMaxRightInput = () => {
         if (isDeposit) {
             onRightInput(availableRai.toString())
         } else {
             const availableRaiBN = ethers.utils.parseEther(availableRai)
 
-            const raiBalanceBN = ethers.utils.parseEther(
-                balances.rai.toString()
-            )
+            const raiBalanceBN = balances.rai
+                ? ethers.utils.parseEther(balances.rai.toString())
+                : BigNumber.from('0')
 
             const isMore = raiBalanceBN.gt(availableRaiBN)
 
             onRightInput(
-                isMore ? availableRai.toString() : balances.rai.toString()
+                isMore
+                    ? availableRai.toString()
+                    : balances.rai
+                    ? balances.rai.toString()
+                    : '0'
             )
         }
     }