Merge pull request #392 from dOrgTech/develop

Merge develop to V2

README.md

@@ -179,6 +179,11 @@ At a contract level, there is no such distinction, but in the UI it exists to le
 ```
 
 # Contributing
+## Developer Docs
+
+- [Tezos Homebase Docs](https://docs.google.com/document/d/1zZwcvX0jNE8PycOMNSULy2i-mcjg1LJ9FFYbGP4m9TM/edit?usp=sharing)
+- [Tezos Homebase - Local Env Setup](https://docs.google.com/document/d/1GDnJzwezXXEGiwZAWioOlfvmcSuHuREpO7GIKMLjYmk/edit?usp=sharing)
+
 ## Running the project
 
 To run the project:

src/modules/explorer/components/DAOStatsRow.tsx

@@ -201,7 +201,7 @@ export const DAOStatsRow: React.FC = () => {
                   <ProposalInfoTitle color="secondary">{symbol} Locked</ProposalInfoTitle>
                 </Grid>
                 <Grid item>
-                  <LargeNumber>{amountLocked.dp(10).toString()}</LargeNumber>
+                  <LargeNumber>{amountLocked.dp(10, 1).toString()}</LargeNumber>
                 </Grid>
                 <Grid item>
                   <LockedTokensBar variant="determinate" value={amountLockedPercentage.toNumber()} color="secondary" />

src/modules/explorer/components/FreezeDialog.tsx

@@ -48,7 +48,8 @@ export const FreezeDialog: React.FC<{ freeze: boolean }> = ({ freeze }) => {
   const { account } = useTezos()
 
   const [showMax, setShowMax] = React.useState<boolean>(false)
-  const [max, setMax] = React.useState(0)
+  const [maxDeposit, setMaxDeposit] = React.useState(0)
+  const [maxWithdraw, setMaxWithdraw] = React.useState(0)
 
   const handleClickOpen = () => {
     setOpen(true)
@@ -83,8 +84,17 @@ export const FreezeDialog: React.FC<{ freeze: boolean }> = ({ freeze }) => {
         )
         setShowMax(true)
         if (availableBalance) {
-          const formattedBalance = parseUnits(new BigNumber(availableBalance), dao.data.token.decimals).toNumber()
-          setMax(formattedBalance)
+          const formattedBalance = parseUnits(new BigNumber(availableBalance), dao.data.token.decimals)
+            .dp(10, 1)
+            .toNumber()
+          setMaxDeposit(formattedBalance)
+        }
+
+        const userLedger = ledger.find(l => l.holder.address.toLowerCase() === account.toLowerCase())
+        if (userLedger) {
+          if (userLedger.available_balance) {
+            setMaxWithdraw(userLedger.available_balance.dp(10, 1).toNumber())
+          }
         }
       }
     }
@@ -111,9 +121,19 @@ export const FreezeDialog: React.FC<{ freeze: boolean }> = ({ freeze }) => {
                 {showMax && freeze ? (
                   <>
                     <Typography>
-                      {max} {dao?.data.token.symbol}
+                      {maxDeposit} {dao?.data.token.symbol}
+                    </Typography>
+                    <CustomMaxLabel color="secondary" onClick={() => setAmount(maxDeposit)}>
+                      Use Max
+                    </CustomMaxLabel>
+                  </>
+                ) : null}
+                {showMax && !freeze ? (
+                  <>
+                    <Typography>
+                      {maxWithdraw} {dao?.data.token.symbol}
                     </Typography>
-                    <CustomMaxLabel color="secondary" onClick={() => setAmount(max)}>
+                    <CustomMaxLabel color="secondary" onClick={() => setAmount(maxWithdraw)}>
                       Use Max
                     </CustomMaxLabel>
                   </>

src/modules/explorer/components/UserBalances.tsx

@@ -108,9 +108,9 @@ export const UserBalances: React.FC<{ daoId: string }> = ({ daoId, children }) =
       return userBalances
     }
 
-    userBalances.available.balance = userLedger.available_balance.dp(10).toString()
-    userBalances.pending.balance = userLedger.pending_balance.dp(10).toString()
-    userBalances.staked.balance = userLedger.staked.dp(10).toString()
+    userBalances.available.balance = userLedger.available_balance.dp(10, 1).toString()
+    userBalances.pending.balance = userLedger.pending_balance.dp(10, 1).toString()
+    userBalances.staked.balance = userLedger.staked.dp(10, 1).toString()
 
     return userBalances
   }, [account, ledger])

src/modules/explorer/pages/DAO/index.tsx

@@ -102,8 +102,8 @@ export const DAO: React.FC = () => {
       .sort((a, b) => b.available_balance.minus(a.available_balance).toNumber())
       .map(p => ({
         address: p.holder.address,
-        totalStaked: new BigNumber(p.total_balance).dp(10).toString(),
-        availableStaked: new BigNumber(p.available_balance).dp(10).toString(),
+        totalStaked: new BigNumber(p.total_balance).dp(10, 1).toString(),
+        availableStaked: new BigNumber(p.available_balance).dp(10, 1).toString(),
         votes: p.holder.votes_cast.toString(),
         proposalsVoted: p.holder.proposals_voted.toString()
       }))

src/modules/explorer/pages/Treasury/components/BalancesTable.tsx

@@ -57,7 +57,7 @@ const createData = (daoHolding: DAOHolding): RowData => {
   return {
     symbol: daoHolding.token.symbol,
     address: daoHolding.token.contract,
-    amount: daoHolding.balance.dp(10).toString()
+    amount: daoHolding.balance.dp(10, 1).toString()
   }
 }
 

src/modules/explorer/pages/Treasury/components/TransfersTable.tsx

@@ -36,7 +36,7 @@ const createData = (transfer: TransferWithBN, isInbound: boolean) => {
   return {
     token: transfer.name,
     date: dayjs(transfer.date).format("ll"),
-    amount: transfer.amount.dp(10).toString(),
+    amount: transfer.amount.dp(10, 1).toString(),
     address: isInbound ? transfer.sender : transfer.recipient,
     hash: transfer.hash
   }

src/services/bakingBad/tokenBalances/index.ts

@@ -3,7 +3,7 @@ import { NFT, Token } from "models/Token"
 import { Network } from "services/beacon"
 import { parseUnits } from "services/contracts/utils"
 import { networkNameMap } from ".."
-import { BalanceTZKT, DAOToken, FA2TokenDTO, NFTDTO, TokenDataTZKT } from "./types"
+import { BalanceDataDTO, BalanceTZKT, DAOToken, FA2TokenDTO, NFTDTO, TokenDataTZKT } from "./types"
 
 const isNFTDTO = (value: DAOToken): value is NFTDTO => value.hasOwnProperty("artifact_uri")
 
@@ -189,17 +189,15 @@ export const getTokenMetadata = async (contractAddress: string, network: Network
 }
 
 export const getUserTokenBalance = async (accountAddress: string, network: Network = "mainnet", tokenAddress = "") => {
-  const url = `https://api.${networkNameMap[network]}.tzkt.io/v1/tokens/balances/?account=${accountAddress}`
+  const url = `https://api.${networkNameMap[network]}.tzkt.io/v1/tokens/balances/?account=${accountAddress}&token.contract=${tokenAddress}`
 
   const response = await fetch(url)
 
   if (!response.ok) {
     throw new Error("Failed to fetch user balances")
   }
 
-  const userTokens = await response.json()
-
-  const userTokenBalance = userTokens.filter((token: any) => token.token.contract.address === tokenAddress)
+  const userTokenBalance: BalanceDataDTO[] = await response.json()
 
   if (userTokenBalance && userTokenBalance[0]) {
     return userTokenBalance[0].balance

src/services/bakingBad/tokenBalances/types.ts

@@ -128,3 +128,15 @@ export interface TokenDataTZKT {
   totalSupply: string
   metadata: Metadata
 }
+
+export interface BalanceDataDTO {
+  id: number
+  account: Account
+  token: Token
+  balance: string
+  transfersCount: number
+  firstLevel: number
+  firstTime: string
+  lastLevel: number
+  lastTime: string
+}